@lvce-editor/file-search-worker 4.1.0 → 4.3.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 = ['dispose', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusPrevious', 'handleBeforeInput', 'handleBlur', 'handleClickAt', 'handleFocus', 'handleInput', 'handleWheel', 'renderEventListeners', 'selectCurrentIndex', 'selectIndex', 'selectItem', 'setValue'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -2314,13 +2322,14 @@ 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$1 = async state => {
+  // TODO fix virtual dom diffing so that input isn't destroyed and loses focus when rerendering
+  // await CloseWidget.closeWidget(state.uid)
+  return state;
 };
 
-const handleBlur = async state => {
-  await closeWidget(state.uid);
-  return state;
+const closeWidget = async id => {
+  await invoke$1('Viewlet.closeWidget', id);
 };
 
 const getPick = (items, index) => {
@@ -2380,6 +2389,17 @@ const handleClickAt = (state, x, y) => {
   return selectIndex(state, index);
 };
 
+const setFocus = async focusKey => {
+  await invoke$1('Focus.setFocus', focusKey);
+};
+
+const handleBlur = async state => {
+  // TODO fix virtual dom diffing so that input isn't destroyed and loses focus when rerendering
+  await setFocus(FocusQuickPickInput);
+  // await CloseWidget.closeWidget(state.uid)
+  return state;
+};
+
 const getDefaultValue = uri => {
   switch (uri) {
     case 'quickPick://everything':
@@ -2648,7 +2668,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 +2701,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 +2914,7 @@ const getQuickPickItemVirtualDom = visibleItem => {
   if (isActive) {
     // @ts-ignore
     parent.id = 'QuickPickItemActive';
-    parent.className += ' ' + QuickPickItemActive;
+    parent.className += ' ' + QuickPickItemActive$1;
   }
   if (fileIcon) {
     parent.childCount++;
@@ -2934,23 +2959,20 @@ const getQuickPickItemsVirtualDom = visibleItems => {
   return dom;
 };
 
-const QuickPick = 'QuickPick';
-const QuickPickItems = 'QuickPickItems';
-
+const HandleBeforeInput = 'handleBeforeInput';
+const HandleBlur = 'handleBlur';
+const HandleFocus = 'handleFocus';
+const HandleInput = 'handleInput';
 const HandlePointerDown = 'handlePointerDown';
 const HandleWheel = 'handleWheel';
-const HandleBlur = 'handleBlur';
-const HandleBeforeInput = 'handleBeforeInput';
 
-const QuickPickInput = 'QuickPickInput';
+const QuickPick = 'QuickPick';
+const QuickPickItems = 'QuickPickItems';
+const QuickPickItemActive = 'QuickPickItemActive';
 
-const getQuickPickHeaderVirtualDom = () => {
+const getQuickPickInputVirtualDom = () => {
   const ariaLabel = typeNameofCommandToRun();
-  return [{
-    type: Div$1,
-    className: QuickPickHeader,
-    childCount: 1
-  }, {
+  return {
     type: Input$1,
     className: InputBox,
     spellcheck: false,
@@ -2961,8 +2983,21 @@ const getQuickPickHeaderVirtualDom = () => {
     name: QuickPickInput,
     onBeforeInput: HandleBeforeInput,
     onBlur: HandleBlur,
-    ariaLabel: ariaLabel
-  }];
+    onInput: HandleInput,
+    onFocus: HandleFocus,
+    ariaLabel: ariaLabel,
+    ariaAutoComplete: 'list',
+    ariaExpanded: true,
+    autocomplete: 'off'
+  };
+};
+
+const getQuickPickHeaderVirtualDom = () => {
+  return [{
+    type: Div$1,
+    className: QuickPickHeader,
+    childCount: 1
+  }, getQuickPickInputVirtualDom()];
 };
 
 const getQuickPickVirtualDom = visibleItems => {
@@ -2978,6 +3013,8 @@ const getQuickPickVirtualDom = visibleItems => {
     className: QuickPickItems$1,
     id: QuickPickItems,
     role: ListBox,
+    ariaActivedescendant: QuickPickItemActive,
+    onWheel: HandleWheel,
     childCount: visibleItems.length
   }, ...getQuickPickItemsVirtualDom(visibleItems)];
 };
@@ -3018,6 +3055,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 +3092,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 +3122,19 @@ 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']
+  }, {
+    name: HandleFocus,
+    params: ['handleFocus']
   }];
 };
 
@@ -3125,6 +3174,7 @@ const wrapCommand = fn => {
 const commandMap = {
   'QuickPick.addMenuEntries': add,
   'QuickPick.create2': create,
+  'QuickPick.dispose': dispose,
   'QuickPick.focusFirst': wrapCommand(focusFirst),
   'QuickPick.focusIndex': wrapCommand(focusIndex),
   'QuickPick.focusLast': wrapCommand(focusLast),
@@ -3133,19 +3183,20 @@ const commandMap = {
   'QuickPick.getCommandIds': getCommandIds,
   'QuickPick.getKeyBindings': getKeyBindings,
   'QuickPick.handleBeforeInput': wrapCommand(handleBeforeInput),
-  'QuickPick.handleBlur': wrapCommand(handleBlur),
+  'QuickPick.handleBlur': wrapCommand(handleBlur$1),
   'QuickPick.handleClickAt': wrapCommand(handleClickAt),
+  'QuickPick.handleFocus': wrapCommand(handleBlur),
   'QuickPick.handleInput': wrapCommand(handleInput),
   'QuickPick.handleWheel': wrapCommand(handleWheel),
   'QuickPick.loadContent': wrapCommand(loadContent),
   'QuickPick.loadEntries2': load,
   'QuickPick.render': doRender,
+  'QuickPick.renderEventListeners': renderEventListeners,
   'QuickPick.selectCurrentIndex': wrapCommand(selectCurrentIndex),
   'QuickPick.selectIndex': wrapCommand(selectIndex),
   'QuickPick.selectItem': wrapCommand(selectItem),
   'QuickPick.setDeltaY': wrapCommand(setDeltaY),
   'QuickPick.setValue': wrapCommand(setValue),
-  'QuickPick.renderEventListeners': renderEventListeners,
   // deprecated
   'SearchFile.filter': filterQuickPickItems,
   'SearchFile.searchFile': searchFile$5,

package/package.json

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