@lvce-editor/editor-worker 3.11.0 → 3.13.0

package/dist/editorWorkerMain.js

@@ -2442,7 +2442,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 +2461,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
@@ -2506,6 +2514,11 @@ const CompletionDetail = 999;
 const Empty = 0;
 const FindWidgetToggleReplace = 42;
 const FindWidgetReplace = 43;
+const FindWidgetReplaceButton = 46;
+const FindWidgetReplaceAllButton = 47;
+const FindWidgetCloseButton = 48;
+const FindWidgetFocusNext = 49;
+const FindWidgetFocusPrevious = 50;
 
 const newStateGenerator = state => {
   return loadContent$3(state);
@@ -5097,7 +5110,8 @@ const create$1 = () => {
       width: 0,
       height: 0,
       focused: false,
-      focusSource: Unknown$1
+      focusSource: Unknown$1,
+      focus: 0
     },
     newState: {
       value: '',
@@ -5117,7 +5131,8 @@ const create$1 = () => {
       width: 0,
       height: 0,
       focused: true,
-      focusSource: Unknown$1
+      focusSource: Unknown$1,
+      focus: 0
     }
   };
   return widget;
@@ -5137,6 +5152,9 @@ const getSearchRegex = searchString => {
 };
 
 const findRegexMatches = (lines, regex) => {
+  if (!regex.global) {
+    throw new Error(`regex must be global`);
+  }
   const {
     length
   } = lines;
@@ -5163,12 +5181,27 @@ const findMatchesCaseInsensitive = (lines, searchString) => {
   return findRegexMatches(lines, regex);
 };
 
+const getFindWidgetHeight = replaceExpanded => {
+  const collapsedHeight = 30;
+  const expandedHeight = 60;
+  const newHeight = replaceExpanded ? expandedHeight : collapsedHeight;
+  return newHeight;
+};
+
 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 => {
@@ -5230,28 +5263,22 @@ const handleInput = (state, value) => {
   return refresh(state, value);
 };
 const handleFocus = async state => {
-  if (state.focus === 'find') {
+  if (state.focus === FindWidget) {
     return state;
   }
   await setFocus(FindWidget);
   return {
     ...state,
-    focus: 'find'
+    focus: FindWidget
   };
 };
 const handleBlur = async state => {
   await setFocus(Empty);
   return state;
 };
-const getHeight = replaceExpanded => {
-  const collapsedHeight = 30;
-  const expandedHeight = 60;
-  const newHeight = replaceExpanded ? expandedHeight : collapsedHeight;
-  return newHeight;
-};
 const toggleReplace = state => {
   const newExpanded = !state.replaceExpanded;
-  const newHeight = getHeight(newExpanded);
+  const newHeight = getFindWidgetHeight(newExpanded);
   return {
     ...state,
     replaceExpanded: !state.replaceExpanded,
@@ -5319,45 +5346,57 @@ const close$1 = async state => {
     disposed: true
   };
 };
+const handleToggleReplaceFocus = async state => {
+  if (state.focus === FindWidgetToggleReplace) {
+    return state;
+  }
+  await setFocus(FindWidgetToggleReplace);
+  return {
+    ...state,
+    focus: FindWidgetToggleReplace
+  };
+};
 const handleReplaceFocus = async state => {
-  if (state.focus === 'replaceInput') {
+  if (state.focus === FindWidgetReplace) {
     return state;
   }
   await setFocus(FindWidgetReplace);
   return {
     ...state,
-    focus: 'replaceInput',
+    focus: FindWidgetReplace,
     focusSource: User
   };
 };
 const focusReplace = state => {
-  // TODO
-  return {
-    ...state,
-    focus: 'replace',
-    focusSource: Script
-  };
+  return setFindWidgetFocus(state, FindWidgetReplace);
 };
 const focusFind = state => {
-  // TODO
-  return {
-    ...state,
-    focus: 'find',
-    focusSource: Script
-  };
+  return setFindWidgetFocus(state, FindWidget);
 };
 const handleReplaceInput = state => {
   // TODO
   return state;
 };
 const focusToggleReplace = async state => {
-  await setFocus(FindWidgetToggleReplace);
+  return setFindWidgetFocus(state, FindWidgetToggleReplace);
+};
+const handleReplaceAllFocus = async state => {
+  if (state.focus === FindWidgetReplaceAllButton) {
+    return state;
+  }
+  await setFocus(FindWidgetReplaceAllButton);
   return {
     ...state,
-    focus: 'toggleReplace',
-    focusSource: Script
+    focus: FindWidgetReplaceAllButton
   };
 };
+const focusReplaceButton = async state => {
+  console.log('f replace button');
+  return setFindWidgetFocus(state, FindWidgetReplaceButton);
+};
+const focusReplaceAllButton = async state => {
+  return setFindWidgetFocus(state, FindWidgetReplaceAllButton);
+};
 
 const openFind2 = async editor => {
   const newStateGenerator = async state => {
@@ -5385,11 +5424,12 @@ const openFind2 = async editor => {
       height,
       editorUid: editor.uid || editor.id,
       focusSource: Script,
-      focus: 'find'
+      focus: FindWidget
     };
     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 => {
@@ -8693,7 +8733,9 @@ const widgetCommands = {
   'FindWidget.handleReplaceFocus': Find,
   'FindWidget.focusFind': Find,
   'FindWidget.focusToggleReplace': Find,
-  'FindWidget.focusReplace': Find
+  'FindWidget.focusReplace': Find,
+  'FindWidget.focusReplaceButton': Find,
+  'FindWidget.focusReplaceAllButton': Find
 };
 
 // TODO wrap commands globally, not per editor
@@ -8863,21 +8905,25 @@ const commandMap = {
   'EditorCompletion.selectIndex': selectIndex,
   'EditorCompletion.toggleDetails': toggleDetails,
   'FindWidget.close': close$1,
+  'FindWidget.focusFind': focusFind,
   'FindWidget.focusFirst': focusFirst$1,
   'FindWidget.focusIndex': focusIndex$1,
   'FindWidget.focusLast': focusLast,
   'FindWidget.focusNext': focusNext$1,
   'FindWidget.focusPrevious': focusPrevious$1,
+  'FindWidget.focusReplace': focusReplace,
+  'FindWidget.focusToggleReplace': focusToggleReplace,
   'FindWidget.handleBlur': handleBlur,
   'FindWidget.handleFocus': handleFocus,
   'FindWidget.handleInput': handleInput,
   'FindWidget.handleReplaceFocus': handleReplaceFocus,
+  'FindWidget.handleReplaceInput': handleReplaceInput,
   'FindWidget.loadContent': loadContent$1,
   'FindWidget.toggleReplace': toggleReplace,
-  'FindWidget.focusReplace': focusReplace,
-  'FindWidget.focusFind': focusFind,
-  'FindWidget.handleReplaceInput': handleReplaceInput,
-  'FindWidget.focusToggleReplace': focusToggleReplace,
+  'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
+  'FindWidget.handleReplaceAllFocus': handleReplaceAllFocus,
+  'FindWidget.focusReplaceButton': focusReplaceButton,
+  'FindWidget.focusReplaceAllButton': focusReplaceAllButton,
   'Font.ensure': ensure,
   'Hover.getHoverInfo': getEditorHoverInfo,
   'Hover.handleSashPointerDown': handleSashPointerDown,
@@ -9951,6 +9997,84 @@ 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="${SearchValue}"]`;
+    case FindWidgetReplace:
+      return `[name="${ReplaceValue}"]`;
+    case FindWidgetReplaceAllButton:
+      return `[name="${ReplaceAll}"]`;
+    case FindWidgetCloseButton:
+      return `[name="${Close}"]`;
+    case FindWidgetToggleReplace:
+      return `[name="${ToggleReplace}"]`;
+    case FindWidgetFocusNext:
+      return `[name="${FocusNext}"]`;
+    case FindWidgetFocusPrevious:
+      return `[name="${FocusPrevious}"]`;
+    case FindWidgetReplaceButton:
+      return `[name="${Replace}"]`;
+    default:
+      return '';
+  }
+};
+
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
@@ -9964,7 +10088,9 @@ const getIconButtonVirtualDom = iconButton => {
   const {
     label,
     icon,
-    disabled
+    disabled,
+    name,
+    onClick
   } = iconButton;
   let className = IconButton;
   if (disabled) {
@@ -9977,7 +10103,8 @@ const getIconButtonVirtualDom = iconButton => {
     ariaLabel: label,
     childCount: 1,
     disabled: disabled ? true : undefined,
-    onClick: iconButton.onClick
+    onClick: onClick,
+    name: name
   }, getIconVirtualDom(icon)];
 };
 
@@ -10068,7 +10195,8 @@ const getSearchToggleButtonVirtualDom = (replaceExpanded, onClick = '') => {
     name: 'ToggleReplace',
     childCount: 1,
     'data-command': 'toggleReplace',
-    onClick
+    onClick,
+    onFocus: 'handleToggleReplaceFocus'
   }, {
     type: Div,
     className: `MaskIcon ${replaceExpanded ? 'MaskIconChevronDown' : 'MaskIconChevronRight'}`,
@@ -10104,12 +10232,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;
@@ -10125,33 +10247,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];
   }
@@ -10170,27 +10269,12 @@ const renderBounds = {
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
   }
 };
-
-// TODO always focus element by name
-// TODO use numeric key
-const getKey = focus => {
-  switch (focus) {
-    case 'find':
-      return `[name="search-value"]`;
-    case 'replace':
-      return '[name="replace-value"]';
-    case 'toggleReplace':
-      return `[name="toggleReplace"]`;
-    default:
-      return '';
-  }
-};
 const renderFocus = {
   isEqual(oldState, newState) {
     return oldState.focused === newState.focused && oldState.focus === newState.focus && oldState.focusSource === newState.focusSource;
   },
   apply(oldState, newState) {
-    const key = getKey(newState.focus || '');
+    const key = getFindWidgetFocusSelector(newState.focus);
     return ['focus', key, newState.focusSource];
   }
 };

package/package.json

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