@lvce-editor/find-widget-worker 1.13.0 → 1.14.0

package/dist/findWidgetWorkerMain.js

@@ -977,7 +977,8 @@ const create$1 = (uid, x, y, width, height, parentUid) => {
     editorY: y,
     editorWidth: width,
     editorHeight: height,
-    inputSource: 0
+    inputSource: 0,
+    preserveCase: false
   };
   set$3(uid, state, state);
   return state;
@@ -1010,6 +1011,7 @@ const RenderContent = 13;
 const RenderFocusContext = 14;
 const RenderFocus = 15;
 const RenderValue = 16;
+const RenderReplaceValue = 17;
 
 const Button = 1;
 const Div = 4;
@@ -1124,7 +1126,7 @@ const activateByEvent = async event => {
   // @ts-ignore
   await invoke$1('ActivateByEvent.activateByEvent', event);
 };
-const applyEdit = async (editorUid, changes) => {
+const applyEdit$1 = async (editorUid, changes) => {
   // @ts-ignore
   await invoke$1('Editor.applyEdit2', editorUid, changes);
 };
@@ -1189,7 +1191,7 @@ const registerMockRpc = commandMap => {
 const EditorWorker = {
   __proto__: null,
   activateByEvent,
-  applyEdit,
+  applyEdit: applyEdit$1,
   applyWorkspaceEdit,
   closeWidget,
   dispose,
@@ -1213,7 +1215,9 @@ const EditorWorker = {
 
 const {
   invoke,
-  set} = EditorWorker;
+  set,
+  applyEdit
+} = EditorWorker;
 
 const setSelections = async (editorUid, selections) => {
   // @ts-ignore
@@ -1286,6 +1290,10 @@ const handleBlur = async state => {
   };
 };
 
+const handleClickButton = async (state, name) => {
+  return state;
+};
+
 const close$1 = async state => {
   const {
     editorUid
@@ -1368,6 +1376,17 @@ const handleInput = (state, value, inputSource = User) => {
   return refresh(state, value, inputSource);
 };
 
+const toggleMatchCase = state => {
+  const {
+    matchCase
+  } = state;
+  // TODO update search results
+  return {
+    ...state,
+    matchCase: !matchCase
+  };
+};
+
 const getFindWidgetHeight = replaceExpanded => {
   const collapsedHeight = 30;
   const expandedHeight = 60;
@@ -1388,6 +1407,24 @@ const toggleReplace = state => {
   };
 };
 
+const toggleUseRegularExpression = state => {
+  const {
+    useRegularExpression
+  } = state;
+  return {
+    ...state,
+    useRegularExpression: !useRegularExpression
+  };
+};
+
+const handleReplaceInput = (state, value, inputSource = User) => {
+  return {
+    ...state,
+    replacement: value,
+    inputSource
+  };
+};
+
 const getFindWidgetPosition = (editorX, editorY, editorWidth) => {
   const width = 300;
   const height = 30;
@@ -1492,6 +1529,7 @@ const HandleClickPreviousMatch = 'handleClickPreviousMatch';
 const HandleClickReplace = 'handleClickReplace';
 const HandleClickToggleReplace = 'handleClickToggleReplace';
 const HandleClickReplaceAll = 'handleClickReplaceAll';
+const HandleClickButton = 'handleClickButton';
 const HandleFocus = 'handleFocus';
 const HandleInput = 'handleInput';
 const HandleReplaceFocus = 'handleReplaceFocus';
@@ -1541,27 +1579,33 @@ const close = () => {
 const find = () => {
   return i18nString(Find$1);
 };
-const replace = () => {
+const replace$1 = () => {
   return i18nString(Replace$2);
 };
-const replaceAll = () => {
+const replaceAll$1 = () => {
   return i18nString(ReplaceAll$2);
 };
 
+const MatchCase$1 = 'CaseSensitive';
+const UseRegularExpression$1 = 'Regex';
+const MatchWholeWord$1 = 'WholeWord';
 const ArrowDown = 'ArrowDown';
 const ArrowUp = 'ArrowUp';
 const Close$1 = 'Close';
 const Replace$1 = 'Replace';
 const ReplaceAll$1 = 'ReplaceAll';
 
-const ToggleReplace = 'ToggleReplace';
-const SearchValue = 'search-value';
-const ReplaceValue = 'replace-value';
-const ReplaceAll = 'ReplaceAll';
 const Close = 'Close';
 const FocusNext = 'FocusNext';
 const FocusPrevious = 'FocusPrevious';
+const MatchCase = 'MatchCase';
+const MatchWholeWord = 'MatchWholeWord';
 const Replace = 'Replace';
+const ReplaceAll = 'ReplaceAll';
+const ReplaceValue = 'replace-value';
+const SearchValue = 'search-value';
+const ToggleReplace = 'ToggleReplace';
+const UseRegularExpression = 'UseRegularExpression';
 
 const getFindWidgetButtons = (findButtonsEnabled, replaceButtonsEnabled) => {
   const findButtons = [{
@@ -1584,13 +1628,13 @@ const getFindWidgetButtons = (findButtonsEnabled, replaceButtonsEnabled) => {
     name: Close
   }];
   const replaceButtons = [{
-    label: replace(),
+    label: replace$1(),
     icon: Replace$1,
     disabled: !replaceButtonsEnabled,
     onClick: HandleClickReplace,
     name: Replace
   }, {
-    label: replaceAll(),
+    label: replaceAll$1(),
     icon: ReplaceAll$1,
     disabled: !replaceButtonsEnabled,
     onClick: HandleClickReplaceAll,
@@ -1645,6 +1689,25 @@ const ViewletFind = 'ViewletFind';
 const FindWidget = 'FindWidget';
 const ViewletFindWidget = 'ViewletFindWidget';
 
+const getFindButtons = () => {
+  return [{
+    checked: false,
+    icon: MatchCase$1,
+    title: 'Match Case',
+    name: MatchCase
+  }, {
+    checked: false,
+    icon: MatchWholeWord$1,
+    title: 'Match Whole Word',
+    name: MatchWholeWord
+  }, {
+    checked: false,
+    icon: UseRegularExpression$1,
+    title: 'Use Regular Expression',
+    name: UseRegularExpression
+  }];
+};
+
 const getFindMatchCountClassName = (matchCount, value) => {
   if (value && matchCount === 0) {
     return mergeClassNames(FindWidgetMatchCount, FindWidgetMatchCountEmpty);
@@ -1701,7 +1764,7 @@ const getSearchFieldButtonVirtualDom = button => {
     childCount: 1
   }, {
     type: Div,
-    className: mergeClassNames(MaskIcon, icon),
+    className: mergeClassNames(MaskIcon, `MaskIcon${icon}`),
     childCount: 0
   }];
 };
@@ -1741,7 +1804,7 @@ const getFindWidgetFindVirtualDom = (matchCountText, buttons, matchCount, value)
     className: FindWidgetFind,
     childCount: 5
   });
-  dom.push(...getSearchFieldVirtualDom('search-value', find(), HandleInput, [], [], HandleFocus));
+  dom.push(...getSearchFieldVirtualDom(SearchValue, find(), HandleInput, getFindButtons(), [], HandleFocus));
   const findClassName = getFindMatchCountClassName(matchCount, value);
   dom.push({
     type: Div,
@@ -1758,7 +1821,7 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons) => {
       type: Div,
       className: FindWidgetReplace,
       childCount: 1 + replaceButtons.length
-    }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, [], [], HandleReplaceFocus), ...replaceButtons.flatMap(getIconButtonVirtualDom));
+    }, ...getSearchFieldVirtualDom(ReplaceValue, replace$1(), HandleReplaceInput, [], [], HandleReplaceFocus), ...replaceButtons.flatMap(getIconButtonVirtualDom));
   }
   return dom;
 };
@@ -1867,6 +1930,9 @@ const getEventListeners = (uid, widgetId) => {
   }, {
     name: HandleClickReplaceAll,
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickReplaceAll', 0, widgetId]
+  }, {
+    name: HandleClickButton,
+    params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleClickButton', 0, widgetId, `event.target.name`]
   }];
 };
 
@@ -1893,6 +1959,14 @@ const renderFocusContext = (oldState, newState) => {
   return [/* method */SetFocusContext, FocusFindWidget];
 };
 
+const renderReplaceValue = (oldState, newState) => {
+  const {
+    uid,
+    replacement
+  } = newState;
+  return [SetValueByName, uid, Replace, replacement];
+};
+
 const renderUid = (oldState, newState) => {
   const {
     uid,
@@ -1925,6 +1999,8 @@ const getRenderer = diffType => {
       return renderFocus;
     case RenderValue:
       return renderValue;
+    case RenderReplaceValue:
+      return renderReplaceValue;
     default:
       throw new Error('unknown renderer');
   }
@@ -1949,6 +2025,63 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
+const applyEdits = async (editorId, edits) => {
+  await applyEdit(editorId, edits);
+};
+
+const getEdits = (matches, value, replacement, startIndex, replaceAll) => {
+  if (value.length === 0 || matches.length === 0) {
+    return [];
+  }
+  const edits = [];
+  const totalMatches = Math.floor(matches.length / 2);
+  const fromIndex = replaceAll ? 0 : Math.max(0, startIndex);
+  const toIndex = replaceAll ? totalMatches : Math.min(totalMatches, fromIndex + 1);
+  for (let i = fromIndex; i < toIndex; i++) {
+    const rowIndex = matches[i * 2];
+    const startColumnIndex = matches[i * 2 + 1];
+    const endColumnIndex = startColumnIndex + value.length;
+    edits.push({
+      rowIndex,
+      startColumnIndex,
+      endColumnIndex,
+      newText: replacement
+    });
+  }
+  return edits;
+};
+
+const replace = async state => {
+  const {
+    matches,
+    value,
+    replacement,
+    matchIndex,
+    editorUid
+  } = state;
+  const edits = getEdits(matches, value, replacement, matchIndex, false);
+  await applyEdits(editorUid, edits);
+  // TODO ask editor worker to apply edit
+  // TODO ask editor worker for new lines?
+  return {
+    ...state
+  };
+};
+
+const replaceAll = state => {
+  const {
+    matches,
+    value,
+    replacement,
+    editorUid
+  } = state;
+  const edits = getEdits(matches, value, replacement, 0, true);
+  void applyEdits(editorUid, edits);
+  return {
+    ...state
+  };
+};
+
 const commandMap = {
   'FindWidget.create': create$1,
   'FindWidget.diff2': diff2,
@@ -1957,6 +2090,7 @@ const commandMap = {
   'FindWidget.focusFirst': wrapCommand(focusFirst),
   'FindWidget.focusIndex': wrapCommand(focusIndex),
   'FindWidget.focusLast': wrapCommand(focusLast),
+  'FindWidget.toggleMatchCase': wrapCommand(toggleMatchCase),
   'FindWidget.focusNext': wrapCommand(focusNext),
   'FindWidget.focusPrevious': wrapCommand(focusPrevious),
   'FindWidget.focusReplace': wrapCommand(focusReplace),
@@ -1965,11 +2099,16 @@ const commandMap = {
   'FindWidget.handleBlur': wrapCommand(handleBlur),
   'FindWidget.handleClickClose': wrapCommand(handleClickClose),
   'FindWidget.handleInput': wrapCommand(handleInput),
+  'FindWidget.handleReplaceInput': wrapCommand(handleReplaceInput),
   'FindWidget.loadContent': wrapCommand(loadContent),
   'FindWidget.preventDefaultBrowserFind': wrapCommand(preventDefaultBrowserFind),
   'FindWidget.render2': render2,
   'FindWidget.terminate': terminate,
-  'FindWidget.toggleReplace': wrapCommand(toggleReplace)
+  'FindWidget.toggleReplace': wrapCommand(toggleReplace),
+  'FindWidget.replace': wrapCommand(replace),
+  'FindWidget.replaceAll': wrapCommand(replaceAll),
+  'FindWidget.handleClickButton': wrapCommand(handleClickButton),
+  'FindWidget.toggleUseRegularExpression': wrapCommand(toggleUseRegularExpression)
 };
 
 const listen = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/find-widget-worker",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",