cleanup

prevwong · Mar 11, 2021 · fe795bf · fe795bf
1 parent 94f363d
commit fe795bf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/packages/core/src/editor/tests/actions.test.ts b/packages/core/src/editor/tests/actions.test.ts
@@ -1,6 +1,7 @@
 import mapValues from 'lodash/mapValues';
 
 import { QueryMethods } from '../../editor/query';
+import { EditorState } from '../../interfaces';
 import { createNode } from '../../utils/createNode';
 import {
   createTestState,
@@ -10,8 +11,8 @@ import {
 import { ActionMethods } from '../actions';
 
 // TODO: create a cleaner way to test Action methods
-const Actions = (state) => (cb) => {
-  const methods = ActionMethods(state as any, QueryMethods(state) as any);
+const Actions = (state: EditorState) => (cb) => {
+  const methods = ActionMethods(state, QueryMethods(state) as any);
   cb(methods);
   return state;
 };

diff --git a/packages/core/src/utils/createNode.ts b/packages/core/src/utils/createNode.ts
@@ -30,7 +30,7 @@ export function createNode(
       name: getNodeTypeName(actualType),
       displayName: getNodeTypeName(actualType),
       props: {},
-      custom: newNode.data.custom || {},
+      custom: {},
       parent: null,
       isCanvas: false,
       hidden: false,
@@ -97,20 +97,6 @@ export function createNode(
       userComponentConfig.name ||
       node.data.displayName;
 
-    node.data.isCanvas =
-      userComponentConfig.isCanvas !== undefined &&
-      userComponentConfig.isCanvas !== null
-        ? userComponentConfig.isCanvas
-        : node.data.isCanvas;
-
-    if (userComponentConfig.rules) {
-      Object.keys(userComponentConfig.rules).forEach((key) => {
-        if (['canDrag', 'canDrop', 'canMoveIn', 'canMoveOut'].includes(key)) {
-          node.rules[key] = userComponentConfig.rules[key];
-        }
-      });
-    }
-
     node.data.props = {
       ...(userComponentConfig.props ||
         userComponentConfig.defaultProps ||
@@ -124,6 +110,21 @@ export function createNode(
       ...node.data.custom,
     };
 
+    if (
+      userComponentConfig.isCanvas !== undefined &&
+      userComponentConfig.isCanvas !== null
+    ) {
+      node.data.isCanvas = userComponentConfig.isCanvas;
+    }
+
+    if (userComponentConfig.rules) {
+      Object.keys(userComponentConfig.rules).forEach((key) => {
+        if (['canDrag', 'canDrop', 'canMoveIn', 'canMoveOut'].includes(key)) {
+          node.rules[key] = userComponentConfig.rules[key];
+        }
+      });
+    }
+
     if (userComponentConfig.related) {
       const relatedNodeContext = {
         id: node.id,