@lvce-editor/find-widget-worker 2.2.0 → 2.4.0

package/dist/findWidgetWorkerMain.js

@@ -940,91 +940,6 @@ const terminate = () => {
   globalThis.close();
 };
 
-const {
-  get: get$1,
-  set: set$3,
-  wrapCommand,
-  dispose: dispose$2,
-  getCommandIds,
-  registerCommands,
-  wrapGetter
-} = create$2();
-
-const User$1 = 1;
-const Script$1 = 2;
-const Unknown = 0;
-
-const create$1 = (uid, x, y, width, height, parentUid) => {
-  const state = {
-    uid,
-    value: '',
-    ariaAnnouncement: '',
-    matches: new Uint32Array(),
-    matchIndex: -1,
-    matchCount: 0,
-    replaceExpanded: false,
-    useRegularExpression: false,
-    matchCase: false,
-    matchWholeWord: false,
-    replacement: '',
-    editorUid: parentUid,
-    x: 0,
-    y: 0,
-    width: 0,
-    height: 0,
-    focused: false,
-    focusSource: Unknown,
-    focus: 0,
-    version: 0,
-    lines: [],
-    selections: [],
-    editorX: x,
-    editorY: y,
-    editorWidth: width,
-    editorHeight: height,
-    inputSource: 0,
-    preserveCase: false,
-    resizerPointerDown: false,
-    minWidth: 400,
-    history: [],
-    inputErrorMessage: '',
-    inputHeight: 15,
-    inputLineHeight: 15,
-    inputPaddingTop: 2,
-    inputPaddingBottom: 2
-  };
-  set$3(uid, state, state);
-  return state;
-};
-
-const isEqual$8 = (oldState, newState) => {
-  return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
-};
-
-const isEqual$7 = (oldState, newState) => {
-  return newState.width === newState.width && oldState.height === newState.height && oldState.x === newState.x && oldState.inputHeight === newState.inputHeight;
-};
-
-const isEqual$6 = (oldState, newState) => {
-  return oldState.version === newState.version;
-};
-
-const isEqual$5 = (oldState, newState) => {
-  return oldState.focused === newState.focused && oldState.focus === newState.focus;
-};
-
-const isEqual$4 = (oldState, newState) => {
-  return oldState.focused === newState.focused;
-};
-
-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$2 = (oldState, newState) => {
-  return oldState.version === newState.version;
-};
-
 const CheckBox = 'checkbox';
 const Group = 'group';
 const None = 'none';
@@ -1043,8 +958,8 @@ const Enter = 3;
 const KeyF = 34;
 const F4 = 60;
 
-const User = 1;
-const Script = 2;
+const User$1 = 1;
+const Script$1 = 2;
 
 const CtrlCmd = 1 << 11 >>> 0;
 const Shift = 1 << 10 >>> 0;
