@lvce-editor/static-server 0.70.21 → 0.70.23

package/static/{a0480e0 → 309b303}/packages/text-search-worker/dist/textSearchWorkerMain.js

@@ -592,7 +592,7 @@ const callbacks = Object.create(null);
 const get$3 = id => {
   return callbacks[id];
 };
-const remove$2 = id => {
+const remove$3 = id => {
   delete callbacks[id];
 };
 class JsonRpcError extends Error {
@@ -745,7 +745,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove$2(id);
+  remove$3(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -1195,6 +1195,25 @@ const WebWorkerRpcClient = {
   __proto__: null,
   create: create$1$1
 };
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
+};
 
 const Alert = 'alert';
 const Button$3 = 'button';
@@ -1206,9 +1225,78 @@ const ToolBar = 'toolbar';
 const Tree$1 = 'tree';
 const TreeItem$1 = 'treeitem';
 
+const Actions = 'Actions';
+const Badge = 'Badge';
+const Chevron = 'Chevron';
+const CloseMaskIcon = 'MaskIcon MaskIconClose';
+const Empty$1 = '';
+const FileIcon = 'FileIcon';
+const FocusOutline = 'FocusOutline';
+const Grow = 'Grow';
+const Highlight = 'Highlight';
+const HighlightDeleted = 'HighlightDeleted';
+const HighlightInserted = 'HighlightInserted';
+const IconButton = 'IconButton';
+const IconButtonDisabled = 'IconButtonDisabled';
+const Label = 'Label';
+const List$1 = 'List';
+const MaskIcon = 'MaskIcon';
+const MaskIconBook = 'MaskIconBook';
+const MaskIconCaseSensitive = 'MaskIconCaseSensitive';
+const MaskIconChevronDown = 'MaskIconChevronDown';
+const MaskIconChevronRight = 'MaskIconChevronRight';
+const MaskIconEllipsis = 'MaskIconEllipsis';
+const MaskIconExclude = 'MaskIconExclude';
+const MaskIconPreserveCase = 'MaskIconPreserveCase';
+const MaskIconRegex = 'MaskIconRegex';
+const MaskIconReplaceAll = 'MaskIconReplaceAll';
+const MaskIconWholeWord = 'MaskIconWholeWord';
+const MultilineInputBox = 'MultilineInputBox';
+const ScrollBar = 'ScrollBar';
+const ScrollBarThumb = 'ScrollBarThumb';
+const ScrollBarVertical = 'ScrollBarVertical';
+const Search$2 = 'Search';
+const SearchField = 'SearchField';
+const SearchFieldButton = 'SearchFieldButton';
+const SearchFieldButtonChecked = 'SearchFieldButtonChecked';
+const SearchFieldButtonDisabled = 'SearchFieldButtonDisabled';
+const SearchFieldButtons = 'SearchFieldButtons';
+const SearchFieldContainer = 'SearchFieldContainer';
+const SearchFieldError = 'SearchFieldError';
+const SearchHeader = 'SearchHeader';
+const SearchHeaderDetails = 'SearchHeaderDetails';
+const SearchHeaderDetailsExpanded = 'SearchHeaderDetailsExpanded';
+const SearchHeaderDetailsExpandedTop = 'SearchHeaderDetailsExpandedTop';
+const SearchHeaderDetailsHeading = 'SearchHeaderDetailsHeading';
+const SearchHeaderTop = 'SearchHeaderTop';
+const SearchHeaderTopRight = 'SearchHeaderTopRight';
+const SearchInputError = 'SearchInputError';
+const SearchRemove = 'SearchRemove';
+const SearchToggleButton = 'SearchToggleButton';
+const SearchToggleButtonExpanded = 'SearchToggleButtonExpanded';
+const SourceControlBadge = 'SourceControlBadge';
+const ToggleDetails = 'ToggleDetails';
+const Tree = 'Tree';
+const TreeItem = 'TreeItem';
+const TreeItemActive = 'TreeItemActive';
+const TreeItems$1 = 'TreeItems';
+const Viewlet = 'Viewlet';
+const ViewletSearchMessage = 'ViewletSearchMessage';
+const ViewletSearchMessageIndented = 'ViewletSearchMessageIndented';
+
 const File$2 = 7;
 
-const Button$2 = 'event.button';
+const Button$2 = 1;
+const Div = 4;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+const Ins = 20;
+const Del = 21;
+const H4 = 24;
+const TextArea = 62;
+
+const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const DeltaMode = 'event.deltaMode';
@@ -1220,7 +1308,7 @@ const TargetValue = 'event.target.value';
 
 const Script$1 = 2;
 
-const Search$2 = 18;
+const Search$1 = 18;
 const InputContextMenu = 91;
 
 const Separator = 1;
@@ -1243,7 +1331,22 @@ const SetDom2 = 'Viewlet.setDom2';
 const SetFocusContext = 'Viewlet.setFocusContext';
 const SetValueByName = 'Viewlet.setValueByName';
 
-const FocusSearch$1 = 1013;
+const Empty = 0;
+const FocusIgnoreFiles = 1012;
+const FocusSearch = 1013;
+const FocusSearchExcludeInput = 1008;
+const FocusSearchIncludeInput = 1007;
+const FocusSearchInput = 21;
+const FocusSearchMatchCase = 32;
+const FocusSearchOpenEditors = 1011;
+const FocusSearchPreserveCase = 36;
+const FocusSearchRegex = 33;
+const FocusSearchReplaceAll = 35;
+const FocusSearchReplaceInput = 31;
+const FocusSearchResults = 22;
+const FocusSearchWholeWord = 34;
+const FocusToggleDetails = 1010;
+const FocusToggleReplace = 1020;
 
 const rpcs = Object.create(null);
 const set$4 = (id, rpc) => {
@@ -1252,7 +1355,11 @@ const set$4 = (id, rpc) => {
 const get$2 = id => {
   return rpcs[id];
 };
+const remove$2 = id => {
+  delete rpcs[id];
+};
 
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create$3 = rpcId => {
   return {
     async dispose() {
@@ -1271,6 +1378,18 @@ const create$3 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$4(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove$2(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$4(rpcId, rpc);
     }
@@ -1407,105 +1526,20 @@ const terminate = () => {
   globalThis.close();
 };
 
-const Actions = 'Actions';
-const Badge = 'Badge';
-const Chevron = 'Chevron';
-const CloseMaskIcon = 'MaskIcon MaskIconClose';
-const Empty$1 = '';
-const FileIcon = 'FileIcon';
-const FocusOutline = 'FocusOutline';
-const Grow = 'Grow';
-const Highlight = 'Highlight';
-const HighlightDeleted = 'HighlightDeleted';
-const HighlightInserted = 'HighlightInserted';
-const IconButton = 'IconButton';
-const IconButtonDisabled = 'IconButtonDisabled';
-const Label = 'Label';
-const List$1 = 'List';
-const MaskIcon = 'MaskIcon';
-const MaskIconBook = 'MaskIconBook';
-const MaskIconCaseSensitive = 'MaskIconCaseSensitive';
-const MaskIconChevronDown = 'MaskIconChevronDown';
-const MaskIconChevronRight = 'MaskIconChevronRight';
-const MaskIconEllipsis = 'MaskIconEllipsis';
-const MaskIconExclude = 'MaskIconExclude';
-const MaskIconPreserveCase = 'MaskIconPreserveCase';
-const MaskIconRegex = 'MaskIconRegex';
-const MaskIconReplaceAll = 'MaskIconReplaceAll';
-const MaskIconWholeWord = 'MaskIconWholeWord';
-const MultilineInputBox = 'MultilineInputBox';
-const ScrollBar = 'ScrollBar';
-const ScrollBarThumb = 'ScrollBarThumb';
-const ScrollBarVertical = 'ScrollBarVertical';
-const Search$1 = 'Search';
-const SearchField = 'SearchField';
-const SearchFieldButton = 'SearchFieldButton';
-const SearchFieldButtonChecked = 'SearchFieldButtonChecked';
-const SearchFieldButtonDisabled = 'SearchFieldButtonDisabled';
-const SearchFieldButtons = 'SearchFieldButtons';
-const SearchFieldContainer = 'SearchFieldContainer';
-const SearchFieldError = 'SearchFieldError';
-const SearchHeader = 'SearchHeader';
-const SearchHeaderDetails = 'SearchHeaderDetails';
-const SearchHeaderDetailsExpanded = 'SearchHeaderDetailsExpanded';
-const SearchHeaderDetailsExpandedTop = 'SearchHeaderDetailsExpandedTop';
-const SearchHeaderDetailsHeading = 'SearchHeaderDetailsHeading';
-const SearchHeaderTop = 'SearchHeaderTop';
-const SearchHeaderTopRight = 'SearchHeaderTopRight';
-const SearchInputError = 'SearchInputError';
-const SearchRemove = 'SearchRemove';
-const SearchToggleButton = 'SearchToggleButton';
-const SearchToggleButtonExpanded = 'SearchToggleButtonExpanded';
-const SourceControlBadge = 'SourceControlBadge';
-const ToggleDetails = 'ToggleDetails';
-const Tree = 'Tree';
-const TreeItem = 'TreeItem';
-const TreeItemActive = 'TreeItemActive';
-const TreeItems$1 = 'TreeItems';
-const Viewlet = 'Viewlet';
-const ViewletSearchMessage = 'ViewletSearchMessage';
-const ViewletSearchMessageIndented = 'ViewletSearchMessageIndented';
-
-const Button$1 = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-const Img = 17;
-const Ins = 20;
-const Del = 21;
-const H4 = 24;
-const TextArea = 62;
-
-const Empty = 0;
-const FocusIgnoreFiles = 1012;
-const FocusSearch = 1013;
-const FocusSearchExcludeInput = 1008;
-const FocusSearchIncludeInput = 1007;
-const FocusSearchInput = 21;
-const FocusSearchMatchCase = 32;
-const FocusSearchOpenEditors = 1011;
-const FocusSearchPreserveCase = 36;
-const FocusSearchRegex = 33;
-const FocusSearchReplaceAll = 35;
-const FocusSearchReplaceInput = 31;
-const FocusSearchResults = 22;
-const FocusSearchWholeWord = 34;
-const FocusToggleDetails = 1010;
-const FocusToggleReplace = 1020;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
   };
 };
 
 const SetText = 1;
+const Replace$1 = 2;
 const SetAttribute = 3;
 const RemoveAttribute = 4;
 const Add = 6;
@@ -1514,24 +1548,6 @@ const NavigateParent = 8;
 const RemoveChild = 9;
 const NavigateSibling = 10;
 
-const applyPendingPatches = (patches, pendingPatches, skip) => {
-  for (let k = 0; k < pendingPatches.length - skip; k += 2) {
-    const type = pendingPatches[k];
-    const index = pendingPatches[k + 1];
-    if (type === NavigateParent) {
-      patches.push({
-        type
-      });
-    } else {
-      patches.push({
-        type,
-        index
-      });
-    }
-  }
-  pendingPatches.length = 0;
-};
-
 const isKey = key => {
   return key !== 'type' && key !== 'childCount';
 };
@@ -1541,183 +1557,262 @@ const getKeys = node => {
   return keys;
 };
 
-const getTotalChildCount = (nodes, index) => {
-  let i = index;
-  let pending = 1;
-  while (pending) {
+const arrayToTree = nodes => {
+  const result = [];
+  let i = 0;
+  while (i < nodes.length) {
     const node = nodes[i];
-    pending += node.childCount;
-    pending--;
-    i++;
+    const {
+      children,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, node.childCount || 0);
+    result.push({
+      node,
+      children
+    });
+    i += 1 + nodesConsumed;
   }
-  return i - index;
+  return result;
+};
+const getChildrenWithCount = (nodes, startIndex, childCount) => {
+  if (childCount === 0) {
+    return {
+      children: [],
+      nodesConsumed: 0
+    };
+  }
+  const children = [];
+  let i = startIndex;
+  let remaining = childCount;
+  let totalConsumed = 0;
+  while (remaining > 0 && i < nodes.length) {
+    const node = nodes[i];
+    const nodeChildCount = node.childCount || 0;
+    const {
+      children: nodeChildren,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, nodeChildCount);
+    children.push({
+      node,
+      children: nodeChildren
+    });
+    const nodeSize = 1 + nodesConsumed;
+    i += nodeSize;
+    totalConsumed += nodeSize;
+    remaining--;
+  }
+  return {
+    children,
+    nodesConsumed: totalConsumed
+  };
 };
 
-const diff$1 = (oldNodes, newNodes) => {
+const compareNodes = (oldNode, newNode) => {
   const patches = [];
-  const pendingPatches = [];
-  let i = 0;
-  let j = 0;
-  let siblingOffset = 0;
-  let maxSiblingOffset = 1;
-  const indexStack = [0, 1];
-  while (i < oldNodes.length && j < newNodes.length) {
-    const oldNode = oldNodes[i];
-    const newNode = newNodes[j];
-    // TODO maybe don't have the current element in indexstack
-    if (siblingOffset === maxSiblingOffset) {
-      indexStack.pop();
-      indexStack.pop();
-      pendingPatches.push(NavigateParent, 0);
-      maxSiblingOffset = indexStack.pop();
-      siblingOffset = indexStack.pop() + 1;
-    }
-    while (siblingOffset === maxSiblingOffset) {
-      pendingPatches.push(NavigateParent, 0);
-      maxSiblingOffset = indexStack.pop();
-      siblingOffset = indexStack.pop() + 1;
+  // Check if node type changed - return null to signal incompatible nodes
+  // (caller should handle this with a Replace operation)
+  if (oldNode.type !== newNode.type) {
+    return null;
+  }
+  // Handle text nodes
+  if (oldNode.type === Text && newNode.type === Text) {
+    if (oldNode.text !== newNode.text) {
+      patches.push({
+        type: SetText,
+        value: newNode.text
+      });
     }
-    if (oldNode.type !== newNode.type) {
-      let skip = 0;
-      if (pendingPatches.length > 0 && pendingPatches.at(-2) === NavigateChild) {
-        skip = 2;
-      }
-      applyPendingPatches(patches, pendingPatches, skip);
-      const oldTotal = getTotalChildCount(oldNodes, i);
-      const newTotal = getTotalChildCount(newNodes, j);
+    return patches;
+  }
+  // Compare attributes
+  const oldKeys = getKeys(oldNode);
+  const newKeys = getKeys(newNode);
+  // Check for attribute changes
+  for (const key of newKeys) {
+    if (oldNode[key] !== newNode[key]) {
       patches.push({
-        type: RemoveChild,
-        index: siblingOffset
+        type: SetAttribute,
+        key,
+        value: newNode[key]
       });
+    }
+  }
+  // Check for removed attributes
+  for (const key of oldKeys) {
+    if (!(key in newNode)) {
       patches.push({
-        type: Add,
-        nodes: newNodes.slice(j, j + newTotal)
+        type: RemoveAttribute,
+        key
       });
-      siblingOffset++;
-      i += oldTotal;
-      j += newTotal;
+    }
+  }
+  return patches;
+};
+
+const treeToArray = node => {
+  const result = [node.node];
+  for (const child of node.children) {
+    result.push(...treeToArray(child));
+  }
+  return result;
+};
+
+const diffChildren = (oldChildren, newChildren, patches) => {
+  const maxLength = Math.max(oldChildren.length, newChildren.length);
+  // Track where we are: -1 means at parent, >= 0 means at child index
+  let currentChildIndex = -1;
+  // Collect indices of children to remove (we'll add these patches at the end in reverse order)
+  const indicesToRemove = [];
+  for (let i = 0; i < maxLength; i++) {
+    const oldNode = oldChildren[i];
+    const newNode = newChildren[i];
+    if (!oldNode && !newNode) {
       continue;
     }
-    if (oldNode.type === Text && newNode.type === Text) {
-      if (oldNode.text !== newNode.text) {
-        if (siblingOffset !== 0) {
-          pendingPatches.push(NavigateSibling, siblingOffset);
-        }
-        applyPendingPatches(patches, pendingPatches, 0);
+    if (!oldNode) {
+      // Add new node - we should be at the parent
+      if (currentChildIndex >= 0) {
+        // Navigate back to parent
         patches.push({
-          type: SetText,
-          value: newNode.text
+          type: NavigateParent
         });
+        currentChildIndex = -1;
       }
-      i++;
-      j++;
-      siblingOffset++;
-      continue;
-    }
-    const oldKeys = getKeys(oldNode);
-    const newKeys = getKeys(newNode);
-    let hasAttributeChanges = false;
-    for (const key of newKeys) {
-      if (oldNode[key] !== newNode[key]) {
-        hasAttributeChanges = true;
-        break;
-      }
-    }
-    for (const key of oldKeys) {
-      if (!(key in newNode)) {
-        hasAttributeChanges = true;
-        break;
-      }
-    }
-    if (hasAttributeChanges) {
-      if (siblingOffset > 0) {
-        pendingPatches.push(NavigateSibling, siblingOffset);
-      }
-      applyPendingPatches(patches, pendingPatches, 0);
-      for (const key of newKeys) {
-        if (oldNode[key] !== newNode[key]) {
+      // Flatten the entire subtree so renderInternal can handle it
+      const flatNodes = treeToArray(newNode);
+      patches.push({
+        type: Add,
+        nodes: flatNodes
+      });
+    } else if (newNode) {
+      // Compare nodes to see if we need any patches
+      const nodePatches = compareNodes(oldNode.node, newNode.node);
+      // If nodePatches is null, the node types are incompatible - need to replace
+      if (nodePatches === null) {
+        // Navigate to this child
+        if (currentChildIndex === -1) {
           patches.push({
-            type: SetAttribute,
-            key,
-            value: newNode[key]
+            type: NavigateChild,
+            index: i
           });
-        }
-      }
-      for (const key of oldKeys) {
-        if (!(key in newNode)) {
+          currentChildIndex = i;
+        } else if (currentChildIndex !== i) {
           patches.push({
-            type: RemoveAttribute,
-            key
+            type: NavigateSibling,
+            index: i
           });
+          currentChildIndex = i;
         }
-      }
-    }
-    if (oldNode.childCount && newNode.childCount) {
-      maxSiblingOffset = oldNode.childCount;
-      indexStack.push(0, maxSiblingOffset);
-      pendingPatches.push(NavigateChild, 0);
-      i++;
-      j++;
-      continue;
-    }
-    if (oldNode.childCount) {
-      applyPendingPatches(patches, pendingPatches, 0);
-      for (let k = 0; k < oldNode.childCount; k++) {
+        // Replace the entire subtree
+        const flatNodes = treeToArray(newNode);
         patches.push({
-          type: RemoveChild,
-          index: 0
+          type: Replace$1,
+          nodes: flatNodes
         });
+        // After replace, we're at the new element (same position)
+        continue;
       }
-      i += getTotalChildCount(oldNodes, i);
-      j++;
-      siblingOffset++;
-      continue;
-    }
-    if (newNode.childCount) {
-      applyPendingPatches(patches, pendingPatches, 0);
-      const total = getTotalChildCount(newNodes, j);
-      patches.push({
-        type: Add,
-        nodes: newNodes.slice(j + 1, j + total)
-      });
-      i++;
-      j += total;
-      continue;
+      // Check if we need to recurse into children
+      const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
+      // Only navigate to this element if we need to do something
+      if (nodePatches.length > 0 || hasChildrenToCompare) {
+        // Navigate to this child if not already there
+        if (currentChildIndex === -1) {
+          patches.push({
+            type: NavigateChild,
+            index: i
+          });
+          currentChildIndex = i;
+        } else if (currentChildIndex !== i) {
+          patches.push({
+            type: NavigateSibling,
+            index: i
+          });
+          currentChildIndex = i;
+        }
+        // Apply node patches (these apply to the current element, not children)
+        if (nodePatches.length > 0) {
+          patches.push(...nodePatches);
+        }
+        // Compare children recursively
+        if (hasChildrenToCompare) {
+          diffChildren(oldNode.children, newNode.children, patches);
+        }
+      }
+    } else {
+      // Remove old node - collect the index for later removal
+      indicesToRemove.push(i);
     }
-    i++;
-    j++;
-    siblingOffset++;
   }
-  while (i < oldNodes.length) {
-    if (indexStack.length !== 2) {
-      patches.push({
-        type: NavigateParent
-      });
-    }
+  // Navigate back to parent if we ended at a child
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+    currentChildIndex = -1;
+  }
+  // Add remove patches in reverse order (highest index first)
+  // This ensures indices remain valid as we remove
+  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
     patches.push({
       type: RemoveChild,
-      index: siblingOffset
+      index: indicesToRemove[j]
     });
-    i += getTotalChildCount(oldNodes, i);
-    indexStack.pop();
-    indexStack.pop();
   }
-  while (j < newNodes.length) {
-    if (siblingOffset > 0) {
+};
+const diffTrees = (oldTree, newTree, patches, path) => {
+  // At the root level (path.length === 0), we're already AT the element
+  // So we compare the root node directly, then compare its children
+  if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
+    const oldNode = oldTree[0];
+    const newNode = newTree[0];
+    // Compare root nodes
+    const nodePatches = compareNodes(oldNode.node, newNode.node);
+    // If nodePatches is null, the root node types are incompatible - need to replace
+    if (nodePatches === null) {
+      const flatNodes = treeToArray(newNode);
       patches.push({
-        type: NavigateSibling,
-        index: siblingOffset
+        type: Replace$1,
+        nodes: flatNodes
       });
-      siblingOffset = 0;
+      return;
     }
-    const count = getTotalChildCount(newNodes, j);
-    patches.push({
-      type: Add,
-      nodes: newNodes.slice(j, j + count)
-    });
-    j += count;
+    if (nodePatches.length > 0) {
+      patches.push(...nodePatches);
+    }
+    // Compare children
+    if (oldNode.children.length > 0 || newNode.children.length > 0) {
+      diffChildren(oldNode.children, newNode.children, patches);
+    }
+  } else {
+    // Non-root level or multiple root elements - use the regular comparison
+    diffChildren(oldTree, newTree, patches);
   }
-  return patches;
+};
+
+const removeTrailingNavigationPatches = patches => {
+  // Find the last non-navigation patch
+  let lastNonNavigationIndex = -1;
+  for (let i = patches.length - 1; i >= 0; i--) {
+    const patch = patches[i];
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+      lastNonNavigationIndex = i;
+      break;
+    }
+  }
+  // Return patches up to and including the last non-navigation patch
+  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+};
+
+const diffTree = (oldNodes, newNodes) => {
+  // Step 1: Convert flat arrays to tree structures
+  const oldTree = arrayToTree(oldNodes);
+  const newTree = arrayToTree(newNodes);
+  // Step 3: Compare the trees
+  const patches = [];
+  diffTrees(oldTree, newTree, patches, []);
+  // Remove trailing navigation patches since they serve no purpose
+  return removeTrailingNavigationPatches(patches);
 };
 
 const User = 1;
@@ -1994,6 +2089,7 @@ const create = (uid, x, y, width, height, workspacePath, assetDir, itemHeight, v
     disposed: false,
     fileCount: 0,
     height,
+    initial: true,
     searchResults: [],
     stats: {},
     uid,
@@ -2106,7 +2202,7 @@ const isEqual = (oldState, newState) => {
 };
 
 const modules = [isEqual$2, isEqual$5, isEqual$3, isEqual$6, isEqual$1, isEqual, isEqual$4];
-const numbers = [RenderItems, RenderFocus, RenderIncludeValue, RenderExcludeValue, RenderReplaceValue, RenderValue, RenderFocusContext];
+const numbers = [RenderIncremental, RenderFocus, RenderIncludeValue, RenderExcludeValue, RenderReplaceValue, RenderValue, RenderFocusContext];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -2867,7 +2963,7 @@ const getMenuEntriesList = (state, props) => {
 };
 
 const getMenuEntries = (state, props) => {
-  if (props.menuId === Search$2) {
+  if (props.menuId === Search$1) {
     return getMenuEntriesList(state, props);
   }
   if (props.menuId === InputContextMenu) {
@@ -2877,7 +2973,7 @@ const getMenuEntries = (state, props) => {
 };
 
 const getMenuEntryIds = () => {
-  return [Search$2, InputContextMenu];
+  return [Search$1, InputContextMenu];
 };
 
 const ClearAll$1 = 'ClearAll';
@@ -4476,6 +4572,7 @@ const loadContent = async (state, savedState) => {
     const result = await handleUpdate(state, update);
     return {
       ...result,
+      initial: false,
       loaded: true
     };
   }
@@ -4483,6 +4580,7 @@ const loadContent = async (state, savedState) => {
     ...state,
     ...update,
     flags,
+    initial: false,
     loaded: true,
     threads
   };
@@ -4581,7 +4679,7 @@ const renderFocus = (oldState, newState) => {
 };
 
 const renderFocusContext = (oldState, newState) => {
-  return [SetFocusContext, newState.uid, FocusSearch$1, newState.focus];
+  return [SetFocusContext, newState.uid, FocusSearch, newState.focus];
 };
 
 const None = 0;
@@ -4751,7 +4849,7 @@ const getSearchDetailsToggleVirtualDom = () => {
     role: Button$3,
     tabIndex: 0,
     title: toggleSearchDetails(),
-    type: Button$1
+    type: Button$2
   }, {
     childCount: 0,
     className: mergeClassNames(MaskIcon, MaskIconEllipsis),
@@ -4871,7 +4969,7 @@ const getSearchFieldButtonVirtualDom = button => {
     role,
     tabIndex: 0,
     title,
-    type: Button$1
+    type: Button$2
   }, {
     childCount: 0,
     className: mergeClassNames(MaskIcon, icon),
@@ -5048,7 +5146,7 @@ const getSearchToggleVirtualDom = replaceExpanded => {
     name: ToggleReplace,
     onClick: HandleButtonClick,
     title: toggleReplace$1(),
-    type: Button$1
+    type: Button$2
   }, {
     childCount: 0,
     className: mergeClassNames(MaskIcon, replaceExpanded ? MaskIconChevronDown : MaskIconChevronRight),
@@ -5263,7 +5361,7 @@ const getSearchRemoveVirtualDom = () => {
     className: SearchRemove,
     name: Remove,
     title,
-    type: Button$1
+    type: Button$2
   }, closeIcon];
   return dom;
 };
@@ -5342,8 +5440,11 @@ const getSearchResultsVirtualDom = (visibleItems, focusOutline, scrollbarHeight,
   }, ...getTreeItemsVirtualDom(visibleItems, deltaY, itemHeight), ...getScrollBarVirtualDom(scrollbarHeight, scrollBarY, scrollBarValue)];
 };
 
-const className = mergeClassNames(Viewlet, Search$1);
-const getSearchVirtualDom = (visibleItems, flags, message, focusOutline, searchInputErrorMessage, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight, matchCount, limitHitWarning, focus = 0) => {
+const className = mergeClassNames(Viewlet, Search$2);
+const getSearchVirtualDom = (visibleItems, flags, message, focusOutline, searchInputErrorMessage, scrollBarHeight, scrollBarY, scrollBarValue, deltaY, itemHeight, matchCount, limitHitWarning, focus = 0, initial = false) => {
+  if (initial) {
+    return [];
+  }
   const errorDom = getSearchInputErrorVirtualDom(searchInputErrorMessage);
   const childCount = 2 + (errorDom.length > 0 ? 1 : 0);
   return [{
@@ -5355,16 +5456,16 @@ const getSearchVirtualDom = (visibleItems, flags, message, focusOutline, searchI
 
 const renderItems = (oldState, newState) => {
   const viewModel = createViewModel(newState);
-  const dom = getSearchVirtualDom(viewModel.displayResults, viewModel.flags, viewModel.message, viewModel.focusOutline, viewModel.searchInputErrorMessage, viewModel.scrollBarHeight, viewModel.scrollBarY, viewModel.scrollBarValue, viewModel.deltaY, viewModel.itemHeight, viewModel.matchCount, newState.limitHitWarning, viewModel.focus);
+  const dom = getSearchVirtualDom(viewModel.displayResults, viewModel.flags, viewModel.message, viewModel.focusOutline, viewModel.searchInputErrorMessage, viewModel.scrollBarHeight, viewModel.scrollBarY, viewModel.scrollBarValue, viewModel.deltaY, viewModel.itemHeight, viewModel.matchCount, newState.limitHitWarning, viewModel.focus, newState.initial);
   return [SetDom2, newState.uid, dom];
 };
 
 // TODO cache rendered dom so that it can be used for dom diffing
 const renderIncremental = (oldState, newState) => {
-  const oldDom = renderItems(oldState, oldState);
-  const newDom = renderItems(newState, newState);
-  const patches = diff$1(oldDom, newDom);
-  return patches;
+  const oldDom = renderItems(oldState, oldState)[2];
+  const newDom = renderItems(newState, newState)[2];
+  const patches = diffTree(oldDom, newDom);
+  return ['Viewlet.setPatches', newState.uid, patches];
 };
 
 const renderSelections = (oldState, newState) => {
@@ -5461,7 +5562,7 @@ const getActionButtonVirtualDom = action => {
     className,
     name: id,
     title: label,
-    type: Button$1
+    type: Button$2
   }, getIconVirtualDom(icon)];
 };
 
@@ -5558,7 +5659,7 @@ const renderEventListeners = () => {
     params: ['handleClickAt', ClientX, ClientY, TargetName]
   }, {
     name: HandleListPointerDown,
-    params: ['handleListPointerDown', Button$2, TargetName]
+    params: ['handleListPointerDown', Button$1, TargetName]
   }, {
     name: HandleToggleButtonClick,
     params: ['handleToggleButtonClick']
@@ -5570,11 +5671,11 @@ const renderEventListeners = () => {
     params: ['handleListBlur']
   }, {
     name: HandleListContextMenu,
-    params: ['handleContextMenu', Button$2, ClientX, ClientY],
+    params: ['handleContextMenu', Button$1, ClientX, ClientY],
     preventDefault: true
   }, {
     name: HandleInputContextMenu,
-    params: ['handleInputContextMenu', TargetName, Button$2, ClientX, ClientY],
+    params: ['handleInputContextMenu', TargetName, Button$1, ClientX, ClientY],
     preventDefault: true
   }, {
     name: HandleActionClick,
@@ -5782,10 +5883,10 @@ const handleContextMenuKeyboard = async state => {
     x,
     y
   } = state; // TODO
-  await show2(uid, Search$2, x, y, {
+  await show2(uid, Search$1, x, y, {
     index: 0,
     // TODO pass proper index
-    menuId: Search$2
+    menuId: Search$1
   });
   return state;
 };
@@ -5811,9 +5912,9 @@ const handleContextMenuMouseAt = async (state, eventX, eventY) => {
     focusedIndex: index,
     listFocusedIndex: index
   });
-  await show2(uid, Search$2, x, y, {
+  await show2(uid, Search$1, x, y, {
     index,
-    menuId: Search$2
+    menuId: Search$1
   });
   return state;
 };