Merge remote-tracking branch 'origin/master' into clickable-legend-group-titles

Author: archmoj

.circleci/download_google_fonts.py

@@ -10,15 +10,6 @@ def download(repo, family, types) :
         req = requests.get(url, allow_redirects=True)
         open(dirOut + name, 'wb').write(req.content)
 
-download(
-    'https://github.com/eliheuer/dosis-vf/blob/master/fonts/static-fonts/',
-    'Dosis',
-    [
-        '-Regular',
-        '-Bold'
-    ]
-)
-
 download(
     'https://github.com/googlefonts/noto-fonts/blob/main/hinted/ttf/NotoSansMono/',
     'NotoSansMono',

CONTRIBUTING.md

@@ -84,21 +84,33 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
   [`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
   used and updated correctly.
 
-#### Step 1: Clone the plotly.js repo and install its dependencies
+#### Step 1: Fork the plotly.js repository, clone your fork and step into it
 
 ```bash
-git clone https://github.com/plotly/plotly.js.git
+git clone --depth 1 git@github.com:<your-GitHub-username>/plotly.js.git
 cd plotly.js
+```
+
+#### Step 2: Switch to a dev branch
+
+```bash
+# please do not use master or main for your dev branch
+git checkout dev-branch-name
+```
+
+#### Step 3: Install dependencies
+
+```bash
 npm install
 ```
 
-#### Step 2: Setup test environment
+#### Step 4: Setup test environment
 
 ```bash
 npm run pretest
 ```
 
-#### Step 3: Start the test dashboard
+#### Step 5: Start the test dashboard
 
 ```bash
 npm start
@@ -110,7 +122,7 @@ This command bundles up the source files with source maps using
 dev plotly.js bundle update every time a source file is saved) and opens up a
 tab in your browser.
 
-#### Step 4: Open up the console and start developing
+#### Step 6: Open up the console and start developing
 
 A typical workflow is to make some modifications to the source, update the
 test dashboard, inspect and debug the changes, then repeat. The test dashboard
@@ -138,13 +150,13 @@ Three additional helpers exist that are refreshed every second:
 There is also a search bar in the top right of the dashboard. This fuzzy-searches
 image mocks based on their file name and trace type.
 
-#### Step 5: Regenerate plot-schema in "test" folder then review & commit potential changes
+#### Step 7: Regenerate plot-schema in "test" folder then review & commit potential changes
 
 ```bash
 npm run schema
 ```
 
-#### Step 6: Review & commit potential changes made to test/plot-schema.json
+#### Step 8: Review & commit potential changes made to test/plot-schema.json
 
 > If you are editing attribute descriptions or implementing a new feature this file located in the test folder records the proposed changes to the API. Note that there is another plot-schema.json file located in the dist folder, which should only be updated by the maintainers at release time.
 

draftlogs/5791_change.md

@@ -0,0 +1 @@
+ - Adjust CONTRIBUTING document on how to clone plotly.js and submit pull requests from your fork [[#5791](https://github.com/plotly/plotly.js/pull/5791)]

draftlogs/5813_change.md

@@ -0,0 +1 @@
+ - Sort object key values in schema [[#5813](https://github.com/plotly/plotly.js/pull/5813)]

src/components/calendars/index.js

@@ -10,7 +10,7 @@ var ONEDAY = constants.ONEDAY;
 
 var attributes = {
     valType: 'enumerated',
-    values: Object.keys(calendars.calendars),
+    values: Lib.sortObjectKeys(calendars.calendars),
     editType: 'calc',
     dflt: 'gregorian'
 };

src/components/colorscale/attributes.js

@@ -2,9 +2,10 @@
 
 var colorbarAttrs = require('../colorbar/attributes');
 var counterRegex = require('../../lib/regex').counter;
+var sortObjectKeys = require('../../lib/sort_object_keys');
 
 var palettes = require('./scales.js').scales;
-var paletteStr = Object.keys(palettes);
+var paletteStr = sortObjectKeys(palettes);
 
 function code(s) {
     return '`' + s + '`';

src/lib/index.js

@@ -67,6 +67,8 @@ lib.roundUp = searchModule.roundUp;
 lib.sort = searchModule.sort;
 lib.findIndexOfMin = searchModule.findIndexOfMin;
 
+lib.sortObjectKeys = require('./sort_object_keys');
+
 var statsModule = require('./stats');
 lib.aggNums = statsModule.aggNums;
 lib.len = statsModule.len;

src/lib/sort_object_keys.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = function sortObjectKeys(obj) {
+    return Object.keys(obj).sort();
+};

src/plots/geo/layout_attributes.js

@@ -4,6 +4,7 @@ var colorAttrs = require('../../components/color/attributes');
 var domainAttrs = require('../domain').attributes;
 var constants = require('./constants');
 var overrideAll = require('../../plot_api/edit_types').overrideAll;
+var sortObjectKeys = require('../../lib/sort_object_keys');
 
 var geoAxesAttrs = {
     range: {
@@ -100,14 +101,14 @@ var attrs = module.exports = overrideAll({
     },
     scope: {
         valType: 'enumerated',
-        values: Object.keys(constants.scopeDefaults),
+        values: sortObjectKeys(constants.scopeDefaults),
         dflt: 'world',
         description: 'Set the scope of the map.'
     },
     projection: {
         type: {
             valType: 'enumerated',
-            values: Object.keys(constants.projNames),
+            values: sortObjectKeys(constants.projNames),
             description: 'Sets the projection type.'
         },
         rotation: {

src/plots/mapbox/constants.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var sortObjectKeys = require('../../lib/sort_object_keys');
+
 var requiredVersion = '1.10.1';
 
 var OSM = '© <a target="_blank" href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors';
@@ -156,7 +158,7 @@ var stylesNonMapbox = {
     }
 };
 
-var styleValuesNonMapbox = Object.keys(stylesNonMapbox);
+var styleValuesNonMapbox = sortObjectKeys(stylesNonMapbox);
 
 module.exports = {
     requiredVersion: requiredVersion,

src/traces/scatter3d/attributes.js

@@ -11,6 +11,7 @@ var DASHES = require('../../constants/gl3d_dashes');
 var MARKER_SYMBOLS = require('../../constants/gl3d_markers');
 var extendFlat = require('../../lib/extend').extendFlat;
 var overrideAll = require('../../plot_api/edit_types').overrideAll;
+var sortObjectKeys = require('../../lib/sort_object_keys');
 
 var scatterLineAttrs = scatterAttrs.line;
 var scatterMarkerAttrs = scatterAttrs.marker;
@@ -20,7 +21,7 @@ var lineAttrs = extendFlat({
     width: scatterLineAttrs.width,
     dash: {
         valType: 'enumerated',
-        values: Object.keys(DASHES),
+        values: sortObjectKeys(DASHES),
         dflt: 'solid',
         description: 'Sets the dash style of the lines.'
     }
@@ -122,7 +123,7 @@ var attrs = module.exports = overrideAll({
     marker: extendFlat({  // Parity with scatter.js?
         symbol: {
             valType: 'enumerated',
-            values: Object.keys(MARKER_SYMBOLS),
+            values: sortObjectKeys(MARKER_SYMBOLS),
             dflt: 'circle',
             arrayOk: true,
             description: 'Sets the marker symbol type.'

src/traces/scattergl/attributes.js

@@ -5,6 +5,7 @@ var scatterAttrs = require('../scatter/attributes');
 var axisHoverFormat = require('../../plots/cartesian/axis_format_attributes').axisHoverFormat;
 var colorScaleAttrs = require('../../components/colorscale/attributes');
 
+var sortObjectKeys = require('../../lib/sort_object_keys');
 var extendFlat = require('../../lib/extend').extendFlat;
 var overrideAll = require('../../plot_api/edit_types').overrideAll;
 var DASHES = require('./constants').DASHES;
@@ -59,7 +60,7 @@ var attrs = module.exports = overrideAll({
         },
         dash: {
             valType: 'enumerated',
-            values: Object.keys(DASHES),
+            values: sortObjectKeys(DASHES),
             dflt: 'solid',
             description: 'Sets the style of the lines.'
         }

test/image/baselines/gl3d_indicator_scatter3d.png

@@ -30,7 +30,7 @@
     },
     "font": {
       "color": "white",
-      "family": "Dosis"
+      "family": "Raleway"
     },
     "paper_bgcolor": "black",
     "margin": {

test/image/baselines/indicator_bignumber.png

@@ -109,7 +109,7 @@
     "paper_bgcolor": "black",
     "font": {
       "color": "white",
-      "family": "Dosis"
+      "family": "Raleway"
     },
     "margin": {
       "t": 25,

test/image/baselines/indicator_scatter.png

@@ -33,7 +33,7 @@
     },
     "font": {
       "color": "white",
-      "family": "Dosis"
+      "family": "Raleway"
     },
     "paper_bgcolor": "black",
     "plot_bgcolor": "black",