From cea16fac88134d7ccc7c2b58baf4b25d8a4d8d06 Mon Sep 17 00:00:00 2001
From: XQ <qiaobingxue1998@163.com>
Date: Mon, 8 Aug 2022 23:33:53 +0800
Subject: [PATCH] chore: remove `useAppContext` in dialog props

---
 web/src/components/ArchivedMemoDialog.tsx |  1 -
 web/src/components/DailyReviewDialog.tsx  |  1 -
 web/src/components/Dialog/BaseDialog.tsx  | 15 ++++++---------
 web/src/components/ResourcesDialog.tsx    |  1 -
 web/src/components/SettingDialog.tsx      |  1 -
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/web/src/components/ArchivedMemoDialog.tsx b/web/src/components/ArchivedMemoDialog.tsx
index 84341ac0..df23bbba 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 bf8edfd0..ee169d58 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 bdc46520..1e40629f 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 600e89dc..bfa59781 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 9bf5480d..42e49a7d 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,
     {}