@lvce-editor/find-widget-worker 3.16.1 → 3.17.0

package/dist/findWidgetWorkerMain.js

@@ -1529,6 +1529,7 @@ const createState = (uid, x, y, width, height, parentUid, instanceId) => {
     focused: false,
     focusSource: Unknown,
     focusVersion: 0,
+    fontSize: 'inherit',
     height: 0,
     history: [],
     inputBorderWidth: 1,
@@ -1580,7 +1581,7 @@ const isEqual$8 = (oldState, newState) => {
 };
 
 const isEqual$7 = (oldState, newState) => {
-  return oldState.width === newState.width && oldState.height === newState.height && oldState.x === newState.x && oldState.searchInputHeight === newState.searchInputHeight;
+  return oldState.width === newState.width && oldState.height === newState.height && oldState.x === newState.x && oldState.searchInputHeight === newState.searchInputHeight && oldState.fontSize === newState.fontSize;
 };
 
 const isEqual$6 = (oldState, newState) => {
@@ -1875,8 +1876,9 @@ const measureTextHeight = (value, lineHeight) => {
   return lines.length * lineHeight;
 };
 
-const measureInputHeight = (value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded) => {
-  const textHeight = measureTextHeight(value, inputLineHeight);
+const measureInputHeight = (value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded, fontSize = 'inherit') => {
+  const effectiveLineHeight = typeof fontSize === 'number' ? Math.max(inputLineHeight, fontSize) : inputLineHeight;
+  const textHeight = measureTextHeight(value, effectiveLineHeight);
   const inputHeight = textHeight + inputPaddingBottom + inputPaddingTop + inputBorderWidth * 2;
   const replaceInputHeight = replaceExpanded ? inputHeight : 0; // TODO should be independent of input
   const actualGap = replaceExpanded ? inputGap : 0;
@@ -1891,6 +1893,7 @@ const measureInputHeight = (value, inputLineHeight, inputPaddingBottom, inputPad
 
 const refresh$1 = (state, value, inputSource) => {
   const {
+    fontSize,
     inputBorderWidth,
     inputGap,
     inputLineHeight,
@@ -1914,7 +1917,7 @@ const refresh$1 = (state, value, inputSource) => {
   const {
     height,
     inputHeight
-  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded);
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded, fontSize);
   if (error) {
     return {
       ...state,
@@ -2376,6 +2379,7 @@ const handleToggleReplaceFocus = state => {
 
 const toggleReplace$1 = state => {
   const {
+    fontSize,
     inputBorderWidth,
     inputGap,
     inputLineHeight,
@@ -2387,7 +2391,7 @@ const toggleReplace$1 = state => {
   const newExpanded = !replaceExpanded;
   const {
     height
-  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, newExpanded);
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, newExpanded, fontSize);
   return {
     ...state,
     height,
@@ -2598,6 +2602,57 @@ const handleReplaceInput = (state, value, inputSource = User$1) => {
   };
 };
 
+const MIN_FONT_SIZE = 10;
+const MAX_FONT_SIZE = 100;
+const EMPTY_VALUES = [undefined, null, '', 0];
+const normalizeFontSize = value => {
+  let result = 'inherit';
+  if (!EMPTY_VALUES.includes(value)) {
+    let numericValue = NaN;
+    if (typeof value === 'number') {
+      numericValue = value;
+    } else if (typeof value === 'string' && value.trim()) {
+      numericValue = Number(value);
+    }
+    if (Number.isFinite(numericValue)) {
+      result = Math.min(MAX_FONT_SIZE, Math.max(MIN_FONT_SIZE, numericValue));
+    }
+  }
+  return result;
+};
+
+const getFontSize = async () => {
+  try {
+    const value = await invoke('Editor.getFindWidgetFontSize');
+    return normalizeFontSize(value);
+  } catch {
+    return 'inherit';
+  }
+};
+
+const handleSettingsChanged = async state => {
+  const {
+    inputBorderWidth,
+    inputGap,
+    inputLineHeight,
+    inputPaddingBottom,
+    inputPaddingTop,
+    replaceExpanded,
+    value
+  } = state;
+  const fontSize = await getFontSize();
+  const {
+    height,
+    inputHeight
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded, fontSize);
+  return {
+    ...state,
+    fontSize,
+    height,
+    searchInputHeight: inputHeight
+  };
+};
+
 const regexFlags = 'gi';
 const getSearchRegex = searchString => {
   const escaped = escapeRegExpCharacters(searchString);
@@ -2612,8 +2667,7 @@ const findMatchesCaseInsensitive = (lines, searchString) => {
   return findRegexMatches(lines, regex);
 };
 
-const getFindWidgetPosition = (editorX, editorY, editorWidth) => {
-  const width = 300;
+const getFindWidgetPosition = (editorX, editorY, editorWidth, width = 300) => {
   const height = 30;
   const paddingTop = 10;
   const paddingRight = 20;
@@ -2678,6 +2732,7 @@ const loadContent = async (state, savedState) => {
     inputPaddingTop,
     replaceExpanded
   } = state;
+  const fontSize = await getFontSize();
   const {
     replacement,
     value
@@ -2698,11 +2753,12 @@ const loadContent = async (state, savedState) => {
   const {
     height,
     inputHeight
-  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded);
+  } = measureInputHeight(value, inputLineHeight, inputPaddingBottom, inputPaddingTop, inputBorderWidth, inputGap, replaceExpanded, fontSize);
   return {
     ...state,
     focus: FocusSearchInput,
     focused: true,
+    fontSize,
     height,
     inputSource: Script$1,
     lines,
@@ -3193,6 +3249,7 @@ const renderContent = (oldState, newState) => {
 
 const renderCss = (oldState, newState) => {
   const {
+    fontSize,
     height,
     searchInputHeight: inputHeight,
     uid,
@@ -3200,12 +3257,14 @@ const renderCss = (oldState, newState) => {
     x,
     y
   } = newState;
+  const cssFontSize = fontSize === 'inherit' ? 'inherit' : `${fontSize}px`;
   const css = `:root {
   --FindWidgetWidth: ${width}px;
   --FindWidgetHeight: ${height}px;
   --FindWidgetX: ${x}px;
   --FindWidgetY: ${y}px;
   --FindWidgetInputHeight: ${inputHeight}px;
+  --FindWidgetFontSize: ${cssFontSize};
 }`;
   return [SetCss, uid, css];
 };
@@ -3423,7 +3482,25 @@ const renderInstance = (instanceId, diffResult) => {
 };
 
 const resize = async (state, dimensions) => {
-  return state;
+  const {
+    height: editorHeight,
+    width: editorWidth,
+    x: editorX,
+    y: editorY
+  } = dimensions;
+  const {
+    width: widgetWidth
+  } = state;
+  const position = getFindWidgetPosition(editorX, editorY, editorWidth, widgetWidth);
+  return {
+    ...state,
+    editorHeight,
+    editorWidth,
+    editorX,
+    editorY,
+    x: position.x,
+    y: position.y
+  };
 };
 
 const saveState = state => {
@@ -3483,6 +3560,7 @@ const commandMap = {
   'FindWidget.handleResizerPointerDown': wrapCommand(handleResizerPointerDown),
   'FindWidget.handleResizerPointerMove': wrapCommand(handleResizerPointerMove),
   'FindWidget.handleResizerPointerUp': wrapCommand(handleResizerPointerUp),
+  'FindWidget.handleSettingsChanged': wrapCommand(handleSettingsChanged),
   'FindWidget.handleToggleReplaceFocus': wrapCommand(handleToggleReplaceFocus),
   'FindWidget.loadContent': wrapCommand(loadContent),
   'FindWidget.loadContentInstance': wrapInstanceCommand(loadContent),

package/package.json

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