@lvce-editor/editor-worker 10.2.0 → 11.1.0

package/dist/editorWorkerMain.js

@@ -1118,6 +1118,8 @@ const ExtensionHostWorker = 44;
 const MarkdownWorker = 300;
 const RendererWorker$1 = 1;
 
+const FocusEditorText$1 = 12;
+
 const rpcs = Object.create(null);
 const set$c = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1348,7 +1350,7 @@ const getIcons = async requests => {
 const activateByEvent$1 = event => {
   return invoke$b('ExtensionHostManagement.activateByEvent', event);
 };
-const setAdditionalFocus$1 = focusKey => {
+const setAdditionalFocus = focusKey => {
   // @ts-ignore
   return invoke$b('Focus.setAdditionalFocus', focusKey);
 };
@@ -1530,7 +1532,7 @@ const RendererWorker = {
   sendMessagePortToSearchProcess,
   sendMessagePortToSyntaxHighlightingWorker: sendMessagePortToSyntaxHighlightingWorker$1,
   set: set$a,
-  setAdditionalFocus: setAdditionalFocus$1,
+  setAdditionalFocus,
   setColorTheme,
   setExtensionsSearchValue,
   setFocus: setFocus$1,
@@ -3599,6 +3601,7 @@ const createEditor = async ({
   const newEditor4 = {
     ...newEditor3,
     focused: true,
+    focus: FocusEditorText$1,
     textInfos,
     differences
   };
@@ -3762,13 +3765,12 @@ const applyWorkspaceEdit = async (editor, changes) => {
 };
 
 const handleBlur$1 = editor => {
-  if (editor.focusKey !== Empty) {
+  if (!editor.focused) {
     return editor;
   }
   const newEditor = {
     ...editor,
-    focused: false,
-    focusKey: Empty
+    focused: false
   };
   return newEditor;
 };
@@ -4212,25 +4214,6 @@ const hasWidget = (widgets, id) => {
   return false;
 };
 
-const setAdditionalFocus = async focusKey => {
-  // @ts-ignore
-  await invoke$9('Focus.setAdditionalFocus', focusKey);
-};
-
-const setFocus = async focusKey => {
-  if (!focusKey) {
-    return;
-  }
-  await invoke$9('Focus.setFocus', focusKey);
-};
-const unsetAdditionalFocus = async focusKey => {
-  if (!focusKey) {
-    return;
-  }
-  // @ts-ignore
-  await invoke$9('Focus.removeAdditionalFocus', focusKey);
-};
-
 const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGenerator, fullFocus) => {
   const {
     widgets
@@ -4249,14 +4232,13 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
     newState
   };
   const newWidgets = [...widgets, latestWidget];
-  // TODO avoid side effect, apply focus shift during render
-  await (fullFocus ? setFocus(focusKey) : setAdditionalFocus(focusKey));
   const newFocus = !fullFocus;
   const newEditor = {
     ...editor,
     widgets: newWidgets,
-    focusKey,
-    focused: newFocus
+    focused: newFocus,
+    focus: fullFocus ? focusKey : FocusEditorText$1,
+    additionalFocus: fullFocus ? 0 : focusKey
   };
   return newEditor;
 };
@@ -4925,7 +4907,7 @@ const getChanges$4 = (editor, getDelta) => {
     } = editor;
     for (let i = 0; i < selections.length; i += 4) {
       // @ts-ignore
-      const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(selections, i);
+      const [selectionStartRow, selectionStartColumn] = getSelectionPairs(selections, i);
       const start = {
         rowIndex: selectionStartRow,
         columnIndex: selectionStartColumn
@@ -5520,12 +5502,16 @@ const handleDoubleClick = (editor, modifier, x, y) => {
   return selectWord(editor, position.rowIndex, position.columnIndex);
 };
 
-const WhenExpressionEditorText = 12;
 const handleFocus$1 = editor => {
-  // TODO make change events functional,
-  // when rendering, send focus changes to renderer worker
-  invoke$9('Focus.setFocus', WhenExpressionEditorText);
-  return editor;
+  if (editor.focused && editor.focus === FocusEditorText$1) {
+    return editor;
+  }
+  return {
+    ...editor,
+    focused: true,
+    focus: FocusEditorText$1,
+    additionalFocus: 0
+  };
 };
 
 const Single = 1;
@@ -6867,7 +6853,7 @@ const getNewSelections$4 = (selections, lines, getDelta) => {
   const newSelections = clone(selections);
   for (let i = 0; i < selections.length; i += 4) {
     // @ts-ignore
-    const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn, reversed] = getSelectionPairs(selections, i);
+    const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(selections, i);
     if (selectionStartRow === selectionEndRow && selectionStartColumn === selectionEndColumn) {
       moveToPositionLeft(newSelections, i + 2, selectionStartRow, selectionStartColumn, lines, getDelta);
       moveToPositionEqual(newSelections, i, selectionEndRow, selectionEndColumn);
@@ -9235,6 +9221,17 @@ const getWordAtOffset = editor => {
   return '';
 };
 
+const setFocus = async focusKey => {
+  await invoke$9('Focus.setFocus', focusKey);
+};
+const unsetAdditionalFocus = async focusKey => {
+  if (!focusKey) {
+    return;
+  }
+  // @ts-ignore
+  await invoke$9('Focus.removeAdditionalFocus', focusKey);
+};
+
 const FocusEditor = 12;
 const FocusEditorCompletions = 9;
 const FocusEditorRename = 11;
@@ -10324,14 +10321,28 @@ const renderFocus$1 = {
     return oldState.focused === newState.focused;
   },
   apply(oldState, newState) {
-    // TODO avoid side effect
-    if (newState.focused) {
-      const FocusEditorText = 12;
-      invoke$9('Focus.setFocus', FocusEditorText);
-    }
     return [/* method */'setFocused', newState.focused];
   }
 };
+const renderFocusContext = {
+  isEqual(oldState, newState) {
+    return oldState.focus === newState.focus;
+  },
+  apply(oldState, newState) {
+    return ['Viewlet.setFocusContext', newState.uid, newState.focus];
+  }
+};
+const renderAdditionalFocusContext = {
+  isEqual(oldState, newState) {
+    return newState.additionalFocus === newState.additionalFocus;
+  },
+  apply(oldState, newState) {
+    if (newState.additionalFocus) {
+      return ['Focus.setAdditionalFocus', newState.uid, newState.additionalFocus];
+    }
+    return ['Focus.unsetAdditionalFocus', newState.uid, newState.additionalFocus];
+  }
+};
 const renderDecorations = {
   isEqual(oldState, newState) {
     return oldState.decorations === newState.decorations;
@@ -10413,11 +10424,12 @@ const renderWidgets = {
       }
     }
     const allCommands = [...addCommands, ...changeCommands, ...removeCommands];
-    return allCommands;
+    const filteredCommands = allCommands.filter(item => item[0] !== 'Viewlet.setFocusContext');
+    return filteredCommands;
   },
   multiple: true
 };
-const render$6 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets];
+const render$6 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets, renderFocusContext, renderAdditionalFocusContext];
 const renderEditor = id => {
   const instance = get$4(id);
   if (!instance) {
@@ -10562,8 +10574,9 @@ const widgetCommands = {
 const effects = [editorDiagnosticEffect];
 const wrapCommand = fn => async (editorUid, ...args) => {
   const oldInstance = get$4(editorUid);
-  const newEditor = await fn(oldInstance.newState, ...args);
-  if (oldInstance.newState === newEditor) {
+  const state = oldInstance.newState;
+  const newEditor = await fn(state, ...args);
+  if (state === newEditor) {
     return newEditor;
   }
   for (const effect of effects) {
@@ -10575,7 +10588,7 @@ const wrapCommand = fn => async (editorUid, ...args) => {
 
   // TODO combine neweditor with latest editor?
 
-  set$6(editorUid, oldInstance.newState, newEditor);
+  set$6(editorUid, state, newEditor);
   const commands = renderEditor(editorUid);
   return {
     ...newEditor,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "10.2.0",
+  "version": "11.1.0",
   "license": "MIT",
   "author": "Lvce Editor",
   "type": "module",
   "main": "dist/editorWorkerMain.js",
   "dependencies": {
-    "@lvce-editor/constants": "^1.23.0"
+    "@lvce-editor/constants": "^1.24.0"
   }
 }