@lvce-editor/editor-worker 3.6.0 → 3.7.0

package/dist/editorWorkerMain.js

@@ -513,7 +513,6 @@ const offsetAt = (textDocument, positionRowIndex, positionColumnIndex) => {
   return offset;
 };
 const positionAt = (textDocument, offset) => {
-  // console.log({ textDocument, offset })
   let rowIndex = 0;
   let columnIndex = 0;
   let currentOffset = 0;
@@ -2012,7 +2011,6 @@ const createEditor = async ({
     ...newEditor3,
     focused: true
   };
-  // console.log({ newEditor })
   set$7(id, emptyEditor, newEditor4);
   await invoke$2(TextDocumentSyncFull, uri, id, languageId, content);
 };
@@ -2503,7 +2501,7 @@ const create$3 = () => {
 };
 
 const ColorPicker = 41;
-const FindWidget$1 = 16;
+const FindWidget = 16;
 const EditorCompletion = 9;
 const CompletionDetail = 999;
 
@@ -3646,7 +3644,7 @@ const state$5 = {
     columnIndex: 0
   }
 };
-const getPosition$1 = () => {
+const getPosition$2 = () => {
   return state$5.position;
 };
 
@@ -3871,13 +3869,6 @@ const handleMouseMoveWithAltKey = async (editor, x, y) => {
     // const definitionRelativeY = definitionStartPosition.rowIndex - editor.minLineY
 
     const lineTokenMap = editor.lineCache[definitionStartPosition.rowIndex + 1];
-    console.log({
-      tokenMap: lineTokenMap
-    });
-    console.log({
-      lineCache: editor.lineCache,
-      rowIndex: definitionStartPosition.rowIndex
-    });
     if (!lineTokenMap) {
       return editor;
     }
@@ -3885,9 +3876,6 @@ const handleMouseMoveWithAltKey = async (editor, x, y) => {
     if (tokenIndex === -1) {
       return editor;
     }
-    console.log({
-      token: tokenIndex
-    });
     // .tokens
     // await RendererProcess.invoke(
     //   /* Viewlet.invoke */ 'Viewlet.send',
@@ -3896,9 +3884,6 @@ const handleMouseMoveWithAltKey = async (editor, x, y) => {
     //   /* relativeY */ definitionRelativeY,
     //   /* tokenIndex */ tokenIndex,
     // )
-    console.log({
-      definition
-    });
     return editor;
   } catch (error) {
     // @ts-ignore
@@ -3979,7 +3964,7 @@ const setPosition = position => {
 const getEditor$1 = () => {
   return state$3.currentEditor;
 };
-const getPosition = () => {
+const getPosition$1 = () => {
   return state$3.position;
 };
 const hasListener = () => {
@@ -4224,7 +4209,7 @@ const getNewSelections$5 = (anchor, position) => {
 
 // @ts-ignore
 const editorMoveSelection = (editor, position) => {
-  const anchor = getPosition$1();
+  const anchor = getPosition$2();
   const newSelections = getNewSelections$5(anchor, position);
   // TODO if selection equals previous selection -> do nothing
   return scheduleSelections(editor, newSelections);
@@ -4511,7 +4496,7 @@ const getNewEditor$1 = (editor, position) => {
     const newMinLineY = position.rowIndex;
     const newMaxLineY = position.rowIndex + diff;
     const newDeltaY = position.rowIndex * rowHeight;
-    const anchor = getPosition$1();
+    const anchor = getPosition$2();
     const newSelections = new Uint32Array([position.rowIndex - 1, position.columnIndex, anchor.rowIndex, anchor.columnIndex]);
     return {
       ...editor,
@@ -4526,7 +4511,7 @@ const getNewEditor$1 = (editor, position) => {
     const newMinLineY = position.rowIndex - diff;
     const newMaxLineY = position.rowIndex;
     const newDeltaY = newMinLineY * rowHeight;
-    const anchor = getPosition$1();
+    const anchor = getPosition$2();
     const newSelections = new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex + 1, position.columnIndex]);
     return {
       ...editor,
@@ -4543,7 +4528,7 @@ const continueScrollingAndMovingSelection = async () => {
   if (!editor) {
     return;
   }
-  const position = getPosition();
+  const position = getPosition$1();
   if (position.rowIndex === 0) {
     return;
   }
@@ -5087,12 +5072,6 @@ const openCompletion = async editor => {
   };
 };
 
-const FindWidget = 'FindWidget';
-const openFind = async state => {
-  await invoke$3('Viewlet.openWidget', FindWidget);
-  return state;
-};
-
 const create$1 = () => {
   const uid = create$4();
   const widget = {
@@ -5109,7 +5088,12 @@ const create$1 = () => {
       matchCase: false,
       matchWholeWord: false,
       replacement: '',
-      editorUid: 0
+      editorUid: 0,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      focused: false
     },
     newState: {
       value: '',
@@ -5123,7 +5107,12 @@ const create$1 = () => {
       matchCase: false,
       matchWholeWord: false,
       replacement: '',
-      editorUid: 0
+      editorUid: 0,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      focused: true
     }
   };
   return widget;
@@ -5173,6 +5162,20 @@ const getMatchCount = matches => {
   return matches.length / 2;
 };
 
+const getPosition = editor => {
+  const width = 300;
+  const height = 30;
+  const paddingTop = 10;
+  const paddingRight = 20;
+  const x = editor.x + editor.width - width - paddingRight;
+  const y = editor.y + paddingTop;
+  return {
+    y,
+    x,
+    width,
+    height
+  };
+};
 const loadContent$1 = editorId => {
   const editor = getEditor(editorId);
   const {
@@ -5278,24 +5281,35 @@ const openFind2 = async editor => {
       matchCount,
       matchIndex
     } = await loadContent$1(editor.uid);
+    const {
+      x,
+      y,
+      width,
+      height
+    } = getPosition(editor);
     const latestState = {
       ...state,
       value,
       matches,
       matchCount,
-      matchIndex
+      matchIndex,
+      x,
+      y,
+      width,
+      height
     };
     return latestState;
   };
-  return addWidgetToEditor(Find, FindWidget$1, editor, create$1, newStateGenerator);
+  return addWidgetToEditor(Find, FindWidget, editor, create$1, newStateGenerator);
+};
+
+const openFind = async state => {
+  return openFind2(state);
 };
 
 const organizeImports = async editor => {
   // TODO ask extension host worker directly
   const edits = await invoke$3('ExtensionHostOrganizeImports.organizeImports', editor);
-  console.log({
-    edits
-  });
   return applyDocumentEdits(editor, edits);
 };
 
@@ -6786,9 +6800,6 @@ const typeWithAutoClosing = async (editor, text) => {
     case DoubleQuote:
     case SingleQuote:
     case BackTick:
-      console.log({
-        auto: editor
-      });
       if (isAutoClosingQuotesEnabled) {
         return typeWithAutoClosingQuote(editor, text);
       }
@@ -7539,7 +7550,7 @@ const renderHoverDom = {
     return [/* method */'Viewlet.setDom2', dom];
   }
 };
-const renderBounds$3 = {
+const renderBounds$4 = {
   isEqual(oldState, newState) {
     return oldState.x === newState.x && oldState.y === newState.y && oldState.resizedWidth === newState.resizedWidth;
   },
@@ -7557,7 +7568,7 @@ const renderBounds$3 = {
     return [SetBounds, x, y, resizedWidth, height];
   }
 };
-const render$9 = [renderHoverDom, renderBounds$3];
+const render$9 = [renderHoverDom, renderBounds$4];
 const renderHover = async (oldState, newState) => {
   const commands = [];
   for (const item of render$9) {
@@ -8171,7 +8182,6 @@ const getLineInfosViewport = (editor, tokens, embeddedResults, minLineY, maxLine
   };
 };
 const getVisible = async (editor, syncIncremental) => {
-  // console.log({ editor })
   // TODO should separate rendering from business logic somehow
   // currently hard to test because need to mock editor height, top, left,
   // invalidStartIndex, lineCache, etc. just for testing editorType
@@ -8421,7 +8431,7 @@ const renderScrollBarX = {
     return [/* method */'setScrollBarHorizontal', /* scrollBarX */scrollBarX, /* scrollBarWidth */scrollBarWidth, /* deltaX */newState.deltaX];
   }
 };
-const renderFocus = {
+const renderFocus$1 = {
   isEqual(oldState, newState) {
     return oldState.focused === newState.focused;
   },
@@ -8519,7 +8529,7 @@ const renderWidgets = {
   },
   multiple: true
 };
-const render$8 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus, renderDecorations, renderGutterInfo, renderWidgets];
+const render$8 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets];
 const renderEditor = async id => {
   const instance = get$7(id);
   if (!instance) {
@@ -8551,16 +8561,7 @@ const keep = [
 // 'ColorPicker.loadContent',
 'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render',
 // 'ColorPicker.render',
-'Editor.getText', 'Editor.getSelections',
-// 'EditorCompletion.advance',
-// 'EditorCompletion.handleEditorBlur',
-// 'EditorCompletion.handleEditorClick',
-// 'EditorCompletion.handleEditorDeleteLeft',
-// 'EditorCompletion.handleEditorType',
-// 'EditorCompletion.loadContent',
-// 'EditorCompletion.selectCurrent',
-// 'EditorCompletion.selectIndex',
-'FindWidget.focusFirst', 'FindWidget.focusIndex', 'FindWidget.focusLast', 'FindWidget.focusNext', 'FindWidget.focusPrevious', 'FindWidget.handleInput', 'FindWidget.loadContent', 'Font.ensure', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize'];
+'Editor.getText', 'Editor.getSelections', 'Font.ensure', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize'];
 
 const wrapWidgetCommand = (widgetId, fn) => {
   const isWidget = widget => {
@@ -8587,7 +8588,13 @@ const wrapWidgetCommand = (widgetId, fn) => {
 
 const widgetCommands = {
   'ColorPicker.handleSliderPointerDown': ColorPicker$1,
-  'ColorPicker.handleSliderPointerMove': ColorPicker$1
+  'ColorPicker.handleSliderPointerMove': ColorPicker$1,
+  'FindWidget.focusNext': Find,
+  'FindWidget.focusPrevious': Find,
+  'FindWidget.close': Find,
+  'FindWidget.focusIndex': Find,
+  'FindWidget.focusFirst': Find,
+  'FindWidget.focusLast': Find
 };
 
 // TODO wrap commands globally, not per editor
@@ -8775,6 +8782,7 @@ const commandMap = {
 wrapCommands(commandMap);
 
 const CheckBox = 'checkbox';
+const Group = 'group';
 const None = 'none';
 const Option = 'option';
 
@@ -8975,7 +8983,7 @@ const renderItems = {
     return ['setDom', dom];
   }
 };
-const renderBounds$2 = {
+const renderBounds$3 = {
   isEqual(oldState, newState) {
     return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.x === newState.x && oldState.y === newState.y;
   },
@@ -9021,7 +9029,7 @@ const renderScrollBar = {
     return [/* method */SetScrollBar, /* scrollBarY */scrollBarY, /* scrollBarHeight */scrollBarHeight];
   }
 };
-const render$7 = [renderItems, renderBounds$2, renderHeight, renderNegativeMargin, renderScrollBar];
+const render$7 = [renderItems, renderBounds$3, renderHeight, renderNegativeMargin, renderScrollBar];
 const renderCompletion = (oldState, newState) => {
   const commands = [];
   for (const item of render$7) {
@@ -9624,6 +9632,17 @@ 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');
+  // TODO have separate rendering functions, e.g.
+  // 1. renderDom
+  // 2. renderAriaAnnouncement
+  // 3. renderFocus
+  // to ensure that focus is always after the element is added to the dom
+  if (focusCommandIndex !== -1) {
+    const command = allCommands[focusCommandIndex];
+    allCommands.splice(focusCommandIndex, 1);
+    allCommands.push(command);
+  }
   return allCommands;
 };
 
@@ -9652,7 +9671,7 @@ const renderContent$1 = {
     return ['Viewlet.setDom2', newState.uid, dom];
   }
 };
-const renderBounds$1 = {
+const renderBounds$2 = {
   isEqual(oldState, newState) {
     return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
   },
@@ -9666,7 +9685,7 @@ const renderBounds$1 = {
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
   }
 };
-const render$5 = [renderContent$1, renderBounds$1, renderColor, renderOffsetX];
+const render$5 = [renderContent$1, renderBounds$2, renderColor, renderOffsetX];
 const renderFull$1 = (oldState, newState) => {
   const commands = [];
   for (const item of render$5) {
@@ -9733,7 +9752,7 @@ const renderContent = {
     return ['Viewlet.setDom2', newState.uid, dom];
   }
 };
-const renderBounds = {
+const renderBounds$1 = {
   isEqual(oldState, newState) {
     return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
   },
@@ -9747,7 +9766,7 @@ const renderBounds = {
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
   }
 };
-const render$3 = [renderContent, renderBounds];
+const render$3 = [renderContent, renderBounds$1];
 const renderFull = (oldState, newState) => {
   return renderParts(render$3, oldState, newState);
 };
@@ -9903,7 +9922,7 @@ const getIconButtonVirtualDom = iconButton => {
     type: Button,
     className,
     title: label,
-    ariaLaBel: label,
+    ariaLabel: label,
     childCount: 1,
     disabled: disabled ? true : undefined
   }, getIconVirtualDom(icon)];
@@ -9912,8 +9931,9 @@ const getFindWidgetVirtualDom = (matchCountText, replaceExpanded, buttons, match
   const dom = [];
   dom.push({
     type: Div,
-    className: 'Viewlet ViewletFind',
-    childCount: 2
+    className: 'Viewlet ViewletFind ViewletFindWidget FindWidget',
+    childCount: 2,
+    role: Group
   });
   dom.push(...getSearchToggleButtonVirtualDom(replaceExpanded, 'handleClick'));
   dom.push({
@@ -9985,7 +10005,28 @@ const renderDetails = {
     return ['Viewlet.setDom2', dom];
   }
 };
-
+const renderBounds = {
+  isEqual(oldState, newState) {
+    return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
+  },
+  apply(oldState, newState) {
+    const {
+      x,
+      y,
+      width,
+      height
+    } = newState;
+    return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
+  }
+};
+const renderFocus = {
+  isEqual(oldState, newState) {
+    return oldState.focused === newState.focused;
+  },
+  apply(oldState, newState) {
+    return ['focus', newState.focused];
+  }
+};
 // const getAriaLabel = (state: FindWidgetState) => {
 //   const { matchIndex, matchCount, value } = state
 //   return FindStrings.matchesFoundFor(matchIndex, matchCount, value)
@@ -10006,9 +10047,7 @@ const renderDetails = {
 //   },
 // }
 
-const render$1 = [
-// renderAriaAnnouncement,
-renderDetails, renderValue];
+const render$1 = [renderDetails, renderBounds, renderValue, renderFocus];
 const apply = (oldState, newState) => {
   return renderParts(render$1, oldState, newState);
 };
@@ -10019,7 +10058,7 @@ const render = widget => {
   const uid = widget.newState.uid;
   for (const command of commands) {
     if (command[0] === 'Viewlet.setDom2') {
-      wrappedCommands.push(command);
+      wrappedCommands.push([command[0], uid, ...command.slice(1)]);
     } else {
       wrappedCommands.push(['Viewlet.send', uid, ...command]);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/editor-worker",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "",
   "main": "dist/testWorkerMain.js",
   "type": "module",