@lvce-editor/file-search-worker 4.1.0 → 4.2.0

package/dist/fileSearchWorkerMain.js

@@ -448,7 +448,7 @@ const set$2 = (id, fn) => {
 const get$2 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
 let id = 0;
@@ -625,7 +625,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove(id);
+  remove$1(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -1699,13 +1699,17 @@ const create$2 = () => {
         oldState,
         newState
       };
+    },
+    remove(uid) {
+      delete states[uid];
     }
   };
 };
 
 const {
   get,
-  set
+  set,
+  remove
 } = create$2();
 
 const create$1 = ({
@@ -1808,6 +1812,10 @@ const create = (uid, uri, listItemHeight, x, y, width, height, platform, args, r
   set(uid, state, state);
 };
 
+const dispose = uid => {
+  remove(uid);
+};
+
 const emptyMatches = [];
 
 const convertToPick = item => {
@@ -2083,7 +2091,7 @@ const focusPrevious = state => {
   return focusIndex(state, previousIndex);
 };
 
-const commandIds = ['focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusPrevious', 'handleBeforeInput', 'handleBlur', 'handleClickAt', 'handleInput', 'handleWheel', 'renderEventListeners', 'selectCurrentIndex', 'selectIndex', 'selectItem', 'setValue'];
+const commandIds = ['focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusPrevious', 'handleBeforeInput', 'handleBlur', 'handleClickAt', 'handleInput', 'handleWheel', 'dispose', 'renderEventListeners', 'selectCurrentIndex', 'selectIndex', 'selectItem', 'setValue'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -2314,15 +2322,16 @@ const handleBeforeInput = (state, inputType, data, selectionStart, selectionEnd)
   return handleInput(state, newValue, cursorOffset, User);
 };
 
-const closeWidget = async id => {
-  await invoke$1('Viewlet.closeWidget', id);
-};
-
 const handleBlur = async state => {
-  await closeWidget(state.uid);
+  // TODO fix virtual dom diffing so that input isn't destroyed and loses focus when rerendering
+  // await CloseWidget.closeWidget(state.uid)
   return state;
 };
 
+const closeWidget = async id => {
+  await invoke$1('Viewlet.closeWidget', id);
+};
+
 const getPick = (items, index) => {
   array(items);
   number(index);
@@ -2648,7 +2657,12 @@ const renderCursorOffset = newState => {
   return ['Viewlet.send', newState.uid, /* method */SetCursorOffset, /* cursorOffset */newState.cursorOffset];
 };
 
+const QuickPickInput = 'QuickPickInput';
+
 const renderFocus = newState => {
+  if (newState.renderAllItems) {
+    return ['Viewlet.focusElementByName', QuickPickInput];
+  }
   const selector = newState.focused ? '.InputBox' : '';
   return ['Viewlet.focusSelector', selector];
 };
@@ -2676,7 +2690,7 @@ const QuickPick$1 = 'QuickPick';
 const QuickPickHeader = 'QuickPickHeader';
 const QuickPickHighlight = 'QuickPickHighlight';
 const QuickPickItem = 'QuickPickItem';
-const QuickPickItemActive = 'QuickPickItemActive';
+const QuickPickItemActive$1 = 'QuickPickItemActive';
 const QuickPickItemDescription = 'QuickPickItemDescription';
 const QuickPickItemLabel = 'QuickPickItemLabel';
 const QuickPickItems$1 = 'QuickPickItems';
@@ -2889,7 +2903,7 @@ const getQuickPickItemVirtualDom = visibleItem => {
   if (isActive) {
     // @ts-ignore
     parent.id = 'QuickPickItemActive';
-    parent.className += ' ' + QuickPickItemActive;
+    parent.className += ' ' + QuickPickItemActive$1;
   }
   if (fileIcon) {
     parent.childCount++;
@@ -2934,15 +2948,15 @@ const getQuickPickItemsVirtualDom = visibleItems => {
   return dom;
 };
 
-const QuickPick = 'QuickPick';
-const QuickPickItems = 'QuickPickItems';
-
 const HandlePointerDown = 'handlePointerDown';
 const HandleWheel = 'handleWheel';
 const HandleBlur = 'handleBlur';
 const HandleBeforeInput = 'handleBeforeInput';
+const HandleInput = 'handleInput';
 
-const QuickPickInput = 'QuickPickInput';
+const QuickPick = 'QuickPick';
+const QuickPickItems = 'QuickPickItems';
+const QuickPickItemActive = 'QuickPickItemActive';
 
 const getQuickPickHeaderVirtualDom = () => {
   const ariaLabel = typeNameofCommandToRun();
@@ -2961,7 +2975,10 @@ const getQuickPickHeaderVirtualDom = () => {
     name: QuickPickInput,
     onBeforeInput: HandleBeforeInput,
     onBlur: HandleBlur,
-    ariaLabel: ariaLabel
+    onInput: HandleInput,
+    ariaLabel: ariaLabel,
+    ariaAutoComplete: 'list',
+    ariaExpanded: true
   }];
 };
 
@@ -2978,6 +2995,8 @@ const getQuickPickVirtualDom = visibleItems => {
     className: QuickPickItems$1,
     id: QuickPickItems,
     role: ListBox,
+    ariaActiveDescendant: QuickPickItemActive,
+    onWheel: HandleWheel,
     childCount: visibleItems.length
   }, ...getQuickPickItemsVirtualDom(visibleItems)];
 };
@@ -3018,6 +3037,12 @@ const applyRender = async (oldState, newState, diffResult) => {
   const commands = [];
   const viewModel = await createQuickPickViewModel(oldState, newState);
   for (const item of diffResult) {
+    if (viewModel.renderAllItems && item === Height) {
+      continue;
+    }
+    if (viewModel.renderAllItems && item === RenderFocusedIndex) {
+      continue;
+    }
     const fn = getRenderer(item);
     commands.push(fn(viewModel));
   }
@@ -3049,8 +3074,8 @@ const isEqual = (oldState, newState) => {
   return newState.inputSource === User || oldState.value === newState.value;
 };
 
-const modules = [isEqual$2, isEqual$1, isEqual$4, isEqual, isEqual$3];
-const numbers = [diffType$2, diffType$1, diffType$4, diffType, diffType$3];
+const modules = [isEqual$2, isEqual$1, isEqual, isEqual$3, isEqual$4];
+const numbers = [diffType$2, diffType$1, diffType, diffType$3, diffType$4];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -3079,13 +3104,16 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleWheel,
-    params: ['handleWheel']
+    params: ['handleWheel', 'event.deltaMode', 'event.deltaY']
   }, {
     name: HandleBlur,
     params: ['handleBlur']
   }, {
     name: HandleBeforeInput,
     params: ['handleBeforeInput']
+  }, {
+    name: HandleInput,
+    params: ['handleInput', 'event.target.value']
   }];
 };
 
@@ -3134,6 +3162,7 @@ const commandMap = {
   'QuickPick.getKeyBindings': getKeyBindings,
   'QuickPick.handleBeforeInput': wrapCommand(handleBeforeInput),
   'QuickPick.handleBlur': wrapCommand(handleBlur),
+  'QuickPick.dispose': dispose,
   'QuickPick.handleClickAt': wrapCommand(handleClickAt),
   'QuickPick.handleInput': wrapCommand(handleInput),
   'QuickPick.handleWheel': wrapCommand(handleWheel),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/file-search-worker",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "",
   "keywords": [
     "text-search"