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

  - resolved conflicts in:
  test/image/mocks/texttemplate.json
  test/image/mocks/texttemplate_scatter.json

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/6992_fix.md

@@ -0,0 +1,3 @@
+ - Fix unicode variable names in @plotly/d3 [[#6992](https://github.com/plotly/plotly.js/pull/6992)],
+   with thanks to @GeorchW for the contribution!
+

package-lock.json

@@ -71,7 +71,7 @@
     ]
   },
   "dependencies": {
-    "@plotly/d3": "3.8.1",
+    "@plotly/d3": "3.8.2",
     "@plotly/d3-sankey": "0.7.2",
     "@plotly/d3-sankey-circular": "0.33.1",
     "@plotly/mapbox-gl": "1.13.4",

package.json

@@ -102,6 +102,8 @@ exports.valObjectMeta = {
         requiredOpts: [],
         otherOpts: ['dflt', 'min', 'max', 'arrayOk'],
         coerceFunction: function(v, propOut, dflt, opts) {
+            if(isTypedArraySpec(v)) v = decodeTypedArraySpec(v);
+
             if(!isNumeric(v) ||
                     (opts.min !== undefined && v < opts.min) ||
                     (opts.max !== undefined && v > opts.max)) {
@@ -116,8 +118,15 @@ exports.valObjectMeta = {
             'are coerced to the `dflt`.'
         ].join(' '),
         requiredOpts: [],
-        otherOpts: ['dflt', 'min', 'max', 'arrayOk'],
+        otherOpts: ['dflt', 'min', 'max', 'arrayOk', 'extras'],
         coerceFunction: function(v, propOut, dflt, opts) {
+            if((opts.extras || []).indexOf(v) !== -1) {
+                propOut.set(v);
+                return;
+            }
+
+            if(isTypedArraySpec(v)) v = decodeTypedArraySpec(v);
+
             if(v % 1 || !isNumeric(v) ||
                     (opts.min !== undefined && v < opts.min) ||
                     (opts.max !== undefined && v > opts.max)) {
@@ -158,6 +167,8 @@ exports.valObjectMeta = {
         requiredOpts: [],
         otherOpts: ['dflt', 'arrayOk'],
         coerceFunction: function(v, propOut, dflt) {
+            if(isTypedArraySpec(v)) v = decodeTypedArraySpec(v);
+
             if(tinycolor(v).isValid()) propOut.set(v);
             else propOut.set(dflt);
         }
@@ -200,6 +211,8 @@ exports.valObjectMeta = {
         requiredOpts: [],
         otherOpts: ['dflt', 'arrayOk'],
         coerceFunction: function(v, propOut, dflt) {
+            if(isTypedArraySpec(v)) v = decodeTypedArraySpec(v);
+
             if(v === 'auto') propOut.set('auto');
             else if(!isNumeric(v)) propOut.set(dflt);
             else propOut.set(modHalf(+v, 360));

src/lib/coerce.js

@@ -20,6 +20,27 @@ module.exports = function(opts) {
     var editType = opts.editType;
     var colorEditType = opts.colorEditType;
     if(colorEditType === undefined) colorEditType = editType;
+
+    var weight = {
+        editType: editType,
+        valType: 'integer',
+        min: 1,
+        max: 1000,
+        extras: ['normal', 'bold'],
+        dflt: 'normal',
+        description: [
+            'Sets the weight (or boldness) of the font.'
+        ].join(' ')
+    };
+
+    if(opts.noNumericWeightValues) {
+        weight.valType = 'enumerated';
+        weight.values = weight.extras;
+        weight.extras = undefined;
+        weight.min = undefined;
+        weight.max = undefined;
+    }
+
     var attrs = {
         family: {
             valType: 'string',
@@ -49,15 +70,7 @@ module.exports = function(opts) {
             editType: colorEditType
         },
 
-        weight: {
-            editType: editType,
-            valType: 'enumerated',
-            values: ['normal', 'bold'],
-            dflt: 'normal',
-            description: [
-                'Sets the weight (or boldness) of the font.'
-            ].join(' ')
-        },
+        weight: weight,
 
         style: {
             editType: editType,

src/plots/font_attributes.js

@@ -107,7 +107,7 @@ module.exports = function toSVG(gd, format, scale) {
 
             // Drop normal font-weight, font-style and font-variant to reduce the size
             var fw = this.style.fontWeight;
-            if(fw && fw === 'normal') {
+            if(fw && (fw === 'normal' || fw === '400')) { // font-weight 400 is similar to normal
                 txt.style('font-weight', undefined);
             }
             var fs = this.style.fontStyle;

src/snapshot/tosvg.js

@@ -44,6 +44,7 @@ var attrs = module.exports = overrideAll({
         editType: 'calc',
         colorEditType: 'style',
         arrayOk: true,
+        noNumericWeightValues: true,
         variantValues: ['normal', 'small-caps'],
         description: 'Sets the text font.'
     }),

src/traces/scattergl/attributes.js

@@ -190,7 +190,7 @@ function convertTextStyle(gd, trace) {
     if(
         isArrayOrTypedArray(tfs) ||
         Array.isArray(tff) ||
-        Array.isArray(tfw) ||
+        isArrayOrTypedArray(tfw) ||
         Array.isArray(tfy) ||
         Array.isArray(tfv)
     ) {
@@ -207,7 +207,7 @@ function convertTextStyle(gd, trace) {
             ) * plotGlPixelRatio;
 
             fonti.family = Array.isArray(tff) ? tff[i] : tff;
-            fonti.weight = Array.isArray(tfw) ? tfw[i] : tfw;
+            fonti.weight = weightFallBack(isArrayOrTypedArray(tfw) ? tfw[i] : tfw);
             fonti.style = Array.isArray(tfy) ? tfy[i] : tfy;
             fonti.variant = Array.isArray(tfv) ? tfv[i] : tfv;
         }
@@ -216,7 +216,7 @@ function convertTextStyle(gd, trace) {
         optsOut.font = {
             size: tfs * plotGlPixelRatio,
             family: tff,
-            weight: tfw,
+            weight: weightFallBack(tfw),
             style: tfy,
             variant: tfv
         };
@@ -225,6 +225,14 @@ function convertTextStyle(gd, trace) {
     return optsOut;
 }
 
+// scattergl rendering pipeline has limited support of numeric weight values
+// Here we map the numbers to be either bold or normal.
+function weightFallBack(w) {
+    if(w <= 1000) {
+        return w > 500 ? 'bold' : 'normal';
+    }
+    return w;
+}
 
 function convertMarkerStyle(gd, trace) {
     var count = trace._length;

src/traces/scattergl/convert.js

@@ -0,0 +1,45 @@
+'use strict';
+
+// Must use one of the following fonts as the family, else default to 'Open Sans Regular'
+// See https://github.com/openmaptiles/fonts/blob/gh-pages/fontstacks.json
+var supportedFonts = [
+    'Metropolis Black Italic',
+    'Metropolis Black',
+    'Metropolis Bold Italic',
+    'Metropolis Bold',
+    'Metropolis Extra Bold Italic',
+    'Metropolis Extra Bold',
+    'Metropolis Extra Light Italic',
+    'Metropolis Extra Light',
+    'Metropolis Light Italic',
+    'Metropolis Light',
+    'Metropolis Medium Italic',
+    'Metropolis Medium',
+    'Metropolis Regular Italic',
+    'Metropolis Regular',
+    'Metropolis Semi Bold Italic',
+    'Metropolis Semi Bold',
+    'Metropolis Thin Italic',
+    'Metropolis Thin',
+    'Open Sans Bold Italic',
+    'Open Sans Bold',
+    'Open Sans Extrabold Italic',
+    'Open Sans Extrabold',
+    'Open Sans Italic',
+    'Open Sans Light Italic',
+    'Open Sans Light',
+    'Open Sans Regular',
+    'Open Sans Semibold Italic',
+    'Open Sans Semibold',
+    'Klokantech Noto Sans Bold',
+    'Klokantech Noto Sans CJK Bold',
+    'Klokantech Noto Sans CJK Regular',
+    'Klokantech Noto Sans Italic',
+    'Klokantech Noto Sans Regular'
+];
+
+module.exports = {
+    isSupportedFont: function(a) {
+        return supportedFonts.indexOf(a) !== -1;
+    }
+};