@@ -1078,97 +993,33 @@ 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$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 = [];
-  for (let i = 0; i < modules.length; i++) {
-    const fn = modules[i];
-    if (!fn(oldState, newState)) {
-      diffResult.push(numbers[i]);
-    }
-  }
-  return diffResult;
-};
-
-const diff2 = uid => {
-  const {
-    oldState,
-    newState
-  } = get$1(uid);
-  const diffResult = diff(oldState, newState);
-  return diffResult;
-};
-
-const dispose$1 = uid => {
-  return dispose$2(uid);
-};
-
-const FocusFindWidgetCloseButton = 48;
-const FocusFindWidgetReplace = 43;
-const FocusFindWidgetReplaceAllButton = 47;
-
-const setFindWidgetFocus = (state, focusKey) => {
-  if (state.focus === focusKey) {
-    return state;
-  }
-  return {
-    ...state,
-    focus: focusKey,
-    focusSource: Script$1
-  };
-};
-
-const focusCloseButton = state => {
-  return setFindWidgetFocus(state, FocusFindWidgetCloseButton);
-};
-
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$3 = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get = id => {
+const get$1 = id => {
   return rpcs[id];
 };
 
-const create = rpcId => {
+const create$1 = rpcId => {
   return {
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get(rpcId);
+      const rpc = get$1(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get(rpcId);
+      const rpc = get$1(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$2(rpcId, rpc);
+      set$3(rpcId, rpc);
     },
     async dispose() {
-      const rpc = get(rpcId);
+      const rpc = get$1(rpcId);
       await rpc.dispose();
     }
   };
@@ -1177,9 +1028,9 @@ const create = rpcId => {
 const {
   invoke: invoke$1,
   invokeAndTransfer,
-  set: set$1,
-  dispose
-} = create(EditorWorker$1);
+  set: set$2,
+  dispose: dispose$2
+} = create$1(EditorWorker$1);
 const sendMessagePortToExtensionHostWorker = async port => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer(
@@ -1249,7 +1100,7 @@ const registerMockRpc = commandMap => {
   const mockRpc = createMockRpc({
     commandMap
   });
-  set$1(mockRpc);
+  set$2(mockRpc);
   return mockRpc;
 };
 
@@ -1259,7 +1110,7 @@ const EditorWorker = {
   applyEdit,
   applyWorkspaceEdit,
   closeWidget,
-  dispose,
+  dispose: dispose$2,
   getLanguageId,
   getLines: getLines$1,
   getOffsetAtCursor,
@@ -1274,13 +1125,173 @@ const EditorWorker = {
   invokeAndTransfer,
   registerMockRpc,
   sendMessagePortToExtensionHostWorker,
-  set: set$1,
+  set: set$2,
   updateDebugInfo
 };
 
 const {
   invoke,
-  set} = EditorWorker;
+  set: set$1} = EditorWorker;
+
+const close$1 = async state => {
+  const {
+    editorUid
+  } = state;
+  // @ts-ignore
+  await invoke('Editor.closeFind2', editorUid);
+  return state;
+};
+
+const {
+  get,
+  set,
+  wrapCommand,
+  dispose: dispose$1,
+  getCommandIds,
+  registerCommands,
+  wrapGetter
+} = create$2();
+
+const User = 1;
+const Script = 2;
+const Unknown = 0;
+
+const create = (uid, x, y, width, height, parentUid) => {
+  const state = {
+    uid,
+    value: '',
+    ariaAnnouncement: '',
+    matches: new Uint32Array(),
+    matchIndex: -1,
+    matchCount: 0,
+    replaceExpanded: false,
+    useRegularExpression: false,
+    matchCase: false,
+    matchWholeWord: false,
+    replacement: '',
+    editorUid: parentUid,
+    x: 0,
+    y: 0,
+    width: 0,
+    height: 0,
+    focused: false,
+    focusSource: Unknown,
+    focus: 0,
+    version: 0,
+    lines: [],
+    selections: [],
+    editorX: x,
+    editorY: y,
+    editorWidth: width,
+    editorHeight: height,
+    inputSource: 0,
+    preserveCase: false,
+    resizerPointerDown: false,
+    minWidth: 400,
+    history: [],
+    inputErrorMessage: '',
+    searchInputHeight: 15,
+    inputLineHeight: 15,
+    inputPaddingTop: 4,
+    inputPaddingBottom: 4,
+    inputBorderWidth: 1,
+    inputGap: 3
+  };
+  set(uid, state, state);
+  return state;
+};
+
+const isEqual$8 = (oldState, newState) => {
+  return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
+};
+
+const isEqual$7 = (oldState, newState) => {
+  return newState.width === newState.width && oldState.height === newState.height && oldState.x === newState.x && oldState.searchInputHeight === newState.searchInputHeight;
+};
+
+const isEqual$6 = (oldState, newState) => {
+  return oldState.version === newState.version;
+};
+
+const isEqual$5 = (oldState, newState) => {
+  return oldState.focused === newState.focused && oldState.focus === newState.focus;
+};
+
+const isEqual$4 = (oldState, newState) => {
+  return oldState.focused === newState.focused;
+};
+
+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$2 = (oldState, newState) => {
+  return oldState.version === newState.version;
+};
+
+const isEqual$1 = (oldState, newState) => {
+  return newState.inputSource === User$1 || 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$1 || oldState.value === newState.value;
+};
+
+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 = [];
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
+    }
+  }
+  return diffResult;
+};
+
+const diff2 = uid => {
+  const {
+    oldState,
+    newState
+  } = get(uid);
+  const diffResult = diff(oldState, newState);
+  return diffResult;
+};
+
+const dispose = uid => {
+  return dispose$1(uid);
+};
+
+const FocusFindWidgetCloseButton = 48;
+const FocusFindWidgetReplace = 43;
+const FocusFindWidgetReplaceAllButton = 47;
+
+const setFindWidgetFocus = (state, focusKey) => {
+  if (state.focus === focusKey) {
+    return state;
+  }
+  return {
+    ...state,
+    focus: focusKey,
+    focusSource: Script
+  };
+};
+
+const focusCloseButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetCloseButton);
+};
 
 const setSelections = async (editorUid, selections) => {
   // @ts-ignore
@@ -1434,6 +1445,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,
@@ -1442,7 +1467,10 @@ const refresh$1 = (state, value, inputSource) => {
     matchWholeWord,
     inputLineHeight,
     inputPaddingTop,
-    inputPaddingBottom
+    inputPaddingBottom,
+    replaceExpanded,
+    inputBorderWidth,
+    inputGap
   } = state;
   const options = {
     matchCase,
@@ -1453,14 +1481,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
     };
   }
