-
Notifications
You must be signed in to change notification settings - Fork 141
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: MessageDialogの内部ロジックを整理する #5320
Open
AtsushiM
wants to merge
4
commits into
master
Choose a base branch
from
chore-refactoring-MessageDialog
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+38
−14
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
9d02add
chore: MessageDialogContentInnerのstyle生成をmemo化する
AtsushiM b015904
chore: MessageDialogContentInner内のStackをSectionに置き換えて効率化する
AtsushiM f99ecc9
chore: MessageDialogContentInnerのFooterClusterを切り出す
AtsushiM 37587af
chore: MessageDialogContentのhandleClickCloseのifを調整
AtsushiM File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
---|---|---|
@@ -1,7 +1,8 @@ | ||
import React, { type FC } from 'react' | ||
import React, { type FC, useMemo } from 'react' | ||
|
||
import { Button } from '../../Button' | ||
import { Cluster, Stack } from '../../Layout' | ||
import { Cluster } from '../../Layout' | ||
import { Section } from '../../SectioningContent' | ||
import { DialogBody, Props as DialogBodyProps } from '../DialogBody' | ||
import { DialogHeader, Props as DialogHeaderProps } from '../DialogHeader' | ||
import { dialogContentInner } from '../dialogInnerStyle' | ||
|
@@ -33,20 +34,44 @@ export const MessageDialogContentInner: FC<MessageDialogContentInnerProps> = ({ | |
onClickClose, | ||
decorators, | ||
}) => { | ||
const { wrapper, actionArea } = dialogContentInner() | ||
const styles = useMemo(() => { | ||
const { wrapper, actionArea } = dialogContentInner() | ||
|
||
return { | ||
wrapper: wrapper(), | ||
actionArea: actionArea(), | ||
} | ||
}, []) | ||
|
||
return ( | ||
// eslint-disable-next-line smarthr/best-practice-for-layouts, smarthr/a11y-heading-in-sectioning-content | ||
<Stack gap={0} as="section" className={wrapper()}> | ||
// eslint-disable-next-line smarthr/a11y-heading-in-sectioning-content | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
<Section className={styles.wrapper}> | ||
<DialogHeader title={title} subtitle={subtitle} titleTag={titleTag} titleId={titleId} /> | ||
<DialogBody contentPadding={contentPadding} contentBgColor={contentBgColor}> | ||
{description} | ||
</DialogBody> | ||
<Cluster as="footer" justify="flex-end" className={actionArea()}> | ||
<Button onClick={onClickClose} className="smarthr-ui-Dialog-closeButton"> | ||
{decorators?.closeButtonLabel?.(CLOSE_BUTTON_LABEL) || CLOSE_BUTTON_LABEL} | ||
</Button> | ||
</Cluster> | ||
</Stack> | ||
<FooterCluster | ||
onClickClose={onClickClose} | ||
decorators={decorators} | ||
className={styles.actionArea} | ||
/> | ||
</Section> | ||
) | ||
} | ||
|
||
const FooterCluster = React.memo< | ||
Pick<MessageDialogContentInnerProps, 'onClickClose' | 'decorators'> & { className: string } | ||
>(({ onClickClose, decorators, className }) => { | ||
const children = useMemo( | ||
() => decorators?.closeButtonLabel?.(CLOSE_BUTTON_LABEL) || CLOSE_BUTTON_LABEL, | ||
[decorators], | ||
) | ||
|
||
return ( | ||
<Cluster as="footer" justify="flex-end" className={className}> | ||
<Button onClick={onClickClose} className="smarthr-ui-Dialog-closeButton"> | ||
{children} | ||
</Button> | ||
</Cluster> | ||
) | ||
}) |
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.
早期returnに意味があるほど複雑なロジックではなく、逆に分かりづらいのでifの条件を整えています