@lvce-editor/find-widget-worker 1.16.0 → 1.18.0

package/dist/findWidgetWorkerMain.js

@@ -943,7 +943,8 @@ const {
   wrapCommand,
   dispose: dispose$2,
   getCommandIds,
-  registerCommands
+  registerCommands,
+  wrapGetter
 } = create$2();
 
 const User$1 = 1;
@@ -980,7 +981,8 @@ const create$1 = (uid, x, y, width, height, parentUid) => {
     editorHeight: height,
     inputSource: 0,
     preserveCase: false,
-    resizerPointerDown: false
+    resizerPointerDown: false,
+    minWidth: 400
   };
   set$3(uid, state, state);
   return state;
@@ -1567,13 +1569,22 @@ const handleResizerPointerDown = async (state, eventX, eventY) => {
   };
 };
 
+const getNewWidth = (oldWidth, oldX, eventX, minWidth) => {
+  const oldXEnd = oldX + oldWidth;
+  const newWidth = Math.max(oldXEnd - eventX, minWidth);
+  return newWidth;
+};
 const handleResizerPointerMove = async (state, eventX, eventY) => {
   const {
     width,
-    x
+    x,
+    resizerPointerDown,
+    minWidth
   } = state;
-  const oldXEnd = x + width;
-  const newWidth = oldXEnd - eventX;
+  if (!resizerPointerDown) {
+    return state;
+  }
+  const newWidth = getNewWidth(width, x, eventX, minWidth);
   return {
     ...state,
     x: eventX,
@@ -1668,13 +1679,38 @@ const getSelections = async editorUid => {
   return selections;
 };
 
-const loadContent = async state => {
+const getSavedValue = savedState => {
+  if (savedState && savedState.value) {
+    return savedState.value;
+  }
+  return '';
+};
+const getSavedReplacement = savedState => {
+  if (savedState && savedState.replacement) {
+    return savedState.replacement;
+  }
+  return '';
+};
+const restoreState = savedState => {
+  const value = getSavedValue(savedState);
+  const replacement = getSavedReplacement(savedState);
+  return {
+    value,
+    replacement
+  };
+};
+
+const loadContent = async (state, savedState) => {
   const {
     editorUid,
     editorWidth,
     editorX,
     editorY
   } = state;
+  const {
+    replacement,
+    value
+  } = restoreState(savedState);
   const lines = await getLines(editorUid);
   const selections = await getSelections(editorUid);
   const {
@@ -1686,24 +1722,25 @@ const loadContent = async state => {
   if (lines.length === 0) {
     return state;
   }
-  const value = getSelectedText(lines, selections);
-  const matches = findMatchesCaseInsensitive(lines, value);
+  const actualValue = value || getSelectedText(lines, selections);
+  const matches = findMatchesCaseInsensitive(lines, actualValue);
   const matchCount = getMatchCount(matches);
   return {
     ...state,
-    value,
+    focused: true,
+    height,
+    inputSource: Script,
+    lines,
+    matchCount,
     matches,
     matchIndex: 0,
-    matchCount,
+    replacement,
+    selections,
+    value: actualValue,
     version: 1,
-    x,
-    y,
     width,
-    height,
-    lines,
-    selections,
-    focused: true,
-    inputSource: Script
+    x,
+    y
   };
 };
 
@@ -1744,7 +1781,6 @@ const HandleReplaceInput = 'handleReplaceInput';
 const HandleResizerPointerDown = 'handleResizerPointerDown';
 const HandleResizerPointerMove = 'handleResizerPointerMove';
 const HandleResizerPointerUp = 'handleResizerPointerUp';
-const HandleSliderPointerMove = 'handleSliderPointerMove';
 const HandleToggleReplaceFocus = 'handleToggleReplaceFocus';
 
 const emptyObject = {};
@@ -2036,9 +2072,7 @@ const getResizerVirtualDom = () => {
     type: Div,
     className: 'Resizer',
     childCount: 1,
-    onPointerDown: HandleResizerPointerDown,
-    onPointerMove: HandleResizerPointerUp,
-    onPointerUp: HandleResizerPointerMove
+    onPointerDown: HandleResizerPointerDown
   }, {
     type: Div,
     className: 'ResizerHighlight',
@@ -2177,7 +2211,7 @@ const getEventListeners = (uid, widgetId) => {
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleResizerPointerDown', 0, widgetId, ClientX, ClientY],
     trackPointerEvents: [HandleResizerPointerMove, HandleResizerPointerUp]
   }, {
-    name: HandleSliderPointerMove,
+    name: HandleResizerPointerMove,
     params: ['executeWidgetCommand', 'FindWidget', 'FindWidget.handleResizerPointerMove', 0, widgetId, ClientX, ClientY]
   }, {
     name: HandleResizerPointerUp,
@@ -2280,6 +2314,27 @@ const resize = async (state, dimensions) => {
   return state;
 };
 
+const saveState = state => {
+  const {
+    width,
+    value,
+    replacement,
+    matchCase,
+    matchWholeWord,
+    useRegularExpression,
+    replaceExpanded
+  } = state;
+  return {
+    width,
+    value,
+    replacement,
+    matchCase,
+    matchWholeWord,
+    useRegularExpression,
+    replaceExpanded
+  };
+};
+
 const commandMap = {
   'FindWidget.create': create$1,
   'FindWidget.diff2': diff2,
@@ -2309,6 +2364,7 @@ const commandMap = {
   'FindWidget.replaceAll': wrapCommand(replaceAll$1),
   'FindWidget.resize': wrapCommand(resize),
   'FindWidget.terminate': terminate,
+  'FindWidget.saveState': wrapGetter(saveState),
   '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.16.0",
+  "version": "1.18.0",
   "description": "Web Worker for the find widget in Lvce Editor",
   "repository": {
     "type": "git",