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

package/dist/fileSearchWorkerMain.js

@@ -1778,7 +1778,7 @@ const handleWheel = (state, deltaMode, deltaY) => {
   return setDeltaY(state, state.deltaY + deltaY);
 };
 
-const create = (uid, uri, listItemHeight, x, y, width, height, platform, args, renderAllItems) => {
+const create = (uid, uri, listItemHeight, x, y, width, height, platform, args) => {
   const state = {
     uid,
     state: Default$1,
@@ -1806,8 +1806,7 @@ const create = (uid, uri, listItemHeight, x, y, width, height, platform, args, r
     args,
     focused: false,
     platform,
-    value: '',
-    renderAllItems
+    value: ''
   };
   set(uid, state, state);
 };
@@ -2091,7 +2090,7 @@ const focusPrevious = state => {
   return focusIndex(state, previousIndex);
 };
 
-const commandIds = ['focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusPrevious', 'handleBeforeInput', 'handleBlur', 'handleClickAt', 'handleInput', 'handleWheel', 'dispose', '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;
@@ -2144,6 +2143,11 @@ const InsertLineBreak = 'insertLineBreak';
 const InsertCompositionText = 'insertCompositionText';
 const InsertFromPaste = 'insertFromPaste';
 
+const RE_ALPHA_NUMERIC = /[a-z\d]/i;
+const isAlphaNumeric = character => {
+  return RE_ALPHA_NUMERIC.test(character);
+};
+
 const getNewValueInsertText = (value, selectionStart, selectionEnd, data) => {
   if (selectionStart === value.length) {
     const newValue = value + data;
@@ -2177,10 +2181,6 @@ const getNewValueDeleteContentBackward = (value, selectionStart, selectionEnd, d
     cursorOffset: selectionStart
   };
 };
-const RE_ALPHA_NUMERIC = /[a-z\d]/i;
-const isAlphaNumeric = character => {
-  return RE_ALPHA_NUMERIC.test(character);
-};
 const getNewValueDeleteWordBackward = (value, selectionStart, selectionEnd, data) => {
   const after = value.slice(selectionEnd);
   if (selectionStart === selectionEnd) {
@@ -2322,7 +2322,7 @@ const handleBeforeInput = (state, inputType, data, selectionStart, selectionEnd)
   return handleInput(state, newValue, cursorOffset, User);
 };
 
-const handleBlur = async state => {
+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;
@@ -2389,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':
@@ -2573,6 +2584,13 @@ const getIconRequests = (items, provider) => {
   return iconRequests;
 };
 
+const getPickDescription$3 = (provider, pick) => {
+  if (provider.getPickDescription) {
+    return provider.getPickDescription(pick);
+  }
+  return '';
+};
+
 const requestFileIcons = async requests => {
   const promises = requests.map(request => {
     if (!request.name) {
@@ -2587,12 +2605,6 @@ const requestFileIcons = async requests => {
   return Promise.all(promises);
 };
 
-const getPickDescription$3 = (provider, pick) => {
-  if (provider.getPickDescription) {
-    return provider.getPickDescription(pick);
-  }
-  return '';
-};
 const getVisible = async (provider, items, minLineY, maxLineY, focusedIndex) => {
   const visibleItems = [];
   const setSize = items.length;
@@ -2636,8 +2648,7 @@ const createQuickPickViewModel = async (oldState, newState) => {
     height,
     oldFocusedIndex,
     newFocusedIndex,
-    uid: newState.uid,
-    renderAllItems: newState.renderAllItems
+    uid: newState.uid
   };
 };
 
@@ -2660,11 +2671,7 @@ const renderCursorOffset = newState => {
 const QuickPickInput = 'QuickPickInput';
 
 const renderFocus = newState => {
-  if (newState.renderAllItems) {
-    return ['Viewlet.focusElementByName', QuickPickInput];
-  }
-  const selector = newState.focused ? '.InputBox' : '';
-  return ['Viewlet.focusSelector', selector];
+  return ['Viewlet.focusElementByName', QuickPickInput];
 };
 
 const renderFocusedIndex = newState => {
@@ -2696,21 +2703,52 @@ const QuickPickItemLabel = 'QuickPickItemLabel';
 const QuickPickItems$1 = 'QuickPickItems';
 const Viewlet = 'Viewlet';
 
+const HandleBeforeInput = 'handleBeforeInput';
+const HandleBlur = 'handleBlur';
+const HandleFocus = 'handleFocus';
+const HandleInput = 'handleInput';
+const HandlePointerDown = 'handlePointerDown';
+const HandleWheel = 'handleWheel';
+
+const QuickPick = 'QuickPick';
+const QuickPickItems = 'QuickPickItems';
+const QuickPickItemActive = 'QuickPickItemActive';
+
 const Div$1 = 4;
 const Input$1 = 6;
 const Span$1 = 8;
 const Img$1 = 17;
 
-const getFileIconVirtualDom = icon => {
+const getQuickPickInputVirtualDom = () => {
+  const ariaLabel = typeNameofCommandToRun();
   return {
-    type: Img$1,
-    className: FileIcon,
-    src: icon,
-    role: None$1,
-    childCount: 0
+    type: Input$1,
+    className: InputBox,
+    spellcheck: false,
+    autocapitalize: 'off',
+    inputType: 'text',
+    childCount: 0,
+    role: ComboBox,
+    name: QuickPickInput,
+    onBeforeInput: HandleBeforeInput,
+    onBlur: HandleBlur,
+    onInput: HandleInput,
+    onFocus: HandleFocus,
+    ariaLabel: ariaLabel,
+    ariaAutoComplete: 'list',
+    ariaExpanded: true,
+    autocomplete: 'off'
   };
 };
 
+const getQuickPickHeaderVirtualDom = () => {
+  return [{
+    type: Div$1,
+    className: QuickPickHeader,
+    childCount: 1
+  }, getQuickPickInputVirtualDom()];
+};
+
 var __defProp = Object.defineProperty;
 var __export = (target, all) => {
   for (var name in all) __defProp(target, name, {
@@ -2878,6 +2916,17 @@ const addHighlights = (dom, highlights, label) => {
     dom.push(text(afterText));
   }
 };
+
+const getFileIconVirtualDom = icon => {
+  return {
+    type: Img$1,
+    className: FileIcon,
+    src: icon,
+    role: None$1,
+    childCount: 0
+  };
+};
+
 const getQuickPickItemVirtualDom = visibleItem => {
   const {
     posInSet,
@@ -2948,40 +2997,6 @@ const getQuickPickItemsVirtualDom = visibleItems => {
   return dom;
 };
 
-const HandlePointerDown = 'handlePointerDown';
-const HandleWheel = 'handleWheel';
-const HandleBlur = 'handleBlur';
-const HandleBeforeInput = 'handleBeforeInput';
-const HandleInput = 'handleInput';
-
-const QuickPick = 'QuickPick';
-const QuickPickItems = 'QuickPickItems';
-const QuickPickItemActive = 'QuickPickItemActive';
-
-const getQuickPickHeaderVirtualDom = () => {
-  const ariaLabel = typeNameofCommandToRun();
-  return [{
-    type: Div$1,
-    className: QuickPickHeader,
-    childCount: 1
-  }, {
-    type: Input$1,
-    className: InputBox,
-    spellcheck: false,
-    autocapitalize: 'off',
-    inputType: 'text',
-    childCount: 0,
-    role: ComboBox,
-    name: QuickPickInput,
-    onBeforeInput: HandleBeforeInput,
-    onBlur: HandleBlur,
-    onInput: HandleInput,
-    ariaLabel: ariaLabel,
-    ariaAutoComplete: 'list',
-    ariaExpanded: true
-  }];
-};
-
 const getQuickPickVirtualDom = visibleItems => {
   const quickOpen$1 = quickOpen();
   return [{
@@ -2995,19 +3010,15 @@ const getQuickPickVirtualDom = visibleItems => {
     className: QuickPickItems$1,
     id: QuickPickItems,
     role: ListBox,
-    ariaActiveDescendant: QuickPickItemActive,
+    ariaActivedescendant: QuickPickItemActive,
     onWheel: HandleWheel,
     childCount: visibleItems.length
   }, ...getQuickPickItemsVirtualDom(visibleItems)];
 };
 
 const renderItems = newState => {
-  if (newState.renderAllItems) {
-    const dom = getQuickPickVirtualDom(newState.visibleItems);
-    return ['Viewlet.setDom2', dom];
-  }
-  const dom = getQuickPickItemsVirtualDom(newState.visibleItems);
-  return ['Viewlet.send', newState.uid, /* method */'setItemsDom', dom];
+  const dom = getQuickPickVirtualDom(newState.visibleItems);
+  return ['Viewlet.setDom2', dom];
 };
 
 const renderValue = newState => {
@@ -3037,10 +3048,10 @@ const applyRender = async (oldState, newState, diffResult) => {
   const commands = [];
   const viewModel = await createQuickPickViewModel(oldState, newState);
   for (const item of diffResult) {
-    if (viewModel.renderAllItems && item === Height) {
+    if (item === Height) {
       continue;
     }
-    if (viewModel.renderAllItems && item === RenderFocusedIndex) {
+    if (item === RenderFocusedIndex) {
       continue;
     }
     const fn = getRenderer(item);
@@ -3114,6 +3125,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleInput,
     params: ['handleInput', 'event.target.value']
+  }, {
+    name: HandleFocus,
+    params: ['handleFocus']
   }];
 };
 
@@ -3153,6 +3167,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),
@@ -3161,20 +3176,20 @@ const commandMap = {
   'QuickPick.getCommandIds': getCommandIds,
   'QuickPick.getKeyBindings': getKeyBindings,
   'QuickPick.handleBeforeInput': wrapCommand(handleBeforeInput),
-  'QuickPick.handleBlur': wrapCommand(handleBlur),
-  'QuickPick.dispose': dispose,
+  '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.2.0",
+  "version": "4.4.0",
   "description": "",
   "keywords": [
     "text-search"