@lvce-editor/editor-worker 4.3.0 → 4.5.0

package/dist/editorWorkerMain.js

@@ -1739,6 +1739,22 @@ const HoverExecute = 'ExtensionHostHover.execute';
 const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompletionProvider';
 const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
 
+const ColorPicker$2 = 41;
+const CompletionDetail$1 = 999;
+const EditorCompletion = 9;
+const Empty = 0;
+const FindWidget = 16;
+const FocusEditorHover = 51;
+const FocusEditorRename = 11;
+const FocusFindWidgetCloseButton = 48;
+const FocusFindWidgetNextMatchButton = 49;
+const FocusFindWidgetPreviousMatchButton = 50;
+const FocusFindWidgetReplace = 43;
+const FocusFindWidgetReplaceAllButton = 47;
+const FocusFindWidgetReplaceButton = 46;
+const FocusFindWidgetToggleReplace = 42;
+const SourceActions = 38;
+
 const measureCharacterWidth = (fontWeight, fontSize, fontFamily, letterSpacing) => {
   return measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
 };
@@ -1852,7 +1868,8 @@ const createEditor = async ({
     charWidth,
     uid: id,
     id,
-    widgets: []
+    widgets: [],
+    focusKey: Empty
   };
   // TODO avoid creating intermediate editors here
   const newEditor1 = setBounds(editor, x, y, width, height, 9);
@@ -1929,15 +1946,14 @@ const applyEdit = async (editor, changes) => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-const handleBlur$1 = editor => {
-  // for (const listener of state.blurListeners) {
-  //   listener(editor)
-  // }
-  // TODO save on blur
-  // Command.execute(/* Main.save */ 89)
+const handleBlur$2 = editor => {
+  if (editor.focusKey !== Empty) {
+    return editor;
+  }
   const newEditor = {
     ...editor,
-    focused: false
+    focused: false,
+    focusKey: Empty
   };
   return newEditor;
 };
@@ -2258,9 +2274,9 @@ const cancelSelection = editor => {
 };
 
 // TODO use numeric widget id
-const ColorPicker$2 = 'colorPicker';
+const ColorPicker$1 = 'colorPicker';
 const Completion = 'completion';
-const CompletionDetail$1 = 'completionDetail';
+const CompletionDetail = 'completionDetail';
 const Find = 'find';
 const Hover = 'hover';
 const Rename = 'rename';
@@ -2317,6 +2333,7 @@ const closeRename = editor => {
   const newWidgets = [...widgets.slice(0, renameWidgetIndex), ...widgets.slice(renameWidgetIndex + 1)];
   return {
     ...editor,
+    focused: true,
     widgets: newWidgets
   };
 };
@@ -2383,9 +2400,12 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
   } else {
     await setAdditionalFocus(focusKey);
   }
+  const newFocus = fullFocus ? false : true;
   const newEditor = {
     ...editor,
-    widgets: newWidgets
+    widgets: newWidgets,
+    focusKey,
+    focused: newFocus
   };
   return newEditor;
 };
