@morscherlab/mint-sdk 1.2.0-beta.1 → 1.2.0-beta.11

package/src/components/LcmsSequenceTable.vue

@@ -1,12 +1,14 @@
 <script setup lang="ts">
 /** Table for Xcalibur-compatible LCMS sequence rows with optional reorder/remove/duplicate controls. */
-import { computed, ref } from 'vue'
+import { computed, type ComponentPublicInstance } from 'vue'
+import { useListReorder } from '../composables/useListReorder'
 import {
   basenameFromWindowsPath,
   DEFAULT_LCMS_SEQUENCE_COLUMNS,
   type LcmsSequenceItem,
   type LcmsSequenceTableColumn,
 } from '../lcms'
+import DataStateInternal from './internal/DataStateInternal.vue'
 
 interface Props {
   items?: LcmsSequenceItem[]
@@ -15,6 +17,13 @@ interface Props {
   maxRows?: number
   showMoreLabel?: boolean
   emptyMessage?: string
+  /** Replace the table with a loading placeholder. */
+  loading?: boolean
+  /**
+   * Error message. When set, the table is replaced by an error state.
+   * `null`/`undefined` renders normally.
+   */
+  error?: string | null
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -24,6 +33,8 @@ const props = withDefaults(defineProps<Props>(), {
   maxRows: undefined,
   showMoreLabel: true,
   emptyMessage: 'No sequence items to display',
+  loading: false,
+  error: null,
 })
 
 const emit = defineEmits<{
@@ -32,8 +43,38 @@ const emit = defineEmits<{
   duplicate: [index: number]
 }>()
 
-const dragIndex = ref<number | null>(null)
-const dropTargetIndex = ref<number | null>(null)
+// Rows are a plain ordered list: pointer drag plus an Alt+Arrow keyboard
+// alternative, both from the shared reorder composable.
+const handleRefs = new Map<string, HTMLElement>()
+
+const {
+  draggingId,
+  dragOverId,
+  announcement: reorderAnnouncement,
+  announcerStyle,
+  onDragStart,
+  onDragOver,
+  onDragLeave,
+  onDrop,
+  onDragEnd,
+  onKeydown: onReorderKeydown,
+} = useListReorder<LcmsSequenceItem>({
+  items: () => props.items,
+  getId: (_item, index) => String(index),
+  getLabel: (item) => item.file_name,
+  disabled: () => !props.editable,
+  getElement: (id) => handleRefs.get(id),
+  itemNoun: 'Row',
+  onReorder: ({ fromIndex, toIndex }) => emit('reorder', fromIndex, toIndex),
+})
+
+function setHandleRef(index: number, el: Element | ComponentPublicInstance | null) {
+  if (el instanceof HTMLElement) {
+    handleRefs.set(String(index), el)
+  } else {
+    handleRefs.delete(String(index))
+  }
+}
 
 const displayItems = computed(() => {
   if (!props.maxRows) return props.items
@@ -60,42 +101,11 @@ function cellValue(item: LcmsSequenceItem, column: LcmsSequenceTableColumn, inde
   return item[column.key] ?? ''
 }
 
-function onDragStart(event: DragEvent, index: number) {
-  if (!props.editable) return
-  dragIndex.value = index
-  if (event.dataTransfer) {
-    event.dataTransfer.effectAllowed = 'move'
-    event.dataTransfer.setData('text/plain', String(index))
-  }
-}
-
-function onDragOver(event: DragEvent, index: number) {
-  if (!props.editable) return
-  event.preventDefault()
-  if (event.dataTransfer) event.dataTransfer.dropEffect = 'move'
-  if (dragIndex.value !== null && dragIndex.value !== index) {
-    dropTargetIndex.value = index
-  }
-}
-
-function clearDragState() {
-  dragIndex.value = null
-  dropTargetIndex.value = null
-}
-
-function onDrop(event: DragEvent, toIndex: number) {
-  if (!props.editable) return
-  event.preventDefault()
-  if (dragIndex.value !== null && dragIndex.value !== toIndex) {
-    emit('reorder', dragIndex.value, toIndex)
-  }
-  clearDragState()
-}
 </script>
 
 <template>
   <div class="mint-lcms-sequence-table">
-    <div class="mint-lcms-sequence-table__scroller">
+    <div v-if="!loading && !error && items.length > 0" class="mint-lcms-sequence-table__scroller">
       <table class="mint-lcms-sequence-table__table">
         <thead>
           <tr>
@@ -120,19 +130,27 @@ function onDrop(event: DragEvent, toIndex: number) {
             :draggable="editable"
             class="mint-lcms-sequence-table__row"
             :class="{
-              'mint-lcms-sequence-table__row--dragging': dragIndex === index,
-              'mint-lcms-sequence-table__row--drop-above': dropTargetIndex === index && dragIndex !== null && dragIndex > index,
-              'mint-lcms-sequence-table__row--drop-below': dropTargetIndex === index && dragIndex !== null && dragIndex < index,
+              'mint-lcms-sequence-table__row--dragging': draggingId === String(index),
+              'mint-lcms-sequence-table__row--drop-above': dragOverId === String(index) && draggingId !== null && Number(draggingId) > index,
+              'mint-lcms-sequence-table__row--drop-below': dragOverId === String(index) && draggingId !== null && Number(draggingId) < index,
             }"
-            @dragstart="onDragStart($event, index)"
+            @dragstart="onDragStart($event, item, index)"
             @dragenter.prevent
-            @dragover="onDragOver($event, index)"
-            @dragleave="dropTargetIndex = null"
-            @drop="onDrop($event, index)"
-            @dragend="clearDragState"
+            @dragover="onDragOver($event, item, index)"
+            @dragleave="onDragLeave"
+            @drop="onDrop($event, item, index)"
+            @dragend="onDragEnd"
           >
             <td v-if="editable" class="mint-lcms-sequence-table__drag-cell">
-              <span class="mint-lcms-sequence-table__drag-handle" aria-hidden="true">::</span>
+              <button
+                :ref="(el) => setHandleRef(index, el)"
+                type="button"
+                class="mint-lcms-sequence-table__drag-handle"
+                :aria-label="`Reorder ${item.file_name}. Press Alt with the arrow keys to move it.`"
+                @keydown="onReorderKeydown($event, item, index)"
+              >
+                ::
+              </button>
             </td>
             <td
               v-for="column in columns"
@@ -176,16 +194,29 @@ function onDrop(event: DragEvent, toIndex: number) {
       </table>
     </div>
 
-    <div v-if="items.length === 0" class="mint-lcms-sequence-table__empty">
-      {{ emptyMessage }}
+    <div v-else-if="error" class="mint-lcms-sequence-table__state">
+      <slot name="error" :error="error">
+        <DataStateInternal state="error" size="sm" :title="error" />
+      </slot>
+    </div>
+
+    <div v-else-if="loading" class="mint-lcms-sequence-table__state">
+      <slot name="loading">
+        <DataStateInternal state="loading" size="sm" loading-label="Loading sequence" />
+      </slot>
+    </div>
+
+    <div v-else class="mint-lcms-sequence-table__state">
+      <slot name="empty">
+        <DataStateInternal state="empty" size="sm" :title="emptyMessage" />
+      </slot>
     </div>
 
     <div v-if="hasMore && showMoreLabel" class="mint-lcms-sequence-table__more">
       Showing first {{ maxRows }} of {{ items.length }} items
     </div>
+
+    <!-- Reorder announcements for screen readers -->
+    <div role="status" aria-live="polite" :style="announcerStyle">{{ reorderAnnouncement }}</div>
   </div>
 </template>
-
-<style>
-@import '../styles/components/lcms-sequence-table.css';
-</style>

package/src/components/LoadingSpinner.vue

@@ -44,7 +44,3 @@ withDefaults(defineProps<Props>(), {
     <span class="mint-spinner__label">{{ label }}</span>
   </div>
 </template>
-
-<style>
-@import '../styles/components/loading-spinner.css';
-</style>

package/src/components/MobileSupportGate.vue

@@ -109,7 +109,3 @@ const {
     :is-supported="isSupported"
   />
 </template>
-
-<style>
-@import '../styles/components/mobile-support-gate.css';
-</style>

package/src/components/MoleculeInput.vue

@@ -420,7 +420,3 @@ onUnmounted(() => {
     </div>
   </div>
 </template>
-
-<style>
-@import '../styles/components/molecule-input.css';
-</style>

package/src/components/MultiSelect.vue

@@ -117,7 +117,3 @@ const selectedLabels = computed(() => {
     </div>
   </div>
 </template>
-
-<style>
-@import '../styles/components/multi-select.css';
-</style>

package/src/components/NumberInput.vue

@@ -156,7 +156,3 @@ function increment() {
     />
   </div>
 </template>
-
-<style>
-@import '../styles/components/number-input.css';
-</style>

package/src/components/PlateMapEditor.vue

@@ -1,22 +1,15 @@
 <script setup lang="ts">
 /** Full plate-map design environment for 96/384-well plates with sample assignment, slot-color coding, undo/redo, and CSV/JSON import-export. */
 import { ref, computed, watch } from 'vue'
-import type { PlateMapEditorState, WellPlateFormat, SampleType, Well, PlateMap } from '../types'
+import type { PlateMapEditorState, WellPlateFormat, SampleType, Well, PlateMap, SlotPosition } from '../types'
+// Slot colors matching MSExpDesigner — shared with RackEditor.
+import { SLOT_COLORS, SLOT_ORDER } from '../utils/color'
 import { useWellPlateEditor } from '../composables/useWellPlateEditor'
 import { useEventListener } from '../composables/useEventListener'
 import WellPlate from './WellPlate.vue'
 import SampleLegend from './SampleLegend.vue'
 import PlateMapEditorToolbarInternal from './internal/PlateMapEditorToolbarInternal.vue'
 
-// Slot colors matching MSExpDesigner
-type SlotPosition = 'R' | 'G' | 'B' | 'Y'
-const SLOT_COLORS: Record<SlotPosition, string> = {
-  R: '#ef4444', // red
-  G: '#22c55e', // green
-  B: '#3b82f6', // blue
-  Y: '#eab308', // yellow
-}
-const SLOT_ORDER: SlotPosition[] = ['R', 'G', 'B', 'Y']
 
 interface Props {
   modelValue?: PlateMapEditorState
@@ -428,7 +421,3 @@ useEventListener(() => document, 'keydown', handleKeyDown)
     </Teleport>
   </div>
 </template>
-
-<style>
-@import '../styles/components/plate-map-editor.css';
-</style>

package/src/components/PluginIcon.vue

@@ -152,7 +152,3 @@ const rootStyle = computed(() =>
     />
   </span>
 </template>
-
-<style>
-@import '../styles/components/plugin-icon.css';
-</style>

package/src/components/PluginWorkspaceView.props.ts

@@ -1,8 +1,13 @@
 import type {
   AccountMenuItem,
+  ExperimentSummary,
+  PageSelectorItem,
   PageSelectorItemInput,
+  PillNavItem,
   PillNavItemInput,
+  PillNavOption,
   PluginSwitcherInfo,
+  PluginSwitcherPlugin,
   SidebarToolSection,
   TopBarSettingsConfig,
   TopBarVariant,
@@ -156,6 +161,39 @@ export interface PluginWorkspaceViewProps {
   sidebarCloseLabel?: string
 }
 
+/**
+ * Event map for PluginWorkspaceView, shared with the {@link usePluginWorkspace} composable
+ * so its internal pieces can emit through the exact same typed contract as the public component.
+ */
+export interface PluginWorkspaceViewEmits {
+  'update:activeView': [value: string]
+  'page-selector-select': [page: PageSelectorItem]
+  'pill-select': [item: PillNavItem]
+  'pill-option-select': [option: PillNavOption, item: PillNavItem]
+  'plugin-switcher-select': [plugin: PluginSwitcherPlugin]
+  'plugin-switcher-install': []
+  'account-menu-select': [item: AccountMenuItem]
+  'sign-out': []
+  'notifications-click': []
+  'settings-values-change': [data: Record<string, unknown>]
+  'admin-click': []
+  'experiment-select': [experiment: ExperimentSummary]
+  'experiment-detach': []
+  'update:modelValue': [values: Record<string, unknown>]
+  'update:values': [values: Record<string, unknown>]
+  'update:sidebarCollapsed': [value: boolean]
+  'update:toggle': [sectionId: string, value: boolean]
+  'section-action': [sectionId: string, actionId: string]
+  'form-submit': [sectionId: string, values: Record<string, unknown>]
+  'form-cancel': [sectionId: string]
+}
+
+/** Typed `emit` function shape produced by `defineEmits<PluginWorkspaceViewEmits>()`. */
+export type PluginWorkspaceViewEmit = <K extends keyof PluginWorkspaceViewEmits>(
+  event: K,
+  ...args: PluginWorkspaceViewEmits[K]
+) => void
+
 export interface PluginWorkspaceSlotProps {
   activeView: string
   setActiveView: (viewId: string) => void

package/src/components/PluginWorkspaceView.vue

@@ -12,26 +12,19 @@
 import { computed, useSlots } from 'vue'
 import type {
   AccountMenuItem,
-  ExperimentSummary,
-  PageSelectorItem,
   PillNavItem,
   PluginSwitcherPlugin,
   PillNavOption,
 } from '../types'
 import { useAppExperiment } from '../composables/useAppExperiment'
-import AppLayout from './AppLayout.vue'
-import AppSidebar from './AppSidebar.vue'
-import AppTopBar from './AppTopBar.vue'
-import { usePluginWorkspaceControls } from './PluginWorkspaceView.controls'
-import { usePluginWorkspaceNavigation } from './PluginWorkspaceView.navigation'
-import {
-  getPluginWorkspaceSidebarSlotNames,
-  getPluginWorkspaceTopBarSlotNames,
-  hasPluginWorkspaceSidebarSurface,
-} from './PluginWorkspaceView.shell'
+import { usePluginWorkspace } from '../composables/usePluginWorkspace'
+import WorkspaceControlsInternal from './internal/WorkspaceControlsInternal.vue'
+import WorkspaceShellInternal from './internal/WorkspaceShellInternal.vue'
+import WorkspaceSidebarInternal from './internal/WorkspaceSidebarInternal.vue'
 import type {
   PluginWorkspaceForwardedSlotProps,
   PluginWorkspaceSlotProps,
+  PluginWorkspaceViewEmits,
   PluginWorkspaceViewProps,
 } from './PluginWorkspaceView.props'
 
@@ -103,28 +96,7 @@ const props = withDefaults(defineProps<PluginWorkspaceViewProps>(), {
   sidebarCloseLabel: 'Close workspace sidebar',
 })
 
-const emit = defineEmits<{
-  'update:activeView': [value: string]
-  'page-selector-select': [page: PageSelectorItem]
-  'pill-select': [item: PillNavItem]
-  'pill-option-select': [option: PillNavOption, item: PillNavItem]
-  'plugin-switcher-select': [plugin: PluginSwitcherPlugin]
-  'plugin-switcher-install': []
-  'account-menu-select': [item: AccountMenuItem]
-  'sign-out': []
-  'notifications-click': []
-  'settings-values-change': [data: Record<string, unknown>]
-  'admin-click': []
-  'experiment-select': [experiment: ExperimentSummary]
-  'experiment-detach': []
-  'update:modelValue': [values: Record<string, unknown>]
-  'update:values': [values: Record<string, unknown>]
-  'update:sidebarCollapsed': [value: boolean]
-  'update:toggle': [sectionId: string, value: boolean]
-  'section-action': [sectionId: string, actionId: string]
-  'form-submit': [sectionId: string, values: Record<string, unknown>]
-  'form-cancel': [sectionId: string]
-}>()
+const emit = defineEmits<PluginWorkspaceViewEmits>()
 
 defineSlots<{
   default?: (props: PluginWorkspaceSlotProps) => unknown
@@ -158,82 +130,19 @@ if (props.experimentShell) {
   })
 }
 
-const topBarSlotNames = computed<string[]>(() =>
-  getPluginWorkspaceTopBarSlotNames(slots),
-)
-
-const sidebarSlotNames = computed<string[]>(() =>
-  getPluginWorkspaceSidebarSlotNames(slots),
-)
-
 const {
-  generatedPillNav,
-  generatedDefaultView,
-  internalControlValues,
-  resolvedComponentBindings,
-  resolvedComponentBindingsById,
-  resolvedComponentProps,
-  resolvedComponentPropsById,
+  shell,
+  sidebar,
+  controls,
   handleControlValuesUpdate,
-} = usePluginWorkspaceControls({
-  model: () => props.model,
-  controls: () => props.controls,
-  controlOptions: () => props.controlOptions,
-  modelValue: () => props.modelValue,
-  values: () => props.values,
-  componentBindings: () => props.componentBindings,
-  componentProps: () => props.componentProps,
-  componentPropsById: () => props.componentPropsById,
-  emitValues: (values) => {
-    emit('update:modelValue', values)
-    emit('update:values', values)
-  },
-})
-
-const {
-  resolvedPillNav,
-  resolvedActiveView,
-  resolvedCurrentPillId,
-  resolvedCurrentPageSelectorId,
-  setActiveView,
   handlePageSelectorSelect,
   handlePillSelect,
-} = usePluginWorkspaceNavigation({
-  activeView: () => props.activeView,
-  defaultActiveView: () => props.defaultActiveView,
-  currentPillId: () => props.currentPillId,
-  currentPageSelectorId: () => props.currentPageSelectorId,
-  pillNav: () => props.pillNav,
-  pageSelector: () => props.pageSelector,
-  panelIds: () => Object.keys(props.panels),
-  generatedPillNav,
-  generatedDefaultView,
-  emitActiveView: (viewId) => emit('update:activeView', viewId),
-  emitPageSelectorSelect: (page) => emit('page-selector-select', page),
-  emitPillSelect: (item) => emit('pill-select', item),
+} = usePluginWorkspace({
+  props,
+  slots,
+  emit,
 })
 
-const hasSidebarSurface = computed(() => {
-  return hasPluginWorkspaceSidebarSurface({
-    showSidebar: props.showSidebar,
-    panels: props.panels,
-    forms: props.forms,
-    model: props.model,
-    controls: props.controls,
-    showSidebarWhenEmpty: props.showSidebarWhenEmpty,
-    sidebarContentId: props.sidebarContentId,
-    sidebarTitle: props.sidebarTitle,
-    sidebarSubtitle: props.sidebarSubtitle,
-    sidebarBadge: props.sidebarBadge,
-    hasSidebarSlot: Boolean(slots.sidebar),
-    sidebarSlotCount: sidebarSlotNames.value.length,
-  })
-})
-
-function handlePillOptionSelect(option: PillNavOption, item: PillNavItem) {
-  emit('pill-option-select', option, item)
-}
-
 function handleToggle(sectionId: string, value: boolean) {
   emit('update:toggle', sectionId, value)
 }
@@ -249,126 +158,48 @@ function handleFormCancel(sectionId: string) {
 </script>
 
 <template>
-  <AppLayout
-    class="mint-plugin-workspace-view"
-    :sidebar-position="sidebarPosition"
-    :sidebar-width="sidebarWidth"
-    :floating="floating"
-    :responsive-sidebar="responsiveSidebar"
-    :sidebar-toggle-label="sidebarToggleLabel"
-    :sidebar-close-label="sidebarCloseLabel"
+  <WorkspaceShellInternal
+    :shell="shell"
+    @page-selector-select="handlePageSelectorSelect"
+    @pill-select="handlePillSelect"
+    @pill-option-select="(option: PillNavOption, item: PillNavItem) => emit('pill-option-select', option, item)"
+    @plugin-switcher-select="(plugin: PluginSwitcherPlugin) => emit('plugin-switcher-select', plugin)"
+    @plugin-switcher-install="emit('plugin-switcher-install')"
+    @account-menu-select="(item: AccountMenuItem) => emit('account-menu-select', item)"
+    @sign-out="emit('sign-out')"
+    @notifications-click="emit('notifications-click')"
+    @settings-values-change="emit('settings-values-change', $event)"
+    @admin-click="emit('admin-click')"
   >
-    <template #topbar>
-      <slot
-        name="topbar"
-        :active-view="resolvedActiveView"
-        :set-active-view="setActiveView"
-        :values="internalControlValues"
-        :component-bindings="resolvedComponentBindings"
-        :component-bindings-by-id="resolvedComponentBindingsById"
-        :component-props="resolvedComponentProps"
-        :component-props-by-id="resolvedComponentPropsById"
-      >
-        <AppTopBar
-          :title="title"
-          :subtitle="subtitle"
-          :variant="topBarVariant"
-          :home-path="homePath"
-          :show-logo="showLogo"
-          :page-selector="pageSelector"
-          :current-page-selector-id="resolvedCurrentPageSelectorId"
-          :plugin-switcher="pluginSwitcher"
-          :pill-nav="resolvedPillNav"
-          :current-pill-id="resolvedCurrentPillId"
-          :show-theme-toggle="showThemeToggle"
-          :show-settings="showSettings"
-          :settings-config="settingsConfig"
-          :show-standalone-label="showStandaloneLabel"
-          :standalone-label="standaloneLabel"
-          :account-menu="accountMenu"
-          :show-notifications="showNotifications"
-          :has-notification-dot="hasNotificationDot"
-          :show-admin="showAdmin"
-          :admin-path="adminPath"
-          :user-name="userName"
-          :user-initial="userInitial"
-          :user-email="userEmail"
-          @page-selector-select="handlePageSelectorSelect"
-          @pill-select="handlePillSelect"
-          @pill-option-select="handlePillOptionSelect"
-          @plugin-switcher-select="emit('plugin-switcher-select', $event)"
-          @plugin-switcher-install="emit('plugin-switcher-install')"
-          @account-menu-select="emit('account-menu-select', $event)"
-          @sign-out="emit('sign-out')"
-          @notifications-click="emit('notifications-click')"
-          @settings-values-change="emit('settings-values-change', $event)"
-          @admin-click="emit('admin-click')"
-        >
-          <template
-            v-for="slotName in topBarSlotNames"
-            :key="slotName"
-            #[slotName]="slotProps"
-          >
-            <!-- @vue-ignore dynamic SDK slot forwarding for AppTopBar passthrough slots -->
-            <slot
-              :name="slotName"
-              v-bind="slotProps ?? {}"
-            />
-          </template>
-        </AppTopBar>
-      </slot>
+    <template v-if="slots.topbar" #topbar="scope">
+      <slot name="topbar" v-bind="scope" />
     </template>
 
-    <template v-if="hasSidebarSurface" #sidebar>
+    <template
+      v-for="slotName in shell.topBarSlotNames"
+      :key="slotName"
+      #[slotName]="slotProps"
+    >
+      <!-- @vue-ignore dynamic SDK slot forwarding for AppTopBar passthrough slots -->
       <slot
-        name="sidebar"
-        :active-view="resolvedActiveView"
-        :set-active-view="setActiveView"
-        :values="internalControlValues"
-        :component-bindings="resolvedComponentBindings"
-        :component-bindings-by-id="resolvedComponentBindingsById"
-        :component-props="resolvedComponentProps"
-        :component-props-by-id="resolvedComponentPropsById"
-      >
-        <AppSidebar
-          :title="sidebarTitle"
-          :subtitle="sidebarSubtitle"
-          :badge="sidebarBadge"
-          :variant="sidebarVariant"
-          :panels="panels"
-          :active-view="resolvedActiveView"
-          :floating="false"
-          :dense="dense"
-          :width="sidebarWidth"
-          :side="sidebarPosition"
-          :forms="forms"
-          :content-id="sidebarContentId"
-          :show-when-empty="showSidebarWhenEmpty || sidebarContentId !== undefined"
-          :model="model"
-          :controls="controls"
-          :control-options="controlOptions"
-          :values="internalControlValues"
-          :form-enhancements="formEnhancements"
-          :show-form-actions="showFormActions"
-          :form-loading="formLoading"
-          :form-disabled="formDisabled"
-          :form-readonly="formReadonly"
-          :form-size="formSize"
-          :collapsible="sidebarCollapsible"
-          :collapsed="sidebarCollapsed"
-          :default-collapsed="defaultSidebarCollapsed"
-          :collapsed-width="sidebarCollapsedWidth"
-          :collapse-button-label="sidebarCollapseButtonLabel"
-          :expand-button-label="sidebarExpandButtonLabel"
+        :name="slotName"
+        v-bind="slotProps ?? {}"
+      />
+    </template>
+
+    <template v-if="shell.hasSidebarSurface" #sidebar="scope">
+      <slot name="sidebar" v-bind="scope">
+        <WorkspaceSidebarInternal
+          :sidebar="sidebar"
           @update:model-value="handleControlValuesUpdate"
           @update:collapsed="emit('update:sidebarCollapsed', $event)"
           @update:toggle="handleToggle"
-          @section-action="(sectionId, actionId) => emit('section-action', sectionId, actionId)"
+          @section-action="(sectionId: string, actionId: string) => emit('section-action', sectionId, actionId)"
           @form-submit="handleFormSubmit"
           @form-cancel="handleFormCancel"
         >
           <template
-            v-for="slotName in sidebarSlotNames"
+            v-for="slotName in sidebar.slotNames"
             :key="slotName"
             #[slotName]="slotProps"
           >
@@ -378,18 +209,16 @@ function handleFormCancel(sectionId: string) {
               v-bind="slotProps ?? {}"
             />
           </template>
-        </AppSidebar>
+        </WorkspaceSidebarInternal>
       </slot>
     </template>
 
-    <slot
-      :active-view="resolvedActiveView"
-      :set-active-view="setActiveView"
-      :values="internalControlValues"
-      :component-bindings="resolvedComponentBindings"
-      :component-bindings-by-id="resolvedComponentBindingsById"
-      :component-props="resolvedComponentProps"
-      :component-props-by-id="resolvedComponentPropsById"
-    />
-  </AppLayout>
+    <template #default>
+      <WorkspaceControlsInternal :controls="controls">
+        <template #default="controlsScope">
+          <slot v-bind="controlsScope" />
+        </template>
+      </WorkspaceControlsInternal>
+    </template>
+  </WorkspaceShellInternal>
 </template>