Merge pull request #72 from anotherglitchinthematrix/patch-1

fix: `jsonEditor.value` could be `undefined` under some certain situation in Vue 2

Author: cloydlau

src/Component.ts

@@ -40,7 +40,7 @@ export default defineComponent({
       ]),
     ),
   } as {
-    [key in ModelValueProp]: {}
+    [key in ModelValueProp]: object
   } & { mode: { type: PropType<Mode> } } & {
     [key in typeof boolAttrs[number]]: {
       type: PropType<boolean>
@@ -90,7 +90,7 @@ export default defineComponent({
       emit('update:mode', mode)
     }
 
-    const mergeFunction = (previousValue: Function, currentValue: Function) => (...args: any) => {
+    const mergeFunction = (previousValue: (...args: any) => unknown, currentValue: (...args: any) => unknown) => (...args: any) => {
       previousValue(...args)
       currentValue(...args)
     }
@@ -144,7 +144,7 @@ export default defineComponent({
     watch(
       () => props.mode,
       (mode) => {
-        // `jsonEditor.value` could be `undefined` in Vue 2.6 (dev environment)
+        // `jsonEditor.value` could be `undefined` in Vue 2.6
         jsonEditor.value?.updateProps({
           mode,
         })
@@ -154,7 +154,7 @@ export default defineComponent({
     watch(
       () => Array.from(boolAttrs, boolAttr => props[boolAttr]),
       (values) => {
-        jsonEditor.value.updateProps(
+        jsonEditor.value?.updateProps(
           Object.fromEntries(Array.from(values, (v, i) => [boolAttrs[i], v]).filter(([, v]) => v !== undefined)),
         )
       },
@@ -165,16 +165,16 @@ export default defineComponent({
       (newAttrs) => {
         // Functions need to be merged again
         const defaultFunctionAttrs: {
-          onChange?: Function
-          onChangeMode?: Function
+          onChange?: (...args: any) => unknown
+          onChangeMode?: (...args: any) => unknown
         } = {}
         if (newAttrs.onChange) {
           defaultFunctionAttrs.onChange = onChange
         }
         if (newAttrs.onChangeMode) {
           defaultFunctionAttrs.onChangeMode = onChangeMode
         }
-        jsonEditor.value.updateProps(
+        jsonEditor.value?.updateProps(
           Object.getOwnPropertyNames(defaultFunctionAttrs).length > 0
             ? conclude([newAttrs, defaultFunctionAttrs], {
               type: Object,
@@ -191,7 +191,7 @@ export default defineComponent({
     expose?.({ jsonEditor })
 
     onUnmounted(() => {
-      jsonEditor.value.destroy()
+      jsonEditor.value?.destroy()
     })
 
     onMounted(() => {