@lvce-editor/editor-worker 18.16.0 → 18.18.0

package/dist/editorWorkerMain.js

@@ -4093,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 && oldState.selections === newState.selections;
+  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;
@@ -6351,8 +6351,8 @@ const handlePointerCaptureLost = editor => {
   return editor;
 };
 
-const handlePointerDown$1 = state => {
-  return state;
+const handlePointerDown$1 = (state, button, altKey, ctrlKey, x, y, detail) => {
+  return handleMouseDown(state, button, altKey, ctrlKey, x, y, detail);
 };
 
 const moveRectangleSelection = (editor, position) => {
@@ -6532,7 +6532,7 @@ const moveSelectionPx = async (editor, x, y) => {
   return editorMoveSelection(editor, position);
 };
 
-const handlePointerMove = (editor, x, y, altKey) => {
+const handlePointerMove = async (editor, x, y, altKey) => {
   if (altKey) {
     return moveRectangleSelectionPx(editor, x, y);
   }
@@ -6540,6 +6540,7 @@ const handlePointerMove = (editor, x, y, altKey) => {
 };
 
 const handlePointerUp = editor => {
+  clearEditor();
   return editor;
 };
 
@@ -6774,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 = [];
@@ -11399,10 +11407,37 @@ const diffTree = (oldNodes, newNodes) => {
   return removeTrailingNavigationPatches(patches);
 };
 
+const getEditorInputVirtualDom = () => {
+  return [{
+    ariaAutoComplete: 'list',
+    ariaMultiLine: 'true',
+    ariaRoleDescription: 'editor',
+    autocapitalize: 'off',
+    autocomplete: 'off',
+    autocorrect: 'off',
+    childCount: 0,
+    className: 'EditorInput',
+    name: 'editor',
+    onBeforeInput: HandleBeforeInput,
+    onBlur: HandleBlur,
+    onCompositionEnd: HandleCompositionEnd,
+    onCompositionStart: HandleCompositionStart,
+    onCompositionUpdate: HandleCompositionUpdate,
+    onCut: HandleCut,
+    onFocus: HandleFocus,
+    onPaste: HandlePaste,
+    role: 'textbox',
+    spellcheck: false,
+    type: TextArea,
+    wrap: 'off'
+  }];
+};
+
 const getCursorsVirtualDom = cursors => {
   const dom = [];
   for (const translate of cursors) {
     dom.push({
+      childCount: 0,
       className: EditorCursor,
       translate,
       type: Div
@@ -11411,6 +11446,15 @@ const getCursorsVirtualDom = cursors => {
   return dom;
 };
 
+const getEditorCursorsVirtualDom = cursorInfos => {
+  const cursorsDom = getCursorsVirtualDom([...cursorInfos]);
+  return [{
+    childCount: cursorInfos.length,
+    className: 'LayerCursor',
+    type: Div
+  }, ...cursorsDom];
+};
+
 // TODO use numeric value
 const Error$1 = 'error';
 const Warning = 'warning';
@@ -11455,19 +11499,16 @@ const getDiagnosticsVirtualDom = diagnostics => {
   return dom;
 };
 
-const getGutterInfoVirtualDom = gutterInfo => {
+const getEditorDiagnosticsVirtualDom = diagnostics => {
+  const diagnosticsDom = getDiagnosticsVirtualDom([...diagnostics]);
   return [{
-    childCount: 1,
-    className: 'LineNumber',
-    type: Span
-  }, text(gutterInfo)];
-};
-const getEditorGutterVirtualDom = gutterInfos => {
-  const dom = gutterInfos.flatMap(getGutterInfoVirtualDom);
-  return dom;
+    childCount: diagnostics.length,
+    className: 'LayerDiagnostics',
+    type: Div
+  }, ...diagnosticsDom];
 };
 
-const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1) => {
+const getEditorRowsVirtualDom$1 = (textInfos, differences, lineNumbers = true, highlightedLine = -1) => {
   const dom = [];
   for (let i = 0; i < textInfos.length; i++) {
     const textInfo = textInfos[i];
@@ -11495,7 +11536,65 @@ const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, hig
   return dom;
 };
 
-const getScrollBarVirtualDom = () => {
+const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, highlightedLine = -1) => {
+  const rowsDom = getEditorRowsVirtualDom$1(textInfos, differences, lineNumbers, highlightedLine);
+  return [{
+    childCount: textInfos.length,
+    className: 'EditorRows',
+    onMouseDown: HandleMouseDown,
+    onPointerDown: HandlePointerDown,
+    onWheel: HandleWheel,
+    type: Div
+  }, ...rowsDom];
+};
+
+const getSelectionsVirtualDom = selections => {
+  const dom = [];
+  for (let i = 0; i < selections.length; i += 4) {
+    const x = selections[i];
+    const y = selections[i + 1];
+    const width = selections[i + 2];
+    const height = selections[i + 3];
+    dom.push({
+      childCount: 0,
+      className: EditorSelection,
+      height,
+      left: x,
+      top: y,
+      type: Div,
+      width
+    });
+  }
+  return dom;
+};
+
+const getEditorSelectionsVirtualDom = selectionInfos => {
+  const selectionsDom = getSelectionsVirtualDom(selectionInfos);
+  return [{
+    childCount: selectionInfos.length / 4,
+    className: 'Selections',
+    type: Div
+  }, ...selectionsDom];
+};
+
+const getEditorLayersVirtualDom = (selectionInfos, textInfos, differences, lineNumbers = true, highlightedLine = -1, cursorInfos = [], diagnostics = []) => {
+  return [{
+    childCount: 4,
+    className: 'EditorLayers',
+    type: Div
+  }, ...getEditorSelectionsVirtualDom(selectionInfos), ...getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine), ...getEditorCursorsVirtualDom(cursorInfos), ...getEditorDiagnosticsVirtualDom(diagnostics)];
+};
+
+const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
+  return [{
+    childCount: scrollBarDiagnostics.length,
+    className: 'EditorScrollBarDiagnostics',
+    type: Div
+  }, ...getDiagnosticsVirtualDom([...scrollBarDiagnostics])];
+};
+
+const getScrollBarVirtualDom = (deltaY, finalDeltaY, height, scrollBarHeight) => {
+  const scrollBarY = getScrollBarY(deltaY, finalDeltaY, height, scrollBarHeight);
   return [{
     childCount: 1,
     className: 'ScrollBar ScrollBarVertical',
@@ -11505,6 +11604,8 @@ const getScrollBarVirtualDom = () => {
   }, {
     childCount: 0,
     className: 'ScrollBarThumb ScrollBarThumbVertical',
+    style: `height:${scrollBarHeight}px;`,
+    translate: `0 ${scrollBarY}px`,
     type: Div
   }, {
     childCount: 1,
@@ -11518,112 +11619,84 @@ const getScrollBarVirtualDom = () => {
   }];
 };
 
-const getSelectionsVirtualDom = selections => {
-  const dom = [];
-  for (let i = 0; i < selections.length; i += 4) {
-    const x = selections[i];
-    const y = selections[i + 1];
-    const width = selections[i + 2];
-    const height = selections[i + 3];
-    dom.push({
-      className: EditorSelection,
-      height,
-      left: x,
-      top: y,
-      type: Div,
-      width
-    });
-  }
+const getEditorContentVirtualDom = ({
+  cursorInfos = [],
+  deltaY = 0,
+  diagnostics = [],
+  differences,
+  finalDeltaY = 0,
+  height = 0,
+  highlightedLine = -1,
+  lineNumbers = true,
+  scrollBarDiagnostics = [],
+  scrollBarHeight = 0,
+  selectionInfos = [],
+  textInfos
+}) => {
+  return [{
+    childCount: 5,
+    className: 'EditorContent',
+    onMouseMove: HandleMouseMove,
+    type: Div
+  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(deltaY, finalDeltaY, height, scrollBarHeight)];
+};
+
+const getGutterInfoVirtualDom = gutterInfo => {
+  return [{
+    childCount: 1,
+    className: 'LineNumber',
+    type: Span
+  }, text(gutterInfo)];
+};
+const getEditorGutterVirtualDom$1 = gutterInfos => {
+  const dom = gutterInfos.flatMap(getGutterInfoVirtualDom);
   return dom;
 };
 
+const getEditorGutterVirtualDom = gutterInfos => {
+  const gutterDom = getEditorGutterVirtualDom$1([...gutterInfos]);
+  return [{
+    childCount: gutterInfos.length,
+    className: 'Gutter',
+    type: Div
+  }, ...gutterDom];
+};
+
 const getEditorVirtualDom = ({
   cursorInfos = [],
+  deltaY = 0,
   diagnostics = [],
   differences,
+  finalDeltaY = 0,
   gutterInfos = [],
+  height = 0,
   highlightedLine = -1,
   lineNumbers = true,
   scrollBarDiagnostics = [],
+  scrollBarHeight = 0,
   selectionInfos = [],
   textInfos
 }) => {
-  const cursorInfosArray = [...cursorInfos];
-  const diagnosticsArray = [...diagnostics];
-  const gutterInfosArray = [...gutterInfos];
-  const scrollBarDiagnosticsArray = [...scrollBarDiagnostics];
-  const rowsDom = getEditorRowsVirtualDom(textInfos, differences, lineNumbers, highlightedLine);
-  const cursorsDom = getCursorsVirtualDom(cursorInfosArray);
-  const selectionsDom = getSelectionsVirtualDom(selectionInfos);
-  const diagnosticsDom = getDiagnosticsVirtualDom(diagnosticsArray);
-  const gutterDom = getEditorGutterVirtualDom(gutterInfosArray);
-  const scrollBarDiagnosticsDom = getDiagnosticsVirtualDom(scrollBarDiagnosticsArray);
-  const scrollBarDom = getScrollBarVirtualDom();
   return [{
     childCount: 2,
     className: 'Viewlet Editor',
     onContextMenu: HandleContextMenu,
-    onWheel: HandleWheel,
     role: 'code',
     type: Div
-  }, {
-    childCount: gutterInfosArray.length,
-    className: 'Gutter',
-    type: Div
-  }, ...gutterDom, {
-    childCount: 5,
-    className: 'EditorContent',
-    onMouseMove: HandleMouseMove,
-    type: Div
-  }, {
-    ariaAutoComplete: 'list',
-    ariaMultiLine: 'true',
-    ariaRoleDescription: 'editor',
-    autocapitalize: 'off',
-    autocomplete: 'off',
-    autocorrect: 'off',
-    childCount: 0,
-    className: 'EditorInput',
-    name: 'editor',
-    onBeforeInput: HandleBeforeInput,
-    onBlur: HandleBlur,
-    onCompositionEnd: HandleCompositionEnd,
-    onCompositionStart: HandleCompositionStart,
-    onCompositionUpdate: HandleCompositionUpdate,
-    onCut: HandleCut,
-    onFocus: HandleFocus,
-    onPaste: HandlePaste,
-    role: 'textbox',
-    spellcheck: false,
-    type: TextArea,
-    wrap: 'off'
-  }, {
-    childCount: 4,
-    className: 'EditorLayers',
-    type: Div
-  }, {
-    childCount: selectionsDom.length,
-    className: 'Selections',
-    type: Div
-  }, ...selectionsDom, {
-    childCount: textInfos.length,
-    className: 'EditorRows',
-    onMouseDown: HandleMouseDown,
-    onPointerDown: HandlePointerDown,
-    type: Div
-  }, ...rowsDom, {
-    childCount: cursorsDom.length,
-    className: 'LayerCursor',
-    type: Div
-  }, ...cursorsDom, {
-    childCount: diagnosticsDom.length,
-    className: 'LayerDiagnostics',
-    type: Div
-  }, ...diagnosticsDom, {
-    childCount: scrollBarDiagnosticsDom.length,
-    className: 'EditorScrollBarDiagnostics',
-    type: Div
-  }, ...scrollBarDiagnosticsDom, ...scrollBarDom];
+  }, ...getEditorGutterVirtualDom(gutterInfos), ...getEditorContentVirtualDom({
+    cursorInfos,
+    deltaY,
+    diagnostics,
+    differences,
+    finalDeltaY,
+    height,
+    highlightedLine,
+    lineNumbers,
+    scrollBarDiagnostics,
+    scrollBarHeight,
+    selectionInfos,
+    textInfos
+  })];
 };
 
 const getDom = state => {
@@ -11720,7 +11793,7 @@ const renderLines = {
       minLineY
     } = newState;
     const relativeLine = highlightedLine - minLineY;
-    const dom = getEditorRowsVirtualDom(textInfos, differences, true, relativeLine);
+    const dom = getEditorRowsVirtualDom$1(textInfos, differences, true, relativeLine);
     return [/* method */'setText', dom];
   },
   isEqual(oldState, newState) {
@@ -11811,7 +11884,7 @@ const renderGutterInfo = {
         gutterInfos.push(i + 1);
       }
     }
-    const dom = getEditorGutterVirtualDom(gutterInfos);
+    const dom = getEditorGutterVirtualDom$1(gutterInfos);
     return ['renderGutter', dom];
   },
   isEqual(oldState, newState) {
@@ -11947,7 +12020,7 @@ const renderEventListeners = () => {
     params: ['handlePointerUp']
   }, {
     name: HandleWheel,
-    params: ['setDelta', DeltaMode, DeltaY],
+    params: ['handleWheel', DeltaMode, 'event.deltaX', DeltaY],
     passive: true
   }, {
     name: HandleContextMenu,
@@ -12166,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.16.0",
+  "version": "18.18.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:lvce-editor/editor-worker.git"