@lvce-editor/activity-bar-worker 3.0.0 → 3.2.0

package/dist/activityBarWorkerMain.js

@@ -225,8 +225,8 @@ const getModuleNotFoundError = stderr => {
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
 const isModuleNotFoundError = stderr => {
@@ -249,14 +249,14 @@ const isUnhelpfulNativeModuleError = stderr => {
 const getNativeModuleErrorMessage = stderr => {
   const message = getMessageCodeBlock(stderr);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
 const getModuleSyntaxError = () => {
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -275,8 +275,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -286,8 +286,8 @@ class IpcError extends VError {
     if (stdout || stderr) {
       // @ts-ignore
       const {
-        message,
         code,
+        message,
         stack
       } = getHelpfulChildProcessError(stdout, stderr);
       const cause = new Error(message);
@@ -348,8 +348,8 @@ const wrap$f = global => {
 };
 const waitForFirstMessage = async port => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
@@ -369,8 +369,8 @@ const listen$6 = async () => {
   const type = firstMessage.params[0];
   if (type === 'message-port') {
     parentIpc.send({
-      jsonrpc: '2.0',
       id: firstMessage.id,
+      jsonrpc: '2.0',
       result: null
     });
     parentIpc.dispose();
@@ -412,56 +412,14 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   wrap: wrap$e
 };
 
-const Two = '2.0';
-const create$4 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
+const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const set$3 = (id, fn) => {
-  callbacks[id] = fn;
-};
 const get$2 = id => {
   return callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete callbacks[id];
 };
-let id = 0;
-const create$3$1 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3$1();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$3(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2$1 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
 class JsonRpcError extends Error {
   constructor(message) {
     super(message);
@@ -612,7 +570,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 => {
@@ -655,9 +613,9 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$1 = (id, error) => {
+const create$1$2 = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error
   };
@@ -666,22 +624,22 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(id, errorProperty);
+  return create$1$2(id, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$3 = (message, result) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id: message.id,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$3(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error: {
       code: Custom,
@@ -768,29 +726,6 @@ const handleJsonRpcMessage = async (...args) => {
   }
   throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2$1(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
-  }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
-  transport.send(message);
-};
-const invoke$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -813,24 +748,87 @@ const execute = (command, ...args) => {
   return fn(...args);
 };
 
+const Two = '2.0';
+const create$s = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const create$r = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+let id = 0;
+const create$q = () => {
+  return ++id;
+};
+
+/* eslint-disable n/no-unsupported-features/es-syntax */
+
+const registerPromise = map => {
+  const id = create$q();
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
+};
+
+// @ts-ignore
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
+    promise
+  } = registerPromise(callbacks);
+  const message = create$r(id, method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
+};
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$1(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$s(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
@@ -847,7 +845,7 @@ const logError = () => {
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -865,7 +863,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$3 = async ({
+const create$1$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -877,7 +875,26 @@ const create$3 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$3
+  create: create$1$1
+};
+const createMockRpc = ({
+  commandMap
+}) => {
+  const invocations = [];
+  const invoke = (method, ...params) => {
+    invocations.push([method, ...params]);
+    const command = commandMap[method];
+    if (!command) {
+      throw new Error(`command ${method} not found`);
+    }
+    return command(...params);
+  };
+  const mockRpc = {
+    invocations,
+    invoke,
+    invokeAndTransfer: invoke
+  };
+  return mockRpc;
 };
 
 const Button$2 = 'button';
@@ -916,9 +933,13 @@ const Web = 1;
 
 const RendererWorker = 1;
 
+const Left = 1;
+const Right = 2;
+
 const SetCss = 'Viewlet.setCss';
 const SetDom2 = 'Viewlet.setDom2';
 const SetFocusContext = 'Viewlet.setFocusContext';
+const SetPatches = 'Viewlet.setPatches';
 
 const FocusActivityBar = 5;
 const FocusExplorer = 13;
@@ -930,9 +951,17 @@ const set$2 = (id, rpc) => {
 const get$1 = id => {
   return rpcs[id];
 };
+const remove = id => {
+  delete rpcs[id];
+};
 
+/* eslint-disable  @typescript-eslint/explicit-function-return-type */
 const create$2 = rpcId => {
   return {
+    async dispose() {
+      const rpc = get$1(rpcId);
+      await rpc.dispose();
+    },
     // @ts-ignore
     invoke(method, ...params) {
       const rpc = get$1(rpcId);
@@ -945,19 +974,28 @@ const create$2 = rpcId => {
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
+    registerMockRpc(commandMap) {
+      const mockRpc = createMockRpc({
+        commandMap
+      });
+      set$2(rpcId, mockRpc);
+      // @ts-ignore
+      mockRpc[Symbol.dispose] = () => {
+        remove(rpcId);
+      };
+      // @ts-ignore
+      return mockRpc;
+    },
     set(rpc) {
       set$2(rpcId, rpc);
-    },
-    async dispose() {
-      const rpc = get$1(rpcId);
-      await rpc.dispose();
     }
   };
 };
 
 const {
   invoke,
-  set: set$1} = create$2(RendererWorker);
+  set: set$1
+} = create$2(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
@@ -975,42 +1013,68 @@ const create$1 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
-    get(uid) {
-      return states[uid];
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
     },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
+    diff(uid, modules, numbers) {
+      const {
+        newState,
+        oldState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
     },
     dispose(uid) {
       delete states[uid];
     },
+    get(uid) {
+      return states[uid];
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
     getKeys() {
       return Object.keys(states).map(key => {
         return Number.parseInt(key);
       });
     },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        newState,
+        oldState
+      };
     },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
-          oldState,
-          newState
+          newState,
+          oldState
         } = states[uid];
         const newerState = await fn(newState, ...args);
         if (oldState === newerState || newState === newerState) {
           return;
         }
-        const latest = states[uid];
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...newerState
+        };
         states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
+          newState: latestNew,
+          oldState: latestOld.oldState
         };
       };
       return wrapped;
@@ -1023,28 +1087,6 @@ const create$1 = () => {
         return fn(newState, ...args);
       };
       return wrapped;
-    },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
-        }
-      }
-      return diffResult;
-    },
-    getCommandIds() {
-      const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId);
-      return ids;
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
     }
   };
 };
@@ -1065,6 +1107,7 @@ const {
 // TODO parentUid might ot be needed
 const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) => {
   const state = {
+    accountEnabled: false,
     activityBarItems: [],
     currentViewletId: '',
     filteredItems: [],
@@ -1072,6 +1115,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     focused: false,
     focusedIndex: -1,
     height,
+    initial: true,
     itemHeight: 48,
     numberOfVisibleItems: 0,
     platform,
@@ -1106,9 +1150,10 @@ const RenderItems = 4;
 const RenderFocus = 6;
 const RenderFocusContext = 7;
 const RenderCss = 11;
+const RenderIncremental = 12;
 
 const modules = [isEqual, isEqual$1, isEqual$1, isEqual$2];
-const numbers = [RenderItems, RenderFocus, RenderFocusContext, RenderCss];
+const numbers = [RenderIncremental, RenderFocus, RenderFocusContext, RenderCss];
 
 const diff2 = uid => {
   return diff(uid, modules, numbers);
@@ -1195,13 +1240,19 @@ const getKeyBindings = () => {
   }];
 };
 
-const Tab = 1;
-const Button = 1 << 1;
-const Progress = 1 << 2;
-const Enabled = 1 << 3;
-const Selected = 1 << 4;
-const Focused = 1 << 5;
-const MarginTop = 1 << 6;
+const getMenuEntriesAccount = state => {
+  return [{
+    command: 'Account.signIn',
+    flags: None,
+    id: 'signIn',
+    label: 'Sign In'
+  }, {
+    command: 'Account.signOut',
+    flags: None,
+    id: 'signOut',
+    label: 'Sign Out'
+  }];
+};
 
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
@@ -1215,6 +1266,7 @@ const i18nString = (key, placeholders = emptyObject) => {
   return key.replaceAll(RE_PLACEHOLDER, replacer);
 };
 
+const Account$1 = 'Account';
 const Explorer$1 = 'Explorer';
 const Search$2 = 'Search';
 const SourceControl$2 = 'Source Control';
@@ -1231,6 +1283,9 @@ const ColorTheme = 'Color Theme';
 const CommandPalette = 'Command Palette';
 const KeyboardShortcuts = 'Keyboard Shortcuts';
 
+const account = () => {
+  return i18nString(Account$1);
+};
 const explorer = () => {
   return i18nString(Explorer$1);
 };
@@ -1277,9 +1332,6 @@ const colorTheme = () => {
   return i18nString(ColorTheme);
 };
 
-const Left = 1;
-const Right = 2;
-
 const menuEntryMoveSideBar = sideBarLocation => {
   switch (sideBarLocation) {
     case Left:
@@ -1308,16 +1360,25 @@ const menuEntrySeparator = {
   label: ''
 };
 
+const Tab = 1;
+const Button = 1 << 1;
+const Progress = 1 << 2;
+const Enabled = 1 << 3;
+const Selected = 1 << 4;
+const Focused = 1 << 5;
+const MarginTop = 1 << 6;
+
 const toContextMenuItem$1 = activityBarItem => {
   const isEnabled = activityBarItem.flags & Enabled;
   return {
-    command: '',
+    args: [activityBarItem.id],
+    command: 'ActivityBar.toggleActivityBarItem',
     flags: isEnabled ? Checked : Unchecked,
-    id: '',
-    // TODO
+    id: `toggle-${activityBarItem.id}`,
     label: activityBarItem.id
   };
 };
+
 const getMenuEntriesActivityBar = state => {
   const {
     activityBarItems,
@@ -1401,11 +1462,15 @@ const getMenuEntriesSettings = state => {
   return items;
 };
 
+// Use a unique number for the Account menu ID
+const ACCOUNT_MENU_ID$1 = 1000;
 const getMenuEntries = (state, options) => {
   const {
     menuId
   } = options;
   switch (menuId) {
+    case ACCOUNT_MENU_ID$1:
+      return getMenuEntriesAccount();
     case ActivityBar$3:
       return getMenuEntriesActivityBar(state);
     case ActivityBarAdditionalViews:
@@ -1489,6 +1554,18 @@ const show2 = async (uid, menuId, x, y, args) => {
   await showContextMenu2(uid, menuId, x, y, args);
 };
 
+// Use a unique number for the Account menu ID
+const ACCOUNT_MENU_ID = 1000;
+const handleClickAccount = async (state, eventX, eventY, viewletId) => {
+  const {
+    uid
+  } = state;
+  await show2(uid, ACCOUNT_MENU_ID, eventX, eventY, {
+    menuId: ACCOUNT_MENU_ID
+  });
+  return state;
+};
+
 const handleClickAdditionalViews = async (state, eventX, eventY, viewletId) => {
   const {
     uid
@@ -1552,6 +1629,8 @@ const handleClickIndex = async (state, button, index, x, y) => {
   const item = filteredItems[index];
   const viewletId = item.id;
   switch (viewletId) {
+    case 'Account':
+      return handleClickAccount(state, x, y);
     case 'Additional Views':
       return handleClickAdditionalViews(state, x, y, viewletId);
     case 'Settings':
@@ -1582,6 +1661,7 @@ const handleContextMenu = async (state, button, eventX, eventY) => {
   return state;
 };
 
+const Account = 'Account';
 const DebugAlt2 = 'DebugAlt2';
 const Extensions$1 = 'Extensions';
 const Files = 'Files';
@@ -1630,6 +1710,78 @@ const handleResize = (state, dimensions) => {
   };
 };
 
+const Explorer = 'Explorer';
+const Extensions = 'Extensions';
+const RunAndDebug = 'Run And Debug';
+const Search = 'Search';
+const SourceControl = 'Source Control';
+
+const getActivityBarItems = state => {
+  const {
+    accountEnabled
+  } = state;
+  const items = [
+  // Top
+  {
+    flags: Tab | Enabled,
+    icon: Files,
+    id: Explorer,
+    keyShortcuts: 'Control+Shift+E',
+    title: explorer()
+  }, {
+    flags: Tab | Enabled,
+    icon: Search$1,
+    id: Search,
+    keyShortcuts: 'Control+Shift+F',
+    title: search()
+  }, {
+    flags: Tab | Enabled,
+    icon: SourceControl$1,
+    id: SourceControl,
+    keyShortcuts: 'Control+Shift+G',
+    title: sourceControl()
+  }, {
+    flags: Tab | Enabled,
+    icon: DebugAlt2,
+    id: RunAndDebug,
+    keyShortcuts: 'Control+Shift+D',
+    title: runAndDebug()
+  }, {
+    flags: Tab | Enabled,
+    icon: Extensions$1,
+    id: Extensions,
+    keyShortcuts: 'Control+Shift+X',
+    title: extensions()
+  }
+  // Bottom
+  ];
+  if (accountEnabled) {
+    items.push({
+      flags: Button | Enabled | MarginTop,
+      icon: Account,
+      id: 'Account',
+      keyShortcuts: '',
+      title: account()
+    });
+  }
+  items.push({
+    flags: Button | Enabled | MarginTop,
+    icon: SettingsGear,
+    id: 'Settings',
+    keyShortcuts: '',
+    title: settings()
+  });
+  return items;
+};
+
+const getSideBarPosition = async () => {
+  try {
+    return await invoke('Layout.getSideBarPosition');
+  } catch {
+    return Left;
+  }
+};
+
 const setFlag = (item, flag, enabled) => {
   return {
     ...item,
@@ -1637,6 +1789,32 @@ const setFlag = (item, flag, enabled) => {
   };
 };
 
+const markSelected = (items, selectedIndex) => {
+  return items.map((item, index) => {
+    const isSelected = index === selectedIndex;
+    return setFlag(item, Selected, isSelected);
+  });
+};
+
+const handleSettingsChanged = async state => {
+  const {
+    height,
+    itemHeight,
+    selectedIndex
+  } = state;
+  const items = getActivityBarItems(state);
+  const itemsWithSelected = markSelected(items, selectedIndex);
+  const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
+  const newItems = await updateItemsWithBadgeCount(filteredItems);
+  const sidebarLocation = await getSideBarPosition();
+  return {
+    ...state,
+    activityBarItems: itemsWithSelected,
+    filteredItems: newItems,
+    sideBarLocation: sidebarLocation
+  };
+};
+
 const handleSideBarHidden = state => {
   const itemsCleared = state.activityBarItems.map(item => {
     const withoutSelected = setFlag(item, Selected, false);
@@ -1660,13 +1838,6 @@ const findIndex = (activityBarItems, id) => {
   return -1;
 };
 
-const markSelected = (items, selectedIndex) => {
-  return items.map((item, index) => {
-    const isSelected = index === selectedIndex;
-    return setFlag(item, Selected, isSelected);
-  });
-};
-
 const handleSideBarViewletChange = (state, id, ...args) => {
   const {
     activityBarItems,
@@ -1724,56 +1895,6 @@ const handleUpdateStateChange = async (state, config) => {
   };
 };
 
-const Explorer = 'Explorer';
-const Extensions = 'Extensions';
-const RunAndDebug = 'Run And Debug';
-const Search = 'Search';
-const SourceControl = 'Source Control';
-
-const getActivityBarItems = () => {
-  return [
-  // Top
-  {
-    flags: Tab | Enabled,
-    icon: Files,
-    id: Explorer,
-    keyShortcuts: 'Control+Shift+E',
-    title: explorer()
-  }, {
-    flags: Tab | Enabled,
-    icon: Search$1,
-    id: Search,
-    keyShortcuts: 'Control+Shift+F',
-    title: search()
-  }, {
-    flags: Tab | Enabled,
-    icon: SourceControl$1,
-    id: SourceControl,
-    keyShortcuts: 'Control+Shift+G',
-    title: sourceControl()
-  }, {
-    flags: Tab | Enabled,
-    icon: DebugAlt2,
-    id: RunAndDebug,
-    keyShortcuts: 'Control+Shift+D',
-    title: runAndDebug()
-  }, {
-    flags: Tab | Enabled,
-    icon: Extensions$1,
-    id: Extensions,
-    keyShortcuts: 'Control+Shift+X',
-    title: extensions()
-  },
-  // Bottom
-  {
-    flags: Button | Enabled | MarginTop,
-    icon: SettingsGear,
-    id: 'Settings',
-    keyShortcuts: '',
-    title: settings()
-  }];
-};
-
 const getActiveView = async () => {
   try {
     const activeView = await invoke('Layout.getActiveSideBarView');
@@ -1782,24 +1903,27 @@ const getActiveView = async () => {
     return Explorer;
   }
 };
-const loadContent = async (state, savedState) => {
+
+const loadContent = async state => {
   const {
     height,
     itemHeight
   } = state;
-  const items = getActivityBarItems();
+  const items = getActivityBarItems(state);
   const activeView = await getActiveView();
   const index = items.findIndex(item => item.id === activeView);
   const itemsWithSelected = markSelected(items, index);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
   const newItems = await updateItemsWithBadgeCount(filteredItems);
+  const sidebarLocation = await getSideBarPosition();
   return {
     ...state,
     activityBarItems: itemsWithSelected,
     currentViewletId: Explorer,
     filteredItems: newItems,
+    initial: false,
     selectedIndex: index,
-    sideBarLocation: Left,
+    sideBarLocation: sidebarLocation,
     sideBarVisible: true
   };
 };
@@ -1833,12 +1957,289 @@ const mergeClassNames = (...classNames) => {
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
+  };
+};
+
+const SetText = 1;
+const Replace = 2;
+const SetAttribute = 3;
+const RemoveAttribute = 4;
+const Add = 6;
+const NavigateChild = 7;
+const NavigateParent = 8;
+const RemoveChild = 9;
+const NavigateSibling = 10;
+
+const isKey = key => {
+  return key !== 'type' && key !== 'childCount';
+};
+
+const getKeys = node => {
+  const keys = Object.keys(node).filter(isKey);
+  return keys;
+};
+
+const arrayToTree = nodes => {
+  const result = [];
+  let i = 0;
+  while (i < nodes.length) {
+    const node = nodes[i];
+    const {
+      children,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, node.childCount || 0);
+    result.push({
+      node,
+      children
+    });
+    i += 1 + nodesConsumed;
+  }
+  return result;
+};
+const getChildrenWithCount = (nodes, startIndex, childCount) => {
+  if (childCount === 0) {
+    return {
+      children: [],
+      nodesConsumed: 0
+    };
+  }
+  const children = [];
+  let i = startIndex;
+  let remaining = childCount;
+  let totalConsumed = 0;
+  while (remaining > 0 && i < nodes.length) {
+    const node = nodes[i];
+    const nodeChildCount = node.childCount || 0;
+    const {
+      children: nodeChildren,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, nodeChildCount);
+    children.push({
+      node,
+      children: nodeChildren
+    });
+    const nodeSize = 1 + nodesConsumed;
+    i += nodeSize;
+    totalConsumed += nodeSize;
+    remaining--;
+  }
+  return {
+    children,
+    nodesConsumed: totalConsumed
   };
 };
 
+const compareNodes = (oldNode, newNode) => {
+  const patches = [];
+  // Check if node type changed - return null to signal incompatible nodes
+  // (caller should handle this with a Replace operation)
+  if (oldNode.type !== newNode.type) {
+    return null;
+  }
+  // Handle text nodes
+  if (oldNode.type === Text && newNode.type === Text) {
+    if (oldNode.text !== newNode.text) {
+      patches.push({
+        type: SetText,
+        value: newNode.text
+      });
+    }
+    return patches;
+  }
+  // Compare attributes
+  const oldKeys = getKeys(oldNode);
+  const newKeys = getKeys(newNode);
+  // Check for attribute changes
+  for (const key of newKeys) {
+    if (oldNode[key] !== newNode[key]) {
+      patches.push({
+        type: SetAttribute,
+        key,
+        value: newNode[key]
+      });
+    }
+  }
+  // Check for removed attributes
+  for (const key of oldKeys) {
+    if (!(key in newNode)) {
+      patches.push({
+        type: RemoveAttribute,
+        key
+      });
+    }
+  }
+  return patches;
+};
+
+const treeToArray = node => {
+  const result = [node.node];
+  for (const child of node.children) {
+    result.push(...treeToArray(child));
+  }
+  return result;
+};
+
+const diffChildren = (oldChildren, newChildren, patches) => {
+  const maxLength = Math.max(oldChildren.length, newChildren.length);
+  // Track where we are: -1 means at parent, >= 0 means at child index
+  let currentChildIndex = -1;
+  // Collect indices of children to remove (we'll add these patches at the end in reverse order)
+  const indicesToRemove = [];
+  for (let i = 0; i < maxLength; i++) {
+    const oldNode = oldChildren[i];
+    const newNode = newChildren[i];
+    if (!oldNode && !newNode) {
+      continue;
+    }
+    if (!oldNode) {
+      // Add new node - we should be at the parent
+      if (currentChildIndex >= 0) {
+        // Navigate back to parent
+        patches.push({
+          type: NavigateParent
+        });
+        currentChildIndex = -1;
+      }
+      // Flatten the entire subtree so renderInternal can handle it
+      const flatNodes = treeToArray(newNode);
+      patches.push({
+        type: Add,
+        nodes: flatNodes
+      });
+    } else if (newNode) {
+      // Compare nodes to see if we need any patches
+      const nodePatches = compareNodes(oldNode.node, newNode.node);
+      // If nodePatches is null, the node types are incompatible - need to replace
+      if (nodePatches === null) {
+        // Navigate to this child
+        if (currentChildIndex === -1) {
+          patches.push({
+            type: NavigateChild,
+            index: i
+          });
+          currentChildIndex = i;
+        } else if (currentChildIndex !== i) {
+          patches.push({
+            type: NavigateSibling,
+            index: i
+          });
+          currentChildIndex = i;
+        }
+        // Replace the entire subtree
+        const flatNodes = treeToArray(newNode);
+        patches.push({
+          type: Replace,
+          nodes: flatNodes
+        });
+        // After replace, we're at the new element (same position)
+        continue;
+      }
+      // Check if we need to recurse into children
+      const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
+      // Only navigate to this element if we need to do something
+      if (nodePatches.length > 0 || hasChildrenToCompare) {
+        // Navigate to this child if not already there
+        if (currentChildIndex === -1) {
+          patches.push({
+            type: NavigateChild,
+            index: i
+          });
+          currentChildIndex = i;
+        } else if (currentChildIndex !== i) {
+          patches.push({
+            type: NavigateSibling,
+            index: i
+          });
+          currentChildIndex = i;
+        }
+        // Apply node patches (these apply to the current element, not children)
+        if (nodePatches.length > 0) {
+          patches.push(...nodePatches);
+        }
+        // Compare children recursively
+        if (hasChildrenToCompare) {
+          diffChildren(oldNode.children, newNode.children, patches);
+        }
+      }
+    } else {
+      // Remove old node - collect the index for later removal
+      indicesToRemove.push(i);
+    }
+  }
+  // Navigate back to parent if we ended at a child
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+    currentChildIndex = -1;
+  }
+  // Add remove patches in reverse order (highest index first)
+  // This ensures indices remain valid as we remove
+  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
+    patches.push({
+      type: RemoveChild,
+      index: indicesToRemove[j]
+    });
+  }
+};
+const diffTrees = (oldTree, newTree, patches, path) => {
+  // At the root level (path.length === 0), we're already AT the element
+  // So we compare the root node directly, then compare its children
+  if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
+    const oldNode = oldTree[0];
+    const newNode = newTree[0];
+    // Compare root nodes
+    const nodePatches = compareNodes(oldNode.node, newNode.node);
+    // If nodePatches is null, the root node types are incompatible - need to replace
+    if (nodePatches === null) {
+      const flatNodes = treeToArray(newNode);
+      patches.push({
+        type: Replace,
+        nodes: flatNodes
+      });
+      return;
+    }
+    if (nodePatches.length > 0) {
+      patches.push(...nodePatches);
+    }
+    // Compare children
+    if (oldNode.children.length > 0 || newNode.children.length > 0) {
+      diffChildren(oldNode.children, newNode.children, patches);
+    }
+  } else {
+    // Non-root level or multiple root elements - use the regular comparison
+    diffChildren(oldTree, newTree, patches);
+  }
+};
+
+const removeTrailingNavigationPatches = patches => {
+  // Find the last non-navigation patch
+  let lastNonNavigationIndex = -1;
+  for (let i = patches.length - 1; i >= 0; i--) {
+    const patch = patches[i];
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+      lastNonNavigationIndex = i;
+      break;
+    }
+  }
+  // Return patches up to and including the last non-navigation patch
+  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+};
+
+const diffTree = (oldNodes, newNodes) => {
+  // Step 1: Convert flat arrays to tree structures
+  const oldTree = arrayToTree(oldNodes);
+  const newTree = arrayToTree(newNodes);
+  // Step 3: Compare the trees
+  const patches = [];
+  diffTrees(oldTree, newTree, patches, []);
+  // Remove trailing navigation patches since they serve no purpose
+  return removeTrailingNavigationPatches(patches);
+};
+
 const Vertical = 'vertical';
 
 const ActivityBar$1 = 'ActivityBar';
@@ -2047,12 +2448,23 @@ const getActivityBarVirtualDom = visibleItems => {
 const renderItems = (oldState, newState) => {
   const {
     filteredItems,
+    initial,
     uid
   } = newState;
+  if (initial) {
+    return [SetDom2, uid, []];
+  }
   const dom = getActivityBarVirtualDom(filteredItems);
   return [SetDom2, uid, dom];
 };
 
+const renderIncremental = (oldState, newState) => {
+  const oldDom = renderItems(oldState, oldState)[2];
+  const newDom = renderItems(newState, newState)[2];
+  const patches = diffTree(oldDom, newDom);
+  return [SetPatches, newState.uid, patches];
+};
+
 const getRenderer = diffType => {
   switch (diffType) {
     case RenderCss:
@@ -2061,6 +2473,8 @@ const getRenderer = diffType => {
       return renderFocusContext;
     case RenderFocusContext:
       return renderFocusContext;
+    case RenderIncremental:
+      return renderIncremental;
     case RenderItems:
       return renderItems;
     default:
@@ -2111,25 +2525,50 @@ const renderEventListeners = () => {
 
 const saveState = state => {
   const {
-    currentViewletId,
-    uid
+    currentViewletId
   } = state;
   return {
-    currentViewletId,
-    uid
+    currentViewletId
   };
 };
 
-const isEnabled = activityBarItem => {
-  return activityBarItem.enabled;
+const setAccountEnabled = (state, enabled) => {
+  const {
+    height,
+    itemHeight,
+    selectedIndex
+  } = state;
+  const newState = {
+    ...state,
+    accountEnabled: enabled
+  };
+  const newActivityBarItems = getActivityBarItems(newState);
+  const markedItems = markSelected(newActivityBarItems, selectedIndex);
+  const filteredItems = getFilteredActivityBarItems(markedItems, height, itemHeight);
+  return {
+    ...newState,
+    activityBarItems: markedItems,
+    filteredItems: filteredItems
+  };
 };
-const toggleActivityBarItem = async (state, item) => {
-  const activityBarItem = state.activityBarItems.find(activityBarItem => activityBarItem.id === item.label);
-  // @ts-ignore
-  activityBarItem.enabled = !activityBarItem.enabled;
+
+const toggleActivityBarItem = async (state, itemId) => {
+  const {
+    activityBarItems
+  } = state;
+  const updatedItems = activityBarItems.map(item => {
+    if (item.id === itemId) {
+      const isCurrentlyEnabled = item.flags & Enabled;
+      return {
+        ...item,
+        flags: isCurrentlyEnabled ? item.flags & -9 : item.flags | Enabled
+      };
+    }
+    return item;
+  });
   return {
     ...state,
-    activityBarItems: state.activityBarItems.filter(isEnabled)
+    activityBarItems: updatedItems
   };
 };
 
@@ -2151,6 +2590,7 @@ const commandMap = {
   'ActivityBar.handleClick': wrapCommand(handleClick),
   'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),
   'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
+  'ActivityBar.handleSettingsChanged': wrapCommand(handleSettingsChanged),
   'ActivityBar.handleSideBarHidden': wrapCommand(handleSideBarHidden),
   'ActivityBar.handleSideBarViewletChange': wrapCommand(handleSideBarViewletChange),
   'ActivityBar.handleUpdateStateChange': wrapCommand(handleUpdateStateChange),
@@ -2159,6 +2599,7 @@ const commandMap = {
   'ActivityBar.renderEventListeners': renderEventListeners,
   'ActivityBar.resize': wrapCommand(handleResize),
   'ActivityBar.saveState': wrapGetter(saveState),
+  'ActivityBar.setAccountEnabled': wrapCommand(setAccountEnabled),
   'ActivityBar.terminate': terminate,
   'ActivityBar.toggleActivityBarItem': wrapCommand(toggleActivityBarItem)
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/activity-bar-worker",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",