add bold and italic to scattermapbox

Author: archmoj

src/lib/coerce.js

@@ -471,8 +471,8 @@ exports.coerceFont = function(coerce, attr, dfltObj, opts) {
     out.size = coerce(attr + '.size', dfltObj.size);
     out.color = coerce(attr + '.color', dfltObj.color);
 
-    if(!opts.noWeight) out.weight = coerce(attr + '.weight', dfltObj.weight);
-    if(!opts.noStyle) out.style = coerce(attr + '.style', dfltObj.style);
+    out.weight = coerce(attr + '.weight', dfltObj.weight);
+    out.style = coerce(attr + '.style', dfltObj.style);
     if(!opts.noVariant) out.variant = coerce(attr + '.variant', dfltObj.variant);
 
     return out;

src/plots/font_attributes.js

@@ -71,7 +71,7 @@ module.exports = function(opts) {
             ].join(' ')
         },
 
-        variant: {
+        variant: opts.noVariant ? undefined : {
             editType: editType,
             valType: 'enumerated',
             values: variantValues || [

src/plots/mapbox/layout_attributes.js

@@ -11,15 +11,13 @@ var templatedArray = require('../../plot_api/plot_template').templatedArray;
 var constants = require('./constants');
 
 var fontAttr = fontAttrs({
+    noVariant: true,
     description: [
         'Sets the icon text font (color=mapbox.layer.paint.text-color, size=mapbox.layer.layout.text-size).',
         'Has an effect only when `type` is set to *symbol*.'
     ].join(' ')
 });
 fontAttr.family.dflt = 'Open Sans Regular, Arial Unicode MS Regular';
-delete fontAttr.weight;
-delete fontAttr.style;
-delete fontAttr.variant;
 
 var attrs = module.exports = overrideAll({
     _arrayAttrRegexps: [Lib.counterRegex('mapbox', '.layers', true)],

src/traces/scatter/text_defaults.js

@@ -11,8 +11,6 @@ module.exports = function(traceIn, traceOut, layout, coerce, opts) {
 
     coerce('textposition');
     Lib.coerceFont(coerce, 'textfont', opts.font || layout.font, {
-        noWeight: opts.noFontWeight,
-        noStyle: opts.noFontStyle,
         noVariant: opts.noFontVariant
     });
 

src/traces/scattermapbox/convert.js

@@ -146,16 +146,23 @@ module.exports = function convert(gd, calcTrace) {
         }
 
         if(hasText) {
+            var font = trace.textfont;
+            var str = '';
+            if(font.weight === 'bold') str += ' Bold';
+            if(font.style === 'italic') str += ' Italic';
+            var textFont = font.family;
+            if(str) textFont = textFont.replace(' Regular', str);
+            textFont = textFont.split(', ');
+
             var iconSize = (trace.marker || {}).size;
             var textOpts = convertTextOpts(trace.textposition, iconSize);
 
             // all data-driven below !!
-
             Lib.extendFlat(symbol.layout, {
                 'text-size': trace.textfont.size,
                 'text-anchor': textOpts.anchor,
                 'text-offset': textOpts.offset,
-                'text-font': trace.textfont.family.split(', '),
+                'text-font': textFont
             });
 
             Lib.extendFlat(symbol.paint, {

src/traces/scattermapbox/defaults.js

@@ -107,11 +107,11 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
         handleTextDefaults(traceIn, traceOut, layout, coerce,
             {
                 noSelect: true,
-                noFontWeight: true,
-                noFontStyle: true,
                 noFontVariant: true,
                 font: {
                     family: supportedFonts.indexOf(layout.font.family) !== -1 ? layout.font.family : 'Open Sans Regular',
+                    weight: layout.font.weight,
+                    style: layout.font.style,
                     size: layout.font.size,
                     color: layout.font.color
                 }

test/image/baselines/mapbox_bubbles-text.png

@@ -32,6 +32,8 @@
       ],
       "textposition": "top left",
       "textfont": {
+        "weight": "bold",
+        "style": "italic",
         "size": 20,
         "color": "red"
       }

test/image/mocks/mapbox_bubbles-text.json

@@ -3780,6 +3780,28 @@
           "editType": "plot",
           "min": 1,
           "valType": "number"
+         },
+         "style": {
+          "description": "Sets whether a font should be styled with a normal or italic face from its family.",
+          "dflt": "normal",
+          "editType": "plot",
+          "valType": "enumerated",
+          "values": [
+           "normal",
+           "italic"
+          ]
+         },
+         "weight": {
+          "description": "Sets the weight (or boldness) of the font.",
+          "dflt": "normal",
+          "editType": "plot",
+          "extras": [
+           "normal",
+           "bold"
+          ],
+          "max": 1000,
+          "min": 1,
+          "valType": "integer"
          }
         },
         "textposition": {
@@ -66656,6 +66678,28 @@
       "editType": "calc",
       "min": 1,
       "valType": "number"
+     },
+     "style": {
+      "description": "Sets whether a font should be styled with a normal or italic face from its family.",
+      "dflt": "normal",
+      "editType": "calc",
+      "valType": "enumerated",
+      "values": [
+       "normal",
+       "italic"
+      ]
+     },
+     "weight": {
+      "description": "Sets the weight (or boldness) of the font.",
+      "dflt": "normal",
+      "editType": "calc",
+      "extras": [
+       "normal",
+       "bold"
+      ],
+      "max": 1000,
+      "min": 1,
+      "valType": "integer"
      }
     },
     "textposition": {