@lvce-editor/find-widget-worker 3.7.5 → 3.9.0

package/dist/findWidgetWorkerMain.js

@@ -891,11 +891,11 @@ const SetValueByName = 'Viewlet.setValueByName';
 
 const FocusFindWidget$1 = 16;
 const FocusFindWidgetCloseButton$1 = 48;
-const FocusFindWidgetNextMatchButton = 49;
-const FocusFindWidgetPreviousMatchButton = 50;
+const FocusFindWidgetNextMatchButton$1 = 49;
+const FocusFindWidgetPreviousMatchButton$1 = 50;
 const FocusFindWidgetReplace$1 = 43;
 const FocusFindWidgetReplaceAllButton$1 = 47;
-const FocusFindWidgetReplaceButton = 46;
+const FocusFindWidgetReplaceButton$1 = 46;
 const FocusIgnoreFiles = 1012;
 const FocusSearchExcludeInput = 1008;
 const FocusSearchIncludeInput = 1007;
@@ -1058,28 +1058,87 @@ const terminate = () => {
 
 const close$1 = async state => {
   const {
-    editorUid
+    editorUid,
+    instanceId
   } = state;
-  // @ts-ignore
-  await invoke('Editor.closeFind2', editorUid);
+  if (instanceId) {
+    // @ts-ignore
+    await invoke('Editor.requestFindWidgetClose', {
+      editorUid,
+      instanceId
+    });
+  } else {
+    // @ts-ignore
+    await invoke('Editor.closeFind2', editorUid);
+  }
   return state;
 };
 
+const registry = create$1();
+const instanceUids = new Map();
 const {
-  dispose: dispose$1,
   get,
   getCommandIds,
   registerCommands,
   set,
   wrapCommand,
   wrapGetter
-} = create$1();
+} = registry;
+const registerInstance = (instanceId, uid) => {
+  const previousUid = instanceUids.get(instanceId);
+  if (previousUid !== undefined && previousUid !== uid) {
+    registry.dispose(previousUid);
+  }
+  instanceUids.set(instanceId, uid);
+};
+const resolveUid = instanceId => {
+  return instanceUids.get(instanceId);
+};
+const dispose$1 = uid => {
+  const state = registry.get(uid)?.newState;
+  if (state?.instanceId) {
+    instanceUids.delete(state.instanceId);
+  }
+  registry.dispose(uid);
+};
+const disposeInstance$1 = instanceId => {
+  const uid = instanceUids.get(instanceId);
+  if (uid === undefined) {
+    return;
+  }
+  instanceUids.delete(instanceId);
+  registry.dispose(uid);
+};
+const wrapInstanceCommand = fn => {
+  return async (instanceId, ...args) => {
+    const uid = instanceUids.get(instanceId);
+    if (uid === undefined) {
+      return;
+    }
+    const states = registry.get(uid);
+    if (!states) {
+      return;
+    }
+    const newerState = await fn(states.newState, ...args);
+    if (states.oldState === newerState || states.newState === newerState) {
+      return;
+    }
+    if (instanceUids.get(instanceId) !== uid) {
+      return;
+    }
+    const latest = registry.get(uid);
+    if (!latest) {
+      return;
+    }
+    registry.set(uid, latest.oldState, newerState);
+  };
+};
 
 const User = 1;
 const Script = 2;
 const Unknown = 0;
 
