@lvce-editor/editor-worker 3.13.0 → 3.15.0

package/dist/editorWorkerMain.js

@@ -1,3 +1,23 @@
+const commands = Object.create(null);
+const registerCommand = (key, fn) => {
+  commands[key] = fn;
+};
+const register$1 = commandMap => {
+  for (const [key, value] of Object.entries(commandMap)) {
+    registerCommand(key, value);
+  }
+};
+const getCommand = key => {
+  return commands[key];
+};
+const execute$1 = (command, ...args) => {
+  const fn = getCommand(command);
+  if (!fn) {
+    throw new Error(`command not found ${command}`);
+  }
+  return fn(...args);
+};
+
 let AssertionError$1 = class AssertionError extends Error {
   constructor(message) {
     super(message);
@@ -121,7 +141,7 @@ const IconButtonDisabled = 'IconButtonDisabled';
 const IconButton = 'IconButton';
 const CompletionDetailContent = 'CompletionDetailContent';
 const Diagnostic = 'Diagnostic';
-const FindWidgetReplace$1 = 'FindWidgetReplace';
+const FindWidgetReplace = 'FindWidgetReplace';
 const FindWidgetFind = 'FindWidgetFind';
 const FindWidgetMatchCount = 'FindWidgetMatchCount';
 const FindWidgetRight = 'FindWidgetRight';
@@ -611,15 +631,15 @@ const createMeasureContext = () => {
   return ctx;
 };
 
-const state$b = {
+const state$a = {
   ctx: undefined
 };
 const getOrCreate = createCtx => {
-  if (state$b.ctx) {
-    return state$b.ctx;
+  if (state$a.ctx) {
+    return state$a.ctx;
   }
-  state$b.ctx = createCtx();
-  return state$b.ctx;
+  state$a.ctx = createCtx();
+  return state$a.ctx;
 };
 
 const getContext = () => {
@@ -1200,11 +1220,11 @@ const get$6 = id => {
 const remove$4 = id => {
   delete state$1$1.callbacks[id];
 };
-const state$a = {
+const state$9 = {
   id: 0
 };
 const create$3$1 = () => {
-  return ++state$a.id;
+  return ++state$9.id;
 };
 const warn$1 = (...args) => {
   console.warn(...args);
@@ -1531,38 +1551,6 @@ const invokeAndTransfer$2 = async (ipc, method, ...params) => {
   return result;
 };
 
-const state$9 = {
-  commands: Object.create(null)
-};
-
-// @ts-ignore
-const registerCommand = (key, fn) => {
-  state$9.commands[key] = fn;
-};
-
-// @ts-ignore
-const registerCommands = commandMap => {
-  for (const [key, value] of Object.entries(commandMap)) {
-    registerCommand(key, value);
-  }
-};
-
-// @ts-ignore
-const getCommand = key => {
-  return state$9.commands[key];
-};
-
-const processName = 'editor-worker';
-
-// @ts-ignore
-const execute$1 = (command, ...args) => {
-  const fn = getCommand(command);
-  if (!fn) {
-    throw new Error(`[${processName}] command not found ${command}`);
-  }
-  return fn(...args);
-};
-
 const requiresSocket = () => {
   return false;
 };
@@ -2512,13 +2500,13 @@ const FindWidget = 16;
 const EditorCompletion = 9;
 const CompletionDetail = 999;
 const Empty = 0;
-const FindWidgetToggleReplace = 42;
-const FindWidgetReplace = 43;
-const FindWidgetReplaceButton = 46;
-const FindWidgetReplaceAllButton = 47;
-const FindWidgetCloseButton = 48;
-const FindWidgetFocusNext = 49;
-const FindWidgetFocusPrevious = 50;
+const FocusFindWidgetToggleReplace = 42;
+const FocusFindWidgetReplace = 43;
+const FocusFindWidgetReplaceButton = 46;
+const FocusFindWidgetReplaceAllButton = 47;
+const FocusFindWidgetCloseButton = 48;
+const FocusFindWidgetNextMatchButton = 49;
+const FocusFindWidgetPreviousMatchButton = 50;
 
 const newStateGenerator = state => {
   return loadContent$3(state);
@@ -3639,7 +3627,7 @@ const handleDoubleClick = (editor, modifier, x, y) => {
 };
 
 const WhenExpressionEditorText = 12;
-const handleFocus$1 = editor => {
+const handleFocus = editor => {
   // TODO make change events functional,
   // when rendering, send focus changes to renderer worker
   invoke$3('Focus.setFocus', WhenExpressionEditorText);
@@ -3656,7 +3644,7 @@ const state$5 = {
     columnIndex: 0
   }
 };
-const getPosition$2 = () => {
+const getPosition$1 = () => {
   return state$5.position;
 };
 
@@ -3976,7 +3964,7 @@ const setPosition = position => {
 const getEditor$1 = () => {
   return state$3.currentEditor;
 };
-const getPosition$1 = () => {
+const getPosition = () => {
   return state$3.position;
 };
 const hasListener = () => {
@@ -4221,7 +4209,7 @@ const getNewSelections$5 = (anchor, position) => {
 
 // @ts-ignore
 const editorMoveSelection = (editor, position) => {
-  const anchor = getPosition$2();
+  const anchor = getPosition$1();
   const newSelections = getNewSelections$5(anchor, position);
   // TODO if selection equals previous selection -> do nothing
   return scheduleSelections(editor, newSelections);
@@ -4508,7 +4496,7 @@ const getNewEditor$1 = (editor, position) => {
     const newMinLineY = position.rowIndex;
     const newMaxLineY = position.rowIndex + diff;
     const newDeltaY = position.rowIndex * rowHeight;
-    const anchor = getPosition$2();
+    const anchor = getPosition$1();
     const newSelections = new Uint32Array([position.rowIndex - 1, position.columnIndex, anchor.rowIndex, anchor.columnIndex]);
     return {
       ...editor,
@@ -4523,7 +4511,7 @@ const getNewEditor$1 = (editor, position) => {
     const newMinLineY = position.rowIndex - diff;
     const newMaxLineY = position.rowIndex;
     const newDeltaY = newMinLineY * rowHeight;
-    const anchor = getPosition$2();
+    const anchor = getPosition$1();
     const newSelections = new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex + 1, position.columnIndex]);
     return {
       ...editor,
@@ -4540,7 +4528,7 @@ const continueScrollingAndMovingSelection = async () => {
   if (!editor) {
     return;
   }
-  const position = getPosition$1();
+  const position = getPosition();
   if (position.rowIndex === 0) {
     return;
   }
@@ -5181,22 +5169,14 @@ const findMatchesCaseInsensitive = (lines, searchString) => {
   return findRegexMatches(lines, regex);
 };
 
-const getFindWidgetHeight = replaceExpanded => {
-  const collapsedHeight = 30;
-  const expandedHeight = 60;
-  const newHeight = replaceExpanded ? expandedHeight : collapsedHeight;
-  return newHeight;
-};
-
 const getMatchCount = matches => {
   return matches.length / 2;
 };
 
-const setFindWidgetFocus = async (state, focusKey) => {
+const setFindWidgetFocus = (state, focusKey) => {
   if (state.focus === focusKey) {
     return state;
   }
-  await setFocus(focusKey);
   return {
     ...state,
     focus: focusKey,
@@ -5204,88 +5184,15 @@ const setFindWidgetFocus = async (state, focusKey) => {
   };
 };
 
-const getPosition = editor => {
-  const width = 300;
-  const height = 30;
-  const paddingTop = 10;
-  const paddingRight = 20;
-  const x = editor.x + editor.width - width - paddingRight;
-  const y = editor.y + paddingTop;
-  return {
-    y,
-    x,
-    width,
-    height
-  };
+const focusCloseButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetCloseButton);
 };
-const loadContent$1 = editorId => {
-  const editor = getEditor(editorId);
-  const {
-    selections,
-    lines
-  } = editor;
-  const startRowIndex = selections[0];
-  const startColumnIndex = selections[1];
-  const endColumnIndex = selections[3];
-  const line = lines[startRowIndex];
-  const value = line.slice(startColumnIndex, endColumnIndex);
-  const matches = findMatchesCaseInsensitive(lines, value);
-  const matchCount = getMatchCount(matches);
-  return {
-    value,
-    matches,
-    matchIndex: 0,
-    matchCount,
-    editorUid: editor.uid
-  };
-};
-const refresh = (state, value = state.value) => {
-  // TODO get focused editor
-  const {
-    editorUid
-  } = state;
-  // highlight locations that match value
-  const editor = getEditor(editorUid);
-  const {
-    lines
-  } = editor;
-  const matches = findMatchesCaseInsensitive(lines, value);
-  const matchCount = getMatchCount(matches);
-  return {
-    ...state,
-    matches,
-    matchIndex: 0,
-    matchCount,
-    value
-  };
-};
-const handleInput = (state, value) => {
-  return refresh(state, value);
-};
-const handleFocus = async state => {
-  if (state.focus === FindWidget) {
-    return state;
-  }
-  await setFocus(FindWidget);
-  return {
-    ...state,
-    focus: FindWidget
-  };
-};
-const handleBlur = async state => {
-  await setFocus(Empty);
-  return state;
-};
-const toggleReplace = state => {
-  const newExpanded = !state.replaceExpanded;
-  const newHeight = getFindWidgetHeight(newExpanded);
-  return {
-    ...state,
-    replaceExpanded: !state.replaceExpanded,
-    height: newHeight
-  };
+
+const focusFind = state => {
+  return setFindWidgetFocus(state, FindWidget);
 };
 
+// TODO don't call renderer worker, set editor state
 // TODO this function should be synchronous
 const focusIndex$1 = async (state, index) => {
   const {
@@ -5338,64 +5245,152 @@ const focusPrevious$1 = state => {
   }
   return focusIndex$1(state, matchIndex - 1);
 };
-const close$1 = async state => {
-  // TODO
-  // await Viewlet.closeWidget(uid)
-  return {
-    ...state,
-    disposed: true
-  };
+
+const focusNextMatchButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetNextMatchButton);
 };
-const handleToggleReplaceFocus = async state => {
-  if (state.focus === FindWidgetToggleReplace) {
+
+const focusPreviousMatchButton = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetPreviousMatchButton);
+};
+
+const focusReplace = state => {
+  return setFindWidgetFocus(state, FocusFindWidgetReplace);
+};
+
+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 => {
+  await setFocus(Empty);
+  return state;
+};
+
+const handleFindWidgetFocus = (state, focusKey) => {
+  if (state.focus === focusKey) {
     return state;
   }
-  await setFocus(FindWidgetToggleReplace);
   return {
     ...state,
-    focus: FindWidgetToggleReplace
+    focus: focusKey,
+    focusSource: User
   };
 };
-const handleReplaceFocus = async state => {
-  if (state.focus === FindWidgetReplace) {
-    return state;
-  }
-  await setFocus(FindWidgetReplace);
+
+const handleReplaceAllFocus = state => {
+  return handleFindWidgetFocus(state, FocusFindWidgetReplaceAllButton);
+};
+
+const handleReplaceFocus = state => {
+  return handleFindWidgetFocus(state, FocusFindWidgetReplace);
+};
+
+const getFindWidgetHeight = replaceExpanded => {
+  const collapsedHeight = 30;
+  const expandedHeight = 60;
+  const newHeight = replaceExpanded ? expandedHeight : collapsedHeight;
+  return newHeight;
+};
+
+const toggleReplace = state => {
+  const newExpanded = !state.replaceExpanded;
+  const newHeight = getFindWidgetHeight(newExpanded);
   return {
     ...state,
-    focus: FindWidgetReplace,
-    focusSource: User
+    replaceExpanded: !state.replaceExpanded,
+    height: newHeight
   };
 };
-const focusReplace = state => {
-  return setFindWidgetFocus(state, FindWidgetReplace);
+
+const loadContent$1 = editorId => {
+  const editor = getEditor(editorId);
+  const {
+    selections,
+    lines
+  } = editor;
+  const startRowIndex = selections[0];
+  const startColumnIndex = selections[1];
+  const endColumnIndex = selections[3];
+  const line = lines[startRowIndex];
+  const value = line.slice(startColumnIndex, endColumnIndex);
+  const matches = findMatchesCaseInsensitive(lines, value);
+  const matchCount = getMatchCount(matches);
+  return {
+    value,
+    matches,
+    matchIndex: 0,
+    matchCount,
+    editorUid: editor.uid
+  };
 };
-const focusFind = state => {
-  return setFindWidgetFocus(state, FindWidget);
+const refresh = (state, value = state.value) => {
+  // TODO get focused editor
+  const {
+    editorUid
+  } = state;
+  // highlight locations that match value
+  const editor = getEditor(editorUid);
+  const {
+    lines
+  } = editor;
+  const matches = findMatchesCaseInsensitive(lines, value);
+  const matchCount = getMatchCount(matches);
+  return {
+    ...state,
+    matches,
+    matchIndex: 0,
+    matchCount,
+    value
+  };
 };
-const handleReplaceInput = state => {
-  // TODO
-  return state;
+const handleInput = (state, value) => {
+  return refresh(state, value);
 };
-const focusToggleReplace = async state => {
-  return setFindWidgetFocus(state, FindWidgetToggleReplace);
+const close$1 = async state => {
+  // TODO
+  // await Viewlet.closeWidget(uid)
+  return {
+    ...state,
+    disposed: true
+  };
 };
-const handleReplaceAllFocus = async state => {
-  if (state.focus === FindWidgetReplaceAllButton) {
+const handleToggleReplaceFocus = async state => {
+  if (state.focus === FocusFindWidgetToggleReplace) {
     return state;
   }
-  await setFocus(FindWidgetReplaceAllButton);
+  await setFocus(FocusFindWidgetToggleReplace);
   return {
     ...state,
-    focus: FindWidgetReplaceAllButton
+    focus: FocusFindWidgetToggleReplace
   };
 };
-const focusReplaceButton = async state => {
-  console.log('f replace button');
-  return setFindWidgetFocus(state, FindWidgetReplaceButton);
+const handleReplaceInput = state => {
+  // TODO
+  return state;
 };
-const focusReplaceAllButton = async state => {
-  return setFindWidgetFocus(state, FindWidgetReplaceAllButton);
+
+const getFindWidgetPosition = editor => {
+  const width = 300;
+  const height = 30;
+  const paddingTop = 10;
+  const paddingRight = 20;
+  const x = editor.x + editor.width - width - paddingRight;
+  const y = editor.y + paddingTop;
+  return {
+    y,
+    x,
+    width,
+    height
+  };
 };
 
 const openFind2 = async editor => {
@@ -5411,7 +5406,7 @@ const openFind2 = async editor => {
       y,
       width,
       height
-    } = getPosition(editor);
+    } = getFindWidgetPosition(editor);
     const latestState = {
       ...state,
       value,
@@ -8735,7 +8730,10 @@ const widgetCommands = {
   'FindWidget.focusToggleReplace': Find,
   'FindWidget.focusReplace': Find,
   'FindWidget.focusReplaceButton': Find,
-  'FindWidget.focusReplaceAllButton': Find
+  'FindWidget.focusReplaceAllButton': Find,
+  'FindWidget.focusNextMatchButton': Find,
+  'FindWidget.focusPreviousMatchButton': Find,
+  'FindWidget.focusCloseButton': Find
 };
 
 // TODO wrap commands globally, not per editor
@@ -8818,7 +8816,7 @@ const commandMap = {
   'Editor.handleBlur': handleBlur$1,
   'Editor.handleContextMenu': handleContextMenu,
   'Editor.handleDoubleClick': handleDoubleClick,
-  'Editor.handleFocus': handleFocus$1,
+  'Editor.handleFocus': handleFocus,
   'Editor.handleMouseDown': handleMouseDown,
   'Editor.handleMouseMove': handleMouseMove,
   'Editor.handleMouseMoveWithAltKey': handleMouseMoveWithAltKey,
@@ -8910,20 +8908,23 @@ const commandMap = {
   'FindWidget.focusIndex': focusIndex$1,
   'FindWidget.focusLast': focusLast,
   'FindWidget.focusNext': focusNext$1,
+  'FindWidget.focusNextMatchButton': focusNextMatchButton,
   'FindWidget.focusPrevious': focusPrevious$1,
+  'FindWidget.focusPreviousMatchButton': focusPreviousMatchButton,
   'FindWidget.focusReplace': focusReplace,
-  'FindWidget.focusToggleReplace': focusToggleReplace,
+  'FindWidget.focusReplaceAllButton': focusReplaceAllButton,
+  'FindWidget.focusReplaceButton': focusReplaceButton,
+  'FindWidget.focusToggleReplace': focusToggleReplaceButton,
   'FindWidget.handleBlur': handleBlur,
-  'FindWidget.handleFocus': handleFocus,
+  'FindWidget.handleFocus': handleFindWidgetFocus,
   'FindWidget.handleInput': handleInput,
+  'FindWidget.handleReplaceAllFocus': handleReplaceAllFocus,
   'FindWidget.handleReplaceFocus': handleReplaceFocus,
   'FindWidget.handleReplaceInput': handleReplaceInput,
+  'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
   'FindWidget.loadContent': loadContent$1,
   'FindWidget.toggleReplace': toggleReplace,
-  'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
-  'FindWidget.handleReplaceAllFocus': handleReplaceAllFocus,
-  'FindWidget.focusReplaceButton': focusReplaceButton,
-  'FindWidget.focusReplaceAllButton': focusReplaceAllButton,
+  'FindWidget.focusCloseButton': focusCloseButton,
   'Font.ensure': ensure,
   'Hover.getHoverInfo': getEditorHoverInfo,
   'Hover.handleSashPointerDown': handleSashPointerDown,
@@ -9767,7 +9768,7 @@ const listen$1 = async ({
 };
 
 const listen = async () => {
-  registerCommands(commandMap);
+  register$1(commandMap);
   register(Completion, EditorCompletionWidget);
   const ipc = await listen$1({
     method: Auto()
@@ -10056,19 +10057,19 @@ const getFindWidgetFocusSelector = focus => {
   switch (focus) {
     case FindWidget:
       return `[name="${SearchValue}"]`;
-    case FindWidgetReplace:
+    case FocusFindWidgetReplace:
       return `[name="${ReplaceValue}"]`;
-    case FindWidgetReplaceAllButton:
+    case FocusFindWidgetReplaceAllButton:
       return `[name="${ReplaceAll}"]`;
-    case FindWidgetCloseButton:
+    case FocusFindWidgetCloseButton:
       return `[name="${Close}"]`;
-    case FindWidgetToggleReplace:
+    case FocusFindWidgetToggleReplace:
       return `[name="${ToggleReplace}"]`;
-    case FindWidgetFocusNext:
+    case FocusFindWidgetNextMatchButton:
       return `[name="${FocusNext}"]`;
-    case FindWidgetFocusPrevious:
+    case FocusFindWidgetPreviousMatchButton:
       return `[name="${FocusPrevious}"]`;
-    case FindWidgetReplaceButton:
+    case FocusFindWidgetReplaceButton:
       return `[name="${Replace}"]`;
     default:
       return '';
@@ -10178,7 +10179,7 @@ const getFindWidgetReplaceVirtualDom = (replaceExpanded, replaceButtons) => {
   if (replaceExpanded) {
     dom.push({
       type: Div,
-      className: FindWidgetReplace$1,
+      className: FindWidgetReplace,
       childCount: 1 + replaceButtons.length
     }, ...getSearchFieldVirtualDom('replace-value', replace(), 'handleReplaceInput', [], [], 'handleReplaceFocus'), ...replaceButtons.flatMap(getIconButtonVirtualDom));
   }
@@ -10300,6 +10301,10 @@ const renderFocus = {
 
 const render$1 = [renderDetails, renderBounds, renderValue, renderFocus];
 const apply = (oldState, newState) => {
+  // TODO avoid side effect
+  if (oldState.focus !== newState.focus) {
+    setFocus(newState.focus);
+  }
   return renderParts(render$1, oldState, newState);
 };
 
@@ -10327,7 +10332,7 @@ const Commands = {
   'FindWidget.focusIndex': focusIndex$1,
   'FindWidget.focusLast': focusLast,
   'FindWidget.toggleReplace': toggleReplace,
-  'FindWidget.handleFocus': handleFocus,
+  'FindWidget.handleFocus': focusFind,
   'FindWidget.handleBlur': handleBlur
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "3.13.0",
+  "version": "3.15.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",