@lvce-editor/editor-worker 18.22.0 → 18.23.0

package/dist/editorWorkerMain.js

@@ -1623,6 +1623,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     fontFamily: '',
     fontSize: 0,
     fontWeight: 0,
+    handleOffset: 0,
     handleOffsetX: 0,
     height,
     highlightedLine: -1,
@@ -2743,6 +2744,9 @@ const getVisible$1 = async (editor, syncIncremental) => {
 
 const getScrollBarOffset = (delta, finalDelta, size, scrollBarSize) => {
   const scrollBarOffset = delta / finalDelta * (size - scrollBarSize);
+  if (!Number.isFinite(scrollBarOffset)) {
+    return 0;
+  }
   return scrollBarOffset;
 };
 const getScrollBarY = getScrollBarOffset;
@@ -4006,6 +4010,7 @@ const createEditor = async ({
     fontFamily,
     fontSize,
     fontWeight,
+    handleOffset: 0,
     handleOffsetX: 0,
     height,
     id,
@@ -4101,7 +4106,7 @@ const createEditor = async ({
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.itemHeight === newState.itemHeight;
+  return oldState.rowHeight === newState.rowHeight && oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.scrollBarHeight === newState.scrollBarHeight;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -6663,18 +6668,17 @@ const getNewPercent = (state, relativeY) => {
   // clicked at bottom
   return 1;
 };
-
-// @ts-ignore
-const handleScrollBarMove = (state, eventY) => {
+const handleScrollBarMove = async (state, eventY) => {
   const {
     finalDeltaY,
-    handleOffset,
+    handleOffset = 0,
     y
   } = state;
   const relativeY = eventY - y - handleOffset;
   const newPercent = getNewPercent(state, relativeY);
   const newDeltaY = newPercent * finalDeltaY;
-  return setDeltaYFixedValue$1(state, newDeltaY);
+  const newState = await setDeltaYFixedValue$1(state, newDeltaY);
+  return newState;
 };
 const handleScrollBarVerticalPointerMove = handleScrollBarMove;
 
@@ -6684,7 +6688,7 @@ const handleScrollBarVerticalPointerMove = handleScrollBarMove;
 // when clicked at y > editor.height - editor.scrollBarHeight/2, position scrollbar at (y - scrollbarHeight/2)
 // additionally, when clicked on scrollbar, scrollbar position shouldn't move
 
-const handleScrollBarPointerDown = (state, eventY) => {
+const handleScrollBarPointerDown = async (state, eventY) => {
   const {
     deltaY,
     finalDeltaY,
@@ -6706,8 +6710,9 @@ const handleScrollBarPointerDown = (state, eventY) => {
     percent
   } = getNewDeltaPercent(height, scrollBarHeight, relativeY);
   const newDeltaY = percent * finalDeltaY;
+  const newState = await setDeltaYFixedValue$1(state, newDeltaY);
   return {
-    ...setDeltaYFixedValue$1(state, newDeltaY),
+    ...newState,
     handleOffset
   };
 };
@@ -11127,19 +11132,34 @@ const registerListener = (listenerType, rpcId) => {
   registerListener$1(listenerType, rpcId);
 };
 
-const getCss = itemHeight => {
-  return `:root {
-  --ActivityBarItemHeight: var(--${itemHeight}px);
+const getCss = (rowHeight, scrollBarHeight, scrollBarTop) => {
+  return `.Editor {
+  --EditorRowHeight: ${rowHeight}px;
+  --ScrollBarHeight: ${scrollBarHeight}px;
+  --ScrollBarTop: ${scrollBarTop}px;
+}
+.Editor .EditorRow {
+  height: var(--EditorRowHeight);
+  line-height: var(--EditorRowHeight);
+}
+.Editor .ScrollBarThumbVertical {
+  height: var(--ScrollBarHeight);
+  translate: 0px var(--ScrollBarTop);
 }
 `;
 };
 
 const renderCss = (oldState, newState) => {
   const {
-    itemHeight,
+    deltaY,
+    finalDeltaY,
+    height,
+    rowHeight,
+    scrollBarHeight,
     uid
   } = newState;
-  const css = getCss(itemHeight);
+  const scrollBarTop = getScrollBarY(deltaY, finalDeltaY, height, scrollBarHeight);
+  const css = getCss(rowHeight, scrollBarHeight, scrollBarTop);
   return [SetCss$1, uid, css];
 };
 
@@ -12035,6 +12055,7 @@ const renderEventListeners = () => {
   }, {
     name: HandleScrollBarVerticalPointerDown,
     params: ['handleScrollBarVerticalPointerDown', ClientY],
+    preventDefault: true,
     trackPointerEvents: [HandleScrollBarVerticalPointerMove, HandleScrollBarVerticalPointerUp]
   }, {
     name: HandleScrollBarVerticalPointerMove,

package/package.json

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