From 44bf6276876e7d67ab927e2df1eecbb008217b91 Mon Sep 17 00:00:00 2001 From: Alesya Volosach Date: Fri, 6 Nov 2026 17:40:29 +0300 Subject: [PATCH 1/5] =?UTF-8?q?fix(storybook):=20=D0=B8=D1=81=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=83=D1=87=D1=91=D1=82=20saf?= =?UTF-8?q?e=20area=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8=20Controls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .storybook/StorybookShell.tsx | 18 ++---------------- .storybook/preview.tsx | 11 ++++++++--- 2 files changed, 10 insertions(+), 19 deletions(-) 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: { From f851bd6b025d5bc386e3f4356f637adc817d5a49 Mon Sep 17 00:00:00 2001 From: Alesya Volosach Date: Fri, 6 Nov 2026 17:40:29 +0300 Subject: [PATCH 2/5] =?UTF-8?q?fix(tokens):=20=D0=BE=D0=B1=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=82=D0=BE=D0=BA=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20Dialog=20=D0=BF=D0=BE=20=D0=BC=D0=B0=D0=BA=D0=B5=D1=82?= =?UTF-8?q?=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- design-tokens/input/tokens.json | 16 ++++++---------- src/theme/tokens/components/dark.json | 16 ++++++++-------- src/theme/tokens/components/light.json | 16 ++++++++-------- 3 files changed, 22 insertions(+), 26 deletions(-) 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/src/theme/tokens/components/dark.json b/src/theme/tokens/components/dark.json index 565612f6..4e5adfc8 100644 --- a/src/theme/tokens/components/dark.json +++ b/src/theme/tokens/components/dark.json @@ -1069,23 +1069,23 @@ "background": "#56595f", "borderColor": "#404348", "color": "#ffffff", - "borderRadius": 20, + "borderRadius": 24, "shadow": "0 4px 8px rgba(0, 0, 0, 0.2000)" }, "header": { - "paddingTop": 24, - "paddingRight": 24, + "paddingTop": 20, + "paddingRight": 20, "paddingBottom": 14, - "paddingLeft": 24, + "paddingLeft": 20, "gap": 8 }, - "title": { "fontSize": 20, "fontWeight": 600 }, + "title": { "fontSize": 18, "fontWeight": 600 }, "content": { "padding": 24 }, "footer": { "paddingTop": 0, - "paddingRight": 24, - "paddingBottom": 24, - "paddingLeft": 24, + "paddingRight": 20, + "paddingBottom": 20, + "paddingLeft": 20, "gap": 8 }, "colorScheme": { "root": { "background": "#2b2e33" } } diff --git a/src/theme/tokens/components/light.json b/src/theme/tokens/components/light.json index 0b843487..560b47d7 100644 --- a/src/theme/tokens/components/light.json +++ b/src/theme/tokens/components/light.json @@ -1069,23 +1069,23 @@ "background": "#ffffff", "borderColor": "#e2e2e4", "color": "#2b2e33", - "borderRadius": 20, + "borderRadius": 24, "shadow": "0 4px 8px rgba(0, 0, 0, 0.2000)" }, "header": { - "paddingTop": 24, - "paddingRight": 24, + "paddingTop": 20, + "paddingRight": 20, "paddingBottom": 14, - "paddingLeft": 24, + "paddingLeft": 20, "gap": 8 }, - "title": { "fontSize": 20, "fontWeight": 600 }, + "title": { "fontSize": 18, "fontWeight": 600 }, "content": { "padding": 24 }, "footer": { "paddingTop": 0, - "paddingRight": 24, - "paddingBottom": 24, - "paddingLeft": 24, + "paddingRight": 20, + "paddingBottom": 20, + "paddingLeft": 20, "gap": 8 }, "colorScheme": { "root": { "background": "#ffffff" } } From cb08ceec7cdb76e7954de9ce7254341a74b306fc Mon Sep 17 00:00:00 2001 From: Alesya Volosach Date: Fri, 6 Nov 2026 17:40:29 +0300 Subject: [PATCH 3/5] =?UTF-8?q?feat(dialog):=20=D0=BE=D0=B1=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=84=D0=BE=D1=80=D0=BC?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5,=20API=20=D0=B8=20=D0=B4=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=83=D0=BF=D0=BD=D0=BE=D1=81=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/Dialog.md | 181 ++ src/components/Dialog/Dialog.stories.tsx | 106 - src/components/Dialog/Dialog.tsx | 167 +- src/components/Dialog/DialogActions.tsx | 156 + src/components/Dialog/DialogComponent.tsx | 70 +- src/components/Dialog/DialogHeader.tsx | 148 +- .../__tests__/Dialog.accessibility.test.tsx | 107 + .../__tests__/Dialog.animation.test.tsx | 152 + .../Dialog/__tests__/Dialog.test.tsx | 156 +- .../Dialog/__tests__/DialogActions.test.tsx | 57 + .../DialogHeader.accessibility.test.tsx | 34 + .../Dialog/__tests__/DialogHeader.test.tsx | 42 +- .../__snapshots__/Dialog.test.tsx.snap | 171 -- .../__snapshots__/DialogHeader.test.tsx.snap | 2569 ----------------- src/components/Dialog/index.ts | 5 + .../internal/DialogAccessibilityContext.ts | 11 + .../Dialog/stories/Dialog.stories.tsx | 272 ++ .../Dialog/stories/DialogStoryBody.tsx | 48 + src/components/Dialog/strings.ts | 1 + 19 files changed, 1422 insertions(+), 3031 deletions(-) create mode 100644 src/components/Dialog/Dialog.md delete mode 100644 src/components/Dialog/Dialog.stories.tsx create mode 100644 src/components/Dialog/DialogActions.tsx create mode 100644 src/components/Dialog/__tests__/Dialog.accessibility.test.tsx create mode 100644 src/components/Dialog/__tests__/Dialog.animation.test.tsx create mode 100644 src/components/Dialog/__tests__/DialogActions.test.tsx create mode 100644 src/components/Dialog/__tests__/DialogHeader.accessibility.test.tsx delete mode 100644 src/components/Dialog/__tests__/__snapshots__/Dialog.test.tsx.snap delete mode 100644 src/components/Dialog/__tests__/__snapshots__/DialogHeader.test.tsx.snap create mode 100644 src/components/Dialog/internal/DialogAccessibilityContext.ts create mode 100644 src/components/Dialog/stories/Dialog.stories.tsx create mode 100644 src/components/Dialog/stories/DialogStoryBody.tsx create mode 100644 src/components/Dialog/strings.ts diff --git a/src/components/Dialog/Dialog.md b/src/components/Dialog/Dialog.md new file mode 100644 index 00000000..3a8067a1 --- /dev/null +++ b/src/components/Dialog/Dialog.md @@ -0,0 +1,181 @@ +# 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 ( + <> +