diff --git a/.github/release.sh b/.github/release.sh index 506097c32a9..d860327d884 100755 --- a/.github/release.sh +++ b/.github/release.sh @@ -17,10 +17,14 @@ echo "Doing a release..." LOG=$(git log --format="%s" -1 | grep -Poe "#\d+") PR_NUM=${LOG:1} -yarn run lerna publish prerelease --preid=prerelease --dist-tag=prerelease --yes 2>&1 | tee lerna-output.txt +#yarn run lerna publish prerelease --preid=prerelease --dist-tag=prerelease --yes 2>&1 | tee lerna-output.txt +# Patch release +yarn run lerna publish patch --dist-tag=prerelease-patch --no-private --yes 2>&1 | tee lerna-output.txt # use lerna command below for dry run #yarn run lerna version prerelease --preid=prerelease --yes --no-git-tag-version --no-push | tee lerna-output.txt +# use lerna command below for dry run for patch release +#yarn run lerna version patch --yes --no-git-tag-version --no-push --no-private | tee lerna-output.txt if grep -i "Successfully published" lerna-output.txt; # Leave a Github comment then diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 66e9c84d2df..f0e311a38d0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: push: branches: - - main + - 6.4.x concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/lerna.json b/lerna.json index c0c2c7cbe39..99816a89984 100644 --- a/lerna.json +++ b/lerna.json @@ -24,7 +24,7 @@ } }, "version": "independent", - "allowBranch": ["main", "v4", "5.0.x", "6.3.x", "v5"], + "allowBranch": ["main", "v4", "5.0.x", "6.3.x", "6.4.x", "v5"], "packages": ["packages/*", "packages/react-integration/demo-app-ts"], "$schema": "node_modules/lerna/schemas/lerna-schema.json" } diff --git a/packages/react-charts/CHANGELOG.md b/packages/react-charts/CHANGELOG.md index 19deb37c9df..46ab115b85f 100644 --- a/packages/react-charts/CHANGELOG.md +++ b/packages/react-charts/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [8.4.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-charts@8.4.0...@patternfly/react-charts@8.4.1) (2026-01-28) + +**Note:** Version bump only for package @patternfly/react-charts + # [8.4.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-charts@8.4.0-prerelease.4...@patternfly/react-charts@8.4.0) (2025-10-16) **Note:** Version bump only for package @patternfly/react-charts diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json index d328f6e8bba..d04f2f1f683 100644 --- a/packages/react-charts/package.json +++ b/packages/react-charts/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-charts", - "version": "8.4.0", + "version": "8.4.1", "description": "This library provides a set of React chart components for use with the PatternFly reference implementation.", "main": "dist/js/index.js", "module": "dist/esm/index.js", @@ -42,7 +42,7 @@ "@patternfly/react-styles": "workspace:^", "@patternfly/react-tokens": "workspace:^", "hoist-non-react-statics": "^3.3.2", - "lodash": "^4.17.21", + "lodash": "^4.17.23", "tslib": "^2.8.1" }, "devDependencies": { diff --git a/packages/react-charts/src/victory/components/ChartCursorTooltip/__snapshots__/ChartCursorFlyout.test.tsx.snap b/packages/react-charts/src/victory/components/ChartCursorTooltip/__snapshots__/ChartCursorFlyout.test.tsx.snap index b655956fd5d..4eb9b6d341d 100644 --- a/packages/react-charts/src/victory/components/ChartCursorTooltip/__snapshots__/ChartCursorFlyout.test.tsx.snap +++ b/packages/react-charts/src/victory/components/ChartCursorTooltip/__snapshots__/ChartCursorFlyout.test.tsx.snap @@ -18,12 +18,12 @@ exports[`allows tooltip via container component 1`] = ` width="200" > - {(isUploadEnabled || emptyState) && !value ? ( + {isUploadEnabled || emptyState ? (
event.stopPropagation() // Prevents clicking TextArea from opening file dialog diff --git a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap index 80f02fa90b6..7401f59a595 100644 --- a/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap +++ b/packages/react-code-editor/src/components/CodeEditor/__test__/__snapshots__/CodeEditor.test.tsx.snap @@ -6,124 +6,130 @@ exports[`Matches snapshot with control buttons enabled 1`] = ` class="pf-v6-c-code-editor" > -
-
-
-
diff --git a/packages/react-core/CHANGELOG.md b/packages/react-core/CHANGELOG.md index 2dda274c9e3..409b9096a71 100644 --- a/packages/react-core/CHANGELOG.md +++ b/packages/react-core/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.4.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@6.4.0...@patternfly/react-core@6.4.1) (2026-01-28) + +### Bug Fixes + +- **Wizard:** Fix crash in nav when first sub-step is hidden ([#12166](https://github.com/patternfly/patternfly-react/issues/12166)) ([900686d](https://github.com/patternfly/patternfly-react/commit/900686dbfda5ab47731e64e3be1fcd2eeedee358)) + # [6.4.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-core@6.4.0-prerelease.5...@patternfly/react-core@6.4.0) (2025-10-16) **Note:** Version bump only for package @patternfly/react-core diff --git a/packages/react-core/package.json b/packages/react-core/package.json index dae5f7d8dfa..90ebe8e3f92 100644 --- a/packages/react-core/package.json +++ b/packages/react-core/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-core", - "version": "6.4.0", + "version": "6.4.1", "description": "This library provides a set of common React components for use with the PatternFly reference implementation.", "main": "dist/js/index.js", "module": "dist/esm/index.js", diff --git a/packages/react-core/src/components/Wizard/WizardNavInternal.tsx b/packages/react-core/src/components/Wizard/WizardNavInternal.tsx index 3ac47570b1c..b94d0f7ec57 100644 --- a/packages/react-core/src/components/Wizard/WizardNavInternal.tsx +++ b/packages/react-core/src/components/Wizard/WizardNavInternal.tsx @@ -48,7 +48,7 @@ export const WizardNavInternal = ({ let firstSubStepIndex: number; let hasActiveChild = false; - const subNavItems = step.subStepIds?.map((subStepId, subStepIndex) => { + const subNavItems = step.subStepIds?.map((subStepId, _subStepIndex) => { const subStep = steps.find((step) => step.id === subStepId); const hasVisitedNextStep = steps.some((step) => step.index > subStep.index && step.isVisited); const isSubStepDisabled = @@ -66,8 +66,8 @@ export const WizardNavInternal = ({ return; } - // Store the first sub-step index so that when its parent is clicked, the first sub-step is focused - if (subStepIndex === 0) { + // Store the first visible sub-step index so that when its parent is clicked, the first sub-step is focused + if (firstSubStepIndex === undefined) { firstSubStepIndex = subStep.index; } diff --git a/packages/react-core/src/components/Wizard/__tests__/Wizard.test.tsx b/packages/react-core/src/components/Wizard/__tests__/Wizard.test.tsx index 49780e335bd..f421a173571 100644 --- a/packages/react-core/src/components/Wizard/__tests__/Wizard.test.tsx +++ b/packages/react-core/src/components/Wizard/__tests__/Wizard.test.tsx @@ -627,3 +627,42 @@ test('onStepChange skips over disabled or hidden steps and substeps', async () = WizardStepChangeScope.Back ); }); + +test('clicking parent step navigates to first visible sub-step when first sub-step is hidden', async () => { + const user = userEvent.setup(); + const onStepChange = jest.fn(); + + render( + + + , + , + + ]} + /> + + + ); + + // Navigate to step 3 first + await user.click(screen.getByRole('button', { name: 'Test step 3' })); + expect(onStepChange).toHaveBeenCalledWith( + null, + expect.objectContaining({ id: 'step-3' }), + expect.objectContaining({ id: 'step-1' }), + WizardStepChangeScope.Nav + ); + + // Click on parent step 2 - should navigate to the first VISIBLE sub-step (step2-sub2), not crash + await user.click(screen.getByRole('button', { name: 'Test step 2' })); + expect(onStepChange).toHaveBeenCalledWith( + null, + expect.objectContaining({ id: 'step2-sub2' }), + expect.objectContaining({ id: 'step-3' }), + WizardStepChangeScope.Nav + ); +}); diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md index eb03b654db9..c81f42891ea 100644 --- a/packages/react-docs/CHANGELOG.md +++ b/packages/react-docs/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [7.4.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-docs@7.4.0...@patternfly/react-docs@7.4.1) (2026-01-28) + +**Note:** Version bump only for package @patternfly/react-docs + # [7.4.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-docs@7.4.0-prerelease.7...@patternfly/react-docs@7.4.0) (2025-10-16) **Note:** Version bump only for package @patternfly/react-docs diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index 81e513303dd..ba7a1897acb 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -1,7 +1,7 @@ { "name": "@patternfly/react-docs", "description": "PatternFly React Docs", - "version": "7.4.0", + "version": "7.4.1", "publishConfig": { "access": "public", "tag": "prerelease" diff --git a/packages/react-drag-drop/CHANGELOG.md b/packages/react-drag-drop/CHANGELOG.md index a4ea794807b..f769dcda948 100644 --- a/packages/react-drag-drop/CHANGELOG.md +++ b/packages/react-drag-drop/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.4.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-drag-drop@6.4.0...@patternfly/react-drag-drop@6.4.1) (2026-01-28) + +**Note:** Version bump only for package @patternfly/react-drag-drop + # [6.4.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-drag-drop@6.4.0-prerelease.5...@patternfly/react-drag-drop@6.4.0) (2025-10-16) **Note:** Version bump only for package @patternfly/react-drag-drop diff --git a/packages/react-drag-drop/package.json b/packages/react-drag-drop/package.json index f11fd13d755..2fc6e45bc98 100644 --- a/packages/react-drag-drop/package.json +++ b/packages/react-drag-drop/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-drag-drop", - "version": "6.4.0", + "version": "6.4.1", "description": "PatternFly drag and drop solution", "main": "dist/js/index.js", "module": "dist/esm/index.js", diff --git a/packages/react-integration/demo-app-ts/package.json b/packages/react-integration/demo-app-ts/package.json index 485c20195b9..57e022da5e9 100644 --- a/packages/react-integration/demo-app-ts/package.json +++ b/packages/react-integration/demo-app-ts/package.json @@ -11,8 +11,8 @@ "@patternfly/react-core": "workspace:^", "react": "^18.3.1", "react-dom": "^18.3.1", - "react-router": "^7.3.0", - "react-router-dom": "^7.3.0" + "react-router": "^7.12.0", + "react-router-dom": "^7.12.0" }, "devDependencies": { "@vitejs/plugin-react-swc": "^3.9.0", diff --git a/packages/react-table/CHANGELOG.md b/packages/react-table/CHANGELOG.md index bda24dd30e4..63e5148be79 100644 --- a/packages/react-table/CHANGELOG.md +++ b/packages/react-table/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.4.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-table@6.4.0...@patternfly/react-table@6.4.1) (2026-01-28) + +**Note:** Version bump only for package @patternfly/react-table + # [6.4.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-table@6.4.0-prerelease.6...@patternfly/react-table@6.4.0) (2025-10-16) **Note:** Version bump only for package @patternfly/react-table diff --git a/packages/react-table/package.json b/packages/react-table/package.json index cbab99e0dcf..f80ba99e035 100644 --- a/packages/react-table/package.json +++ b/packages/react-table/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-table", - "version": "6.4.0", + "version": "6.4.1", "description": "This library provides a set of React table components for use with the PatternFly 4", "main": "dist/js/index.js", "module": "dist/esm/index.js", @@ -44,7 +44,7 @@ "@patternfly/react-icons": "workspace:^", "@patternfly/react-styles": "workspace:^", "@patternfly/react-tokens": "workspace:^", - "lodash": "^4.17.21", + "lodash": "^4.17.23", "tslib": "^2.8.1" }, "peerDependencies": { diff --git a/packages/react-templates/CHANGELOG.md b/packages/react-templates/CHANGELOG.md index 82cb6098f25..3c2fa7a3c71 100644 --- a/packages/react-templates/CHANGELOG.md +++ b/packages/react-templates/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [6.4.1](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-templates@6.4.0...@patternfly/react-templates@6.4.1) (2026-01-28) + +**Note:** Version bump only for package @patternfly/react-templates + # [6.4.0](https://github.com/patternfly/patternfly-react/compare/@patternfly/react-templates@6.4.0-prerelease.6...@patternfly/react-templates@6.4.0) (2025-10-16) **Note:** Version bump only for package @patternfly/react-templates diff --git a/packages/react-templates/package.json b/packages/react-templates/package.json index a311a50e760..d4db5c94fcd 100644 --- a/packages/react-templates/package.json +++ b/packages/react-templates/package.json @@ -1,6 +1,6 @@ { "name": "@patternfly/react-templates", - "version": "6.4.0", + "version": "6.4.1", "description": "This package provides wrapped component demos for ease of use\n", "main": "dist/js/index.js", "module": "dist/esm/index.js", diff --git a/yarn.lock b/yarn.lock index 185d663cf88..b93ab9c0519 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4337,7 +4337,7 @@ __metadata: fs-extra: "npm:^11.3.0" hoist-non-react-statics: "npm:^3.3.2" jest-canvas-mock: "npm:^2.5.2" - lodash: "npm:^4.17.21" + lodash: "npm:^4.17.23" tslib: "npm:^2.8.1" peerDependencies: echarts: ^5.6.0 || ^6.0.0 @@ -4581,7 +4581,7 @@ __metadata: "@patternfly/react-icons": "workspace:^" "@patternfly/react-styles": "workspace:^" "@patternfly/react-tokens": "workspace:^" - lodash: "npm:^4.17.21" + lodash: "npm:^4.17.23" tslib: "npm:^2.8.1" peerDependencies: react: ^17 || ^18 || ^19 @@ -9942,8 +9942,8 @@ __metadata: "@vitejs/plugin-react-swc": "npm:^3.9.0" react: "npm:^18.3.1" react-dom: "npm:^18.3.1" - react-router: "npm:^7.3.0" - react-router-dom: "npm:^7.3.0" + react-router: "npm:^7.12.0" + react-router-dom: "npm:^7.12.0" vite: "npm:^6.2.2" languageName: unknown linkType: soft @@ -16020,6 +16020,13 @@ __metadata: languageName: node linkType: hard +"lodash@npm:^4.17.23": + version: 4.17.23 + resolution: "lodash@npm:4.17.23" + checksum: 10c0/1264a90469f5bb95d4739c43eb6277d15b6d9e186df4ac68c3620443160fc669e2f14c11e7d8b2ccf078b81d06147c01a8ccced9aab9f9f63d50dcf8cace6bf6 + languageName: node + linkType: hard + "log-symbols@npm:^2.1.0": version: 2.2.0 resolution: "log-symbols@npm:2.2.0" @@ -19316,21 +19323,21 @@ __metadata: languageName: node linkType: hard -"react-router-dom@npm:^7.3.0": - version: 7.3.0 - resolution: "react-router-dom@npm:7.3.0" +"react-router-dom@npm:^7.12.0": + version: 7.13.0 + resolution: "react-router-dom@npm:7.13.0" dependencies: - react-router: "npm:7.3.0" + react-router: "npm:7.13.0" peerDependencies: react: ">=18" react-dom: ">=18" - checksum: 10c0/62360eb87d64081b413591a8c96dbf0f1f568df2e1b2748179a586f0ccd891df85acf25a52b6425fee8614266d53fd7ba9944b5c7ab6478966c46daa546307b8 + checksum: 10c0/759bd5e7fe7b5baba50a0264724188707682d217cad8eac702a55e0b1abebf295be014dd3bfaff8e3c2def9dfaa23e6ded3f908feab84df766e9b82cc3774e98 languageName: node linkType: hard -"react-router@npm:7.3.0, react-router@npm:^7.3.0": - version: 7.3.0 - resolution: "react-router@npm:7.3.0" +"react-router@npm:7.13.0, react-router@npm:^7.12.0": + version: 7.13.0 + resolution: "react-router@npm:7.13.0" dependencies: "@types/cookie": "npm:^0.6.0" cookie: "npm:^1.0.1" @@ -19342,7 +19349,7 @@ __metadata: peerDependenciesMeta: react-dom: optional: true - checksum: 10c0/2965a8a7598afaeb5c4d10c3364452df924bed9b03f6b18d7049e4b93054e2412749d0621b2ff4cdd7791af9fb843148aefbea3db2ffc9f43ef68f9df0c0241d + checksum: 10c0/397cb009bc83d071269c8f9323bbfe1f856721fde75e39b29fe0ddfe7564ebdc3b8bbb85768321cae92ec28b406e8fac7eab7e232d0738b3b1c092e2764e4307 languageName: node linkType: hard