@lvce-editor/extension-search-view 4.11.0 → 4.13.0

package/dist/extensionSearchViewWorkerMain.js

@@ -1138,7 +1138,7 @@ const LeftClick = 0;
 
 const DebugWorker = 55;
 const ExtensionHostWorker = 44;
-const RendererWorker$1 = 1;
+const RendererWorker$2 = 1;
 
 const None$2 = 0;
 const Input = 1;
@@ -1241,6 +1241,46 @@ const getFinalDeltaY = (height, itemHeight, itemsLength) => {
   return finalDeltaY;
 };
 
+const Button = 1;
+
+const HandleClearSearchResults = 1;
+const HandleClickFilter = 2;
+const HandleContextMenu = 3;
+const HandleExtensionsInput = 4;
+const HandleFocus = 5;
+const HandlePointerDown = 7;
+const HandleScrollBarMove = 9;
+const HandleScrollBarPointerCaptureLost = 10;
+const HandleScrollBarPointerDown = 11;
+const HandleTouchEnd = 12;
+const HandleTouchMove = 13;
+const HandleTouchStart = 14;
+const HandleWheel = 15;
+const HandleHeaderContextMenu = 16;
+
+const ClearAll = 'ClearAll';
+const Filter = 'Filter';
+const Refresh = 'Refresh';
+const Ellipsis = 'Ellipsis';
+
+const getInputActions = hasValue => {
+  const clearEnabled = hasValue;
+  const actions = [{
+    onClick: HandleClearSearchResults,
+    icon: `MaskIcon${ClearAll}`,
+    title: clearExtensionSearchResults(),
+    type: Button,
+    enabled: clearEnabled
+  }, {
+    icon: `MaskIcon${Filter}`,
+    title: filter(),
+    type: Button,
+    onClick: HandleClickFilter,
+    enabled: true
+  }];
+  return actions;
+};
+
 const getListHeight = (itemsLength, itemHeight, maxHeight) => {
   number(itemsLength);
   number(itemHeight);
@@ -1266,9 +1306,6 @@ const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
 };
 
