@lvce-editor/editor-worker 4.2.0 → 4.4.0

package/dist/editorWorkerMain.js

@@ -1929,7 +1929,7 @@ const applyEdit = async (editor, changes) => {
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
-const handleBlur$1 = editor => {
+const handleBlur$2 = editor => {
   // for (const listener of state.blurListeners) {
   //   listener(editor)
   // }
@@ -2263,7 +2263,7 @@ const Completion = 'completion';
 const CompletionDetail$1 = 'completionDetail';
 const Find = 'find';
 const Hover = 'hover';
-const Rename$1 = 'rename';
+const Rename = 'rename';
 const SourceAction = 'sourceAction';
 
 const isCompletionWidget = widget => {
@@ -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,20 @@ 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 FocusEditorRename = 11;
 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);
@@ -4038,15 +4038,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,
@@ -5291,7 +5288,7 @@ const focusToggleReplaceButton = state => {
   return setFindWidgetFocus(state, FocusFindWidgetToggleReplace);
 };
 
-const handleBlur = async state => {
+const handleBlur$1 = async state => {
   await setFocus(Empty);
   return state;
 };
@@ -5478,7 +5475,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 +5492,7 @@ const create$3 = () => {
       focusedIndex: -1,
       oldValue: '',
       newValue: '',
-      focused: false,
+      focused: true,
       x: 0,
       y: 0,
       width: 0,
@@ -5536,7 +5533,7 @@ const openRename = async editor => {
     return latestState;
   };
   const fullFocus = true;
-  return addWidgetToEditor(Rename$1, Rename, editor, create$3, newStateGenerator, fullFocus);
+  return addWidgetToEditor(Rename, FocusEditorRename, editor, create$3, newStateGenerator, fullFocus);
 };
 
 const organizeImports = async editor => {
@@ -8020,6 +8017,10 @@ const renderHover = (oldState, newState) => {
   return commands;
 };
 
+const handleBlur = editor => {
+  return closeRename(editor);
+};
+
 const replaceTextOccurrences = (editor, matches, oldValue, newValue) => {
   const ranges = [];
   const oldValueLength = oldValue.length;
@@ -8927,7 +8928,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;
   },
@@ -9025,7 +9026,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) {
@@ -9185,7 +9186,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,
@@ -9279,6 +9280,7 @@ const commandMap = {
   'EditorCompletion.selectCurrent': selectCurrent,
   'EditorCompletion.selectIndex': selectIndex,
   'EditorCompletion.toggleDetails': toggleDetails,
+  'EditorRename.handleBlur': handleBlur,
   'FindWidget.close': close$1,
   'FindWidget.focusCloseButton': focusCloseButton,
   'FindWidget.focusFind': focusFind,
@@ -9293,7 +9295,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,
@@ -9808,7 +9810,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
@@ -10722,7 +10726,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;
   },
@@ -10751,7 +10755,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) {
@@ -10785,7 +10789,7 @@ const Commands = {
   'FindWidget.focusLast': focusLast,
   'FindWidget.toggleReplace': toggleReplace,
   'FindWidget.handleFocus': focusFind,
-  'FindWidget.handleBlur': handleBlur
+  'FindWidget.handleBlur': handleBlur$1
 };
 
 const EditorFindWidget = {
@@ -10830,7 +10834,8 @@ const getRenameVirtualDom = state => {
     type: Input,
     className: 'InputBox RenameInputBox',
     value: state.newValue,
-    childCount: 0
+    childCount: 0,
+    onBlur: 'handleBlur'
   }];
 };
 
@@ -10857,7 +10862,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);
 };
@@ -10869,6 +10882,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]);
     }
@@ -11002,7 +11017,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.2.0",
+  "version": "4.4.0",
   "description": "",
   "main": "dist/editorWorkerMain.js",
   "type": "module",