There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
feat(component): new hook to open confirm modal (#6342)
CatsJuiced412635f6b63
diff --git a/packages/frontend/component/.storybook/preview.tsx b/packages/frontend/component/.storybook/preview.tsxindex e255d0ea09..8cd3ebd6aa 100644--- a/packages/frontend/component/.storybook/preview.tsx+++ b/packages/frontend/component/.storybook/preview.tsx@@ -8,6 +8,7 @@ import { useDarkMode } from 'storybook-dark-mode';import type { Preview } from '@storybook/react';import React from 'react';+import { ConfirmModalProvider } from '../src/ui/modal/confirm-modal';export const parameters: Preview = {argTypes: {@@ -53,9 +54,11 @@ export const decorators = [(Story: ComponentType, context) => {return (<ThemeProvider themes={['dark', 'light']} enableSystem={true}>- <ThemeChange />- <Component />- <Story {...context} />+ <ConfirmModalProvider>+ <ThemeChange />+ <Component />+ <Story {...context} />+ </ConfirmModalProvider></ThemeProvider>);},diff --git a/packages/frontend/component/src/ui/modal/confirm-modal.stories.tsx b/packages/frontend/component/src/ui/modal/confirm-modal.stories.tsxnew file mode 100644index 0000000000..f3b58e5b9c--- /dev/null+++ b/packages/frontend/component/src/ui/modal/confirm-modal.stories.tsx@@ -0,0 +1,38 @@+import type { Meta } from '@storybook/react';++import { Button } from '../button';+import {+ ConfirmModal,+ type ConfirmModalProps,+ useConfirmModal,+} from './confirm-modal';++export default {+ title: 'UI/Modal/Confirm Modal',+ component: ConfirmModal,+ argTypes: {},+} satisfies Meta<ConfirmModalProps>;++export const UsingHook = () => {+ const { openConfirmModal } = useConfirmModal();++ const onConfirm = () =>+ new Promise<void>(resolve => setTimeout(resolve, 2000));++ const showConfirm = () => {+ openConfirmModal({+ cancelText: 'Cancel',+ confirmButtonOptions: {+ children: 'Confirm',+ },+ title: 'Confirm Modal',+ children: 'Are you sure you want to confirm?',+ onConfirm,+ onCancel: () => {+ console.log('Cancelled');+ },+ });+ };++ return <Button onClick={showConfirm}>Show confirm</Button>;+};diff --git a/packages/frontend/component/src/ui/modal/confirm-modal.tsx b/packages/frontend/component/src/ui/modal/confirm-modal.tsxindex 35a4093bdc..349056ca8b 100644--- a/packages/frontend/component/src/ui/modal/confirm-modal.tsx+++ b/packages/frontend/component/src/ui/modal/confirm-modal.tsx@@ -1,5 +1,7 @@import { DialogTrigger } from '@radix-ui/react-dialog';import clsx from 'clsx';+import type { PropsWithChildren } from 'react';+import { createContext, useCallback, useContext, useState } from 'react';import type { ButtonProps } from '../button';import { Button } from '../button';@@ -9,9 +11,11 @@ import * as styles from './styles.css';export interface ConfirmModalProps extends ModalProps {confirmButtonOptions?: ButtonProps;- onConfirm?: () => void;+ onConfirm?: (() => void) | (() => Promise<void>);+ onCancel?: () => void;cancelText?: string;cancelButtonOptions?: ButtonProps;+ reverseFooter?: boolean;}export const ConfirmModal = ({@@ -20,7 +24,9 @@ export const ConfirmModal = ({// FIXME: we need i18ncancelText = 'Cancel',cancelButtonOptions,+ reverseFooter,onConfirm,+ onCancel,width = 480,...props}: ConfirmModalProps) => {@@ -36,13 +42,92 @@ export const ConfirmModal = ({<divclassName={clsx(styles.modalFooter, {modalFooterWithChildren: !!children,+ reverse: reverseFooter,})}><DialogTrigger asChild>- <Button {...cancelButtonOptions}>{cancelText}</Button>+ <Button onClick={onCancel} {...cancelButtonOptions}>+ {cancelText}+ </Button></DialogTrigger><Button onClick={onConfirm} {...confirmButtonOptions}></Button></div></Modal>);};++interface ConfirmModalContextProps {+ modalProps: ConfirmModalProps;+ openConfirmModal: (props?: ConfirmModalProps) => void;+ closeConfirmModal: () => void;+}+const ConfirmModalContext = createContext<ConfirmModalContextProps>({+ modalProps: { open: false },+ openConfirmModal: () => {},+ closeConfirmModal: () => {},+});+export const ConfirmModalProvider = ({ children }: PropsWithChildren) => {+ const [modalProps, setModalProps] = useState<ConfirmModalProps>({+ open: false,+ });++ const setLoading = useCallback((value: boolean) => {+ setModalProps(prev => ({+ ...prev,+ confirmButtonOptions: {+ ...prev.confirmButtonOptions,+ loading: value,+ },+ }));+ }, []);++ const closeConfirmModal = useCallback(() => {+ setModalProps({ open: false });+ }, []);++ const openConfirmModal = useCallback(+ (props?: ConfirmModalProps) => {+ if (!props) {+ setModalProps({ open: true });+ return;+ }++ const { onConfirm: _onConfirm, ...otherProps } = props;++ const onConfirm = () => {+ setLoading(true);+ _onConfirm?.()+ ?.catch(console.error)+ ?.finally(() => closeConfirmModal());+ };+ setModalProps({ ...otherProps, onConfirm, open: true });+ },+ [closeConfirmModal, setLoading]+ );++ const onOpenChange = useCallback((open: boolean) => {+ setModalProps(props => ({ ...props, open }));+ }, []);++ return (+ <ConfirmModalContext.Provider+ value={{ openConfirmModal, closeConfirmModal, modalProps }}+ >+ {children}+ {/* TODO: multi-instance support(unnecessary for now) */}+ <ConfirmModal onOpenChange={onOpenChange} {...modalProps} />+ </ConfirmModalContext.Provider>+ );+};+export const useConfirmModal = () => {+ const context = useContext(ConfirmModalContext);+ if (!context) {+ throw new Error(+ 'useConfirmModal must be used within a ConfirmModalProvider'+ );+ }+ return {+ openConfirmModal: context.openConfirmModal,+ closeConfirmModal: context.closeConfirmModal,+ };+};diff --git a/packages/frontend/component/src/ui/modal/styles.css.ts b/packages/frontend/component/src/ui/modal/styles.css.tsindex b3a8d44e3c..6372d9bef5 100644--- a/packages/frontend/component/src/ui/modal/styles.css.ts+++ b/packages/frontend/component/src/ui/modal/styles.css.ts@@ -65,6 +65,10 @@ export const modalFooter = style({'&.modalFooterWithChildren': {paddingTop: '20px',},+ '&.reverse': {+ flexDirection: 'row-reverse',+ justifyContent: 'flex-start',+ },},});export const confirmModalContent = style({diff --git a/packages/frontend/core/src/components/affine/enable-affine-cloud-modal/index.tsx b/packages/frontend/core/src/components/affine/enable-affine-cloud-modal/index.tsxindex bd33049e69..c1efc7c1c9 100644--- a/packages/frontend/core/src/components/affine/enable-affine-cloud-modal/index.tsx+++ b/packages/frontend/core/src/components/affine/enable-affine-cloud-modal/index.tsx@@ -11,7 +11,7 @@ import { useCurrentLoginStatus } from '../../../hooks/affine/use-current-login-sexport const EnableAffineCloudModal = ({onConfirm: propsOnConfirm,...props-}: ConfirmModalProps) => {+}: Omit<ConfirmModalProps, 'onConfirm'> & { onConfirm: () => void }) => {const t = useAFFiNEI18N();const loginStatus = useCurrentLoginStatus();const setAuthAtom = useSetAtom(authAtom);diff --git a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/modals.tsx b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/modals.tsxindex 9df712e6b3..ea613c5d5b 100644--- a/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/modals.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/general-setting/plans/modals.tsx@@ -55,7 +55,7 @@ export const ConfirmLoadingModal = ({onOpenChange={onOpenChange}onConfirm={() => {confirmed.current = true;- onConfirm?.();+ onConfirm?.()?.catch(console.error);}}{...props}>diff --git a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsxindex 51542bdf39..0631ea4441 100644--- a/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx+++ b/packages/frontend/core/src/components/affine/setting-modal/workspace-setting/new-workspace-setting-detail/delete-leave-workspace/delete/index.tsx@@ -13,6 +13,7 @@ import * as styles from './style.css';interface WorkspaceDeleteProps extends ConfirmModalProps {workspaceMetadata: WorkspaceMetadata;+ onConfirm?: () => void;}export const WorkspaceDeleteModal = ({