@lvce-editor/find-widget-worker 1.23.0 → 2.1.0

package/dist/findWidgetWorkerMain.js

@@ -988,8 +988,10 @@ const create$1 = (uid, x, y, width, height, parentUid) => {
     minWidth: 400,
     history: [],
     inputErrorMessage: '',
-    inputHeight: 24,
-    inputLineHeight: 24
+    inputHeight: 15,
+    inputLineHeight: 15,
+    inputPaddingTop: 2,
+    inputPaddingBottom: 2
   };
   set$3(uid, state, state);
   return state;
@@ -1046,9 +1048,18 @@ const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const TargetName = 'event.target.name';
 
+const Tab = 2;
+const Enter = 3;
+const KeyF = 34;
+const F4 = 60;
+
 const User = 1;
 const Script = 2;
 
+const CtrlCmd = 1 << 11 >>> 0;
+const Shift = 1 << 10 >>> 0;
+const Alt = 1 << 9 >>> 0;
+
 const EditorWorker$1 = 99;
 
 const FocusSelector = 'Viewlet.focusSelector';
@@ -1056,7 +1067,13 @@ const SetCss = 'Viewlet.setCss';
 const SetFocusContext = 'Viewlet.setFocusContext';
 const SetValueByName = 'Viewlet.setValueByName';
 
+const FocusFindWidget$1 = 16;
 const FocusFindWidgetCloseButton$1 = 48;
+const FocusFindWidgetNextMatchButton = 49;
+const FocusFindWidgetPreviousMatchButton = 50;
+const FocusFindWidgetReplace$1 = 43;
+const FocusFindWidgetReplaceAllButton$1 = 47;
+const FocusFindWidgetReplaceButton = 46;
 const FocusIgnoreFiles = 1012;
 const FocusSearchExcludeInput = 1008;
 const FocusSearchIncludeInput = 1007;
@@ -1419,7 +1436,9 @@ const refresh$1 = (state, value, inputSource) => {
     matchCase,
     useRegularExpression,
     matchWholeWord,
-    inputLineHeight
+    inputLineHeight,
+    inputPaddingTop,
+    inputPaddingBottom
   } = state;
   const options = {
     matchCase,
@@ -1430,12 +1449,15 @@ const refresh$1 = (state, value, inputSource) => {
     matches,
     error
   } = findMatches(lines, value, options);
-  const inputHeight = measureTextHeight(value, inputLineHeight);
+  const textHeight = measureTextHeight(value, inputLineHeight);
+  const inputHeight = textHeight + inputPaddingBottom + inputPaddingTop;
+  const height = inputHeight + 5;
   if (error) {
     return {
       ...state,
       inputErrorMessage: error,
-      inputHeight
+      inputHeight,
+      height
     };
   }
   const matchCount = getMatchCount(matches);
@@ -1447,7 +1469,8 @@ const refresh$1 = (state, value, inputSource) => {
     matchCount,
     matches,
     matchIndex: 0,
-    value
+    value,
+    height
   };
 };
 
@@ -1517,7 +1540,7 @@ const applyEdits = async (editorId, edits) => {
   await invoke('Editor.applyDocumentEdits', editorId, edits);
 };
 
