@lvce-editor/editor-worker 4.1.0 → 4.3.0

package/dist/editorWorkerMain.js

@@ -2258,13 +2258,13 @@ const cancelSelection = editor => {
 };
 
 // TODO use numeric widget id
+const ColorPicker$2 = 'colorPicker';
 const Completion = 'completion';
 const CompletionDetail$1 = 'completionDetail';
-const ColorPicker$2 = 'colorPicker';
 const Find = 'find';
 const Hover = 'hover';
+const Rename = 'rename';
 const SourceAction = 'sourceAction';
-const Rename$1 = 'rename';
 
 const isCompletionWidget = widget => {
   return widget.id === Completion;
@@ -2304,7 +2304,7 @@ const closeFind = editor => {
 
 // TODO duplicate code
 const isRenameWidget = widget => {
-  return widget.id === Rename$1;
+  return widget.id === Rename;
 };
 const closeRename = editor => {
   const {
@@ -2425,20 +2425,19 @@ const create$6 = () => {
 };
 
 const ColorPicker$1 = 41;
-const FindWidget = 16;
-const EditorCompletion = 9;
 const CompletionDetail = 999;
+const EditorCompletion = 9;
 const Empty = 0;
-const FocusFindWidgetToggleReplace = 42;
-const FocusFindWidgetReplace = 43;
-const FocusFindWidgetReplaceButton = 46;
-const FocusFindWidgetReplaceAllButton = 47;
+const FindWidget = 16;
+const FocusEditorHover = 51;
 const FocusFindWidgetCloseButton = 48;
 const FocusFindWidgetNextMatchButton = 49;
 const FocusFindWidgetPreviousMatchButton = 50;
-const FocusEditorHover = 51;
+const FocusFindWidgetReplace = 43;
+const FocusFindWidgetReplaceAllButton = 47;
+const FocusFindWidgetReplaceButton = 46;
+const FocusFindWidgetToggleReplace = 42;
 const SourceActions = 38;
-const Rename = 999;
 
 const newStateGenerator$1 = state => {
   return loadContent$3(state);
@@ -5478,7 +5477,7 @@ const getRenamePosition = editor => {
 const create$3 = () => {
   const completionUid = create$7();
   const renameWidget = {
-    id: Rename$1,
+    id: Rename,
     oldState: {
       uid: completionUid,
       focusedIndex: -1,
@@ -5495,7 +5494,7 @@ const create$3 = () => {
       focusedIndex: -1,
       oldValue: '',
       newValue: '',
-      focused: false,
+      focused: true,
       x: 0,
       y: 0,
       width: 0,
@@ -5536,7 +5535,7 @@ const openRename = async editor => {
     return latestState;
   };
   const fullFocus = true;
-  return addWidgetToEditor(Rename$1, Rename, editor, create$3, newStateGenerator, fullFocus);
+  return addWidgetToEditor(Rename, undefined, editor, create$3, newStateGenerator, fullFocus);
 };
 
 const organizeImports = async editor => {
@@ -6697,35 +6696,44 @@ const showHover2 = async editor => {
   return addWidgetToEditor(Hover, FocusEditorHover, editor, create$2, newStateGenerator);
 };
 
-const EditorSourceActions = 'EditorSourceActions';
-const showSourceActions$1 = async editor => {
-  // TODO
-  // 1. hide hover, completions, color picker
-  // 2. query source actions from extension host
-  // 3. show source actions menu
-
-  await invoke$3('Viewlet.openWidget', EditorSourceActions);
-  return editor;
-};
-
-// TODO maybe ask extension host worker instead
+// TODO ask extension host worker instead
 const getEditorSourceActions = async () => {
   const sourceActions = await invoke$3('GetEditorSourceActions.getEditorSourceActions');
   return sourceActions;
 };
 
-const loadSourceActions = async (editorUid, state) => {
+const getSourceActionWidgetPosition = editor => {
+  const width = 300;
+  const height = 150;
+  const cursor = getPositionAtCursor(editor);
+  const x = cursor.x;
+  const y = cursor.y;
+  return {
+    x,
+    y,
+    width,
+    height
+  };
+};
+
+const loadSourceActions = async (editor, state) => {
   // const editor = GetEditor.getEditor(editorUid)
   // TODO request source actions information from extensions
   const sourceActions = await getEditorSourceActions();
   // TODO avoid side effect
+  const {
+    x,
+    y,
+    width,
+    height
+  } = getSourceActionWidgetPosition(editor);
   return {
     ...state,
     sourceActions,
-    x: 200,
-    y: -200,
-    width: 250,
-    height: 150,
+    x,
+    y,
+    width,
+    height,
     maxHeight: 150,
     focusedIndex: 0
   };
@@ -6760,9 +6768,8 @@ const create$1 = () => {
 };
 
 const showSourceActions = async editor => {
-  const uid = editor.uid;
   const newStateGenerator = state => {
-    return loadSourceActions(uid, state);
+    return loadSourceActions(editor, state);
   };
   return addWidgetToEditor(SourceAction, SourceActions, editor, create$1, newStateGenerator);
 };
@@ -8919,7 +8926,7 @@ const renderScrollBarX = {
     return [/* method */'setScrollBarHorizontal', /* scrollBarX */scrollBarX, /* scrollBarWidth */scrollBarWidth, /* deltaX */newState.deltaX];
   }
 };
-const renderFocus$1 = {
+const renderFocus$2 = {
   isEqual(oldState, newState) {
     return oldState.focused === newState.focused;
   },
@@ -9017,7 +9024,7 @@ const renderWidgets = {
   },
   multiple: true
 };
-const render$d = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets];
+const render$d = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$2, renderDecorations, renderGutterInfo, renderWidgets];
 const renderEditor = async id => {
   const instance = get$6(id);
   if (!instance) {
@@ -9244,7 +9251,7 @@ const commandMap = {
   'Editor.setSelections': setSelections,
   'Editor.showHover': showHover,
   'Editor.showHover2': showHover2,
-  'Editor.showSourceActions': showSourceActions$1,
+  'Editor.showSourceActions': showSourceActions,
   'Editor.showSourceActions2': showSourceActions,
   'Editor.sortLinesAscending': sortLinesAscending,
   'Editor.tabCompletion': tabCompletion,
@@ -9800,7 +9807,9 @@ const addWidget = (widget, id, render) => {
   allCommands.push(['Viewlet.createFunctionalRoot', id, uid]);
   allCommands.push(...commands);
   allCommands.push(['Viewlet.send', uid, 'appendWidget']);
-  const focusCommandIndex = allCommands.findIndex(command => command[2] === 'focus');
+  const focusCommandIndex = allCommands.findIndex(command => {
+    return command[2] === 'focus' || command[0] === 'Viewlet.focusSelector';
+  });
   // TODO have separate rendering functions, e.g.
   // 1. renderDom
   // 2. renderAriaAnnouncement
@@ -10714,7 +10723,7 @@ const renderBounds$2 = {
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
   }
 };
-const renderFocus = {
+const renderFocus$1 = {
   isEqual(oldState, newState) {
     return oldState.focused === newState.focused && oldState.focus === newState.focus && oldState.focusSource === newState.focusSource;
   },
@@ -10743,7 +10752,7 @@ const renderFocus = {
 //   },
 // }
 
-const render$6 = [renderDetails, renderBounds$2, renderValue, renderFocus];
+const render$6 = [renderDetails, renderBounds$2, renderValue, renderFocus$1];
 const apply = (oldState, newState) => {
   // TODO avoid side effect
   if (oldState.focus !== newState.focus) {
@@ -10849,7 +10858,15 @@ const renderBounds$1 = {
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
   }
 };
-const render$3 = [renderContent, renderBounds$1];
+const renderFocus = {
+  isEqual(oldState, newState) {
+    return oldState.focused === newState.focused;
+  },
+  apply(oldState, newState) {
+    return [/* method */'Viewlet.focusSelector', newState.uid, '.RenameInputBox'];
+  }
+};
+const render$3 = [renderContent, renderBounds$1, renderFocus];
 const renderFull = (oldState, newState) => {
   return renderParts(render$3, oldState, newState);
 };
@@ -10861,6 +10878,8 @@ const render$2 = widget => {
   for (const command of commands) {
     if (command[0] === 'Viewlet.setDom2') {
       wrappedCommands.push(command);
+    } else if (command[0] === 'Viewlet.focusSelector') {
+      wrappedCommands.push(command);
     } else {
       wrappedCommands.push(['Viewlet.send', uid, ...command]);
     }
@@ -10994,7 +11013,7 @@ const registerWidgets = () => {
   set$7(CompletionDetail$1, EditorCompletionDetailWidget);
   set$7(Find, EditorFindWidget);
   set$7(Hover, EditorHoverWidget);
-  set$7(Rename$1, EditorRenameWidget);
+  set$7(Rename, EditorRenameWidget);
   set$7(SourceAction, EditorSourceActionWidget);
 };
 

package/package.json

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