@lvce-editor/about-view 5.0.0 → 5.2.0

package/dist/aboutWorkerMain.js

@@ -395,7 +395,7 @@ const set$2 = (id, fn) => {
 const get$2 = id => {
   return callbacks[id];
 };
-const remove$1 = id => {
+const remove = id => {
   delete callbacks[id];
 };
 let id = 0;
@@ -414,7 +414,7 @@ const registerPromise = () => {
     promise
   };
 };
-const create$2 = (method, params) => {
+const create$2$1 = (method, params) => {
   const {
     id,
     promise
@@ -572,7 +572,7 @@ const resolve = (id, response) => {
     return;
   }
   fn(response);
-  remove$1(id);
+  remove(id);
 };
 const E_COMMAND_NOT_FOUND = 'E_COMMAND_NOT_FOUND';
 const getErrorType = prettyError => {
@@ -706,7 +706,7 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   const {
     message,
     promise
-  } = create$2(method, params);
+  } = create$2$1(method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -756,6 +756,9 @@ const createRpc = ipc => {
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
+    },
+    async dispose() {
+      await ipc?.dispose();
     }
   };
   return rpc;
@@ -790,7 +793,7 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$1 = async ({
+const create$2 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -802,23 +805,42 @@ const create$1 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$1
+  create: create$2
 };
 
-const states = Object.create(null);
-const get$1 = uid => {
-  return states[uid];
-};
-const remove = uid => {
-  delete states[uid];
-};
-const set$1 = (uid, oldState, newState) => {
-  states[uid] = {
-    oldState,
-    newState
+const create$1 = () => {
+  const states = Object.create(null);
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    },
+    dispose(uid) {
+      delete states[uid];
+    },
+    getKeys() {
+      return Object.keys(states).map(key => {
+        return Number.parseInt(key);
+      });
+    },
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
+    }
   };
 };
 
+const {
+  get: get$1,
+  set: set$1,
+  dispose: dispose$1} = create$1();
+
 const create = uid => {
   const state = {
     uid,
@@ -830,20 +852,26 @@ const create = uid => {
 };
 
 const RenderFocus = 2;
+const RenderFocusContext = 4;
 const RenderAbout = 3;
 
-const diffType$1 = RenderAbout;
-const isEqual$1 = (oldState, newState) => {
+const diffType$2 = RenderAbout;
+const isEqual$2 = (oldState, newState) => {
   return oldState.productName === newState.productName && JSON.stringify(oldState.lines) === JSON.stringify(newState.lines);
 };
 
-const diffType = RenderFocus;
+const diffType$1 = RenderFocus;
+const isEqual$1 = (oldState, newState) => {
+  return oldState.focusId === newState.focusId;
+};
+
+const diffType = RenderFocusContext;
 const isEqual = (oldState, newState) => {
   return oldState.focusId === newState.focusId;
 };
 
-const modules = [isEqual$1, isEqual];
-const numbers = [diffType$1, diffType];
+const modules = [isEqual$2, isEqual$1, isEqual];
+const numbers = [diffType$2, diffType$1, diffType];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -866,7 +894,7 @@ const diff2 = uid => {
 };
 
 const dispose = uid => {
-  remove(uid);
+  dispose$1(uid);
 };
 
 const None = 0;
@@ -983,14 +1011,25 @@ const handleClickCopy = async state => {
   return state;
 };
 
+const closeWidget = async id => {
+  await invoke('Viewlet.closeWidget', id);
+};
+
 const handleClickOk = async state => {
-  await invoke('Viewlet.closeWidget', 'About');
+  await closeWidget('About');
   return state;
 };
 
 const handleFocusIn = async state => {
+  // TODO remove side effect
   await invoke('Focus.setFocus', FocusAbout);
-  return state;
+  if (state.focusId) {
+    return state;
+  }
+  return {
+    ...state,
+    focusId: Ok$2
+  };
 };
 
 const OneSecondAgo = '1 second ago';
@@ -1413,9 +1452,12 @@ const HandleFocusIn = 'handleFocusIn';
 
 const Button$1 = 1;
 const Div = 4;
-const Text = 12;
 const Br = 55;
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+const Text = 12;
 const text = data => {
   return {
     type: Text,
@@ -1449,14 +1491,6 @@ const True = 'true';
 const Button = 'button';
 const Dialog = 'dialog';
 
-const joinBySpace = (...items) => {
-  return items.join(' ');
-};
-
-const mergeClassNames = (...classNames) => {
-  return joinBySpace(...classNames.filter(Boolean));
-};
-
 const getPrimaryButtonVirtualDom = (message, onClick, name) => {
   return [{
     type: Button$1,
@@ -1483,6 +1517,10 @@ const DialogHeading = 'DialogHeading';
 const Ok = 'Ok';
 const Copy = 'Copy';
 
+const joinBySpace = (...items) => {
+  return items.join(' ');
+};
+
 const Focusable = -1;
 
 const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copyMessage, productName) => {
@@ -1569,12 +1607,18 @@ const renderFocus = (oldState, newState) => {
   return ['Viewlet.focusElementByName', name];
 };
 
+const renderFocusContext = (oldState, newState) => {
+  return ['Viewlet.setFocusContext', FocusAbout];
+};
+
 const getRenderer = diffType => {
   switch (diffType) {
     case RenderAbout:
       return renderDialog;
     case RenderFocus:
       return renderFocus;
+    case RenderFocusContext:
+      return renderFocusContext;
     default:
       throw new Error('unknown renderer');
   }
@@ -1594,8 +1638,8 @@ const doRender = (uid, diffResult) => {
     oldState,
     newState
   } = get$1(uid);
-  const commands = applyRender(oldState, newState, diffResult);
   set$1(uid, newState, newState);
+  const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
 
@@ -1690,18 +1734,33 @@ const showAbout = async platform => {
   await fn();
 };
 
+const wrapCommand = fn => {
+  const wrapped = async (uid, ...args) => {
+    const {
+      newState
+    } = get$1(uid);
+    const newerState = await fn(newState, ...args);
+    if (newState === newerState) {
+      return;
+    }
+    const latest = get$1(uid);
+    set$1(uid, latest.oldState, newerState);
+  };
+  return wrapped;
+};
+
 const commandMap = {
   'About.create': create,
   'About.diff2': diff2,
   'About.dispose': dispose,
-  'About.focusNext': focusNext,
-  'About.focusPrevious': focusPrevious,
+  'About.focusNext': wrapCommand(focusNext),
+  'About.focusPrevious': wrapCommand(focusPrevious),
   'About.getCommandIds': getCommandIds,
   'About.getKeyBindings': getKeyBindings,
-  'About.handleClickClose': handleClickClose,
-  'About.handleClickCopy': handleClickCopy,
-  'About.handleClickOk': handleClickOk,
-  'About.handleFocusIn': handleFocusIn,
+  'About.handleClickClose': wrapCommand(handleClickClose),
+  'About.handleClickCopy': wrapCommand(handleClickCopy),
+  'About.handleClickOk': wrapCommand(handleClickOk),
+  'About.handleFocusIn': wrapCommand(handleFocusIn),
   'About.loadContent2': loadContent2,
   'About.render2': doRender,
   'About.renderEventListeners': renderEventListeners,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/about-view",
-  "version": "5.0.0",
+  "version": "5.2.0",
   "description": "About View Worker",
   "keywords": [
     "about-view"