fix ts errors

gwenaelp · Nov 29, 2023 · 2db8239 · 2db8239
1 parent 64f0f75
commit 2db8239
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 45 deletions.
diff --git a/.nvmrc b/.nvmrc
diff --git a/jest.config.js b/jest.config.js
diff --git a/jest.setup.js b/jest.setup.js
diff --git a/src/components/NodeTypes/Image.vue b/src/components/NodeTypes/Image.vue
@@ -1,11 +1,11 @@
 <template>
   <g>
-    <image :href="options.image" x="5" :width="nodeModel.width - 10" :height="nodeModel.height" />
+    <image :href="options.image" x="5" :width="nodeModel?.width - 10" :height="nodeModel?.height" />
     <text
       :class="options.editableTitle ? 'title-editable': ''"
-      :x="nodeModel.width / 2"
-      :y="nodeModel.height + 14"
-      :width="nodeModel.width"
+      :x="nodeModel?.width / 2"
+      :y="nodeModel?.height + 14"
+      :width="nodeModel?.width"
       ref="title"
       text-anchor="middle"
       font-size="14"
@@ -14,7 +14,7 @@
       :style="options.titleStyle || ''"
       @click="options.editableTitle ? parentDiagram.editText(nodeModel, 'title', $refs.title) : undefined"
     >
-      {{nodeModel.title}}
+      {{nodeModel?.title}}
     </text>
     <g class="prevent-node-drag">
       <slot />
@@ -32,10 +32,10 @@ export default defineComponent({
   },
   computed: {
     options () {
-      return this.nodeModel.options || {};
+      return this.nodeModel?.options || {};
     },
-    parentDiagram() {
-      return this.$parent.$parent.$parent;
+    parentDiagram (): any {
+      return this.$parent?.$parent?.$parent;
     },
   },
 });

diff --git a/src/components/NodeTypes/Shader.vue b/src/components/NodeTypes/Shader.vue
@@ -25,11 +25,11 @@
       :style="options.titleStyle || ''"
       @click="options.editableTitle ? parentDiagram.editText(nodeModel, 'title', $refs.title) : undefined"
     >
-      {{nodeModel.title}}
+      {{nodeModel?.title}}
     </text>
-    <g v-if="nodeModel.deletable" @click="$emit('deleteNode')">
+    <g v-if="nodeModel?.deletable" @click="$emit('deleteNode')">
       <rect
-        :x="nodeModel.width - 12"
+        :x="nodeModel?.width - 12"
         y="3"
         width="14"
         height="14"
@@ -38,14 +38,14 @@
         :fill-opacity="0.25"
       />
       <line
-        :x1="nodeModel.width" :y1="5"
-        :x2="nodeModel.width - 10" :y2="15"
+        :x1="nodeModel?.width" :y1="5"
+        :x2="nodeModel?.width - 10" :y2="15"
         style="stroke:rgb(0,0,0);"
         stroke-width="2"
       />
       <line
-        :x1="nodeModel.width - 10" :y1="5"
-        :x2="nodeModel.width" :y2="15"
+        :x1="nodeModel?.width - 10" :y1="5"
+        :x2="nodeModel?.width" :y2="15"
         style="stroke:rgb(0,0,0);"
         stroke-width="2"
       />
@@ -54,8 +54,8 @@
       fill="#ffffff"
       x="2" y="20"
       rx="3" ry="3"
-      :width="nodeModel.width - 4"
-      :height="nodeModel.height - 22"
+      :width="nodeModel?.width - 4"
+      :height="nodeModel?.height - 22"
       class="node-light-background"
     />
     <g class="prevent-node-drag">
@@ -88,7 +88,7 @@ export default defineComponent({
     color () {
       return this.nodeModel?.color || '#66cc00';
     },
-    parentDiagram() {
+    parentDiagram () : any {
       return this.$parent?.$parent?.$parent;
     },
   },

diff --git a/src/components/NodeTypes/Text.vue b/src/components/NodeTypes/Text.vue
@@ -4,16 +4,16 @@
       :class="options.editableTitle ? 'title-editable': ''"
       :x="nodeModel?.width || 0 / 2"
       :y="nodeModel?.height || 0 / 2"
-      :width="nodeModel.width"
+      :width="nodeModel?.width"
       ref="title"
       text-anchor="middle"
       font-size="14"
       font-weight="bold"
       fill="#000000"
       :style="options.titleStyle || ''"
-      @click="options.editableTitle ? parentDiagram.editText(nodeModel, 'title', $refs.title) : undefined"
+      @click="options.editableTitle ? parentDiagram?.editText(nodeModel, 'title', $refs.title) : undefined"
     >
-      {{nodeModel.title}}
+      {{nodeModel?.title}}
     </text>
     <g class="prevent-node-drag">
       <slot />
@@ -31,7 +31,7 @@ export default {
     options () {
       return this.nodeModel?.options || {};
     },
-    parentDiagram() {
+    parentDiagram() : any {
       return this.$parent?.$parent?.$parent;
     },
   },