@lvce-editor/about-view 2.2.0 → 2.4.0

package/dist/aboutWorkerMain.js

@@ -800,15 +800,15 @@ const WebWorkerRpcClient = {
 };
 
 const None = 0;
-const Ok = 1;
-const Copy = 2;
+const Ok$1 = 1;
+const Copy$1 = 2;
 
 const getNextFocus = focusId => {
   switch (focusId) {
-    case Ok:
-      return Copy;
-    case Copy:
-      return Ok;
+    case Ok$1:
+      return Copy$1;
+    case Copy$1:
+      return Ok$1;
     default:
       return None;
   }
@@ -826,10 +826,10 @@ const focusNext = state => {
 
 const getPreviousFocus = focusId => {
   switch (focusId) {
-    case Ok:
-      return Copy;
-    case Copy:
-      return Ok;
+    case Ok$1:
+      return Copy$1;
+    case Copy$1:
+      return Ok$1;
     default:
       return None;
   }
@@ -846,13 +846,12 @@ const focusPrevious = state => {
 };
 
 const emptyObject = {};
-const RE_PLACEHOLDER = /{(PH\d+)}/g;
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
   if (placeholders === emptyObject) {
     return key;
   }
   const replacer = (match, rest) => {
-    // @ts-ignore
     return placeholders[rest];
   };
   return key.replaceAll(RE_PLACEHOLDER, replacer);
@@ -1260,26 +1259,31 @@ const mergeClassNames = (...classNames) => {
   return joinBySpace(...classNames.filter(Boolean));
 };
 
-const getPrimaryButtonVirtualDom = (message, onClick) => {
+const getPrimaryButtonVirtualDom = (message, onClick, name) => {
   return [{
     type: Button$1,
     className: mergeClassNames(Button$2, ButtonPrimary),
     onClick,
-    childCount: 1
+    childCount: 1,
+    name
   }, text(message)];
 };
-const getSecondaryButtonVirtualDom = (message, onClick) => {
+const getSecondaryButtonVirtualDom = (message, onClick, name) => {
   return [{
     type: Button$1,
     className: mergeClassNames(Button$2, ButtonSecondary),
     onClick,
-    childCount: 1
+    childCount: 1,
+    name
   }, text(message)];
 };
 
 const DialogIcon = 'DialogIcon';
 const DialogHeading = 'DialogHeading';
 
+const Ok = 'Ok';
+const Copy = 'Copy';
+
 const Focusable = -1;
 
 const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copyMessage, productName) => {
@@ -1330,7 +1334,7 @@ const getDialogVirtualDom = (content, closeMessage, infoMessage, okMessage, copy
     type: Div,
     className: DialogButtonsRow,
     childCount: 2
-  }, ...getSecondaryButtonVirtualDom(okMessage, HandleClickOk), ...getPrimaryButtonVirtualDom(copyMessage, HandleClickCopy)];
+  }, ...getSecondaryButtonVirtualDom(okMessage, HandleClickOk, Ok), ...getPrimaryButtonVirtualDom(copyMessage, HandleClickCopy, Copy)];
   return dom;
 };
 
@@ -1344,13 +1348,36 @@ const getAboutVirtualDom = (productName, lines, closeMessage, okMessage, copyMes
   }, ...getDialogVirtualDom(content, closeMessage, infoMessage, okMessage, copyMessage, productName)];
 };
 
+const Tab = 2;
+const Escape = 8;
+
+const Shift = 1 << 10 >>> 0;
+
+const FocusAbout = 4;
+
+const getKeyBindings = () => {
+  return [{
+    key: Escape,
+    command: 'About.handleClickClose',
+    when: FocusAbout
+  }, {
+    key: Tab,
+    command: 'About.focusNext',
+    when: FocusAbout
+  }, {
+    key: Tab | Shift,
+    command: 'About.focusPrevious',
+    when: FocusAbout
+  }];
+};
+
 const loadContent = state => {
   const lines = getDetailStringWeb();
   return {
     ...state,
     productName: productNameLong,
     lines,
-    focusId: Ok
+    focusId: Ok$1
   };
 };
 
@@ -1383,10 +1410,10 @@ const closeDialog = () => {
 
 const getFocusSelector = focusId => {
   switch (focusId) {
-    case Copy:
-      return '.ButtonPrimary';
-    case Ok:
-      return '.ButtonSecondary';
+    case Copy$1:
+      return Copy;
+    case Ok$1:
+      return Ok;
     default:
       return '';
   }
@@ -1410,8 +1437,8 @@ const renderFocus = {
     return oldState.focusId === newState.focusId;
   },
   apply(oldState, newState) {
-    const selector = getFocusSelector(newState.focusId);
-    return ['setFocused', selector];
+    const name = getFocusSelector(newState.focusId);
+    return ['Viewlet.focusElementByName', name];
   }
 };
 const render = [renderDialog, renderFocus];
@@ -1450,6 +1477,7 @@ const commandMap = {
   'About.focusPrevious': focusPrevious,
   'About.getDetailString': getDetailString,
   'About.getDetailStringWeb': getDetailStringWeb,
+  'About.getKeyBindings': getKeyBindings,
   'About.getVirtualDom': getAboutVirtualDom,
   'About.loadContent': loadContent,
   'About.render': doRender,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/about-view",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "description": "",
   "main": "dist/aboutWorkerMain.js",
   "type": "module",