@lvce-editor/editor-worker 18.17.0 → 18.18.0

package/dist/editorWorkerMain.js

@@ -4093,7 +4093,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.highlightedLine === newState.highlightedLine && oldState.lineNumbers === newState.lineNumbers && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.scrollBarWidth === newState.scrollBarWidth && oldState.selectionInfos === newState.selectionInfos;
+  return oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.highlightedLine === newState.highlightedLine && oldState.lineNumbers === newState.lineNumbers && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.deltaY === newState.deltaY && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.scrollBarWidth === newState.scrollBarWidth && oldState.selectionInfos === newState.selectionInfos;
 };
 
 const RenderFocus = 6;
@@ -6775,6 +6775,13 @@ const handleTouchMove = (editor, touchEvent) => {
   setDeltaYFixedValue(editor, offsetY);
 };
 
+// Keep wheel handling as a dedicated command entry point and delegate
+// the actual scroll state update to the shared setDelta logic.
+// @ts-ignore
+const handleWheel$2 = (editor, deltaMode, eventDeltaX, eventDeltaY) => {
+  return setDelta(editor, deltaMode, eventDeltaX, eventDeltaY);
+};
+
 // @ts-ignore
 const getChanges$2 = selections => {
   const changes = [];
@@ -11536,6 +11543,7 @@ const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, hig
     className: 'EditorRows',
     onMouseDown: HandleMouseDown,
     onPointerDown: HandlePointerDown,
+    onWheel: HandleWheel,
     type: Div
   }, ...rowsDom];
 };
@@ -11585,7 +11593,8 @@ const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
   }, ...getDiagnosticsVirtualDom([...scrollBarDiagnostics])];
 };
 
-const getScrollBarVirtualDom = () => {
+const getScrollBarVirtualDom = (deltaY, finalDeltaY, height, scrollBarHeight) => {
+  const scrollBarY = getScrollBarY(deltaY, finalDeltaY, height, scrollBarHeight);
   return [{
     childCount: 1,
     className: 'ScrollBar ScrollBarVertical',
@@ -11595,6 +11604,8 @@ const getScrollBarVirtualDom = () => {
   }, {
     childCount: 0,
     className: 'ScrollBarThumb ScrollBarThumbVertical',
+    style: `height:${scrollBarHeight}px;`,
+    translate: `0 ${scrollBarY}px`,
     type: Div
   }, {
     childCount: 1,
@@ -11610,11 +11621,15 @@ const getScrollBarVirtualDom = () => {
 
 const getEditorContentVirtualDom = ({
   cursorInfos = [],
+  deltaY = 0,
   diagnostics = [],
   differences,
+  finalDeltaY = 0,
+  height = 0,
   highlightedLine = -1,
   lineNumbers = true,
   scrollBarDiagnostics = [],
+  scrollBarHeight = 0,
   selectionInfos = [],
   textInfos
 }) => {
@@ -11623,7 +11638,7 @@ const getEditorContentVirtualDom = ({
     className: 'EditorContent',
     onMouseMove: HandleMouseMove,
     type: Div
-  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
+  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(deltaY, finalDeltaY, height, scrollBarHeight)];
 };
 
 const getGutterInfoVirtualDom = gutterInfo => {
@@ -11649,12 +11664,16 @@ const getEditorGutterVirtualDom = gutterInfos => {
 
 const getEditorVirtualDom = ({
   cursorInfos = [],
+  deltaY = 0,
   diagnostics = [],
   differences,
+  finalDeltaY = 0,
   gutterInfos = [],
+  height = 0,
   highlightedLine = -1,
   lineNumbers = true,
   scrollBarDiagnostics = [],
+  scrollBarHeight = 0,
   selectionInfos = [],
   textInfos
 }) => {
@@ -11662,16 +11681,19 @@ const getEditorVirtualDom = ({
     childCount: 2,
     className: 'Viewlet Editor',
     onContextMenu: HandleContextMenu,
-    onWheel: HandleWheel,
     role: 'code',
     type: Div
   }, ...getEditorGutterVirtualDom(gutterInfos), ...getEditorContentVirtualDom({
     cursorInfos,
+    deltaY,
     diagnostics,
     differences,
+    finalDeltaY,
+    height,
     highlightedLine,
     lineNumbers,
     scrollBarDiagnostics,
+    scrollBarHeight,
     selectionInfos,
     textInfos
   })];
@@ -11998,7 +12020,7 @@ const renderEventListeners = () => {
     params: ['handlePointerUp']
   }, {
     name: HandleWheel,
-    params: ['setDelta', DeltaMode, DeltaY],
+    params: ['handleWheel', DeltaMode, 'event.deltaX', DeltaY],
     passive: true
   }, {
     name: HandleContextMenu,
@@ -12217,6 +12239,7 @@ const commandMap = {
   'Editor.handleTouchMove': wrapCommandOld(handleTouchMove),
   'Editor.handleTouchStart': wrapCommandOld(handleTouchStart),
   'Editor.handleTripleClick': wrapCommandOld(handleTripleClick),
+  'Editor.handleWheel': wrapCommandOld(handleWheel$2),
   'Editor.hotReload': hotReload,
   'Editor.indendLess': wrapCommandOld(indentLess),
   'Editor.indentMore': wrapCommandOld(indentMore),

package/package.json

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