-const create = (uid, x, y, width, height, parentUid) => {
+const createState = (uid, x, y, width, height, parentUid, instanceId) => {
   const state = {
     ariaAnnouncement: '',
     editorHeight: height,
@@ -1100,6 +1159,9 @@ const create = (uid, x, y, width, height, parentUid) => {
     inputPaddingBottom: 4,
     inputPaddingTop: 4,
     inputSource: 0,
+    ...(instanceId && {
+      instanceId
+    }),
     lines: [],
     matchCase: false,
     matchCount: 0,
@@ -1122,8 +1184,17 @@ const create = (uid, x, y, width, height, parentUid) => {
     y: 0
   };
   set(uid, state, state);
+  if (instanceId) {
+    registerInstance(instanceId, uid);
+  }
   return state;
 };
+const create = (uid, x, y, width, height, parentUid) => {
+  return createState(uid, x, y, width, height, parentUid);
+};
+const createInstance = (instanceId, uid, x, y, width, height, parentUid) => {
+  return createState(uid, x, y, width, height, parentUid, instanceId);
+};
 
 const isEqual$8 = (oldState, newState) => {
   return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
@@ -1193,15 +1264,28 @@ const diff2 = uid => {
   const diffResult = diff(oldState, newState);
   return diffResult;
 };
+const diffInstance = instanceId => {
+  const uid = resolveUid(instanceId);
+  if (uid === undefined) {
+    return [];
+  }
+  return diff2(uid);
+};
 
 const dispose = uid => {
   return dispose$1(uid);
 };
+const disposeInstance = instanceId => {
+  return disposeInstance$1(instanceId);
+};
 
 const FindWidget$1 = 16;
 const FocusFindWidgetCloseButton = 48;
+const FocusFindWidgetNextMatchButton = 49;
+const FocusFindWidgetPreviousMatchButton = 50;
 const FocusFindWidgetReplace = 43;
 const FocusFindWidgetReplaceAllButton = 47;
+const FocusFindWidgetReplaceButton = 46;
 const FocusFindWidgetToggleReplace = 42;
 
 const setFindWidgetFocus = (state, focusKey) => {
@@ -1282,6 +1366,14 @@ const focusPrevious = state => {
   return focusIndex(state, matchIndex - 1);
 };
 
+const focusNextMatchButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetNextMatchButton);
+};
+
+const focusPreviousMatchButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetPreviousMatchButton);
+};
+
 const focusReplace = state => {
   return setFindWidgetFocus(state, FocusFindWidgetReplace);
 };
@@ -1290,6 +1382,14 @@ const focusReplaceAllButton = state => {
   return setFindWidgetFocus(state, FocusFindWidgetReplaceAllButton);
 };
 
+const focusReplaceButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetReplaceButton);
+};
+
+const focusToggleReplaceButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetToggleReplace);
+};
+
 const handleBlur = async state => {
   return {
     ...state,
@@ -2009,19 +2109,19 @@ const getKeyBindings = () => {
   }, {
     command: 'FindWidget.focusNextMatchButton',
     key: Tab,
-    when: FocusFindWidgetPreviousMatchButton
+    when: FocusFindWidgetPreviousMatchButton$1
   }, {
     command: 'FindWidget.focusReplace',
     key: Shift | Tab,
-    when: FocusFindWidgetPreviousMatchButton
+    when: FocusFindWidgetPreviousMatchButton$1
   }, {
     command: 'FindWidget.focusPreviousMatchButton',
     key: Shift | Tab,
-    when: FocusFindWidgetNextMatchButton
+    when: FocusFindWidgetNextMatchButton$1
   }, {
     command: 'FindWidget.focusCloseButton',
     key: Tab,
-    when: FocusFindWidgetNextMatchButton
+    when: FocusFindWidgetNextMatchButton$1
   }, {
     command: 'FindWidget.focusNextMatchButton',
     key: Shift | Tab,
@@ -2037,11 +2137,11 @@ const getKeyBindings = () => {
   }, {
     command: 'FindWidget.focusReplaceAllButton',
     key: Tab,
-    when: FocusFindWidgetReplaceButton
+    when: FocusFindWidgetReplaceButton$1
   }, {
     command: 'FindWidget.focusCloseButton',
     key: Shift | Tab,
-    when: FocusFindWidgetReplaceButton
+    when: FocusFindWidgetReplaceButton$1
   }, {
     command: 'FindWidget.focusReplaceButton',
     key: Shift | Tab,
@@ -2417,7 +2517,7 @@ const ViewletFindWidget = 'ViewletFindWidget';
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
-    className: `${MaskIcon} MaskIcon${icon}`,
+    className: mergeClassNames(MaskIcon, `MaskIcon${icon}`),
     role: None,
     type
   };
@@ -2431,10 +2531,7 @@ const getIconButtonVirtualDom = iconButton => {
     name,
     onClick
   } = iconButton;
-  let className = IconButton;
-  if (disabled) {
-    className += ' ' + IconButtonDisabled;
-  }
+  const className = mergeClassNames(IconButton, disabled ? IconButtonDisabled : '');
   return [{
     ariaLabel: label,
     childCount: 1,
@@ -2467,6 +2564,8 @@ const getMatchCountVirtualDom = (matchCountText, matchCount, hasValue, hasError
   }, text(matchCountText)];
 };
 
+const Focusable = 0;
+
 const checkedClassName = mergeClassNames(SearchFieldButton, SearchFieldButtonChecked);
 const unCheckedClassName = SearchFieldButton;
 const getSearchFieldButtonVirtualDom = button => {
@@ -2484,7 +2583,7 @@ const getSearchFieldButtonVirtualDom = button => {
     name,
     onClick,
     role: CheckBox,
-    tabIndex: 0,
+    tabIndex: Focusable,
     title,
     type: Button
   }, {
@@ -2531,6 +2630,11 @@ const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, out
   return dom;
 };
 
+const findWidgetFindNode = {
+  childCount: 2,
+  className: FindWidgetFind,
+  type: Div
+};
 const getExtraClassName = (hasError, inputFocused) => {
   if (hasError) {
     return SearchFieldError;
@@ -2542,11 +2646,7 @@ const getExtraClassName = (hasError, inputFocused) => {
 };
 const getFindWidgetFindVirtualDom = (matchCountText, buttons, fieldButtons, matchCount, hasValue, hasError, inputFocused) => {
   const extraClassName = getExtraClassName(hasError, inputFocused);
-  return [{
-    childCount: 2,
-    className: FindWidgetFind,
-    type: Div
-  }, ...getSearchFieldVirtualDom(SearchValue, find(), HandleInput, fieldButtons, [], HandleFocus, extraClassName, inputFocused, hasError ? 'FindWidgetInputError' : '', hasError ? 'true' : ''), {
+  return [findWidgetFindNode, ...getSearchFieldVirtualDom(SearchValue, find(), HandleInput, fieldButtons, [], HandleFocus, extraClassName, inputFocused, hasError ? 'FindWidgetInputError' : '', hasError ? 'true' : ''), {
     childCount: 1 + buttons.length,
     className: 'FindWidgetActions',
     type: Div
@@ -2565,17 +2665,19 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons, replace
   }, ...getSearchFieldVirtualDom(ReplaceValue, replace(), HandleReplaceInput, [], [], HandleReplaceFocus, extraClassName, replaceInputFocused), ...replaceButtons.flatMap(getIconButtonVirtualDom)];
 };
 
+const resizerNode = {
+  childCount: 1,
+  className: Resizer,
+  onPointerDown: HandleResizerPointerDown,
+  type: Div
+};
+const resizerHighlightNode = {
+  childCount: 0,
+  className: ResizerHighlight,
+  type: Div
+};
 const getResizerVirtualDom = () => {
-  return [{
-    childCount: 1,
-    className: Resizer,
-    onPointerDown: HandleResizerPointerDown,
-    type: Div
-  }, {
-    childCount: 0,
-    className: ResizerHighlight,
-    type: Div
-  }];
+  return [resizerNode, resizerHighlightNode];
 };
 
 const getSearchToggleButtonVirtualDom = (replaceExpanded, onClick = '') => {
@@ -2846,6 +2948,13 @@ const render2 = (uid, diffResult) => {
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
+const renderInstance = (instanceId, diffResult) => {
+  const uid = resolveUid(instanceId);
+  if (uid === undefined) {
+    return [];
+  }
+  return render2(uid, diffResult);
+};
 
 const resize = async (state, dimensions) => {
   return state;
@@ -2875,8 +2984,11 @@ const saveState = state => {
 const commandMap = {
   'FindWidget.close': wrapCommand(close$1),
   'FindWidget.create': create,
+  'FindWidget.createInstance': createInstance,
   'FindWidget.diff2': diff2,
+  'FindWidget.diffInstance': diffInstance,
   'FindWidget.dispose': dispose,
+  'FindWidget.disposeInstance': disposeInstance,
   'FindWidget.focusCloseButton': wrapCommand(focusCloseButton),
   'FindWidget.focusElement': wrapCommand(focusElement),
   'FindWidget.focusFind': wrapCommand(focusFind),
@@ -2885,10 +2997,14 @@ const commandMap = {
   'FindWidget.focusLast': wrapCommand(focusLast),
   'FindWidget.focusNext': wrapCommand(focusNext),
   'FindWidget.focusNextElement': wrapCommand(focusNextElement),
+  'FindWidget.focusNextMatchButton': wrapCommand(focusNextMatchButton),
   'FindWidget.focusPrevious': wrapCommand(focusPrevious),
   'FindWidget.focusPreviousElement': wrapCommand(focusPreviousElement),
+  'FindWidget.focusPreviousMatchButton': wrapCommand(focusPreviousMatchButton),
   'FindWidget.focusReplace': wrapCommand(focusReplace),
   'FindWidget.focusReplaceAllButton': wrapCommand(focusReplaceAllButton),
+  'FindWidget.focusReplaceButton': wrapCommand(focusReplaceButton),
+  'FindWidget.focusToggleReplace': wrapCommand(focusToggleReplaceButton),
   'FindWidget.getCommandIds': getCommandIds,
   'FindWidget.getKeyBindings': getKeyBindings,
   'FindWidget.handleBlur': wrapCommand(handleBlur),
@@ -2903,8 +3019,10 @@ const commandMap = {
   'FindWidget.handleResizerPointerUp': wrapCommand(handleResizerPointerUp),
   'FindWidget.handleToggleReplaceFocus': wrapCommand(handleToggleReplaceFocus),
   'FindWidget.loadContent': wrapCommand(loadContent),
+  'FindWidget.loadContentInstance': wrapInstanceCommand(loadContent),
   'FindWidget.preventDefaultBrowserFind': wrapCommand(preventDefaultBrowserFind),
   'FindWidget.render2': render2,
+  'FindWidget.renderInstance': renderInstance,
   'FindWidget.replace': wrapCommand(replace$1),
   'FindWidget.replaceAll': wrapCommand(replaceAll$1),
   'FindWidget.resize': wrapCommand(resize),

package/package.json

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