@lvce-editor/editor-worker 18.15.0 → 18.17.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.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;
 };
 
@@ -9899,16 +9900,35 @@ const unsetAdditionalFocus = async focusKey => {
 const shouldUpdateSelectionData = (oldState, newState) => {
   return oldState.selections !== newState.selections || oldState.focused !== newState.focused || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.differences !== newState.differences || oldState.charWidth !== newState.charWidth || oldState.cursorWidth !== newState.cursorWidth || oldState.fontFamily !== newState.fontFamily || oldState.fontSize !== newState.fontSize || oldState.fontWeight !== newState.fontWeight || oldState.isMonospaceFont !== newState.isMonospaceFont || oldState.letterSpacing !== newState.letterSpacing || oldState.lines !== newState.lines || oldState.rowHeight !== newState.rowHeight || oldState.tabSize !== newState.tabSize || oldState.width !== newState.width;
 };
+const shouldUpdateVisibleTextData = (oldState, newState) => {
+  if (oldState.textInfos !== newState.textInfos || oldState.differences !== newState.differences) {
+    return false;
+  }
+  return oldState.lines !== newState.lines || oldState.tokenizerId !== newState.tokenizerId || oldState.minLineY !== newState.minLineY || oldState.maxLineY !== newState.maxLineY || oldState.decorations !== newState.decorations || oldState.embeds !== newState.embeds || oldState.deltaX !== newState.deltaX || oldState.width !== newState.width || oldState.highlightedLine !== newState.highlightedLine || oldState.debugEnabled !== newState.debugEnabled;
+};
 const updateDerivedState = async (oldState, newState) => {
+  let finalState = newState;
+  if (shouldUpdateVisibleTextData(oldState, newState)) {
+    const syncIncremental = getEnabled();
+    const {
+      differences,
+      textInfos
+    } = await getVisible$1(newState, syncIncremental);
+    finalState = {
+      ...newState,
+      differences,
+      textInfos
+    };
+  }
   if (!shouldUpdateSelectionData(oldState, newState)) {
-    return newState;
+    return finalState;
   }
   const {
     cursorInfos,
     selectionInfos
-  } = await getVisible(newState);
+  } = await getVisible(finalState);
   return {
-    ...newState,
+    ...finalState,
     cursorInfos,
     selectionInfos
   };
@@ -11380,10 +11400,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
@@ -11392,6 +11439,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';
@@ -11436,19 +11492,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];
@@ -11476,6 +11529,62 @@ const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, hig
   return dom;
 };
 
+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,
+    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 = () => {
   return [{
     childCount: 1,
@@ -11499,25 +11608,45 @@ 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 = [],
+  diagnostics = [],
+  differences,
+  highlightedLine = -1,
+  lineNumbers = true,
+  scrollBarDiagnostics = [],
+  selectionInfos = [],
+  textInfos
+}) => {
+  return [{
+    childCount: 5,
+    className: 'EditorContent',
+    onMouseMove: HandleMouseMove,
+    type: Div
+  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
+};
+
+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 = [],
   diagnostics = [],
@@ -11529,17 +11658,6 @@ const getEditorVirtualDom = ({
   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',
@@ -11547,64 +11665,16 @@ const getEditorVirtualDom = ({
     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,
+    diagnostics,
+    differences,
+    highlightedLine,
+    lineNumbers,
+    scrollBarDiagnostics,
+    selectionInfos,
+    textInfos
+  })];
 };
 
 const getDom = state => {
@@ -11701,7 +11771,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) {
@@ -11792,7 +11862,7 @@ const renderGutterInfo = {
         gutterInfos.push(i + 1);
       }
     }
-    const dom = getEditorGutterVirtualDom(gutterInfos);
+    const dom = getEditorGutterVirtualDom$1(gutterInfos);
     return ['renderGutter', dom];
   },
   isEqual(oldState, newState) {
@@ -12026,6 +12096,7 @@ const wrapCommand = fn => async (editorUid, ...args) => {
     return newEditor;
   }
   const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
+
   // TODO if editor did not change, no need to update furthur
 
   // TODO combine neweditor with latest editor?

package/package.json

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