Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
feat: `esc` key to exit multiple dialogs (#692)
Zeng199855695f2189a2
diff --git a/web/src/components/AboutSiteDialog.tsx b/web/src/components/AboutSiteDialog.tsxindex 6aead8373..047598905 100644--- a/web/src/components/AboutSiteDialog.tsx+++ b/web/src/components/AboutSiteDialog.tsx@@ -59,6 +59,7 @@ export default function showAboutSiteDialog(): void {generateDialog({className: "about-site-dialog",+ dialogName: "about-site-dialog",},AboutSiteDialog);diff --git a/web/src/components/ArchivedMemoDialog.tsx b/web/src/components/ArchivedMemoDialog.tsxindex a68ac5743..e5951fbf5 100644--- a/web/src/components/ArchivedMemoDialog.tsx+++ b/web/src/components/ArchivedMemoDialog.tsx@@ -69,6 +69,7 @@ export default function showArchivedMemoDialog(): void {generateDialog({className: "archived-memo-dialog",+ dialogName: "archived-memo-dialog",},ArchivedMemoDialog,{}diff --git a/web/src/components/ChangeMemberPasswordDialog.tsx b/web/src/components/ChangeMemberPasswordDialog.tsxindex ce49643ce..5101f9095 100644--- a/web/src/components/ChangeMemberPasswordDialog.tsx+++ b/web/src/components/ChangeMemberPasswordDialog.tsx@@ -117,6 +117,7 @@ function showChangeMemberPasswordDialog(user: User) {generateDialog({className: "change-member-password-dialog",+ dialogName: "change-member-password-dialog",},ChangeMemberPasswordDialog,{ user }diff --git a/web/src/components/ChangeMemoCreatedTsDialog.tsx b/web/src/components/ChangeMemoCreatedTsDialog.tsxindex 02a1889ab..e8d9fc3e1 100644--- a/web/src/components/ChangeMemoCreatedTsDialog.tsx+++ b/web/src/components/ChangeMemoCreatedTsDialog.tsx@@ -97,6 +97,7 @@ function showChangeMemoCreatedTsDialog(memoId: MemoId) {generateDialog({className: "change-memo-created-ts-dialog",+ dialogName: "change-memo-created-ts-dialog",},ChangeMemoCreatedTsDialog,{diff --git a/web/src/components/ChangePasswordDialog.tsx b/web/src/components/ChangePasswordDialog.tsxindex 599eeda60..6842c621a 100644--- a/web/src/components/ChangePasswordDialog.tsx+++ b/web/src/components/ChangePasswordDialog.tsx@@ -115,6 +115,7 @@ function showChangePasswordDialog() {generateDialog({className: "change-password-dialog",+ dialogName: "change-password-dialog",},ChangePasswordDialog);diff --git a/web/src/components/ChangeResourceFilenameDialog.tsx b/web/src/components/ChangeResourceFilenameDialog.tsxindex 82878f99e..c7720e736 100644--- a/web/src/components/ChangeResourceFilenameDialog.tsx+++ b/web/src/components/ChangeResourceFilenameDialog.tsx@@ -87,6 +87,7 @@ function showChangeResourceFilenameDialog(resourceId: ResourceId, resourceFilenagenerateDialog({className: "change-resource-filename-dialog",+ dialogName: "change-resource-filename-dialog",},ChangeResourceFilenameDialog,{diff --git a/web/src/components/CreateShortcutDialog.tsx b/web/src/components/CreateShortcutDialog.tsxindex ee71d9f3a..f711a159b 100644--- a/web/src/components/CreateShortcutDialog.tsx+++ b/web/src/components/CreateShortcutDialog.tsx@@ -291,6 +291,7 @@ export default function showCreateShortcutDialog(shortcutId?: ShortcutId): voidgenerateDialog({className: "create-shortcut-dialog",+ dialogName: "create-shortcut-dialog",},CreateShortcutDialog,{ shortcutId }diff --git a/web/src/components/DailyReviewDialog.tsx b/web/src/components/DailyReviewDialog.tsxindex 502f94cf0..3969b805a 100644--- a/web/src/components/DailyReviewDialog.tsx+++ b/web/src/components/DailyReviewDialog.tsx@@ -115,6 +115,7 @@ export default function showDailyReviewDialog(datestamp: DateStamp = Date.now())generateDialog({className: "daily-review-dialog",+ dialogName: "daily-review-dialog",},DailyReviewDialog,{ currentDateStamp: datestamp }diff --git a/web/src/components/Dialog/BaseDialog.tsx b/web/src/components/Dialog/BaseDialog.tsxindex 2373d0912..85a76ccfb 100644--- a/web/src/components/Dialog/BaseDialog.tsx+++ b/web/src/components/Dialog/BaseDialog.tsx@@ -3,13 +3,15 @@ import { createRoot } from "react-dom/client";import { Provider } from "react-redux";import { ANIMATION_DURATION } from "../../helpers/consts";import store from "../../store";-import "../../less/base-dialog.less";+import { useDialogStore } from "../../store/module";import { CssVarsProvider } from "@mui/joy";import theme from "../../theme";+import "../../less/base-dialog.less";interface DialogConfig {className: string;clickSpaceDestroy?: boolean;+ dialogName: string;}interface Props extends DialogConfig, DialogProps {@@ -17,12 +19,17 @@ interface Props extends DialogConfig, DialogProps {}const BaseDialog: React.FC<Props> = (props: Props) => {- const { children, className, clickSpaceDestroy, destroy } = props;+ const { children, className, clickSpaceDestroy, dialogName, destroy } = props;+ const dialogStore = useDialogStore();useEffect(() => {+ dialogStore.pushDialogStack(dialogName);const handleKeyDown = (event: KeyboardEvent) => {if (event.code === "Escape") {- destroy();+ if (dialogName === dialogStore.topDialogStack()) {+ dialogStore.popDialogStack();+ destroy();+ }}};diff --git a/web/src/components/Dialog/CommonDialog.tsx b/web/src/components/Dialog/CommonDialog.tsxindex 50d4bfe47..dc56a1859 100644--- a/web/src/components/Dialog/CommonDialog.tsx+++ b/web/src/components/Dialog/CommonDialog.tsx@@ -72,6 +72,7 @@ interface CommonDialogProps {content: string;className?: string;style?: DialogStyle;+ dialogName: string;closeBtnText?: string;confirmBtnText?: string;onClose?: () => void;@@ -82,6 +83,7 @@ export const showCommonDialog = (props: CommonDialogProps) => {generateDialog({className: `common-dialog ${props?.className ?? ""}`,+ dialogName: `common-dialog ${props?.className ?? ""}`,},CommonDialog,propsdiff --git a/web/src/components/PreviewImageDialog.tsx b/web/src/components/PreviewImageDialog.tsxindex 542011603..e60f87961 100644--- a/web/src/components/PreviewImageDialog.tsx+++ b/web/src/components/PreviewImageDialog.tsx@@ -124,6 +124,7 @@ export default function showPreviewImageDialog(imgUrls: string[] | string, initigenerateDialog({className: "preview-image-dialog",+ dialogName: "preview-image-dialog",},PreviewImageDialog,{diff --git a/web/src/components/ResourcesDialog.tsx b/web/src/components/ResourcesDialog.tsxindex dbd2b8b7f..e741e6f0a 100644--- a/web/src/components/ResourcesDialog.tsx+++ b/web/src/components/ResourcesDialog.tsx@@ -125,6 +125,7 @@ const ResourcesDialog: React.FC<Props> = (props: Props) => {title: t("resources.delete-resource"),content: warningText,style: "warning",+ dialogName: "delete-unused-resources",onConfirm: async () => {for (const resource of unusedResources) {await resourceStore.deleteResourceById(resource.id);@@ -143,6 +144,7 @@ const ResourcesDialog: React.FC<Props> = (props: Props) => {title: t("resources.delete-resource"),content: warningText,style: "warning",+ dialogName: "delete-resource-dialog",onConfirm: async () => {await resourceStore.deleteResourceById(resource.id);},@@ -242,6 +244,7 @@ export default function showResourcesDialog() {generateDialog({className: "resources-dialog",+ dialogName: "resources-dialog",},ResourcesDialog,{}diff --git a/web/src/components/ResourcesSelectorDialog.tsx b/web/src/components/ResourcesSelectorDialog.tsxindex d0ca80f5d..c1fa300d9 100644--- a/web/src/components/ResourcesSelectorDialog.tsx+++ b/web/src/components/ResourcesSelectorDialog.tsx@@ -148,6 +148,7 @@ export default function showResourcesSelectorDialog() {generateDialog({className: "resources-selector-dialog",+ dialogName: "resources-selector-dialog",},ResourcesSelectorDialog,{}diff --git a/web/src/components/SettingDialog.tsx b/web/src/components/SettingDialog.tsxindex 646c2a0aa..da2df9a05 100644--- a/web/src/components/SettingDialog.tsx+++ b/web/src/components/SettingDialog.tsx@@ -92,6 +92,7 @@ export default function showSettingDialog(): void {generateDialog({className: "setting-dialog",+ dialogName: "setting-dialog",},SettingDialog,{}diff --git a/web/src/components/Settings/MemberSection.tsx b/web/src/components/Settings/MemberSection.tsxindex 79d83998a..ab1d3cabf 100644--- a/web/src/components/Settings/MemberSection.tsx+++ b/web/src/components/Settings/MemberSection.tsx@@ -79,6 +79,7 @@ const PreferencesSection = () => {title: `Archive Member`,content: `❗️Are you sure to archive ${user.username}?`,style: "warning",+ dialogName: "archive-user-dialog",onConfirm: async () => {await userStore.patchUser({id: user.id,@@ -102,6 +103,7 @@ const PreferencesSection = () => {title: `Delete Member`,content: `Are you sure to delete ${user.username}? THIS ACTION IS IRREVERSIABLE.❗️`,style: "warning",+ dialogName: "delete-user-dialog",onConfirm: async () => {await userStore.deleteUser({id: user.id,diff --git a/web/src/components/Settings/MyAccountSection.tsx b/web/src/components/Settings/MyAccountSection.tsxindex b732fe8ce..bed7870c4 100644--- a/web/src/components/Settings/MyAccountSection.tsx+++ b/web/src/components/Settings/MyAccountSection.tsx@@ -16,6 +16,7 @@ const MyAccountSection = () => {title: "Reset Open API",content: "❗️The existing API will be invalidated and a new one will be generated, are you sure you want to reset?",style: "warning",+ dialogName: "reset-openid-dialog",onConfirm: async () => {await userStore.patchUser({id: user.id,diff --git a/web/src/components/ShareMemoDialog.tsx b/web/src/components/ShareMemoDialog.tsxindex b5610500b..bbb8e4c4a 100644--- a/web/src/components/ShareMemoDialog.tsx+++ b/web/src/components/ShareMemoDialog.tsx@@ -190,6 +190,7 @@ export default function showShareMemoDialog(memo: Memo): void {generateDialog({className: "share-memo-dialog",+ dialogName: "share-memo-dialog",},ShareMemoDialog,{ memo }diff --git a/web/src/components/UpdateAccountDialog.tsx b/web/src/components/UpdateAccountDialog.tsxindex 01493e9c9..a2ba6156d 100644--- a/web/src/components/UpdateAccountDialog.tsx+++ b/web/src/components/UpdateAccountDialog.tsx@@ -139,6 +139,7 @@ function showUpdateAccountDialog() {generateDialog({className: "update-account-dialog",+ dialogName: "update-account-dialog",},UpdateAccountDialog);diff --git a/web/src/store/index.ts b/web/src/store/index.tsindex 98349ae74..e08ecfae5 100644--- a/web/src/store/index.ts+++ b/web/src/store/index.ts@@ -7,6 +7,7 @@ import editorReducer from "./reducer/editor";import shortcutReducer from "./reducer/shortcut";import locationReducer from "./reducer/location";import resourceReducer from "./reducer/resource";+import dialogReducer from "./reducer/dialog";const store = configureStore({reducer: {@@ -17,6 +18,7 @@ const store = configureStore({shortcut: shortcutReducer,location: locationReducer,resource: resourceReducer,+ dialog: dialogReducer,},});diff --git a/web/src/store/module/dialog.ts b/web/src/store/module/dialog.tsnew file mode 100644index 000000000..714346840--- /dev/null+++ b/web/src/store/module/dialog.ts@@ -0,0 +1,23 @@+import store, { useAppSelector } from "..";+import { pushDialogStack, popDialogStack } from "../reducer/dialog";+import { last } from "lodash";++export const useDialogStore = () => {+ const state = useAppSelector((state) => state.editor);++ return {+ state,+ getState: () => {+ return store.getState().dialog;+ },+ pushDialogStack: (dialogName: string) => {+ store.dispatch(pushDialogStack(dialogName));+ },+ popDialogStack: () => {+ store.dispatch(popDialogStack());+ },+ topDialogStack: () => {+ return last(store.getState().dialog.dialogStack);+ },+ };+};diff --git a/web/src/store/module/index.ts b/web/src/store/module/index.tsindex 95a237f84..72614a90a 100644--- a/web/src/store/module/index.ts+++ b/web/src/store/module/index.ts@@ -5,3 +5,4 @@ export * from "./memo";export * from "./resource";export * from "./shortcut";export * from "./user";+export * from "./dialog";diff --git a/web/src/store/reducer/dialog.ts b/web/src/store/reducer/dialog.tsnew file mode 100644index 000000000..dce4de8ba--- /dev/null+++ b/web/src/store/reducer/dialog.ts@@ -0,0 +1,30 @@+import { createSlice, PayloadAction } from "@reduxjs/toolkit";++interface State {+ dialogStack: string[];+}++const dialogSlice = createSlice({+ name: "dialog",+ initialState: {+ dialogStack: [],+ } as State,+ reducers: {+ pushDialogStack: (state, action: PayloadAction<string>) => {+ return {+ ...state,+ dialogStack: [...state.dialogStack, action.payload],+ };+ },+ popDialogStack: (state) => {+ return {+ ...state,+ dialogStack: state.dialogStack.slice(0, state.dialogStack.length - 1),+ };+ },+ },+});++export const { pushDialogStack, popDialogStack } = dialogSlice.actions;++export default dialogSlice.reducer;