@workbench-kit/shell-react 0.0.2-prototype.0.2.26 → 0.0.2-prototype.0.2.27

package/src/shell/shell.tsx

@@ -1,6 +1,5 @@
 import { useCallback, useEffect, useMemo, useReducer, useState, type ReactNode } from 'react';
 import { Modal } from '@workbench-kit/react/modal';
-import { TilepaperAppIcon } from '@workbench-kit/react';
 import { Badge, Button, IconButton } from '@workbench-kit/react/primitives';
 import {
   WorkbenchSettingsModal,
@@ -89,6 +88,8 @@ export type { WorkbenchLocaleOption, WorkbenchThemeOption } from './settings.js'
 export interface WorkbenchShellProps {
   accountManagement?: WorkbenchAccountManagementInput | undefined;
   additionalSettingsCategories?: readonly WorkbenchSettingsCategory[] | undefined;
+  /** Host-owned product mark shown by the default title bar. */
+  appIcon?: ReactNode;
   catalogTrustPolicy?: ExtensionCatalogTrustPolicy | undefined;
   catalogUrl?: string | undefined;
   commandHost?: false | Omit<WorkbenchCommandHostProps, 'onOpenSettings'>;
@@ -147,6 +148,7 @@ const OPEN_SETTINGS_COMMAND_ID = 'workbench-kit.builtin.settings.open';
 export function WorkbenchShell({
   accountManagement,
   additionalSettingsCategories,
+  appIcon,
   catalogTrustPolicy,
   catalogUrl = '/extension-catalog.json',
   commandHost,
@@ -383,6 +385,7 @@ export function WorkbenchShell({
   const resolvedTitleBar =
     titleBar === undefined ? (
       <WorkbenchShellTitleBar
+        appIcon={appIcon}
         helpContent={helpContent}
         isAuxiliarySidebarVisible={layout.auxiliaryBar.visible}
         isPanelVisible={layout.panel.visible}
@@ -725,6 +728,7 @@ export function WorkbenchShell({
 }
 
 function WorkbenchShellTitleBar({
+  appIcon,
   helpContent,
   isAuxiliarySidebarVisible,
   isPanelVisible,
@@ -739,6 +743,7 @@ function WorkbenchShellTitleBar({
   onTogglePanel,
   onTogglePrimarySidebar,
 }: {
+  appIcon: ReactNode | undefined;
   helpContent: ReactNode | undefined;
   isAuxiliarySidebarVisible: boolean;
   isPanelVisible: boolean;
@@ -756,9 +761,11 @@ function WorkbenchShellTitleBar({
   return (
     <>
       <div className="workbench-shell-titlebar__identity">
-        <span aria-hidden className="workbench-shell-titlebar__app-icon">
-          <TilepaperAppIcon compact />
-        </span>
+        {appIcon ? (
+          <span aria-hidden className="workbench-shell-titlebar__app-icon">
+            {appIcon}
+          </span>
+        ) : null}
         <span className="workbench-shell-titlebar__title">{title}</span>
         {titleMeta ? <span className="workbench-shell-titlebar__meta">{titleMeta}</span> : null}
       </div>

package/src/workbench/command-host.tsx

@@ -18,6 +18,7 @@ import {
 } from '@workbench-kit/react/workbench';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
+import { useContextKeyRevision } from '../commands/use-context-key-revision.js';
 import { useWorkbench } from '../shell/provider.js';
 import { registerWorkbenchShellCommandHandlers } from './shell-command-registration.js';
 import {
@@ -98,6 +99,7 @@ export function WorkbenchCommandHost({
   quickOpenTitle = 'Quick Open',
 }: WorkbenchCommandHostProps) {
   const {
+    contextKeyService,
     executeCommand,
     extensionRegistry,
     keybindingOverrides,
@@ -110,6 +112,11 @@ export function WorkbenchCommandHost({
   const [quickOpenQuery, setQuickOpenQuery] = useState('');
   const [layout, setLayout] = useState(() => layoutService.getState());
   const shellContextRef = useRef<WorkbenchShellCommandContext | undefined>(undefined);
+  const contextKeyRevision = useContextKeyRevision(contextKeyService);
+  const contextKeySnapshot = useMemo(
+    () => contextKeyService.createSnapshot(),
+    [contextKeyRevision, contextKeyService],
+  );
 
   const workspaceService = isWorkspaceResourceService(workspaceHostPort?.service)
     ? workspaceHostPort.service
@@ -126,19 +133,41 @@ export function WorkbenchCommandHost({
     };
   }, [layoutService]);
 
-  const shellActivities = useMemo(
+  const managedShellActivities = useMemo(
     () => resolveShellCommandActivities(extensionRegistry),
     [extensionRegistry],
   );
+  const visibleShellActivities = useMemo(
+    () => resolveShellCommandActivities(extensionRegistry, contextKeySnapshot),
+    [contextKeySnapshot, extensionRegistry],
+  );
+  const visibleShellActivityIdSet = new Set(visibleShellActivities.map((activity) => activity.id));
+  const visibleShellActivitySignature = managedShellActivities
+    .map((activity) => (visibleShellActivityIdSet.has(activity.id) ? '1' : '0'))
+    .join('');
 
   const shellCommandDefinitions = useMemo(
     () =>
       createWorkbenchShellCommands({
-        activities: shellActivities,
+        activities: managedShellActivities.filter(
+          (_activity, index) => visibleShellActivitySignature[index] === '1',
+        ),
         includeSettings: true,
         includeSidebarToggle: true,
       }),
-    [shellActivities],
+    [managedShellActivities, visibleShellActivitySignature],
+  );
+
+  const managedShellCommandIds = useMemo(
+    () =>
+      new Set(
+        createWorkbenchShellCommands({
+          activities: managedShellActivities,
+          includeSettings: true,
+          includeSidebarToggle: true,
+        }).map((command) => command.id),
+      ),
+    [managedShellActivities],
   );
 
   const shellCommandRegistry = useMemo(
@@ -194,11 +223,19 @@ export function WorkbenchCommandHost({
       buildWorkbenchPaletteCommands({
         additionalCommands,
         extensionCommandFeaturesById: collectExtensionCommandFeaturesById(extensionRegistry),
-        extensionCommands: extensionRegistry.commands.getCommands(),
+        extensionCommands: extensionRegistry.commands
+          .getCommands()
+          .filter((command) => !managedShellCommandIds.has(command.id)),
         shellCommands: shellCommandDefinitions,
         shellContext,
       }),
-    [additionalCommands, extensionRegistry, shellContext, shellCommandDefinitions],
+    [
+      additionalCommands,
+      extensionRegistry,
+      managedShellCommandIds,
+      shellContext,
+      shellCommandDefinitions,
+    ],
   );
 
   const resolvedQuickOpenProviders = useMemo(() => {

package/src/workbench/command-palette.ts

@@ -4,7 +4,11 @@ import type {
   WorkbenchShellCommandActivity,
   WorkbenchShellCommandContext,
 } from '@workbench-kit/react/workbench';
-import type { ExtensionCommandFeatureSpec, ExtensionRegistry } from '@workbench-kit/workbench-core';
+import {
+  filterActivitiesByWhenClause,
+  type ExtensionCommandFeatureSpec,
+  type ExtensionRegistry,
+} from '@workbench-kit/workbench-core';
 
 export const WORKBENCH_COMMAND_PALETTE_SHORTCUT = 'Ctrl+Shift+P';
 export const WORKBENCH_QUICK_ACCESS_SHORTCUT = 'Ctrl+P';
@@ -44,10 +48,16 @@ export function resolveExtensionCommandIcon(icon: ExtensionCommand['icon']): str
 
 export function resolveShellCommandActivities(
   extensionRegistry: ExtensionRegistry,
+  contextKeys?: object | undefined,
 ): WorkbenchShellCommandActivity[] {
   const activities = extensionRegistry.activities.getActivities();
   if (activities.length > 0) {
-    return activities
+    const visibleActivities =
+      contextKeys === undefined
+        ? activities
+        : filterActivitiesByWhenClause(activities, contextKeys);
+
+    return visibleActivities
       .map((activity) => ({
         icon: formatWorkbenchCommandIcon(activity.icon),
         id: activity.viewContainerId,

package/src/workbench/workspace-view-state.ts

@@ -1,10 +1,12 @@
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import type {
   VirtualWorkspaceState,
   WorkspaceChangeEvent,
   WorkspaceResourceService,
 } from '@workbench-kit/workspace';
 
+const EMPTY_WORKSPACE_FILES: VirtualWorkspaceState['files'] = [];
+
 export function isWorkspaceResourceService(value: unknown): value is WorkspaceResourceService {
   return (
     typeof value === 'object' &&
@@ -33,3 +35,18 @@ export function useWorkspaceResourceState(
 
   return state;
 }
+
+export function useWorkspaceTextDocuments(workspaceService: WorkspaceResourceService | undefined) {
+  const workspaceState = useWorkspaceResourceState(workspaceService);
+  const files =
+    workspaceState?.files ?? workspaceService?.getState().files ?? EMPTY_WORKSPACE_FILES;
+  const documentsByPath = useMemo(
+    () => new Map(files.map((file) => [file.path.replace(/\\/g, '/'), file.content])),
+    [files],
+  );
+  const loadDocument = useCallback(
+    (documentPath: string) => documentsByPath.get(documentPath.replace(/\\/g, '/')) ?? null,
+    [documentsByPath],
+  );
+  return { files, loadDocument };
+}