Merge remote-tracking branch 'origin/master' into cam/7678/enable-typescript-type-checking

Author: camdecoster

.github/workflows/publish-dist.yml

@@ -16,41 +16,6 @@ concurrency:
 
 jobs:
   publish-dist:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-
-      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
-        with:
-          node-version: '18'
-          cache: 'npm'
-
-      - name: Set up build environment
-        run: .github/scripts/env_build.sh
-
-      - name: Set draft version in package.json
-        run: |
-          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)
-          # View package.json diff from last release (should show that the version has been changed to the draft version)
-          git --no-pager diff --color-words tags/$(git describe --tags --abbrev=0) package.json || true
-
-      - name: Build dist/
-        run: npm run build
-
-      - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        name: Upload Node 18 archive of plotly.js build folder
-        with:
-          name: dist-node18
-          retention-days: 7
-          path: dist/
-
-      - name: Test plot-schema.json diff
-        run: diff --unified --color dist/plot-schema.json test/plot-schema.json
-
-  publish-dist-node-v22:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -76,9 +41,9 @@ jobs:
         run: npm run build
 
       - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-        name: Upload Node 22 archive of plotly.js build folder
+        name: Upload archive of plotly.js build artifacts (contents of dist/)
         with:
-          name: dist-node22
+          name: dist
           retention-days: 7
           path: dist/
 

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

@@ -1,5 +1,8 @@
 name: Upload dev build from PR
 
+# See https://github.com/plotly/plotly.js/blob/master/CONTRIBUTING.md#live-links-to-dev-builds
+# for documentation on the usage of this workflow.
+
 on:
   workflow_run:
     workflows: ["Publish Dist"]  # publish-dist.yml
@@ -9,49 +12,103 @@ on:
     inputs:
       pr_number:
         description: 'PR Number to deploy'
-        required: true
-      run_id:
-        description: 'The Run ID of the CI workflow that has the artifact'
-        required: true
+        required: false
+
+env:
+  ARTIFACT_UPLOAD_WORKFLOW_NAME: "Publish Dist"
+  UPLOAD_DIR_NAME: "upload"
 
 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)
     if: |
           github.event_name == 'workflow_dispatch' ||
           (
             github.event_name == 'workflow_run' && 
             github.event.workflow_run.event == 'pull_request' &&
-            github.event.workflow_run.conclusion == 'success'
+            github.event.workflow_run.conclusion == 'success' &&
+            github.event.workflow_run.head_repository.full_name == github.repository
           )
     steps:
+      - name: Get required metadata (PR number, commit SHA, workflow run ID containing artifacts)
+        id: get-metadata
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_EVENT_NAME: ${{ github.event_name }}
+          GH_REPO: ${{ github.repository }}
+          SHA: ${{ github.event.workflow_run.head_sha }}
+          RUN_ID: ${{ github.event.workflow_run.id }}
+          PR_NUM: ${{ github.event.workflow_run.pull_requests[0].number || inputs.pr_number }}
+        run: |
+          # Get SHA from manually-provided PR number if triggered by workflow_dispatch
+          if [ "${GH_EVENT_NAME}" == "workflow_dispatch" ]; then
+            if [ -n "${PR_NUM}" ]; then
+              SHA=$(gh pr view "${PR_NUM}" --repo "${GH_REPO}" --json headRefOid --template '{{.headRefOid}}')
+            fi
+          fi
+
+          # At this point, SHA should be defined. If not, fail the workflow
+          if [ -z "${SHA}" ]; then
+            echo "Failed to get commit SHA, exiting"
+            exit 1
+          fi
+
+          # If PR_NUM is empty, get PR number using SHA
+          if [ -z "${PR_NUM}" ]; then
+            PR_NUM=$(gh pr list --search "sha:${SHA}" --state open --json number --jq '.[0].number')
+          fi
+
+          # Validate that we have a valid PR number
+          if [ -z "${PR_NUM}" ] || [[ ! "${PR_NUM}" =~ ^[1-9][0-9]{0,4}$ ]]; then
+            echo "Failed to get PR number, exiting (PR_NUM=${PR_NUM})"
+            exit 1
+          fi
+
+          # If RUN_ID is empty, use the gh CLI to get the most recent run ID for SHA
+          if [ -z "${RUN_ID}" ]; then
+            RUN_ID=$(gh run list \
+              --workflow "${ARTIFACT_UPLOAD_WORKFLOW_NAME}" \
+              --commit "${SHA}" \
+              --limit 1 \
+              --json databaseId \
+              --jq '.[0].databaseId')
+          fi
+
+          # At this point, RUN_ID should be defined. If not, fail the workflow
+          if [ -z "${RUN_ID}" ]; then
+            echo "Failed to get workflow run ID, exiting"
+            exit 1
+          fi
+
+          # Save PR number, commit SHA, short SHA, and run ID to output
+          echo "PR_NUM=${PR_NUM}" >> $GITHUB_OUTPUT
+          echo "SHA=${SHA}" >> $GITHUB_OUTPUT
+          echo "SHORT_SHA=${SHA:0:7}" >> $GITHUB_OUTPUT
+          echo "RUN_ID=${RUN_ID}" >> $GITHUB_OUTPUT
+
       - name: Download build artifact
         id: download-artifact
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
         with:
