@lvce-editor/editor-worker 18.12.0 → 18.14.0

package/dist/editorWorkerMain.js

@@ -1229,7 +1229,6 @@ const SetFocusContext$1 = 'Viewlet.setFocusContext';
 const SetPatches = 'Viewlet.setPatches';
 
 const FocusEditorText$1 = 12;
-const FocusExplorer = 13;
 
 const {
   invoke: invoke$f,
@@ -1572,7 +1571,6 @@ const editorStates = create$9();
 const {
   getCommandIds,
   registerCommands,
-  wrapCommand,
   wrapGetter
 } = editorStates;
 const get$6 = id => {
@@ -1607,6 +1605,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     completionState: '',
     completionTriggerCharacters: [],
     completionUid: 0,
+    cursorInfos: [],
     cursorWidth: 2,
     debugEnabled: false,
     decorations: [],
@@ -1655,6 +1654,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     savedSelections: [],
     scrollBarHeight: 0,
     scrollBarWidth: 0,
+    selectionInfos: [],
     selections: new Uint32Array(),
     tabSize: 0,
     textInfos: [],
@@ -3666,6 +3666,7 @@ const setText$1 = (editor, text) => {
 };
 
 const emptyEditor = {
+  cursorInfos: [],
   debugEnabled: false,
   decorations: [],
   deltaX: 0,
@@ -3685,6 +3686,7 @@ const emptyEditor = {
   maxLineY: 0,
   minLineY: 0,
   scrollBarHeight: 0,
+  selectionInfos: [],
   selections: new Uint32Array(),
   textInfos: [],
   tokenizerId: 0,
@@ -3973,6 +3975,7 @@ const createEditor = async ({
     completionState: '',
     completionTriggerCharacters,
     completionUid: 0,
+    cursorInfos: [],
     cursorWidth: 2,
     decorations: [],
     deltaX: 0,
@@ -4016,6 +4019,7 @@ const createEditor = async ({
     savedSelections,
     scrollBarHeight: 0,
     scrollBarWidth: 0,
+    selectionInfos: [],
     selections: new Uint32Array(),
     tabSize,
     textInfos: [],
@@ -4089,7 +4093,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.lines === newState.lines && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial;
+  return oldState.lines === newState.lines && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.selections === newState.selections;
 };
 
 const RenderFocus = 6;
@@ -6337,6 +6341,22 @@ const handlePointerCaptureLost = editor => {
   return editor;
 };
 
+const handlePointerDown$1 = (state, button, altKey, ctrlKey, x, y, detail) => {
+  const modifier = 0;
+  const clickDetail = Single; // TODO
+  // console.log({ detail })
+  switch (clickDetail) {
+    case Double:
+      return handleDoubleClick(state, modifier, x, y);
+    case Single:
+      return handleSingleClick(state, modifier, x, y);
+    case Triple:
+      return handleTripleClick(state, modifier, x, y);
+    default:
+      return state;
+  }
+};
+
 const moveRectangleSelection = (editor, position) => {
   // @ts-ignore
   // const anchor = EditorMoveSelection.state.position
@@ -9531,29 +9551,28 @@ const InputBox = 'InputBox';
 const MaskIcon = 'MaskIcon';
 const Viewlet = 'Viewlet';
 
-const HandleBeforeInput = 'handleBeforeInput';
-const HandleBlur = 'handleBlur';
-const HandleClose = 'handleClose';
-const HandleCompositionEnd = 'handleCompositionEnd';
-const HandleCompositionStart = 'handleCompositionStart';
-const HandleCompositionUpdate = 'handleCompositionUpdate';
-const HandleContextMenu = 'handleContextMenu';
-const HandleCut = 'handleCut';
-const HandleFocus = 'handleFocus';
-const HandleMouseDown = 'handleMouseDown';
-const HandleMouseMove = 'handleMouseMove';
-const HandlePaste = 'handlePaste';
-const HandlePointerDown = 'handlePointerDown';
-const HandlePointerMove = 'handlePointerMove';
-const HandlePointerUp = 'handlePointerUp';
-const HandleSashPointerDown = 'handleSashPointerDown';
-const HandleScrollBarHorizontalPointerDown = 'handleScrollBarHorizontalPointerDown';
-const HandleScrollBarHorizontalPointerMove = 'handleScrollBarHorizontalPointerMove';
-const HandleScrollBarHorizontalPointerUp = 'handleScrollBarHorizontalPointerUp';
-const HandleScrollBarVerticalPointerDown = 'handleScrollBarVerticalPointerDown';
-const HandleScrollBarVerticalPointerMove = 'handleScrollBarVerticalPointerMove';
-const HandleScrollBarVerticalPointerUp = 'handleScrollBarVerticalPointerUp';
-const HandleWheel = 'handleWheel';
+const HandleBeforeInput = 1;
+const HandleBlur = 2;
+const HandleClose = 9;
+const HandleCompositionEnd = 10;
+const HandleCompositionStart = 11;
+const HandleCompositionUpdate = 12;
+const HandleContextMenu = 13;
+const HandleCut = 14;
+const HandleFocus = 15;
+const HandleMouseMove = 19;
+const HandlePaste = 20;
+const HandlePointerDown = 21;
+const HandlePointerMove = 22;
+const HandlePointerUp = 23;
+const HandleSashPointerDown = 26;
+const HandleScrollBarHorizontalPointerDown = 27;
+const HandleScrollBarHorizontalPointerMove = 28;
+const HandleScrollBarHorizontalPointerUp = 29;
+const HandleScrollBarVerticalPointerDown = 30;
+const HandleScrollBarVerticalPointerMove = 31;
+const HandleScrollBarVerticalPointerUp = 32;
+const HandleWheel = 33;
 
 const Div = 4;
 const Input = 6;
@@ -9878,6 +9897,24 @@ const unsetAdditionalFocus = async focusKey => {
   await invoke$c('Focus.removeAdditionalFocus', focusKey);
 };
 
+const shouldUpdateSelectionData = (oldState, newState) => {
+  return oldState.selections !== newState.selections || oldState.focused !== newState.focused || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.differences !== newState.differences || oldState.charWidth !== newState.charWidth || oldState.cursorWidth !== newState.cursorWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width;
+};
+const updateDerivedState = async (oldState, newState) => {
+  if (!shouldUpdateSelectionData(oldState, newState)) {
+    return newState;
+  }
+  const {
+    cursorInfos,
+    selectionInfos
+  } = await getVisible(newState);
+  return {
+    ...newState,
+    cursorInfos,
+    selectionInfos
+  };
+};
+
 const FocusEditor = 12;
 const FocusEditorCompletions = 9;
 const FocusEditorRename = 11;
@@ -9939,13 +9976,14 @@ const getSelections2 = editorUid => {
   } = editor;
   return selections;
 };
-const setSelections2 = (editorUid, selections) => {
+const setSelections2 = async (editorUid, selections) => {
   const editor = getEditor(editorUid);
   const newEditor = {
     ...editor,
     selections
   };
-  set$7(editorUid, editor, newEditor);
+  const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
+  set$7(editorUid, editor, newEditorWithDerivedState);
 };
 const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocus$1) => {
   const editor = getEditor(editorUid);
@@ -9964,7 +10002,8 @@ const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocu
     focused: true,
     widgets: newWidgets
   };
-  set$7(editorUid, editor, newEditor);
+  const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
+  set$7(editorUid, editor, newEditorWithDerivedState);
   await setFocus(FocusEditorText);
   if (unsetAdditionalFocus$1) {
     await unsetAdditionalFocus(unsetAdditionalFocus$1);
@@ -9976,7 +10015,8 @@ const closeFind2 = async editorUid => {
 const applyEdits2 = async (editorUid, edits) => {
   const editor = getEditor(editorUid);
   const newEditor = await applyEdit(editor, edits);
-  set$7(editorUid, editor, newEditor);
+  const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
+  set$7(editorUid, editor, newEditorWithDerivedState);
 };
 const getSourceActions = async editorUid => {
   const actions = await getEditorSourceActions(editorUid);
@@ -10786,6 +10826,7 @@ const intialize = async (syntaxHighlightingEnabled, syncIncremental) => {
 const kLineHeight = 'editor.lineHeight';
 const kFontSize = 'editor.fontSize';
 const kFontFamily = 'editor.fontFamily';
+const kLetterSpacing = 'editor.letterSpacing';
 const kTabSize = 'editor.tabSize';
 const kLineNumbers = 'editor.lineNumbers';
 const kDiagnostics = 'editor.diagnostics';
@@ -10815,9 +10856,10 @@ const getFontFamily = async () => {
   return (await get$1(kFontFamily)) || 'Fira Code';
 };
 const getLetterSpacing = async () => {
-  {
-    return 0;
-  }
+  // if (!false) {
+  //   return 0
+  // }
+  return (await get$1(kLetterSpacing)) ?? 0.5;
 };
 const getTabSize = async () => {
   return (await get$1(kTabSize)) || 2;
@@ -11049,7 +11091,7 @@ const renderFocus$2 = (oldState, newState) => {
 };
 
 const renderFocusContext$1 = (oldState, newState) => {
-  return [SetFocusContext$1, newState.uid, FocusExplorer];
+  return [SetFocusContext$1, newState.uid, FocusEditorText$1];
 };
 
 const SetText = 1;
@@ -11548,7 +11590,7 @@ const getEditorVirtualDom = ({
   }, ...selectionsDom, {
     childCount: textInfos.length,
     className: 'EditorRows',
-    onMouseDown: HandleMouseDown,
+    // onMouseDown: DomEventListenerFunctions.HandleMouseDown,
     onPointerDown: HandlePointerDown,
     type: Div
   }, ...rowsDom, {
@@ -11668,17 +11710,17 @@ const renderLines = {
   }
 };
 const renderSelections = {
-  apply: async (oldState, newState) => {
+  apply: (oldState, newState) => {
     const {
-      cursorInfos,
-      selectionInfos
-    } = await getVisible(newState);
+      cursorInfos = [],
+      selectionInfos = []
+    } = newState;
     const cursorsDom = getCursorsVirtualDom(cursorInfos);
     const selectionsDom = getSelectionsVirtualDom(selectionInfos);
     return [/* method */'setSelections', cursorsDom, selectionsDom];
   },
   isEqual(oldState, newState) {
-    return oldState.selections === newState.selections && oldState.focused === newState.focused && oldState.minLineY === newState.minLineY && oldState.deltaX === newState.deltaX;
+    return oldState.cursorInfos === newState.cursorInfos && oldState.selectionInfos === newState.selectionInfos;
   }
 };
 const renderScrollBarY = {
@@ -11872,12 +11914,9 @@ const renderEventListeners = () => {
     name: HandlePaste,
     params: ['paste', 'event.clipboardData ? event.clipboardData.getData("text/plain") : ""'],
     preventDefault: true
-  }, {
-    name: HandleMouseDown,
-    params: ['handleMouseDown', 'event.button === 2 ? -1 : (((event.metaKey || event.ctrlKey) ? 2048 : 0) | (event.shiftKey ? 1024 : 0) | (event.altKey ? 512 : 0))', ClientX, ClientY, 'event.button === 2 ? 0 : event.detail']
   }, {
     name: HandlePointerDown,
-    params: [],
+    params: ['handlePointerDown', 'event.button', 'event.altKey', 'event.ctrlKey', ClientX, ClientY],
     trackPointerEvents: [HandlePointerMove, HandlePointerUp]
   }, {
     name: HandlePointerMove,
@@ -11974,6 +12013,25 @@ const updateDebugInfo = async debugId => {
   await invoke$c('Editor.rerender', key);
 };
 
+// TODO wrap commands globally, not per editor
+// TODO only store editor state in editor worker, not in renderer worker also
+
+const wrapCommand = fn => async (editorUid, ...args) => {
+  const oldInstance = get$6(editorUid);
+  const state = oldInstance.newState;
+  const newEditor = await fn(state, ...args);
+  if (state === newEditor) {
+    return newEditor;
+  }
+  const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
+  // TODO if editor did not change, no need to update furthur
+
+  // TODO combine neweditor with latest editor?
+
+  set$7(editorUid, state, newEditorWithDerivedState);
+  return newEditorWithDerivedState;
+};
+
 const wrapCommandOld = wrapCommand;
 const commandMap = {
   'ActivateByEvent.activateByEvent': activateByEvent,
@@ -12060,7 +12118,7 @@ const commandMap = {
   'Editor.handleBeforeInput': wrapCommandOld(handleBeforeInput),
   'Editor.handleBeforeInputFromContentEditable': wrapCommandOld(handleBeforeInputFromContentEditable),
   'Editor.handleBlur': wrapCommandOld(handleBlur$1),
-  'Editor.handleClickAtPosition': handleClickAtPosition,
+  'Editor.handleClickAtPosition': wrapCommandOld(handleClickAtPosition),
   'Editor.handleContextMenu': wrapCommandOld(handleContextMenu),
   'Editor.handleDoubleClick': wrapCommandOld(handleDoubleClick),
   'Editor.handleFocus': wrapCommandOld(handleFocus$1),
@@ -12069,6 +12127,7 @@ const commandMap = {
   'Editor.handleMouseMoveWithAltKey': wrapCommandOld(handleMouseMoveWithAltKey),
   'Editor.handleNativeSelectionChange': editorHandleNativeSelectionChange,
   'Editor.handlePointerCaptureLost': wrapCommandOld(handlePointerCaptureLost),
+  'Editor.handlePointerDown': wrapCommandOld(handlePointerDown$1),
   'Editor.handlePointerMove': wrapCommandOld(handlePointerMove),
   'Editor.handlePointerUp': wrapCommandOld(handlePointerUp),
   'Editor.handleScrollBarClick': handleScrollBarPointerDown,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "18.12.0",
+  "version": "18.14.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"