@@ -2397,7 +2417,7 @@ const create$7 = () => {
 const create$6 = () => {
   const completionUid = create$7();
   const widget = {
-    id: ColorPicker$2,
+    id: ColorPicker$1,
     oldState: {
       color: '',
       offsetX: 0,
@@ -2424,26 +2444,11 @@ const create$6 = () => {
   return widget;
 };
 
-const ColorPicker$1 = 41;
-const CompletionDetail = 999;
-const EditorCompletion = 9;
-const Empty = 0;
-const FindWidget = 16;
-const FocusEditorHover = 51;
-const FocusFindWidgetCloseButton = 48;
-const FocusFindWidgetNextMatchButton = 49;
-const FocusFindWidgetPreviousMatchButton = 50;
-const FocusFindWidgetReplace = 43;
-const FocusFindWidgetReplaceAllButton = 47;
-const FocusFindWidgetReplaceButton = 46;
-const FocusFindWidgetToggleReplace = 42;
-const SourceActions = 38;
-
 const newStateGenerator$1 = state => {
   return loadContent$3(state);
 };
 const openColorPicker = async editor => {
-  return addWidgetToEditor(ColorPicker$2, ColorPicker$1, editor, create$6, newStateGenerator$1);
+  return addWidgetToEditor(ColorPicker$1, ColorPicker$2, editor, create$6, newStateGenerator$1);
 };
 
 const state$6 = {
@@ -4037,15 +4042,12 @@ const handleScrollBarMove = (state, eventY) => {
 };
 const handleScrollBarVerticalPointerMove = handleScrollBarMove;
 
-// @ts-ignore
-
 // TODO scrollbar position can be in interval [0, editor.height - editor.scrollBarHeight]
 // when clicked at y <= editor.scrollbarHeight/2, position is set to zero
 // when clicked at y >= editor.height - editor.scrollBarHeight/2, position is set to (editor.height - scrollBarHeight/2)
 // when clicked at y > editor.height - editor.scrollBarHeight/2, position scrollbar at (y - scrollbarHeight/2)
 // additionally, when clicked on scrollbar, scrollbar position shouldn't move
 
-// @ts-ignore
 const handleScrollBarPointerDown = (state, eventY) => {
   const {
     y,
@@ -5183,7 +5185,7 @@ const isFind = widget => {
 };
 // TODO don't call renderer worker, set editor state
 // TODO this function should be synchronous
-const focusIndex$1 = (editor, index) => {
+const focusIndex$2 = (editor, index) => {
   const findState = getFindState(editor);
   if (!findState) {
     return editor;
@@ -5226,7 +5228,7 @@ const focusFirst$1 = editor => {
   if (!findState) {
     return editor;
   }
-  return focusIndex$1(editor, 0);
+  return focusIndex$2(editor, 0);
 };
 const focusLast = editor => {
   const findState = getFindState(editor);
@@ -5236,9 +5238,9 @@ const focusLast = editor => {
   const {
     matchCount
   } = findState;
-  return focusIndex$1(editor, matchCount - 1);
+  return focusIndex$2(editor, matchCount - 1);
 };
-const focusNext$1 = editor => {
+const focusNext$2 = editor => {
   const findState = getFindState(editor);
   if (!findState) {
     return editor;
@@ -5250,7 +5252,7 @@ const focusNext$1 = editor => {
   if (matchIndex === matchCount - 1) {
     return focusFirst$1(editor);
   }
-  return focusIndex$1(editor, matchIndex + 1);
+  return focusIndex$2(editor, matchIndex + 1);
 };
 const focusPrevious$1 = editor => {
   const findState = getFindState(editor);
@@ -5263,7 +5265,7 @@ const focusPrevious$1 = editor => {
   if (matchIndex === 0) {
     return focusLast(editor);
   }
-  return focusIndex$1(editor, matchIndex - 1);
+  return focusIndex$2(editor, matchIndex - 1);
 };
 
 const focusNextMatchButton = state => {
@@ -5290,7 +5292,7 @@ const focusToggleReplaceButton = state => {
   return setFindWidgetFocus(state, FocusFindWidgetToggleReplace);
 };
 
-const handleBlur = async state => {
+const handleBlur$1 = async state => {
   await setFocus(Empty);
   return state;
 };
@@ -5535,7 +5537,7 @@ const openRename = async editor => {
     return latestState;
   };
   const fullFocus = true;
-  return addWidgetToEditor(Rename, undefined, editor, create$3, newStateGenerator, fullFocus);
+  return addWidgetToEditor(Rename, FocusEditorRename, editor, create$3, newStateGenerator, fullFocus);
 };
 
 const organizeImports = async editor => {
@@ -7563,7 +7565,7 @@ const editorUnindent = editor => {
 // editor.lines //?
 
 const isCompletionDetailWidget = widget => {
-  return widget.id === CompletionDetail$1;
+  return widget.id === CompletionDetail;
 };
 const closeDetails = editor => {
   const {
@@ -7580,7 +7582,7 @@ const closeDetails = editor => {
   };
 };
 
-const focusIndex = (state, index) => {
+const focusIndex$1 = (state, index) => {
   const newState = {
     ...state,
     focusedIndex: index,
@@ -7591,17 +7593,17 @@ const focusIndex = (state, index) => {
 
 const focusFirst = state => {
   const firstIndex = 0;
-  return focusIndex(state, firstIndex);
+  return focusIndex$1(state, firstIndex);
 };
 
-const focusNext = state => {
+const focusNext$1 = state => {
   const nextIndex = state.focusedIndex + 1;
-  return focusIndex(state, nextIndex);
+  return focusIndex$1(state, nextIndex);
 };
 
 const focusPrevious = state => {
   const previousIndex = state.focusedIndex - 1;
-  return focusIndex(state, previousIndex);
+  return focusIndex$1(state, previousIndex);
 };
 
 // TODO optimize this function to return the minimum number
@@ -7651,7 +7653,7 @@ const handelWheel = (state, deltaMode, deltaY) => {
 const create = () => {
   const completionUid = create$7();
   const completionWidget = {
-    id: CompletionDetail$1,
+    id: CompletionDetail,
     oldState: {
       content: '',
       uid: completionUid,
@@ -7702,7 +7704,7 @@ const openDetails = editor => {
     };
     return newestState;
   };
-  return addWidgetToEditor(CompletionDetail$1, CompletionDetail, editor, create, newStateGenerator);
+  return addWidgetToEditor(CompletionDetail, CompletionDetail$1, editor, create, newStateGenerator);
 };
 
 const getEdits = async (editor, completionItem) => {
@@ -7783,7 +7785,7 @@ const selectCurrent = editor => {
 };
 
 const getCompletionDetailState = editor => {
-  return getWidgetState(editor, CompletionDetail$1);
+  return getWidgetState(editor, CompletionDetail);
 };
 
 const toggleDetails = editor => {
@@ -8019,6 +8021,23 @@ const renderHover = (oldState, newState) => {
   return commands;
 };
 
+const handleBlur = editor => {
+  return closeRename(editor);
+};
+
+const focusIndex = (state, index) => {
+  const newState = {
+    ...state,
+    focusedIndex: index
+  };
+  return newState;
+};
+
+const focusNext = state => {
+  const nextIndex = state.focusedIndex + 1;
+  return focusIndex(state, nextIndex);
+};
+
 const replaceTextOccurrences = (editor, matches, oldValue, newValue) => {
   const ranges = [];
   const oldValueLength = oldValue.length;
@@ -9074,8 +9093,8 @@ const wrapWidgetCommand = (widgetId, fn) => {
 };
 
 const widgetCommands = {
-  'ColorPicker.handleSliderPointerDown': ColorPicker$2,
-  'ColorPicker.handleSliderPointerMove': ColorPicker$2,
+  'ColorPicker.handleSliderPointerDown': ColorPicker$1,
+  'ColorPicker.handleSliderPointerMove': ColorPicker$1,
   // 'FindWidget.focusNext': WidgetId.Find,
   // 'FindWidget.focusPrevious': WidgetId.Find,
   'FindWidget.close': Find,
@@ -9184,7 +9203,7 @@ const commandMap = {
   'Editor.goToTypeDefinition': goToTypeDefinition,
   'Editor.handleBeforeInput': handleBeforeInput,
   'Editor.handleBeforeInputFromContentEditable': handleBeforeInputFromContentEditable,
-  'Editor.handleBlur': handleBlur$1,
+  'Editor.handleBlur': handleBlur$2,
   'Editor.handleContextMenu': handleContextMenu,
   'Editor.handleDoubleClick': handleDoubleClick,
   'Editor.handleFocus': handleFocus,
@@ -9265,8 +9284,8 @@ const commandMap = {
   'EditorCompletion.advance': advance,
   'EditorCompletion.closeDetails': closeDetails,
   'EditorCompletion.focusFirst': focusFirst,
-  'EditorCompletion.focusIndex': focusIndex,
-  'EditorCompletion.focusNext': focusNext,
+  'EditorCompletion.focusIndex': focusIndex$1,
+  'EditorCompletion.focusNext': focusNext$1,
   'EditorCompletion.focusPrevious': focusPrevious,
   'EditorCompletion.handleEditorBlur': handleEditorBlur,
   'EditorCompletion.handleEditorClick': handleEditorClick,
@@ -9278,13 +9297,15 @@ const commandMap = {
   'EditorCompletion.selectCurrent': selectCurrent,
   'EditorCompletion.selectIndex': selectIndex,
   'EditorCompletion.toggleDetails': toggleDetails,
+  'EditorRename.handleBlur': handleBlur,
+  'EditorSourceActions.focusNext': focusNext,
   'FindWidget.close': close$1,
   'FindWidget.focusCloseButton': focusCloseButton,
   'FindWidget.focusFind': focusFind,
   'FindWidget.focusFirst': focusFirst$1,
-  'FindWidget.focusIndex': focusIndex$1,
+  'FindWidget.focusIndex': focusIndex$2,
   'FindWidget.focusLast': focusLast,
-  'FindWidget.focusNext': focusNext$1,
+  'FindWidget.focusNext': focusNext$2,
   'FindWidget.focusNextMatchButton': focusNextMatchButton,
   'FindWidget.focusPrevious': focusPrevious$1,
   'FindWidget.focusPreviousMatchButton': focusPreviousMatchButton,
@@ -9292,7 +9313,7 @@ const commandMap = {
   'FindWidget.focusReplaceAllButton': focusReplaceAllButton,
   'FindWidget.focusReplaceButton': focusReplaceButton,
   'FindWidget.focusToggleReplace': focusToggleReplaceButton,
-  'FindWidget.handleBlur': handleBlur,
+  'FindWidget.handleBlur': handleBlur$1,
   'FindWidget.handleFocus': handleFindWidgetFocus,
   'FindWidget.handleInput': handleInput,
   'FindWidget.handleReplaceAllFocus': handleReplaceAllFocus,
@@ -10780,13 +10801,13 @@ const add$3 = widget => {
 const remove$3 = removeWidget;
 const Commands = {
   'FindWidget.close': close$1,
-  'FindWidget.focusNext': focusNext$1,
+  'FindWidget.focusNext': focusNext$2,
   'FindWidget.focusPrevious': focusPrevious$1,
-  'FindWidget.focusIndex': focusIndex$1,
+  'FindWidget.focusIndex': focusIndex$2,
   'FindWidget.focusLast': focusLast,
   'FindWidget.toggleReplace': toggleReplace,
   'FindWidget.handleFocus': focusFind,
-  'FindWidget.handleBlur': handleBlur
+  'FindWidget.handleBlur': handleBlur$1
 };
 
 const EditorFindWidget = {
@@ -10831,7 +10852,8 @@ const getRenameVirtualDom = state => {
     type: Input,
     className: 'InputBox RenameInputBox',
     value: state.newValue,
-    childCount: 0
+    childCount: 0,
+    onBlur: 'handleBlur'
   }];
 };
 
@@ -11008,9 +11030,9 @@ const EditorSourceActionWidget = {
 };
 
 const registerWidgets = () => {
-  set$7(ColorPicker$2, EditorColorPickerWidget);
+  set$7(ColorPicker$1, EditorColorPickerWidget);
   set$7(Completion, EditorCompletionWidget);
-  set$7(CompletionDetail$1, EditorCompletionDetailWidget);
+  set$7(CompletionDetail, EditorCompletionDetailWidget);
   set$7(Find, EditorFindWidget);
   set$7(Hover, EditorHoverWidget);
   set$7(Rename, EditorRenameWidget);

package/package.json

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