@_unit/unit 1.0.71 → 1.0.73

package/src/Class/Graph/buildMoveMap.ts

@@ -469,11 +469,13 @@ export function buildMoveMap(
 
     let parentId = null
     let parentIndex = null
+    let parentSlot = null
     let children = []
     let childrenSlot = {}
 
     if (isComponentSpec(spec)) {
       parentId = getSubComponentParentId(source, unitId)
+      parentSlot = getSubComponentParentSlotName(source, unitId)
       parentIndex = getSubComponentParentIndex(source, unitId)
       children = getSubComponentChildren(source, unitId)
       childrenSlot = getSubComponentChildrenSlot(source, unitId)
@@ -497,6 +499,7 @@ export function buildMoveMap(
           {},
           parentId,
           parentIndex,
+          parentSlot,
           children,
           childrenSlot
         ),
@@ -934,14 +937,24 @@ export function buildMoveMap(
 
       addDependency(moveSubComponentTask, parentAddUnitTask)
     } else {
-      const defaultSlotSubComponentId = getDefaultSlotSubComponentId(target)
+      if (reverse) {
+        const graphParentId = getSubComponentParentId(target, graphId)
 
-      if (defaultSlotSubComponentId) {
-        nextParentId = defaultSlotSubComponentId
+        nextParentId = graphParentId
         nextParentIndex = parentIndex
         nextParentSlot = 'default'
 
         addMoveToParentTask()
+      } else {
+        const defaultSlotSubComponentId = getDefaultSlotSubComponentId(target)
+
+        if (defaultSlotSubComponentId) {
+          nextParentId = defaultSlotSubComponentId
+          nextParentIndex = parentIndex
+          nextParentSlot = 'default'
+
+          addMoveToParentTask()
+        }
       }
     }
 

package/src/Class/Graph/index.ts

@@ -3331,10 +3331,10 @@ export class Graph<I extends Dict<any> = any, O extends Dict<any> = any>
     subComponentId: string,
     childId: string,
     at: number,
-    slot: string
+    slotName: string
   ) => {
     insertSubComponentChild(
-      { parentId: subComponentId, childId, at },
+      { parentId: subComponentId, childId, slotName, at },
       this._spec.component
     )
   }
@@ -3492,7 +3492,7 @@ export class Graph<I extends Dict<any> = any, O extends Dict<any> = any>
       .slice(0, -1)
       .concat([[unitId, ...(data[data.length - 1] ?? [])]])
 
-    this.emit(event, ...data_)
+    this.edit(event, ...data_)
 
     this._bubble && this._bubble(event, ...data_)
   }

package/src/Class/Graph/interface.ts

@@ -40,6 +40,7 @@ export type GraphAddUnitData = {
   pinPosition?: IOOf<Dict<Position>> | undefined
   layoutPosition?: Position | undefined
   parentId?: string | null | undefined
+  parentSlot?: string | null | undefined
   parentIndex?: number
   children?: string[]
   childrenSlot?: Dict<string>
@@ -105,6 +106,7 @@ export type GraphRemoveUnitData = {
   pinPosition?: IOOf<Dict<Position>>
   layoutPosition?: Position
   parentId?: string | null
+  parentSlot?: string | null
   parentIndex?: number
   children?: string[]
   childrenSlot?: Dict<string>

package/src/client/component.ts

@@ -3753,10 +3753,7 @@ export class Component<
     this.memRemoveParentRootAt(component, slotName, at, _at)
   }
 
-  public memRemoveParentRoot(
-    component: Component,
-    slotParent?: Component
-  ): void {
+  public memRemoveParentRoot(component: Component): void {
     const at = this.$parentRoot.indexOf(component)
     const at_ = this.$mountParentRoot.indexOf(component)
     const slotName = this.$parentRootSlotName[at]

package/src/spec/actions/G.ts

@@ -133,6 +133,7 @@ export const makeAddUnitAction = (
   merges?: GraphUnitMerges | null,
   plugs?: GraphUnitPlugs | null,
   parentId?: string | null | null,
+  parentSlot?: string | null,
   parentIndex?: number | null,
   children?: string[] | null,
   childrenSlot?: Dict<string> | null,
@@ -147,6 +148,7 @@ export const makeAddUnitAction = (
     pinPosition,
     layoutPosition,
     parentId,
+    parentSlot,
     parentIndex,
     children,
     childrenSlot,
@@ -221,6 +223,7 @@ export const makeRemoveUnitAction = (
   merges?: GraphMergesSpec,
   plugs?: GraphUnitPlugs,
   parentId?: string | null,
+  parentSlot?: string | null,
   parentIndex?: number,
   children?: string[],
   childrenSlot?: Dict<string>,
@@ -235,6 +238,7 @@ export const makeRemoveUnitAction = (
     pinPosition,
     layoutPosition,
     parentId,
+    parentSlot,
     parentIndex,
     children,
     childrenSlot,

package/src/spec/reducers/component.ts

@@ -12,6 +12,7 @@ import {
   deepGet,
   deepGetOrDefault,
   deepSet,
+  set,
 } from '../../util/object'
 import { getComponentSubComponentParentId } from '../util/component'
 
@@ -71,7 +72,10 @@ export const removeSubComponent = (
 
   for (const childId of children) {
     if (parentId) {
-      appendSubComponentChild({ parentId, childId }, component)
+      appendSubComponentChild(
+        { parentId, childId, slotName: 'default' },
+        component
+      )
     } else {
       appendRoot({ childId }, component)
     }
@@ -127,7 +131,11 @@ export const removeSubComponentChild = (
 }
 
 export const appendSubComponentChild = (
-  { parentId, childId }: { parentId: string; childId: string },
+  {
+    parentId,
+    childId,
+    slotName,
+  }: { parentId: string; childId: string; slotName: string },
   state: GraphComponentSpec
 ): void => {
   const { subComponents } = state
@@ -137,14 +145,21 @@ export const appendSubComponentChild = (
   const subComponent = subComponents[parentId]
 
   subComponent.children = subComponent.children || []
+  subComponent.childSlot = subComponent.childSlot || {}
 
-  const { children } = subComponent
+  const { children, childSlot } = subComponent
 
   push(children, childId)
+  set(childSlot, childId, slotName)
 }
 
 export const insertSubComponentChild = (
-  { parentId, childId, at }: { parentId: string; childId: string; at: number },
+  {
+    parentId,
+    childId,
+    slotName = 'default',
+    at,
+  }: { parentId: string; childId: string; slotName: string; at: number },
   state: GraphComponentSpec
 ): void => {
   const { subComponents } = state
@@ -154,10 +169,12 @@ export const insertSubComponentChild = (
   const subComponent = subComponents[parentId]
 
   subComponent.children = subComponent.children ?? []
+  subComponent.childSlot = subComponent.childSlot ?? {}
 
-  const { children } = subComponent
+  const { children, childSlot } = subComponent
 
   insert(children, childId, at)
+  set(childSlot, childId, slotName)
 }
 
 export const reorderSubComponent = (
@@ -176,9 +193,11 @@ export const _removeSubComponentFromParent = (
   state: GraphComponentSpec
 ) => {
   for (const childId of children) {
+    const slotName = slotMap[childId] ?? 'default'
+
     if (parentId) {
       removeRoot({ childId }, state)
-      appendSubComponentChild({ parentId, childId }, state)
+      appendSubComponentChild({ parentId, childId, slotName }, state)
     } else {
       appendRoot({ childId }, state)
     }
@@ -190,6 +209,8 @@ export const moveSubComponentRoot = (
   state: GraphComponentSpec
 ) => {
   for (const childId of children) {
+    const slotName = slotMap[childId]
+
     const currentParentId = getComponentSubComponentParentId(state, childId)
 
     if (currentParentId) {
@@ -199,7 +220,7 @@ export const moveSubComponentRoot = (
     }
 
     if (parentId) {
-      appendSubComponentChild({ parentId, childId }, state)
+      appendSubComponentChild({ parentId, childId, slotName }, state)
     } else {
       appendRoot({ childId }, state)
     }
@@ -240,7 +261,7 @@ export const moveRoot = (
   removeSubComponentFromParent({ subComponentId: childId }, component)
 
   if (parentId) {
-    insertSubComponentChild({ parentId, childId, at }, component)
+    insertSubComponentChild({ parentId, childId, slotName, at }, component)
   } else {
     insertRoot({ childId, at }, component)
   }

package/src/spec/reducers/spec.ts

@@ -413,13 +413,16 @@ export const setUnitId = (
 
     if (parentId) {
       const at = spec.component.subComponents[parentId].children.indexOf(unitId)
+      const slotName =
+        spec.component.subComponents?.[parentId]?.childSlot?.[unitId] ??
+        'default'
 
       removeSubComponentChild(
         { parentId: parentId, childId: unitId },
         spec.component
       )
       insertSubComponentChild(
-        { parentId, childId: newUnitId, at },
+        { parentId, childId: newUnitId, slotName, at },
         spec.component
       )
     } else {

package/src/spec/reverseAction.ts

@@ -98,6 +98,7 @@ export const reverseAction = ({ type, data }: Action): Action => {
         data.merges,
         data.plugs,
         data.parentId,
+        data.parentSlot,
         data.parentIndex,
         data.children,
         data.childrenSlot,
@@ -112,6 +113,7 @@ export const reverseAction = ({ type, data }: Action): Action => {
         data.merges,
         data.plugs,
         data.parentId,
+        data.parentSlot,
         data.parentIndex,
         data.children,
         data.childrenSlot,