Merge remote-tracking branch 'origin/master' into font-shadow-striding-capitalize

 - Resolved sonflicts in test/image/baselines/trace_metatext.png

Author: archmoj

draftlogs/6996_fix.md

@@ -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) {

draftlogs/6997_fix.md

@@ -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;
 }

draftlogs/6998_fix.md

@@ -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",