Skip to content

Apply and ensure stroke event only to activate editable shapes#4810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
archmoj merged 3 commits into from
May 4, 2020
Merged

Apply and ensure stroke event only to activate editable shapes #4810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e96a40
fix issue 4806 and 4808 - use and ensure stroke event only to activat…
archmoj May 4, 2020
078c007
allow activation of editable shapes using opaque fill
archmoj May 4, 2020
bb3f858
fixup config editable: true test
archmoj May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/components/shapes/draw.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ function drawOne(gd, index) {
var lineColor = options.line.width ? options.line.color : 'rgba(0,0,0,0)';
var lineWidth = options.line.width;
var lineDash = options.line.dash;
if(!lineWidth && options.editable === true) {
// ensure invisible border to activate the shape
lineWidth = 5;
lineDash = 'solid';
}

var isOpen = d[d.length - 1] !== 'Z';

Expand DownExpand Up@@ -163,15 +168,11 @@ function drawOne(gd, index) {
} else {
if(gd._context.edits.shapePosition) {
setupDragElement(gd, path, options, index, shapeLayer, editHelpers);
} else if(options.editable === true) {
path.style('pointer-events',
(isOpen || Color.opacity(fillColor) * opacity <= 0.5) ? 'stroke' : 'all'
);
}

path.style('pointer-events',
!couldHaveActiveShape(gd) || (
lineWidth < 2 || ( // not has a remarkable border
!isOpen && Color.opacity(fillColor) * opacity > 0.5 // not too transparent
)
) ? 'all' : 'stroke'
);
}

path.node().addEventListener('click', function() { return activateShape(gd, path); });
Expand Down
243 changes: 238 additions & 5 deletions test/jasmine/tests/draw_newshape_test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1089,7 +1089,7 @@ describe('Activate and edit editable shapes', function() {
afterEach(destroyGraphDiv);

['mouse'].forEach(function(device) {
it('@flaky reactangle using' + device, function(done) {
it('@flaky reactangle using' + device, function(done) {
var i = 0; // shape index

Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1224,7 +1224,7 @@ describe('Activate and edit editable shapes', function() {
.then(done);
});

it('@flaky circle using' + device, function(done) {
it('@flaky circle using' + device, function(done) {
var i = 1; // shape index

Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1281,7 +1281,7 @@ describe('Activate and edit editable shapes', function() {
.then(done);
});

it('@flaky closed-path using' + device, function(done) {
it('@flaky closed-path using' + device, function(done) {
var i = 2; // shape index

Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1326,7 +1326,7 @@ describe('Activate and edit editable shapes', function() {
.then(done);
});

it('@flaky bezier curves using' + device, function(done) {
it('@flaky bezier curves using' + device, function(done) {
var i = 5; // shape index

Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1371,7 +1371,7 @@ describe('Activate and edit editable shapes', function() {
.then(done);
});

it('@flaky multi-cell path using' + device, function(done) {
it('@flaky multi-cell path using' + device, function(done) {
var i = 6; // shape index

Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1426,3 +1426,236 @@ describe('Activate and edit editable shapes', function() {
});
});
});


describe('Activate and edit editable shapes', function() {
var gd;

beforeEach(function() {
gd = createGraphDiv();
});

afterEach(destroyGraphDiv);

it('should not set pointer-events for non-editable shapes i.e. to allow pan/zoom/hover work inside shapes', function(done) {
Plotly.newPlot(gd, {
data: [{
mode: 'markers',
x: [1, 3, 3],
y: [2, 1, 3]
}],
layout: {
shapes: [
{
editable: false,
x0: 1.5,
x1: 2,
y0: 1.5,
y1: 2,
opacity: 0.5,
fillcolor: 'blue',
line: {
width: 0,
dash: 'dash',
color: 'black'
}
}, {
editable: false,
x0: 2,
x1: 2.5,
y0: 1.5,
y1: 2,
opacity: 0.7,
fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
line: {
width: 0,
dash: 'dash',
color: 'black'
}
}, {
editable: false,
x0: 1.5,
x1: 2,
y0: 2,
y1: 2.5,
fillcolor: 'red',
line: {
width: 3,
dash: 'dash',
color: 'green'
}
}, {
editable: false,
path: 'M2,2H2.5,V2.5', // open path
fillcolor: 'rgba(0,0,0,0)',
line: {
width: 3,
dash: 'dash',
color: 'green'
}
}
]
}
})

.then(function() {
var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
expect(el.style['pointer-events']).toBe('');
expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
expect(el.style['stroke-opacity']).toBe('0'); // invisible
expect(el.style['stroke-width']).toBe('0px'); // no pixel

el = Plotly.d3.selectAll('.shapelayer path')[0][1];
expect(el.style['pointer-events']).toBe('');
expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
expect(el.style['stroke-opacity']).toBe('0'); // invisible
expect(el.style['stroke-width']).toBe('0px'); // no pixel

el = Plotly.d3.selectAll('.shapelayer path')[0][2];
expect(el.style['pointer-events']).toBe('');
expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
expect(el.style['stroke-opacity']).toBe('1'); // visible
expect(el.style['stroke-width']).toBe('3px'); // custom pixel

el = Plotly.d3.selectAll('.shapelayer path')[0][3];
expect(el.style['pointer-events']).toBe('');
expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
expect(el.style['stroke-opacity']).toBe('1'); // visible
expect(el.style['stroke-width']).toBe('3px'); // custom pixel
})

.catch(failTest)
.then(done);
});

it('should provide invisible border & set pointer-events (depending on fill transparency) for editable shapes i.e. to allow shape activation', function(done) {
Plotly.newPlot(gd, {
data: [{
mode: 'markers',
x: [1, 3, 3],
y: [2, 1, 3]
}],
layout: {
shapes: [
{
editable: true,
x0: 1.5,
x1: 2,
y0: 1.5,
y1: 2,
opacity: 0.5,
fillcolor: 'blue',
line: {
width: 0,
dash: 'dash',
color: 'black'
}
}, {
editable: true,
x0: 2,
x1: 2.5,
y0: 1.5,
y1: 2,
opacity: 0.7,
fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
line: {
width: 0,
dash: 'dash',
color: 'black'
}
}, {
editable: true,
x0: 1.5,
x1: 2,
y0: 2,
y1: 2.5,
fillcolor: 'red',
line: {
width: 3,
dash: 'dash',
color: 'green'
}
}, {
editable: true,
path: 'M2,2H2.5,V2.5', // open path
fillcolor: 'rgba(0,0,0,0)',
line: {
width: 3,
dash: 'dash',
color: 'green'
}
}
]
}
})

.then(function() {
var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
expect(el.style['pointer-events']).toBe('stroke');
expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
expect(el.style['stroke-opacity']).toBe('0'); // invisible
expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

el = Plotly.d3.selectAll('.shapelayer path')[0][1];
expect(el.style['pointer-events']).toBe('stroke');
expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
expect(el.style['stroke-opacity']).toBe('0'); // invisible
expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

el = Plotly.d3.selectAll('.shapelayer path')[0][2];
expect(el.style['pointer-events']).toBe('all');
expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
expect(el.style['stroke-opacity']).toBe('1'); // visible
expect(el.style['stroke-width']).toBe('3px'); // custom pixel

el = Plotly.d3.selectAll('.shapelayer path')[0][3];
expect(el.style['pointer-events']).toBe('stroke');
expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
expect(el.style['stroke-opacity']).toBe('1'); // visible
expect(el.style['stroke-width']).toBe('3px'); // custom pixel
})

.catch(failTest)
.then(done);
});

it('should not provide invisible border & set pointer-events to "stroke" for shapes made editable via config', function(done) {
Plotly.newPlot(gd, {
data: [{
mode: 'markers',
x: [1, 3, 3],
y: [2, 1, 3]
}],
layout: {
shapes: [
{
x0: 1.5,
x1: 2.5,
y0: 1.5,
y1: 2.5,
fillcolor: 'blue',
line: {
width: 0,
dash: 'dash',
color: 'black'
}
}
]
},
config: {
editable: true
}
})

.then(function() {
var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
expect(el.style['pointer-events']).toBe('all');
expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
expect(el.style['stroke-opacity']).toBe('0'); // invisible
expect(el.style['stroke-width']).toBe('0px'); // no extra pixels
})

.catch(failTest)
.then(done);
});
});
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Apply and ensure stroke event only to activate editable shapes by archmoj · Pull Request #4810 · plotly/plotly.js · GitHub
Skip to content
Apply and ensure stroke event only to activate editable shapes#4810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

archmoj
merged 3 commits into

from

May 4, 2020
 Merged


Apply and ensure stroke event only to activate editable shapes
#4810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3e96a40

fix issue 4806 and 4808 - use and ensure stroke event only to activat…


archmoj May 4, 2020
078c007

allow activation of editable shapes using opaque fill


archmoj May 4, 2020
bb3f858

fixup config editable: true test


archmoj May 4, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 9 additions & 8 deletions
src/components/shapes/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ function drawOne(gd, index) {
 var lineColor = options.line.width ? options.line.color : 'rgba(0,0,0,0)';
 var lineWidth = options.line.width;
 var lineDash = options.line.dash;
 if(!lineWidth && options.editable === true) {
 // ensure invisible border to activate the shape
 lineWidth = 5;
 lineDash = 'solid';
 }

 var isOpen = d[d.length - 1] !== 'Z';

Expand DownExpand Up@@ -163,15 +168,11 @@ function drawOne(gd, index) {
 } else {
 if(gd._context.edits.shapePosition) {
 setupDragElement(gd, path, options, index, shapeLayer, editHelpers);
 } else if(options.editable === true) {
 path.style('pointer-events',
 (isOpen || Color.opacity(fillColor) * opacity <= 0.5) ? 'stroke' : 'all'
 );
 }

 path.style('pointer-events',
 !couldHaveActiveShape(gd) || (
 lineWidth < 2 || ( // not has a remarkable border
 !isOpen && Color.opacity(fillColor) * opacity > 0.5 // not too transparent
 )
 ) ? 'all' : 'stroke'
 );
 }

 path.node().addEventListener('click', function() { return activateShape(gd, path); });
Expand Down

243 changes: 238 additions & 5 deletions
test/jasmine/tests/draw_newshape_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1089,7 +1089,7 @@ describe('Activate and edit editable shapes', function() {
 afterEach(destroyGraphDiv);

 ['mouse'].forEach(function(device) {
 it('@flaky reactangle using' + device, function(done) {
 it('@flaky reactangle using' + device, function(done) {
 var i = 0; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1224,7 +1224,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky circle using' + device, function(done) {
 it('@flaky circle using' + device, function(done) {
 var i = 1; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1281,7 +1281,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky closed-path using' + device, function(done) {
 it('@flaky closed-path using' + device, function(done) {
 var i = 2; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1326,7 +1326,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky bezier curves using' + device, function(done) {
 it('@flaky bezier curves using' + device, function(done) {
 var i = 5; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1371,7 +1371,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky multi-cell path using' + device, function(done) {
 it('@flaky multi-cell path using' + device, function(done) {
 var i = 6; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1426,3 +1426,236 @@ describe('Activate and edit editable shapes', function() {
 });
 });
});


describe('Activate and edit editable shapes', function() {
 var gd;

 beforeEach(function() {
 gd = createGraphDiv();
 });

 afterEach(destroyGraphDiv);

 it('should not set pointer-events for non-editable shapes i.e. to allow pan/zoom/hover work inside shapes', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: false,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should provide invisible border & set pointer-events (depending on fill transparency) for editable shapes i.e. to allow shape activation', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: true,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should not provide invisible border & set pointer-events to "stroke" for shapes made editable via config', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 x0: 1.5,
 x1: 2.5,
 y0: 1.5,
 y1: 2.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }
 ]
 },
 config: {
 editable: true
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no extra pixels
 })

 .catch(failTest)
 .then(done);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Apply and ensure stroke event only to activate editable shapes by archmoj · Pull Request #4810 · plotly/plotly.js · GitHub
Skip to content
Apply and ensure stroke event only to activate editable shapes#4810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

archmoj
merged 3 commits into

from

May 4, 2020
 Merged


Apply and ensure stroke event only to activate editable shapes
#4810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3e96a40

fix issue 4806 and 4808 - use and ensure stroke event only to activat…


archmoj May 4, 2020
078c007

allow activation of editable shapes using opaque fill


archmoj May 4, 2020
bb3f858

fixup config editable: true test


archmoj May 4, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 9 additions & 8 deletions
src/components/shapes/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ function drawOne(gd, index) {
 var lineColor = options.line.width ? options.line.color : 'rgba(0,0,0,0)';
 var lineWidth = options.line.width;
 var lineDash = options.line.dash;
 if(!lineWidth && options.editable === true) {
 // ensure invisible border to activate the shape
 lineWidth = 5;
 lineDash = 'solid';
 }

 var isOpen = d[d.length - 1] !== 'Z';

Expand DownExpand Up@@ -163,15 +168,11 @@ function drawOne(gd, index) {
 } else {
 if(gd._context.edits.shapePosition) {
 setupDragElement(gd, path, options, index, shapeLayer, editHelpers);
 } else if(options.editable === true) {
 path.style('pointer-events',
 (isOpen || Color.opacity(fillColor) * opacity <= 0.5) ? 'stroke' : 'all'
 );
 }

 path.style('pointer-events',
 !couldHaveActiveShape(gd) || (
 lineWidth < 2 || ( // not has a remarkable border
 !isOpen && Color.opacity(fillColor) * opacity > 0.5 // not too transparent
 )
 ) ? 'all' : 'stroke'
 );
 }

 path.node().addEventListener('click', function() { return activateShape(gd, path); });
Expand Down

243 changes: 238 additions & 5 deletions
test/jasmine/tests/draw_newshape_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1089,7 +1089,7 @@ describe('Activate and edit editable shapes', function() {
 afterEach(destroyGraphDiv);

 ['mouse'].forEach(function(device) {
 it('@flaky reactangle using' + device, function(done) {
 it('@flaky reactangle using' + device, function(done) {
 var i = 0; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1224,7 +1224,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky circle using' + device, function(done) {
 it('@flaky circle using' + device, function(done) {
 var i = 1; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1281,7 +1281,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky closed-path using' + device, function(done) {
 it('@flaky closed-path using' + device, function(done) {
 var i = 2; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1326,7 +1326,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky bezier curves using' + device, function(done) {
 it('@flaky bezier curves using' + device, function(done) {
 var i = 5; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1371,7 +1371,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky multi-cell path using' + device, function(done) {
 it('@flaky multi-cell path using' + device, function(done) {
 var i = 6; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1426,3 +1426,236 @@ describe('Activate and edit editable shapes', function() {
 });
 });
});


describe('Activate and edit editable shapes', function() {
 var gd;

 beforeEach(function() {
 gd = createGraphDiv();
 });

 afterEach(destroyGraphDiv);

 it('should not set pointer-events for non-editable shapes i.e. to allow pan/zoom/hover work inside shapes', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: false,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should provide invisible border & set pointer-events (depending on fill transparency) for editable shapes i.e. to allow shape activation', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: true,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should not provide invisible border & set pointer-events to "stroke" for shapes made editable via config', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 x0: 1.5,
 x1: 2.5,
 y0: 1.5,
 y1: 2.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }
 ]
 },
 config: {
 editable: true
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no extra pixels
 })

 .catch(failTest)
 .then(done);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Apply and ensure stroke event only to activate editable shapes by archmoj · Pull Request #4810 · plotly/plotly.js · GitHub
Skip to content
Apply and ensure stroke event only to activate editable shapes#4810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

archmoj
merged 3 commits into

from

May 4, 2020
 Merged


Apply and ensure stroke event only to activate editable shapes
#4810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3e96a40

fix issue 4806 and 4808 - use and ensure stroke event only to activat…


archmoj May 4, 2020
078c007

allow activation of editable shapes using opaque fill


archmoj May 4, 2020
bb3f858

fixup config editable: true test


archmoj May 4, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 9 additions & 8 deletions
src/components/shapes/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ function drawOne(gd, index) {
 var lineColor = options.line.width ? options.line.color : 'rgba(0,0,0,0)';
 var lineWidth = options.line.width;
 var lineDash = options.line.dash;
 if(!lineWidth && options.editable === true) {
 // ensure invisible border to activate the shape
 lineWidth = 5;
 lineDash = 'solid';
 }

 var isOpen = d[d.length - 1] !== 'Z';

Expand DownExpand Up@@ -163,15 +168,11 @@ function drawOne(gd, index) {
 } else {
 if(gd._context.edits.shapePosition) {
 setupDragElement(gd, path, options, index, shapeLayer, editHelpers);
 } else if(options.editable === true) {
 path.style('pointer-events',
 (isOpen || Color.opacity(fillColor) * opacity <= 0.5) ? 'stroke' : 'all'
 );
 }

 path.style('pointer-events',
 !couldHaveActiveShape(gd) || (
 lineWidth < 2 || ( // not has a remarkable border
 !isOpen && Color.opacity(fillColor) * opacity > 0.5 // not too transparent
 )
 ) ? 'all' : 'stroke'
 );
 }

 path.node().addEventListener('click', function() { return activateShape(gd, path); });
Expand Down

243 changes: 238 additions & 5 deletions
test/jasmine/tests/draw_newshape_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1089,7 +1089,7 @@ describe('Activate and edit editable shapes', function() {
 afterEach(destroyGraphDiv);

 ['mouse'].forEach(function(device) {
 it('@flaky reactangle using' + device, function(done) {
 it('@flaky reactangle using' + device, function(done) {
 var i = 0; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1224,7 +1224,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky circle using' + device, function(done) {
 it('@flaky circle using' + device, function(done) {
 var i = 1; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1281,7 +1281,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky closed-path using' + device, function(done) {
 it('@flaky closed-path using' + device, function(done) {
 var i = 2; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1326,7 +1326,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky bezier curves using' + device, function(done) {
 it('@flaky bezier curves using' + device, function(done) {
 var i = 5; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1371,7 +1371,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky multi-cell path using' + device, function(done) {
 it('@flaky multi-cell path using' + device, function(done) {
 var i = 6; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1426,3 +1426,236 @@ describe('Activate and edit editable shapes', function() {
 });
 });
});


describe('Activate and edit editable shapes', function() {
 var gd;

 beforeEach(function() {
 gd = createGraphDiv();
 });

 afterEach(destroyGraphDiv);

 it('should not set pointer-events for non-editable shapes i.e. to allow pan/zoom/hover work inside shapes', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: false,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should provide invisible border & set pointer-events (depending on fill transparency) for editable shapes i.e. to allow shape activation', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: true,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should not provide invisible border & set pointer-events to "stroke" for shapes made editable via config', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 x0: 1.5,
 x1: 2.5,
 y0: 1.5,
 y1: 2.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }
 ]
 },
 config: {
 editable: true
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no extra pixels
 })

 .catch(failTest)
 .then(done);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Apply and ensure stroke event only to activate editable shapes by archmoj · Pull Request #4810 · plotly/plotly.js · GitHub
Skip to content
Apply and ensure stroke event only to activate editable shapes#4810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

archmoj
merged 3 commits into

from

May 4, 2020
 Merged


Apply and ensure stroke event only to activate editable shapes
#4810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3e96a40

fix issue 4806 and 4808 - use and ensure stroke event only to activat…


archmoj May 4, 2020
078c007

allow activation of editable shapes using opaque fill


archmoj May 4, 2020
bb3f858

fixup config editable: true test


archmoj May 4, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 9 additions & 8 deletions
src/components/shapes/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ function drawOne(gd, index) {
 var lineColor = options.line.width ? options.line.color : 'rgba(0,0,0,0)';
 var lineWidth = options.line.width;
 var lineDash = options.line.dash;
 if(!lineWidth && options.editable === true) {
 // ensure invisible border to activate the shape
 lineWidth = 5;
 lineDash = 'solid';
 }

 var isOpen = d[d.length - 1] !== 'Z';

Expand DownExpand Up@@ -163,15 +168,11 @@ function drawOne(gd, index) {
 } else {
 if(gd._context.edits.shapePosition) {
 setupDragElement(gd, path, options, index, shapeLayer, editHelpers);
 } else if(options.editable === true) {
 path.style('pointer-events',
 (isOpen || Color.opacity(fillColor) * opacity <= 0.5) ? 'stroke' : 'all'
 );
 }

 path.style('pointer-events',
 !couldHaveActiveShape(gd) || (
 lineWidth < 2 || ( // not has a remarkable border
 !isOpen && Color.opacity(fillColor) * opacity > 0.5 // not too transparent
 )
 ) ? 'all' : 'stroke'
 );
 }

 path.node().addEventListener('click', function() { return activateShape(gd, path); });
Expand Down

243 changes: 238 additions & 5 deletions
test/jasmine/tests/draw_newshape_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1089,7 +1089,7 @@ describe('Activate and edit editable shapes', function() {
 afterEach(destroyGraphDiv);

 ['mouse'].forEach(function(device) {
 it('@flaky reactangle using' + device, function(done) {
 it('@flaky reactangle using' + device, function(done) {
 var i = 0; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1224,7 +1224,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky circle using' + device, function(done) {
 it('@flaky circle using' + device, function(done) {
 var i = 1; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1281,7 +1281,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky closed-path using' + device, function(done) {
 it('@flaky closed-path using' + device, function(done) {
 var i = 2; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1326,7 +1326,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky bezier curves using' + device, function(done) {
 it('@flaky bezier curves using' + device, function(done) {
 var i = 5; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1371,7 +1371,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky multi-cell path using' + device, function(done) {
 it('@flaky multi-cell path using' + device, function(done) {
 var i = 6; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1426,3 +1426,236 @@ describe('Activate and edit editable shapes', function() {
 });
 });
});


describe('Activate and edit editable shapes', function() {
 var gd;

 beforeEach(function() {
 gd = createGraphDiv();
 });

 afterEach(destroyGraphDiv);

 it('should not set pointer-events for non-editable shapes i.e. to allow pan/zoom/hover work inside shapes', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: false,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should provide invisible border & set pointer-events (depending on fill transparency) for editable shapes i.e. to allow shape activation', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: true,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should not provide invisible border & set pointer-events to "stroke" for shapes made editable via config', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 x0: 1.5,
 x1: 2.5,
 y0: 1.5,
 y1: 2.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }
 ]
 },
 config: {
 editable: true
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no extra pixels
 })

 .catch(failTest)
 .then(done);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Apply and ensure stroke event only to activate editable shapes by archmoj · Pull Request #4810 · plotly/plotly.js · GitHub
Skip to content
Apply and ensure stroke event only to activate editable shapes#4810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

archmoj
merged 3 commits into

from

May 4, 2020
 Merged


Apply and ensure stroke event only to activate editable shapes
#4810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3e96a40

fix issue 4806 and 4808 - use and ensure stroke event only to activat…


archmoj May 4, 2020
078c007

allow activation of editable shapes using opaque fill


archmoj May 4, 2020
bb3f858

fixup config editable: true test


archmoj May 4, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 9 additions & 8 deletions
src/components/shapes/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ function drawOne(gd, index) {
 var lineColor = options.line.width ? options.line.color : 'rgba(0,0,0,0)';
 var lineWidth = options.line.width;
 var lineDash = options.line.dash;
 if(!lineWidth && options.editable === true) {
 // ensure invisible border to activate the shape
 lineWidth = 5;
 lineDash = 'solid';
 }

 var isOpen = d[d.length - 1] !== 'Z';

Expand DownExpand Up@@ -163,15 +168,11 @@ function drawOne(gd, index) {
 } else {
 if(gd._context.edits.shapePosition) {
 setupDragElement(gd, path, options, index, shapeLayer, editHelpers);
 } else if(options.editable === true) {
 path.style('pointer-events',
 (isOpen || Color.opacity(fillColor) * opacity <= 0.5) ? 'stroke' : 'all'
 );
 }

 path.style('pointer-events',
 !couldHaveActiveShape(gd) || (
 lineWidth < 2 || ( // not has a remarkable border
 !isOpen && Color.opacity(fillColor) * opacity > 0.5 // not too transparent
 )
 ) ? 'all' : 'stroke'
 );
 }

 path.node().addEventListener('click', function() { return activateShape(gd, path); });
Expand Down

243 changes: 238 additions & 5 deletions
test/jasmine/tests/draw_newshape_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1089,7 +1089,7 @@ describe('Activate and edit editable shapes', function() {
 afterEach(destroyGraphDiv);

 ['mouse'].forEach(function(device) {
 it('@flaky reactangle using' + device, function(done) {
 it('@flaky reactangle using' + device, function(done) {
 var i = 0; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1224,7 +1224,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky circle using' + device, function(done) {
 it('@flaky circle using' + device, function(done) {
 var i = 1; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1281,7 +1281,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky closed-path using' + device, function(done) {
 it('@flaky closed-path using' + device, function(done) {
 var i = 2; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1326,7 +1326,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky bezier curves using' + device, function(done) {
 it('@flaky bezier curves using' + device, function(done) {
 var i = 5; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1371,7 +1371,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky multi-cell path using' + device, function(done) {
 it('@flaky multi-cell path using' + device, function(done) {
 var i = 6; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1426,3 +1426,236 @@ describe('Activate and edit editable shapes', function() {
 });
 });
});


describe('Activate and edit editable shapes', function() {
 var gd;

 beforeEach(function() {
 gd = createGraphDiv();
 });

 afterEach(destroyGraphDiv);

 it('should not set pointer-events for non-editable shapes i.e. to allow pan/zoom/hover work inside shapes', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: false,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should provide invisible border & set pointer-events (depending on fill transparency) for editable shapes i.e. to allow shape activation', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: true,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should not provide invisible border & set pointer-events to "stroke" for shapes made editable via config', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 x0: 1.5,
 x1: 2.5,
 y0: 1.5,
 y1: 2.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }
 ]
 },
 config: {
 editable: true
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no extra pixels
 })

 .catch(failTest)
 .then(done);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Apply and ensure stroke event only to activate editable shapes by archmoj · Pull Request #4810 · plotly/plotly.js · GitHub
Skip to content
Apply and ensure stroke event only to activate editable shapes#4810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

archmoj
merged 3 commits into

from

May 4, 2020
 Merged


Apply and ensure stroke event only to activate editable shapes
#4810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3e96a40

fix issue 4806 and 4808 - use and ensure stroke event only to activat…


archmoj May 4, 2020
078c007

allow activation of editable shapes using opaque fill


archmoj May 4, 2020
bb3f858

fixup config editable: true test


archmoj May 4, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 9 additions & 8 deletions
src/components/shapes/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ function drawOne(gd, index) {
 var lineColor = options.line.width ? options.line.color : 'rgba(0,0,0,0)';
 var lineWidth = options.line.width;
 var lineDash = options.line.dash;
 if(!lineWidth && options.editable === true) {
 // ensure invisible border to activate the shape
 lineWidth = 5;
 lineDash = 'solid';
 }

 var isOpen = d[d.length - 1] !== 'Z';

Expand DownExpand Up@@ -163,15 +168,11 @@ function drawOne(gd, index) {
 } else {
 if(gd._context.edits.shapePosition) {
 setupDragElement(gd, path, options, index, shapeLayer, editHelpers);
 } else if(options.editable === true) {
 path.style('pointer-events',
 (isOpen || Color.opacity(fillColor) * opacity <= 0.5) ? 'stroke' : 'all'
 );
 }

 path.style('pointer-events',
 !couldHaveActiveShape(gd) || (
 lineWidth < 2 || ( // not has a remarkable border
 !isOpen && Color.opacity(fillColor) * opacity > 0.5 // not too transparent
 )
 ) ? 'all' : 'stroke'
 );
 }

 path.node().addEventListener('click', function() { return activateShape(gd, path); });
Expand Down

243 changes: 238 additions & 5 deletions
test/jasmine/tests/draw_newshape_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1089,7 +1089,7 @@ describe('Activate and edit editable shapes', function() {
 afterEach(destroyGraphDiv);

 ['mouse'].forEach(function(device) {
 it('@flaky reactangle using' + device, function(done) {
 it('@flaky reactangle using' + device, function(done) {
 var i = 0; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1224,7 +1224,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky circle using' + device, function(done) {
 it('@flaky circle using' + device, function(done) {
 var i = 1; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1281,7 +1281,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky closed-path using' + device, function(done) {
 it('@flaky closed-path using' + device, function(done) {
 var i = 2; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1326,7 +1326,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky bezier curves using' + device, function(done) {
 it('@flaky bezier curves using' + device, function(done) {
 var i = 5; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1371,7 +1371,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky multi-cell path using' + device, function(done) {
 it('@flaky multi-cell path using' + device, function(done) {
 var i = 6; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1426,3 +1426,236 @@ describe('Activate and edit editable shapes', function() {
 });
 });
});


describe('Activate and edit editable shapes', function() {
 var gd;

 beforeEach(function() {
 gd = createGraphDiv();
 });

 afterEach(destroyGraphDiv);

 it('should not set pointer-events for non-editable shapes i.e. to allow pan/zoom/hover work inside shapes', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: false,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should provide invisible border & set pointer-events (depending on fill transparency) for editable shapes i.e. to allow shape activation', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: true,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should not provide invisible border & set pointer-events to "stroke" for shapes made editable via config', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 x0: 1.5,
 x1: 2.5,
 y0: 1.5,
 y1: 2.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }
 ]
 },
 config: {
 editable: true
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no extra pixels
 })

 .catch(failTest)
 .then(done);
 });
});

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Apply and ensure stroke event only to activate editable shapes by archmoj · Pull Request #4810 · plotly/plotly.js · GitHub
Skip to content
Apply and ensure stroke event only to activate editable shapes#4810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

archmoj
merged 3 commits into

from

May 4, 2020
 Merged


Apply and ensure stroke event only to activate editable shapes
#4810
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
3e96a40

fix issue 4806 and 4808 - use and ensure stroke event only to activat…


archmoj May 4, 2020
078c007

allow activation of editable shapes using opaque fill


archmoj May 4, 2020
bb3f858

fixup config editable: true test


archmoj May 4, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 9 additions & 8 deletions
src/components/shapes/draw.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -119,6 +119,11 @@ function drawOne(gd, index) {
 var lineColor = options.line.width ? options.line.color : 'rgba(0,0,0,0)';
 var lineWidth = options.line.width;
 var lineDash = options.line.dash;
 if(!lineWidth && options.editable === true) {
 // ensure invisible border to activate the shape
 lineWidth = 5;
 lineDash = 'solid';
 }

 var isOpen = d[d.length - 1] !== 'Z';

Expand DownExpand Up@@ -163,15 +168,11 @@ function drawOne(gd, index) {
 } else {
 if(gd._context.edits.shapePosition) {
 setupDragElement(gd, path, options, index, shapeLayer, editHelpers);
 } else if(options.editable === true) {
 path.style('pointer-events',
 (isOpen || Color.opacity(fillColor) * opacity <= 0.5) ? 'stroke' : 'all'
 );
 }

 path.style('pointer-events',
 !couldHaveActiveShape(gd) || (
 lineWidth < 2 || ( // not has a remarkable border
 !isOpen && Color.opacity(fillColor) * opacity > 0.5 // not too transparent
 )
 ) ? 'all' : 'stroke'
 );
 }

 path.node().addEventListener('click', function() { return activateShape(gd, path); });
Expand Down

243 changes: 238 additions & 5 deletions
test/jasmine/tests/draw_newshape_test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1089,7 +1089,7 @@ describe('Activate and edit editable shapes', function() {
 afterEach(destroyGraphDiv);

 ['mouse'].forEach(function(device) {
 it('@flaky reactangle using' + device, function(done) {
 it('@flaky reactangle using' + device, function(done) {
 var i = 0; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1224,7 +1224,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky circle using' + device, function(done) {
 it('@flaky circle using' + device, function(done) {
 var i = 1; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1281,7 +1281,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky closed-path using' + device, function(done) {
 it('@flaky closed-path using' + device, function(done) {
 var i = 2; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1326,7 +1326,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky bezier curves using' + device, function(done) {
 it('@flaky bezier curves using' + device, function(done) {
 var i = 5; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1371,7 +1371,7 @@ describe('Activate and edit editable shapes', function() {
 .then(done);
 });

 it('@flaky multi-cell path using' + device, function(done) {
 it('@flaky multi-cell path using' + device, function(done) {
 var i = 6; // shape index

 Plotly.newPlot(gd, {
Expand DownExpand Up@@ -1426,3 +1426,236 @@ describe('Activate and edit editable shapes', function() {
 });
 });
});


describe('Activate and edit editable shapes', function() {
 var gd;

 beforeEach(function() {
 gd = createGraphDiv();
 });

 afterEach(destroyGraphDiv);

 it('should not set pointer-events for non-editable shapes i.e. to allow pan/zoom/hover work inside shapes', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: false,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: false,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should provide invisible border & set pointer-events (depending on fill transparency) for editable shapes i.e. to allow shape activation', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 1.5,
 y1: 2,
 opacity: 0.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 2,
 x1: 2.5,
 y0: 1.5,
 y1: 2,
 opacity: 0.7,
 fillcolor: 'rgba(255,0,0,0.7)', // N.B. 0.7 * 0.7 = 0.49 <= 0.5 is quite transparent
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }, {
 editable: true,
 x0: 1.5,
 x1: 2,
 y0: 2,
 y1: 2.5,
 fillcolor: 'red',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }, {
 editable: true,
 path: 'M2,2H2.5,V2.5', // open path
 fillcolor: 'rgba(0,0,0,0)',
 line: {
 width: 3,
 dash: 'dash',
 color: 'green'
 }
 }
 ]
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][1];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('5px'); // some pixels to activate shape

 el = Plotly.d3.selectAll('.shapelayer path')[0][2];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel

 el = Plotly.d3.selectAll('.shapelayer path')[0][3];
 expect(el.style['pointer-events']).toBe('stroke');
 expect(el.style.stroke).toBe('rgb(0, 128, 0)'); // custom color
 expect(el.style['stroke-opacity']).toBe('1'); // visible
 expect(el.style['stroke-width']).toBe('3px'); // custom pixel
 })

 .catch(failTest)
 .then(done);
 });

 it('should not provide invisible border & set pointer-events to "stroke" for shapes made editable via config', function(done) {
 Plotly.newPlot(gd, {
 data: [{
 mode: 'markers',
 x: [1, 3, 3],
 y: [2, 1, 3]
 }],
 layout: {
 shapes: [
 {
 x0: 1.5,
 x1: 2.5,
 y0: 1.5,
 y1: 2.5,
 fillcolor: 'blue',
 line: {
 width: 0,
 dash: 'dash',
 color: 'black'
 }
 }
 ]
 },
 config: {
 editable: true
 }
 })

 .then(function() {
 var el = Plotly.d3.selectAll('.shapelayer path')[0][0];
 expect(el.style['pointer-events']).toBe('all');
 expect(el.style.stroke).toBe('rgb(0, 0, 0)'); // no color
 expect(el.style['stroke-opacity']).toBe('0'); // invisible
 expect(el.style['stroke-width']).toBe('0px'); // no extra pixels
 })

 .catch(failTest)
 .then(done);
 });
});