limit variant options for scattergl and scatter3d - arrayOk scatter3d family supported now

Author: archmoj

src/plots/font_attributes.js

@@ -16,6 +16,7 @@
  * @return {object} attributes object containing {family, size, color} as specified
  */
 module.exports = function(opts) {
+    var variantValues = opts.variantValues;
     var editType = opts.editType;
     var colorEditType = opts.colorEditType;
     if(colorEditType === undefined) colorEditType = editType;
@@ -73,12 +74,9 @@ module.exports = function(opts) {
         variant: {
             editType: editType,
             valType: 'enumerated',
-            values: [
+            values: variantValues || [
                 'normal',
                 'small-caps',
-                // In WebGL-based traces e.g scattergl and scatter3d,
-                // the only options are *normal* and *small-caps*.
-
                 'all-small-caps',
                 'all-petite-caps',
                 'petite-caps',

src/traces/scatter3d/attributes.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var scatterAttrs = require('../scatter/attributes');
+var fontAttrs = require('../../plots/font_attributes');
 var colorAttributes = require('../../components/colorscale/attributes');
 var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
 var hovertemplateAttrs = require('../../plots/template_attributes').hovertemplateAttrs;
@@ -155,14 +156,13 @@ var attrs = module.exports = overrideAll({
     ),
 
     textposition: extendFlat({}, scatterAttrs.textposition, {dflt: 'top center'}),
-    textfont: {
-        color: scatterAttrs.textfont.color,
-        size: scatterAttrs.textfont.size,
-        weight: scatterAttrs.textfont.weight,
-        style: scatterAttrs.textfont.style,
-        variant: scatterAttrs.textfont.variant,
-        family: extendFlat({}, scatterAttrs.textfont.family, {arrayOk: false})
-    },
+    textfont: fontAttrs({
+        editType: 'calc',
+        colorEditType: 'style',
+        arrayOk: true,
+        variantValues: ['normal', 'small-caps'],
+        description: 'Sets the text font.'
+    }),
 
     opacity: baseAttrs.opacity,
 

src/traces/scattergl/attributes.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var baseAttrs = require('../../plots/attributes');
+var fontAttrs = require('../../plots/font_attributes');
 var makeFillcolorAttr = require('../scatter/fillcolor_attribute');
 var scatterAttrs = require('../scatter/attributes');
 var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
@@ -36,7 +37,13 @@ var attrs = module.exports = overrideAll({
     hovertext: scatterAttrs.hovertext,
 
     textposition: scatterAttrs.textposition,
-    textfont: scatterAttrs.textfont,
+    textfont: fontAttrs({
+        editType: 'calc',
+        colorEditType: 'style',
+        arrayOk: true,
+        variantValues: ['normal', 'small-caps'],
+        description: 'Sets the text font.'
+    }),
 
     mode: {
         valType: 'flaglist',

test/plot-schema.json

@@ -58297,15 +58297,21 @@
       "editType": "none",
       "valType": "string"
      },
+     "description": "Sets the text font.",
      "editType": "calc",
      "family": {
-      "arrayOk": false,
+      "arrayOk": true,
       "description": "HTML font family - the typeface that will be applied by the web browser. The web browser will only be able to apply a font if it is available on the system which it operates. Provide multiple font families, separated by commas, to indicate the preference in which to apply fonts if they aren't available on the system. The Chart Studio Cloud (at https://chart-studio.plotly.com or on-premise) generates images on a server, where only a select number of fonts are installed and supported. These include *Arial*, *Balto*, *Courier New*, *Droid Sans*,, *Droid Serif*, *Droid Sans Mono*, *Gravitas One*, *Old Standard TT*, *Open Sans*, *Overpass*, *PT Sans Narrow*, *Raleway*, *Times New Roman*.",
       "editType": "calc",
       "noBlank": true,
       "strict": true,
       "valType": "string"
      },
+     "familysrc": {
+      "description": "Sets the source reference on Chart Studio Cloud for `family`.",
+      "editType": "none",
+      "valType": "string"
+     },
      "role": "object",
      "size": {
       "arrayOk": true,
@@ -58342,11 +58348,7 @@
       "valType": "enumerated",
       "values": [
        "normal",
-       "small-caps",
-       "all-small-caps",
-       "all-petite-caps",
-       "petite-caps",
-       "unicase"
+       "small-caps"
       ]
      },
      "variantsrc": {
@@ -65012,11 +65014,7 @@
       "valType": "enumerated",
       "values": [
        "normal",
-       "small-caps",
-       "all-small-caps",
-       "all-petite-caps",
-       "petite-caps",
-       "unicase"
+       "small-caps"
       ]
      },
      "variantsrc": {
@@ -70884,11 +70882,7 @@
       "valType": "enumerated",
       "values": [
        "normal",
-       "small-caps",
-       "all-small-caps",
-       "all-petite-caps",
-       "petite-caps",
-       "unicase"
+       "small-caps"
       ]
      },
      "variantsrc": {