@lvce-editor/activity-bar-worker 7.1.0 → 7.2.0

package/dist/activityBarWorkerMain.js

@@ -13,13 +13,13 @@ const create$a = () => {
     },
     diff(uid, modules, numbers) {
       const {
-        newState,
-        oldState
+        oldState,
+        scheduledState
       } = states[uid];
       const diffResult = [];
       for (let i = 0; i < modules.length; i++) {
         const fn = modules[i];
-        if (!fn(oldState, newState)) {
+        if (!fn(oldState, scheduledState)) {
           diffResult.push(numbers[i]);
         }
       }
@@ -37,17 +37,16 @@ const create$a = () => {
       return ids;
     },
     getKeys() {
-      return Object.keys(states).map(key => {
-        return Number.parseFloat(key);
-      });
+      return Object.keys(states).map(Number);
     },
     registerCommands(commandMap) {
       Object.assign(commandMapRef, commandMap);
     },
-    set(uid, oldState, newState) {
+    set(uid, oldState, newState, scheduledState) {
       states[uid] = {
         newState,
-        oldState
+        oldState,
+        scheduledState: scheduledState ?? newState
       };
     },
     wrapCommand(fn) {
@@ -67,7 +66,8 @@ const create$a = () => {
         };
         states[uid] = {
           newState: latestNew,
-          oldState: latestOld.oldState
+          oldState: latestOld.oldState,
+          scheduledState: latestNew
         };
       };
       return wrapped;
@@ -104,7 +104,8 @@ const create$a = () => {
         };
         states[uid] = {
           newState: latestNew,
-          oldState: latestOld.oldState
+          oldState: latestOld.oldState,
+          scheduledState: latestNew
         };
         return {
           error
@@ -159,8 +160,60 @@ const create$9 = (id, uri, x, y, width, height, args, parentUid, platform = 0) =
   return state;
 };
 
+const hashString = value => {
+  let hash = 2_166_136_261;
+  for (const character of value) {
+    hash ^= character.codePointAt(0) || 0;
+    hash = Math.imul(hash, 16_777_619);
+  }
+  return (hash >>> 0).toString(36);
+};
+const isCustomIconUrl = icon => {
+  return icon.startsWith('http://') || icon.startsWith('https://') || icon.startsWith('file://') || icon.startsWith('/');
+};
+const getCustomIconClass = (id, iconUrl) => {
+  const hashInput = id + '\n' + iconUrl;
+  return `MaskIconCustomView${hashString(hashInput)}`;
+};
+const getIconClass = (item, builtinPrefix) => {
+  if (item.customIconClass) {
+    return item.customIconClass;
+  }
+  return `${builtinPrefix}${item.icon}`;
+};
+const escapeCssUrl = url => {
+  return url.replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('\n', '\\a ').replaceAll('\r', '\\d ').replaceAll('\f', '\\c ');
+};
+const getCustomIconCss = items => {
+  const seen = new Set();
+  let css = '';
+  for (const item of items) {
+    const {
+      customIconClass,
+      customIconUrl
+    } = item;
+    if (!customIconClass || !customIconUrl || seen.has(customIconClass)) {
+      continue;
+    }
+    seen.add(customIconClass);
+    css += `.${customIconClass} {
+  mask-image: url("${escapeCssUrl(customIconUrl)}");
+}
+`;
+  }
+  return css;
+};
+const getCustomIconSignature = items => {
+  return items.map(item => {
+    if (!item.customIconClass || !item.customIconUrl) {
+      return '';
+    }
+    return `${item.customIconClass}\n${item.customIconUrl}`;
+  }).filter(Boolean).join('\n');
+};
+
 const isEqual$2 = (oldState, newState) => {
-  return oldState.itemHeight === newState.itemHeight;
+  return oldState.itemHeight === newState.itemHeight && getCustomIconSignature(oldState.filteredItems) === getCustomIconSignature(newState.filteredItems);
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -481,7 +534,7 @@ const getMenuEntriesActivityBar = state => {
   } = state;
   const topItems = activityBarItems.filter(item => !(item.flags & Button));
   const bottomItems = activityBarItems.filter(item => item.flags & Button);
-  const entries = [...topItems.map(toContextMenuItem$1)];
+  const entries = topItems.map(toContextMenuItem$1);
   if (bottomItems.length > 0) {
     entries.push(menuEntrySeparator, ...bottomItems.map(toContextMenuItem$1));
   }
@@ -628,7 +681,7 @@ class AssertionError extends Error {
 const Object$1 = 1;
 const Number$1 = 2;
 const Array$1 = 3;
-const String = 4;
+const String$1 = 4;
 const Boolean$1 = 5;
 const Function = 6;
 const Null = 7;
@@ -640,7 +693,7 @@ const getType = value => {
     case 'function':
       return Function;
     case 'string':
-      return String;
+      return String$1;
     case 'object':
       if (value === null) {
         return Null;
@@ -1754,7 +1807,7 @@ const updateItemsWithBadgeCount = async items => {
     const badgeCounts = await invoke('Layout.getBadgeCounts');
     const newItems = items.map(item => {
       const badgeCount = badgeCounts[item.id] || 0;
-      const badgeText = badgeCount ? `${badgeCount}` : '';
+      const badgeText = badgeCount ? String(badgeCount) : '';
       return {
         ...item,
         badgeText
@@ -2029,13 +2082,24 @@ const Search = 'Search';
 const SourceControl = 'Source Control';
 
 const toActivityBarItem = view => {
-  return {
+  const icon = view.icon || Extensions$1;
+  const customIconUrl = isCustomIconUrl(icon) ? icon : undefined;
+  const customIconClass = customIconUrl ? getCustomIconClass(view.id, customIconUrl) : undefined;
+  const item = {
     flags: Tab | Enabled,
-    icon: view.icon || Extensions$1,
+    icon,
     id: view.id,
     keyShortcuts: '',
     title: view.title || view.id
   };
+  if (customIconClass && customIconUrl) {
+    return {
+      ...item,
+      customIconClass,
+      customIconUrl
+    };
+  }
+  return item;
 };
 const getActivityBarItems = (state, contributedViews = []) => {
   const {
@@ -2345,19 +2409,20 @@ const loadContent = async state => {
   };
 };
 
-const getCss = itemHeight => {
+const getCss = (itemHeight, items = []) => {
   return `:root {
   --ActivityBarItemHeight: var(--${itemHeight}px);
 }
-`;
+${getCustomIconCss(items)}`;
 };
 
 const renderCss = (oldState, newState) => {
   const {
+    filteredItems,
     itemHeight,
     uid
   } = newState;
-  const css = getCss(itemHeight);
+  const css = getCss(itemHeight, filteredItems);
   return [SetCss, uid, css];
 };
 
@@ -2451,12 +2516,12 @@ const getChildrenWithCount = (nodes, startIndex, childCount) => {
 };
 
 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;
   }
+  const patches = [];
   // Handle reference nodes - special handling for uid changes
   if (oldNode.type === Reference) {
     if (oldNode.uid !== newNode.uid) {
@@ -2492,7 +2557,7 @@ const compareNodes = (oldNode, newNode) => {
   }
   // Check for removed attributes
   for (const key of oldKeys) {
-    if (!(key in newNode)) {
+    if (!Object.hasOwn(newNode, key)) {
       patches.push({
         type: RemoveAttribute,
         key
@@ -2707,7 +2772,6 @@ const getClassName = (isFocused, marginTop, isSelected) => {
 const getActivityBarItemInProgressDom = item => {
   const {
     flags,
-    icon,
     title
   } = item;
   const isTab = flags & Tab;
@@ -2730,7 +2794,7 @@ const getActivityBarItemInProgressDom = item => {
     type: Div
   }, {
     childCount: 0,
-    className: mergeClassNames(Icon, `MaskIcon${icon}`),
+    className: mergeClassNames(Icon, getIconClass(item, 'MaskIcon')),
     role: None$1,
     type: Div
   }, ...getBadgeVirtualDom()];
@@ -2740,7 +2804,6 @@ const getActivityBarItemWithBadgeDom = item => {
   const {
     badgeText,
     flags,
-    icon,
     title
   } = item;
   if (!badgeText) {
@@ -2767,7 +2830,7 @@ const getActivityBarItemWithBadgeDom = item => {
     type: Div
   }, {
     childCount: 0,
-    className: mergeClassNames(Icon, `MaskIcon${icon}`),
+    className: mergeClassNames(Icon, getIconClass(item, 'MaskIcon')),
     role: None$1,
     type: Div
   }, {
@@ -2777,10 +2840,10 @@ const getActivityBarItemWithBadgeDom = item => {
   }, text(badgeText)];
 };
 
-const getIconVirtualDom = (icon, type = Div) => {
+const getIconVirtualDom = (icon, type = Div, customIconClass = '') => {
   return {
     childCount: 0,
-    className: `MaskIcon MaskIcon${icon}`,
+    className: customIconClass ? `MaskIcon ${customIconClass}` : `MaskIcon MaskIcon${icon}`,
     role: None$1,
     type
   };
@@ -2812,7 +2875,7 @@ const getActivityBarItemVirtualDom = item => {
       role,
       title,
       type: Div
-    }, getIconVirtualDom(icon)];
+    }, getIconVirtualDom(icon, Div, item.customIconClass)];
   }
 
   // TODO support progress on selected activity bar item
@@ -2827,7 +2890,7 @@ const getActivityBarItemVirtualDom = item => {
     ariaLabel: '',
     ariaSelected,
     childCount: 0,
-    className: mergeClassNames(className, `Icon${icon}`),
+    className: mergeClassNames(className, getIconClass(item, 'Icon')),
     role,
     title,
     type: Div

package/package.json

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