diff --git a/DesignerSpace/Workspace/FunctionLibraries/ReferenceAttachDetach.js b/DesignerSpace/Workspace/FunctionLibraries/ReferenceAttachDetach.js index f3ffe978a..f0f6dc9df 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/ReferenceAttachDetach.js +++ b/DesignerSpace/Workspace/FunctionLibraries/ReferenceAttachDetach.js @@ -16,6 +16,9 @@ function newReferenceAttachDetach () { function completeAttachment (node, attachToNode) { node.payload.referenceParent = attachToNode + if (attachToNode.referenceChildren === undefined) { + attachToNode.referenceChildren = [] + } attachToNode.referenceChildren.push(node) } diff --git a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js index 619e7a51c..3d403db29 100644 --- a/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js +++ b/DesignerSpace/Workspace/FunctionLibraries/UiObjectsFromNodes.js @@ -1082,8 +1082,34 @@ function newUiObjectsFromNodes () { return } default: { + /* Get node definition */ let nodeDefinition = APP_SCHEMA_MAP.get(node.type) if (nodeDefinition !== undefined) { + /* Open Check for reference Children. */ + let referenceChildren + if (nodeDefinition.isReferenceParent === true) { + if (mapOfReferenceParents !== undefined) { + if (node.savedPayload.referenceChildren !== undefined) { + referenceChildren = [] + mapOfReferenceParents.set(node.id, node) + referenceChildren = node.savedPayload.referenceChildren + } + } + } + + /* Open Check Reference Parent */ + let referenceParent + if (nodeDefinition.isReferenceChildren === true) { + if (mapOfReferenceChildren !== undefined) { + if (node.savedPayload.referenceParent !== undefined) { + if (node.savedPayload.referenceParent.id !== undefined) { + mapOfReferenceChildren.set(node.id, node) + referenceParent = node.savedPayload.referenceParent + } + } + } + } + /* Resolve Initial Values */ if (nodeDefinition.initialValues !== undefined) { if (nodeDefinition.initialValues.code !== undefined) { @@ -1118,7 +1144,31 @@ function newUiObjectsFromNodes () { } } } + + /* Close Reference Children Check. */ + if (nodeDefinition.isReferenceParent === true) { + if (node.referenceChildren === undefined) { + node.referenceChildren = [] + } + if (referenceChildren !== undefined) { + node.savedPayload = { + referenceChildren: referenceChildren + } + } else { + node.referenceChildren = [] + } + } + + /* Close Reference Parent Check */ + if (nodeDefinition.isReferenceChildren === true) { + if (referenceParent !== undefined) { + node.savedPayload = { + referenceParent: referenceParent + } + } + } } + return } } @@ -1129,6 +1179,7 @@ function newUiObjectsFromNodes () { name: 'New ' + type, type: type } + createUiObject(true, object.type, object.name, object, parent, parent) let parentNodeDefinition = APP_SCHEMA_MAP.get(parent.type) diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index b3b9bb9c3..8ab62c54f 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -557,9 +557,9 @@ function newUiObject () { default: let nodeDefinition = APP_SCHEMA_MAP.get(thisObject.payload.node.type) if (nodeDefinition !== undefined) { - if (nodeDefinition.attachesTo !== undefined) { - compatibleTypes = nodeDefinition.attachesTo.compatibleTypes - compatibleSubTypes = nodeDefinition.attachesTo.compatibleSubTypes + if (nodeDefinition.chainAttachesTo !== undefined) { + compatibleTypes = nodeDefinition.chainAttachesTo.compatibleTypes + compatibleSubTypes = nodeDefinition.chainAttachesTo.compatibleSubTypes } else { return } @@ -799,7 +799,17 @@ function newUiObject () { compatibleSubTypes = undefined break default: - return + let nodeDefinition = APP_SCHEMA_MAP.get(thisObject.payload.node.type) + if (nodeDefinition !== undefined) { + if (nodeDefinition.referenceAttachesTo !== undefined) { + compatibleTypes = nodeDefinition.referenceAttachesTo.compatibleTypes + compatibleSubTypes = nodeDefinition.referenceAttachesTo.compatibleSubTypes + } else { + return + } + } else { + return + } } let foundCompatible = false referenceAttachToNode = undefined