@lvce-editor/editor-worker 18.10.0 → 18.12.0

package/dist/editorWorkerMain.js

@@ -3955,6 +3955,7 @@ const createEditor = async ({
   savedSelections,
   tabSize,
   uri,
+  useFunctionalRendering,
   width,
   x,
   y
@@ -4022,6 +4023,7 @@ const createEditor = async ({
     uid: id,
     undoStack: [],
     uri,
+    useFunctionalRendering,
     validLines: [],
     widgets: [],
     width,
@@ -6335,6 +6337,194 @@ const handlePointerCaptureLost = editor => {
   return editor;
 };
 
+const moveRectangleSelection = (editor, position) => {
+  // @ts-ignore
+  // const anchor = EditorMoveSelection.state.position
+  // const startRowIndex = anchor.rowIndex
+  // const startColumnIndex = anchor.columnIndex
+  // const endRowIndex = position.rowIndex
+  // const endColumnIndex = position.columnIndex
+  // const selectionEdits: any[] = []
+  // for (let i = startRowIndex; i <= endRowIndex; i++) {
+  //   selectionEdits.push({
+  //     start: {
+  //       rowIndex: i,
+  //       columnIndex: startColumnIndex,
+  //     },
+  //     end: {
+  //       rowIndex: i,
+  //       columnIndex: endColumnIndex,
+  //     },
+  //   })
+  // }
+  // // @ts-ignore
+  // const cursorEdits = [selectionEdits.at(-1).end]
+  // // @ts-ignore
+  // Editor.scheduleCursorsAndSelections(editor, cursorEdits, selectionEdits)
+  return editor;
+};
+
+// @ts-ignore
+const moveRectangleSelectionPx = async (editor, x, y) => {
+  await at(editor, x, y);
+};
+
+const requestAnimationFrame = fn => {
+  globalThis.requestAnimationFrame(fn);
+};
+
+const LessThan = -1;
+const Equal = 0;
+const GreaterThan = 1;
+
+// @ts-ignore
+
+// @ts-ignore
+const compare = (positionA, positionB) => {
+  if (positionA.rowIndex > positionB.rowIndex) {
+    return GreaterThan;
+  }
+  if (positionA.rowIndex === positionB.rowIndex) {
+    if (positionA.columnIndex > positionB.columnIndex) {
+      return GreaterThan;
+    }
+    if (positionA.columnIndex < positionB.columnIndex) {
+      return LessThan;
+    }
+    return Equal;
+  }
+  return LessThan;
+};
+
+// @ts-ignore
+const editorMoveSelectionBackwards = (anchor, position) => {
+  return new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex, position.columnIndex]);
+};
+
+// @ts-ignore
+const editorMoveSelectionEqual = (anchor, position) => {
+  return new Uint32Array([position.rowIndex, position.columnIndex, position.rowIndex, position.columnIndex]);
+};
+
+// @ts-ignore
+const editorMoveSelectionForwards = (anchor, position) => {
+  return new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex, position.columnIndex]);
+};
+
+// @ts-ignore
+const getNewSelections$5 = (anchor, position) => {
+  switch (compare(position, anchor)) {
+    case Equal:
+      return editorMoveSelectionEqual(anchor, position);
+    case GreaterThan:
+      return editorMoveSelectionForwards(anchor, position);
+    case LessThan:
+      return editorMoveSelectionBackwards(anchor, position);
+    default:
+      throw new Error('unexpected comparison result');
+  }
+};
+
+// @ts-ignore
+const editorMoveSelection = (editor, position) => {
+  const anchor = getPosition$1();
+  const newSelections = getNewSelections$5(anchor, position);
+  // TODO if selection equals previous selection -> do nothing
+  return scheduleSelections(editor, newSelections);
+};
+
+// @ts-ignore
+const getNewEditor$1 = (editor, position) => {
+  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 = getPosition$1();
+    const newSelections = new Uint32Array([position.rowIndex - 1, position.columnIndex, anchor.rowIndex, anchor.columnIndex]);
+    return {
+      ...editor,
+      deltaY: newDeltaY,
+      maxLineY: newMaxLineY,
+      minLineY: newMinLineY,
+      selections: newSelections
+    };
+  }
+  if (position.rowIndex > maxLineY) {
+    const diff = maxLineY - minLineY;
+    const newMinLineY = position.rowIndex - diff;
+    const newMaxLineY = position.rowIndex;
+    const newDeltaY = newMinLineY * rowHeight;
+    const anchor = getPosition$1();
+    const newSelections = new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex + 1, position.columnIndex]);
+    return {
+      ...editor,
+      deltaY: newDeltaY,
+      maxLineY: newMaxLineY,
+      minLineY: newMinLineY,
+      selections: newSelections
+    };
+  }
+  return editor;
+};
+const continueScrollingAndMovingSelection = async () => {
+  const editor = getEditor$1();
+  if (!editor) {
+    return;
+  }
+  const position = getPosition();
+  if (position.rowIndex === 0) {
+    return;
+  }
+  const newEditor = getNewEditor$1(editor, position);
+  if (editor === newEditor) {
+    return;
+  }
+  // await Viewlet.setState(ViewletModuleId.EditorText, newEditor)
+  setEditor(newEditor);
+  // @ts-ignore
+  const delta = position.rowIndex < editor.minLineY ? -1 : 1;
+  setPosition({
+    columnIndex: position.columnIndex,
+    rowIndex: position.rowIndex + delta
+  });
+  requestAnimationFrame(continueScrollingAndMovingSelection);
+  // TODO get editor state
+  // if editor is disposed, return and remove animation frame
+  // on cursor up, remove animation frame
+  //
+};
+
+// @ts-ignore
+const moveSelectionPx = async (editor, x, y) => {
+  object(editor);
+  number(x);
+  number(y);
+  const position = await at(editor, x, y);
+  if (!hasListener() && (position.rowIndex < editor.minLineY || position.rowIndex > editor.maxLineY)) {
+    requestAnimationFrame(continueScrollingAndMovingSelection);
+    setEditor(editor);
+    setPosition(position);
+  }
+  return editorMoveSelection(editor, position);
+};
+
+const handlePointerMove = (editor, x, y, altKey) => {
+  if (altKey) {
+    return moveRectangleSelectionPx(editor, x, y);
+  }
+  return moveSelectionPx(editor, x, y);
+};
+
+const handlePointerUp = editor => {
+  return editor;
+};
+
 // @ts-ignore
 
 // @ts-ignore
