Introduce global contexts #2159
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,6 +42,8 @@ var enforceAxisConstraints = axisConstraints.enforce; | |
| var cleanAxisConstraints = axisConstraints.clean; | ||
| var axisIds = require('../plots/cartesian/axis_ids'); | ||
|
|
||
| var createRegl = require('regl'); | ||
|
|
||
|
|
||
| /** | ||
| * Main plot-creation function | ||
|
|
@@ -195,6 +197,51 @@ Plotly.plot = function(gd, data, layout, config) { | |
| } | ||
| } | ||
|
|
||
| if(!fullLayout._glcanvas && fullLayout._has('gl')) { | ||
| fullLayout._glcanvas = fullLayout._glcontainer.selectAll('.gl-canvas').data([{ | ||
| key: 'contextLayer', | ||
| context: true, | ||
| pick: false | ||
| }, { | ||
| key: 'focusLayer', | ||
| context: false, | ||
| pick: false | ||
| }, { | ||
| key: 'pickLayer', | ||
| context: false, | ||
| pick: true | ||
| }]); | ||
|
There was a problem hiding this comment. I think you need a key-function here to make sure to not create these canvas nodes on every hard redraw that go through Sometime like: fullLayout._glcanvas = fullLayout._glcontainer.selectAll('.gl-canvas').data([{
/* .. as currently ... */
}], function(d) { return d.key; });There was a problem hiding this comment. This makes me wonder: we probably don't have sufficient test coverage for Plotly.newPlot(gd, [{
type: 'scattergl',
// ...
}])
.then(function() {
d3.selectAll('canvas').size() // => 3
return Plotly.restyle(gd, 'type', 'scatter')
})
.then(function() {
d3.selectAll('canvas').size() // => 0
})As restyling a Plotly.newPlot(gd, [{
type: 'parcoords',
// ...
}])
.then(function() {
d3.selectAll('canvas').size() // => 3
return Plotly.deleteTraces(gd, [0])
})
.then(function() {
d3.selectAll('canvas').size() // => 0
}) |
||
|
|
||
| fullLayout._glcanvas.enter().append('canvas') | ||
| .each(function(d) { | ||
| d.regl = createRegl({ | ||
| canvas: this, | ||
| attributes: { | ||
| antialias: !d.pick, | ||
| preserveDrawingBuffer: true | ||
| }, | ||
| extensions: ['ANGLE_instanced_arrays', 'OES_element_index_uint'], | ||
| pixelRatio: gd._context.plotGlPixelRatio || global.devicePixelRatio | ||
| }); | ||
| }) | ||
| .attr('class', function(d) { | ||
| return 'gl-canvas gl-canvas-' + d.key.replace('Layer', ''); | ||
| }) | ||
| .style({ | ||
| 'position': 'absolute', | ||
| 'top': 0, | ||
| 'left': 0, | ||
| 'width': '100%', | ||
| 'height': '100%', | ||
| 'pointer-events': 'none', | ||
| 'overflow': 'visible' | ||
| }) | ||
| .attr('width', fullLayout.width) | ||
| .attr('height', fullLayout.height); | ||
|
|
||
| fullLayout._glcanvas.exit().remove(); | ||
| } | ||
|
|
||
| return Lib.syncOrAsync([ | ||
| subroutines.layoutStyles | ||
| ], gd); | ||
|
|
@@ -1993,7 +2040,7 @@ function _relayout(gd, aobj) { | |
| else flags.plot = true; | ||
| } | ||
| else { | ||
| if((fullLayout._has('gl2d') || fullLayout._has('regl')) && | ||
| (ai === 'dragmode' && | ||
| (vi === 'lasso' || vi === 'select') && | ||
| !(vOld === 'lasso' || vOld === 'select')) | ||
|
|
@@ -2754,7 +2801,7 @@ function makePlotFramework(gd) { | |
| .classed('plotly', true); | ||
|
|
||
| // Make the svg container | ||
| fullLayout._paperdiv = fullLayout._container.selectAll('.svg-container').data([{}]); | ||
|
|
||
| fullLayout._paperdiv.enter().append('div') | ||
| .classed('svg-container', true) | ||
| .style('position', 'relative'); | ||
|
|
@@ -2765,10 +2812,13 @@ function makePlotFramework(gd) { | |
| // TODO: sort out all the ordering so we don't have to | ||
| // explicitly delete anything | ||
| fullLayout._glcontainer = fullLayout._paperdiv.selectAll('.gl-container') | ||
| .data([{}]); | ||
|
There was a problem hiding this comment. what about this one here? There was a problem hiding this comment. that is the way There was a problem hiding this comment. Does it work ok with There was a problem hiding this comment. @etpinard that is the point that parcoords puts |
||
| fullLayout._glcontainer.enter().append('div') | ||
| .classed('gl-container', true); | ||
|
|
||
| // That is initialized in drawFramework if there are `gl` traces | ||
| fullLayout._glcanvas = null; | ||
|
|
||
| fullLayout._paperdiv.selectAll('.main-svg').remove(); | ||
|
|
||
| fullLayout._paper = fullLayout._paperdiv.insert('svg', ':first-child') | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ha.
reglmust be invoking one or many globals that IE9 doesn't support at runtime.As this file here
plot_api.jsis required in all partial bundles (even that gl-less ones), this makes the IE9 test fail.So, I think the best to solve this would be use a
Registry.getComponentMethod-style pattern so thatreglis only required in bundles that exposeregltraces.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@etpinard do I get it right that we don't have this safe-require pattern yet? What if I just require regl directly when the
regltrace type is detected?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You mean something like:
in
plot_api.js? That could work, butreglwould still get bundled up in all partial bundles.