@lvce-editor/status-bar-worker 3.30.0 → 3.30.2

package/dist/statusBarWorkerMain.js

@@ -1899,13 +1899,19 @@ const applyUpdate = update => {
     ...editorStatus,
     ...update
   };
-  if (typeof next.column !== 'number' || typeof next.encoding !== 'string' || typeof next.endOfLine !== 'string' || typeof next.insertSpaces !== 'boolean' || typeof next.languageId !== 'string' || typeof next.line !== 'number' || typeof next.tabSize !== 'number') {
+  if (typeof next.column !== 'number' || typeof next.encoding !== 'string' || typeof next.endOfLine !== 'string' || typeof next.insertSpaces !== 'boolean' || typeof next.languageId !== 'string' || typeof next.line !== 'number' || next.selectedChars !== undefined && typeof next.selectedChars !== 'number' || typeof next.tabSize !== 'number') {
     throw new TypeError('The first editor status update must contain a complete status');
   }
   editorStatus = next;
   return editorStatus;
 };
 
+let visible = true;
+const isVisible = () => visible;
+const setVisible = value => {
+  visible = value;
+};
+
 const textItem = (name, text, ariaLabel, tooltip) => ({
   ariaLabel,
   command: '',
@@ -1927,12 +1933,15 @@ const getEditorStatusBarItems = status => {
     insertSpaces = true,
     languageId,
     line,
+    selectedChars = 0,
     tabSize
   } = status;
   const encodingLabel = encoding === 'utf8' ? ['UTF', '8'].join('-') : encoding;
   const indentationLabel = insertSpaces ? `Spaces: ${tabSize}` : `Tab Size: ${tabSize}`;
   const endOfLineLabel = endOfLine.toUpperCase();
-  return [textItem(EditorPosition, `Ln ${line}, Col ${column}`, `Line ${line}, Column ${column}`, 'Go to Line/Column'), textItem(EditorIndentation, indentationLabel, indentationLabel, 'Select Indentation'), textItem(EditorEncoding, encodingLabel, `Encoding: ${encodingLabel}`, 'Select Encoding'), textItem(EditorEndOfLine, endOfLineLabel, `End of Line: ${endOfLineLabel}`, 'Select End of Line Sequence'), textItem(EditorLanguage, languageId, `Language: ${languageId}`, 'Select Language Mode')];
+  const positionLabel = selectedChars > 0 ? `Ln ${line}, Col ${column} (${selectedChars} selected)` : `Ln ${line}, Col ${column}`;
+  const positionAriaLabel = selectedChars > 0 ? `Line ${line}, Column ${column}, ${selectedChars} selected` : `Line ${line}, Column ${column}`;
+  return [textItem(EditorPosition, positionLabel, positionAriaLabel, 'Go to Line/Column'), textItem(EditorIndentation, indentationLabel, indentationLabel, 'Select Indentation'), textItem(EditorEncoding, encodingLabel, `Encoding: ${encodingLabel}`, 'Select Encoding'), textItem(EditorEndOfLine, endOfLineLabel, `End of Line: ${endOfLineLabel}`, 'Select End of Line Sequence'), textItem(EditorLanguage, languageId, `Language: ${languageId}`, 'Select Language Mode')];
 };
 
 const dependencies = {
@@ -1940,7 +1949,7 @@ const dependencies = {
   [EditorEndOfLine]: ['endOfLine'],
   [EditorIndentation]: ['insertSpaces', 'tabSize'],
   [EditorLanguage]: ['languageId'],
-  [EditorPosition]: ['line', 'column']
+  [EditorPosition]: ['line', 'column', 'selectedChars']
 };
 const handleEditorStatusChanged = (state, editorStatus, previous = state) => {
   const {
@@ -2075,7 +2084,48 @@ const handleEditorStatusChangedAll = async update => {
       newState,
       oldState
     } = get$5(uid);
-    const newerState = handleEditorStatusChanged(newState, editorStatus, previous);
+    const newerState = isVisible() ? handleEditorStatusChanged(newState, editorStatus, previous) : {
+      ...newState,
+      editorStatus
+    };
+    if (newState === newerState || oldState === newerState) {
+      continue;
+    }
+    set$6(uid, oldState, newerState);
+    changedUids.push(uid);
+  }
+  await Promise.all(changedUids.map(renderOutOfBand));
+};
+
+const handleEditorStatusVisibilityChanged = (state, visible) => {
+  const {
+    statusBarItemsRight
+  } = state;
+  setVisible(visible);
+  if (!visible) {
+    const editorItems = statusBarItemsRight.filter(item => isEditorStatus(item.name));
+    if (editorItems.length === 0) {
+      return state;
+    }
+    return {
+      ...state,
+      statusBarItemsRight: statusBarItemsRight.filter(item => !isEditorStatus(item.name))
+    };
+  }
+  return handleEditorStatusChanged(state, get$2(), {
+    editorStatus: undefined
+  });
+};
+
+const handleEditorStatusVisibilityChangedAll = async visible => {
+  setVisible(visible);
+  const changedUids = [];
+  for (const uid of getKeys()) {
+    const {
+      newState,
+      oldState
+    } = get$5(uid);
+    const newerState = handleEditorStatusVisibilityChanged(newState, visible);
     if (newState === newerState || oldState === newerState) {
       continue;
     }
@@ -2381,6 +2431,7 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
   const rpc = await create$2({
     commandMap: {
       'StatusBar.handleEditorStatusChanged': handleEditorStatusChangedAll,
+      'StatusBar.handleEditorStatusVisibilityChanged': handleEditorStatusVisibilityChangedAll,
       'StatusBar.supportsEditorStatusDeltas': supportsEditorStatusDeltas,
       'Viewlet.executeViewletCommand': executeViewletCommand
     },
@@ -2517,7 +2568,14 @@ const loadContent = async state => {
     statusBarItemsRight: statusBarItems.filter(item => isRight(item.name)),
     warningCount: 0
   };
-  const currentState = itemsVisible ? handleEditorStatusChanged(loadedState, get$2()) : loadedState;
+  let currentState = loadedState;
+  if (itemsVisible) {
+    if (isVisible()) {
+      currentState = handleEditorStatusChanged(loadedState, get$2());
+    } else {
+      currentState = handleEditorStatusVisibilityChanged(loadedState, false);
+    }
+  }
   const latestNotificationCount = get$1();
   if (latestNotificationCount === undefined) {
     return currentState;
@@ -2607,6 +2665,7 @@ const commandMap = {
   'StatusBar.handleClick': wrapCommand(handleClick),
   'StatusBar.handleContextMenu': wrapCommand(handleContextMenu),
   'StatusBar.handleEditorStatusChanged': handleEditorStatusChangedAll,
+  'StatusBar.handleEditorStatusVisibilityChanged': handleEditorStatusVisibilityChangedAll,
   'StatusBar.handleExtensionManagementMessagePort': handleExtensionManagementMessagePort,
   'StatusBar.handleExtensionsChanged': refreshExtensionItems,
   'StatusBar.handleItemsChanged': refreshExtensionItems,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/status-bar-worker",
-  "version": "3.30.0",
+  "version": "3.30.2",
   "description": "Status Bar Worker",
   "repository": {
     "type": "git",