@workbench-kit/react 0.0.2-prototype.0.2.4 → 0.0.2-prototype.0.2.41

package/src/workbench/settings/StructuredDataSchemaPanel.tsx

@@ -6,6 +6,7 @@ import { ScrollArea } from '../../primitives/scroll-area';
 import { cx } from '../../utils/cx';
 import { WorkbenchSectionTabPanel } from './SectionTabPanel';
 import { WorkbenchSectionedPanel } from './SectionedPanel';
+import { getWorkbenchStructuredDataSchemaPathSegments } from './structuredDataSchemaSection';
 import {
   WorkbenchStructuredDataSchemaFieldInput,
   appendWorkbenchStructuredDataSchemaTableRow,
@@ -98,6 +99,24 @@ interface WorkbenchStructuredDataSchemaSectionView {
   value: unknown;
 }
 
+interface SchemaSectionRenderOptions {
+  classNames?: WorkbenchStructuredDataSchemaPanelClassNames | undefined;
+  fieldErrors?: Record<string, ReactNode> | undefined;
+  getFieldErrorId?: ((dataPath: string) => string | undefined) | undefined;
+  labels?: WorkbenchStructuredDataSchemaPanelLabels | undefined;
+  localErrorKeys?: ReadonlySet<string> | undefined;
+  onDataValueChange: (path: string[], value: unknown) => void;
+  onValidateField?: (
+    dataPath: string,
+    definition: WorkbenchStructuredDataSchemaFieldDefinition | undefined,
+    value: unknown,
+  ) => void;
+  readOnly: boolean;
+}
+
+type SchemaSectionRenderProps = WorkbenchStructuredDataSchemaSectionView &
+  SchemaSectionRenderOptions;
+
 const defaultSchemaPanelClassNames: Required<WorkbenchStructuredDataSchemaPanelClassNames> = {
   checkbox: 'ui-workbench-structured-data-schema-panel__checkbox',
   empty: 'ui-workbench-structured-data-schema-panel__empty',
@@ -144,7 +163,10 @@ function getSchemaFieldValue({
   sectionValue: unknown;
 }) {
   const fullPath = getWorkbenchStructuredDataSchemaFieldDataPath(section, fieldPath);
-  const rootValue = getWorkbenchStructuredDataValue(data, fullPath.split('.'));
+  const rootValue = getWorkbenchStructuredDataValue(
+    data,
+    getWorkbenchStructuredDataSchemaPathSegments(fullPath),
+  );
   if (rootValue !== null && rootValue !== undefined) return rootValue;
 
   const record = asWorkbenchStructuredDataRecord(sectionValue);
@@ -152,7 +174,8 @@ function getSchemaFieldValue({
 }
 
 function formatSchemaFieldErrorKey(path: string | readonly string[]) {
-  const segments = typeof path === 'string' ? path.split('.') : path;
+  const segments =
+    typeof path === 'string' ? getWorkbenchStructuredDataSchemaPathSegments(path) : path;
   return segments.filter(Boolean).join('.');
 }
 
@@ -245,20 +268,7 @@ function renderSchemaFormSection({
   schema,
   section,
   value,
-}: WorkbenchStructuredDataSchemaSectionView & {
-  classNames?: WorkbenchStructuredDataSchemaPanelClassNames | undefined;
-  fieldErrors?: Record<string, ReactNode> | undefined;
-  getFieldErrorId?: ((dataPath: string) => string | undefined) | undefined;
-  labels?: WorkbenchStructuredDataSchemaPanelLabels | undefined;
-  localErrorKeys?: ReadonlySet<string> | undefined;
-  onDataValueChange: (path: string[], value: unknown) => void;
-  onValidateField?: (
-    dataPath: string,
-    definition: WorkbenchStructuredDataSchemaFieldDefinition | undefined,
-    value: unknown,
-  ) => void;
-  readOnly: boolean;
-}) {
+}: SchemaSectionRenderProps) {
   const fields = section.fields ?? [];
   if (fields.length) {
     return (
@@ -281,7 +291,11 @@ function renderSchemaFormSection({
                   mergedFieldErrors: fieldErrors,
                   onValidateField,
                   value: fieldValue,
-                  onValueChange: (nextValue) => onDataValueChange(dataPath.split('.'), nextValue),
+                  onValueChange: (nextValue) =>
+                    onDataValueChange(
+                      getWorkbenchStructuredDataSchemaPathSegments(dataPath),
+                      nextValue,
+                    ),
                 })
               : null;
 
@@ -353,7 +367,12 @@ function renderSchemaFormSection({
                     readOnly={readOnly}
                     textareaClassName={classNames.settingControlTextarea}
                     value={entry}
-                    onValueChange={(nextValue) => onDataValueChange(dataPath.split('.'), nextValue)}
+                    onValueChange={(nextValue) =>
+                      onDataValueChange(
+                        getWorkbenchStructuredDataSchemaPathSegments(dataPath),
+                        nextValue,
+                      )
+                    }
                   />
                 </div>
               </Field>
@@ -379,20 +398,8 @@ function renderSchemaTableSection({
   section,
   value,
   ...sectionView
-}: WorkbenchStructuredDataSchemaSectionView & {
-  classNames?: WorkbenchStructuredDataSchemaPanelClassNames | undefined;
-  fieldErrors?: Record<string, ReactNode> | undefined;
-  getFieldErrorId?: ((dataPath: string) => string | undefined) | undefined;
-  labels?: WorkbenchStructuredDataSchemaPanelLabels | undefined;
-  localErrorKeys?: ReadonlySet<string> | undefined;
-  onDataValueChange: (path: string[], value: unknown) => void;
-  onValidateField?: (
-    dataPath: string,
-    definition: WorkbenchStructuredDataSchemaFieldDefinition | undefined,
-    value: unknown,
-  ) => void;
+}: SchemaSectionRenderProps & {
   preferredTableColumns?: readonly string[] | undefined;
-  readOnly: boolean;
 }) {
   const rows = getWorkbenchStructuredDataSchemaTableRows(value);
   const columns = getWorkbenchStructuredDataSchemaDocumentTableColumns({
@@ -569,22 +576,10 @@ function renderSchemaPanelSection({
   preferredTableColumns,
   readOnly,
   sectionView,
-}: {
+}: SchemaSectionRenderOptions & {
   anchorId?: string | undefined;
-  classNames?: WorkbenchStructuredDataSchemaPanelClassNames | undefined;
-  fieldErrors?: Record<string, ReactNode> | undefined;
-  getFieldErrorId?: ((dataPath: string) => string | undefined) | undefined;
   headerActions?: ReactNode | undefined;
-  labels?: WorkbenchStructuredDataSchemaPanelLabels | undefined;
-  localErrorKeys?: ReadonlySet<string> | undefined;
-  onDataValueChange: (path: string[], value: unknown) => void;
-  onValidateField?: (
-    dataPath: string,
-    definition: WorkbenchStructuredDataSchemaFieldDefinition | undefined,
-    value: unknown,
-  ) => void;
   preferredTableColumns?: readonly string[] | undefined;
-  readOnly: boolean;
   sectionView: WorkbenchStructuredDataSchemaSectionView;
 }) {
   const { section, value } = sectionView;

package/src/workbench/settings/sectionedPanelScrollSpy.ts

@@ -30,12 +30,6 @@ export const WORKBENCH_SECTIONED_PANEL_INTERSECTION_THRESHOLDS = [0, 0.25, 0.5,
 
 export type WorkbenchSectionedPanelScrollSpyAxis = 'vertical' | 'horizontal';
 
-export interface WorkbenchSectionedPanelIntersectionEntry {
-  intersectionRatio: number;
-  isIntersecting: boolean;
-  target: { id: string };
-}
-
 export interface WorkbenchSectionedPanelScrollPosition {
   anchorId: string;
   /** Section start along the active scroll axis (top or left). */
@@ -108,70 +102,6 @@ export function isWorkbenchSectionedPanelAtScrollEnd({
   return scrollPosition + clientSize >= scrollSize - bottomThreshold;
 }
 
-/** @deprecated Use `isWorkbenchSectionedPanelAtScrollStart`. */
-export function isWorkbenchSectionedPanelAtScrollTop({
-  scrollTop,
-  topThreshold = WORKBENCH_SECTIONED_PANEL_SCROLL_THRESHOLD,
-}: {
-  scrollTop: number;
-  topThreshold?: number | undefined;
-}): boolean {
-  return isWorkbenchSectionedPanelAtScrollStart({
-    scrollPosition: scrollTop,
-    startThreshold: topThreshold,
-  });
-}
-
-/** @deprecated Use `isWorkbenchSectionedPanelAtScrollEnd`. */
-export function isWorkbenchSectionedPanelAtScrollBottom({
-  bottomThreshold = WORKBENCH_SECTIONED_PANEL_SCROLL_THRESHOLD,
-  clientHeight,
-  scrollHeight,
-  scrollTop,
-}: {
-  bottomThreshold?: number | undefined;
-  clientHeight: number;
-  scrollHeight: number;
-  scrollTop: number;
-}): boolean {
-  return isWorkbenchSectionedPanelAtScrollEnd({
-    bottomThreshold,
-    clientSize: clientHeight,
-    scrollPosition: scrollTop,
-    scrollSize: scrollHeight,
-  });
-}
-
-export function resolveWorkbenchSectionedPanelActiveAnchorFromIntersection({
-  anchorOrder,
-  entries,
-  fallbackAnchorId,
-}: {
-  anchorOrder: readonly string[];
-  entries: readonly WorkbenchSectionedPanelIntersectionEntry[];
-  fallbackAnchorId?: string | undefined;
-}): string | undefined {
-  const intersectingAnchorIds = new Set(
-    entries
-      .filter((entry) => entry.isIntersecting && entry.target.id)
-      .map((entry) => entry.target.id),
-  );
-
-  if (intersectingAnchorIds.size === 0) {
-    return fallbackAnchorId;
-  }
-
-  let nextActive = fallbackAnchorId;
-
-  for (const anchorId of anchorOrder) {
-    if (intersectingAnchorIds.has(anchorId)) {
-      nextActive = anchorId;
-    }
-  }
-
-  return nextActive ?? fallbackAnchorId;
-}
-
 export function resolveWorkbenchSectionedPanelActiveAnchorFromScroll({
   activeLineBias = WORKBENCH_SECTIONED_PANEL_SCROLL_SPY_ACTIVE_LINE_BIAS,
   anchorOrder,
@@ -250,17 +180,6 @@ export function resolveWorkbenchSectionedPanelScrollTarget({
   return Math.max(0, sectionStart - offset);
 }
 
-/** @deprecated Use `resolveWorkbenchSectionedPanelScrollTarget`. */
-export function resolveWorkbenchSectionedPanelScrollTop({
-  offset = WORKBENCH_SECTIONED_PANEL_SCROLL_SPY_OFFSET,
-  sectionTop,
-}: {
-  offset?: number | undefined;
-  sectionTop: number;
-}): number {
-  return resolveWorkbenchSectionedPanelScrollTarget({ offset, sectionStart: sectionTop });
-}
-
 export function createWorkbenchSectionedPanelIntersectionRootMargin(
   offset = WORKBENCH_SECTIONED_PANEL_SCROLL_SPY_OFFSET,
   axis: WorkbenchSectionedPanelScrollSpyAxis = 'vertical',

package/src/workbench/settings/structuredDataFormModel.ts

@@ -135,6 +135,7 @@ function isWorkbenchStructuredDataFormEmptyValue(value: WorkbenchStructuredDataF
   return value === '' || value === false;
 }
 
-function isRenderableWorkbenchStructuredDataFormError(error: ReactNode) {
+/** True when a form field error should render (non-empty ReactNode). */
+export function isRenderableWorkbenchStructuredDataFormError(error: ReactNode) {
   return error !== undefined && error !== null && error !== false && error !== '';
 }

package/src/workbench/settings/structuredDataSchema.ts

@@ -19,6 +19,7 @@ import {
 import {
   getWorkbenchStructuredDataSchemaFieldDataPath,
   getWorkbenchStructuredDataSchemaFieldDefinition,
+  getWorkbenchStructuredDataSchemaPathSegments,
   getWorkbenchStructuredDataSchemaSectionFieldLabel,
   getWorkbenchStructuredDataSchemaSectionPath,
 } from './structuredDataSchemaSection';
@@ -206,14 +207,18 @@ export function getWorkbenchStructuredDataSchemaDocumentSectionValue({
   section: WorkbenchStructuredDataSchemaSectionSummary;
 }) {
   const sectionKey = getWorkbenchStructuredDataSchemaSectionPath(section);
-  const record = asWorkbenchStructuredDataRecord(data);
-  if (!sectionKey || !record) return sectionKey ? null : data;
-  if (sectionKey in record) return record[sectionKey];
+  if (!sectionKey) return data;
 
-  const directValue = getWorkbenchStructuredDataValue(data, sectionKey.split('.'));
+  const directValue = getWorkbenchStructuredDataValue(
+    data,
+    getWorkbenchStructuredDataSchemaPathSegments(sectionKey),
+  );
   if (directValue !== null && directValue !== undefined) return directValue;
 
-  for (const path of aliases[sectionKey] ?? []) {
+  const sectionAliases = Object.prototype.hasOwnProperty.call(aliases, sectionKey)
+    ? (aliases[sectionKey] ?? [])
+    : [];
+  for (const path of sectionAliases) {
     if (!path.length) return data;
     const value = getWorkbenchStructuredDataValue(data, path);
     if (value !== null && value !== undefined) return value;
@@ -279,13 +284,17 @@ export function createWorkbenchStructuredDataSchemaDocumentSampleData(
         ? section.columns
         : Object.keys(schemaTable?.items ?? {});
 
-      return setWorkbenchStructuredDataValue(sample, path.split('.'), [
-        createWorkbenchStructuredDataSchemaDocumentEmptyRow({
-          columns,
-          schema,
-          section,
-        }),
-      ]);
+      return setWorkbenchStructuredDataValue(
+        sample,
+        getWorkbenchStructuredDataSchemaPathSegments(path),
+        [
+          createWorkbenchStructuredDataSchemaDocumentEmptyRow({
+            columns,
+            schema,
+            section,
+          }),
+        ],
+      );
     }
 
     return (section.fields ?? []).reduce<WorkbenchStructuredDataRecord>((nextSample, fieldPath) => {
@@ -296,7 +305,9 @@ export function createWorkbenchStructuredDataSchemaDocumentSampleData(
       );
       return setWorkbenchStructuredDataValue(
         nextSample,
-        getWorkbenchStructuredDataSchemaFieldDataPath(section, fieldPath).split('.'),
+        getWorkbenchStructuredDataSchemaPathSegments(
+          getWorkbenchStructuredDataSchemaFieldDataPath(section, fieldPath),
+        ),
         getWorkbenchStructuredDataSchemaFieldDefaultValue(definition),
       );
     }, sample);

package/src/workbench/settings/structuredDataSchemaSection.ts

@@ -21,6 +21,10 @@ export function getWorkbenchStructuredDataSchemaSectionPath(
   return section.sectionKey || section.id || '';
 }
 
+export function getWorkbenchStructuredDataSchemaPathSegments(path: string) {
+  return path ? path.split('.') : [];
+}
+
 export function getWorkbenchStructuredDataSchemaFieldDataPath(
   section: WorkbenchStructuredDataSchemaSectionSummary,
   fieldPath: string,

package/src/workbench/settings/structuredDataSchemaTable.ts

@@ -7,7 +7,10 @@ import type {
   WorkbenchStructuredDataSchemaTableRowKeyInput,
 } from './structuredDataSchemaTypes';
 import { getWorkbenchStructuredDataSchemaFieldDefaultValue } from './structuredDataSchemaField';
-import { getWorkbenchStructuredDataSchemaSectionPath } from './structuredDataSchemaSection';
+import {
+  getWorkbenchStructuredDataSchemaPathSegments,
+  getWorkbenchStructuredDataSchemaSectionPath,
+} from './structuredDataSchemaSection';
 
 export function getWorkbenchStructuredDataSchemaTableRows(
   value: unknown,
@@ -34,7 +37,7 @@ export function getWorkbenchStructuredDataSchemaTablePath(
   section: WorkbenchStructuredDataSchemaSectionSummary,
 ) {
   const tablePath = getWorkbenchStructuredDataSchemaSectionPath(section);
-  return tablePath ? tablePath.split('.') : [];
+  return getWorkbenchStructuredDataSchemaPathSegments(tablePath);
 }
 
 export function getWorkbenchStructuredDataSchemaTableRowKey({

package/src/workbench/{ActivityBar.tsx → shell/ActivityBar.tsx}

@@ -1,14 +1,13 @@
-import './shell/activity-bar.css';
+import './activity-bar.css';
 import { type ComponentPropsWithoutRef, type ReactNode } from 'react';
-import { Button } from '../primitives/button';
-import { cx } from '../utils/cx';
+import { Button } from '../../primitives/button';
+import { cx } from '../../utils/cx';
 import { type ActivityBarOrientation } from './activityBarOrder';
 import {
   mergeWorkbenchSidebarViewPlacementDropZoneProps,
   useWorkbenchSidebarViewPlacementDropZone,
 } from './useWorkbenchSidebarViewPlacementDropZone';
 import { useWorkbenchSidebarActionBarDnd } from './useWorkbenchSidebarActionBarDnd';
-import { WORKBENCH_SIDEBAR_VIEW_PLACEMENT_DRAG_DATA_TYPE } from './sidebarViewPlacementDnd';
 
 export interface ActivityBarItem {
   active?: boolean;
@@ -20,23 +19,20 @@ export interface ActivityBarItem {
 }
 
 export interface ActivityBarProps extends Omit<ComponentPropsWithoutRef<'nav'>, 'children'> {
-  acceptSidebarViewPlacementDrop?: ((viewId: string) => boolean) | undefined;
+  acceptSidebarViewPlacementDrop?: (viewId: string) => boolean;
   itemDataAttributeName?: string;
   items: ActivityBarItem[];
   onItemActivate?: (item: ActivityBarItem) => void;
   onItemsReorder?: (itemIds: string[]) => void;
-  onSidebarViewPlacementDrop?: ((viewId: string) => void) | undefined;
-  orientation?: ActivityBarOrientation | undefined;
+  onSidebarViewPlacementDrop?: (viewId: string) => void;
+  orientation?: ActivityBarOrientation;
   reorderable?: boolean;
   secondaryItems?: ActivityBarItem[];
-  sidebarViewPlacementDropZoneId?: string | undefined;
+  sidebarViewPlacementDropZoneId?: string;
   /** Enables cross-slot placement drag without reordering within the bar. */
-  placementDraggable?: boolean | undefined;
+  placementDraggable?: boolean;
 }
 
-/** @deprecated Use WORKBENCH_SIDEBAR_VIEW_PLACEMENT_DRAG_DATA_TYPE */
-export const ACTIVITY_BAR_DRAG_DATA_TYPE = WORKBENCH_SIDEBAR_VIEW_PLACEMENT_DRAG_DATA_TYPE;
-
 export function ActivityBar({
   'aria-label': ariaLabel = 'Activity bar',
   acceptSidebarViewPlacementDrop,

package/src/workbench/{ArtifactShell.tsx → shell/ArtifactShell.tsx}

@@ -1,8 +1,8 @@
 import { useState, type ComponentPropsWithRef, type ReactNode } from 'react';
-import { EmptyState } from '../primitives/empty-state';
-import { IconButton } from '../primitives/icon-button';
-import { cx } from '../utils/cx';
-import { WorkspacePathLabel } from './workspace/WorkspacePathLabel';
+import { EmptyState } from '../../primitives/empty-state';
+import { IconButton } from '../../primitives/icon-button';
+import { cx } from '../../utils/cx';
+import { WorkspacePathLabel } from '../workspace/WorkspacePathLabel';
 import { SplitView } from './SplitView';
 
 export type WorkbenchArtifactMode = 'code' | 'preview' | 'split';
@@ -31,8 +31,8 @@ export interface WorkbenchPreviewRendererMatch {
 
 export interface WorkbenchPreviewRendererContext {
   artifact: WorkbenchArtifactDescriptor;
-  match?: WorkbenchPreviewRendererMatch | undefined;
-  renderer?: WorkbenchPreviewRenderer | undefined;
+  match?: WorkbenchPreviewRendererMatch;
+  renderer?: WorkbenchPreviewRenderer;
 }
 
 export interface WorkbenchPreviewRenderer {
@@ -58,11 +58,11 @@ export type WorkbenchArtifactShellRenderPreview = (
 ) => ReactNode;
 
 export interface WorkbenchArtifactModeControlsProps extends ComponentPropsWithRef<'div'> {
-  codeLabel?: string | undefined;
+  codeLabel?: string;
   mode: WorkbenchArtifactMode;
   onModeChange: (mode: WorkbenchArtifactMode) => void;
-  previewLabel?: string | undefined;
-  splitLabel?: string | undefined;
+  previewLabel?: string;
+  splitLabel?: string;
 }
 
 function normalizeToken(value: string | undefined) {
@@ -229,9 +229,9 @@ export function WorkbenchArtifactModeControls({
 
 export interface WorkbenchArtifactPreviewProps extends ComponentPropsWithRef<'div'> {
   artifact: WorkbenchArtifactDescriptor;
-  renderPreview?: WorkbenchArtifactShellRenderPreview | undefined;
-  renderers?: readonly WorkbenchPreviewRenderer[] | undefined;
-  unsupportedLabel?: ReactNode | undefined;
+  renderPreview?: WorkbenchArtifactShellRenderPreview;
+  renderers?: readonly WorkbenchPreviewRenderer[];
+  unsupportedLabel?: ReactNode;
 }
 
 export function WorkbenchArtifactPreview({
@@ -270,19 +270,19 @@ export interface WorkbenchArtifactShellProps extends Omit<
   ComponentPropsWithRef<'div'>,
   'children'
 > {
-  artifact?: WorkbenchArtifactDescriptor | undefined;
-  codeLabel?: string | undefined;
-  defaultMode?: WorkbenchArtifactMode | undefined;
-  emptyLabel?: ReactNode | undefined;
-  mode?: WorkbenchArtifactMode | undefined;
-  onModeChange?: ((mode: WorkbenchArtifactMode) => void) | undefined;
-  previewLabel?: string | undefined;
-  previewRenderers?: readonly WorkbenchPreviewRenderer[] | undefined;
-  renderCode?: WorkbenchArtifactShellRenderCode | undefined;
-  renderPreview?: WorkbenchArtifactShellRenderPreview | undefined;
-  showHeader?: boolean | undefined;
-  splitLabel?: string | undefined;
-  unsupportedPreviewLabel?: ReactNode | undefined;
+  artifact?: WorkbenchArtifactDescriptor;
+  codeLabel?: string;
+  defaultMode?: WorkbenchArtifactMode;
+  emptyLabel?: ReactNode;
+  mode?: WorkbenchArtifactMode;
+  onModeChange?: (mode: WorkbenchArtifactMode) => void;
+  previewLabel?: string;
+  previewRenderers?: readonly WorkbenchPreviewRenderer[];
+  renderCode?: WorkbenchArtifactShellRenderCode;
+  renderPreview?: WorkbenchArtifactShellRenderPreview;
+  showHeader?: boolean;
+  splitLabel?: string;
+  unsupportedPreviewLabel?: ReactNode;
 }
 
 export function WorkbenchArtifactShell({

package/src/workbench/{SplitView.tsx → shell/SplitView.tsx}

@@ -1,4 +1,4 @@
-import './shell/split-view.css';
+import './split-view.css';
 import {
   useEffect,
   useLayoutEffect,
@@ -9,7 +9,7 @@ import {
   type PointerEvent,
   type ReactNode,
 } from 'react';
-import { cx } from '../utils/cx';
+import { cx } from '../../utils/cx';
 
 export type SplitViewOrientation = 'horizontal' | 'vertical';
 export type SplitViewPrimarySizeUnit = 'percent' | 'pixels';
@@ -42,7 +42,7 @@ export interface SplitViewProps {
   onPrimarySizePxPreviewChange?: (primarySizePx: number) => void;
   onSecondarySizePxChange?: (secondarySizePx: number) => void;
   onSecondarySizePxPreviewChange?: (secondarySizePx: number) => void;
-  orientation?: SplitViewOrientation | undefined;
+  orientation?: SplitViewOrientation;
   primary: ReactNode;
   primarySizePercent?: number;
   primarySizePx?: number;

package/src/workbench/{StatusBar.tsx → shell/StatusBar.tsx}

@@ -1,8 +1,8 @@
-import './shell/status-bar.css';
+import './status-bar.css';
 import type { ComponentPropsWithRef, ReactNode } from 'react';
-import { Button } from '../primitives/button';
-import { cxCodicon } from '../utils/codicon';
-import { cx } from '../utils/cx';
+import { Button } from '../../primitives/button';
+import { cxCodicon } from '../../utils/codicon';
+import { cx } from '../../utils/cx';
 import {
   getWorkbenchStatusLabel,
   isWorkbenchStatusBusy,
@@ -106,7 +106,7 @@ function sortByOrderPriority<T extends { order?: number }>(values: readonly T[])
 }
 
 export interface StatusBarSectionProps extends ComponentPropsWithRef<'div'> {
-  align?: StatusBarSectionAlign | undefined;
+  align?: StatusBarSectionAlign;
 }
 
 export function StatusBarSection({ align = 'start', className, ...props }: StatusBarSectionProps) {
@@ -123,9 +123,9 @@ export function StatusBarSection({ align = 'start', className, ...props }: Statu
 }
 
 export interface StatusBarItemProps extends ComponentPropsWithRef<'button'> {
-  active?: boolean | undefined;
-  icon?: ReactNode | string | undefined;
-  status?: WorkbenchStatus | undefined;
+  active?: boolean;
+  icon?: ReactNode | string;
+  status?: WorkbenchStatus;
 }
 
 function resolveStatusBarIcon(icon: ReactNode | string | undefined) {

package/src/workbench/{StructuredArtifactEditor.tsx → shell/StructuredArtifactEditor.tsx}

@@ -1,15 +1,15 @@
 import { useState, useMemo, type ReactNode } from 'react';
-import { useWorkspaceDrafts } from './workspace/WorkspaceDraftsContext';
-import { WorkspaceEditor, type WorkspaceEditorTheme } from './workspace/WorkspaceEditor';
-import { WorkbenchStructuredDataSchemaPanelEmbed } from './settings/StructuredDataSchemaPanelEmbed';
-import { type WorkbenchStructuredDataSchemaDocument } from './settings/StructuredDataForm';
+import { useWorkspaceDrafts } from '../workspace/WorkspaceDraftsContext';
+import { WorkspaceEditor, type WorkspaceEditorTheme } from '../workspace/WorkspaceEditor';
+import { WorkbenchStructuredDataSchemaPanelEmbed } from '../settings/StructuredDataSchemaPanelEmbed';
+import { type WorkbenchStructuredDataSchemaDocument } from '../settings/StructuredDataForm';
 import { type WorkbenchArtifactMode, WorkbenchArtifactModeControls } from './ArtifactShell';
-import { Button } from '../primitives/button';
-import { Panel, PanelBody, PanelHeader } from '../layout/panel';
-import { Toolbar } from '../primitives/toolbar';
+import { Button } from '../../primitives/button';
+import { Panel, PanelBody, PanelHeader } from '../../layout/panel';
+import { Toolbar } from '../../primitives/toolbar';
 import { SplitView } from './SplitView';
-import { type WorkspaceFile } from './workspace/types';
-import { fileNameOfPath } from './workspace/path';
+import { type WorkspaceFile } from '../workspace/types';
+import { fileNameOfPath } from '../workspace/path';
 
 export interface StructuredArtifactEditorProps {
   activePattern?: string;