@@ -6736,183 +6926,6 @@ const insertLineBreak = async editor => {
   return scheduleDocumentAndCursorsSelections(editor, changes, selectionChanges);
 };
 
-const moveRectangleSelection = (editor, position) => {
-  // @ts-ignore
-  // const anchor = EditorMoveSelection.state.position
-  // const startRowIndex = anchor.rowIndex
-  // const startColumnIndex = anchor.columnIndex
-  // const endRowIndex = position.rowIndex
-  // const endColumnIndex = position.columnIndex
-  // const selectionEdits: any[] = []
-  // for (let i = startRowIndex; i <= endRowIndex; i++) {
-  //   selectionEdits.push({
-  //     start: {
-  //       rowIndex: i,
-  //       columnIndex: startColumnIndex,
-  //     },
-  //     end: {
-  //       rowIndex: i,
-  //       columnIndex: endColumnIndex,
-  //     },
-  //   })
-  // }
-  // // @ts-ignore
-  // const cursorEdits = [selectionEdits.at(-1).end]
-  // // @ts-ignore
-  // Editor.scheduleCursorsAndSelections(editor, cursorEdits, selectionEdits)
-  return editor;
-};
-
-// @ts-ignore
-const moveRectangleSelectionPx = async (editor, x, y) => {
-  await at(editor, x, y);
-};
-
-const LessThan = -1;
-const Equal = 0;
-const GreaterThan = 1;
-
-// @ts-ignore
-
-// @ts-ignore
-const compare = (positionA, positionB) => {
-  if (positionA.rowIndex > positionB.rowIndex) {
-    return GreaterThan;
-  }
-  if (positionA.rowIndex === positionB.rowIndex) {
-    if (positionA.columnIndex > positionB.columnIndex) {
-      return GreaterThan;
-    }
-    if (positionA.columnIndex < positionB.columnIndex) {
-      return LessThan;
-    }
-    return Equal;
-  }
-  return LessThan;
-};
-
-// @ts-ignore
-const editorMoveSelectionBackwards = (anchor, position) => {
-  return new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex, position.columnIndex]);
-};
-
-// @ts-ignore
-const editorMoveSelectionEqual = (anchor, position) => {
-  return new Uint32Array([position.rowIndex, position.columnIndex, position.rowIndex, position.columnIndex]);
-};
-
-// @ts-ignore
-const editorMoveSelectionForwards = (anchor, position) => {
-  return new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex, position.columnIndex]);
-};
-
-// @ts-ignore
-const getNewSelections$5 = (anchor, position) => {
-  switch (compare(position, anchor)) {
-    case Equal:
-      return editorMoveSelectionEqual(anchor, position);
-    case GreaterThan:
-      return editorMoveSelectionForwards(anchor, position);
-    case LessThan:
-      return editorMoveSelectionBackwards(anchor, position);
-    default:
-      throw new Error('unexpected comparison result');
-  }
-};
-
-// @ts-ignore
-const editorMoveSelection = (editor, position) => {
-  const anchor = getPosition$1();
-  const newSelections = getNewSelections$5(anchor, position);
-  // TODO if selection equals previous selection -> do nothing
-  return scheduleSelections(editor, newSelections);
-};
-
-const requestAnimationFrame = fn => {
-  globalThis.requestAnimationFrame(fn);
-};
-
-// @ts-ignore
-const getNewEditor$1 = (editor, position) => {
-  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 = getPosition$1();
-    const newSelections = new Uint32Array([position.rowIndex - 1, position.columnIndex, anchor.rowIndex, anchor.columnIndex]);
-    return {
-      ...editor,
-      deltaY: newDeltaY,
-      maxLineY: newMaxLineY,
-      minLineY: newMinLineY,
-      selections: newSelections
-    };
-  }
-  if (position.rowIndex > maxLineY) {
-    const diff = maxLineY - minLineY;
-    const newMinLineY = position.rowIndex - diff;
-    const newMaxLineY = position.rowIndex;
-    const newDeltaY = newMinLineY * rowHeight;
-    const anchor = getPosition$1();
-    const newSelections = new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex + 1, position.columnIndex]);
-    return {
-      ...editor,
-      deltaY: newDeltaY,
-      maxLineY: newMaxLineY,
-      minLineY: newMinLineY,
-      selections: newSelections
-    };
-  }
-  return editor;
-};
-const continueScrollingAndMovingSelection = async () => {
-  const editor = getEditor$1();
-  if (!editor) {
-    return;
-  }
-  const position = getPosition();
-  if (position.rowIndex === 0) {
-    return;
-  }
-  const newEditor = getNewEditor$1(editor, position);
-  if (editor === newEditor) {
-    return;
-  }
-  // await Viewlet.setState(ViewletModuleId.EditorText, newEditor)
-  setEditor(newEditor);
-  // @ts-ignore
-  const delta = position.rowIndex < editor.minLineY ? -1 : 1;
-  setPosition({
-    columnIndex: position.columnIndex,
-    rowIndex: position.rowIndex + delta
-  });
-  requestAnimationFrame(continueScrollingAndMovingSelection);
-  // TODO get editor state
-  // if editor is disposed, return and remove animation frame
-  // on cursor up, remove animation frame
-  //
-};
-
-// @ts-ignore
-const moveSelectionPx = async (editor, x, y) => {
-  object(editor);
-  number(x);
-  number(y);
-  const position = await at(editor, x, y);
-  if (!hasListener() && (position.rowIndex < editor.minLineY || position.rowIndex > editor.maxLineY)) {
-    requestAnimationFrame(continueScrollingAndMovingSelection);
-    setEditor(editor);
-    setPosition(position);
-  }
-  return editorMoveSelection(editor, position);
-};
-
 const Script = 2;
 const Unknown$1 = 0;
 
