Improve JSON data handling

wtetsu · Aug 19, 2020 · 6ba8688 · 6ba8688
1 parent 2346e62
commit 6ba8688
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/options/component/WholeSettings.tsx b/src/options/component/WholeSettings.tsx
@@ -63,6 +63,9 @@ export const WholeSettings: React.FC<Props> = (props) => {
     return immer(orgSettings, (d) => {
       const errors = [];
       for (const key of Object.keys(d)) {
+        if (!(key in newSettings)) {
+          continue;
+        }
         if (!canReplace(d[key], newSettings[key])) {
           errors.push(`Invalid ${key}`);
         }

diff --git a/src/options/logic/data.ts b/src/options/logic/data.ts
@@ -53,7 +53,7 @@ const isShiftJisSoleChar = (byte: number) => {
 
 export const preProcessSettings = (settings: MouseDictionarySettings): MouseDictionarySettings => {
   return immer(settings, (d) => {
-    for (let i = 0; i < d.replaceRules.length; i++) {
+    for (let i = 0; i < d?.replaceRules?.length; i++) {
       d.replaceRules[i].key = i.toString();
     }
   });