@lvce-editor/title-bar-worker 2.7.0 → 2.9.0

package/dist/titleBarWorkerMain.js

@@ -1031,6 +1031,8 @@ const diff = (oldState, newState) => {
 const {
   get: get$1,
   set: set$3,
+  getCommandIds,
+  registerCommands,
   wrapCommand
 } = create$2();
 
@@ -1042,12 +1044,6 @@ const diff2 = uid => {
   return diff(oldState, newState);
 };
 
-const commandsIds = ['closeMenu', 'handleClickAt', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusPrevious', 'handleClick', 'handleFocus', 'handleFocusOut', 'handleKeyArrowDown', 'handleKeyArrowLeft', 'handleKeyArrowRight', 'handleKeyArrowUp', 'handleKeyEnd', 'handleKeyEnter', 'handleKeyEscape', 'handleKeyHome', 'handleKeySpace', 'handleMenuClick', 'handleMenuMouseOver', 'handleMouseOut', 'handleMouseOver', 'handlePointerOver', 'handlePointerOut', 'toggleIndex', 'toggleMenu'];
-
-const getCommandIds = () => {
-  return commandsIds;
-};
-
 const Menu$1 = 'menu';
 const MenuBar = 'menubar';
 const MenuItem$1 = 'menuitem';
@@ -1055,13 +1051,17 @@ const MenuItemCheckBox = 'menuitemcheckbox';
 const None$1 = 'none';
 const Separator$1 = 'separator';
 
-const Button = 1;
+const Button$1 = 1;
 const Div = 4;
 const Span = 8;
 const Text = 12;
 const I = 16;
 const Img = 17;
 
+const Button = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+
 const Escape$2 = 8;
 const Space$2 = 9;
 const End$2 = 255;
@@ -2210,7 +2210,7 @@ const createTitleBarButton = button => {
     onClick
   } = button;
   const dom = [{
-    type: Button,
+    type: Button$1,
     className: `TitleBarButton TitleBarButton${id}`,
     ariaLabel: label,
     childCount: 1,
@@ -3028,6 +3028,16 @@ const parseKey = rawKey => {
   };
 };
 
+const getKeyDom = key => {
+  const parsedKey = parseKey(key);
+  const keyBindingsString = getKeyBindingString(parsedKey.key, false, parsedKey.isCtrl, parsedKey.isShift);
+  return [{
+    type: Span,
+    className: MenuItemKeyBinding,
+    childCount: 1
+  }, text(keyBindingsString)];
+};
+
 const classNameFocused = mergeClassNames(MenuItem, MenuItemFocused);
 const getMenuItemClassName = isFocused => {
   if (isFocused) {
@@ -3042,25 +3052,15 @@ const getMenuItemDefaultDom = menuItem => {
     key
   } = menuItem;
   const className = getMenuItemClassName(isFocused);
-  const dom = [];
-  dom.push({
+  const keyDom = key ? getKeyDom(key) : [];
+  const childCount = key ? 2 : 1;
+  return [{
     type: Div,
     className,
     role: MenuItem$1,
     tabIndex: -1,
-    childCount: 1
-  }, text(label));
-  if (key) {
-    dom[0].childCount++;
-    const parsedKey = parseKey(key);
-    const keyBindingsString = getKeyBindingString(parsedKey.key, false, parsedKey.isCtrl, parsedKey.isShift);
-    dom.push({
-      type: Span,
-      className: MenuItemKeyBinding,
-      childCount: 1
-    }, text(keyBindingsString));
-  }
-  return dom;
+    childCount
+  }, text(label), ...keyDom];
 };
 
 const disabled = {
@@ -3109,11 +3109,8 @@ const getMenuItemSubMenuDom = menuItem => {
     isExpanded,
     level
   } = menuItem;
-  let className = MenuItem;
-  className += ' ' + MenuItemSubMenu;
-  if (isFocused) {
-    className += ' ' + MenuItemFocused;
-  }
+  const baseClassName = mergeClassNames(MenuItem, MenuItemSubMenu);
+  const className = isFocused ? mergeClassNames(baseClassName, MenuItemFocused) : baseClassName;
   return [{
     type: Div,
     className,
@@ -3281,22 +3278,22 @@ const renderEventListeners = () => {
     params: ['handleFocus']
   }, {
     name: HandleMenuClick,
-    params: ['handleMenuClick', 'event.clientX', 'event.clientY']
+    params: ['handleMenuClick', ClientX, ClientY]
   }, {
     name: HandleMenuMouseOver,
-    params: ['handleMenuMouseOver', 'event.clientX', 'event.clientY']
+    params: ['handleMenuMouseOver', ClientX, ClientY]
   }, {
     name: HandleClick,
-    params: ['handleClickAt', 'event.button', 'event.clientX', 'event.clientY']
+    params: ['handleClickAt', Button, ClientX, ClientY]
   }, {
     name: HandlePointerOut,
-    params: ['handlePointerOut', 'event.clientX', 'event.clientY']
+    params: ['handlePointerOut', ClientX, ClientY]
   }, {
     name: HandlePointerOver,
-    params: ['handlePointerOver', 'event.clientX', 'event.clientY']
+    params: ['handlePointerOver', ClientX, ClientY]
   }, {
     name: HandleFocusOut,
-    params: ['handleFocusOut', 'event.clientX', 'event.clientY'] // TODO maybe check relatedTarget
+    params: ['handleFocusOut', ClientX, ClientY] // TODO maybe check relatedTarget
   }];
 };
 
@@ -3306,8 +3303,37 @@ const saveState = uid => {
   };
 };
 
+const DEFAULT_UID = 1;
+const createDefaultState = (uid = DEFAULT_UID) => ({
+  assetDir: '',
+  focusedIndex: -1,
+  height: 30,
+  iconWidth: 30,
+  isMenuOpen: false,
+  itleBarIconEnabled: true,
+  labelFontFamily: 'system-ui, Ubuntu, Droid Sans, sans-serif',
+  labelFontSize: 13,
+  labelFontWeight: 400,
+  labelLetterSpacing: 0,
+  labelPadding: 8,
+  menus: [],
+  titleBarButtonsEnabled: true,
+  titleBarButtonsWidth: 90,
+  titleBarEntries: [],
+  titleBarHeight: 30,
+  titleBarIconWidth: 30,
+  titleBarMenuBarEnabled: true,
+  titleBarTitleEnabled: true,
+  uid,
+  width: 800,
+  x: 0,
+  y: 0,
+  title: ''
+});
+
 const create = (id, uri, x, y, width, height) => {
   const state = {
+    ...createDefaultState(),
     uid: id,
     titleBarEntries: [],
     focusedIndex: -1,
@@ -3859,6 +3885,7 @@ const commandMap = {
 };
 
 const listen = async () => {
+  registerCommands(commandMap);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/title-bar-worker",
-  "version": "2.7.0",
+  "version": "2.9.0",
   "description": "Title Bar Worker",
   "repository": {
     "type": "git",
@@ -11,6 +11,7 @@
   "type": "module",
   "main": "dist/titleBarWorkerMain.js",
   "dependencies": {
+    "@lvce-editor/constants": "^1.26.0",
     "@lvce-editor/viewlet-registry": "^1.4.0"
   }
 }