@@ -9527,14 +9540,26 @@ const HandleCompositionUpdate = 'handleCompositionUpdate';
 const HandleContextMenu = 'handleContextMenu';
 const HandleCut = 'handleCut';
 const HandleFocus = 'handleFocus';
+const HandleMouseDown = 'handleMouseDown';
 const HandleMouseMove = 'handleMouseMove';
+const HandlePaste = 'handlePaste';
+const HandlePointerDown = 'handlePointerDown';
+const HandlePointerMove = 'handlePointerMove';
+const HandlePointerUp = 'handlePointerUp';
 const HandleSashPointerDown = 'handleSashPointerDown';
+const HandleScrollBarHorizontalPointerDown = 'handleScrollBarHorizontalPointerDown';
+const HandleScrollBarHorizontalPointerMove = 'handleScrollBarHorizontalPointerMove';
+const HandleScrollBarHorizontalPointerUp = 'handleScrollBarHorizontalPointerUp';
+const HandleScrollBarVerticalPointerDown = 'handleScrollBarVerticalPointerDown';
+const HandleScrollBarVerticalPointerMove = 'handleScrollBarVerticalPointerMove';
+const HandleScrollBarVerticalPointerUp = 'handleScrollBarVerticalPointerUp';
 const HandleWheel = 'handleWheel';
 
 const Div = 4;
 const Input = 6;
 const Span = 8;
 const Text = 12;
