fix(options): entry incorrect initial form state

Closes #865
crimx · Jun 23, 2020 · f009670 · f009670
1 parent e0e962e
commit f009670
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 33 deletions.
diff --git a/src/options/components/Entries/ContextMenus/EditeModal.tsx b/src/options/components/Entries/ContextMenus/EditeModal.tsx
@@ -48,6 +48,8 @@ export const EditModal: FC<EditModalProps> = ({ menuID, onClose }) => {
     }
   })
 
+  if (allMenus === null) return null
+
   return (
     <Modal
       visible={!!menuID}

diff --git a/src/options/components/Entries/DictAuths.tsx b/src/options/components/Entries/DictAuths.tsx
@@ -14,6 +14,8 @@ export const DictAuths: FC = () => {
   const { t } = useTranslate(['options', 'dicts'])
   const dictAuths = useObservableGetState(config$$, null, 'dictAuth')
 
+  if (dictAuths === null) return null
+
   const formItems: SaladictFormItem[] = [
     {
       key: 'dictauthstitle',
@@ -24,41 +26,37 @@ export const DictAuths: FC = () => {
     }
   ]
 
-  if (dictAuths) {
-    objectKeys(dictAuths).forEach(dictID => {
-      const auth = dictAuths[dictID]!
-      const configPath = getConfigPath('dictAuth', dictID)
-      const title = t(`dicts:${dictID}.name`)
+  objectKeys(dictAuths).forEach(dictID => {
+    const auth = dictAuths[dictID]!
+    const configPath = getConfigPath('dictAuth', dictID)
+    const title = t(`dicts:${dictID}.name`)
 
-      objectKeys(auth).forEach((key, i, keys) => {
-        const isLast = i + 1 === keys.length
-        formItems.push({
-          name: configPath + '.' + key,
-          label: (
-            <span>
-              {i === 0 ? title + ' ' : ''}
-              <code>{key}</code>
-            </span>
-          ),
-          help: isLast ? (
-            <Trans message={t('dictAuth.dictHelp')}>
-              <a
-                href={
-                  require(`@/components/dictionaries/${dictID}/auth.ts`).url
-                }
-                target="_blank"
-                rel="nofollow noopener noreferrer"
-              >
-                {title}
-              </a>
-            </Trans>
-          ) : null,
-          style: { marginBottom: isLast ? 10 : 5 },
-          children: <Input />
-        })
+    objectKeys(auth).forEach((key, i, keys) => {
+      const isLast = i + 1 === keys.length
+      formItems.push({
+        name: configPath + '.' + key,
+        label: (
+          <span>
+            {i === 0 ? title + ' ' : ''}
+            <code>{key}</code>
+          </span>
+        ),
+        help: isLast ? (
+          <Trans message={t('dictAuth.dictHelp')}>
+            <a
+              href={require(`@/components/dictionaries/${dictID}/auth.ts`).url}
+              target="_blank"
+              rel="nofollow noopener noreferrer"
+            >
+              {title}
+            </a>
+          </Trans>
+        ) : null,
+        style: { marginBottom: isLast ? 10 : 5 },
+        children: <Input />
       })
     })
-  }
+  })
 
   return <SaladictForm items={formItems} />
 }
diff --git a/src/options/components/Entries/Pronunciation.tsx b/src/options/components/Entries/Pronunciation.tsx
@@ -11,7 +11,7 @@ export const Pronunciation: FC = () => {
   const globals = useContext(GlobalsContext)
   const zdicAudio = useObservableGetState(
     profile$$,
-    false,
+    null,
     'dicts',
     'all',
     'zdic',
@@ -27,6 +27,8 @@ export const Pronunciation: FC = () => {
     [zdicAudio]
   )
 
+  if (zdicAudio === null) return null
+
   return (
     <SaladictForm
       items={[
-Original file line number
+Diff line change
@@ Expand Up @@
         }
       })
+      if (allMenus === null) return null
       return (
         <Modal
           visible={!!menuID}
@@ Expand Down @@