@lvce-editor/title-bar-worker 2.17.0 → 2.19.0

package/dist/titleBarWorkerMain.js

@@ -1149,10 +1149,11 @@ const {
   set: set$3,
   getCommandIds,
   registerCommands,
-  wrapCommand
+  wrapCommand,
+  wrapGetter
 } = create$2();
 
-const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled, titleBarStyleCustom) => {
+const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled, titleBarStyleCustom, assetDir) => {
   const titleBarButtons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
   const state = {
     ...createDefaultState(),
@@ -1175,10 +1176,10 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
     platform,
     controlsOverlayEnabled,
     titleBarStyleCustom,
-    titleBarButtons
+    titleBarButtons,
+    assetDir
   };
   set$3(id, state, state);
-  return state;
 };
 
 const RenderEntries = 1;
@@ -1189,12 +1190,10 @@ const isEqual$3 = (oldState, newState) => {
   return oldState.titleBarEntries === newState.titleBarEntries && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
 };
 
-const diffType$2 = RenderFocusedIndex;
 const isEqual$2 = (oldState, newState) => {
   return oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
 };
 
-const diffType$1 = RenderMenus;
 const isEqual$1 = (oldState, newState) => {
   return oldState.menus === newState.menus;
 };
@@ -1221,13 +1220,12 @@ const diff2 = uid => {
   return diff(oldState, newState);
 };
 
-const diffType = RenderEntries;
 const isEqual = (oldState, newState) => {
   return oldState.titleBarEntries === newState.titleBarEntries && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen && oldState.assetDir === newState.assetDir && oldState.titleBarIconEnabled === newState.titleBarIconEnabled && oldState.title === newState.title && oldState.titleBarTitleEnabled === newState.titleBarTitleEnabled && oldState.platform === newState.platform && oldState.controlsOverlayEnabled === newState.controlsOverlayEnabled && oldState.titleBarStyleCustom === newState.titleBarStyleCustom && oldState.titleBarButtonsEnabled === newState.titleBarButtonsEnabled && oldState.titleBarButtons === newState.titleBarButtons;
 };
 
 const modules = [isEqual, isEqual$2, isEqual$1];
