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(core): open restore history confirm modal with hook (#6343)
CatsJuice710edd28db42
diff --git a/packages/frontend/component/src/components/context/index.tsx b/packages/frontend/component/src/components/context/index.tsxindex dc8c63815e..d8928dc668 100644--- a/packages/frontend/component/src/components/context/index.tsx+++ b/packages/frontend/component/src/components/context/index.tsx@@ -5,6 +5,8 @@ import { Provider } from 'jotai';import type { PropsWithChildren } from 'react';import { useMemo } from 'react';+import { ConfirmModalProvider } from '../../ui/modal';+export type AffineContextProps = PropsWithChildren<{store?: ReturnType<typeof createStore>;}>;@@ -17,6 +19,7 @@ export function AffineContext(props: AffineContextProps) {[<Provider key="JotaiProvider" store={props.store} />,<ThemeProvider key="ThemeProvider" />,+ <ConfirmModalProvider key="ConfirmModalProvider" />,].filter(Boolean),[props.store])}diff --git a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsxindex 2da233d67f..3fbe56b220 100644--- a/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx+++ b/packages/frontend/core/src/components/affine/page-history-modal/history-modal.tsx@@ -1,10 +1,9 @@import { Loading, Scrollable } from '@affine/component';import { EditorLoading } from '@affine/component/page-detail-skeleton';import { Button, IconButton } from '@affine/component/ui/button';-import { ConfirmModal, Modal } from '@affine/component/ui/modal';+import { Modal, useConfirmModal } from '@affine/component/ui/modal';import { openSettingModalAtom } from '@affine/core/atoms';import { useIsWorkspaceOwner } from '@affine/core/hooks/affine/use-is-workspace-owner';-import { useAsyncCallback } from '@affine/core/hooks/affine-async-hooks';import { useDocCollectionPageTitle } from '@affine/core/hooks/use-block-suite-workspace-page-title';import { useWorkspaceQuota } from '@affine/core/hooks/use-workspace-quota';import { Trans } from '@affine/i18n';@@ -374,51 +373,6 @@ const PageHistoryList = ({);};-interface ConfirmRestoreModalProps {- open: boolean;- onConfirm: (res: boolean) => void;- isMutating: boolean;-}--const ConfirmRestoreModal = ({- isMutating,- open,- onConfirm,-}: ConfirmRestoreModalProps) => {- const t = useAFFiNEI18N();-- const handleConfirm = useCallback(() => {- onConfirm(true);- }, [onConfirm]);-- const handleCancel = useCallback(() => {- onConfirm(false);- }, [onConfirm]);-- return (- <ConfirmModal- open={open}- onOpenChange={handleCancel}- title={t['com.affine.history.restore-current-version']()}- description={t['com.affine.history.confirm-restore-modal.hint']()}- cancelText={t['Cancel']()}- contentOptions={{- ['data-testid' as string]: 'confirm-restore-history-modal',- style: {- padding: '20px 26px',- },- }}- confirmButtonOptions={{- loading: isMutating,- type: 'primary',- ['data-testid' as string]: 'confirm-restore-history-button',- children: t['com.affine.history.confirm-restore-modal.restore'](),- }}- onConfirm={handleConfirm}- ></ConfirmModal>- );-};-const EmptyHistoryPrompt = () => {const t = useAFFiNEI18N();@@ -453,6 +407,7 @@ const PageHistoryManager = ({const pageDocId = useMemo(() => {return docCollection.getDoc(pageId)?.spaceDoc.guid ?? pageId;}, [pageId, docCollection]);+ const { openConfirmModal } = useConfirmModal();const snapshotPage = useSnapshotPage(docCollection, pageDocId, activeVersion);@@ -478,21 +433,23 @@ const PageHistoryManager = ({const title = useDocCollectionPageTitle(docCollection, pageId);- const [showRestoreConfirmModal, setShowRestoreConfirmModal] = useState(false);-- const showRestoreConfirm = useCallback(() => {- setShowRestoreConfirmModal(true);- }, []);-- const onConfirmRestore = useAsyncCallback(- async res => {- if (res) {- await handleRestore();- }- setShowRestoreConfirmModal(false);- },- [handleRestore]- );+ const onConfirmRestore = useCallback(() => {+ openConfirmModal({+ title: t['com.affine.history.restore-current-version'](),+ description: t['com.affine.history.confirm-restore-modal.hint'](),+ cancelText: t['Cancel'](),+ contentOptions: {+ ['data-testid' as string]: 'confirm-restore-history-modal',+ style: { padding: '20px 26px' },+ },+ confirmButtonOptions: {+ type: 'primary',+ ['data-testid' as string]: 'confirm-restore-history-button',+ children: t['com.affine.history.confirm-restore-modal.restore'](),+ },+ onConfirm: handleRestore,+ });+ }, [handleRestore, openConfirmModal, t]);const [historyList, loadMore, loadingMore] = useDocSnapshotList(workspaceId,@@ -533,18 +490,12 @@ const PageHistoryManager = ({<div className={styles.spacer} /><Buttontype="primary"- onClick={showRestoreConfirm}+ onClick={onConfirmRestore}disabled={isMutating || !activeVersion}>{t['com.affine.history.restore-current-version']()}</Button></div>-- <ConfirmRestoreModal- open={showRestoreConfirmModal}- isMutating={isMutating}- onConfirm={onConfirmRestore}- /></div>);};