Skip to content

Commit e60123f

Browse files
committed
Merge remote-tracking branch 'origin/master' into font-shadow-striding-capitalize
- Resolved sonflicts in test/image/baselines/trace_metatext.png
2 parents 9416441 + cfccbcc commit e60123f

File tree

86 files changed

+111
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+111
-94
lines changed

Diff for: draftlogs/6996_fix.md

+2

Diff for: draftlogs/6997_fix.md

+2

Diff for: draftlogs/6998_fix.md

+2

Diff for: src/components/legend/draw.js

+11-6
Original file line numberDiff line numberDiff line change
@@ -423,18 +423,23 @@ function drawOne(gd, opts) {
423423
dragElement.init({
424424
element: legend.node(),
425425
gd: gd,
426-
prepFn: function() {
426+
prepFn: function(e) {
427+
if(e.target === scrollBar.node()) {
428+
return;
429+
}
427430
var transform = Drawing.getTranslate(legend);
428431
x0 = transform.x;
429432
y0 = transform.y;
430433
},
431434
moveFn: function(dx, dy) {
432-
var newX = x0 + dx;
433-
var newY = y0 + dy;
435+
if(x0 !== undefined && y0 !== undefined) {
436+
var newX = x0 + dx;
437+
var newY = y0 + dy;
434438

435-
Drawing.setTranslate(legend, newX, newY);
436-
xf = dragElement.align(newX, legendObj._width, gs.l, gs.l + gs.w, legendObj.xanchor);
437-
yf = dragElement.align(newY + legendObj._height, -legendObj._height, gs.t + gs.h, gs.t, legendObj.yanchor);
439+
Drawing.setTranslate(legend, newX, newY);
440+
xf = dragElement.align(newX, legendObj._width, gs.l, gs.l + gs.w, legendObj.xanchor);
441+
yf = dragElement.align(newY + legendObj._height, -legendObj._height, gs.t + gs.h, gs.t, legendObj.yanchor);
442+
}
438443
},
439444
doneFn: function() {
440445
if(xf !== undefined && yf !== undefined) {

Diff for: src/lib/dom.js

+3
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ function getElementAndAncestors(element) {
134134
while(isTransformableElement(element)) {
135135
allElements.push(element);
136136
element = element.parentNode;
137+
if(typeof ShadowRoot === 'function' && element instanceof ShadowRoot) {
138+
element = element.host;
139+
}
137140
}
138141
return allElements;
139142
}

Diff for: stackgl_modules/index.js

+17-17
Large diffs are not rendered by default.

Diff for: stackgl_modules/package-lock.json

+63-62
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: stackgl_modules/package.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,22 @@
1313
"box-intersect": "plotly/box-intersect#v1.1.0",
1414
"convex-hull": "^1.0.3",
1515
"delaunay-triangulate": "^1.1.6",
16-
"gl-axes3d": "^1.7.0",
17-
"gl-cone3d": "^1.6.0",
18-
"gl-error3d": "^1.0.16",
16+
"gl-axes3d": "^1.7.1",
17+
"gl-cone3d": "^1.6.1",
18+
"gl-error3d": "^1.0.17",
1919
"gl-heatmap2d": "^1.1.1",
20-
"gl-line3d": "1.2.1",
21-
"gl-mesh3d": "^2.3.1",
20+
"gl-line3d": "^1.2.2",
21+
"gl-mesh3d": "^2.3.2",
2222
"gl-plot2d": "^1.5.0",
2323
"gl-plot3d": "^2.4.7",
2424
"gl-pointcloud2d": "^1.0.3",
25-
"gl-scatter3d": "^1.4.0",
25+
"gl-scatter3d": "^1.4.1",
2626
"gl-select-box": "^1.0.4",
2727
"gl-shader": "4.3.1",
2828
"gl-spikes2d": "^1.0.2",
29-
"gl-streamtube3d": "^1.4.1",
30-
"gl-surface3d": "^1.6.0",
29+
"gl-spikes3d": "^1.0.11",
30+
"gl-streamtube3d": "^1.4.2",
31+
"gl-surface3d": "^1.6.1",
3132
"glslify": "^7.1.1",
3233
"incremental-convex-hull": "plotly/incremental-convex-hull#v1.1.0",
3334
"is-mobile": "^4.0.0",

Diff for: test/image/baselines/gl3d_annotations.png

-27 Bytes
-38 Bytes

Diff for: test/image/baselines/gl3d_bunny.png

8 Bytes

Diff for: test/image/baselines/gl3d_bunny_cell-area.png

10 Bytes

Diff for: test/image/baselines/gl3d_chrisp-nan-1.png

-21 Bytes

Diff for: test/image/baselines/gl3d_coloraxes.png

27 Bytes
1 Byte

Diff for: test/image/baselines/gl3d_cone-rossler.png

-7 Bytes

Diff for: test/image/baselines/gl3d_cone-with-streamtube.png

0 Bytes

Diff for: test/image/baselines/gl3d_contour-lines.png

0 Bytes

Diff for: test/image/baselines/gl3d_contour-lines2.png

19 Bytes

Diff for: test/image/baselines/gl3d_convex-hull.png

8 Bytes

Diff for: test/image/baselines/gl3d_cufflinks.png

-3 Bytes

Diff for: test/image/baselines/gl3d_directions-isosurface2.png

-21 Bytes

Diff for: test/image/baselines/gl3d_directions-streamtube1.png

-7 Bytes

Diff for: test/image/baselines/gl3d_directions-streamtube2.png

-15 Bytes

Diff for: test/image/baselines/gl3d_error_bars_log_2.png

-53 Bytes

Diff for: test/image/baselines/gl3d_ibm-plot.png

-162 Bytes

Diff for: test/image/baselines/gl3d_isosurface_math.png

-150 Bytes
-60 Bytes
26 Bytes

Diff for: test/image/baselines/gl3d_isosurface_transparent.png

-6 Bytes
42 Bytes

Diff for: test/image/baselines/gl3d_mesh3d-missing-colors.png

8 Bytes
8 Bytes

Diff for: test/image/baselines/gl3d_mirror-ticks.png

-1 Bytes

Diff for: test/image/baselines/gl3d_opacity-scaling-spikes.png

-88 Bytes

Diff for: test/image/baselines/gl3d_opacity-surface.png

-5 Bytes
-4.87 KB
-4 Bytes

Diff for: test/image/baselines/gl3d_projection-traces.png

-1 Bytes

Diff for: test/image/baselines/gl3d_reversescale.png

8 Bytes

Diff for: test/image/baselines/gl3d_ribbons.png

14 Bytes

Diff for: test/image/baselines/gl3d_scatter-color-array.png

4 Bytes
-80 Bytes
0 Bytes

Diff for: test/image/baselines/gl3d_scatter3d-align-texts.png

1 Byte
0 Bytes
0 Bytes

Diff for: test/image/baselines/gl3d_set-ranges.png

-27 Bytes

Diff for: test/image/baselines/gl3d_snowden.png

1 Byte

Diff for: test/image/baselines/gl3d_snowden_altered.png

8 Bytes

Diff for: test/image/baselines/gl3d_streamtube-thin.png

-1 Bytes
4 Bytes
1 Byte
-20 Bytes

Diff for: test/image/baselines/gl3d_surface-lighting.png

-1 Bytes

Diff for: test/image/baselines/gl3d_surface_connectgaps.png

-64 Bytes
184 Bytes
37 Bytes

Diff for: test/image/baselines/gl3d_surface_intensity.png

-11 Bytes
-4 Bytes
0 Bytes
0 Bytes

Diff for: test/image/baselines/gl3d_text-weirdness.png

1 Byte

Diff for: test/image/baselines/gl3d_traces-with-legend.png

16 Bytes

Diff for: test/image/baselines/gl3d_traces-with-opacity.png

808 Bytes

Diff for: test/image/baselines/gl3d_transparent_same-depth.png

-1 Bytes

Diff for: test/image/baselines/gl3d_volume_airflow.png

-14 Bytes

Diff for: test/image/baselines/gl3d_volume_multiple-traces.png

39 Bytes
10 Bytes
-21 Bytes

Diff for: test/image/baselines/gl3d_world-cals.png

50 Bytes

Diff for: test/image/baselines/plot_types.png

-2 Bytes

Diff for: test/image/baselines/trace_metatext.png

2 Bytes

Diff for: test/image/compare_pixels_test.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,8 @@ for(var i = 0; i < allMockList.length; i++) {
178178
'gl3d_opacity-scaling-spikes',
179179
'gl3d_cone-wind',
180180
'gl3d_isosurface_math',
181-
'gl3d_scatter3d-blank-text'
181+
'gl3d_scatter3d-blank-text',
182+
'gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges'
182183
].indexOf(mockName) !== -1) threshold = 0.7;
183184
}
184185

0 commit comments

Comments
 (0)