-const numbers = [diffType, diffType$2, diffType$1];
+const numbers = [RenderEntries, RenderFocusedIndex, RenderMenus];
 
 const diff3 = uid => {
   const {
@@ -1548,6 +1546,8 @@ const parseKey = rawKey => {
 const DebugWorker = 55;
 const RendererWorker$1 = 1;
 
+const FocusTitleBarMenuBar = 26;
+
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -1564,8 +1564,6 @@ const text = data => {
   };
 };
 
-const FocusTitleBarMenuBar = 26;
-
 const getKeyBindings$1 = () => {
   return [{
     key: DownArrow$1,
@@ -2293,7 +2291,7 @@ const getRecentlyOpened = () => {
 
 const File = 'file://';
 
-const getTitle = (homeDir, uri) => {
+const getTitle$1 = (homeDir, uri) => {
   if (!uri) {
     return '';
   }
@@ -2317,7 +2315,7 @@ const getHomeDir = () => {
 const MAX_MENU_RECENT_ENTRIES = 10;
 const toMenuItem = folder => {
   const homeDir = getHomeDir();
-  const label = getTitle(homeDir, folder);
+  const label = getTitle$1(homeDir, folder);
   return {
     label,
     flags: None,
@@ -2528,153 +2526,6 @@ const getMenuEntries$1 = async (id, platform) => {
   return menu.getMenuEntries(platform);
 };
 
-const MaskIconCheck = 'MaskIconCheck';
-const Menu = 'Menu';
-const MenuItem = 'MenuItem';
-const MenuItemCheckMark = 'MenuItemCheckMark';
-const MenuItemCheckmarkIcon = 'MenuItemCheckmarkIcon';
-const MenuItemFocused = 'MenuItemFocused';
-const MenuItemKeyBinding = 'MenuItemKeyBinding';
-const MenuItemSeparator = 'MenuItemSeparator';
-const MenuItemSeparatorLine = 'MenuItemSeparatorLine';
-const MenuItemSubMenu = 'MenuItemSubMenu';
-const MenuItemSubMenuArrowRight = 'MenuItemSubMenuArrowRight';
-const TitleBarButtons = 'TitleBarButtons';
-const TitleBarEntryActive = 'TitleBarEntryActive';
-const TitleBarIcon = 'TitleBarIcon';
-const TitleBarIconIcon = 'TitleBarIconIcon';
-const TitleBarMenuBar$1 = 'TitleBarMenuBar';
-const TitleBarTopLevelEntry = 'TitleBarTopLevelEntry';
-const TitleBarTopLevelEntryLabel = 'TitleBarTopLevelEntryLabel';
-const Viewlet = 'Viewlet';
-
-const getIconVirtualDom = (icon, type = Div) => {
-  return {
-    type,
-    className: `MaskIcon MaskIcon${icon}`,
-    role: None$1,
-    childCount: 0
-  };
-};
-
-const createTitleBarButton = button => {
-  const {
-    id,
-    icon,
-    label,
-    onClick
-  } = button;
-  const dom = [{
-    type: Button$1,
-    className: `TitleBarButton TitleBarButton${id}`,
-    ariaLabel: label,
-    childCount: 1,
-    onClick
-  }, getIconVirtualDom(icon, I)];
-  return dom;
-};
-
-const getTitleBarButtonsVirtualDom = buttons => {
-  return [{
-    type: Div,
-    className: mergeClassNames(Viewlet, TitleBarButtons),
-    childCount: buttons.length
-  }, ...buttons.flatMap(createTitleBarButton)];
-};
-
-const parentNode$1 = {
-  type: Div,
-  className: mergeClassNames(Viewlet, TitleBarIcon),
-  childCount: 1
-};
-const getTitleBarIconVirtualDom = iconSrc => {
-  return [parentNode$1, {
-    type: Img,
-    className: TitleBarIconIcon,
-    src: iconSrc,
-    alt: '',
-    childCount: 0
-  }];
-};
-
-const HandleClick = 1;
-const HandleClickMinimize = 2;
-const HandleClickToggleClose = 3;
-const HandleClickToggleMaximize = 4;
-const HandleFocusIn = 5;
-const HandleFocusOut = 6;
-const HandlePointerOut = 7;
-const HandlePointerOver = 8;
-const HandleMenuClick = 9;
-const HandleMenuMouseOver = 10;
-
-const getItemVirtualDom = item => {
-  // @ts-ignore
-  const {
-    keyboardShortCut,
-    label,
-    isOpen,
-    isFocused
-  } = item;
-  // TODO avoid mutation
-  const dom = [];
-  dom.push({
-    type: Div,
-    className: TitleBarTopLevelEntry,
-    ariaHasPopup: true,
-    ariaExpanded: isOpen,
-    role: MenuItem$1,
-    childCount: 1,
-    ariaKeyShortcuts: keyboardShortCut
-  });
-  if (isOpen) {
-    // @ts-ignore
-    dom[0].ariaOwns = 'Menu-0';
-  }
-  if (isFocused) {
-    dom[0].className += ' ' + TitleBarEntryActive;
-    // @ts-ignore
-    dom[0].id = 'TitleBarEntryActive';
-    dom.push({
-      type: Div,
-      className: TitleBarTopLevelEntryLabel,
-      childCount: 1
-    });
-  }
-  dom.push(text(label));
-  return dom;
-};
-const getTitleBarMenuBarItemsVirtualDom = visibleItems => {
-  const dom = visibleItems.flatMap(getItemVirtualDom);
-  return dom;
-};
-
-const activeId = 'TitleBarEntryActive';
-const getTitleBarMenuBarVirtualDom = (visibleItems, focusedIndex) => {
-  return [{
-    type: Div,
-    className: mergeClassNames(Viewlet, TitleBarMenuBar$1),
-    role: MenuBar,
-    tabIndex: 0,
-    childCount: visibleItems.length,
-    onMouseDown: HandleClick,
-    onFocusOut: HandleFocusOut,
-    onFocusIn: HandleFocusIn,
-    onPointerOver: HandlePointerOver,
-    onPointerOut: HandlePointerOut,
-    ariaActivedescendant: focusedIndex === -1 ? '' : activeId
-  }, ...getTitleBarMenuBarItemsVirtualDom(visibleItems)];
-};
-
-const parentNode = {
-  type: Div,
-  className: 'TitleBarTitle',
-  childCount: 1
-};
-const getTitleVirtualDom = title => {
-  return [parentNode, text(title)];
-};
-
 const maximize = async () => {
   await invoke('ElectronWindow.maximize');
 };
@@ -3030,6 +2881,15 @@ const addWidths = (entries, labelPadding, fontWeight, fontSize, fontFamily, lett
   return withWidths;
 };
 
+const getTitle = workspaceUri => {
+  if (!workspaceUri) {
+    return '';
+  }
+  const slashIndex = workspaceUri.lastIndexOf('/');
+  const baseName = workspaceUri.slice(slashIndex);
+  return baseName;
+};
+
 const loadContent2 = async state => {
   const {
     platform,
@@ -3044,7 +2904,9 @@ const loadContent2 = async state => {
   const titleBarEntries = await getMenuEntries(TitleBar$1);
   const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
   const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
-  const title = 'test';
+  // @ts-ignore
+  const workspaceUri = await invoke('Workspace.getUri');
+  const title = getTitle(workspaceUri);
   const iconWidth = 30;
   return {
     ...state,
@@ -3055,74 +2917,6 @@ const loadContent2 = async state => {
   };
 };
 
-const loadContent = async (state, titleBarEntries) => {
-  const {
-    platform,
-    controlsOverlayEnabled,
-    titleBarStyleCustom,
-    labelFontFamily,
-    labelFontSize,
-    labelFontWeight,
-    labelLetterSpacing,
-    labelPadding
-  } = state;
-  const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
-  const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
-  const title = 'test';
-  return {
-    ...state,
-    titleBarEntries: withWidths,
-    buttons,
-    title
-  };
-};
-
-const Ellipsis = 'Ellipsis';
-
-const getVisibleTitleBarEntries = (entries, width, focusedIndex, isMenuOpen) => {
-  array(entries);
-  number(width);
-  let total = 0;
-  const visible = [];
-  for (let i = 0; i < entries.length; i++) {
-    const entry = entries[i];
-    total += entry.width;
-    if (total >= width) {
-      break;
-    }
-    const isOpen = i === focusedIndex && isMenuOpen;
-    const isFocused = i === focusedIndex;
-    visible.push({
-      ...entry,
-      isOpen,
-      isFocused
-    });
-  }
-  const hasOverflow = visible.length < entries.length;
-  if (hasOverflow) {
-    const padding = 8;
-    const moreIconWidth = 22;
-    const totalPadding = padding * 2;
-    const hasStillOverflow = total + moreIconWidth + totalPadding > width;
-    if (hasStillOverflow) {
-      visible.pop();
-    }
-    visible.push({
-      ariaLabel: moreDot(),
-      icon: Ellipsis,
-      label: '',
-      width: moreIconWidth + totalPadding
-    });
-  }
-  return visible;
-};
-
-const renderEntries = (oldState, newState) => {
-  const visibleEntries = getVisibleTitleBarEntries(newState.titleBarEntries, newState.width, newState.focusedIndex, newState.isMenuOpen);
-  const dom = getTitleBarMenuBarVirtualDom(visibleEntries, newState.focusedIndex);
-  return ['Viewlet.setDom2', newState.uid, dom];
-};
-
 const renderFocusedIndex = (oldState, newState) => {
   if (newState.focusedIndex === -1) {
     return [];
@@ -3130,6 +2924,26 @@ const renderFocusedIndex = (oldState, newState) => {
   return ['Viewlet.focusSelector', '.ViewletTitleBarMenuBar'];
 };
 
+const MaskIconCheck = 'MaskIconCheck';
+const Menu = 'Menu';
+const MenuItem = 'MenuItem';
+const MenuItemCheckMark = 'MenuItemCheckMark';
+const MenuItemCheckmarkIcon = 'MenuItemCheckmarkIcon';
+const MenuItemFocused = 'MenuItemFocused';
+const MenuItemKeyBinding = 'MenuItemKeyBinding';
+const MenuItemSeparator = 'MenuItemSeparator';
+const MenuItemSeparatorLine = 'MenuItemSeparatorLine';
+const MenuItemSubMenu = 'MenuItemSubMenu';
+const MenuItemSubMenuArrowRight = 'MenuItemSubMenuArrowRight';
+const TitleBarButtons = 'TitleBarButtons';
+const TitleBarEntryActive = 'TitleBarEntryActive';
+const TitleBarIcon = 'TitleBarIcon';
+const TitleBarIconIcon = 'TitleBarIconIcon';
+const TitleBarMenuBar = 'TitleBarMenuBar';
+const TitleBarTopLevelEntry = 'TitleBarTopLevelEntry';
+const TitleBarTopLevelEntryLabel = 'TitleBarTopLevelEntryLabel';
+const Viewlet = 'Viewlet';
+
 const checkboxChecked = {
   type: Div,
   className: mergeClassNames(MenuItem, MenuItemCheckMark),
@@ -3361,43 +3175,175 @@ const renderMenus = (oldState, newState) => {
   return ['Viewlet.send', newState.uid, /* method */SetMenus, /* changes */changes, newState.uid];
 };
 
-const getRenderer = diffType => {
-  switch (diffType) {
-    case RenderEntries:
-      return renderEntries;
-    case RenderFocusedIndex:
-      return renderFocusedIndex;
-    case RenderMenus:
-      return renderMenus;
-    default:
-      throw new Error('unknown renderer');
-  }
+const getIcon = assetDir => {
+  return `${assetDir}/icons/icon.svg`;
 };
 
-const applyRender = (oldState, newState, diffResult) => {
-  const commands = [];
-  for (const item of diffResult) {
-    const fn = getRenderer(item);
-    const result = fn(oldState, newState);
-    if (result.length > 0) {
-      commands.push(result);
-    }
-  }
-  return commands;
+const getIconVirtualDom = (icon, type = Div) => {
+  return {
+    type,
+    className: `MaskIcon MaskIcon${icon}`,
+    role: None$1,
+    childCount: 0
+  };
 };
 
-const render2 = async (uid, diffResult) => {
+const createTitleBarButton = button => {
   const {
-    oldState,
-    newState
-  } = get$1(uid);
-  set$3(uid, newState, newState);
-  const commands = applyRender(oldState, newState, diffResult);
-  return commands;
+    id,
+    icon,
+    label,
+    onClick
+  } = button;
+  const dom = [{
+    type: Button$1,
+    className: `TitleBarButton TitleBarButton${id}`,
+    ariaLabel: label,
+    childCount: 1,
+    onClick
+  }, getIconVirtualDom(icon, I)];
+  return dom;
 };
 
-const getIcon = assetDir => {
-  return `${assetDir}/icons/icon.svg`;
+const getTitleBarButtonsVirtualDom = buttons => {
+  return [{
+    type: Div,
+    className: mergeClassNames(Viewlet, TitleBarButtons),
+    childCount: buttons.length
+  }, ...buttons.flatMap(createTitleBarButton)];
+};
+
+const parentNode$1 = {
+  type: Div,
+  className: mergeClassNames(Viewlet, TitleBarIcon),
+  childCount: 1
+};
+const getTitleBarIconVirtualDom = iconSrc => {
+  return [parentNode$1, {
+    type: Img,
+    className: TitleBarIconIcon,
+    src: iconSrc,
+    alt: '',
+    childCount: 0
+  }];
+};
+
+const HandleClick = 1;
+const HandleClickMinimize = 2;
+const HandleClickToggleClose = 3;
+const HandleClickToggleMaximize = 4;
+const HandleFocusIn = 5;
+const HandleFocusOut = 6;
+const HandlePointerOut = 7;
+const HandlePointerOver = 8;
+const HandleMenuClick = 9;
+const HandleMenuMouseOver = 10;
+
+const getItemVirtualDom = item => {
+  // @ts-ignore
+  const {
+    keyboardShortCut,
+    label,
+    isOpen,
+    isFocused
+  } = item;
+  // TODO avoid mutation
+  const dom = [];
+  dom.push({
+    type: Div,
+    className: TitleBarTopLevelEntry,
+    ariaHasPopup: true,
+    ariaExpanded: isOpen,
+    role: MenuItem$1,
+    childCount: 1,
+    ariaKeyShortcuts: keyboardShortCut
+  });
+  if (isOpen) {
+    // @ts-ignore
+    dom[0].ariaOwns = 'Menu-0';
+  }
+  if (isFocused) {
+    dom[0].className += ' ' + TitleBarEntryActive;
+    // @ts-ignore
+    dom[0].id = 'TitleBarEntryActive';
+    dom.push({
+      type: Div,
+      className: TitleBarTopLevelEntryLabel,
+      childCount: 1
+    });
+  }
+  dom.push(text(label));
+  return dom;
+};
+const getTitleBarMenuBarItemsVirtualDom = visibleItems => {
+  const dom = visibleItems.flatMap(getItemVirtualDom);
+  return dom;
+};
+
+const activeId = 'TitleBarEntryActive';
+const getTitleBarMenuBarVirtualDom = (visibleItems, focusedIndex) => {
+  return [{
+    type: Div,
+    className: mergeClassNames(Viewlet, TitleBarMenuBar),
+    role: MenuBar,
+    tabIndex: 0,
+    childCount: visibleItems.length,
+    onMouseDown: HandleClick,
+    onFocusOut: HandleFocusOut,
+    onFocusIn: HandleFocusIn,
+    onPointerOver: HandlePointerOver,
+    onPointerOut: HandlePointerOut,
+    ariaActivedescendant: focusedIndex === -1 ? '' : activeId
+  }, ...getTitleBarMenuBarItemsVirtualDom(visibleItems)];
+};
+
+const parentNode = {
+  type: Div,
+  className: 'TitleBarTitle',
+  childCount: 1
+};
+const getTitleVirtualDom = title => {
+  return [parentNode, text(title)];
+};
+
+const Ellipsis = 'Ellipsis';
+
+const getVisibleTitleBarEntries = (entries, width, focusedIndex, isMenuOpen) => {
+  array(entries);
+  number(width);
+  let total = 0;
+  const visible = [];
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i];
+    total += entry.width;
+    if (total >= width) {
+      break;
+    }
+    const isOpen = i === focusedIndex && isMenuOpen;
+    const isFocused = i === focusedIndex;
+    visible.push({
+      ...entry,
+      isOpen,
+      isFocused
+    });
+  }
+  const hasOverflow = visible.length < entries.length;
+  if (hasOverflow) {
+    const padding = 8;
+    const moreIconWidth = 22;
+    const totalPadding = padding * 2;
+    const hasStillOverflow = total + moreIconWidth + totalPadding > width;
+    if (hasStillOverflow) {
+      visible.pop();
+    }
+    visible.push({
+      ariaLabel: moreDot(),
+      icon: Ellipsis,
+      label: '',
+      width: moreIconWidth + totalPadding
+    });
+  }
+  return visible;
 };
 
 const getTitleBarVirtualDom = state => {
@@ -3540,9 +3486,12 @@ const resize = async (state, dimensions) => {
   };
 };
 
-const saveState = uid => {
+const saveState = state => {
+  const {
+    focusedIndex
+  } = state;
   return {
-    x: 1
+    focusedIndex
   };
 };
 
@@ -3675,11 +3624,8 @@ const setFocus = async focusKey => {
   await invoke('Focus.setFocus', focusKey);
 };
 
-// TODO remove this file and merge with whenExpressions
-const TitleBarMenuBar = FocusTitleBarMenuBar;
-
 const handleFocus = async state => {
-  await setFocus(TitleBarMenuBar);
+  await setFocus(FocusTitleBarMenuBar);
   return state;
 };
 
@@ -4068,17 +4014,12 @@ const commandMap = {
   'TitleBar.focusLast': wrapCommand(focusIndex),
   'TitleBar.focusNext': wrapCommand(focusNext),
   'TitleBar.focusPrevious': wrapCommand(focusPrevious),
-  'TitleBar.getButtonsVirtualDom': getTitleBarButtonsVirtualDom,
   'TitleBar.getCommandIds': getCommandIds,
   'TitleBar.getCommands': getCommandIds,
-  'TitleBar.getIconVirtualDom': getTitleBarIconVirtualDom,
   'TitleBar.getKeyBindings': getKeyBindings$1,
   'TitleBar.getMenuEntries': getMenuEntries$1,
   'TitleBar.getMenuIds': getMenuIds,
   'TitleBar.getMenus': getMenus,
-  'TitleBar.getTitleBarButtons': getTitleBarButtons,
-  'TitleBar.getTitleVirtualDom': getTitleVirtualDom,
-  'TitleBar.getVirtualDom': getTitleBarMenuBarVirtualDom,
   'TitleBar.handleButtonsClick': handleClick$1,
   'TitleBar.handleClick': wrapCommand(handleClick),
   'TitleBar.handleClickAt': wrapCommand(handleClickAt),
@@ -4103,13 +4044,11 @@ const commandMap = {
   'TitleBar.handleMouseOver': wrapCommand(handleMouseOver),
   'TitleBar.handlePointerOut': wrapCommand(handlePointerOut),
   'TitleBar.handlePointerOver': wrapCommand(handlePointerOver),
-  'TitleBar.loadContent': wrapCommand(loadContent),
   'TitleBar.loadContent2': wrapCommand(loadContent2),
-  'TitleBar.render2': render2,
   'TitleBar.render3': render3,
   'TitleBar.renderEventListeners': renderEventListeners,
   'TitleBar.resize': wrapCommand(resize),
-  'TitleBar.saveState': saveState,
+  'TitleBar.saveState': wrapGetter(saveState),
   'TitleBar.terminate': terminate,
   'TitleBar.toggleIndex': wrapCommand(toggleIndex),
   'TitleBar.toggleMenu': wrapCommand(toggleMenu)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/title-bar-worker",
-  "version": "2.17.0",
+  "version": "2.19.0",
   "description": "Title Bar Worker",
   "repository": {
     "type": "git",