Merge remote-tracking branch 'origin/master' into parcoords-constraintrange-valtype

Author: archmoj

.circleci/config.yml

@@ -185,18 +185,34 @@ jobs:
           command: .circleci/env_build.sh
       - run:
           name: Preview CHANGELOG for next release (only on master)
-          command: if [ $CIRCLE_BRANCH == "master" ]; then npm run use-draftlogs && git --no-pager diff --color-words CHANGELOG.md || true; fi
+          command: |
+            if [ $CIRCLE_BRANCH == "master" ]
+              then npm run use-draftlogs && git --no-pager diff --color-words CHANGELOG.md || true
+            fi
+      - run:
+          name: Set draft version in package.json
+          command: |
+            node --eval "var fs = require('fs'); var inOut = './package.json'; var data = JSON.parse(fs.readFileSync(inOut)); var a = process.argv; data.version = a[a.length - 1].replace('v', ''); fs.writeFileSync(inOut, JSON.stringify(data, null, 2) + '\n');" `git describe`
+      - run:
+          name: View package.json diff between previous and next releases (including above draft version change)
+          command: git --no-pager diff --color-words tags/$(git describe --tags --abbrev=0) package.json || true
       - run:
           name: Build dist/
           command: npm run build
       - store_artifacts:
           path: dist
           destination: dist
+      - run:
+          name: Preview plot-schema diff between previous and next releases (only on master)
+          command: |
+            if [ $CIRCLE_BRANCH == "master" ]
+              then git --no-pager diff tags/$(git describe --tags --abbrev=0) dist/plot-schema.json || true
+            fi
       - run:
           name: Pack tarball
           command: |
             npm pack
-            version=$(node -e "console.log(require('./package.json').version)")
+            version=$(node --eval "console.log(require('./package.json').version)")
             mv plotly.js-$version.tgz plotly.js.tgz
       - store_artifacts:
           path: plotly.js.tgz

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

