@lvce-editor/editor-worker 3.24.0 → 3.26.0

package/dist/editorWorkerMain.js

@@ -422,7 +422,7 @@ const positionAt = (textDocument, offset) => {
 };
 
 // TODO this should be in a separate scrolling module
-const setDeltaY$2 = (state, value) => {
+const setDeltaY$3 = (state, value) => {
   object(state);
   number$1(value);
   const {
@@ -461,6 +461,7 @@ const getSelectionPairs = (selections, i) => {
 };
 
 const EmptyString$1 = '';
+const NewLine$4 = '\n';
 const Space$1 = ' ';
 const Tab = '\t';
 const DoubleQuote$1 = '"';
@@ -824,9 +825,9 @@ const applyEdit$1 = (editor, changes) => {
 
 // TODO
 const setDeltaYFixedValue$1 = (editor, value) => {
-  return setDeltaY$2(editor, value);
+  return setDeltaY$3(editor, value);
 };
-const setDeltaY$1 = (editor, value) => {
+const setDeltaY$2 = (editor, value) => {
   return setDeltaYFixedValue$1(editor, editor.deltaY + value);
 };
 const isAutoClosingChange = change => {
@@ -1854,7 +1855,7 @@ const createEditor = async ({
   // TODO avoid creating intermediate editors here
   const newEditor1 = setBounds(editor, x, y, width, height, 9);
   const newEditor2 = setText(newEditor1, content);
-  const newEditor3 = setDeltaY$2(newEditor2, 0);
+  const newEditor3 = setDeltaY$3(newEditor2, 0);
   const newEditor4 = {
     ...newEditor3,
     focused: true
@@ -2281,13 +2282,31 @@ const closeCompletion = editor => {
 };
 
 const isMatchingWidget$1 = widget => {
+  return widget.id === Find;
+};
+const closeFind = editor => {
+  const {
+    widgets
+  } = editor;
+  const index = widgets.findIndex(isMatchingWidget$1);
+  if (index === -1) {
+    return editor;
+  }
+  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
+  return {
+    ...editor,
+    widgets: newWidgets
+  };
+};
+
+const isMatchingWidget = widget => {
   return widget.id === SourceAction;
 };
 const closeSourceAction = editor => {
   const {
     widgets
   } = editor;
-  const index = widgets.findIndex(isMatchingWidget$1);
+  const index = widgets.findIndex(isMatchingWidget);
   if (index === -1) {
     return editor;
   }
@@ -4135,8 +4154,8 @@ const handleTouchEnd = (editor, touchEvent) => {
 };
 
 // @ts-ignore
-const setDeltaY = (editor, deltaY) => {
-  return setDeltaY$1(editor, deltaY);
+const setDeltaY$1 = (editor, deltaY) => {
+  return setDeltaY$2(editor, deltaY);
 };
 
 // @ts-ignore
@@ -4155,11 +4174,11 @@ const setDelta = (editor, deltaMode, eventDeltaX, eventDeltaY) => {
     deltaY
   } = editor;
   if (eventDeltaX === 0) {
-    return setDeltaY(editor, eventDeltaY);
+    return setDeltaY$1(editor, eventDeltaY);
   }
   const newDeltaX = clamp(deltaX + eventDeltaX, 0, Number.POSITIVE_INFINITY);
   return {
-    ...setDeltaY(editor, eventDeltaY),
+    ...setDeltaY$1(editor, eventDeltaY),
     deltaX: newDeltaX
   };
 };
@@ -4476,7 +4495,11 @@ const create$4 = () => {
       x: 0,
       y: 0,
       width: 0,
-      height: 0
+      height: 0,
+      deltaY: 0,
+      finalDeltaY: 0,
+      focused: false,
+      headerHeight: 0
     },
     newState: {
       items: [],
@@ -4489,7 +4512,11 @@ const create$4 = () => {
       x: 0,
       y: 0,
       width: 0,
-      height: 0
+      height: 0,
+      deltaY: 0,
+      finalDeltaY: 0,
+      headerHeight: 0,
+      focused: false
     }
   };
   return completionWidget;
@@ -7406,57 +7433,72 @@ const closeDetails = editor => {
   };
 };
 
-const getCompletionState = editor => {
-  return getWidgetState(editor, Completion);
+const focusIndex = (state, index) => {
+  const newState = {
+    ...state,
+    focusedIndex: index,
+    focused: true
+  };
+  return newState;
 };
 
-const isCompletion$1 = widget => {
-  return widget.id === Completion;
+const focusFirst = state => {
+  const firstIndex = 0;
+  return focusIndex(state, firstIndex);
 };
-const focusIndex = (editor, index) => {
-  const child = getCompletionState(editor);
-  if (index === -1) {
-    return editor;
-  }
-  const childIndex = editor.widgets.findIndex(isCompletion$1);
-  // TODO scroll up/down if necessary
-  const childWidget = editor.widgets[childIndex];
-  const newWidget = {
-    ...childWidget,
-    newState: {
-      ...child,
-      focusedIndex: index,
-      focused: true
-    }
-  };
-  const newWidgets = [...editor.widgets.slice(0, childIndex), newWidget, ...editor.widgets.slice(childIndex + 1)];
-  return {
-    ...editor,
-    widgets: newWidgets
-  };
+
+const focusNext = state => {
+  const nextIndex = state.focusedIndex + 1;
+  return focusIndex(state, nextIndex);
 };
 
-const focusFirst = editor => {
-  const firstIndex = 0;
-  return focusIndex(editor, firstIndex);
+const focusPrevious = state => {
+  const previousIndex = state.focusedIndex - 1;
+  return focusIndex(state, previousIndex);
 };
 
-const focusNext = editor => {
-  const child = getCompletionState(editor);
-  if (!child) {
-    return editor;
-  }
-  const nextIndex = child.focusedIndex + 1;
-  return focusIndex(editor, nextIndex);
+// TODO optimize this function to return the minimum number
+// of visible items needed, e.g. when not scrolled 5 items with
+// 20px fill 100px but when scrolled 6 items are needed
+const getNumberOfVisibleItems = (listHeight, itemHeight) => {
+  return Math.ceil(listHeight / itemHeight) + 1;
 };
 
-const focusPrevious = editor => {
-  const child = getCompletionState(editor);
-  if (!child) {
-    return editor;
+const setDeltaY = (state, value) => {
+  object(state);
+  number$1(value);
+  const {
+    itemHeight,
+    finalDeltaY,
+    deltaY,
+    height,
+    headerHeight
+  } = state;
+  const listHeight = height - headerHeight;
+  const newDeltaY = clamp(value, 0, finalDeltaY);
+  if (deltaY === newDeltaY) {
+    return state;
   }
-  const previousIndex = child.focusedIndex - 1;
-  return focusIndex(editor, previousIndex);
+  // TODO when it only moves by one px, extensions don't need to be rerendered, only negative margin
+  const minLineY = Math.floor(newDeltaY / itemHeight);
+  const maxLineY = minLineY + getNumberOfVisibleItems(listHeight, itemHeight);
+  return {
+    ...state,
+    deltaY: newDeltaY,
+    minLineY,
+    maxLineY
+  };
+};
+
+const handleWheel = (state, deltaMode, deltaY) => {
+  number$1(deltaMode);
+  number$1(deltaY);
+  return setDeltaY(state, state.deltaY + deltaY);
+};
+
+const handelWheel = (state, deltaMode, deltaY) => {
+  const newState = handleWheel(state, deltaMode, deltaY);
+  return newState;
 };
 
 const create = () => {
@@ -7492,6 +7534,10 @@ const getCompletionDetailBounds = (completionBounds, borderSize) => {
   };
 };
 
+const getCompletionState = editor => {
+  return getWidgetState(editor, Completion);
+};
+
 const openDetails = editor => {
   const child = getCompletionState(editor);
   if (!child) {
@@ -7599,24 +7645,6 @@ const toggleDetails = editor => {
   return closeDetails(editor);
 };
 
-const isMatchingWidget = widget => {
-  return widget.id === Find;
-};
-const closeFind = editor => {
-  const {
-    widgets
-  } = editor;
-  const index = widgets.findIndex(isMatchingWidget);
-  if (index === -1) {
-    return editor;
-  }
-  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
-  return {
-    ...editor,
-    widgets: newWidgets
-  };
-};
-
 const loadContent = async (editorUid, state, position) => {
   const hoverInfo = await getEditorHoverInfo(editorUid, position);
   if (!hoverInfo) {
@@ -7914,7 +7942,7 @@ const getText = editorUid => {
   const {
     lines
   } = editor;
-  return lines.join('\n');
+  return lines.join(NewLine$4);
 };
 
 const InsertText = 'insertText';
@@ -8871,7 +8899,13 @@ const widgetCommands = {
   'FindWidget.focusReplaceAllButton': Find,
   'FindWidget.focusNextMatchButton': Find,
   'FindWidget.focusPreviousMatchButton': Find,
-  'FindWidget.focusCloseButton': Find
+  'FindWidget.focusCloseButton': Find,
+  'EditorCompletion.handleWheel': Completion,
+  // TODO
+  // 'EditorCompletion.focusFirst': WidgetId.Completion,
+  'EditorCompletion.focusNext': Completion
+  // 'EditorCompletion.focusPrevious': WidgetId.Completion,
+  // 'EditorCompletion.focusLast': WidgetId.Completion,
 };
 
 // TODO wrap commands globally, not per editor
@@ -8907,8 +8941,8 @@ const commandMap = {
   'Editor.braceCompletion': braceCompletion,
   'Editor.cancelSelection': cancelSelection,
   'Editor.closeCompletion': closeCompletion,
-  'Editor.closeSourceAction': closeSourceAction,
   'Editor.closeFind': closeFind,
+  'Editor.closeSourceAction': closeSourceAction,
   'Editor.compositionEnd': compositionEnd,
   'Editor.compositionStart': compositionStart,
   'Editor.compositionUpdate': compositionUpdate,
@@ -9012,7 +9046,7 @@ const commandMap = {
   'Editor.selectWordRight': selectWordRight,
   'Editor.setDecorations': setDecorations,
   'Editor.setDelta': setDelta,
-  'Editor.setDeltaY': setDeltaY,
+  'Editor.setDeltaY': setDeltaY$1,
   'Editor.setLanguageId': setLanguageId,
   'Editor.setSelections': setSelections,
   'Editor.showHover': showHover,
@@ -9038,6 +9072,7 @@ const commandMap = {
   'EditorCompletion.handleEditorClick': handleEditorClick,
   'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft$1,
   'EditorCompletion.handleEditorType': handleEditorType$1,
+  'EditorCompletion.handleWheel': handelWheel,
   'EditorCompletion.loadContent': loadContent$2,
   'EditorCompletion.openDetails': openDetails,
   'EditorCompletion.selectCurrent': selectCurrent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "3.24.0",
+  "version": "3.26.0",
   "description": "",
   "main": "dist/editorWorkerMain.js",
   "type": "module",