diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 749f84f8..775a1fe1 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -21,7 +21,7 @@ importers: '@itwin/delete-itwin-react': workspace:* '@itwin/imodel-browser-react': workspace:* '@itwin/itwinui-icons-react': 2.10.0 - '@itwin/itwinui-react': 3.18.0 + '@itwin/itwinui-react': ^3.19.4 '@itwin/manage-versions-react': workspace:* '@itwin/storybook-auth-addon': workspace:* '@storybook/addon-actions': ^6.5.16 @@ -66,7 +66,7 @@ importers: '@itwin/delete-itwin-react': link:../../modules/delete-itwin '@itwin/imodel-browser-react': link:../../modules/imodel-browser '@itwin/itwinui-icons-react': 2.10.0_nnrd3gsncyragczmpvfhocinkq - '@itwin/itwinui-react': 3.18.0_nnrd3gsncyragczmpvfhocinkq + '@itwin/itwinui-react': 3.19.4_nnrd3gsncyragczmpvfhocinkq '@itwin/manage-versions-react': link:../../modules/manage-versions '@itwin/storybook-auth-addon': link:../../modules/storybook-auth-addon '@storybook/addon-actions': 6.5.16_nnrd3gsncyragczmpvfhocinkq @@ -2739,6 +2739,7 @@ packages: react: 18.3.1 react-dom: 18.3.1_react@18.3.1 tabbable: 6.2.0 + dev: false /@floating-ui/utils/0.2.10: resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==} @@ -2864,6 +2865,7 @@ packages: react: 18.3.1 react-dom: 18.3.1_react@18.3.1 react-table: 7.8.0_react@18.3.1 + dev: false /@itwin/itwinui-react/3.19.4_nnrd3gsncyragczmpvfhocinkq: resolution: {integrity: sha512-DEKmeMyW2w3DDyzt1KHrfXmyj1A0DkTbgF7R+PvrQrkDVh5+08vnAV/Q+EK9fkKUOuRL8P0lvhMhIPhRa1l1eQ==} @@ -5312,6 +5314,7 @@ packages: resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==} dependencies: tslib: 2.8.1 + dev: false /@swc/helpers/0.5.17: resolution: {integrity: sha512-5IKx/Y13RsYd+sauPb2x+U/xZikHjolzfuDgTAl/Tdf3Q8rslRvC19NKDLgAJQ6wsqADk10ntlv08nPFw/gO/A==} @@ -5339,6 +5342,7 @@ packages: '@tanstack/virtual-core': 3.13.6 react: 18.3.1 react-dom: 18.3.1_react@18.3.1 + dev: false /@tanstack/virtual-core/3.13.12: resolution: {integrity: sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==} @@ -5346,6 +5350,7 @@ packages: /@tanstack/virtual-core/3.13.6: resolution: {integrity: sha512-cnQUeWnhNP8tJ4WsGcYiX24Gjkc9ALstLbHcBj1t3E7EimN6n6kHH+DPV4PpDnuw00NApQp+ViojMj1GRdwYQg==} + dev: false /@testing-library/dom/10.4.0: resolution: {integrity: sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==} diff --git a/packages/apps/storybook/.storybook/preview.js b/packages/apps/storybook/.storybook/preview.js index 55c082a4..0fb8fbaa 100644 --- a/packages/apps/storybook/.storybook/preview.js +++ b/packages/apps/storybook/.storybook/preview.js @@ -2,16 +2,11 @@ * Copyright (c) Bentley Systems, Incorporated. All rights reserved. * See LICENSE.md in the project root for license terms and full copyright notice. *--------------------------------------------------------------------------------------------*/ -import React from "react"; import { ThemeProvider } from "@itwin/itwinui-react"; -import addons from "@storybook/addons"; import { themes } from "@storybook/theming"; - +import { useDarkMode } from "storybook-dark-mode"; import { darkTheme, lightTheme } from "./itwinTheme"; -import '@itwin/itwinui-react/styles.css'; - -// get an instance to the communication channel for the manager and preview -const channel = addons.getChannel(); +import "@itwin/itwinui-react/styles.css"; export const parameters = { actions: { argTypesRegex: "^on[A-Z].*" }, @@ -31,24 +26,15 @@ export const parameters = { }, }; -const useTheme = () => { - const [dark, setDark] = React.useState(false); - - React.useEffect(() => { - channel.on("DARK_MODE", setDark); - }, []); - - return dark ? "dark" : "light"; -} - export const decorators = [ (Story) => { - const theme = useTheme(); + const isDark = useDarkMode(); + const theme = isDark ? "dark" : "light"; return ( - - - + + + ); }, -]; +]; \ No newline at end of file diff --git a/packages/apps/storybook/package.json b/packages/apps/storybook/package.json index ba39d9ff..fda75d4d 100644 --- a/packages/apps/storybook/package.json +++ b/packages/apps/storybook/package.json @@ -14,7 +14,7 @@ "@itwin/delete-itwin-react": "workspace:*", "@itwin/imodel-browser-react": "workspace:*", "@itwin/itwinui-icons-react": "2.10.0", - "@itwin/itwinui-react": "3.18.0", + "@itwin/itwinui-react": "^3.19.4", "@itwin/manage-versions-react": "workspace:*", "@itwin/storybook-auth-addon": "workspace:*", "@storybook/addon-actions": "^6.5.16",