@@ -0,0 +1 @@
+ - Improve rendering of scattergl, splom and parcoords by implementing plotGlPixelRatio for those traces [[#5500](https://github.com/plotly/plotly.js/pull/5500)]

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/5801_add.md

@@ -0,0 +1 @@
+ - Add satellite and various projection types to geo subplots [[#5801](https://github.com/plotly/plotly.js/pull/5801)]

draftlogs/5813_change.md

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

draftlogs/5814_add.md

@@ -0,0 +1 @@
+ - Preview plot-schema changes between previous and next release when building dist on master [[#5814](https://github.com/plotly/plotly.js/pull/5814)]

draftlogs/5815_change.md

@@ -0,0 +1 @@
+ - Label draft bundles and show package.json diff between versions when publishing dist artifacts on CircleCI [[#5815](https://github.com/plotly/plotly.js/pull/5815)]

draftlogs/5818_fix.md

@@ -0,0 +1 @@
+ - Adjust links to time format options so that they point to the d3-time-format v2.2.3 applied not the latest [[#5818](https://github.com/plotly/plotly.js/pull/5818)]

draftlogs/5826_change.md

@@ -0,0 +1 @@
+ - replace `d3.interpolate` method with `d3-interpolate` module in `icicle`, `indicator`, `parcats`, `sunburst` and `treemap` [[#5826](https://github.com/plotly/plotly.js/pull/5826)]

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/constants/docs.js

@@ -2,5 +2,5 @@
 
 module.exports = {
     FORMAT_LINK: 'https://github.com/d3/d3-3.x-api-reference/blob/master/Formatting.md#d3_format',
-    DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format#locale_format'
+    DATE_FORMAT_LINK: 'https://github.com/d3/d3-time-format/tree/v2.2.3#locale_format'
 };

src/lib/index.js

@@ -9,7 +9,9 @@ var MAX_SAFE = numConstants.FP_SAFE;
 var MIN_SAFE = -MAX_SAFE;
 var BADNUM = numConstants.BADNUM;
 
-var lib = module.exports = {};
+var lib = module.exports = {
+    _numberFormat: d3.format // simply to test d3.format before switching to d3-format
+};
 
 lib.nestedProperty = require('./nested_property');
 lib.keyedContainer = require('./keyed_container');
@@ -65,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/plot_api/plot_api.js

@@ -222,17 +222,20 @@ function _doPlot(gd, data, layout, config) {
                 });
         }
 
+        var plotGlPixelRatio = gd._context.plotGlPixelRatio;
         if(fullLayout._glcanvas) {
             fullLayout._glcanvas
-                .attr('width', fullLayout.width)
-                .attr('height', fullLayout.height);
+                .attr('width', fullLayout.width * plotGlPixelRatio)
+                .attr('height', fullLayout.height * plotGlPixelRatio)
+                .style('width', fullLayout.width + 'px')
+                .style('height', fullLayout.height + 'px');
 
             var regl = fullLayout._glcanvas.data()[0].regl;
             if(regl) {
                 // Unfortunately, this can happen when relayouting to large
                 // width/height on some browsers.
-                if(Math.floor(fullLayout.width) !== regl._gl.drawingBufferWidth ||
-                    Math.floor(fullLayout.height) !== regl._gl.drawingBufferHeight
+                if(Math.floor(fullLayout.width * plotGlPixelRatio) !== regl._gl.drawingBufferWidth ||
+                    Math.floor(fullLayout.height * plotGlPixelRatio) !== regl._gl.drawingBufferHeight
                  ) {
                     var msg = 'WebGL context buffer and canvas dimensions do not match due to browser/WebGL bug.';
                     if(drawFrameworkCalls) {

src/plots/cartesian/index.js

@@ -596,8 +596,8 @@ exports.toSVG = function(gd) {
             preserveAspectRatio: 'none',
             x: 0,
             y: 0,
-            width: canvas.width,
-            height: canvas.height
+            width: canvas.style.width,
+            height: canvas.style.height
         });
     }
 

src/plots/geo/constants.js

@@ -2,128 +2,120 @@
 
 // projection names to d3 function name
 exports.projNames = {
-    'equirectangular': 'equirectangular',
-    'mercator': 'mercator',
-    'orthographic': 'orthographic',
-    'natural earth': 'naturalEarth',
-    'kavrayskiy7': 'kavrayskiy7',
-    'miller': 'miller',
-    'robinson': 'robinson',
-    'eckert4': 'eckert4',
-    'azimuthal equal area': 'azimuthalEqualArea',
-    'azimuthal equidistant': 'azimuthalEquidistant',
-    'conic equal area': 'conicEqualArea',
-    'conic conformal': 'conicConformal',
-    'conic equidistant': 'conicEquidistant',
-    'gnomonic': 'gnomonic',
-    'stereographic': 'stereographic',
-    'mollweide': 'mollweide',
-    'hammer': 'hammer',
-    'transverse mercator': 'transverseMercator',
-    'albers usa': 'albersUsa',
-    'winkel tripel': 'winkel3',
-    'aitoff': 'aitoff',
-    'sinusoidal': 'sinusoidal',
-/*
-    // potential projections that could be added to the API
-
     'airy': 'airy',
-    // 'albers': 'albers',
-    'armadillo': 'armadillo',
+    'aitoff': 'aitoff',
+    'albers usa': 'albersUsa',
+    'albers': 'albers',
+    // 'armadillo': 'armadillo',
     'august': 'august',
+    'azimuthal equal area': 'azimuthalEqualArea',
+    'azimuthal equidistant': 'azimuthalEquidistant',
     'baker': 'baker',
-    'berghaus': 'berghaus',
+    // 'berghaus': 'berghaus',
     'bertin1953': 'bertin1953',
     'boggs': 'boggs',
     'bonne': 'bonne',
     'bottomley': 'bottomley',
     'bromley': 'bromley',
+    // 'chamberlin africa': 'chamberlinAfrica',
     // 'chamberlin': 'chamberlin',
-    'chamberlin africa': 'chamberlinAfrica',
     'collignon': 'collignon',
+    'conic conformal': 'conicConformal',
+    'conic equal area': 'conicEqualArea',
+    'conic equidistant': 'conicEquidistant',
     'craig': 'craig',
     'craster': 'craster',
     'cylindrical equal area': 'cylindricalEqualArea',
     'cylindrical stereographic': 'cylindricalStereographic',
     'eckert1': 'eckert1',
     'eckert2': 'eckert2',
     'eckert3': 'eckert3',
+    'eckert4': 'eckert4',
     'eckert5': 'eckert5',
     'eckert6': 'eckert6',
     'eisenlohr': 'eisenlohr',
+    'equirectangular': 'equirectangular',
     'fahey': 'fahey',
-    'foucaut': 'foucaut',
     'foucaut sinusoidal': 'foucautSinusoidal',
-    'gilbert': 'gilbert',
-    'gingery': 'gingery',
+    'foucaut': 'foucaut',
+    // 'gilbert': 'gilbert',
+    // 'gingery': 'gingery',
     'ginzburg4': 'ginzburg4',
     'ginzburg5': 'ginzburg5',
     'ginzburg6': 'ginzburg6',
     'ginzburg8': 'ginzburg8',
     'ginzburg9': 'ginzburg9',
+    'gnomonic': 'gnomonic',
+    'gringorten quincuncial': 'gringortenQuincuncial',
     'gringorten': 'gringorten',
     'guyou': 'guyou',
-    'hammer retroazimuthal': 'hammerRetroazimuthal',
-    'healpix': 'healpix',
+    // 'hammer retroazimuthal': 'hammerRetroazimuthal',
+    'hammer': 'hammer',
+    // 'healpix': 'healpix',
     'hill': 'hill',
     'homolosine': 'homolosine',
     'hufnagel': 'hufnagel',
     'hyperelliptical': 'hyperelliptical',
+    // 'interrupted boggs': 'interruptedBoggs',
+    // 'interrupted homolosine': 'interruptedHomolosine',
+    // 'interrupted mollweide hemispheres': 'interruptedMollweideHemispheres',
+    // 'interrupted mollweide': 'interruptedMollweide',
+    // 'interrupted quartic authalic': 'interruptedQuarticAuthalic',
+    // 'interrupted sinu mollweide': 'interruptedSinuMollweide',
+    // 'interrupted sinusoidal': 'interruptedSinusoidal',
+    'kavrayskiy7': 'kavrayskiy7',
     'lagrange': 'lagrange',
     'larrivee': 'larrivee',
     'laskowski': 'laskowski',
-    'littrow': 'littrow',
+    // 'littrow': 'littrow',
     'loximuthal': 'loximuthal',
+    'mercator': 'mercator',
+    'miller': 'miller',
+    // 'modified stereographic alaska': 'modifiedStereographicAlaska',
+    // 'modified stereographic gs48': 'modifiedStereographicGs48',
+    // 'modified stereographic gs50': 'modifiedStereographicGs50',
+    // 'modified stereographic lee': 'modifiedStereographicLee',
+    // 'modified stereographic miller': 'modifiedStereographicMiller',
     // 'modified stereographic': 'modifiedStereographic',
-    'modified stereographic alaska': 'modifiedStereographicAlaska',
-    'modified stereographic gs48': 'modifiedStereographicGs48',
-    'modified stereographic gs50': 'modifiedStereographicGs50',
-    'modified stereographic miller': 'modifiedStereographicMiller',
-    'modified stereographic lee': 'modifiedStereographicLee',
+    'mollweide': 'mollweide',
     'mt flat polar parabolic': 'mtFlatPolarParabolic',
     'mt flat polar quartic': 'mtFlatPolarQuartic',
     'mt flat polar sinusoidal': 'mtFlatPolarSinusoidal',
+    'natural earth': 'naturalEarth',
     'natural earth1': 'naturalEarth1',
     'natural earth2': 'naturalEarth2',
     'nell hammer': 'nellHammer',
     'nicolosi': 'nicolosi',
+    'orthographic': 'orthographic',
     'patterson': 'patterson',
+    'peirce quincuncial': 'peirceQuincuncial',
     'polyconic': 'polyconic',
+    // 'polyhedral butterfly': 'polyhedralButterfly',
+    // 'polyhedral collignon': 'polyhedralCollignon',
+    // 'polyhedral waterman': 'polyhedralWaterman',
     'rectangular polyconic': 'rectangularPolyconic',
+    'robinson': 'robinson',
     'satellite': 'satellite',
     'sinu mollweide': 'sinuMollweide',
+    'sinusoidal': 'sinusoidal',
+    'stereographic': 'stereographic',
     'times': 'times',
-    // 'two point azimuthal': 'twoPointAzimuthal',
+    'transverse mercator': 'transverseMercator',
     // 'two point azimuthalUsa': 'twoPointAzimuthalUsa',
-    // 'two point equidistant': 'twoPointEquidistant',
+    // 'two point azimuthal': 'twoPointAzimuthal',
     // 'two point equidistantUsa': 'twoPointEquidistantUsa',
+    // 'two point equidistant': 'twoPointEquidistant',
     'van der grinten': 'vanDerGrinten',
     'van der grinten2': 'vanDerGrinten2',
     'van der grinten3': 'vanDerGrinten3',
     'van der grinten4': 'vanDerGrinten4',
-    // 'wagner': 'wagner',
     'wagner4': 'wagner4',
     'wagner6': 'wagner6',
     // 'wagner7': 'wagner7',
+    // 'wagner': 'wagner',
     'wiechel': 'wiechel',
+    'winkel tripel': 'winkel3',
     'winkel3': 'winkel3',
-
-    // 'interrupt': 'interrupt',
-    'interrupted homolosine': 'interruptedHomolosine',
-    'interrupted sinusoidal': 'interruptedSinusoidal',
-    'interrupted boggs': 'interruptedBoggs',
-    'interrupted sinu mollweide': 'interruptedSinuMollweide',
-    'interrupted mollweide': 'interruptedMollweide',
-    'interrupted mollweide hemispheres': 'interruptedMollweideHemispheres',
-    'interrupted quartic authalic': 'interruptedQuarticAuthalic',
-
-    'polyhedral butterfly': 'polyhedralButterfly',
-    'polyhedral collignon': 'polyhedralCollignon',
-    'polyhedral waterman': 'polyhedralWaterman',
-
-    'gringorten quincuncial': 'gringortenQuincuncial',
-    'peirce quincuncial': 'peirceQuincuncial',
-*/
 };
 
 // name of the axes