@lvce-editor/editor-worker 3.8.0 → 3.10.0

package/dist/editorWorkerMain.js

@@ -134,7 +134,6 @@ const EditorRow = 'EditorRow';
 const EditorSelection = 'EditorSelection';
 const FileIcon = 'FileIcon';
 const HoverDisplayString = 'HoverDisplayString';
-const SearchFieldContainer = 'SearchFieldContainer';
 const HoverDocumentation = 'HoverDocumentation';
 const SearchFieldButtons = 'SearchFieldButtons';
 const HoverEditorRow = 'HoverEditorRow';
@@ -3420,9 +3419,6 @@ const noTypeDefinitionFound = () => {
 const noResults$1 = () => {
   return i18nString(UiStrings$1.NoResults);
 };
-const replace = () => {
-  return i18nString(UiStrings$1.Replace);
-};
 
 // @ts-ignore
 const goTo = async ({
@@ -5193,7 +5189,8 @@ const loadContent$1 = editorId => {
     value,
     matches,
     matchIndex: 0,
-    matchCount
+    matchCount,
+    editorUid: editor.uid
   };
 };
 const refresh = (state, value = state.value) => {
@@ -5230,9 +5227,14 @@ const handleBlur = async state => {
   return state;
 };
 const toggleReplace = state => {
+  const newExpanded = !state.replaceExpanded;
+  const collapsedHeight = 30;
+  const expandedHeight = 60;
+  const newHeight = newExpanded ? expandedHeight : collapsedHeight;
   return {
     ...state,
-    replaceExpanded: !state.replaceExpanded
+    replaceExpanded: !state.replaceExpanded,
+    height: newHeight
   };
 };
 
@@ -5320,7 +5322,8 @@ const openFind2 = async editor => {
       x,
       y,
       width,
-      height
+      height,
+      editorUid: editor.uid || editor.id
     };
     return latestState;
   };
@@ -8621,7 +8624,11 @@ const widgetCommands = {
   'FindWidget.focusLast': Find,
   'FindWidget.toggleReplace': Find,
   'FindWidget.handleFocus': Find,
-  'FindWidget.handleBlur': Find
+  'FindWidget.handleBlur': Find,
+  'FindWidget.handleToggleReplaceFocus': Find,
+  'FindWidget.handleInput': Find,
+  'FindWidget.handleReplaceInput': Find,
+  'FindWidget.handleReplaceFocus': Find
 };
 
 // TODO wrap commands globally, not per editor
@@ -9842,7 +9849,9 @@ const UiStrings = {
   Close: 'Close',
   PreviousMatch: 'Previous Match',
   NextMatch: 'Next Match',
-  Find: 'Find'
+  Find: 'Find',
+  Replace: 'Replace',
+  ReplaceAll: 'Replace All'
 };
 const noResults = () => {
   return i18nString(UiStrings.NoResults);
@@ -9862,6 +9871,15 @@ const nextMatch = () => {
 const close = () => {
   return i18nString(UiStrings.Close);
 };
+const find = () => {
+  return i18nString(UiStrings.Find);
+};
+const replace = () => {
+  return i18nString(UiStrings.Replace);
+};
+const replaceAll = () => {
+  return i18nString(UiStrings.ReplaceAll);
+};
 
 const getIconVirtualDom = (icon, type = Div) => {
   return {
@@ -9872,6 +9890,27 @@ const getIconVirtualDom = (icon, type = Div) => {
   };
 };
 
+const getIconButtonVirtualDom = iconButton => {
+  const {
+    label,
+    icon,
+    disabled
+  } = iconButton;
+  let className = IconButton;
+  if (disabled) {
+    className += ' ' + IconButtonDisabled;
+  }
+  return [{
+    type: Button,
+    className,
+    title: label,
+    ariaLabel: label,
+    childCount: 1,
+    disabled: disabled ? true : undefined,
+    onClick: iconButton.onClick
+  }, getIconVirtualDom(icon)];
+};
+
 const getSearchFieldButtonVirtualDom = button => {
   const {
     icon,
@@ -9916,36 +9955,11 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
     childCount: insideButtons.length
   }, ...insideButtons.flatMap(getSearchFieldButtonVirtualDom)];
   if (outsideButtons.length > 0) {
-    dom.unshift({
-      type: Div,
-      className: SearchFieldContainer,
-      role: None,
-      childCount: 1 + outsideButtons.length
-    });
-    dom.push(...outsideButtons.flatMap(getSearchFieldButtonVirtualDom));
+    throw new Error('outsideButtons are deprecated');
   }
   return dom;
 };
 
-const getIconButtonVirtualDom = iconButton => {
-  const {
-    label,
-    icon,
-    disabled
-  } = iconButton;
-  let className = IconButton;
-  if (disabled) {
-    className += ' ' + IconButtonDisabled;
-  }
-  return [{
-    type: Button,
-    className,
-    title: label,
-    ariaLabel: label,
-    childCount: 1,
-    disabled: disabled ? true : undefined
-  }, getIconVirtualDom(icon)];
-};
 const getFindWidgetFindVirtualDom = (matchCountText, buttons) => {
   const dom = [];
   dom.push({
@@ -9953,7 +9967,7 @@ const getFindWidgetFindVirtualDom = (matchCountText, buttons) => {
     className: FindWidgetFind,
     childCount: 5
   });
-  dom.push(...getSearchFieldVirtualDom('search-value', 'Find', 'handleInput', [], [], 'handleFocus'));
+  dom.push(...getSearchFieldVirtualDom('search-value', find(), 'handleInput', [], [], 'handleFocus'));
   dom.push({
     type: Div,
     className: FindWidgetMatchCount,
@@ -9962,14 +9976,14 @@ const getFindWidgetFindVirtualDom = (matchCountText, buttons) => {
   return dom;
 };
 
-const getFindWidgetReplaceVirtualDom = replaceExpanded => {
+const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons) => {
   const dom = [];
   if (replaceExpanded) {
     dom.push({
       type: Div,
       className: FindWidgetReplace,
-      childCount: 1
-    }, text(replace()));
+      childCount: 1 + replaceButtons.length
+    }, ...getSearchFieldVirtualDom('replace-value', replace(), 'handleReplaceInput', [], [], 'handleReplaceFocus'), ...replaceButtons.flatMap(getIconButtonVirtualDom));
   }
   return dom;
 };
@@ -9991,7 +10005,7 @@ const getSearchToggleButtonVirtualDom = (replaceExpanded, onClick = '') => {
   }];
 };
 
-const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, buttons, matchCase, matchWholeWord, useRegularExpression) => {
+const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, findButtons, replaceButtons, matchCase, matchWholeWord, useRegularExpression) => {
   const dom = [];
   dom.push({
     type: Div,
@@ -9999,15 +10013,15 @@ const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, buttons, match
     childCount: 2,
     role: Group
   });
-  dom.push(...getSearchToggleButtonVirtualDom(replaceExpanded, 'handleClick'));
+  dom.push(...getSearchToggleButtonVirtualDom(replaceExpanded, 'handleClickToggleReplace'));
   dom.push({
     type: Div,
     className: FindWidgetRight,
     childCount: replaceExpanded ? 2 : 1
   });
-  dom.push(...getFindWidgetFindVirtualDom(matchCountText, buttons));
+  dom.push(...getFindWidgetFindVirtualDom(matchCountText, findButtons));
   if (replaceExpanded) {
-    dom.push(...getFindWidgetReplaceVirtualDom(replaceExpanded));
+    dom.push(...getFindWidgetReplaceVirtualDom(replaceExpanded, replaceButtons));
   }
   return dom;
 };
@@ -10022,6 +10036,8 @@ const getMatchCountText = (matchIndex, matchCount) => {
 const ArrowDown = 'ArrowDown';
 const ArrowUp = 'ArrowUp';
 const Close = 'Close';
+const Replace = 'Replace';
+const ReplaceAll = 'ReplaceAll';
 
 const renderValue = {
   isEqual(oldState, newState) {
@@ -10038,20 +10054,34 @@ const renderDetails = {
   apply(oldState, newState) {
     const matchCountText = getMatchCountText(newState.matchIndex, newState.matchCount);
     const buttonsEnabled = newState.matchCount > 0;
-    const buttons = [{
+    const findButtons = [{
       label: previousMatch(),
       icon: ArrowUp,
-      disabled: !buttonsEnabled
+      disabled: !buttonsEnabled,
+      onClick: 'handleClickPreviousMatch'
     }, {
       label: nextMatch(),
       icon: ArrowDown,
-      disabled: !buttonsEnabled
+      disabled: !buttonsEnabled,
+      onClick: 'handleClickNextMatch'
     }, {
       label: close(),
       icon: Close,
-      disabled: false
+      disabled: false,
+      onClick: 'handleClickClose'
+    }];
+    const replaceButtons = [{
+      label: replace(),
+      icon: Replace,
+      disabled: !buttonsEnabled,
+      onClick: 'handleClickReplace'
+    }, {
+      label: replaceAll(),
+      icon: ReplaceAll,
+      disabled: !buttonsEnabled,
+      onClick: 'handleClickReplaceAll'
     }];
-    const dom = getFindWidgetVirtualDom(matchCountText, newState.replaceExpanded, buttons);
+    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.8.0",
+  "version": "3.10.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",