@lvce-editor/source-control-worker 3.6.0 → 3.6.1

package/dist/sourceControlWorkerMain.js

@@ -1981,6 +1981,7 @@ const loadContent = async (state, savedState) => {
     inputPlaceholder,
     inputValue,
     items: displayItems,
+    loading: false,
     maxLineY,
     root,
     scrollBarHeight,
@@ -2059,6 +2060,7 @@ const createDefaultState = () => ({
   isVisible: true,
   itemHeight: 20,
   items: [],
+  loading: false,
   maxInputLines: 5,
   maxLineY: 0,
   merge: [],
@@ -2098,26 +2100,31 @@ const create2 = (id, _uri, x, y, width, height, workspacePath, platform, assetDi
     assetDir,
     height,
     id,
-    initial: true,
+    initial: false,
+    loading: true,
     platform,
     width,
     workspacePath,
     x,
     y
   };
-  set(id, state, state);
+  set(id, {
+    ...state,
+    initial: true,
+    loading: false
+  }, state);
 };
 
-const isEqual$3 = (oldState, newState) => {
+const isEqual$4 = (oldState, newState) => {
   return oldState.inputBoxHeight === newState.inputBoxHeight;
 };
 
-const isEqual$2 = (oldState, newState) => {
+const isEqual$3 = (oldState, newState) => {
   return oldState.focus === newState.focus;
 };
 
-const isEqual$1 = (oldState, newState) => {
-  return oldState.allGroups === newState.allGroups && oldState.deltaY === newState.deltaY && oldState.items === newState.items && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.sourceControlButtons === newState.sourceControlButtons && oldState.visibleItems === newState.visibleItems;
+const isEqual$2 = (oldState, newState) => {
+  return oldState.allGroups === newState.allGroups && oldState.deltaY === newState.deltaY && oldState.items === newState.items && oldState.loading === newState.loading && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.sourceControlButtons === newState.sourceControlButtons && oldState.visibleItems === newState.visibleItems;
 };
 
 const RenderItems = 4;
@@ -2126,11 +2133,11 @@ const RenderValue = 8;
 const RenderCss = 10;
 const RenderIncremental = 11;
 
-const isEqual = (oldState, newState) => {
+const isEqual$1 = (oldState, newState) => {
   return newState.inputSource === User || oldState.inputValue === newState.inputValue;
 };
 
-const modules = [isEqual$1, isEqual, isEqual$3, isEqual$2];
+const modules = [isEqual$2, isEqual$1, isEqual$4, isEqual$3];
 const numbers = [RenderIncremental, RenderValue, RenderCss, RenderFocusContext];
 
 const diff = (oldState, newState) => {
@@ -2941,8 +2948,32 @@ const handleWheel = async (state, deltaMode, deltaY) => {
   return setDeltaY(state, state.deltaY + deltaY);
 };
 
+const isEqual = (oldProviderIds, newProviderIds) => {
+  if (oldProviderIds.length !== newProviderIds.length) {
+    return false;
+  }
+  for (let index = 0; index < oldProviderIds.length; index++) {
+    if (oldProviderIds[index] !== newProviderIds[index]) {
+      return false;
+    }
+  }
+  return true;
+};
 const handleWorkspaceRefresh = async state => {
-  return refresh(state);
+  const {
+    assetDir,
+    enabledProviderIds,
+    platform,
+    workspacePath
+  } = state;
+  const scheme = getProtocol(workspacePath);
+  const newProviderIds = await getEnabledProviderIds(scheme, workspacePath, assetDir, platform);
+  if (isEqual(enabledProviderIds, newProviderIds)) {
+    return refresh(state);
+  }
+  return loadContent(state, {
+    inputValue: state.inputValue
+  });
 };
 
 const sendMessagePortToExtensionHostWorker = async port => {
@@ -3060,6 +3091,8 @@ const InputBox = 'InputBox';
 const Label = 'Label';
 const LabelDetail = 'LabelDetail';
 const Message = 'Message';
+const Progress = 'Progress';
+const ProgressContainer = 'ProgressContainer';
 const SourceControl = 'SourceControl';
 const SourceControlButton = 'SourceControlButton';
 const SourceControlHeader = 'SourceControlHeader';
@@ -3083,6 +3116,18 @@ const HandleWheel = 9;
 const HandleClickAction = 10;
 const HandleClickSourceControlButton = 11;
 
+const getProgressVirtualDom = () => {
+  return [{
+    childCount: 1,
+    className: ProgressContainer,
+    type: Div
+  }, {
+    childCount: 0,
+    className: Progress,
+    type: Div
+  }];
+};
+
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
@@ -3340,7 +3385,7 @@ const getSourceControlListVirtualDom = items => {
 };
 
 const className = mergeClassNames(Viewlet, SourceControl);
-const getSourceControlVirtualDom = (items, buttons, disabled, placeholder, inputMessage, message) => {
+const getSourceControlVirtualDom = (items, buttons, disabled, placeholder, inputMessage, message, loading) => {
   const content = message ? [{
     childCount: 1,
     className: Message,
@@ -3348,8 +3393,10 @@ const getSourceControlVirtualDom = (items, buttons, disabled, placeholder, input
     paddingRight: '20px',
     type: Div
   }, text(message)] : [...getSourceControlHeaderVirtualDom(placeholder, inputMessage), ...buttons.flatMap(button => getSourceControlButtonVirtualDom(button, disabled)), ...getSourceControlListVirtualDom(items)];
+  const progressDom = loading ? getProgressVirtualDom() : [];
   const dom = [{
-    childCount: message ? 1 : 2 + buttons.length,
+    ariaBusy: loading,
+    childCount: (message ? 1 : 2 + buttons.length) + (loading ? 1 : 0),
     className: className,
     onContextMenu: HandleContextMenu,
     onMouseOver: HandleMouseOver,
@@ -3357,7 +3404,7 @@ const getSourceControlVirtualDom = (items, buttons, disabled, placeholder, input
     onWheel: HandleWheel,
     tabIndex: 0,
     type: Div
-  }, ...content];
+  }, ...progressDom, ...content];
   return dom;
 };
 
@@ -3369,14 +3416,15 @@ const renderItems = (oldState, newState) => {
     inputMessage,
     inputPlaceholder,
     items,
+    loading,
     sourceControlButtons,
     visibleItems
   } = newState;
   if (initial) {
     return [SetDom2, id, []];
   }
-  const unavailableMessage = enabledProviderIds.length === 0 ? noSourceControlProvider() : '';
-  const dom = getSourceControlVirtualDom(visibleItems, sourceControlButtons, items.length === 0, inputPlaceholder, inputMessage, unavailableMessage);
+  const unavailableMessage = !loading && enabledProviderIds.length === 0 ? noSourceControlProvider() : '';
+  const dom = getSourceControlVirtualDom(visibleItems, sourceControlButtons, items.length === 0, inputPlaceholder, inputMessage, unavailableMessage, loading);
   return [SetDom2, id, dom];
 };
 

package/package.json

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