@lvce-editor/editor-worker 3.12.0 → 3.14.0

package/dist/editorWorkerMain.js

@@ -1,3 +1,23 @@
+const commands = Object.create(null);
+const registerCommand = (key, fn) => {
+  commands[key] = fn;
+};
+const register$1 = commandMap => {
+  for (const [key, value] of Object.entries(commandMap)) {
+    registerCommand(key, value);
+  }
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute$1 = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new Error(`command not found ${command}`);
+  }
+  return fn(...args);
+};
+
 let AssertionError$1 = class AssertionError extends Error {
   constructor(message) {
     super(message);
@@ -121,7 +141,7 @@ const IconButtonDisabled = 'IconButtonDisabled';
 const IconButton = 'IconButton';
 const CompletionDetailContent = 'CompletionDetailContent';
 const Diagnostic = 'Diagnostic';
-const FindWidgetReplace$1 = 'FindWidgetReplace';
+const FindWidgetReplace = 'FindWidgetReplace';
 const FindWidgetFind = 'FindWidgetFind';
 const FindWidgetMatchCount = 'FindWidgetMatchCount';
 const FindWidgetRight = 'FindWidgetRight';
@@ -611,15 +631,15 @@ const createMeasureContext = () => {
   return ctx;
 };
 
-const state$b = {
+const state$a = {
   ctx: undefined
 };
 const getOrCreate = createCtx => {
-  if (state$b.ctx) {
-    return state$b.ctx;
+  if (state$a.ctx) {
+    return state$a.ctx;
   }
-  state$b.ctx = createCtx();
-  return state$b.ctx;
+  state$a.ctx = createCtx();
+  return state$a.ctx;
 };
 
 const getContext = () => {
@@ -1200,11 +1220,11 @@ const get$6 = id => {
 const remove$4 = id => {
   delete state$1$1.callbacks[id];
 };
-const state$a = {
+const state$9 = {
   id: 0
 };
 const create$3$1 = () => {
-  return ++state$a.id;
+  return ++state$9.id;
 };
 const warn$1 = (...args) => {
   console.warn(...args);
@@ -1531,38 +1551,6 @@ const invokeAndTransfer$2 = async (ipc, method, ...params) => {
   return result;
 };
 
-const state$9 = {
-  commands: Object.create(null)
-};
-
-// @ts-ignore
-const registerCommand = (key, fn) => {
-  state$9.commands[key] = fn;
-};
-
-// @ts-ignore
-const registerCommands = commandMap => {
-  for (const [key, value] of Object.entries(commandMap)) {
-    registerCommand(key, value);
-  }
-};
-
-// @ts-ignore
-const getCommand = key => {
-  return state$9.commands[key];
-};
-
-const processName = 'editor-worker';
-
-// @ts-ignore
-const execute$1 = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new Error(`[${processName}] command not found ${command}`);
-  }
-  return fn(...args);
-};
-
 const requiresSocket = () => {
   return false;
 };
@@ -2442,7 +2430,11 @@ const setAdditionalFocus = async focusKey => {
   await invoke$3('Focus.setAdditionalFocus', focusKey);
 };
 
-const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGenerator) => {
+const setFocus = async focusKey => {
+  await invoke$3('Focus.setFocus', focusKey);
+};
+
+const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGenerator, fullFocus) => {
   const {
     widgets
   } = editor;
@@ -2457,7 +2449,11 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
   };
   const newWidgets = [...widgets, latestWidget];
   // TODO avoid side effect, apply focus shift during render
-  await setAdditionalFocus(focusKey);
+  if (fullFocus) {
+    await setFocus(focusKey);
+  } else {
+    await setAdditionalFocus(focusKey);
+  }
   const newEditor = {
     ...editor,
     widgets: newWidgets
@@ -2504,10 +2500,13 @@ const FindWidget = 16;
 const EditorCompletion = 9;
 const CompletionDetail = 999;
 const Empty = 0;
-const FindWidgetToggleReplace = 42;
-const FindWidgetReplace = 43;
-const FindWidgetReplaceAll = 46;
-const FindWidgetClose = 47;
+const FocusFindWidgetToggleReplace = 42;
+const FocusFindWidgetReplace = 43;
+const FocusFindWidgetReplaceButton = 46;
+const FocusFindWidgetReplaceAllButton = 47;
+const FocusFindWidgetCloseButton = 48;
+const FocusFindWidgetNextMatchButton = 49;
+const FocusFindWidgetPreviousMatchButton = 50;
 
 const newStateGenerator = state => {
   return loadContent$3(state);
@@ -5181,8 +5180,16 @@ const getMatchCount = matches => {
   return matches.length / 2;
 };
 
-const setFocus = async focusKey => {
-  await invoke$3('Focus.setFocus', focusKey);
+const setFindWidgetFocus = async (state, focusKey) => {
+  if (state.focus === focusKey) {
+    return state;
+  }
+  await setFocus(focusKey);
+  return {
+    ...state,
+    focus: focusKey,
+    focusSource: Script
+  };
 };
 
 const getPosition = editor => {
@@ -5328,64 +5335,64 @@ const close$1 = async state => {
   };
 };
 const handleToggleReplaceFocus = async state => {
-  if (state.focus === FindWidgetToggleReplace) {
+  if (state.focus === FocusFindWidgetToggleReplace) {
     return state;
   }
-  await setFocus(FindWidgetToggleReplace);
+  await setFocus(FocusFindWidgetToggleReplace);
   return {
     ...state,
-    focus: FindWidgetToggleReplace
+    focus: FocusFindWidgetToggleReplace
   };
 };
 const handleReplaceFocus = async state => {
-  if (state.focus === FindWidgetReplace) {
+  if (state.focus === FocusFindWidgetReplace) {
     return state;
   }
-  await setFocus(FindWidgetReplace);
+  await setFocus(FocusFindWidgetReplace);
   return {
     ...state,
-    focus: FindWidgetReplace,
+    focus: FocusFindWidgetReplace,
     focusSource: User
   };
 };
 const focusReplace = state => {
-  // TODO
-  return {
-    ...state,
-    focus: FindWidgetReplace,
-    focusSource: Script
-  };
+  return setFindWidgetFocus(state, FocusFindWidgetReplace);
 };
 const focusFind = state => {
-  // TODO
-  return {
-    ...state,
-    focus: FindWidget,
-    focusSource: Script
-  };
+  return setFindWidgetFocus(state, FindWidget);
 };
 const handleReplaceInput = state => {
   // TODO
   return state;
 };
 const focusToggleReplace = async state => {
-  await setFocus(FindWidgetToggleReplace);
-  return {
-    ...state,
-    focus: FindWidgetToggleReplace,
-    focusSource: Script
-  };
+  return setFindWidgetFocus(state, FocusFindWidgetToggleReplace);
 };
 const handleReplaceAllFocus = async state => {
-  if (state.focus === FindWidgetReplaceAll) {
+  if (state.focus === FocusFindWidgetReplaceAllButton) {
     return state;
   }
-  await setFocus(FindWidgetReplaceAll);
+  await setFocus(FocusFindWidgetReplaceAllButton);
   return {
     ...state,
-    focus: FindWidgetReplaceAll
+    focus: FocusFindWidgetReplaceAllButton
   };
 };
+const focusReplaceButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetReplaceButton);
+};
+const focusReplaceAllButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetReplaceAllButton);
+};
+const focusPreviousMatchButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetPreviousMatchButton);
+};
+const focusNextMatchButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetNextMatchButton);
+};
+const focusCloseButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetCloseButton);
+};
 
 const openFind2 = async editor => {
   const newStateGenerator = async state => {
@@ -5417,7 +5424,8 @@ const openFind2 = async editor => {
     };
     return latestState;
   };
-  return addWidgetToEditor(Find, FindWidget, editor, create$1, newStateGenerator);
+  const fullFocus = true;
+  return addWidgetToEditor(Find, FindWidget, editor, create$1, newStateGenerator, fullFocus);
 };
 
 const openFind = async state => {
@@ -8721,7 +8729,12 @@ const widgetCommands = {
   'FindWidget.handleReplaceFocus': Find,
   'FindWidget.focusFind': Find,
   'FindWidget.focusToggleReplace': Find,
-  'FindWidget.focusReplace': Find
+  'FindWidget.focusReplace': Find,
+  'FindWidget.focusReplaceButton': Find,
+  'FindWidget.focusReplaceAllButton': Find,
+  'FindWidget.focusNextMatchButton': Find,
+  'FindWidget.focusPreviousMatchButton': Find,
+  'FindWidget.focusCloseButton': Find
 };
 
 // TODO wrap commands globally, not per editor
@@ -8896,18 +8909,23 @@ const commandMap = {
   'FindWidget.focusIndex': focusIndex$1,
   'FindWidget.focusLast': focusLast,
   'FindWidget.focusNext': focusNext$1,
+  'FindWidget.focusNextMatchButton': focusNextMatchButton,
   'FindWidget.focusPrevious': focusPrevious$1,
+  'FindWidget.focusPreviousMatchButton': focusPreviousMatchButton,
   'FindWidget.focusReplace': focusReplace,
+  'FindWidget.focusReplaceAllButton': focusReplaceAllButton,
+  'FindWidget.focusReplaceButton': focusReplaceButton,
   'FindWidget.focusToggleReplace': focusToggleReplace,
   'FindWidget.handleBlur': handleBlur,
   'FindWidget.handleFocus': handleFocus,
   'FindWidget.handleInput': handleInput,
+  'FindWidget.handleReplaceAllFocus': handleReplaceAllFocus,
   'FindWidget.handleReplaceFocus': handleReplaceFocus,
   'FindWidget.handleReplaceInput': handleReplaceInput,
+  'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
   'FindWidget.loadContent': loadContent$1,
   'FindWidget.toggleReplace': toggleReplace,
-  'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
-  'FindWidget.handleReplaceAllFocus': handleReplaceAllFocus,
+  'FindWidget.focusCloseButton': focusCloseButton,
   'Font.ensure': ensure,
   'Hover.getHoverInfo': getEditorHoverInfo,
   'Hover.handleSashPointerDown': handleSashPointerDown,
@@ -9751,7 +9769,7 @@ const listen$1 = async ({
 };
 
 const listen = async () => {
-  registerCommands(commandMap);
+  register$1(commandMap);
   register(Completion, EditorCompletionWidget);
   const ipc = await listen$1({
     method: Auto()
@@ -9981,19 +9999,79 @@ const replaceAll = () => {
   return i18nString(UiStrings.ReplaceAll);
 };
 
+const ArrowDown = 'ArrowDown';
+const ArrowUp = 'ArrowUp';
+const Close$1 = 'Close';
+const Replace$1 = 'Replace';
+const ReplaceAll$1 = 'ReplaceAll';
+
+const SearchValue = 'search-value';
+const ReplaceValue = 'replace-value';
+const ReplaceAll = 'ReplaceAll';
+const Close = 'Close';
+const ToggleReplace = 'ToggleReplace';
+const FocusNext = 'FocusNext';
+const FocusPrevious = 'FocusPrevious';
+const Replace = 'Replace';
+
+const getFindWidgetButtons = buttonsEnabled => {
+  const findButtons = [{
+    label: previousMatch(),
+    icon: ArrowUp,
+    disabled: !buttonsEnabled,
+    onClick: 'handleClickPreviousMatch',
+    name: FocusPrevious
+  }, {
+    label: nextMatch(),
+    icon: ArrowDown,
+    disabled: !buttonsEnabled,
+    onClick: 'handleClickNextMatch',
+    name: FocusNext
+  }, {
+    label: close(),
+    icon: Close$1,
+    disabled: false,
+    onClick: 'handleClickClose',
+    name: Close
+  }];
+  const replaceButtons = [{
+    label: replace(),
+    icon: Replace$1,
+    disabled: !buttonsEnabled,
+    onClick: 'handleClickReplace',
+    name: Replace
+  }, {
+    label: replaceAll(),
+    icon: ReplaceAll$1,
+    disabled: !buttonsEnabled,
+    onClick: 'handleClickReplaceAll',
+    name: ReplaceAll
+  }];
+  return {
+    findButtons,
+    replaceButtons
+  };
+};
+
 // TODO always focus element by name
 const getFindWidgetFocusSelector = focus => {
   switch (focus) {
     case FindWidget:
-      return `[name="search-value"]`;
-    case FindWidgetReplace:
-      return '[name="replace-value"]';
-    case FindWidgetReplaceAll:
-      return `[name="replaceAll"]`;
-    case FindWidgetClose:
-      return `[name="close"]`;
-    case FindWidgetToggleReplace:
-      return `[name="ToggleReplace"]`;
+      return `[name="${SearchValue}"]`;
+    case FocusFindWidgetReplace:
+      return `[name="${ReplaceValue}"]`;
+    case FocusFindWidgetReplaceAllButton:
+      return `[name="${ReplaceAll}"]`;
+    case FocusFindWidgetCloseButton:
+      return `[name="${Close}"]`;
+    case FocusFindWidgetToggleReplace:
+      return `[name="${ToggleReplace}"]`;
+    case FocusFindWidgetNextMatchButton:
+      return `[name="${FocusNext}"]`;
+    case FocusFindWidgetPreviousMatchButton:
+      return `[name="${FocusPrevious}"]`;
+    case FocusFindWidgetReplaceButton:
+      return `[name="${Replace}"]`;
     default:
       return '';
   }
@@ -10012,7 +10090,9 @@ const getIconButtonVirtualDom = iconButton => {
   const {
     label,
     icon,
-    disabled
+    disabled,
+    name,
+    onClick
   } = iconButton;
   let className = IconButton;
   if (disabled) {
@@ -10025,7 +10105,8 @@ const getIconButtonVirtualDom = iconButton => {
     ariaLabel: label,
     childCount: 1,
     disabled: disabled ? true : undefined,
-    onClick: iconButton.onClick
+    onClick: onClick,
+    name: name
   }, getIconVirtualDom(icon)];
 };
 
@@ -10099,7 +10180,7 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons) => {
   if (replaceExpanded) {
     dom.push({
       type: Div,
-      className: FindWidgetReplace$1,
+      className: FindWidgetReplace,
       childCount: 1 + replaceButtons.length
     }, ...getSearchFieldVirtualDom('replace-value', replace(), 'handleReplaceInput', [], [], 'handleReplaceFocus'), ...replaceButtons.flatMap(getIconButtonVirtualDom));
   }
@@ -10153,12 +10234,6 @@ const getMatchCountText = (matchIndex, matchCount) => {
   return matchOf(matchIndex + 1, matchCount);
 };
 
-const ArrowDown = 'ArrowDown';
-const ArrowUp = 'ArrowUp';
-const Close = 'Close';
-const Replace = 'Replace';
-const ReplaceAll = 'ReplaceAll';
-
 const renderValue = {
   isEqual(oldState, newState) {
     return oldState.value === newState.value;
@@ -10174,33 +10249,10 @@ const renderDetails = {
   apply(oldState, newState) {
     const matchCountText = getMatchCountText(newState.matchIndex, newState.matchCount);
     const buttonsEnabled = newState.matchCount > 0;
-    const findButtons = [{
-      label: previousMatch(),
-      icon: ArrowUp,
-      disabled: !buttonsEnabled,
-      onClick: 'handleClickPreviousMatch'
-    }, {
-      label: nextMatch(),
-      icon: ArrowDown,
-      disabled: !buttonsEnabled,
-      onClick: 'handleClickNextMatch'
-    }, {
-      label: close(),
-      icon: Close,
-      disabled: false,
-      onClick: 'handleClickClose'
-    }];
-    const replaceButtons = [{
-      label: replace(),
-      icon: Replace,
-      disabled: !buttonsEnabled,
-      onClick: 'handleClickReplace'
-    }, {
-      label: replaceAll(),
-      icon: ReplaceAll,
-      disabled: !buttonsEnabled,
-      onClick: 'handleClickReplaceAll'
-    }];
+    const {
+      findButtons,
+      replaceButtons
+    } = getFindWidgetButtons(buttonsEnabled);
     const dom = getFindWidgetVirtualDom(matchCountText, newState.replaceExpanded, findButtons, replaceButtons);
     return ['Viewlet.setDom2', dom];
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "3.12.0",
+  "version": "3.14.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",