-const getEdits = (matches, value, replacement, startIndex, replaceAll) => {
+const getEdits = (matches, value, replacement, startIndex, replaceAll, lines) => {
   if (value.length === 0 || matches.length === 0) {
     return [];
   }
@@ -1529,17 +1552,22 @@ const getEdits = (matches, value, replacement, startIndex, replaceAll) => {
     const rowIndex = matches[i * 2];
     const startColumnIndex = matches[i * 2 + 1];
     const endColumnIndex = startColumnIndex + value.length;
+
+    // Convert row/column positions to character offsets
+    let startOffset = 0;
+    for (let row = 0; row < rowIndex; row++) {
+      startOffset += lines[row].length + 1; // +1 for newline character
+    }
+    startOffset += startColumnIndex;
+    let endOffset = 0;
+    for (let row = 0; row < rowIndex; row++) {
+      endOffset += lines[row].length + 1; // +1 for newline character
+    }
+    endOffset += endColumnIndex;
     edits.push({
-      start: {
-        rowIndex,
-        columnIndex: startColumnIndex
-      },
-      end: {
-        rowIndex,
-        columnIndex: endColumnIndex
-      },
-      inserted: [replacement],
-      deleted: [value],
+      startOffset,
+      endOffset,
+      inserted: replacement,
       origin: 'find-widget.replace'
     });
   }
@@ -1552,9 +1580,10 @@ const replace$1 = async state => {
     value,
     replacement,
     matchIndex,
-    editorUid
+    editorUid,
+    lines
   } = state;
-  const edits = getEdits(matches, value, replacement, matchIndex, false);
+  const edits = getEdits(matches, value, replacement, matchIndex, false, lines);
   await applyEdits(editorUid, edits);
   // TODO ask editor worker to apply edit
   // TODO ask editor worker for new lines?
@@ -1568,9 +1597,10 @@ const replaceAll$1 = state => {
     matches,
     value,
     replacement,
-    editorUid
+    editorUid,
+    lines
   } = state;
-  const edits = getEdits(matches, value, replacement, 0, true);
+  const edits = getEdits(matches, value, replacement, 0, true, lines);
   void applyEdits(editorUid, edits);
   return {
     ...state
@@ -1794,6 +1824,82 @@ const focusPreviousElement = state => {
   return focusElement(state, previousFocus);
 };
 
+const getKeyBindings = () => {
+  return [{
+    key: Enter,
+    command: 'FindWidget.focusNext',
+    when: FocusFindWidget$1
+  }, {
+    key: CtrlCmd | KeyF,
+    command: 'FindWidget.preventDefaultBrowserFind',
+    when: FocusFindWidget$1
+  }, {
+    key: Shift | F4,
+    command: 'FindWidget.focusPrevious',
+    when: FocusFindWidget$1
+  }, {
+    key: F4,
+    command: 'FindWidget.focusNext',
+    when: FocusFindWidget$1
+  }, {
+    key: Shift | Tab,
+    command: 'FindWidget.focusToggleReplace',
+    when: FocusFindWidget$1
+  }, {
+    key: Tab,
+    command: 'FindWidget.focusReplace',
+    when: FocusFindWidget$1
+  }, {
+    key: Tab,
+    command: 'FindWidget.focusPreviousMatchButton',
+    when: FocusFindWidgetReplace$1
+  }, {
+    key: Alt | CtrlCmd | Enter,
+    command: 'FindWidget.replaceAll',
+    when: FocusFindWidgetReplace$1
+  }, {
+    key: Tab,
+    command: 'FindWidget.focusNextMatchButton',
+    when: FocusFindWidgetPreviousMatchButton
+  }, {
+    key: Shift | Tab,
+    command: 'FindWidget.focusReplace',
+    when: FocusFindWidgetPreviousMatchButton
+  }, {
+    key: Shift | Tab,
+    command: 'FindWidget.focusPreviousMatchButton',
+    when: FocusFindWidgetNextMatchButton
+  }, {
+    key: Tab,
+    command: 'FindWidget.focusCloseButton',
+    when: FocusFindWidgetNextMatchButton
+  }, {
+    key: Shift | Tab,
+    command: 'FindWidget.focusNextMatchButton',
+    when: FocusFindWidgetCloseButton$1
+  }, {
+    key: Tab,
+    command: 'FindWidget.focusReplaceButton',
+    when: FocusFindWidgetCloseButton$1
+  }, {
+    key: Shift | Tab,
+    command: 'FindWidget.focusFind',
+    when: FocusFindWidgetReplace$1
+  }, {
+    key: Tab,
+    command: 'FindWidget.focusReplaceAllButton',
+    when: FocusFindWidgetReplaceButton
+  }, {
+    key: Shift | Tab,
+    command: 'FindWidget.focusCloseButton',
+    when: FocusFindWidgetReplaceButton
+  }, {
+    key: Shift | Tab,
+    command: 'FindWidget.focusReplaceButton',
+    when: FocusFindWidgetReplaceAllButton$1
+  }];
+};
+
 const handleInput = (state, value, inputSource = User) => {
   return refresh(state, value, inputSource);
 };
@@ -1884,7 +1990,8 @@ const loadContent = async (state, savedState) => {
     editorUid,
     editorWidth,
     editorX,
-    editorY
+    editorY,
+    inputLineHeight
   } = state;
   const {
     replacement,
@@ -1904,11 +2011,13 @@ const loadContent = async (state, savedState) => {
   const actualValue = value || getSelectedText(lines, selections);
   const matches = findMatchesCaseInsensitive(lines, actualValue);
   const matchCount = getMatchCount(matches);
+  const inputHeight = measureTextHeight(value, inputLineHeight);
   return {
     ...state,
     focus: FocusSearchInput,
     focused: true,
     height,
+    inputHeight,
     inputSource: Script,
     lines,
     matchCount,
@@ -2153,13 +2262,6 @@ const SearchToggleButtonExpanded = 'SearchToggleButtonExpanded';
 const MaskIconChevronDown = 'MaskIconChevronDown';
 const MaskIconChevronRight = 'MaskIconChevronRight';
 
-const getFindMatchCountClassName = (matchCount, hasValue) => {
-  if (hasValue && matchCount === 0) {
-    return mergeClassNames(FindWidgetMatchCount, FindWidgetMatchCountEmpty);
-  }
-  return FindWidgetMatchCount;
-};
-
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
@@ -2193,6 +2295,22 @@ const getIconButtonVirtualDom = iconButton => {
   }, getIconVirtualDom(icon)];
 };
 
+const emptyMatches = mergeClassNames(FindWidgetMatchCount, FindWidgetMatchCountEmpty);
+const getFindMatchCountClassName = (matchCount, hasValue) => {
+  if (hasValue && matchCount === 0) {
+    return emptyMatches;
+  }
+  return FindWidgetMatchCount;
+};
+
+const getMatchCountVirtualDom = (matchCountText, matchCount, hasValue) => {
+  return [{
+    type: Div,
+    className: getFindMatchCountClassName(matchCount, hasValue),
+    childCount: 1
+  }, text(matchCountText)];
+};
+
 const checkedClassName = mergeClassNames(SearchFieldButton, SearchFieldButtonChecked);
 const unCheckedClassName = SearchFieldButton;
 const getSearchFieldButtonVirtualDom = button => {
@@ -2253,12 +2371,12 @@ const getFindWidgetFindVirtualDom = (matchCountText, buttons, fieldButtons, matc
   return [{
     type: Div,
     className: FindWidgetFind,
-    childCount: 5
+    childCount: 2
   }, ...getSearchFieldVirtualDom(SearchValue, find(), HandleInput, fieldButtons, [], HandleFocus, extraClassName), {
     type: Div,
-    className: getFindMatchCountClassName(matchCount, hasValue),
-    childCount: 1
-  }, text(matchCountText), ...buttons.flatMap(getIconButtonVirtualDom)];
+    className: 'FindWidgetActions',
+    childCount: 1 + buttons.length
+  }, ...getMatchCountVirtualDom(matchCountText, matchCount, hasValue), ...buttons.flatMap(getIconButtonVirtualDom)];
 };
 
 const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons, replaceFieldButtons) => {
@@ -2578,17 +2696,18 @@ const commandMap = {
   'FindWidget.diff2': diff2,
   'FindWidget.dispose': dispose$1,
   'FindWidget.focusCloseButton': wrapCommand(focusCloseButton),
-  'FindWidget.focusFirst': wrapCommand(focusFirst),
   'FindWidget.focusElement': wrapCommand(focusElement),
+  'FindWidget.focusFirst': wrapCommand(focusFirst),
   'FindWidget.focusIndex': wrapCommand(focusIndex),
   'FindWidget.focusLast': wrapCommand(focusLast),
   'FindWidget.focusNext': wrapCommand(focusNext),
-  'FindWidget.focusPrevious': wrapCommand(focusPrevious),
   'FindWidget.focusNextElement': wrapCommand(focusNextElement),
+  'FindWidget.focusPrevious': wrapCommand(focusPrevious),
   'FindWidget.focusPreviousElement': wrapCommand(focusPreviousElement),
   'FindWidget.focusReplace': wrapCommand(focusReplace),
   'FindWidget.focusReplaceAllButton': wrapCommand(focusReplaceAllButton),
   'FindWidget.getCommandIds': getCommandIds,
+  'FindWidget.getKeyBindings': getKeyBindings,
   'FindWidget.handleBlur': wrapCommand(handleBlur),
   'FindWidget.handleClickButton': wrapCommand(handleClickButton),
   'FindWidget.handleClickClose': wrapCommand(handleClickClose),
@@ -2604,8 +2723,8 @@ const commandMap = {
   'FindWidget.replace': wrapCommand(replace$1),
   'FindWidget.replaceAll': wrapCommand(replaceAll$1),
   'FindWidget.resize': wrapCommand(resize),
-  'FindWidget.terminate': terminate,
   'FindWidget.saveState': wrapGetter(saveState),
+  'FindWidget.terminate': terminate,
   'FindWidget.toggleMatchCase': wrapCommand(toggleMatchCase),
   'FindWidget.toggleReplace': wrapCommand(toggleReplace$1),
   'FindWidget.toggleUseRegularExpression': wrapCommand(toggleUseRegularExpression)

package/package.json

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