+const TextArea = 62;
 
 const text = data => {
   return {
@@ -11410,6 +11435,29 @@ const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, hig
   return dom;
 };
 
+const getScrollBarVirtualDom = () => {
+  return [{
+    childCount: 1,
+    className: 'ScrollBar ScrollBarVertical',
+    onContextMenu: HandleContextMenu,
+    onPointerDown: HandleScrollBarVerticalPointerDown,
+    type: Div
+  }, {
+    childCount: 0,
+    className: 'ScrollBarThumb ScrollBarThumbVertical',
+    type: Div
+  }, {
+    childCount: 1,
+    className: 'ScrollBar ScrollBarHorizontal',
+    onPointerDown: HandleScrollBarHorizontalPointerDown,
+    type: Div
+  }, {
+    childCount: 0,
+    className: 'ScrollBarThumb ScrollBarThumbHorizontal',
+    type: Div
+  }];
+};
+
 const getSelectionsVirtualDom = selections => {
   const dom = [];
   for (let i = 0; i < selections.length; i += 4) {
@@ -11450,9 +11498,12 @@ const getEditorVirtualDom = ({
   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
   }, {
@@ -11460,9 +11511,32 @@ const getEditorVirtualDom = ({
     className: 'Gutter',
     type: Div
   }, ...gutterDom, {
-    childCount: 4,
+    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',
@@ -11474,6 +11548,8 @@ const getEditorVirtualDom = ({
   }, ...selectionsDom, {
     childCount: textInfos.length,
     className: 'EditorRows',
+    onMouseDown: HandleMouseDown,
+    onPointerDown: HandlePointerDown,
     type: Div
   }, ...rowsDom, {
     childCount: cursorsDom.length,
@@ -11487,27 +11563,15 @@ const getEditorVirtualDom = ({
     childCount: scrollBarDiagnosticsDom.length,
     className: 'EditorScrollBarDiagnostics',
     type: Div
-  }, ...scrollBarDiagnosticsDom, {
-    childCount: 1,
-    className: 'ScrollBar ScrollBarVertical',
-    type: Div
-  }, {
-    childCount: 0,
-    className: 'ScrollBarThumb ScrollBarThumbVertical',
-    type: Div
-  }, {
-    childCount: 1,
-    className: 'ScrollBar ScrollBarHorizontal',
-    type: Div
-  }, {
-    childCount: 0,
-    className: 'ScrollBarThumb ScrollBarThumbHorizontal',
-    type: Div
-  }];
+  }, ...scrollBarDiagnosticsDom, ...scrollBarDom];
 };
 
 const getDom = state => {
-  if (state.initial && state.textInfos.length === 0) {
+  const {
+    initial,
+    textInfos
+  } = state;
+  if (initial && textInfos.length === 0) {
     return [];
   }
   return getEditorVirtualDom(state);
@@ -11783,13 +11847,14 @@ const renderEventListeners = () => {
     params: ['handleFocus']
   }, {
     name: HandleMouseMove,
-    params: ['handleInput', ClientX, ClientY, AltKey]
+    params: ['handleMouseMove', ClientX, ClientY, AltKey]
   }, {
     name: HandleBlur,
     params: ['handleBlur']
   }, {
     name: HandleBeforeInput,
-    params: ['handleBeforeInput', 'event.inputType', 'event.data']
+    params: ['handleBeforeInput', 'event.inputType', 'event.data'],
+    preventDefault: true
   }, {
     name: HandleCompositionStart,
     params: ['compositionStart', 'event.data']
@@ -11798,11 +11863,28 @@ const renderEventListeners = () => {
     params: ['compositionUpdate', 'event.data']
   }, {
     name: HandleCompositionEnd,
-    params: ['compositionUpdate', 'event.data']
+    params: ['compositionEnd', 'event.data']
   }, {
     name: HandleCut,
     params: ['cut'],
     preventDefault: true
+  }, {
+    name: HandlePaste,
+    params: ['paste', 'event.clipboardData ? event.clipboardData.getData("text/plain") : ""'],
+    preventDefault: true
+  }, {
+    name: HandleMouseDown,
+    params: ['handleMouseDown', 'event.button === 2 ? -1 : (((event.metaKey || event.ctrlKey) ? 2048 : 0) | (event.shiftKey ? 1024 : 0) | (event.altKey ? 512 : 0))', ClientX, ClientY, 'event.button === 2 ? 0 : event.detail']
+  }, {
+    name: HandlePointerDown,
+    params: [],
+    trackPointerEvents: [HandlePointerMove, HandlePointerUp]
+  }, {
+    name: HandlePointerMove,
+    params: ['handlePointerMove', ClientX, ClientY, AltKey]
+  }, {
+    name: HandlePointerUp,
+    params: ['handlePointerUp']
   }, {
     name: HandleWheel,
     params: ['setDelta', DeltaMode, DeltaY],
@@ -11811,6 +11893,26 @@ const renderEventListeners = () => {
     name: HandleContextMenu,
     params: ['handleContextMenu', Button, ClientX, ClientY],
     preventDefault: true
+  }, {
+    name: HandleScrollBarVerticalPointerDown,
+    params: ['handleScrollBarVerticalPointerDown', ClientY],
+    trackPointerEvents: [HandleScrollBarVerticalPointerMove, HandleScrollBarVerticalPointerUp]
+  }, {
+    name: HandleScrollBarVerticalPointerMove,
+    params: ['handleScrollBarVerticalPointerMove', ClientY]
+  }, {
+    name: HandleScrollBarVerticalPointerUp,
+    params: ['handlePointerUp']
+  }, {
+    name: HandleScrollBarHorizontalPointerDown,
+    params: ['handleScrollBarHorizontalPointerDown', ClientX],
+    trackPointerEvents: [HandleScrollBarHorizontalPointerMove, HandleScrollBarHorizontalPointerUp]
+  }, {
+    name: HandleScrollBarHorizontalPointerMove,
+    params: ['handleScrollBarHorizontalMove', ClientX]
+  }, {
+    name: HandleScrollBarHorizontalPointerUp,
+    params: ['handlePointerUp']
   }];
 };
 
@@ -11967,6 +12069,8 @@ const commandMap = {
   'Editor.handleMouseMoveWithAltKey': wrapCommandOld(handleMouseMoveWithAltKey),
   'Editor.handleNativeSelectionChange': editorHandleNativeSelectionChange,
   'Editor.handlePointerCaptureLost': wrapCommandOld(handlePointerCaptureLost),
+  'Editor.handlePointerMove': wrapCommandOld(handlePointerMove),
+  'Editor.handlePointerUp': wrapCommandOld(handlePointerUp),
   'Editor.handleScrollBarClick': handleScrollBarPointerDown,
   'Editor.handleScrollBarHorizontalMove': wrapCommandOld(handleScrollBarHorizontalMove),
   'Editor.handleScrollBarHorizontalPointerDown': wrapCommandOld(handleScrollBarHorizontalPointerDown),

package/package.json

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