fix(Modal): animation update, new variant, close button always visible #1224
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,8 +12,8 @@ | |
| padding: var(--spacing-6) var(--spacing-7); | ||
| max-width: 100%; | ||
| height: fit-content; | ||
| animation: var(--transition-duration-fast-2) fade-in | ||
| var(--transition-duration-fast-2) forwards; | ||
| color: var(--content-basic-primary); | ||
|
|
||
| &--full-space { | ||
|
|
@@ -27,7 +27,7 @@ | |
|
|
||
| &--visible { | ||
| display: flex; | ||
| animation: fade-in var(--transition-duration-fast-2) forwards; | ||
|
|
||
| @media (prefers-reduced-motion) { | ||
| animation: none; | ||
|
|
@@ -100,6 +100,11 @@ | |
| padding-bottom: var(--spacing-5); | ||
| width: 100%; | ||
| color: var(--content-basic-primary); | ||
|
|
||
| &--without-heading { | ||
| flex-direction: row-reverse; | ||
| padding-bottom: 0; | ||
| } | ||
| } | ||
|
|
||
| &__label-header { | ||
|
|
@@ -134,24 +139,12 @@ | |
| } | ||
| } | ||
|
|
||
| @keyframes fade-in { | ||
| 0% { | ||
| opacity: var(--transition-initial-fade-in-opacity); | ||
| } | ||
|
|
||
| 100% { | ||
| opacity: 1; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,13 @@ | ||
| import * as React from 'react'; | ||
|
|
||
| import { GreetingQuickReply, Error } from '@livechat/design-system-icons'; | ||
| import { Meta, StoryFn } from '@storybook/react'; | ||
|
|
||
| import noop from '../../utils/noop'; | ||
| import { Button } from '../Button'; | ||
| import { Icon } from '../Icon'; | ||
|
|
||
| import { ActionModalContent } from './components/ActionModalContent'; | ||
| import { | ||
| ModalContent, | ||
| ModalFullSpaceContent, | ||
|
|
@@ -24,7 +26,7 @@ import { | |
| export default { | ||
| title: 'Components/Modal', | ||
| component: ModalComponent, | ||
| subcomponents: { ModalHeader, ActionModalContent, ModalBase }, | ||
| parameters: { | ||
| viewMode: 'story', | ||
| previewTabs: { | ||
|
|
@@ -51,7 +53,15 @@ const StoryTemplate: StoryFn<ModalProps> = ({ | |
| const [isOpen, setIsOpen] = React.useState(true); | ||
|
|
||
| return ( | ||
| <div | ||
| style={{ | ||
|
There was a problem hiding this comment. please move it to const, outside the component's body. Every inline object or a functions are recreated on each render and we do not want that :) |
||
| width: '80vh', | ||
| height: '50vh', | ||
| display: 'flex', | ||
| alignItems: 'center', | ||
| justifyContent: 'center', | ||
| }} | ||
| > | ||
| <Button onClick={() => setIsOpen(true)}>Open modal</Button> | ||
| {isOpen && ( | ||
| <ModalComponent | ||
|
|
@@ -62,7 +72,7 @@ const StoryTemplate: StoryFn<ModalProps> = ({ | |
| {children} | ||
| </ModalComponent> | ||
| )} | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
|
|
@@ -130,6 +140,36 @@ ModalWithFullSpaceContent.args = { | |
| footer: null, | ||
| } as ModalProps; | ||
|
|
||
| export const ActionModal = StoryTemplate.bind({}); | ||
| ActionModal.args = { | ||
| ...defaultModalProps, | ||
| children: ( | ||
| <ActionModalContent | ||
| icon={ | ||
| <Icon | ||
| source={Error} | ||
| size="xxxlarge" | ||
| customColor="var(--content-basic-disabled)" | ||
| /> | ||
| } | ||
| heading="Action Modal Header" | ||
| actions={ | ||
| <> | ||
| <Button size="large">Button</Button> | ||
| <Button size="large" kind="primary"> | ||
| Button | ||
| </Button> | ||
| </> | ||
| } | ||
| > | ||
| Amet minim mollit non deserunt ullamco est sit aliqua dolor do amet sint. | ||
| Velit officia consequat duis enim velit mollit. Exercitation veniam | ||
| consequat sunt nostrud amet. | ||
| </ActionModalContent> | ||
| ), | ||
| footer: null, | ||
| } as ModalProps; | ||
|
|
||
| export const ModalPortal = ({ | ||
| children, | ||
| ...args | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -81,15 +81,21 @@ export const Modal: React.FC<ModalProps> = ({ | |
| /> | ||
| </div> | ||
| )} | ||
| {!labelHeading && ( | ||
| <div | ||
| className={cx(styles[`${baseClass}__header`], { | ||
| [styles[`${baseClass}__header--without-heading`]]: !heading, | ||
| })} | ||
| > | ||
| {heading && ( | ||
| <Heading | ||
| size="sm" | ||
| as="div" | ||
| className={styles[`${baseClass}__heading`]} | ||
| > | ||
| {heading} | ||
| </Heading> | ||
| )} | ||
| <ModalCloseButton onClick={onCloseButtonClick} /> | ||
| </div> | ||
| )} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,9 +45,6 @@ export const ModalFullSpaceContent: React.FC = () => { | |
|
|
||
| export const ModalContent: React.FC = () => ( | ||
| <div style={{ maxWidth: 400 }}> | ||
| <Text size="sm"> | ||
| Amet minim mollit non deserunt ullamco est sit aliqua dolor do amet sint. | ||
| Velit officia consequat duis enim velit mollit. Exercitation veniam | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| $base-class: 'action-modal-content'; | ||
|
|
||
| .#{$base-class} { | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| padding-top: var(--spacing-3); | ||
| padding-bottom: var(--spacing-10); | ||
| width: 100%; | ||
| max-width: 480px; | ||
| height: 100%; | ||
|
|
||
| &__icon { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| margin-bottom: var(--spacing-3); | ||
| min-width: 48px; | ||
| min-height: 48px; | ||
| } | ||
|
|
||
| &__heading { | ||
| margin-top: 0; | ||
| margin-bottom: var(--spacing-2); | ||
| } | ||
|
|
||
| &__content { | ||
| margin-bottom: var(--spacing-10); | ||
| text-align: center; | ||
| } | ||
|
|
||
| &__actions { | ||
| display: flex; | ||
| gap: var(--spacing-2); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.