diff --git a/CHANGELOG.md b/CHANGELOG.md index b8cd7b2597..3f22d0556d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Add `color` prop to `Segment` typings @layershifter ([#1702](https://github.com/stardust-ui/react/pull/1702)) - Remove `color` prop from `Dialog` typings @layershifter ([#1702](https://github.com/stardust-ui/react/pull/1702)) - `Loader` uses `Text` component for `label` slot instead of `Box` @layershifter ([#1701](https://github.com/stardust-ui/react/pull/1701)) +- Fix nesting issues with `Dialog` component inside `Popup` @layershifter ([#1706](https://github.com/stardust-ui/react/pull/1706)) ### Documentation - Make sidebar categories collapsible @lucivpav ([#1611](https://github.com/stardust-ui/react/pull/1611)) diff --git a/docs/src/components/Sidebar/Sidebar.tsx b/docs/src/components/Sidebar/Sidebar.tsx index 4103220465..cd0abb6cef 100644 --- a/docs/src/components/Sidebar/Sidebar.tsx +++ b/docs/src/components/Sidebar/Sidebar.tsx @@ -417,6 +417,15 @@ class Sidebar extends React.Component { title: { content: 'Popups', as: NavLink, to: '/prototype-popups' }, public: false, }, + { + key: 'nested-popups-and-dialogs', + title: { + content: 'Nested Popups & Dialogs', + as: NavLink, + to: '/prototype-nested-popups-and-dialogs', + }, + public: true, + }, { key: 'iconviewer', title: { content: 'Processed Icons', as: NavLink, to: '/icon-viewer' }, diff --git a/docs/src/prototypes/NestedPopupsAndDialogs/index.tsx b/docs/src/prototypes/NestedPopupsAndDialogs/index.tsx new file mode 100644 index 0000000000..c5d6c213b9 --- /dev/null +++ b/docs/src/prototypes/NestedPopupsAndDialogs/index.tsx @@ -0,0 +1,123 @@ +import { Button, Dialog, Popup } from '@stardust-ui/react' +import * as React from 'react' + +import { ComponentPrototype, PrototypeSection } from 'docs/src/prototypes/Prototypes' + +const PopupAndDialog: React.FC = () => ( + +

+ This Popup will be kept open after Dialog will be opened. +

+ } + /> + + } + trigger={