-          name: dist-node22  # uploaded by publish-dist.yml > publish-dist-node-v22
-          run-id: ${{ github.event.workflow_run.id || inputs.run_id }}
+          name: dist  # uploaded by publish-dist.yml > publish-dist
+          run-id: ${{ steps.get-metadata.outputs.RUN_ID }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path: temp-dist
 
-      - name: Setup metadata and prepare folders
+      - name: Prepare folders
         id: setup-metadata
         env:
           GH_TOKEN: ${{ github.token }}
-          PR_NUM: ${{ github.event.workflow_run.pull_requests[0].number || inputs.pr_number }}
+          PR_NUM: ${{ steps.get-metadata.outputs.PR_NUM }}
+          SHA: ${{ steps.get-metadata.outputs.SHA }}
+          SHORT_SHA: ${{ steps.get-metadata.outputs.SHORT_SHA }}
         run: |
-          # Get SHA from triggering workflow, or from manual input
-          if [ "${{ github.event_name }}" == "workflow_run" ]; then
-            SHA="${{ github.event.workflow_run.head_sha }}"
-          else
-            echo "Fetching latest SHA for PR #$PR_NUM..."
-            SHA=$(gh pr view "$PR_NUM" --repo ${{ github.repository }} --json headRefOid --template '{{.headRefOid}}')
-          fi
-          SHORT_SHA=${SHA::7}
-          UPLOAD_DIR_NAME="upload"
-
-          echo "Using SHA: ${SHA}"
+          echo "SHA: ${SHA}"
           echo "Short SHA: ${SHORT_SHA}"
+          echo "PR number: ${PR_NUM}"
           mkdir -p "${UPLOAD_DIR_NAME}/pr-${PR_NUM}/latest"
           mkdir -p "${UPLOAD_DIR_NAME}/pr-${PR_NUM}/${SHORT_SHA}"
           # Copy all 3 artifacts (plotly.js, plotly.min.js, plot-schema.json) to /latest/
@@ -65,10 +122,6 @@ jobs:
           echo "Created directory ${UPLOAD_DIR_FULL_PATH} with the following contents:"
           echo "$(ls -lR ${UPLOAD_DIR_FULL_PATH})"
 
-          echo "PR_NUM=${PR_NUM}" >> $GITHUB_OUTPUT
-          echo "SHA=${SHA}" >> $GITHUB_OUTPUT
-          echo "SHORT_SHA=${SHORT_SHA}" >> $GITHUB_OUTPUT
-
       - name: Generate GitHub App token
         id: generate-token
         uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3  #v3.1.1
@@ -87,32 +140,45 @@ jobs:
 
       - name: Commit and push files
         id: commit-and-push
+        env:
+          PR_NUM: ${{ steps.get-metadata.outputs.PR_NUM }}
+          SHORT_SHA: ${{ steps.get-metadata.outputs.SHORT_SHA }}
         run: |
-          # 1. Move 'upload' directory into repo folder and cd into repo root
-          mkdir -p plotly.js-dev-builds/upload/
-          cp -r upload/ plotly.js-dev-builds/
+          # Move 'pr-NNNN/' directory into upload directory inside repo and cd into repo root
+          TARGET_DIR="${UPLOAD_DIR_NAME}/pr-${PR_NUM}"
+          mkdir -p "plotly.js-dev-builds/${UPLOAD_DIR_NAME}"
+          cp -r "${TARGET_DIR}" "plotly.js-dev-builds/${UPLOAD_DIR_NAME}"
           cd plotly.js-dev-builds
 
-          # 2. Configure git
+          # Configure git
           git config user.name "plotly.js-pr-upload"
           git config user.email "<>"
 
-          # 3. add, commit, and push
-          git add upload/
+          # Add files
+          git add "${TARGET_DIR}/"
+
+          # Ensure that only files in upload/pr-NNNN/ are staged
+          if git diff --name-only --cached | grep -qv "^${TARGET_DIR}/"; then
+            echo "Error: Changes detected outside ${TARGET_DIR}/"
+            exit 1
+          fi
 
           # Only commit if there are changes
           if git diff --staged --quiet; then
             echo "No changes to commit"
           else
-            git commit -m "Deploy build for PR #${{ steps.setup-metadata.outputs.PR_NUM }} (commit ${{ steps.setup-metadata.outputs.SHORT_SHA }})"
+            git commit -m "Deploy build for PR #${PR_NUM} (commit ${SHORT_SHA})"
             git push origin main
           fi
 
       - name: Generate summary
+        env:
+          PR_NUM: ${{ steps.get-metadata.outputs.PR_NUM }}
+          SHORT_SHA: ${{ steps.get-metadata.outputs.SHORT_SHA }}
         run: |
-          BASE="https://plotly.github.io/plotly.js-dev-builds/upload/pr-${{ steps.setup-metadata.outputs.PR_NUM }}"
+          BASE_URL="https://plotly.github.io/plotly.js-dev-builds/${UPLOAD_DIR_NAME}/pr-${PR_NUM}"
           echo "### PR Build Uploaded" >> $GITHUB_STEP_SUMMARY
-          echo "Builds for PR #${{ steps.setup-metadata.outputs.PR_NUM }} can be accessed at:" >> $GITHUB_STEP_SUMMARY
-          echo "- Latest build for this PR: [$BASE/latest/plotly.min.js]($BASE/latest/plotly.min.js)" >> $GITHUB_STEP_SUMMARY
-          echo "- Build for this commit: [$BASE/${{ steps.setup-metadata.outputs.SHA }}/plotly.min.js]($BASE/${{ steps.setup-metadata.outputs.SHA }}/plotly.min.js)" >> $GITHUB_STEP_SUMMARY
+          echo "Builds for PR #${PR_NUM} can be accessed at:" >> $GITHUB_STEP_SUMMARY
+          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

CHANGELOG.md

@@ -9,6 +9,20 @@ To see all merged commits on the master branch that will be part of the next plo
 
 where X.Y.Z is the semver of most recent plotly.js release.
 
+## [3.6.0] -- 2026-06-01
+
+### Added
+- Add support for arrays for the pie property `legendrank`, so that it can be configured per slice [[#7723](https://github.com/plotly/plotly.js/pull/7723)], with thanks to @my-tien for the contribution!
+- Add `hoversort` layout attribute to sort unified hover label items by value [[#7734](https://github.com/plotly/plotly.js/pull/7734)], with thanks to @kimsehwan96 for the contribution!
+
+### Fixed
+- Fix unexpected `ticklabelindex` behavior when minor ticks are not shown [[#7735](https://github.com/plotly/plotly.js/pull/7735)], with thanks to @my-tien for the contribution!
+- Fix issue where `hoveranywhere` / `clickanywhere` would not emit hover and click events over editable shapes [[#7788](https://github.com/plotly/plotly.js/pull/7788)]
+- Handle 'pixel' size mode for shape labels [[#7790](https://github.com/plotly/plotly.js/pull/7790)]
+- Update box plot defaults to fix issue with calling `Plotly.react` to switch from box to violin plot [[#7811](https://github.com/plotly/plotly.js/pull/7811)]
+- Include shapes with `legendgroup` specified when handling legend visibility toggling [[#7813](https://github.com/plotly/plotly.js/pull/7813)]
+
+
 ## [3.5.1] -- 2026-05-01
 
 ### Changed

CITATION.cff

@@ -9,7 +9,7 @@ authors:
 - family-names: "Samimi"
   given-names: "Mojtaba"
 title: "Open source Plotly charting library"
-version: 3.5.1
+version: 3.6.0
 doi: 10.5281/zenodo.13964707
-date-released: 2026-05-01
+date-released: 2026-06-01
 url: "https://github.com/plotly/plotly.js"

CONTRIBUTING.md

@@ -326,6 +326,17 @@ This will produce the following plot, and say you want to simulate a selection p
 
 <img src="https://user-images.githubusercontent.com/31989842/38890553-0bc6190c-4282-11e8-8efc-077bf05ca565.png">
 
+### Live links to dev builds
+
+The [Upload dev build from PR](.github/workflows/upload-dev-build.yml) workflow can be used to upload a dev build for a PR to the plotly.js-dev-builds repo, creating a live link to the plotly.js dev build which can be used in online coding environments to test and demo the PR.
+
+It is triggered in one of two ways:
+- Automatically on completion of the Publish Dist workflow, if triggered by a PR from a branch in the main repo (not a fork).
+- Manually via the Actions tab in the GitHub UI, by entering a PR number in the workflow inputs
+  - Only users with write access to the plotly.js repo can trigger workflows manually
+
+If you would like a link to the dev build for your PR but don't have permission to trigger the workflow, tag a maintainer to request a run for your PR.
+
 ## Repo organization
 
 - Distributed files are in `dist/`

README.md

@@ -62,7 +62,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
 
 ```html
 <head>
-    <script src="https://cdn.plot.ly/plotly-3.5.1.min.js" charset="utf-8"></script>
+    <script src="https://cdn.plot.ly/plotly-3.6.0.min.js" charset="utf-8"></script>
 </head>
 <body>
     <div id="gd"></div>
@@ -79,7 +79,7 @@ You may also consider using [`plotly.js-dist`](https://www.npmjs.com/package/plo
 Alternatively, you may consider using [native ES6 import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Modules) in the script tag.
 ```html
 <script type="module">
-    import "https://cdn.plot.ly/plotly-3.5.1.min.js"
+    import "https://cdn.plot.ly/plotly-3.6.0.min.js"
     Plotly.newPlot("gd", [{ y: [1, 2, 3] }])
 </script>
 ```
@@ -89,7 +89,7 @@ Fastly supports Plotly.js with free CDN service. Read more at <https://www.fastl
 ### Un-minified versions are also available on CDN
 While non-minified source files may contain characters outside UTF-8, it is recommended that you specify the `charset` when loading those bundles.
 ```html
-<script src="https://cdn.plot.ly/plotly-3.5.1.js" charset="utf-8"></script>
+<script src="https://cdn.plot.ly/plotly-3.6.0.js" charset="utf-8"></script>
 ```
 
 > Please note that as of v2 the "plotly-latest" outputs (e.g. https://cdn.plot.ly/plotly-latest.min.js) will no longer be updated on the CDN, and will stay at the last v1 patch v1.58.5. Therefore, to use the CDN with plotly.js v2 and higher, you must specify an exact plotly.js version.