diff --git a/packages/react-charts/package.json b/packages/react-charts/package.json index 1b5e1343d61..0f0533dad11 100644 --- a/packages/react-charts/package.json +++ b/packages/react-charts/package.json @@ -42,7 +42,7 @@ "@patternfly/react-styles": "workspace:^", "@patternfly/react-tokens": "workspace:^", "hoist-non-react-statics": "^3.3.2", - "lodash": "^4.17.23", + "lodash": "^4.18.1", "tslib": "^2.8.1" }, "devDependencies": { diff --git a/packages/react-integration/demo-app-ts/package.json b/packages/react-integration/demo-app-ts/package.json index d03f30abb3a..f47f0eb6b08 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.12.0", - "react-router-dom": "^7.12.0" + "react-router": "^7.14.1", + "react-router-dom": "^7.14.1" }, "devDependencies": { "@vitejs/plugin-react-swc": "^3.11.0", diff --git a/packages/react-integration/demo-app-ts/src/App.tsx b/packages/react-integration/demo-app-ts/src/App.tsx index a22193c65bb..cc067be8021 100755 --- a/packages/react-integration/demo-app-ts/src/App.tsx +++ b/packages/react-integration/demo-app-ts/src/App.tsx @@ -52,9 +52,9 @@ class App extends Component<{}, AppState> { const htmlElement = document.getElementsByTagName('html')[0]; if (htmlElement) { if (isDarkTheme) { - htmlElement.classList.add('pf-theme-dark'); + htmlElement.classList.add('pf-v6-theme-dark'); } else { - htmlElement.classList.remove('pf-theme-dark'); + htmlElement.classList.remove('pf-v6-theme-dark'); } } }; @@ -99,7 +99,7 @@ class App extends Component<{}, AppState> { id="light-theme" aria-label="Light theme" label={`Light theme`} - name="light-theme" + name="theme" isChecked={!isDarkTheme} onChange={(_event: React.FormEvent, checked: boolean) => checked && this.onThemeSelect(false) @@ -111,7 +111,7 @@ class App extends Component<{}, AppState> { id="dark-theme" label="Dark theme" aria-label="Dark theme" - name="dark-theme" + name="theme" isChecked={isDarkTheme} onChange={(_event: React.FormEvent, checked: boolean) => checked && this.onThemeSelect(true) diff --git a/packages/react-integration/demo-app-ts/src/Demos.ts b/packages/react-integration/demo-app-ts/src/Demos.ts index fa66a655f6f..256d481d017 100644 --- a/packages/react-integration/demo-app-ts/src/Demos.ts +++ b/packages/react-integration/demo-app-ts/src/Demos.ts @@ -249,7 +249,7 @@ export const Demos: DemoInterface[] = [ }, { id: 'modal-deprecated-demo', - name: 'Modal Demo', + name: 'Modal Deprecated Demo', componentType: Examples.ModalDeprecatedDemo }, { diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx index b8b288e5dd1..624eafec14d 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/ChipDemo/ChipDemo.tsx @@ -5,7 +5,6 @@ export const ChipDemo: React.FunctionComponent = () => ( Chip with a really, really, REALLY long text - ; ); ChipDemo.displayName = 'ChipDemo'; diff --git a/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx index e638970bbd3..9dea694561e 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/ClipboardCopyDemo/ClipboardCopyDemo.tsx @@ -21,7 +21,7 @@ export class ClipboardCopyDemo extends Component { isBlock additionalActions={ - - + drawer-section {drawerContent} diff --git a/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx index d3d0de2d154..7d091b129d4 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/MenuDemo/MenuDrilldownDemo.tsx @@ -48,7 +48,7 @@ export class MenuDrilldownDemo extends Component { }; setHeight = (menuId: string, height: number) => { if ( - !this.state.menuHeights[menuId] || + this.state.menuHeights[menuId] === undefined || (menuId !== 'drilldown-rootMenu' && this.state.menuHeights[menuId] !== height) ) { this.setState({ diff --git a/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx b/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx index f4e0d7e0143..31eb2b13488 100644 --- a/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx +++ b/packages/react-integration/demo-app-ts/src/components/demos/NavDemo/NavDemo.tsx @@ -65,7 +65,7 @@ export class NavDemo extends Component { Default Nav -
+