@lvce-editor/explorer-view 2.28.0 → 2.29.0

package/dist/explorerViewWorkerMain.js

@@ -1474,6 +1474,13 @@ const cancelEdit = state => {
   };
 };
 
+const cancelTypeAhead = state => {
+  return {
+    ...state,
+    focusWord: ''
+  };
+};
+
 const isTopLevel$1 = dirent => {
   return dirent.depth === 1;
 };
@@ -1580,6 +1587,20 @@ const create$1 = () => {
         };
       };
       return wrapped;
+    },
+    diff(uid, modules, numbers) {
+      const {
+        oldState,
+        newState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
     }
   };
 };
@@ -1630,7 +1651,9 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     editingSelection: {
       start: 0,
       end: 0
-    }
+    },
+    focusWord: '',
+    focusWordTimeout: 800
   };
   set(uid, state, state);
 };
@@ -1671,7 +1694,9 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     editingSelection: {
       start: 0,
       end: 0
-    }
+    },
+    focusWord: '',
+    focusWordTimeout: 800
   };
   set(state.uid, state, state);
   return state;
@@ -1999,7 +2024,7 @@ const focusIndex = (state, index) => {
   } = state;
   const newItems = items.map((item, i) => ({
     ...item,
-    selected: i === index ? true : false
+    selected: i === index ? false : false
   }));
   if (index < minLineY) {
     if (index < 0) {
@@ -2112,7 +2137,7 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'updateEditingValue', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'cancelTypeAhead', 'updateEditingValue', 'handleKeyDown', 'updateIcons'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -3335,6 +3360,73 @@ const handleInputClick = state => {
   return state;
 };
 
+const filterByFocusWord = (items, focusedIndex, focusWord) => {
+  if (items.length === 0) {
+    return -1;
+  }
+  const matches = [];
+  for (let i = 0; i < items.length; i++) {
+    if (items[i].toLowerCase().includes(focusWord)) {
+      matches.push(i);
+    }
+  }
+  if (matches.length === 0) {
+    return -1;
+  }
+
+  // Find the next match after the current focus
+  let nextIndex = matches.findIndex(index => index > focusedIndex);
+  if (nextIndex === -1) {
+    // If no match found after current focus, wrap around to the first match
+    nextIndex = 0;
+  }
+  return matches[nextIndex];
+};
+
+const RE_ASCII = /^[a-z]$/;
+const isAscii = key => {
+  return RE_ASCII.test(key);
+};
+
+let timeout;
+const handleKeyDown = (state, key) => {
+  const {
+    focusWord,
+    items,
+    focusedIndex,
+    focusWordTimeout
+  } = state;
+  if (focusWord && key === '') {
+    return cancelTypeAhead(state);
+  }
+  if (!isAscii(key)) {
+    return state;
+  }
+  const newFocusWord = focusWord + key.toLowerCase();
+  const itemNames = items.map(item => item.name);
+  const matchingIndex = filterByFocusWord(itemNames, focusedIndex, newFocusWord);
+  if (timeout) {
+    clearTimeout(timeout);
+  }
+
+  // @ts-ignore
+  // eslint-disable-next-line  @typescript-eslint/no-misused-promises
+  timeout = setTimeout(async () => {
+    await invoke('Explorer.cancelTypeAhead');
+  }, focusWordTimeout);
+  if (matchingIndex === -1) {
+    return {
+      ...state,
+      focusWord: newFocusWord
+    };
+  }
+  return {
+    ...state,
+    focusWord: newFocusWord,
+    focusedIndex: matchingIndex
+  };
+};
+
 // TODO add lots of tests for this
 const updateRoot = async state1 => {
   // @ts-ignore
@@ -4030,6 +4122,7 @@ const HandleInputBlur = 'handleInputBlur';
 const HandleInputClick = 'handleInputClick';
 const HandleListBlur = 'handleListBlur';
 const HandleListFocus = 'handleListFocus';
+const HandleListKeyDown = 'handleListKeyDown';
 const HandlePointerDown = 'handlePointerDown';
 const HandleWheel = 'handleWheel';
 
@@ -4214,7 +4307,8 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
     onDrop: HandleDrop,
     onFocus: HandleListFocus,
     onPointerDown: HandlePointerDown,
-    onWheel: HandleWheel
+    onWheel: HandleWheel,
+    onKeyDown: HandleListKeyDown
   }, ...visibleItems.flatMap(getExplorerItemVirtualDom)];
   return dom;
 };
@@ -4480,6 +4574,10 @@ const renderEventListeners = () => {
   return [{
     name: HandleInputBlur,
     params: ['handleInputBlur']
+  }, {
+    name: HandleListKeyDown,
+    params: ['handleKeyDown', 'event.key'],
+    preventDefault: true
   }, {
     name: HandleListFocus,
     params: ['handleFocus', 'event.isTrusted', 'event.target.className']
@@ -4880,6 +4978,8 @@ const updateEditingValue = async (state, value, inputSource = User) => {
 
 const commandMap = {
   'Explorer.acceptEdit': wrapCommand(acceptEdit),
+  'Explorer.handleKeyDown': wrapCommand(handleKeyDown),
+  'Explorer.cancelTypeAhead': wrapCommand(cancelTypeAhead),
   'Explorer.cancelEdit': wrapCommand(cancelEdit),
   'Explorer.collapseAll': wrapCommand(collapseAll),
   'Explorer.copyPath': wrapCommand(copyPath),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "2.28.0",
+  "version": "2.29.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",