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

package/dist/findWidgetWorkerMain.js

@@ -988,53 +988,45 @@ const create$1 = (uid, x, y, width, height, parentUid) => {
     minWidth: 400,
     history: [],
     inputErrorMessage: '',
-    inputHeight: 15,
+    searchInputHeight: 15,
     inputLineHeight: 15,
-    inputPaddingTop: 2,
-    inputPaddingBottom: 2
+    inputPaddingTop: 4,
+    inputPaddingBottom: 4,
+    inputBorderWidth: 1,
+    inputGap: 3
   };
   set$3(uid, state, state);
   return state;
 };
 
-const isEqual$7 = (oldState, newState) => {
+const isEqual$8 = (oldState, newState) => {
   return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
 };
 
-const isEqual$6 = (oldState, newState) => {
-  return newState.width === newState.width && oldState.height === newState.height && oldState.x === newState.x && oldState.inputHeight === newState.inputHeight;
+const isEqual$7 = (oldState, newState) => {
+  return newState.width === newState.width && oldState.height === newState.height && oldState.x === newState.x && oldState.searchInputHeight === newState.searchInputHeight;
 };
 
-const isEqual$5 = (oldState, newState) => {
+const isEqual$6 = (oldState, newState) => {
   return oldState.version === newState.version;
 };
 
-const isEqual$4 = (oldState, newState) => {
+const isEqual$5 = (oldState, newState) => {
   return oldState.focused === newState.focused && oldState.focus === newState.focus;
 };
 
-const isEqual$3 = (oldState, newState) => {
+const isEqual$4 = (oldState, newState) => {
   return oldState.focused === newState.focused;
 };
 
-const isEqual$2 = (oldState, newState) => {
+const isEqual$3 = (oldState, newState) => {
   return oldState.version === newState.version && oldState.replaceExpanded === newState.replaceExpanded && oldState.matchCount === newState.matchCount && oldState.matchIndex === newState.matchIndex && oldState.matchCase === newState.matchCase && oldState.matchWholeWord === newState.matchWholeWord && oldState.useRegularExpression === newState.useRegularExpression && oldState.preserveCase === newState.preserveCase;
 };
 
-const isEqual$1 = (oldState, newState) => {
+const isEqual$2 = (oldState, newState) => {
   return oldState.version === newState.version;
 };
 
-const RenderBounds = 8;
-const RenderCss = 10;
-const RenderEventListeners = 11;
-const RenderUid = 12;
-const RenderContent = 13;
-const RenderFocusContext = 14;
-const RenderFocus = 15;
-const RenderValue = 16;
-const RenderReplaceValue = 17;
-
 const CheckBox = 'checkbox';
 const Group = 'group';
 const None = 'none';
@@ -1088,12 +1080,26 @@ const FocusSearchWholeWord = 34;
 const FocusToggleDetails = 1010;
 const FocusToggleReplace = 1020;
 
+const isEqual$1 = (oldState, newState) => {
+  return newState.inputSource === User || oldState.replacement === newState.replacement;
+};
+
+const RenderBounds = 8;
+const RenderCss = 10;
+const RenderEventListeners = 11;
+const RenderUid = 12;
+const RenderContent = 13;
+const RenderFocusContext = 14;
+const RenderFocus = 15;
+const RenderValue = 16;
+const RenderReplaceValue = 17;
+
 const isEqual = (oldState, newState) => {
   return newState.inputSource === User || oldState.value === newState.value;
 };
 
-const modules = [isEqual$5, isEqual$2, isEqual$7, isEqual$1, isEqual$3, isEqual$4, isEqual, isEqual$6];
-const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext, RenderFocus, RenderValue, RenderCss];
+const modules = [isEqual$6, isEqual$3, isEqual$8, isEqual$2, isEqual$4, isEqual$5, isEqual, isEqual$1, isEqual$7];
+const numbers = [RenderEventListeners, RenderContent, RenderBounds, RenderUid, RenderFocusContext, RenderFocus, RenderValue, RenderReplaceValue, RenderCss];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -1430,6 +1436,20 @@ const measureTextHeight = (value, lineHeight) => {
   return lines.length * lineHeight;
 };
 
+const measureInputHeight = (value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded) => {
+  const textHeight = measureTextHeight(value, inputLineHeight);
+  const inputHeight = textHeight + inputPaddingBottom + inputPaddingTop + inputBorderWidth * 2;
+  const replaceInputHeight = replaceExpanded ? inputHeight : 0; // TODO should be independent of input
+  const actualGap = replaceExpanded ? inputGap : 0;
+  // TODO use variables for margin
+  const height = inputHeight + replaceInputHeight + 5 + actualGap;
+  return {
+    inputHeight,
+    height,
+    replaceInputHeight
+  };
+};
+
 const refresh$1 = (state, value, inputSource) => {
   const {
     lines,
@@ -1438,7 +1458,10 @@ const refresh$1 = (state, value, inputSource) => {
     matchWholeWord,
     inputLineHeight,
     inputPaddingTop,
-    inputPaddingBottom
+    inputPaddingBottom,
+    replaceExpanded,
+    inputBorderWidth,
+    inputGap
   } = state;
   const options = {
     matchCase,
@@ -1449,14 +1472,15 @@ const refresh$1 = (state, value, inputSource) => {
     matches,
     error
   } = findMatches(lines, value, options);
-  const textHeight = measureTextHeight(value, inputLineHeight);
-  const inputHeight = textHeight + inputPaddingBottom + inputPaddingTop;
-  const height = inputHeight + 5;
+  const {
+    inputHeight,
+    height
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded);
   if (error) {
     return {
       ...state,
       inputErrorMessage: error,
-      inputHeight,
+      searchInputHeight: inputHeight,
       height
     };
   }
@@ -1464,7 +1488,7 @@ const refresh$1 = (state, value, inputSource) => {
   return {
     ...state,
     inputErrorMessage: error,
-    inputHeight,
+    searchInputHeight: inputHeight,
     inputSource,
     matchCount,
     matches,
@@ -1702,23 +1726,24 @@ const handleResizerPointerUp = async (state, eventX, eventY) => {
   };
 };
 
-const getFindWidgetHeight = replaceExpanded => {
-  const collapsedHeight = 30;
-  const expandedHeight = 60;
-  const newHeight = replaceExpanded ? expandedHeight : collapsedHeight;
-  return newHeight;
-};
-
 const toggleReplace$1 = state => {
   const {
-    replaceExpanded
+    replaceExpanded,
+    value,
+    inputLineHeight,
+    inputPaddingBottom,
+    inputPaddingTop,
+    inputBorderWidth,
+    inputGap
   } = state;
   const newExpanded = !replaceExpanded;
-  const newHeight = getFindWidgetHeight(newExpanded);
+  const {
+    height
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, newExpanded);
   return {
     ...state,
     replaceExpanded: newExpanded,
-    height: newHeight
+    height
   };
 };
 
@@ -1991,7 +2016,12 @@ const loadContent = async (state, savedState) => {
     editorWidth,
     editorX,
     editorY,
-    inputLineHeight
+    inputLineHeight,
+    inputPaddingBottom,
+    inputPaddingTop,
+    replaceExpanded,
+    inputBorderWidth,
+    inputGap
   } = state;
   const {
     replacement,
@@ -2002,8 +2032,7 @@ const loadContent = async (state, savedState) => {
   const {
     x,
     y,
-    width,
-    height
+    width
   } = getFindWidgetPosition(editorX, editorY, editorWidth);
   if (lines.length === 0) {
     return state;
@@ -2011,19 +2040,22 @@ 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);
+  const {
+    inputHeight,
+    height
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded);
   return {
     ...state,
     focus: FocusSearchInput,
     focused: true,
     height,
-    inputHeight,
     inputSource: Script,
     lines,
     matchCount,
     matches,
     matchIndex: 0,
     replacement,
+    searchInputHeight: inputHeight,
     selections,
     value: actualValue,
     version: 1,
@@ -2479,7 +2511,7 @@ const renderCss = (oldState, newState) => {
     height,
     x,
     y,
-    inputHeight
+    searchInputHeight: inputHeight
   } = newState;
   const css = `:root {
   --FindWidgetWidth: ${width}px;
@@ -2603,7 +2635,7 @@ const renderReplaceValue = (oldState, newState) => {
     uid,
     replacement
   } = newState;
-  return [SetValueByName, uid, Replace$2, replacement];
+  return [SetValueByName, uid, ReplaceValue, replacement];
 };
 
 const renderUid = (oldState, newState) => {
@@ -2727,7 +2759,8 @@ const commandMap = {
   'FindWidget.terminate': terminate,
   'FindWidget.toggleMatchCase': wrapCommand(toggleMatchCase),
   'FindWidget.toggleReplace': wrapCommand(toggleReplace$1),
-  'FindWidget.toggleUseRegularExpression': wrapCommand(toggleUseRegularExpression)
+  'FindWidget.toggleUseRegularExpression': wrapCommand(toggleUseRegularExpression),
+  'FindWidget.togglePreserveCase': wrapCommand(togglePreserveCase)
 };
 
 const listen = async () => {

package/package.json

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