@lvce-editor/renderer-process 30.46.4 → 30.47.0

package/dist/editorOnlyRendererProcessMain.js

@@ -2315,17 +2315,16 @@ const NavigateParent = 8;
 const RemoveChild = 9;
 const NavigateSibling = 10;
 const SetReferenceNodeUid = 11;
+const MultiNavigation = 18;
 
-const handleNavigateChild = (state, patches, patchIndex) => {
-  const patch = patches[patchIndex];
+const handleNavigateChild = (state, index, nextPatchType) => {
   const $Children = state.current.childNodes;
-  const $Child = $Children[patch.index];
+  const $Child = $Children[index];
   if ($Child) {
     state.current = $Child;
     return true;
   }
-  const nextPatch = patches[patchIndex + 1];
-  if (nextPatch && (nextPatch.type === Replace || nextPatch.type === SetReferenceNodeUid) && patch.index === $Children.length) {
+  if ((nextPatchType === Replace || nextPatchType === SetReferenceNodeUid) && index === $Children.length) {
     const $Placeholder = document.createComment('virtual-dom-placeholder');
     state.current.append($Placeholder);
     state.current = $Placeholder;
@@ -2333,7 +2332,7 @@ const handleNavigateChild = (state, patches, patchIndex) => {
   }
   console.error('Cannot navigate to child: child not found at index', {
     $Current: state.current,
-    index: patch.index,
+    index,
     childCount: $Children.length
   });
   return false;
@@ -2349,7 +2348,7 @@ const handleNavigateParent = state => {
   state.current = $Parent;
   return true;
 };
-const handleNavigateSibling = (state, patch, $Element, patchIndex) => {
+const handleNavigateSibling = (state, index, $Element, patchIndex) => {
   const $Parent = state.current.parentNode;
   if (!$Parent) {
     console.error('Cannot navigate to sibling: current node has no parent', {
@@ -2357,14 +2356,14 @@ const handleNavigateSibling = (state, patch, $Element, patchIndex) => {
     });
     return false;
   }
-  let $Sibling = $Parent.childNodes[patch.index];
+  let $Sibling = $Parent.childNodes[index];
   if (!$Sibling && !state.hasAppliedMutation && state.current !== $Element) {
-    $Sibling = $Element.childNodes[patch.index];
+    $Sibling = $Element.childNodes[index];
   }
   if (!$Sibling) {
     console.error('Cannot navigate to sibling: sibling not found at index', {
       $Parent,
-      index: patch.index,
+      index,
       childCount: $Parent.childNodes.length
     });
     return false;
@@ -2372,6 +2371,32 @@ const handleNavigateSibling = (state, patch, $Element, patchIndex) => {
   state.current = $Sibling;
   return true;
 };
+const handleSingleNavigation = (state, type, index, nextPatchType, $Element, patchIndex) => {
+  switch (type) {
+    case NavigateChild:
+      return handleNavigateChild(state, index, nextPatchType);
+    case NavigateParent:
+      return handleNavigateParent(state);
+    case NavigateSibling:
+      return handleNavigateSibling(state, index, $Element, patchIndex);
+    default:
+      console.error('Unknown navigation type', {
+        type
+      });
+      return false;
+  }
+};
+const handleMultiNavigation = (state, navigations, nextPatchType, $Element, patchIndex) => {
+  for (let i = 0; i < navigations.length; i += 2) {
+    const type = navigations[i];
+    const index = navigations[i + 1];
+    const nextType = navigations[i + 2] ?? nextPatchType;
+    if (!handleSingleNavigation(state, type, index, nextType, $Element, patchIndex)) {
+      return false;
+    }
+  }
+  return true;
+};
 const handleSetReferenceNodeUid = (state, patch) => {
   const instance = get$2(patch.uid);
   if (!instance || !instance.state) {
@@ -2389,12 +2414,14 @@ const handleSetReferenceNodeUid = (state, patch) => {
 };
 const handleNavigationPatch = (state, patch, patches, patchIndex, $Element) => {
   switch (patch.type) {
+    case MultiNavigation:
+      return handleMultiNavigation(state, patch.navigations, patches[patchIndex + 1]?.type, $Element, patchIndex);
     case NavigateChild:
-      return handleNavigateChild(state, patches, patchIndex);
+      return handleNavigateChild(state, patch.index, patches[patchIndex + 1]?.type);
     case NavigateParent:
       return handleNavigateParent(state);
     case NavigateSibling:
-      return handleNavigateSibling(state, patch, $Element, patchIndex);
+      return handleNavigateSibling(state, patch.index, $Element, patchIndex);
     default:
       return true;
   }

package/dist/rendererProcessMain.js

@@ -1751,17 +1751,16 @@ const NavigateParent = 8;
 const RemoveChild = 9;
 const NavigateSibling = 10;
 const SetReferenceNodeUid = 11;
+const MultiNavigation = 18;
 
-const handleNavigateChild = (state, patches, patchIndex) => {
-  const patch = patches[patchIndex];
+const handleNavigateChild = (state, index, nextPatchType) => {
   const $Children = state.current.childNodes;
-  const $Child = $Children[patch.index];
+  const $Child = $Children[index];
   if ($Child) {
     state.current = $Child;
     return true;
   }
-  const nextPatch = patches[patchIndex + 1];
-  if (nextPatch && (nextPatch.type === Replace || nextPatch.type === SetReferenceNodeUid) && patch.index === $Children.length) {
+  if ((nextPatchType === Replace || nextPatchType === SetReferenceNodeUid) && index === $Children.length) {
     const $Placeholder = document.createComment('virtual-dom-placeholder');
     state.current.append($Placeholder);
     state.current = $Placeholder;
@@ -1769,7 +1768,7 @@ const handleNavigateChild = (state, patches, patchIndex) => {
   }
   console.error('Cannot navigate to child: child not found at index', {
     $Current: state.current,
-    index: patch.index,
+    index,
     childCount: $Children.length
   });
   return false;
@@ -1785,7 +1784,7 @@ const handleNavigateParent = state => {
   state.current = $Parent;
   return true;
 };
-const handleNavigateSibling = (state, patch, $Element, patchIndex) => {
+const handleNavigateSibling = (state, index, $Element, patchIndex) => {
   const $Parent = state.current.parentNode;
   if (!$Parent) {
     console.error('Cannot navigate to sibling: current node has no parent', {
@@ -1793,14 +1792,14 @@ const handleNavigateSibling = (state, patch, $Element, patchIndex) => {
     });
     return false;
   }
-  let $Sibling = $Parent.childNodes[patch.index];
+  let $Sibling = $Parent.childNodes[index];
   if (!$Sibling && !state.hasAppliedMutation && state.current !== $Element) {
-    $Sibling = $Element.childNodes[patch.index];
+    $Sibling = $Element.childNodes[index];
   }
   if (!$Sibling) {
     console.error('Cannot navigate to sibling: sibling not found at index', {
       $Parent,
-      index: patch.index,
+      index,
       childCount: $Parent.childNodes.length
     });
     return false;
@@ -1808,6 +1807,32 @@ const handleNavigateSibling = (state, patch, $Element, patchIndex) => {
   state.current = $Sibling;
   return true;
 };
+const handleSingleNavigation = (state, type, index, nextPatchType, $Element, patchIndex) => {
+  switch (type) {
+    case NavigateChild:
+      return handleNavigateChild(state, index, nextPatchType);
+    case NavigateParent:
+      return handleNavigateParent(state);
+    case NavigateSibling:
+      return handleNavigateSibling(state, index, $Element, patchIndex);
+    default:
+      console.error('Unknown navigation type', {
+        type
+      });
+      return false;
+  }
+};
+const handleMultiNavigation = (state, navigations, nextPatchType, $Element, patchIndex) => {
+  for (let i = 0; i < navigations.length; i += 2) {
+    const type = navigations[i];
+    const index = navigations[i + 1];
+    const nextType = navigations[i + 2] ?? nextPatchType;
+    if (!handleSingleNavigation(state, type, index, nextType, $Element, patchIndex)) {
+      return false;
+    }
+  }
+  return true;
+};
 const handleSetReferenceNodeUid = (state, patch) => {
   const instance = get$a(patch.uid);
   if (!instance || !instance.state) {
@@ -1825,12 +1850,14 @@ const handleSetReferenceNodeUid = (state, patch) => {
 };
 const handleNavigationPatch = (state, patch, patches, patchIndex, $Element) => {
   switch (patch.type) {
+    case MultiNavigation:
+      return handleMultiNavigation(state, patch.navigations, patches[patchIndex + 1]?.type, $Element, patchIndex);
     case NavigateChild:
-      return handleNavigateChild(state, patches, patchIndex);
+      return handleNavigateChild(state, patch.index, patches[patchIndex + 1]?.type);
     case NavigateParent:
       return handleNavigateParent(state);
     case NavigateSibling:
-      return handleNavigateSibling(state, patch, $Element, patchIndex);
+      return handleNavigateSibling(state, patch.index, $Element, patchIndex);
     default:
       return true;
   }
@@ -7793,8 +7820,21 @@ const isNativeButtonActivation = event => {
   }
   return target instanceof HTMLButtonElement && target.role !== MenuItem && (key === 'Enter' || key === ' ');
 };
+const isTerminalTextInput = event => {
+  const {
+    altKey,
+    ctrlKey,
+    key,
+    metaKey,
+    target
+  } = event;
+  if (altKey || ctrlKey || metaKey || key.length !== 1) {
+    return false;
+  }
+  return target instanceof Element && Boolean(target.closest('.XtermTerminal'));
+};
 const handleKeyDown$1 = event => {
-  if (isNativeButtonActivation(event)) {
+  if (isNativeButtonActivation(event) || isTerminalTextInput(event)) {
     return;
   }
   const identifier = getKeyBindingIdentifier(event);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "30.46.4",
+  "version": "30.47.0",
   "keywords": [
     "lvce-editor",
     "renderer-process"