diff --git a/.storybook/StorybookShell.tsx b/.storybook/StorybookShell.tsx index 860bfff2..0c68aed8 100644 --- a/.storybook/StorybookShell.tsx +++ b/.storybook/StorybookShell.tsx @@ -1,11 +1,8 @@ import type { ReactNode } from 'react' -import { Appearance, View } from 'react-native' -import { StyleSheet } from 'react-native-unistyles' +import { Appearance } from 'react-native' import { ThemeContextProvider, ThemeVariant } from '../src/theme' -import { StorybookToolbar } from './StorybookToolbar' - const initialTheme = Appearance.getColorScheme() === 'dark' ? ThemeVariant.Dark @@ -13,17 +10,6 @@ const initialTheme = export const StorybookShell = ({ children }: { children: ReactNode }) => ( - - - {children} - + {children} ) - -const styles = StyleSheet.create(({ semantic }, rt) => ({ - container: { - flex: 1, - paddingTop: rt.insets.top, - backgroundColor: semantic.colorScheme.color.bg.surface.default.default, - }, -})) diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 3b6433d3..e90578b9 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -2,12 +2,17 @@ import type { Preview } from '@storybook/react' import { StyleSheet } from 'react-native-unistyles' import { View } from 'react-native' +import { StorybookToolbar } from './StorybookToolbar' + const preview: Preview = { decorators: [ (Story) => ( - - - + <> + + + + + ), ], parameters: { diff --git a/design-tokens/input/tokens.json b/design-tokens/input/tokens.json index 464c0b5b..9f73b18a 100644 --- a/design-tokens/input/tokens.json +++ b/design-tokens/input/tokens.json @@ -1353,12 +1353,8 @@ "extend": { "borderColor": "{color.border.neutral.inverse}", "circle": { "borderRadius": "{dimension.borderRadius.max}" }, - "xl": { - "borderRadius": "{dimension.borderRadius.400}" - }, - "lg": { - "borderRadius": "{dimension.borderRadius.350}" - } + "xl": { "borderRadius": "{dimension.borderRadius.400}" }, + "lg": { "borderRadius": "{dimension.borderRadius.350}" } }, "root": { "width": "{dimension.size.900}", @@ -2713,20 +2709,20 @@ "background": "{color.bg.surface.raised.default}", "borderColor": "{color.border.neutral.default}", "color": "{color.fg.default}", - "borderRadius": "{dimension.borderRadius.500}", + "borderRadius": "{dimension.size.700}", "shadow": "{effects.elevation.400}" }, "header": { - "padding": "{dimension.space.700} {dimension.space.700} {dimension.space.400} {dimension.space.700}", + "padding": "{dimension.space.600} {dimension.space.600} {dimension.space.400} {dimension.space.600}", "gap": "{dimension.space.200}" }, "title": { - "fontSize": "{fonts.fontSize.500}", + "fontSize": "{fonts.fontSize.400}", "fontWeight": "{fonts.fontWeight.demibold}" }, "content": { "padding": "{dimension.space.700}" }, "footer": { - "padding": "{dimension.space.none} {dimension.space.700} {dimension.space.700} {dimension.space.700}", + "padding": "{dimension.space.none} {dimension.space.600} {dimension.space.600} {dimension.space.600}", "gap": "{dimension.space.200}" }, "colorScheme": { diff --git a/jest.setup.ts b/jest.setup.ts index 850baa92..ece05e5c 100644 --- a/jest.setup.ts +++ b/jest.setup.ts @@ -120,7 +120,7 @@ unistyles.StyleSheet.create = jest.fn( (stylesheet: ((theme: ReturnType) => unknown) | unknown) => { const styleDefinitions = typeof stylesheet === 'function' - ? stylesheet(getTheme(runtime.themeName)) + ? stylesheet(getTheme(runtime.themeName), runtime.miniRuntime) : stylesheet const activeVariants: Record = {} diff --git a/src/components/Dialog/Dialog.md b/src/components/Dialog/Dialog.md new file mode 100644 index 00000000..fee0ea06 --- /dev/null +++ b/src/components/Dialog/Dialog.md @@ -0,0 +1,191 @@ +# Dialog + +Управляемое модальное окно с отдельными шапкой, содержимым и футером. + +## Использование + +```tsx +import { useState } from 'react' +import { + Button, + Dialog, + DialogActions, + DialogHeader, + Body, +} from '@cdek-it/react-native-ui-kit' + +export function OrderDialog() { + const [visible, setVisible] = useState(false) + const close = () => setVisible(false) + + return ( + <> +