@lvce-editor/editor-worker 11.0.0 → 11.2.0

package/dist/editorWorkerMain.js

@@ -1742,77 +1742,6 @@ const clamp = (num, min, max) => {
   return Math.min(Math.max(num, min), max);
 };
 
-const getScrollBarOffset = (delta, finalDelta, size, scrollBarSize) => {
-  const scrollBarOffset = delta / finalDelta * (size - scrollBarSize);
-  return scrollBarOffset;
-};
-const getScrollBarY = getScrollBarOffset;
-
-const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
-  if (size >= contentSize) {
-    return 0;
-  }
-  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
-};
-
-const getScrollBarWidth = (width, longestLineWidth) => {
-  if (width > longestLineWidth) {
-    return 0;
-  }
-  return width ** 2 / longestLineWidth;
-};
-
-const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
-  const halfScrollBarHeight = scrollBarHeight / 2;
-  if (relativeY <= halfScrollBarHeight) {
-    // clicked at top
-    return {
-      percent: 0,
-      handleOffset: relativeY
-    };
-  }
-  if (relativeY <= height - halfScrollBarHeight) {
-    // clicked in middle
-    return {
-      percent: (relativeY - halfScrollBarHeight) / (height - scrollBarHeight),
-      handleOffset: halfScrollBarHeight
-    };
-  }
-  // clicked at bottom
-  return {
-    percent: 1,
-    handleOffset: scrollBarHeight - height + relativeY
-  };
-};
-
-// TODO this should be in a separate scrolling module
-const setDeltaY$2 = (state, value) => {
-  object(state);
-  number(value);
-  const {
-    finalDeltaY,
-    deltaY,
-    numberOfVisibleLines,
-    height,
-    scrollBarHeight,
-    itemHeight
-  } = state;
-  const newDeltaY = clamp(value, 0, finalDeltaY);
-  if (deltaY === newDeltaY) {
-    return state;
-  }
-  const newMinLineY = Math.floor(newDeltaY / itemHeight);
-  const newMaxLineY = newMinLineY + numberOfVisibleLines;
-  const scrollBarY = getScrollBarY(newDeltaY, finalDeltaY, height, scrollBarHeight);
-  return {
-    ...state,
-    minLineY: newMinLineY,
-    maxLineY: newMaxLineY,
-    deltaY: newDeltaY,
-    scrollBarY
-  };
-};
-
 const Link$1 = 'Link';
 const Function = 'Function';
 const Parameter = 'Parameter';
@@ -2669,6 +2598,96 @@ const getVisible$1 = async (editor, syncIncremental) => {
   };
 };
 
+const getScrollBarOffset = (delta, finalDelta, size, scrollBarSize) => {
+  const scrollBarOffset = delta / finalDelta * (size - scrollBarSize);
+  return scrollBarOffset;
+};
+const getScrollBarY = getScrollBarOffset;
+
+const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
+  if (size >= contentSize) {
+    return 0;
+  }
+  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
+};
+
+const getScrollBarWidth = (width, longestLineWidth) => {
+  if (width > longestLineWidth) {
+    return 0;
+  }
+  return width ** 2 / longestLineWidth;
+};
+
+const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
+  const halfScrollBarHeight = scrollBarHeight / 2;
+  if (relativeY <= halfScrollBarHeight) {
+    // clicked at top
+    return {
+      percent: 0,
+      handleOffset: relativeY
+    };
+  }
+  if (relativeY <= height - halfScrollBarHeight) {
+    // clicked in middle
+    return {
+      percent: (relativeY - halfScrollBarHeight) / (height - scrollBarHeight),
+      handleOffset: halfScrollBarHeight
+    };
+  }
+  // clicked at bottom
+  return {
+    percent: 1,
+    handleOffset: scrollBarHeight - height + relativeY
+  };
+};
+
+let enabled = false;
+const setEnabled = value => {
+  enabled = value;
+};
+const getEnabled = () => {
+  return enabled;
+};
+
+// TODO this should be in a separate scrolling module
+const setDeltaY$2 = async (state, value) => {
+  object(state);
+  number(value);
+  const {
+    finalDeltaY,
+    deltaY,
+    numberOfVisibleLines,
+    height,
+    scrollBarHeight,
+    itemHeight
+  } = state;
+  const newDeltaY = clamp(value, 0, finalDeltaY);
+  if (deltaY === newDeltaY) {
+    return state;
+  }
+  const newMinLineY = Math.floor(newDeltaY / itemHeight);
+  const newMaxLineY = newMinLineY + numberOfVisibleLines;
+  const scrollBarY = getScrollBarY(newDeltaY, finalDeltaY, height, scrollBarHeight);
+  const newEditor1 = {
+    ...state,
+    minLineY: newMinLineY,
+    maxLineY: newMaxLineY,
+    deltaY: newDeltaY,
+    scrollBarY
+  };
+  const syncIncremental = getEnabled();
+  const {
+    textInfos,
+    differences
+  } = await getVisible$1(newEditor1, syncIncremental);
+  const newEditor2 = {
+    ...newEditor1,
+    textInfos,
+    differences
+  };
+  return newEditor2;
+};
+
 const emptyIncrementalEdits = [];
 
 const getIncrementalEdits = async (oldState, newState) => {
@@ -2711,14 +2730,6 @@ const splitLines = lines => {
   return lines.split('\n');
 };
 
-let enabled = false;
-const setEnabled = value => {
-  enabled = value;
-};
-const getEnabled = () => {
-  return enabled;
-};
-
 const getSelectionPairs = (selections, i) => {
   const first = selections[i];
   const second = selections[i + 1];
@@ -3589,9 +3600,9 @@ const createEditor = async ({
   if (lineToReveal && columnToReveal) {
     const delta = lineToReveal * rowHeight;
     // TODO scroll to this line
-    newEditor3 = setDeltaY$2(newEditor2, delta);
+    newEditor3 = await setDeltaY$2(newEditor2, delta);
   } else {
-    newEditor3 = setDeltaY$2(newEditor2, 0);
+    newEditor3 = await setDeltaY$2(newEditor2, 0);
   }
   const syncIncremental = getEnabled();
   const {
@@ -3601,6 +3612,7 @@ const createEditor = async ({
   const newEditor4 = {
     ...newEditor3,
     focused: true,
+    focus: FocusEditorText$1,
     textInfos,
     differences
   };
@@ -4906,7 +4918,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
@@ -6852,7 +6864,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);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "11.0.0",
+  "version": "11.2.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"
   }
 }