diff --git a/packages/react/src/context/config.ts b/packages/react/.storybook/themeConfig.ts similarity index 95% rename from packages/react/src/context/config.ts rename to packages/react/.storybook/themeConfig.ts index 22b1661e..a5756eb7 100644 --- a/packages/react/src/context/config.ts +++ b/packages/react/.storybook/themeConfig.ts @@ -128,4 +128,13 @@ mergedTheme.unstable_sxConfig = { ...muiSxConfig, ...joySxConfig, }; -export default mergedTheme; + +export default { + theme: mergedTheme, + defaultMode: 'dark', + slotProps: { + provider: { + defaultMode: 'dark', + }, + }, +}; diff --git a/packages/react/src/GoogleLoginButton/GoogleLoginButton.stories.tsx b/packages/react/src/GoogleLoginButton/GoogleLoginButton.stories.tsx index ebc4af16..f3d404df 100644 --- a/packages/react/src/GoogleLoginButton/GoogleLoginButton.stories.tsx +++ b/packages/react/src/GoogleLoginButton/GoogleLoginButton.stories.tsx @@ -4,6 +4,7 @@ import Stack from '@mui/joy/Stack'; import Input from '@mui/joy/Input'; import { NileProvider } from '../context'; +import theme from '../../.storybook/themeConfig'; import GoogleLoginButton from './GoogleLoginButton'; @@ -17,7 +18,7 @@ export default meta; export function Basic() { return ( - +
@@ -28,7 +29,7 @@ export function Basic() { export function BasicWithTenantNameProvider() { const [newTenant, setNewTenant] = React.useState(); return ( - +
@@ -57,7 +58,7 @@ export function AlphaVersionWithOutProvider() { export function AlphaVersionWithProvider() { return ( - +
diff --git a/packages/react/src/LoginForm/UserLoginForm.stories.tsx b/packages/react/src/LoginForm/UserLoginForm.stories.tsx index ce0fc1de..5a8b1897 100644 --- a/packages/react/src/LoginForm/UserLoginForm.stories.tsx +++ b/packages/react/src/LoginForm/UserLoginForm.stories.tsx @@ -2,6 +2,7 @@ import React from 'react'; import { Meta } from '@storybook/react'; import Stack from '@mui/joy/Stack'; +import theme from '../../.storybook/themeConfig'; import LoginForm from '../../src/LoginForm'; import { NileProvider } from '../../src/context'; @@ -14,8 +15,12 @@ export default meta; export function Basic() { return ( - - + + alert('success!')} /> diff --git a/packages/react/src/SSO/SSO.stories.tsx b/packages/react/src/SSO/SSO.stories.tsx index 97fa09da..41e41073 100644 --- a/packages/react/src/SSO/SSO.stories.tsx +++ b/packages/react/src/SSO/SSO.stories.tsx @@ -1,7 +1,9 @@ import React from 'react'; +import Typography from '@mui/joy/Typography'; import { Meta } from '@storybook/react'; import { NileProvider } from '../context'; +import theme from '../../.storybook/themeConfig'; import BaseSSOForm, { Okta } from '.'; @@ -14,9 +16,16 @@ export default meta; export function BasicSSO() { return ( - -
+ +
+ Some kind of cool explaination Some kind of cool explaination + } providerName="placeholder" onSuccess={() => alert('success!')} /> @@ -26,8 +35,11 @@ export function BasicSSO() { } export function OktaSSO() { return ( - -
+ +
{ alert('success!'); diff --git a/packages/react/src/SignUpForm/NewUserSignUp.stories.tsx b/packages/react/src/SignUpForm/NewUserSignUp.stories.tsx index 76546464..c227c031 100644 --- a/packages/react/src/SignUpForm/NewUserSignUp.stories.tsx +++ b/packages/react/src/SignUpForm/NewUserSignUp.stories.tsx @@ -2,6 +2,7 @@ import React from 'react'; import { Meta } from '@storybook/react'; import { NileProvider } from '../context'; +import theme from '../../.storybook/themeConfig'; import SignUpForm from '.'; @@ -14,8 +15,11 @@ export default meta; export function Basic() { return ( - -
+ +
alert('success!')} />
diff --git a/packages/react/src/UserTenantList/UserList.stories.tsx b/packages/react/src/UserTenantList/UserList.stories.tsx index b820ee17..c3247d83 100644 --- a/packages/react/src/UserTenantList/UserList.stories.tsx +++ b/packages/react/src/UserTenantList/UserList.stories.tsx @@ -2,6 +2,7 @@ import React from 'react'; import { Meta } from '@storybook/react'; import { NileProvider } from '../context'; +import theme from '../../.storybook/themeConfig'; import UserList from '.'; @@ -22,7 +23,7 @@ const users = [ ]; export function Basic() { return ( - + ); diff --git a/packages/react/src/context/index.tsx b/packages/react/src/context/index.tsx index c85c7370..d73a8fb3 100644 --- a/packages/react/src/context/index.tsx +++ b/packages/react/src/context/index.tsx @@ -34,6 +34,7 @@ export const NileProvider = (props: NileProviderProps) => { const { children, theme, + slotProps, tenantId, QueryProvider = BaseQueryProvider, basePath = 'https://api.thenile.dev', @@ -55,7 +56,7 @@ export const NileProvider = (props: NileProviderProps) => { return ( - + {children} diff --git a/packages/react/src/context/theme.tsx b/packages/react/src/context/theme.tsx index 3c3ed33d..c5082b61 100644 --- a/packages/react/src/context/theme.tsx +++ b/packages/react/src/context/theme.tsx @@ -4,17 +4,17 @@ import CssBaseline from '@mui/material/CssBaseline'; import { Theme } from '@mui/joy/styles'; import { CssVarsProvider as JoyCssVarsProvider } from '@mui/joy/styles'; -import defaultTheme from './config'; - export default function Themer({ theme, children, + slotProps, }: { theme?: Theme; children: JSX.Element; + slotProps?: Record; }) { return ( - + {children} diff --git a/packages/react/src/context/types.ts b/packages/react/src/context/types.ts index 6c5c83ce..ac58b789 100644 --- a/packages/react/src/context/types.ts +++ b/packages/react/src/context/types.ts @@ -14,6 +14,9 @@ export type NileContext = NileReactConfig & { export type NileProviderProps = NileReactConfig & { children: JSX.Element | JSX.Element[]; theme?: Theme; + slotProps?: { + provider?: Record; + }; QueryProvider?: (props: { children: JSX.Element }) => JSX.Element; api?: Browser; }; diff --git a/packages/react/src/lib/SimpleForm/index.tsx b/packages/react/src/lib/SimpleForm/index.tsx index d1b6263c..349a2127 100644 --- a/packages/react/src/lib/SimpleForm/index.tsx +++ b/packages/react/src/lib/SimpleForm/index.tsx @@ -164,9 +164,6 @@ export default function SimpleForm(props: { endDecorator={ field.value ? options[0].label : options[1].label } - sx={{ - '--Switch-thumbSize': '28px', - }} /> ); }} diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index 5552f310..df016d3c 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -1,7 +1,7 @@ { "extends": "../../tsconfig", // see https://www.typescriptlang.org/tsconfig to better understand tsconfigs - "include": ["src/**/*", "test", "src/**/*.stories.tsx"], + "include": ["src/**/*", "test", "src/**/*.stories.tsx", ".storybook/config.ts"], "compilerOptions": { "jsx": "react", "lib": ["dom", "esnext"],