Merge remote-tracking branch 'origin/master' into cam/7334/switch-geodata-providers

Author: camdecoster

.github/workflows/test.yml

@@ -0,0 +1,33 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: No CI Test
+
+on: push
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: browser-actions/setup-chrome@v1
+    - uses: actions/checkout@v4
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+    - run: chrome --version
+    - run: ls
+    - run: npm run pretest
+    - run: npm ci
+    - run: npm run cibuild
+    - name: Run headless test
+      uses: coactions/setup-xvfb@v1
+      with:
+        run: ./tasks/noci_test.sh jasmine

devtools/regl_codegen/devtools.js

@@ -158,5 +158,3 @@ function handleOnLoad() {
         window.close();
     });
 }
-
-module.exports = Tabs;

devtools/test_dashboard/devtools.js

@@ -268,4 +268,3 @@ function handleOnLoad() {
     plotFromHash();
 }
 
-module.exports = Tabs;

draftlogs/7280_add.md

@@ -0,0 +1 @@
+- Add `pattern.path` attribute as an alternative to the preset `pattern.shape` values, so you can use any SVG path string as a pattern fill. [[#7280](https://github.com/plotly/plotly.js/pull/7280)]

draftlogs/7407_fix.md

@@ -0,0 +1 @@
+- Move css-loader and other dependencies into devDependencies section [[#7407](https://github.com/plotly/plotly.js/pull/7407)]

draftlogs/7420_add.md

@@ -0,0 +1,2 @@
+ - Add support for ticklabelposition "inside"/"outside" for category axes with `tickson` set to "boundaries" [[#7420](https://github.com/plotly/plotly.js/pull/7420)],
+   with thanks to @my-tien for the contribution!

package-lock.json

@@ -86,15 +86,13 @@
     "color-parse": "2.0.0",
     "color-rgba": "3.0.0",
     "country-regex": "^1.1.0",
-    "css-loader": "^7.1.2",
     "d3-force": "^1.2.1",
     "d3-format": "^1.4.5",
     "d3-geo-projection": "^2.9.0",
     "d3-hierarchy": "^1.1.9",
     "d3-interpolate": "^3.0.1",
     "d3-time": "^1.1.0",
     "d3-time-format": "^2.2.3",
-    "esbuild-style-plugin": "^1.6.3",
     "fast-isnumeric": "^1.1.4",
     "gl-mat4": "^1.2.0",
     "gl-text": "^1.4.0",
@@ -115,7 +113,6 @@
     "regl-scatter2d": "^3.3.1",
     "regl-splom": "^1.0.14",
     "strongly-connected-components": "^1.0.1",
-    "style-loader": "^4.0.0",
     "superscript-text": "^1.0.0",
     "svg-path-sdf": "^1.1.3",
     "tinycolor2": "^1.4.2",
@@ -138,13 +135,15 @@
     "canvas": "^3.1.0",
     "check-node-version": "^4.2.1",
     "chttps": "^1.0.6",
+    "css-loader": "^7.1.2",
     "d3-geo": "^3.1.1",
     "deep-equal": "^2.2.3",
     "ecstatic": "^4.1.4",
     "esbuild": "^0.25.5",
     "esbuild-plugin-browserify-adapter": "^0.1.4",
     "esbuild-plugin-environment": "^0.4.0",
     "esbuild-plugin-glsl": "^1.2.2",
+    "esbuild-style-plugin": "^1.6.3",
     "extra-iterable": "^2.5.22",
     "falafel": "^2.2.5",
     "fs-extra": "^10.1.0",
@@ -180,6 +179,7 @@
     "run-series": "^1.1.9",
     "sass": "^1.78.0",
     "stream-browserify": "^3.0.0",
+    "style-loader": "^4.0.0",
     "through2": "^4.0.2",
     "topojson": "^1.6.27",
     "transform-loader": "^0.2.4",

package.json

@@ -28,6 +28,16 @@ exports.pattern = {
             'By default, no pattern is used for filling the area.',
         ].join(' ')
     },
+    path: {
+        valType: 'string',
+        arrayOk: true,
+        editType: 'style',
+        description: [
+            'Sets a custom path for pattern fill.',
+            'Use with no `shape` or `solidity`, provide an SVG path string for',
+            'the regions of the square from (0,0) to (`size`,`size`) to color.'
+        ].join(' ')
+    },
     fillmode: {
         valType: 'enumerated',
         values: ['replace', 'overlay'],

src/components/drawing/attributes.js

@@ -218,13 +218,14 @@ drawing.dashStyle = function(dash, lineWidth) {
 function setFillStyle(sel, trace, gd, forLegend) {
     var markerPattern = trace.fillpattern;
     var fillgradient = trace.fillgradient;
-    var patternShape = markerPattern && drawing.getPatternAttr(markerPattern.shape, 0, '');
+    var pAttr = drawing.getPatternAttr;
+    var patternShape = markerPattern && (pAttr(markerPattern.shape, 0, '') || pAttr(markerPattern.path, 0, ''));
     if(patternShape) {
-        var patternBGColor = drawing.getPatternAttr(markerPattern.bgcolor, 0, null);
-        var patternFGColor = drawing.getPatternAttr(markerPattern.fgcolor, 0, null);
+        var patternBGColor = pAttr(markerPattern.bgcolor, 0, null);
+        var patternFGColor = pAttr(markerPattern.fgcolor, 0, null);
         var patternFGOpacity = markerPattern.fgopacity;
-        var patternSize = drawing.getPatternAttr(markerPattern.size, 0, 8);
-        var patternSolidity = drawing.getPatternAttr(markerPattern.solidity, 0, 0.3);
+        var patternSize = pAttr(markerPattern.size, 0, 8);
+        var patternSolidity = pAttr(markerPattern.solidity, 0, 0.3);
         var patternID = trace.uid;
         drawing.pattern(sel, 'point', gd, patternID,
             patternShape, patternSize, patternSolidity,
@@ -662,6 +663,16 @@ drawing.pattern = function(sel, calledBy, gd, patternID, shape, size, solidity,
                 fill: fgRGB
             };
             break;
+        default:
+            width = size;
+            height = size;
+            patternTag = 'path';
+            patternAttrs = {
+                d: shape,
+                opacity: opacity,
+                fill: fgRGB
+            };
+            break;
     }
 
     var str = [
@@ -869,7 +880,10 @@ drawing.singlePointStyle = function(d, sel, trace, fns, gd, pt) {
         }
 
         var markerPattern = marker.pattern;
-        var patternShape = markerPattern && drawing.getPatternAttr(markerPattern.shape, d.i, '');
+        var pAttr = drawing.getPatternAttr;
+        var patternShape = markerPattern && (
+            pAttr(markerPattern.shape, d.i, '') || pAttr(markerPattern.path, d.i, '')
+        );
 
         if(gradientType && gradientType !== 'none') {
             var gradientColor = d.mgc;
@@ -888,14 +902,15 @@ drawing.singlePointStyle = function(d, sel, trace, fns, gd, pt) {
                 fgcolor = pt.color;
                 perPointPattern = true;
             }
-            var patternFGColor = drawing.getPatternAttr(fgcolor, d.i, (pt && pt.color) || null);
+            var patternFGColor = pAttr(fgcolor, d.i, (pt && pt.color) || null);
 
-            var patternBGColor = drawing.getPatternAttr(markerPattern.bgcolor, d.i, null);
+            var patternBGColor = pAttr(markerPattern.bgcolor, d.i, null);
             var patternFGOpacity = markerPattern.fgopacity;
-            var patternSize = drawing.getPatternAttr(markerPattern.size, d.i, 8);
-            var patternSolidity = drawing.getPatternAttr(markerPattern.solidity, d.i, 0.3);
+            var patternSize = pAttr(markerPattern.size, d.i, 8);
+            var patternSolidity = pAttr(markerPattern.solidity, d.i, 0.3);
             perPointPattern = perPointPattern || d.mcc ||
                 Lib.isArrayOrTypedArray(markerPattern.shape) ||
+                Lib.isArrayOrTypedArray(markerPattern.path) ||
                 Lib.isArrayOrTypedArray(markerPattern.bgcolor) ||
                 Lib.isArrayOrTypedArray(markerPattern.fgcolor) ||
                 Lib.isArrayOrTypedArray(markerPattern.size) ||

src/components/drawing/index.js

@@ -376,11 +376,14 @@ module.exports = function style(s, gd, legend) {
             var fillColor = mcc || d0.mc || marker.color;
 
             var markerPattern = marker.pattern;
-            var patternShape = markerPattern && Drawing.getPatternAttr(markerPattern.shape, 0, '');
+            var pAttr = Drawing.getPatternAttr;
+            var patternShape = markerPattern && (
+                pAttr(markerPattern.shape, 0, '') || pAttr(markerPattern.path, 0, '')
+            );
 
             if(patternShape) {
-                var patternBGColor = Drawing.getPatternAttr(markerPattern.bgcolor, 0, null);
-                var patternFGColor = Drawing.getPatternAttr(markerPattern.fgcolor, 0, null);
+                var patternBGColor = pAttr(markerPattern.bgcolor, 0, null);
+                var patternFGColor = pAttr(markerPattern.fgcolor, 0, null);
                 var patternFGOpacity = markerPattern.fgopacity;
                 var patternSize = dimAttr(markerPattern.size, 8, 10);
                 var patternSolidity = dimAttr(markerPattern.solidity, 0.5, 1);

src/components/legend/style.js

@@ -502,8 +502,14 @@ exports.coerceFont = function(coerce, attr, dfltObj, opts) {
  */
 exports.coercePattern = function(coerce, attr, markerColor, hasMarkerColorscale) {
     var shape = coerce(attr + '.shape');
-    if(shape) {
-        coerce(attr + '.solidity');
+    var path;
+    if(!shape) {
+        path = coerce(attr + '.path');
+    }
+    if(shape || path) {
+        if(shape) {
+            coerce(attr + '.solidity');
+        }
         coerce(attr + '.size');
         var fillmode = coerce(attr + '.fillmode');
         var isOverlay = fillmode === 'overlay';

src/lib/coerce.js

@@ -214,7 +214,11 @@ function crawl(objIn, objOut, schema, list, base, path) {
         } else if(!Lib.validate(valIn, nestedSchema)) {
             list.push(format('value', base, p, valIn));
         } else if(nestedSchema.valType === 'enumerated' &&
-            ((nestedSchema.coerceNumber && valIn !== +valOut) || valIn !== valOut)
+            (
+                (nestedSchema.coerceNumber && valIn !== +valOut) ||
+                (!isArrayOrTypedArray(valIn) && valIn !== valOut) ||
+                (String(valIn) !== String(valOut))
+            )
         ) {
             list.push(format('dynamic', base, p, valIn, valOut));
         }

src/plot_api/validate.js

@@ -3073,6 +3073,7 @@ function getPosX(d) {
 // v is a shift perpendicular to the axis
 function getTickLabelUV(ax) {
     var ticklabelposition = ax.ticklabelposition || '';
+    var tickson = ax.tickson || '';
     var has = function(str) {
         return ticklabelposition.indexOf(str) !== -1;
     };
@@ -3083,7 +3084,7 @@ function getTickLabelUV(ax) {
     var isBottom = has('bottom');
     var isInside = has('inside');
 
-    var isAligned = isBottom || isLeft || isTop || isRight;
+    var isAligned = (tickson !== 'boundaries') && (isBottom || isLeft || isTop || isRight);
 
     // early return
     if(!isAligned && !isInside) return [0, 0];
@@ -3167,6 +3168,8 @@ axes.makeTickPath = function(ax, shift, sgn, opts) {
  */
 axes.makeLabelFns = function(ax, shift, angle) {
     var ticklabelposition = ax.ticklabelposition || '';
+    var tickson = ax.tickson || '';
+
     var has = function(str) {
         return ticklabelposition.indexOf(str) !== -1;
     };
@@ -3175,12 +3178,12 @@ axes.makeLabelFns = function(ax, shift, angle) {
     var isLeft = has('left');
     var isRight = has('right');
     var isBottom = has('bottom');
-    var isAligned = isBottom || isLeft || isTop || isRight;
+    var isAligned = (tickson !== 'boundaries') && (isBottom || isLeft || isTop || isRight);
 
     var insideTickLabels = has('inside');
     var labelsOverTicks =
         (ticklabelposition === 'inside' && ax.ticks === 'inside') ||
-        (!insideTickLabels && ax.ticks === 'outside' && ax.tickson !== 'boundaries');
+        (!insideTickLabels && ax.ticks === 'outside' && tickson !== 'boundaries');
 
     var labelStandoff = 0;
     var labelShift = 0;
@@ -3895,14 +3898,16 @@ axes.drawLabels = function(gd, ax, opts) {
                 }
             } else {
                 var ticklabelposition = ax.ticklabelposition || '';
+                var tickson = ax.tickson ||'';
+
                 var has = function(str) {
                     return ticklabelposition.indexOf(str) !== -1;
                 };
                 var isTop = has('top');
                 var isLeft = has('left');
                 var isRight = has('right');
                 var isBottom = has('bottom');
-                var isAligned = isBottom || isLeft || isTop || isRight;
+                var isAligned = (tickson !== 'boundaries') && (isBottom || isLeft || isTop || isRight);
                 var pad = !isAligned ? 0 :
                 (ax.tickwidth || 0) + 2 * TEXTPAD;
 

src/plots/cartesian/axes.js

@@ -167,11 +167,11 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, coerce,
         (axType === 'category' || isMultiCategory) &&
         (containerOut.ticks || containerOut.showgrid)
     ) {
-        var ticksonDflt;
-        if(isMultiCategory) ticksonDflt = 'boundaries';
-        var tickson = coerce('tickson', ticksonDflt);
-        if(tickson === 'boundaries') {
+        if (isMultiCategory) {
+            coerce('tickson', 'boundaries');
             delete containerOut.ticklabelposition;
+        } else { // category axis
+            coerce('tickson');
         }
     }
 

src/plots/cartesian/axis_defaults.js

@@ -663,12 +663,13 @@ module.exports = {
         dflt: 'outside',
         editType: 'calc',
         description: [
-            'Determines where tick labels are drawn with respect to the axis',
+            'Determines where tick labels are drawn with respect to the axis.',
             'Please note that',
-            'top or bottom has no effect on x axes or when `ticklabelmode` is set to *period*.',
-            'Similarly',
-            'left or right has no effect on y axes or when `ticklabelmode` is set to *period*.',
-            'Has no effect on *multicategory* axes or when `tickson` is set to *boundaries*.',
+            'top or bottom has no effect on x axes or when `ticklabelmode` is set to *period*',
+            'or when `tickson` is set to *boundaries*. Similarly,',
+            'left or right has no effect on y axes or when `ticklabelmode` is set to *period*',
+            'or when `tickson` is set to *boundaries*.',
+            'Has no effect on *multicategory* axes.',
             'When used on axes linked by `matches` or `scaleanchor`,',
             'no extra padding for inside labels would be added by autorange,',
             'so that the scales could match.'