@lvce-editor/editor-worker 3.24.0 → 3.25.0

package/dist/editorWorkerMain.js

@@ -461,6 +461,7 @@ const getSelectionPairs = (selections, i) => {
 };
 
 const EmptyString$1 = '';
+const NewLine$4 = '\n';
 const Space$1 = ' ';
 const Tab = '\t';
 const DoubleQuote$1 = '"';
@@ -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;
   }
@@ -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,38 @@ const closeDetails = editor => {
   };
 };
 
-const getCompletionState = editor => {
-  return getWidgetState(editor, Completion);
-};
-
-const isCompletion$1 = widget => {
-  return widget.id === Completion;
-};
-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 focusIndex = (state, index) => {
+  const newState = {
+    ...state,
+    focusedIndex: index,
+    focused: true
   };
+  return newState;
 };
 
-const focusFirst = editor => {
+const focusFirst = state => {
   const firstIndex = 0;
-  return focusIndex(editor, firstIndex);
+  return focusIndex(state, firstIndex);
 };
 
-const focusNext = editor => {
-  const child = getCompletionState(editor);
-  if (!child) {
-    return editor;
-  }
-  const nextIndex = child.focusedIndex + 1;
-  return focusIndex(editor, nextIndex);
+const focusNext = state => {
+  const nextIndex = state.focusedIndex + 1;
+  return focusIndex(state, nextIndex);
 };
 
-const focusPrevious = editor => {
-  const child = getCompletionState(editor);
-  if (!child) {
-    return editor;
-  }
-  const previousIndex = child.focusedIndex - 1;
-  return focusIndex(editor, previousIndex);
+const focusPrevious = state => {
+  const previousIndex = state.focusedIndex - 1;
+  return focusIndex(state, previousIndex);
+};
+
+const handelWheel = (state, deltaMode, deltaY) => {
+  console.log({
+    deltaMode,
+    deltaY,
+    state
+  });
+  // TODO
+  return state;
 };
 
 const create = () => {
@@ -7492,6 +7500,10 @@ const getCompletionDetailBounds = (completionBounds, borderSize) => {
   };
 };
 
+const getCompletionState = editor => {
+  return getWidgetState(editor, Completion);
+};
+
 const openDetails = editor => {
   const child = getCompletionState(editor);
   if (!child) {
@@ -7599,24 +7611,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 +7908,7 @@ const getText = editorUid => {
   const {
     lines
   } = editor;
-  return lines.join('\n');
+  return lines.join(NewLine$4);
 };
 
 const InsertText = 'insertText';
@@ -8871,7 +8865,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 +8907,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,
@@ -9038,6 +9038,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.25.0",
   "description": "",
   "main": "dist/editorWorkerMain.js",
   "type": "module",