Merge remote-tracking branch 'origin/master' into v4.0

Author: camdecoster

.github/workflows/upload-dev-build.yml

@@ -21,20 +21,37 @@ env:
 jobs:
   upload:
     runs-on: ubuntu-latest
-    # Only run on manual dispatch, 
-    # OR if the parent run succeeded and was triggered by a PR from
-    # a branch in the main repo (not a fork)
+    permissions:
+      statuses: write
+    # Only run on manual dispatch,
+    # OR if the parent run succeeded and was triggered by a PR.
+    # Fork PRs run through so we can post a "skipped" commit status to the PR
+    # head and log why; the actual upload steps are guarded by fork-check so no
+    # dev build is published for fork PRs (they lack DEV_DEPLOY_APP access).
     if: |
           github.event_name == 'workflow_dispatch' ||
           (
-            github.event_name == 'workflow_run' && 
+            github.event_name == 'workflow_run' &&
             github.event.workflow_run.event == 'pull_request' &&
-            github.event.workflow_run.conclusion == 'success' &&
-            github.event.workflow_run.head_repository.full_name == github.repository
+            github.event.workflow_run.conclusion == 'success'
           )
     steps:
+      - name: Check if PR is from a fork
+        id: fork-check
+        env:
+          HEAD_REPO: ${{ github.event.workflow_run.head_repository.full_name }}
+          REPO: ${{ github.repository }}
+        run: |
+          if [ -n "${HEAD_REPO}" ] && [ "${HEAD_REPO}" != "${REPO}" ]; then
+            echo "::notice::Dev-build upload skipped: PR is from a fork (${HEAD_REPO}). Dev builds are only uploaded for PRs from branches within ${REPO}. A maintainer can trigger a build manually via workflow_dispatch with the PR number as input."
+            echo "is_fork=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "is_fork=false" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Get required metadata (PR number, commit SHA, workflow run ID containing artifacts)
         id: get-metadata
+        if: steps.fork-check.outputs.is_fork == 'false'
         env:
           GH_TOKEN: ${{ github.token }}
           GH_EVENT_NAME: ${{ github.event_name }}
@@ -91,6 +108,7 @@ jobs:
 
       - name: Download build artifact
         id: download-artifact
+        if: steps.fork-check.outputs.is_fork == 'false'
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
           name: dist  # uploaded by publish-dist.yml > publish-dist
@@ -100,6 +118,7 @@ jobs:
 
       - name: Prepare folders
         id: setup-metadata
+        if: steps.fork-check.outputs.is_fork == 'false'
         env:
           GH_TOKEN: ${{ github.token }}
           PR_NUM: ${{ steps.get-metadata.outputs.PR_NUM }}
@@ -124,6 +143,7 @@ jobs:
 
       - name: Generate GitHub App token
         id: generate-token
+        if: steps.fork-check.outputs.is_fork == 'false'
         uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3  #v3.1.1
         with:
           client-id: ${{ vars.DEV_DEPLOY_APP_ID }}
@@ -132,6 +152,7 @@ jobs:
           repositories: plotly.js-dev-builds
 
       - name: Check out plotly.js-dev-builds repo
+        if: steps.fork-check.outputs.is_fork == 'false'
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           repository: plotly/plotly.js-dev-builds
@@ -140,6 +161,7 @@ jobs:
 
       - name: Commit and push files
         id: commit-and-push
+        if: steps.fork-check.outputs.is_fork == 'false'
         env:
           PR_NUM: ${{ steps.get-metadata.outputs.PR_NUM }}
           SHORT_SHA: ${{ steps.get-metadata.outputs.SHORT_SHA }}
@@ -172,6 +194,7 @@ jobs:
           fi
 
       - name: Generate summary
+        if: steps.fork-check.outputs.is_fork == 'false'
         env:
           PR_NUM: ${{ steps.get-metadata.outputs.PR_NUM }}
           SHORT_SHA: ${{ steps.get-metadata.outputs.SHORT_SHA }}
@@ -182,3 +205,46 @@ jobs:
           echo "- Latest build for this PR: [${BASE_URL}/latest/plotly.min.js](${BASE_URL}/latest/plotly.min.js)" >> $GITHUB_STEP_SUMMARY
           echo "- Build for this commit: [${BASE_URL}/${SHORT_SHA}/plotly.min.js](${BASE_URL}/${SHORT_SHA}/plotly.min.js)" >> $GITHUB_STEP_SUMMARY
           echo "The above links should start working a minute or two after this job completes." >> $GITHUB_STEP_SUMMARY