@@ -1468,7 +1497,7 @@ const refresh$1 = (state, value, inputSource) => {
   return {
     ...state,
     inputErrorMessage: error,
-    inputHeight,
+    searchInputHeight: inputHeight,
     inputSource,
     matchCount,
     matches,
@@ -1478,7 +1507,7 @@ const refresh$1 = (state, value, inputSource) => {
   };
 };
 
-const refresh = (state, value = state.value, inputSource = User) => {
+const refresh = (state, value = state.value, inputSource = User$1) => {
   return refresh$1(state, value, inputSource);
 };
 
@@ -1490,7 +1519,7 @@ const toggleMatchCase = state => {
     ...state,
     matchCase: !matchCase
   };
-  return refresh(newState, newState.value, User);
+  return refresh(newState, newState.value, User$1);
 };
 
 const toggleMatchWholeWord = state => {
@@ -1501,7 +1530,7 @@ const toggleMatchWholeWord = state => {
     ...state,
     matchWholeWord: !matchWholeWord
   };
-  return refresh(newState, newState.value, User);
+  return refresh(newState, newState.value, User$1);
 };
 
 const togglePreserveCase = state => {
@@ -1523,7 +1552,7 @@ const toggleUseRegularExpression = state => {
     ...state,
     useRegularExpression: !useRegularExpression
   };
-  return refresh(newState, newState.value, User);
+  return refresh(newState, newState.value, User$1);
 };
 
 const Close$2 = 'Close';
@@ -1635,15 +1664,6 @@ const handleClickButton = async (state, name) => {
   return fn(state);
 };
 
-const close$1 = async state => {
-  const {
-    editorUid
-  } = state;
-  // @ts-ignore
-  await invoke('Editor.closeFind2', editorUid);
-  return state;
-};
-
 const handleClickClose = state => {
   return close$1(state);
 };
@@ -1655,7 +1675,7 @@ const handleFindWidgetFocus = (state, focusKey) => {
   return {
     ...state,
     focus: focusKey,
-    focusSource: User$1
+    focusSource: User
   };
 };
 
@@ -1706,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
   };
 };
 
@@ -1730,7 +1751,7 @@ const focusElement = (state, whenExpression) => {
   return {
     ...state,
     focus: whenExpression,
-    focusSource: Script
+    focusSource: Script$1
   };
 };
 
@@ -1904,11 +1925,11 @@ const getKeyBindings = () => {
   }];
 };
 
-const handleInput = (state, value, inputSource = User) => {
+const handleInput = (state, value, inputSource = User$1) => {
   return refresh(state, value, inputSource);
 };
 
-const handleReplaceInput = (state, value, inputSource = User) => {
+const handleReplaceInput = (state, value, inputSource = User$1) => {
   return {
     ...state,
     replacement: value,
@@ -1995,7 +2016,12 @@ const loadContent = async (state, savedState) => {
     editorWidth,
     editorX,
     editorY,
-    inputLineHeight
+    inputLineHeight,
+    inputPaddingBottom,
+    inputPaddingTop,
+    replaceExpanded,
+    inputBorderWidth,
+    inputGap
   } = state;
   const {
     replacement,
@@ -2006,8 +2032,7 @@ const loadContent = async (state, savedState) => {
   const {
     x,
     y,
-    width,
-    height
+    width
   } = getFindWidgetPosition(editorX, editorY, editorWidth);
   if (lines.length === 0) {
     return state;
@@ -2015,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,
+    inputSource: Script$1,
     lines,
     matchCount,
     matches,
     matchIndex: 0,
     replacement,
+    searchInputHeight: inputHeight,
     selections,
     value: actualValue,
     version: 1,
@@ -2483,7 +2511,7 @@ const renderCss = (oldState, newState) => {
     height,
     x,
     y,
-    inputHeight
+    searchInputHeight: inputHeight
   } = newState;
   const css = `:root {
   --FindWidgetWidth: ${width}px;
@@ -2607,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) => {
@@ -2664,8 +2692,8 @@ const render2 = (uid, diffResult) => {
   const {
     oldState,
     newState
-  } = get$1(uid);
-  set$3(uid, newState, newState);
+  } = get(uid);
+  set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -2696,9 +2724,10 @@ const saveState = state => {
 };
 
 const commandMap = {
-  'FindWidget.create': create$1,
+  'FindWidget.create': create,
   'FindWidget.diff2': diff2,
-  'FindWidget.dispose': dispose$1,
+  'FindWidget.close': wrapCommand(close$1),
+  'FindWidget.dispose': dispose,
   'FindWidget.focusCloseButton': wrapCommand(focusCloseButton),
   'FindWidget.focusElement': wrapCommand(focusElement),
   'FindWidget.focusFirst': wrapCommand(focusFirst),
@@ -2732,7 +2761,8 @@ const commandMap = {
   'FindWidget.toggleMatchCase': wrapCommand(toggleMatchCase),
   'FindWidget.toggleReplace': wrapCommand(toggleReplace$1),
   'FindWidget.toggleUseRegularExpression': wrapCommand(toggleUseRegularExpression),
-  'FindWidget.togglePreserveCase': wrapCommand(togglePreserveCase)
+  'FindWidget.togglePreserveCase': wrapCommand(togglePreserveCase),
+  'FindWidget.toggleMatchWholeWord': wrapCommand(toggleMatchWholeWord)
 };
 
 const listen = async () => {
@@ -2740,7 +2770,7 @@ const listen = async () => {
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });
-  set(rpc);
+  set$1(rpc);
 };
 
 const main = async () => {

package/package.json

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