Skip to content

armgit / memos

Public Imported from GitHub
0

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.

chore: remove `useAppContext` in dialog props

XQcea16fac8813
diff --git a/web/src/components/ArchivedMemoDialog.tsx b/web/src/components/ArchivedMemoDialog.tsx
index 84341ac06..df23bbbae 100644
--- a/web/src/components/ArchivedMemoDialog.tsx
+++ b/web/src/components/ArchivedMemoDialog.tsx
@@ -66,7 +66,6 @@ export default function showArchivedMemoDialog(): void {
generateDialog(
{
className: "archived-memo-dialog",
- useAppContext: true,
},
ArchivedMemoDialog,
{}
diff --git a/web/src/components/DailyReviewDialog.tsx b/web/src/components/DailyReviewDialog.tsx
index bf8edfd03..ee169d58b 100644
--- a/web/src/components/DailyReviewDialog.tsx
+++ b/web/src/components/DailyReviewDialog.tsx
@@ -113,7 +113,6 @@ export default function showDailyReviewDialog(datestamp: DateStamp = Date.now())
generateDialog(
{
className: "daily-review-dialog",
- useAppContext: true,
},
DailyReviewDialog,
{ currentDateStamp: datestamp }
diff --git a/web/src/components/Dialog/BaseDialog.tsx b/web/src/components/Dialog/BaseDialog.tsx
index bdc46520e..1e40629ff 100644
--- a/web/src/components/Dialog/BaseDialog.tsx
+++ b/web/src/components/Dialog/BaseDialog.tsx
@@ -6,7 +6,6 @@ import "../../less/base-dialog.less";
interface DialogConfig {
className: string;
- useAppContext?: boolean;
clickSpaceDestroy?: boolean;
}
@@ -61,16 +60,14 @@ export function generateDialog<T extends DialogProps>(
destroy: cbs.destroy,
} as T;
- let Fragment = (
- <BaseDialog destroy={cbs.destroy} clickSpaceDestroy={true} {...config}>
- <DialogComponent {...dialogProps} />
- </BaseDialog>
+ const Fragment = (
+ <Provider store={store}>
+ <BaseDialog destroy={cbs.destroy} clickSpaceDestroy={true} {...config}>
+ <DialogComponent {...dialogProps} />
+ </BaseDialog>
+ </Provider>
);
- if (config.useAppContext) {
- Fragment = <Provider store={store}>{Fragment}</Provider>;
- }
-
dialog.render(Fragment);
return cbs;
diff --git a/web/src/components/ResourcesDialog.tsx b/web/src/components/ResourcesDialog.tsx
index 600e89dc2..bfa597819 100644
--- a/web/src/components/ResourcesDialog.tsx
+++ b/web/src/components/ResourcesDialog.tsx
@@ -155,7 +155,6 @@ export default function showResourcesDialog() {
generateDialog(
{
className: "resources-dialog",
- useAppContext: true,
},
ResourcesDialog,
{}
diff --git a/web/src/components/SettingDialog.tsx b/web/src/components/SettingDialog.tsx
index 9bf5480d8..42e49a7da 100644
--- a/web/src/components/SettingDialog.tsx
+++ b/web/src/components/SettingDialog.tsx
@@ -80,7 +80,6 @@ export default function showSettingDialog(): void {
generateDialog(
{
className: "setting-dialog",
- useAppContext: true,
},
SettingDialog,
{}