Merge remote-tracking branch 'origin/master' into build-with-esbuild

Author: archmoj

draftlogs/6990_add.md

@@ -0,0 +1 @@
+ - Add support for numeric text font `weight` [[#6990](https://github.com/plotly/plotly.js/pull/6990)]

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!

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!

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!

src/components/annotations/draw.js

@@ -198,7 +198,10 @@ function drawRaw(gd, options, index, subplotId, xa, ya) {
                 fontColor: hoverFont.color,
                 fontWeight: hoverFont.weight,
                 fontStyle: hoverFont.style,
-                fontVariant: hoverFont.variant
+                fontVariant: hoverFont.variant,
+                fontShadow: hoverFont.fontShadow,
+                fontLineposition: hoverFont.fontLineposition,
+                fontTextcase: hoverFont.fontTextcase,
             }, {
                 container: fullLayout._hoverlayer.node(),
                 outerContainer: fullLayout._paper.node(),

src/components/colorbar/defaults.js

@@ -124,11 +124,9 @@ module.exports = function colorbarDefaults(containerIn, containerOut, layout) {
     coerce('title.text', layout._dfltTitle.colorbar);
 
     var tickFont = colorbarOut.showticklabels ? colorbarOut.tickfont : font;
-    var dfltTitleFont = Lib.extendFlat({}, tickFont, {
-        weight: font.weight,
-        style: font.style,
-        variant: font.variant,
-        color: font.color,
+
+    var dfltTitleFont = Lib.extendFlat({}, font, {
+        family: tickFont.family,
         size: Lib.bigFont(tickFont.size)
     });
     Lib.coerceFont(coerce, 'title.font', dfltTitleFont);

src/components/drawing/index.js

@@ -34,6 +34,9 @@ drawing.font = function(s, font) {
     var color = font.color;
     var size = font.size;
     var family = font.family;
+    var shadow = font.shadow;
+    var lineposition = font.lineposition;
+    var textcase = font.textcase;
 
     if(family) s.style('font-family', family);
     if(size + 1) s.style('font-size', size + 'px');
@@ -42,8 +45,38 @@ drawing.font = function(s, font) {
     if(weight) s.style('font-weight', weight);
     if(style) s.style('font-style', style);
     if(variant) s.style('font-variant', variant);
+
+    if(textcase) s.style('text-transform', dropNone(textcase2transform(textcase)));
+    if(shadow) s.style('text-shadow', shadow === 'auto' ? svgTextUtils.makeTextShadow(Color.contrast(color)) : dropNone(shadow));
+    if(lineposition) s.style('text-decoration-line', dropNone(lineposition2decorationLine(lineposition)));
+};
+
+function dropNone(a) {
+    return a === 'none' ? undefined : a;
+}
+
+var textcase2transformOptions = {
+    normal: 'none',
+    lower: 'lowercase',
+    upper: 'uppercase',
+    'word caps': 'capitalize'
 };
 
+function textcase2transform(textcase) {
+    return textcase2transformOptions[textcase];
+}
+
+function lineposition2decorationLine(lineposition) {
+    return (
+        lineposition
+            .replace('under', 'underline')
+            .replace('over', 'overline')
+            .replace('through', 'line-through')
+            .split('+')
+            .join(' ')
+    );
+}
+
 /*
  * Positioning helpers
  * Note: do not use `setPosition` with <text> nodes modified by
@@ -1136,6 +1169,9 @@ drawing.textPointStyle = function(s, trace, gd) {
             weight: d.tw || trace.textfont.weight,
             style: d.ty || trace.textfont.style,
             variant: d.tv || trace.textfont.variant,
+            textcase: d.tC || trace.textfont.textcase,
+            lineposition: d.tE || trace.textfont.lineposition,
+            shadow: d.tS || trace.textfont.shadow,
             size: fontSize,
             color: fontColor
         })

src/components/fx/hover.js

@@ -961,6 +961,9 @@ function createHoverText(hoverData, opts) {
     var fontWeight = opts.fontWeight || fullLayout.font.weight;
     var fontStyle = opts.fontStyle || fullLayout.font.style;
     var fontVariant = opts.fontVariant || fullLayout.font.variant;
+    var fontTextcase = opts.fontTextcase || fullLayout.font.textcase;
+    var fontLineposition = opts.fontLineposition || fullLayout.font.lineposition;
+    var fontShadow = opts.fontShadow || fullLayout.font.shadow;
 
     var c0 = hoverData[0];
     var xa = c0.xa;
@@ -1041,13 +1044,17 @@ function createHoverText(hoverData, opts) {
         var commonBgColor = commonLabelOpts.bgcolor || Color.defaultLine;
         var commonStroke = commonLabelOpts.bordercolor || Color.contrast(commonBgColor);
         var contrastColor = Color.contrast(commonBgColor);
+        var commonLabelOptsFont = commonLabelOpts.font;
         var commonLabelFont = {
-            weight: commonLabelOpts.font.weight || fontWeight,
-            style: commonLabelOpts.font.style || fontStyle,
-            variant: commonLabelOpts.font.variant || fontVariant,
-            family: commonLabelOpts.font.family || fontFamily,
-            size: commonLabelOpts.font.size || fontSize,
-            color: commonLabelOpts.font.color || contrastColor
+            weight: commonLabelOptsFont.weight || fontWeight,
+            style: commonLabelOptsFont.style || fontStyle,
+            variant: commonLabelOptsFont.variant || fontVariant,
+            textcase: commonLabelOptsFont.textcase || fontTextcase,
+            lineposition: commonLabelOptsFont.lineposition || fontLineposition,
+            shadow: commonLabelOptsFont.shadow || fontShadow,
+            family: commonLabelOptsFont.family || fontFamily,
+            size: commonLabelOptsFont.size || fontSize,
+            color: commonLabelOptsFont.color || contrastColor
         };
 
         lpath.style({
@@ -1370,6 +1377,9 @@ function createHoverText(hoverData, opts) {
                     weight: fontWeight,
                     style: fontStyle,
                     variant: fontVariant,
+                    textcase: fontTextcase,
+                    lineposition: fontLineposition,
+                    shadow: fontShadow,
                     family: fontFamily,
                     size: fontSize
                 });
@@ -1413,7 +1423,10 @@ function createHoverText(hoverData, opts) {
                 color: d.fontColor || contrastColor,
                 weight: d.fontWeight || fontWeight,
                 style: d.fontStyle || fontStyle,
-                variant: d.fontVariant || fontVariant
+                variant: d.fontVariant || fontVariant,
+                textcase: d.fontTextcase || fontTextcase,
+                lineposition: d.fontLineposition || fontLineposition,
+                shadow: d.fontShadow || fontShadow,
             })
             .text(text)
             .attr('data-notex', 1)
@@ -1432,7 +1445,10 @@ function createHoverText(hoverData, opts) {
                 color: nameColor,
                 weight: d.fontWeight || fontWeight,
                 style: d.fontStyle || fontStyle,
-                variant: d.fontVariant || fontVariant
+                variant: d.fontVariant || fontVariant,
+                textcase: d.fontTextcase || fontTextcase,
+                lineposition: d.fontLineposition || fontLineposition,
+                shadow: d.fontShadow || fontShadow,
             }).text(name)
                 .attr('data-notex', 1)
                 .call(svgTextUtils.positionText, 0, 0)

src/components/legend/defaults.js

@@ -33,9 +33,9 @@ function groupDefaults(legendId, layoutIn, layoutOut, fullData) {
     };
 
     var globalFont = layoutOut.font || {};
-    var grouptitlefont = Lib.coerceFont(coerce, 'grouptitlefont', Lib.extendFlat({}, globalFont, {
+    var grouptitlefont = Lib.coerceFont(coerce, 'grouptitlefont', globalFont, { overrideDflt: {
         size: Math.round(globalFont.size * 1.1)
-    }));
+    }});
 
     var legendTraceCount = 0;
     var legendReallyHasATrace = false;

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