-const User = 1;
-const Script = 2;
-
 const getScrollBarY$1 = (delta, finalDelta, size, scrollBarSize) => {
   if (finalDelta === 0) {
     return 0;
@@ -1419,8 +1456,18 @@ const searchExtensions = async (extensions, value, platform, assetDir) => {
 };
 
 // TODO debounce
-const handleInput = async (state, value, inputSource = User) => {
+const handleChange = async (state, update) => {
+  const fullNewState = {
+    ...state,
+    ...update
+  };
   try {
+    const value = fullNewState.searchValue;
+    const {
+      inputSource
+    } = fullNewState;
+    const hasValue = value.length > 0;
+    const inputActions = getInputActions(hasValue);
     const {
       allExtensions,
       itemHeight,
@@ -1447,7 +1494,8 @@ const handleInput = async (state, value, inputSource = User) => {
         placeholder: searchExtensionsInMarketPlace(),
         scrollBarHeight: 0,
         searchValue: value,
-        inputSource
+        inputSource,
+        inputActions
       };
     }
     const total = items.length;
@@ -1471,7 +1519,8 @@ const handleInput = async (state, value, inputSource = User) => {
       scrollBarHeight,
       scrollBarY,
       searchValue: value,
-      inputSource
+      inputSource,
+      inputActions
     };
 
     // TODO handle out of order responses (a bit complicated)
@@ -1480,18 +1529,19 @@ const handleInput = async (state, value, inputSource = User) => {
     // TODO send error to error worker
     await handleError(error);
     return {
-      ...state,
-      searchValue: value,
+      ...fullNewState,
       message: `${error}`
     };
   }
 };
 
 const clearSearchResults = state => {
-  return handleInput({
+  return handleChange(state, {
     ...state,
-    focus: Input
-  }, '', Script$1);
+    focus: Input,
+    searchValue: '',
+    inputSource: Script$1
+  });
 };
 
 const closeSuggest = state => {
@@ -1573,7 +1623,7 @@ const {
   invokeAndTransfer,
   set: set$3,
   dispose: dispose$2
-} = create$1(RendererWorker$1);
+} = create$1(RendererWorker$2);
 const searchFileHtml = async uri => {
   return invoke$2('ExtensionHost.searchFileWithHtml', uri);
 };
@@ -1583,6 +1633,10 @@ const getFilePathElectron = async file => {
 const showContextMenu$1 = async (x, y, id, ...args) => {
   return invoke$2('ContextMenu.show', x, y, id, ...args);
 };
+const showContextMenu2 = async (uid, menuId, x, y, args) => {
+  // @ts-ignore
+  await RendererWorker.invoke('ContextMenu.show2', uid, menuId, x, y, args);
+};
 const getElectronVersion = async () => {
   return invoke$2('Process.getElectronVersion');
 };
@@ -1812,7 +1866,7 @@ const openExtensionSearch = async () => {
 };
 const setExtensionsSearchValue = async searchValue => {
   // @ts-ignore
-  return invoke$2('Extensions.handleInput', searchValue);
+  return invoke$2('Extensions.handleInput', searchValue, Script$1);
 };
 const openExternal = async uri => {
   // @ts-ignore
@@ -1842,7 +1896,7 @@ const registerMockRpc = commandMap => {
   return mockRpc;
 };
 
-const RendererWorker = {
+const RendererWorker$1 = {
   __proto__: null,
   activateByEvent,
   applyBulkReplacement,
@@ -1914,6 +1968,7 @@ const RendererWorker = {
   setWebViewPort,
   setWorkspacePath,
   showContextMenu: showContextMenu$1,
+  showContextMenu2,
   showErrorDialog,
   showMessageBox,
   showSaveFilePicker,
@@ -2048,13 +2103,16 @@ const isEqual$2 = (oldState, newState) => {
   if (!newState.focus) {
     return true;
   }
-  return oldState.focus === newState.focus;
+  return oldState.focus === newState.focus && oldState.inputSource === newState.inputSource;
 };
 
 const isEqual$1 = (oldState, newState) => {
   return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.deltaY === newState.deltaY && oldState.focusedIndex === newState.focusedIndex && oldState.message === newState.message && oldState.inputActions === newState.inputActions && oldState.placeholder === newState.placeholder && oldState.scrollBarHeight === newState.scrollBarHeight;
 };
 
+const User = 1;
+const Script = 2;
+
 const isEqual = (oldState, newState) => {
   return newState.inputSource === User || oldState.searchValue === newState.searchValue;
 };
@@ -2104,6 +2162,7 @@ const focusIndexScrollDown = (state, index, listHeight, itemHeight, itemsLength)
   return {
     ...state,
     focusedIndex: index,
+    listFocusedIndex: index,
     minLineY: newMinLineY,
     maxLineY: newMaxLineY,
     focused: true,
@@ -2126,6 +2185,7 @@ const focusIndexScrollUp = (state, index, listHeight, itemHeight, itemsLength) =
   return {
     ...state,
     focusedIndex: index,
+    listFocusedIndex: index,
     minLineY: newMinLineY,
     maxLineY: newMaxLineY,
     focused: true,
@@ -2151,6 +2211,7 @@ const focusIndex = (state, index) => {
     return {
       ...state,
       focusedIndex: -1,
+      listFocusedIndex: -1,
       focused: true
     };
   }
@@ -2164,6 +2225,7 @@ const focusIndex = (state, index) => {
   return {
     ...state,
     focusedIndex: index,
+    listFocusedIndex: index,
     focused: true
   };
 };
@@ -2244,13 +2306,6 @@ const focusPreviousPage = state => {
   return focusIndex(state, indexPreviousPage);
 };
 
-const Button = 1;
-
-const ClearAll = 'ClearAll';
-const Filter = 'Filter';
-const Refresh = 'Refresh';
-const Ellipsis = 'Ellipsis';
-
 const getActions = () => {
   return [{
     type: Button,
@@ -2371,7 +2426,7 @@ const {
   showContextMenu,
   openUri: openUri$1,
   sendMessagePortToExtensionHostWorker: sendMessagePortToExtensionHostWorker$1
-} = RendererWorker;
+} = RendererWorker$1;
 
 const openUri = async uri => {
   return openUri$1(uri);
@@ -2477,6 +2532,13 @@ const handleHeaderContextMenu = async state => {
   return state;
 };
 
+const handleInput = async (state, value, inputSource = User) => {
+  return handleChange(state, {
+    searchValue: value,
+    inputSource
+  });
+};
+
 // TODO show error / warning  when installment fails / times out
 const handleInstall = async (state, id) => {
   return state;
@@ -2671,42 +2733,6 @@ const getAllExtensions = platform => {
   return getAllExtensions$1(platform);
 };
 
-const HandleClearSearchResults = 1;
-const HandleClickFilter = 2;
-const HandleContextMenu = 3;
-const HandleExtensionsInput = 4;
-const HandleFocus = 5;
-const HandlePointerDown = 7;
-const HandleScrollBarMove = 9;
-const HandleScrollBarPointerCaptureLost = 10;
-const HandleScrollBarPointerDown = 11;
-const HandleTouchEnd = 12;
-const HandleTouchMove = 13;
-const HandleTouchStart = 14;
-const HandleWheel = 15;
-const HandleHeaderContextMenu = 16;
-
-const getInputActions = newState => {
-  const {
-    searchValue
-  } = newState;
-  const clearEnabled = searchValue.length > 0;
-  const actions = [{
-    onClick: HandleClearSearchResults,
-    icon: `MaskIcon${ClearAll}`,
-    title: clearExtensionSearchResults(),
-    type: Button,
-    enabled: clearEnabled
-  }, {
-    icon: `MaskIcon${Filter}`,
-    title: filter(),
-    type: Button,
-    onClick: HandleClickFilter,
-    enabled: true
-  }];
-  return actions;
-};
-
 const Small = 1;
 const Normal = 2;
 const Large = 3;
@@ -2871,13 +2897,11 @@ const loadContent = async (state, savedState) => {
   const allExtensions = await getAllExtensions(platform);
   const size = getViewletSize(width);
   const normalized = normalizeExtension(allExtensions, platform, assetDir);
-  const inputActions = getInputActions(state);
   const updatedState = await handleInput({
     ...state,
     allExtensions: normalized,
     size,
     inputSource: Script,
-    inputActions,
     deltaY
   }, searchValue, Script);
   return updatedState;
@@ -3033,7 +3057,7 @@ const getExtensionHeaderVirtualDom = (placeholder, actions) => {
 };
 
 const renderHeader = newState => {
-  const actions = getInputActions(newState);
+  const actions = getInputActions(newState.searchValue.length > 0);
   const dom = getExtensionHeaderVirtualDom(newState.placeholder, actions);
   return ['setHeaderDom', dom];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-search-view",
-  "version": "4.11.0",
+  "version": "4.13.0",
   "description": "Extension Search View Worker",
   "repository": {
     "type": "git",