@lvce-editor/source-control-worker 1.11.0 → 1.13.0

package/dist/sourceControlWorkerMain.js

@@ -696,14 +696,14 @@ const unwrapJsonRpcResult = responseMessage => {
   }
   throw new JsonRpcError('unexpected response message');
 };
-const warn = (...args) => {
+const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
   const fn = get$3(id);
   if (!fn) {
     console.log(response);
-    warn(`callback ${id} may already be disposed`);
+    warn$1(`callback ${id} may already be disposed`);
     return;
   }
   fn(response);
@@ -857,7 +857,7 @@ const send = (transport, method, ...params) => {
 const invoke$3 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer$2 = (ipc, method, ...params) => {
+const invokeAndTransfer$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -890,7 +890,7 @@ const createRpc = ipc => {
       return invoke$3(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$2(ipc, method, ...params);
+      return invokeAndTransfer$1(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -1044,7 +1044,7 @@ const create2 = (id, uri, x, y, width, height, workspacePath) => {
     id,
     index: [],
     inputValue: '',
-    isExpanded: true,
+    expandedGroups: Object.create(null),
     itemHeight: 20,
     items: [],
     maxLineY: 0,
@@ -1104,7 +1104,7 @@ const getCommandIds = () => {
 };
 
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1112,37 +1112,37 @@ const get$1 = id => {
 };
 const RendererWorker$1 = 1;
 const ExtensionHostWorker = 44;
-const invoke$1$1 = (method, ...params) => {
+const invoke$2 = (method, ...params) => {
   const rpc = get$1(RendererWorker$1);
   // @ts-ignore
   return rpc.invoke(method, ...params);
 };
-const invokeAndTransfer$1 = (method, ...params) => {
+const invokeAndTransfer$2 = (method, ...params) => {
   const rpc = get$1(RendererWorker$1);
   // @ts-ignore
   return rpc.invokeAndTransfer(method, ...params);
 };
-const set$1$1 = rpc => {
-  set$2(RendererWorker$1, rpc);
+const set$2 = rpc => {
+  set$3(RendererWorker$1, rpc);
 };
 const RendererWorker = {
   __proto__: null,
-  invoke: invoke$1$1,
-  invokeAndTransfer: invokeAndTransfer$1,
-  set: set$1$1
+  invoke: invoke$2,
+  invokeAndTransfer: invokeAndTransfer$2,
+  set: set$2
 };
-const invoke$2 = (method, ...params) => {
+const invoke$1$1 = (method, ...params) => {
   const rpc = get$1(ExtensionHostWorker);
   // @ts-ignore
   return rpc.invoke(method, ...params);
 };
-const set$3 = rpc => {
-  set$2(ExtensionHostWorker, rpc);
+const set$1$1 = rpc => {
+  set$3(ExtensionHostWorker, rpc);
 };
 const ExtensionHost = {
   __proto__: null,
-  invoke: invoke$2,
-  set: set$3
+  invoke: invoke$1$1,
+  set: set$1$1
 };
 
 const {
@@ -1199,7 +1199,7 @@ const pathBaseName = path => {
   return path.slice(path.lastIndexOf('/') + 1);
 };
 
-const getDisplayItemsGroup = (group, isExpanded) => {
+const getDisplayItemsGroup = (group, expandedGroups) => {
   const displayItems = [];
   const {
     id,
@@ -1210,6 +1210,7 @@ const getDisplayItemsGroup = (group, isExpanded) => {
     throw new Error('Source control group is missing an items property');
   }
   const length = items.length;
+  const isExpanded = expandedGroups[id] || false;
   const type = isExpanded ? DirectoryExpanded : Directory;
   const icon = isExpanded ? 'ChevronDown' : 'ChevronRight';
   if (length > 0) {
@@ -1260,10 +1261,10 @@ const getDisplayItemsGroup = (group, isExpanded) => {
   return displayItems;
 };
 
-const getDisplayItems = (allGroups, isExpanded) => {
+const getDisplayItems = (allGroups, expandedGroups) => {
   const displayItems = [];
   for (const group of allGroups) {
-    const groupDisplayItems = getDisplayItemsGroup(group, isExpanded);
+    const groupDisplayItems = getDisplayItemsGroup(group, expandedGroups);
     displayItems.push(...groupDisplayItems);
   }
   return displayItems;
@@ -1452,6 +1453,16 @@ const requestSourceActions = async () => {
   return newCache;
 };
 
+/* eslint-disable unicorn/no-array-reduce */
+const restoreExpandedGroups = groups => {
+  return groups.map(group => group.id).reduce((total, current) => {
+    return {
+      ...total,
+      [current]: true
+    };
+  }, Object.create(null));
+};
+
 const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
   if (size >= contentSize) {
     return 0;
@@ -1474,8 +1485,8 @@ const loadContent = async state => {
     allGroups,
     gitRoot
   } = await getGroups(enabledProviderIds);
-  const isExpanded = true;
-  const displayItems = getDisplayItems(allGroups, isExpanded);
+  const expandedGroups = restoreExpandedGroups(allGroups);
+  const displayItems = getDisplayItems(allGroups, expandedGroups);
   const actionsCache = await requestSourceActions();
   const splitButtonEnabled = get();
   const total = displayItems.length;
@@ -1495,7 +1506,6 @@ const loadContent = async state => {
     items: displayItems,
     visibleItems,
     enabledProviderIds,
-    isExpanded,
     root,
     splitButtonEnabled,
     maxLineY,
@@ -1531,6 +1541,10 @@ const getIndex = (state, eventX, eventY) => {
   return index;
 };
 
+const warn = (...args) => {
+  console.warn(...args);
+};
+
 const refresh = async state => {
   const {
     itemHeight,
@@ -1545,8 +1559,8 @@ const refresh = async state => {
     allGroups,
     gitRoot
   } = await getGroups(enabledProviderIds);
-  const isExpanded = true;
-  const displayItems = getDisplayItems(allGroups, isExpanded);
+  const expandedGroups = restoreExpandedGroups(allGroups);
+  const displayItems = getDisplayItems(allGroups, expandedGroups);
   const total = displayItems.length;
   const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
@@ -1563,7 +1577,6 @@ const refresh = async state => {
     items: displayItems,
     visibleItems,
     enabledProviderIds,
-    isExpanded,
     splitButtonEnabled,
     maxLineY,
     scrollBarHeight,
@@ -1580,8 +1593,12 @@ const handleClickSourceControlButtons = async (state, index, name) => {
   if (!item) {
     return state;
   }
-  const button = item.buttons.find(button => button.label === name);
+  const {
+    buttons
+  } = item;
+  const button = buttons.find(button => button.label === name);
   if (!button) {
+    warn(`[source-control-worker] Button not found ${name}`);
     return state;
   }
   const file = item.file;
@@ -1590,46 +1607,51 @@ const handleClickSourceControlButtons = async (state, index, name) => {
   return newState;
 };
 
-const updateVisibleItems = async (state, isExpanded) => {
+const updateVisibleItems = async (state, expandedGroups) => {
   const {
-    allGroups,
     itemHeight,
     height,
-    minimumSliderSize,
+    actionsCache,
     fileIconCache,
-    actionsCache
+    allGroups
   } = state;
-  const displayItems = getDisplayItems(allGroups, isExpanded);
-  const newMaxLineY = displayItems.length;
+  const displayItems = getDisplayItems(allGroups, expandedGroups);
   const total = displayItems.length;
-  const contentHeight = total * itemHeight;
   const listHeight = getListHeight(total, itemHeight, height);
-  const scrollBarHeight = getScrollBarSize(height, contentHeight, minimumSliderSize);
   const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
   const minLineY = 0;
   const maxLineY = Math.min(numberOfVisible, total);
-  const slicedItems = displayItems.slice(minLineY, maxLineY);
-  const newFileIconCache = await getFileIcons(slicedItems, fileIconCache);
-  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, newFileIconCache);
+  const visibleItems = getVisibleSourceControlItems(displayItems, minLineY, maxLineY, actionsCache, fileIconCache);
   return {
     ...state,
     items: displayItems,
-    isExpanded,
-    maxLineY: newMaxLineY,
-    fileIconCache: newFileIconCache,
     visibleItems,
-    scrollBarHeight
+    expandedGroups,
+    minLineY,
+    maxLineY
   };
 };
 
 const handleClickDirectory = async (state, item) => {
-  const isExpanded = true;
-  return updateVisibleItems(state, isExpanded);
+  const {
+    expandedGroups
+  } = state;
+  const newExpandedGroups = {
+    ...expandedGroups,
+    [item.groupId]: true
+  };
+  return updateVisibleItems(state, newExpandedGroups);
 };
 
 const handleClickDirectoryExpanded = async (state, item) => {
-  const isExpanded = false;
-  return updateVisibleItems(state, isExpanded);
+  const {
+    expandedGroups
+  } = state;
+  const newExpandedGroups = {
+    ...expandedGroups,
+    [item.groupId]: false
+  };
+  return updateVisibleItems(state, newExpandedGroups);
 };
 
 const readFile = async (uri, encoding = 'utf8') => {
@@ -1666,9 +1688,9 @@ const selectIndex = async (state, index) => {
   const item = items[index];
   switch (item.type) {
     case Directory:
-      return handleClickDirectory(state);
+      return handleClickDirectory(state, item);
     case DirectoryExpanded:
-      return handleClickDirectoryExpanded(state);
+      return handleClickDirectoryExpanded(state, item);
     case File:
       return handleClickFile(state, item);
     default:
@@ -2261,14 +2283,14 @@ const saveState = uid => {
   const {
     root,
     maxLineY,
-    isExpanded
+    expandedGroups
   } = newState;
   return {
     root,
     minLineY: 0,
     maxLineY,
     deltaY: 0,
-    isExpanded
+    expandedGroups
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/source-control-worker",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "description": "Source Control Worker",
   "keywords": [
     "Lvce Editor"