Account for nodes with Auto Layout applied

Author: yuanqing

packages/utilities/src/node/sort-nodes/sort-nodes-by-canonical-order.ts

@@ -19,7 +19,7 @@ export function sortNodesByCanonicalOrder<Node extends SceneNode>(
   if (areSiblingNodes(siblingNodes) === false) {
     throw new Error('Nodes in `siblingNodes` do not have the same parent')
   }
-  return siblingNodes
+  const result = siblingNodes
     .slice()
     .map(function (node: Node): { index: number; node: Node } {
       return {
@@ -33,4 +33,8 @@ export function sortNodesByCanonicalOrder<Node extends SceneNode>(
     .map(function ({ node }: { node: Node }): Node {
       return node
     })
+  if ('layoutMode' in parentNode && parentNode.layoutMode !== 'NONE') {
+    return result
+  }
+  return result.reverse()
 }

packages/utilities/src/node/sort-nodes/update-nodes-sort-order.ts

@@ -17,17 +17,20 @@ export function updateNodesSortOrder(siblingNodes: Array<SceneNode>): boolean {
     throw new Error('Nodes in `siblingNodes` do not have the same parent')
   }
   const siblingNodesCopy = siblingNodes.slice()
-  const ids = parentNode.children.map(function ({ id }: SceneNode) {
+  if ('layoutMode' in parentNode && parentNode.layoutMode !== 'NONE') {
+    siblingNodesCopy.reverse()
+  }
+  const idsBefore = parentNode.children.map(function ({ id }: SceneNode) {
     return id
   })
-  const insertIndex = computeInsertIndex(siblingNodesCopy, ids)
+  const insertIndex = computeInsertIndex(siblingNodesCopy, idsBefore)
   for (const node of siblingNodesCopy) {
     parentNode.insertChild(insertIndex, node)
   }
   const idsAfter = parentNode.children.map(function ({ id }: SceneNode) {
     return id
   })
-  return compareStringArrays(ids, idsAfter) === false
+  return compareStringArrays(idsBefore, idsAfter) === false
 }
 
 function computeInsertIndex(