@lvce-editor/editor-worker 19.51.1 → 19.53.0

package/dist/editorWorkerMain.js

@@ -5249,8 +5249,8 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
       rowIndex: 0
     },
     selectionAutoMovePosition: {
-      columnIndex: 0,
-      rowIndex: 0
+      x: 0,
+      y: 0
     },
     selectionInfos: [],
     selections: new Uint32Array(),
@@ -5326,8 +5326,8 @@ const emptyEditor = {
     rowIndex: 0
   },
   selectionAutoMovePosition: {
-    columnIndex: 0,
-    rowIndex: 0
+    x: 0,
+    y: 0
   },
   selectionInfos: [],
   selections: new Uint32Array(),
@@ -5420,7 +5420,8 @@ const getLanguages = async (platform, assetDir) => {
 };
 
 const measureCharacterWidth = async (fontWeight, fontSize, fontFamily, letterSpacing) => {
-  return await measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
+  const width = await measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
+  return width + letterSpacing;
 };
 
 const normalizeLineEndings = content => {
@@ -5548,8 +5549,8 @@ const createEditor = async ({
       rowIndex: 0
     },
     selectionAutoMovePosition: {
-      columnIndex: 0,
-      rowIndex: 0
+      x: 0,
+      y: 0
     },
     selectionInfos: [],
     selections: new Uint32Array(),
@@ -6435,7 +6436,7 @@ const format = async editor => {
 };
 
 // @ts-ignore
-const getNewEditor$1 = async editor => {
+const getNewEditor = async editor => {
   return editor;
 };
 
@@ -6501,7 +6502,7 @@ const save = async editor => {
       platform,
       uri
     } = editor;
-    const newEditor = await getNewEditor$1(editor);
+    const newEditor = await getNewEditor(editor);
     const content = applyLineEndings(getText$1(newEditor), newEditor.endOfLine);
     if (isUntitledFile(uri)) {
       const pickedFilePath = await saveUntitledFile(uri, content, platform);
@@ -7366,10 +7367,7 @@ const copy$1 = async editor => {
     lines,
     selections
   } = editor;
-  const selectionStartRowIndex = selections[0];
-  const selectionStartColumnIndex = selections[1];
-  const selectionEndRowIndex = selections[2];
-  const selectionEndColumnIndex = selections[3];
+  const [selectionStartRowIndex, selectionStartColumnIndex, selectionEndRowIndex, selectionEndColumnIndex] = getSelectionPairs(selections, 0);
   const copyFullLine = shouldCopyFullLine(selectionStartRowIndex, selectionStartColumnIndex, selectionEndRowIndex, selectionEndColumnIndex);
   const range = getSelectionRange(lines, copyFullLine, selectionStartRowIndex, selectionStartColumnIndex, selectionEndRowIndex, selectionEndColumnIndex);
   const selectedLines = getSelectionText(editor, range);
@@ -9531,8 +9529,8 @@ const handlePointerCaptureLost = async editor => {
     hasListener: false,
     isSelecting: false,
     selectionAutoMovePosition: {
-      columnIndex: 0,
-      rowIndex: 0
+      x: 0,
+      y: 0
     },
     textDragDropPosition: {
       columnIndex: 0,
@@ -9642,96 +9640,84 @@ const getNewSelections$5 = (anchor, position) => {
 };
 
 // @ts-ignore
-const editorMoveSelection = (editor, position) => {
+const editorMoveSelection = (editor, position, scroll = true) => {
   const anchor = editor.selectionAnchorPosition;
   const newSelections = getNewSelections$5(anchor, position);
   // TODO if selection equals previous selection -> do nothing
-  return scheduleSelections(editor, newSelections);
+  return scroll ? scheduleSelections(editor, newSelections) : {
+    ...editor,
+    selections: newSelections
+  };
 };
 
-// @ts-ignore
-const getNewEditor = (editor, position) => {
+const advanceSelectionAutoScroll = async editor => {
   const {
-    maxLineY,
-    minLineY,
-    rowHeight
-  } = editor;
-  const diff = maxLineY - minLineY;
-  if (position.rowIndex < minLineY) {
-    const newMinLineY = position.rowIndex;
-    const newMaxLineY = position.rowIndex + diff;
-    const newDeltaY = position.rowIndex * rowHeight;
-    const anchor = editor.selectionAnchorPosition;
-    const newSelections = new Uint32Array([position.rowIndex - 1, position.columnIndex, anchor.rowIndex, anchor.columnIndex]);
+    x,
+    y
+  } = editor.selectionAutoMovePosition;
+  const bottom = editor.y + editor.height;
+  if (y >= editor.y && y <= bottom) {
     return {
       ...editor,
-      deltaY: newDeltaY,
-      maxLineY: newMaxLineY,
-      minLineY: newMinLineY,
-      selections: newSelections
+      hasListener: false
     };
   }
-  if (position.rowIndex > maxLineY) {
-    const diff = maxLineY - minLineY;
-    const newMinLineY = position.rowIndex - diff;
-    const newMaxLineY = position.rowIndex;
-    const newDeltaY = newMinLineY * rowHeight;
-    const anchor = editor.selectionAnchorPosition;
-    const newSelections = new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex + 1, position.columnIndex]);
+  const deltaY = (y - (y < editor.y ? editor.y : bottom)) * 0.1;
+  const scrolledEditor = await setDeltaY$1(editor, editor.deltaY + deltaY);
+  if (scrolledEditor === editor) {
     return {
       ...editor,
-      deltaY: newDeltaY,
-      maxLineY: newMaxLineY,
-      minLineY: newMinLineY,
-      selections: newSelections
+      hasListener: false
     };
   }
-  return editor;
+  const selectionY = Math.max(editor.y, Math.min(y, bottom - 1));
+  const position = await at(scrolledEditor, x, selectionY);
+  return editorMoveSelection(scrolledEditor, position, false);
 };
 const continueScrollingAndMovingSelection = async editorUid => {
-  const editorState = get$8(editorUid);
-  const editor = editorState?.newState;
-  if (!editor || !editor.hasListener || !editor.isSelecting) {
+  const editor = get$8(editorUid)?.newState;
+  if (!editor?.isSelecting || !editor.hasListener) {
     return;
   }
-  const position = editor.selectionAutoMovePosition;
-  if (position.rowIndex === 0) {
+  const nextEditor = await advanceSelectionAutoScroll(editor);
+  const derivedEditor = await updateDerivedState(editor, nextEditor);
+  const currentEditor = get$8(editorUid)?.newState;
+  if (currentEditor !== editor) {
+    if (currentEditor?.isSelecting && currentEditor.hasListener) {
+      requestAnimationFrame(() => continueScrollingAndMovingSelection(editorUid));
+    }
     return;
   }
-  const newEditor = getNewEditor(editor, position);
-  if (editor === newEditor) {
-    return;
+  set$8(editor.uid, editor, derivedEditor);
+  if (derivedEditor.hasListener) {
+    requestAnimationFrame(() => continueScrollingAndMovingSelection(editorUid));
   }
-  // @ts-ignore
-  const delta = position.rowIndex < editor.minLineY ? -1 : 1;
-  const nextEditor = {
-    ...newEditor,
-    selectionAutoMovePosition: {
-      columnIndex: position.columnIndex,
-      rowIndex: position.rowIndex + delta
-    }
-  };
-  const newEditorWithDerivedState = await updateDerivedState(editor, nextEditor);
-  set$8(editor.uid, editor, newEditorWithDerivedState);
-  requestAnimationFrame(() => continueScrollingAndMovingSelection(editorUid));
 };
-
-// @ts-ignore
 const moveSelectionPx = async (editor, x, y) => {
   object(editor);
   number(x);
   number(y);
-  const position = await at(editor, x, y);
+  const bottom = editor.y + editor.height;
+  const selectionY = Math.max(editor.y, Math.min(y, bottom - 1));
+  const position = await at(editor, x, selectionY);
   const newEditor = editorMoveSelection(editor, position);
-  if (!editor.hasListener && (position.rowIndex < editor.minLineY || position.rowIndex > editor.maxLineY)) {
-    requestAnimationFrame(() => continueScrollingAndMovingSelection(editor.uid));
+  if (y >= editor.y && y <= bottom) {
     return {
       ...newEditor,
-      hasListener: true,
-      selectionAutoMovePosition: position
+      hasListener: false
     };
   }
-  return newEditor;
+  if (!editor.hasListener) {
+    requestAnimationFrame(() => continueScrollingAndMovingSelection(editor.uid));
+  }
+  return {
+    ...newEditor,
+    hasListener: true,
+    selectionAutoMovePosition: {
+      x,
+      y
+    }
+  };
 };
 
 const handlePointerMove = async (editor, x, y, altKey) => {
@@ -9808,8 +9794,8 @@ const handlePointerUp = async editor => {
     hasListener: false,
     isSelecting: false,
     selectionAutoMovePosition: {
-      columnIndex: 0,
-      rowIndex: 0
+      x: 0,
+      y: 0
     },
     textDragDropPosition: {
       columnIndex: 0,

package/package.json

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