Skip to content

fix(StepFormDialog): onPressEscape時にも状態をリセットするように修正 #6182

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.

Sign up for GitHub

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

Open
Qs-F wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(StepFormDialog): onPressEscape時にも状態をリセットするように修正 #6182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export const StepFormDialog: FC<Props> = ({
}, [isOpen, onClickBack])

return createPortal(
<StepFormDialogProvider firstStep={firstStep}>
<StepFormDialogProvider firstStep={firstStep} isOpen={isOpen}>
<DialogContentInner
{...rest}
isOpen={isOpen}
Expand Down
7 changes: 1 addition & 6 deletions packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialogContentInner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,7 @@ export const StepFormDialogContentInner: FC<StepFormDialogContentInnerProps> = (

const handleCloseAction = useCallback(() => {
onClickClose()
setTimeout(() => {
// HINT: ダイアログが閉じるtransitionが完了してから初期化をしている
stepQueue.current = []
setCurrentStep(firstStep)
}, 300)
}, [firstStep, stepQueue, setCurrentStep, onClickClose])
}, [onClickClose])

const changeCurrentStep = useCallback(
(step: Parameters<typeof setCurrentStep>[0]) => {
Expand Down
13 changes: 12 additions & 1 deletion packages/smarthr-ui/src/components/Dialog/StepFormDialog/StepFormDialogProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,22 @@ export const StepFormDialogContext = createContext<StepFormDialogContextType>({
type Props = {
children: ReactNode
firstStep: StepItem
isOpen: boolean
}
export const StepFormDialogProvider: FC<Props> = ({ children, firstStep }) => {
export const StepFormDialogProvider: FC<Props> = ({ children, firstStep, isOpen }) => {
const [currentStep, setCurrentStep] = useState<StepItem>(firstStep)
const stepQueue = useRef<StepItem[]>([])
const scrollerRef = useRef<HTMLDivElement>(null)
const prevIsOpen = useRef(isOpen)

// ダイアログが閉じたときにリセット
if (prevIsOpen.current && !isOpen) {
setTimeout(() => {
stepQueue.current = []
setCurrentStep(firstStep)
}, 300)
}
prevIsOpen.current = isOpen

return (
<StepFormDialogContext.Provider value={{ currentStep, stepQueue, setCurrentStep, scrollerRef }}>
Expand Down
Loading