+
+      - name: Report dev-build outcome to PR head
+        # Post a commit status on the PR head SHA so a row appears in the PR
+        # merge-box widget. Statuses are keyed by (sha, context) with
+        # last-write-wins semantics, so a maintainer-triggered dispatch that
+        # follows an earlier "Skipped" status updates the same row in place.
+        if: |
+          always() && (
+            (github.event_name == 'workflow_run' && github.event.workflow_run.head_sha != '') ||
+            (github.event_name == 'workflow_dispatch' && steps.get-metadata.outputs.SHA != '')
+          )
+        env:
+          GH_TOKEN: ${{ github.token }}
+          REPO: ${{ github.repository }}
+          SHA: ${{ github.event.workflow_run.head_sha || steps.get-metadata.outputs.SHA }}
+          IS_FORK: ${{ steps.fork-check.outputs.is_fork }}
+          PR_NUM: ${{ steps.get-metadata.outputs.PR_NUM }}
+          UPLOAD_OUTCOME: ${{ steps.commit-and-push.outcome }}
+          RUN_ID: ${{ github.run_id }}
+        run: |
+          RUN_URL="https://github.com/${REPO}/actions/runs/${RUN_ID}"
+          CONTRIBUTING_URL="https://github.com/${REPO}/blob/master/CONTRIBUTING.md#live-links-to-dev-builds"
+
+          if [ "${IS_FORK}" == "true" ]; then
+            STATE="success"
+            DESCRIPTION="Skipped — PR is from a fork. Ask a maintainer to trigger a build."
+            TARGET_URL="${CONTRIBUTING_URL}"
+          elif [ "${UPLOAD_OUTCOME}" == "success" ]; then
+            STATE="success"
+            DESCRIPTION="Latest dev builds for PR #${PR_NUM}"
+            TARGET_URL="https://plotly.github.io/plotly.js-dev-builds/${UPLOAD_DIR_NAME}/pr-${PR_NUM}/latest"
+          else
+            STATE="failure"
+            DESCRIPTION="Upload failed — see workflow run for details."
+            TARGET_URL="${RUN_URL}"
+          fi
+
+          jq -n \
+            --arg state "${STATE}" \
+            --arg description "${DESCRIPTION}" \
+            --arg target_url "${TARGET_URL}" \
+            '{state: $state, target_url: $target_url, description: $description, context: "Upload Dev Build"}' \
+            | gh api --method POST --input - "repos/${REPO}/statuses/${SHA}"

draftlogs/7872_fix.md

