Merge remote-tracking branch 'origin/master' into font-shadow-stridin…

…g-capitalize - Resolved sonflicts in test/image/baselines/trace_metatext.png
plotly · May 16, 2024 · e60123f · e60123f
2 parents 9416441 + cfccbcc
commit e60123f
Show file tree

Hide file tree

Showing 86 changed files with 111 additions and 94 deletions.
diff --git a/draftlogs/6996_fix.md b/draftlogs/6996_fix.md
@@ -0,0 +1,2 @@
+- Fix `getFullTransformMatrix` in shadow DOM [[#6996](https://github.com/plotly/plotly.js/pull/6996)],
+  with thanks to @OpportunityLiu for the contribution!
diff --git a/draftlogs/6997_fix.md b/draftlogs/6997_fix.md
@@ -0,0 +1,2 @@
+- Fix drag on legend scrollbar while `edits.legendPosition` is `true` [[#6997](https://github.com/plotly/plotly.js/pull/6997)],
+  with thanks to @OpportunityLiu for the contribution!
diff --git a/draftlogs/6998_fix.md b/draftlogs/6998_fix.md
@@ -0,0 +1,2 @@
+ - Fix numerical instability in 3D plots [[6998](https://github.com/plotly/plotly.js/pull/6998)],
+   with thanks to @hborchardt for the contribution!
diff --git a/src/components/legend/draw.js b/src/components/legend/draw.js
@@ -423,18 +423,23 @@ function drawOne(gd, opts) {
                 dragElement.init({
                     element: legend.node(),
                     gd: gd,
-                    prepFn: function() {
+                    prepFn: function(e) {
+                        if(e.target === scrollBar.node()) {
+                            return;
+                        }
                         var transform = Drawing.getTranslate(legend);
                         x0 = transform.x;
                         y0 = transform.y;
                     },
                     moveFn: function(dx, dy) {
-                        var newX = x0 + dx;
-                        var newY = y0 + dy;
+                        if(x0 !== undefined && y0 !== undefined) {
+                            var newX = x0 + dx;
+                            var newY = y0 + dy;
 
-                        Drawing.setTranslate(legend, newX, newY);
-                        xf = dragElement.align(newX, legendObj._width, gs.l, gs.l + gs.w, legendObj.xanchor);
-                        yf = dragElement.align(newY + legendObj._height, -legendObj._height, gs.t + gs.h, gs.t, legendObj.yanchor);
+                            Drawing.setTranslate(legend, newX, newY);
+                            xf = dragElement.align(newX, legendObj._width, gs.l, gs.l + gs.w, legendObj.xanchor);
+                            yf = dragElement.align(newY + legendObj._height, -legendObj._height, gs.t + gs.h, gs.t, legendObj.yanchor);
+                        }
                     },
                     doneFn: function() {
                         if(xf !== undefined && yf !== undefined) {

diff --git a/src/lib/dom.js b/src/lib/dom.js
@@ -134,6 +134,9 @@ function getElementAndAncestors(element) {
     while(isTransformableElement(element)) {
         allElements.push(element);
         element = element.parentNode;
+        if(typeof ShadowRoot === 'function' && element instanceof ShadowRoot) {
+            element = element.host;
+        }
     }
     return allElements;
 }

diff --git a/stackgl_modules/index.js b/stackgl_modules/index.js
diff --git a/stackgl_modules/package-lock.json b/stackgl_modules/package-lock.json
diff --git a/stackgl_modules/package.json b/stackgl_modules/package.json
@@ -13,21 +13,22 @@
     "box-intersect": "plotly/box-intersect#v1.1.0",
     "convex-hull": "^1.0.3",
     "delaunay-triangulate": "^1.1.6",
-    "gl-axes3d": "^1.7.0",
-    "gl-cone3d": "^1.6.0",
-    "gl-error3d": "^1.0.16",
+    "gl-axes3d": "^1.7.1",
+    "gl-cone3d": "^1.6.1",
+    "gl-error3d": "^1.0.17",
     "gl-heatmap2d": "^1.1.1",
-    "gl-line3d": "1.2.1",
-    "gl-mesh3d": "^2.3.1",
+    "gl-line3d": "^1.2.2",
+    "gl-mesh3d": "^2.3.2",
     "gl-plot2d": "^1.5.0",
     "gl-plot3d": "^2.4.7",
     "gl-pointcloud2d": "^1.0.3",
-    "gl-scatter3d": "^1.4.0",
+    "gl-scatter3d": "^1.4.1",
     "gl-select-box": "^1.0.4",
     "gl-shader": "4.3.1",
     "gl-spikes2d": "^1.0.2",
-    "gl-streamtube3d": "^1.4.1",
-    "gl-surface3d": "^1.6.0",
+    "gl-spikes3d": "^1.0.11",
+    "gl-streamtube3d": "^1.4.2",
+    "gl-surface3d": "^1.6.1",
     "glslify": "^7.1.1",
     "incremental-convex-hull": "plotly/incremental-convex-hull#v1.1.0",
     "is-mobile": "^4.0.0",

diff --git a/test/image/baselines/gl3d_annotations.png b/test/image/baselines/gl3d_annotations.png
diff --git a/test/image/baselines/gl3d_annotations_orthographic.png b/test/image/baselines/gl3d_annotations_orthographic.png
diff --git a/test/image/baselines/gl3d_bunny.png b/test/image/baselines/gl3d_bunny.png
diff --git a/test/image/baselines/gl3d_bunny_cell-area.png b/test/image/baselines/gl3d_bunny_cell-area.png
diff --git a/test/image/baselines/gl3d_chrisp-nan-1.png b/test/image/baselines/gl3d_chrisp-nan-1.png
diff --git a/test/image/baselines/gl3d_coloraxes.png b/test/image/baselines/gl3d_coloraxes.png
diff --git a/test/image/baselines/gl3d_cone-newplot_reversed_ranges.png b/test/image/baselines/gl3d_cone-newplot_reversed_ranges.png
diff --git a/test/image/baselines/gl3d_cone-rossler.png b/test/image/baselines/gl3d_cone-rossler.png
diff --git a/test/image/baselines/gl3d_cone-with-streamtube.png b/test/image/baselines/gl3d_cone-with-streamtube.png
diff --git a/test/image/baselines/gl3d_contour-lines.png b/test/image/baselines/gl3d_contour-lines.png
diff --git a/test/image/baselines/gl3d_contour-lines2.png b/test/image/baselines/gl3d_contour-lines2.png
diff --git a/test/image/baselines/gl3d_convex-hull.png b/test/image/baselines/gl3d_convex-hull.png
diff --git a/test/image/baselines/gl3d_cufflinks.png b/test/image/baselines/gl3d_cufflinks.png
diff --git a/test/image/baselines/gl3d_directions-isosurface2.png b/test/image/baselines/gl3d_directions-isosurface2.png
diff --git a/test/image/baselines/gl3d_directions-streamtube1.png b/test/image/baselines/gl3d_directions-streamtube1.png
diff --git a/test/image/baselines/gl3d_directions-streamtube2.png b/test/image/baselines/gl3d_directions-streamtube2.png
diff --git a/test/image/baselines/gl3d_error_bars_log_2.png b/test/image/baselines/gl3d_error_bars_log_2.png
diff --git a/test/image/baselines/gl3d_ibm-plot.png b/test/image/baselines/gl3d_ibm-plot.png
diff --git a/test/image/baselines/gl3d_isosurface_1single-surface_middle-range.png b/test/image/baselines/gl3d_isosurface_1single-surface_middle-range.png
diff --git a/test/image/baselines/gl3d_isosurface_2surfaces-checker_spaceframe.png b/test/image/baselines/gl3d_isosurface_2surfaces-checker_spaceframe.png
diff --git a/test/image/baselines/gl3d_isosurface_5more-surfaces_between-ranges.png b/test/image/baselines/gl3d_isosurface_5more-surfaces_between-ranges.png
diff --git a/.../image/baselines/gl3d_isosurface_9more-surfaces_between-ranges_orthographic.png b/.../image/baselines/gl3d_isosurface_9more-surfaces_between-ranges_orthographic.png
diff --git a/test/image/baselines/gl3d_isosurface_log-axis_slices_surface-fill.png b/test/image/baselines/gl3d_isosurface_log-axis_slices_surface-fill.png
diff --git a/test/image/baselines/gl3d_isosurface_math.png b/test/image/baselines/gl3d_isosurface_math.png
diff --git a/test/image/baselines/gl3d_isosurface_multiple-traces.png b/test/image/baselines/gl3d_isosurface_multiple-traces.png
diff --git a/test/image/baselines/gl3d_isosurface_out_of_iso_range_case.png b/test/image/baselines/gl3d_isosurface_out_of_iso_range_case.png
diff --git a/test/image/baselines/gl3d_isosurface_thin_caps_different_dims.png b/test/image/baselines/gl3d_isosurface_thin_caps_different_dims.png
diff --git a/test/image/baselines/gl3d_isosurface_thin_slices_transparent.png b/test/image/baselines/gl3d_isosurface_thin_slices_transparent.png
diff --git a/test/image/baselines/gl3d_isosurface_transparent.png b/test/image/baselines/gl3d_isosurface_transparent.png
diff --git a/test/image/baselines/gl3d_isosurface_uneven-scales_ranges_iso-null.png b/test/image/baselines/gl3d_isosurface_uneven-scales_ranges_iso-null.png
diff --git a/test/image/baselines/gl3d_isosurface_xycaps_volume_slices.png b/test/image/baselines/gl3d_isosurface_xycaps_volume_slices.png
diff --git a/test/image/baselines/gl3d_mesh3d-missing-colors.png b/test/image/baselines/gl3d_mesh3d-missing-colors.png
diff --git a/...aselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png b/...aselines/gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges.png
diff --git a/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_orthographic.png b/test/image/baselines/gl3d_mesh3d_surface3d_scatter3d_orthographic.png
diff --git a/test/image/baselines/gl3d_mesh3d_surface_lighting.png b/test/image/baselines/gl3d_mesh3d_surface_lighting.png
diff --git a/test/image/baselines/gl3d_mirror-ticks.png b/test/image/baselines/gl3d_mirror-ticks.png
diff --git a/test/image/baselines/gl3d_opacity-scaling-spikes.png b/test/image/baselines/gl3d_opacity-scaling-spikes.png
diff --git a/test/image/baselines/gl3d_opacity-surface.png b/test/image/baselines/gl3d_opacity-surface.png
diff --git a/test/image/baselines/gl3d_parametric_surface_data_precision.png b/test/image/baselines/gl3d_parametric_surface_data_precision.png
diff --git a/test/image/baselines/gl3d_perspective_tick_distances.png b/test/image/baselines/gl3d_perspective_tick_distances.png
diff --git a/test/image/baselines/gl3d_projection-traces.png b/test/image/baselines/gl3d_projection-traces.png
diff --git a/test/image/baselines/gl3d_reversescale.png b/test/image/baselines/gl3d_reversescale.png
diff --git a/test/image/baselines/gl3d_ribbons.png b/test/image/baselines/gl3d_ribbons.png
diff --git a/test/image/baselines/gl3d_scatter-color-array.png b/test/image/baselines/gl3d_scatter-color-array.png
diff --git a/test/image/baselines/gl3d_scatter-color-line-gradient.png b/test/image/baselines/gl3d_scatter-color-line-gradient.png
diff --git a/test/image/baselines/gl3d_scatter-colorscale-marker.png b/test/image/baselines/gl3d_scatter-colorscale-marker.png
diff --git a/test/image/baselines/gl3d_scatter3d-align-texts.png b/test/image/baselines/gl3d_scatter3d-align-texts.png
diff --git a/test/image/baselines/gl3d_scatter3d-colorscale-with-line.png b/test/image/baselines/gl3d_scatter3d-colorscale-with-line.png
diff --git a/test/image/baselines/gl3d_scatter3d_errorbars_inherit_color.png b/test/image/baselines/gl3d_scatter3d_errorbars_inherit_color.png
diff --git a/.../image/baselines/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.png b/.../image/baselines/gl3d_scatter3d_line3d_error3d_enable-alpha-with-rgba-color.png
diff --git a/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png b/test/image/baselines/gl3d_scatter3d_line3d_error3d_transparent-with-zero-alpha.png
diff --git a/test/image/baselines/gl3d_set-ranges.png b/test/image/baselines/gl3d_set-ranges.png
diff --git a/test/image/baselines/gl3d_snowden.png b/test/image/baselines/gl3d_snowden.png
diff --git a/test/image/baselines/gl3d_snowden_altered.png b/test/image/baselines/gl3d_snowden_altered.png
diff --git a/test/image/baselines/gl3d_streamtube-thin.png b/test/image/baselines/gl3d_streamtube-thin.png
diff --git a/test/image/baselines/gl3d_streamtube_reversed_ranges.png b/test/image/baselines/gl3d_streamtube_reversed_ranges.png
diff --git a/test/image/baselines/gl3d_surface-circular-colorscale.png b/test/image/baselines/gl3d_surface-circular-colorscale.png
diff --git a/test/image/baselines/gl3d_surface-circular-opacityscale.png b/test/image/baselines/gl3d_surface-circular-opacityscale.png
diff --git a/test/image/baselines/gl3d_surface-lighting.png b/test/image/baselines/gl3d_surface-lighting.png
diff --git a/test/image/baselines/gl3d_surface_connectgaps.png b/test/image/baselines/gl3d_surface_connectgaps.png
diff --git a/test/image/baselines/gl3d_surface_contour_precision.png b/test/image/baselines/gl3d_surface_contour_precision.png
diff --git a/test/image/baselines/gl3d_surface_contour_start-end-size.png b/test/image/baselines/gl3d_surface_contour_start-end-size.png
diff --git a/test/image/baselines/gl3d_surface_intensity.png b/test/image/baselines/gl3d_surface_intensity.png
diff --git a/test/image/baselines/gl3d_surface_opacity-and-opacityscale.png b/test/image/baselines/gl3d_surface_opacity-and-opacityscale.png
diff --git a/test/image/baselines/gl3d_surface_opacityscale_contour.png b/test/image/baselines/gl3d_surface_opacityscale_contour.png
diff --git a/test/image/baselines/gl3d_surface_transparent-with-contours.png b/test/image/baselines/gl3d_surface_transparent-with-contours.png
diff --git a/test/image/baselines/gl3d_text-weirdness.png b/test/image/baselines/gl3d_text-weirdness.png
diff --git a/test/image/baselines/gl3d_traces-with-legend.png b/test/image/baselines/gl3d_traces-with-legend.png
diff --git a/test/image/baselines/gl3d_traces-with-opacity.png b/test/image/baselines/gl3d_traces-with-opacity.png
diff --git a/test/image/baselines/gl3d_transparent_same-depth.png b/test/image/baselines/gl3d_transparent_same-depth.png
diff --git a/test/image/baselines/gl3d_volume_airflow.png b/test/image/baselines/gl3d_volume_airflow.png
diff --git a/test/image/baselines/gl3d_volume_multiple-traces.png b/test/image/baselines/gl3d_volume_multiple-traces.png
diff --git a/test/image/baselines/gl3d_volume_multiple-traces_one-cube.png b/test/image/baselines/gl3d_volume_multiple-traces_one-cube.png
diff --git a/test/image/baselines/gl3d_volume_opacityscale-iso.png b/test/image/baselines/gl3d_volume_opacityscale-iso.png
diff --git a/test/image/baselines/gl3d_world-cals.png b/test/image/baselines/gl3d_world-cals.png
diff --git a/test/image/baselines/plot_types.png b/test/image/baselines/plot_types.png
diff --git a/test/image/baselines/trace_metatext.png b/test/image/baselines/trace_metatext.png
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
@@ -178,7 +178,8 @@ for(var i = 0; i < allMockList.length; i++) {
             'gl3d_opacity-scaling-spikes',
             'gl3d_cone-wind',
             'gl3d_isosurface_math',
-            'gl3d_scatter3d-blank-text'
+            'gl3d_scatter3d-blank-text',
+            'gl3d_mesh3d_surface3d_scatter3d_line3d_error3d_log_reversed_ranges'
         ].indexOf(mockName) !== -1) threshold = 0.7;
     }