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

package/dist/activityBarWorkerMain.js

@@ -613,7 +613,7 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$2 = (id, error) => {
+const create$1$1 = (id, error) => {
   return {
     jsonrpc: Two$1,
     id,
@@ -624,7 +624,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$2(id, errorProperty);
+  return create$1$1(id, errorProperty);
 };
 const create$3 = (message, result) => {
   return {
@@ -749,14 +749,14 @@ const execute = (command, ...args) => {
 };
 
 const Two = '2.0';
-const create$s = (method, params) => {
+const create$t = (method, params) => {
   return {
     jsonrpc: Two,
     method,
     params
   };
 };
-const create$r = (id, method, params) => {
+const create$s = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -766,14 +766,14 @@ const create$r = (id, method, params) => {
   return message;
 };
 let id = 0;
-const create$q = () => {
+const create$r = () => {
   return ++id;
 };
 
 /* eslint-disable n/no-unsupported-features/es-syntax */
 
 const registerPromise = map => {
-  const id = create$q();
+  const id = create$r();
   const {
     promise,
     resolve
@@ -791,7 +791,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$r(id, method, params);
+  const message = create$s(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -827,7 +827,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$s(method, params);
+      const message = create$t(method, params);
       ipc.send(message);
     }
   };
@@ -863,7 +863,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$1$1 = async ({
+const create$2$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -875,7 +875,7 @@ const create$1$1 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$1$1
+  create: create$2$1
 };
 const createMockRpc = ({
   commandMap
@@ -904,6 +904,7 @@ const ToolBar = 'toolbar';
 
 const Div = 4;
 const Text = 12;
+const Reference = 100;
 
 const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
@@ -1001,7 +1002,6 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(menuId);
   number(x);
   number(y);
-  // @ts-ignore
   await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
 
@@ -1661,6 +1661,13 @@ const handleContextMenu = async (state, button, eventX, eventY) => {
   return state;
 };
 
+const handleFocus = state => {
+  return {
+    ...state,
+    focused: true
+  };
+};
+
 const Account = 'Account';
 const DebugAlt2 = 'DebugAlt2';
 const Extensions$1 = 'Extensions';
@@ -1904,13 +1911,25 @@ const getActiveView = async () => {
   }
 };
 
+const getSideBarVisible = async () => {
+  try {
+    const visible = await invoke('Layout.getSideBarVisible');
+    return visible;
+  } catch {
+    return true;
+  }
+};
+
 const loadContent = async state => {
   const {
     height,
     itemHeight
   } = state;
   const items = getActivityBarItems(state);
+  // TODO parallelize async calls
+  // or add one function that returns all needed data
   const activeView = await getActiveView();
+  const sideBarVisible = await getSideBarVisible();
   const index = items.findIndex(item => item.id === activeView);
   const itemsWithSelected = markSelected(items, index);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
@@ -1924,7 +1943,7 @@ const loadContent = async state => {
     initial: false,
     selectedIndex: index,
     sideBarLocation: sidebarLocation,
-    sideBarVisible: true
+    sideBarVisible
   };
 };
 
@@ -1972,6 +1991,7 @@ const NavigateChild = 7;
 const NavigateParent = 8;
 const RemoveChild = 9;
 const NavigateSibling = 10;
+const SetReferenceNodeUid = 11;
 
 const isKey = key => {
   return key !== 'type' && key !== 'childCount';
@@ -2039,6 +2059,16 @@ const compareNodes = (oldNode, newNode) => {
   if (oldNode.type !== newNode.type) {
     return null;
   }
+  // Handle reference nodes - special handling for uid changes
+  if (oldNode.type === Reference) {
+    if (oldNode.uid !== newNode.uid) {
+      patches.push({
+        type: SetReferenceNodeUid,
+        uid: newNode.uid
+      });
+    }
+    return patches;
+  }
   // Handle text nodes
   if (oldNode.type === Text && newNode.type === Text) {
     if (oldNode.text !== newNode.text) {
@@ -2518,8 +2548,8 @@ const renderEventListeners = () => {
   }, {
     name: HandleMouseDown,
     params: ['handleClick', Button$1, ClientX, ClientY],
-    preventDefault: true,
-    stopPropagation: true
+    preventDefault: false,
+    stopPropagation: false
   }];
 };
 
@@ -2590,6 +2620,7 @@ const commandMap = {
   'ActivityBar.handleClick': wrapCommand(handleClick),
   'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),
   'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
+  'ActivityBar.handleFocus': wrapCommand(handleFocus),
   'ActivityBar.handleSettingsChanged': wrapCommand(handleSettingsChanged),
   'ActivityBar.handleSideBarHidden': wrapCommand(handleSideBarHidden),
   'ActivityBar.handleSideBarViewletChange': wrapCommand(handleSideBarViewletChange),

package/package.json

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