@@ -0,0 +1 @@
+- Prevent outside bar text for zero-length bars from overlapping axis tick labels [[#7872](https://github.com/plotly/plotly.js/pull/7872)], with thanks to @vizansh for the contribution!

draftlogs/7900_fix.md

@@ -0,0 +1 @@
+- Fix `hovertemplate`/`texttemplate`/`tickformat`/`hoverformat` improperly handling d3-format specs that start with a sign flag such as `+.2f` [[#7900](https://github.com/plotly/plotly.js/pull/7900)], with thanks to @TemRevil for the contribution!

draftlogs/7908_fix.md

@@ -0,0 +1 @@
+ - Fix crash ("Something went wrong with axis scaling") when a colorbar's title or padding leaves it with a negative domain length [[#7908](https://github.com/plotly/plotly.js/pull/7908)], with thanks to @zeehio for the contribution!

draftlogs/7921_fix.md

@@ -0,0 +1 @@
+- Prevent MultiPolygon features with no positive-area polygon from aborting choropleth rendering [[#7921](https://github.com/plotly/plotly.js/pull/7921)], with thanks to @swjturay for the contribution!

src/components/colorbar/draw.js

@@ -166,6 +166,12 @@ function makeColorBarData(gd) {
     return out;
 }
 
+// Move domain[0] toward domain[1] by delta, without crossing it
+const insetDomainStart = (domain, delta) => [Math.min(domain[0] + delta, domain[1]), domain[1]];
+
+// Move domain[1] toward domain[0] by delta, without crossing it
+const insetDomainEnd = (domain, delta) => [domain[0], Math.max(domain[1] - delta, domain[0])];
+
 function drawColorBar(g, opts, gd) {
     var isVertical = opts.orientation === 'v';
     var len = opts.len;
@@ -299,13 +305,8 @@ function drawColorBar(g, opts, gd) {
 
     // set domain after init, because we may want to
     // allow it outside [0,1]
-    ax.domain = isVertical ? [
-        vFrac + ypad / gs.h,
-        vFrac + lenFrac - ypad / gs.h
-    ] : [
-        vFrac + xpad / gs.w,
-        vFrac + lenFrac - xpad / gs.w
-    ];
+    var padFrac = isVertical ? ypad / gs.h : xpad / gs.w;
+    ax.domain = insetDomainEnd(insetDomainStart([vFrac, vFrac + lenFrac], padFrac), padFrac);
 
     ax.setScale();
 
@@ -472,10 +473,10 @@ function drawColorBar(g, opts, gd) {
                     titleHeight += 5;
 
                     if(titleSide === 'top') {
-                        ax.domain[1] -= titleHeight / gs.h;
+                        ax.domain = insetDomainEnd(ax.domain, titleHeight / gs.h);
                         titleTrans[1] *= -1;
                     } else {
-                        ax.domain[0] += titleHeight / gs.h;
+                        ax.domain = insetDomainStart(ax.domain, titleHeight / gs.h);
                         var nlines = svgTextUtils.lineCount(titleText);
                         titleTrans[1] += (1 - nlines) * lineSize;
                     }
@@ -486,7 +487,7 @@ function drawColorBar(g, opts, gd) {
             } else { // horizontal colorbars
                 if(titleWidth) {
                     if(titleSide === 'right') {
-                        ax.domain[0] += (titleWidth + titleFontSize / 2) / gs.w;
+                        ax.domain = insetDomainStart(ax.domain, (titleWidth + titleFontSize / 2) / gs.w);
                     }
 
                     titleGroup.attr('transform', strTranslate(titleTrans[0], titleTrans[1]));

src/lib/geo_location_utils.js

@@ -238,11 +238,18 @@ function extractTraceFeature(calcTrace) {
                     properties: {}
                 };
 
-                // Compute centroid, add it to the properties
-                if (fOut.geometry.coordinates.length > 0) {
-                    fOut.properties.ct = findCentroid(fOut);
-                } else {
-                    fOut.properties.ct = [NaN, NaN];
+                fOut.properties.ct = findCentroid(fOut);
+
+                if (isNaN(fOut.properties.ct[0])) {
+                    loggers.log(
+                        [
+                            'Location',
+                            cdi.loc,
+                            'has no polygon with positive area.',
+                            'Its centroid could not be computed,',
+                            'so hover and selection will not work for it.'
+                        ].join(' ')
+                    );
                 }
 
                 // Mutate in in/out features into calcdata
@@ -327,6 +334,11 @@ function findCentroid(feature) {
         poly = geometry;
     }
 
+    // Guard against MultiPolygons that don't contain a positive-area polygon
+    // (collapsed rings measure zero, malformed ring ordering measures negative)
+    // and when either geometry type has rings holding no points at all.
+    if (!poly || !poly.coordinates.some((ring) => ring.length > 0)) return [NaN, NaN];
+
     return turfCentroid(poly).geometry.coordinates;
 }
 

src/lib/index.js

@@ -19,8 +19,16 @@ lib.adjustFormat = function adjustFormat(formatStr) {
     if (/^\d%/.test(formatStr)) return '~%';
     if (/^\ds/.test(formatStr)) return '~s';
 
-    // try adding tilde to the start of format in order to trim
-    if (!/^[~,.0$]/.test(formatStr) && /[&fps]/.test(formatStr)) return '~' + formatStr;
+    // A d3-format spec may begin with a sign flag (+, -, (, space). Look past
+    // that prefix before deciding whether to trim, and reattach it: prepending
+    // the tilde to the whole string (e.g. "~+.2f") is an invalid spec that
+    // d3Format rejects, so "+.2f" used to be silently dropped.
+    var prefix = (formatStr.match(/^[+\-( ]?/) || [''])[0];
+    var rest = formatStr.slice(prefix.length);
+
+    // try adding tilde to trim trailing zeros; leave symbol-led specs ($, #)
+    // untrimmed, since the symbol isn't part of the prefix we stripped above
+    if (!/^[~,.0$#]/.test(rest) && /[&fps]/.test(rest)) return prefix + '~' + rest;
 
     return formatStr;
 };

src/traces/bar/plot.js

@@ -554,6 +554,7 @@ function appendBarText(gd, plotinfo, bar, cd, i, x0, x1, y0, y1, r, overhead, op
     // get trace attributes
     var trace = cd[0].trace;
     var isHorizontal = trace.orientation === 'h';
+    var zeroBarDir = getZeroBarDir(cd, isHorizontal, xa, ya);
 
     var text = getText(fullLayout, cd, i, xa, ya);
 
@@ -707,7 +708,8 @@ function appendBarText(gd, plotinfo, bar, cd, i, x0, x1, y0, y1, r, overhead, op
         transform = toMoveOutsideBar(x0, x1, y0, y1, textBB, {
             isHorizontal: isHorizontal,
             constrained: constrained,
-            angle: angle
+            angle: angle,
+            zeroBarDir: zeroBarDir
         });
     } else {
         constrained = trace.constraintext === 'both' || trace.constraintext === 'inside';
@@ -957,7 +959,12 @@ function toMoveOutsideBar(x0, x1, y0, y1, textBB, opts) {
     var anchorX = 0;
     var anchorY = 0;
 
-    var dir = isHorizontal ? dirSign(x1, x0) : dirSign(y0, y1);
+    var dir;
+    if ((isHorizontal ? x0 === x1 : y0 === y1) && opts.zeroBarDir) {
+        dir = opts.zeroBarDir;
+    } else {
+        dir = isHorizontal ? dirSign(x1, x0) : dirSign(y0, y1);
+    }
     if (isHorizontal) {
         targetX = x1 - dir * textpad;
         anchorX = dir * extrapad;
@@ -999,6 +1006,38 @@ function getTextPosition(trace, index) {
     return helpers.coerceEnumerated(attributeTextPosition, value);
 }
 
+function getZeroBarDir(cd, isHorizontal, xa, ya) {
+    var hasPositive = false;
+    var hasNegative = false;
+
+    for (var i = 0; i < cd.length; i++) {
+        var s = cd[i].s;
+
+        if (s > 0) {
+            hasPositive = true;
+        } else if (s < 0) {
+            hasNegative = true;
+        }
+
+        if (hasPositive && hasNegative) {
+            return 0;
+        }
+    }
+
+    var axis = isHorizontal ? xa : ya;
+    var positiveDir = -dirSign(axis.range[0], axis.range[1]);
+
+    if (!hasNegative) {
+        return positiveDir;
+    }
+
+    if (!hasPositive) {
+        return -positiveDir;
+    }
+
+    return 0;
+}
+
 function calcTexttemplate(fullLayout, cd, index, xa, ya) {
     var trace = cd[0].trace;
     var texttemplate = Lib.castOption(trace, index, 'texttemplate');

test/image/mocks/axes_breaks.json

@@ -74,35 +74,35 @@
     "shapes": [
       {
         "type": "rect",
-        "y0": 11,
-        "y1": 89,
+        "y0": "1970-01-01 00:00:00.011",
+        "y1": "1970-01-01 00:00:00.089",
         "yref": "y2",
         "x0": 0.56,
         "x1": 1,
         "xref": "paper"
       },
       {
         "type": "rect",
-        "y0": 101,
-        "y1": 189,
+        "y0": "1970-01-01 00:00:00.101",
+        "y1": "1970-01-01 00:00:00.189",
         "yref": "y2",
         "x0": 0.56,
         "x1": 1,
         "xref": "paper"
       },
       {
         "type": "rect",
-        "x0": 11,
-        "x1": 89,
+        "x0": "1970-01-01 00:00:00.011",
+        "x1": "1970-01-01 00:00:00.089",
         "xref": "x4",
         "y0": 0,
         "y1": 0.5,
         "yref": "paper"
       },
       {
         "type": "rect",
-        "x0": 101,
-        "x1": 189,
+        "x0": "1970-01-01 00:00:00.101",
+        "x1": "1970-01-01 00:00:00.189",
         "xref": "x4",
         "y0": 0,
         "y1": 0.5,