@lvce-editor/title-bar-worker 3.11.0 → 3.12.0

package/dist/titleBarWorkerMain.js

@@ -1342,6 +1342,7 @@ const RendererWorker = 1;
 
 const FocusSelector = 'Viewlet.focusSelector';
 const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
 
 const FocusTitleBarMenuBar = 26;
 
@@ -1754,55 +1755,29 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
   set(id, state, state);
 };
 
-const RenderEntries = 1;
-const RenderFocusedIndex = 2;
-const RenderMenus = 3;
-const RenderFocusContext = 4;
-
-const isEqual$4 = (oldState, newState) => {
-  return oldState.titleBarEntries === newState.titleBarEntries && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
-};
-
 const isEqual$3 = (oldState, newState) => {
-  return oldState.focused === newState.focused;
+  return oldState.titleBarEntries === newState.titleBarEntries && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
+  return oldState.focused || !newState.focused;
 };
 
 const isEqual$1 = (oldState, newState) => {
-  return oldState.menus === newState.menus;
-};
-
-const modules$1 = [isEqual$4, isEqual$2, isEqual$1, isEqual$3];
-const numbers$1 = [RenderEntries, RenderFocusedIndex, RenderMenus, RenderFocusContext];
-
-const diff = (oldState, newState) => {
-  const diffResult = [];
-  for (let i = 0; i < modules$1.length; i++) {
-    const fn = modules$1[i];
-    if (!fn(oldState, newState)) {
-      diffResult.push(numbers$1[i]);
-    }
-  }
-  return diffResult;
-};
-
-const diff2 = uid => {
-  const {
-    newState,
-    oldState
-  } = get(uid);
-  return diff(oldState, newState);
+  return oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
 };
 
 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;
+  return oldState.menus === newState.menus;
 };
 
-const modules = [isEqual, isEqual$2, isEqual$1];
-const numbers = [RenderEntries, RenderFocusedIndex, RenderMenus];
+const RenderEntries = 1;
+const RenderFocusedIndex = 2;
+const RenderMenus = 3;
+const RenderFocusContext = 4;
+
+const modules = [isEqual$3, isEqual$1, isEqual, isEqual$2];
+const numbers = [RenderEntries, RenderFocusedIndex, RenderMenus, RenderFocusContext];
 
 const diff3 = uid => {
   const {
@@ -2985,7 +2960,6 @@ const measureTextWidths2 = async (texts, fontWeight, fontSize, fontFamily, lette
   await using rpc = await launchTextMeasurementWorker();
   const isMonospaceFont = false;
   const charWidth = 0;
-  // @ts-ignore
   const result = await rpc.invoke('TextMeasurement.measureTextWidths', texts, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
   return result;
 };
@@ -3079,6 +3053,13 @@ const loadContent2 = async state => {
   };
 };
 
+const renderFocusContext = (oldState, newState) => {
+  const {
+    uid
+  } = newState;
+  return [SetFocusContext, uid, FocusTitleBarMenuBar];
+};
+
 const renderFocusedIndex = (oldState, newState) => {
   if (newState.focusedIndex === -1) {
     return [];
@@ -3554,6 +3535,8 @@ const getRenderer3 = diffType => {
   switch (diffType) {
     case RenderEntries:
       return renderTitleBar;
+    case RenderFocusContext:
+      return renderFocusContext;
     case RenderFocusedIndex:
       return renderFocusedIndex;
     case RenderMenus:
@@ -3794,12 +3777,7 @@ const handleClickAt = async (state, button, eventX, eventY) => {
   return handleClick(state, button, index);
 };
 
-const setFocus = async focusKey => {
-  await invoke('Focus.setFocus', focusKey);
-};
-
 const handleFocus = async state => {
-  await setFocus(FocusTitleBarMenuBar);
   return {
     ...state,
     focused: true
@@ -4248,7 +4226,6 @@ const commandMap = {
   'TitleBar.closeMenu': closeMenu,
   'TitleBar.create': create,
   'TitleBar.create3': create3,
-  'TitleBar.diff2': diff2,
   'TitleBar.diff3': diff3,
   'TitleBar.focus': wrapCommand(focus),
   'TitleBar.focusFirst': wrapCommand(focusFirst),

package/package.json

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