@almadar/ui 4.7.0 → 4.9.0

package/dist/providers/TraitScopeProvider.d.ts

@@ -0,0 +1,43 @@
+/**
+ * TraitScopeProvider
+ *
+ * Wraps a trait's rendered subtree with its owning `{ orbital, trait }`
+ * pair. Pure components inside the subtree (Button, Form, etc.) keep
+ * calling `useEventBus().emit('UI:X', ...)` exactly as today; the
+ * scoped wrapper that `useEventBus` returns inside this provider
+ * rewrites bare `UI:X` keys into the qualified
+ * `UI:Orbital.Trait.X` form that `useTraitStateMachine` (and the rest
+ * of the post-Phase 4 subscriber side) listens on.
+ *
+ * Producer-side fix for the gap where Button-emitted bare keys never
+ * reached the trait state machine in the runtime path. The compiled
+ * path's codegen wraps each trait view with the same provider so both
+ * paths share the qualification contract.
+ *
+ * @packageDocumentation
+ */
+import React from 'react';
+export interface TraitScope {
+    /** Owning orbital name (e.g. `"ContactOrbital"`). */
+    orbital: string;
+    /** Trait name within the orbital (e.g. `"ContactBrowse"`). */
+    trait: string;
+}
+export interface TraitScopeProviderProps {
+    orbital: string;
+    trait: string;
+    children: React.ReactNode;
+}
+/**
+ * Wrap a trait's rendered subtree to qualify bare `UI:*` emits with the
+ * trait's scope. Mount this at the slot-content boundary in runtime
+ * mode (UISlotRenderer) and at each generated trait view's outermost
+ * element in compiled mode (orbital-shell-typescript codegen).
+ */
+export declare function TraitScopeProvider({ orbital, trait, children, }: TraitScopeProviderProps): React.ReactElement;
+/**
+ * Read the current trait scope. Returns `null` when called outside
+ * any `TraitScopeProvider` (e.g. Storybook, design-system catalog).
+ */
+export declare function useTraitScope(): TraitScope | null;
+export default TraitScopeProvider;

package/dist/providers/index.cjs

@@ -436,7 +436,23 @@ function getGlobalEventBus() {
 }
 function useEventBus() {
   const context = React116.useContext(providers.EventBusContext);
-  return context ?? getGlobalEventBus() ?? fallbackEventBus;
+  const baseBus = context ?? getGlobalEventBus() ?? fallbackEventBus;
+  const scope = providers.useTraitScope();
+  return React116.useMemo(() => {
+    if (!scope) return baseBus;
+    return {
+      ...baseBus,
+      emit: (type, payload, source) => {
+        if (typeof type === "string" && type.startsWith("UI:")) {
+          const tail = type.slice(3);
+          const qualified = tail.includes(".") ? type : `UI:${scope.orbital}.${scope.trait}.${tail}`;
+          baseBus.emit(qualified, payload, source);
+          return;
+        }
+        baseBus.emit(type, payload, source);
+      }
+    };
+  }, [baseBus, scope]);
 }
 function useEventListener(event, handler) {
   const eventBus = useEventBus();
@@ -18651,8 +18667,7 @@ function formatValue(value, format) {
 }
 function DataGrid({
   entity,
-  fields: fieldsProp,
-  columns: columnsProp,
+  fields,
   itemActions,
   cols,
   gap = "md",
@@ -18673,7 +18688,6 @@ function DataGrid({
   const { t } = useTranslate();
   const [selectedIds, setSelectedIds] = React116.useState(/* @__PURE__ */ new Set());
   const [visibleCount, setVisibleCount] = React116.useState(pageSize || Infinity);
-  const fields = fieldsProp ?? columnsProp ?? [];
   const allData = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
@@ -19016,8 +19030,7 @@ function groupData(items, field) {
 }
 function DataList({
   entity,
-  fields: fieldsProp,
-  columns: columnsProp,
+  fields,
   itemActions,
   gap = "none",
   variant = "default",
@@ -19046,7 +19059,6 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React116__namespace.default.useState(pageSize || Infinity);
-  const fields = fieldsProp ?? columnsProp ?? [];
   const allData = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
@@ -37858,6 +37870,17 @@ function renderContainedPortal(slot, content, onDismiss) {
       return /* @__PURE__ */ jsxRuntime.jsx(Box, { id: slotId, children: slotContent });
   }
 }
+function MaybeTraitScope({
+  sourceTrait,
+  children
+}) {
+  const schemaCtx = useEntitySchemaOptional();
+  const orbital = sourceTrait !== void 0 && schemaCtx !== null ? schemaCtx.orbitalsByTrait.get(sourceTrait) : void 0;
+  if (sourceTrait !== void 0 && orbital !== void 0) {
+    return /* @__PURE__ */ jsxRuntime.jsx(providers.TraitScopeProvider, { orbital, trait: sourceTrait, children });
+  }
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children });
+}
 function UISlotComponent({
   slot,
   portal = false,
@@ -37885,11 +37908,11 @@ function UISlotComponent({
             className: cn("ui-slot", `ui-slot-${slot}`, className),
             "data-pattern": pattern,
             "data-source-trait": sourceTrait,
-            children
+            children: /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait, children })
           }
         );
       }
-      return /* @__PURE__ */ jsxRuntime.jsx(CompiledPortal, { slot, className, pattern, sourceTrait, children });
+      return /* @__PURE__ */ jsxRuntime.jsx(CompiledPortal, { slot, className, pattern, sourceTrait, children: /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait, children }) });
     }
     return /* @__PURE__ */ jsxRuntime.jsx(
       Box,
@@ -37898,7 +37921,7 @@ function UISlotComponent({
         className: cn("ui-slot", `ui-slot-${slot}`, className),
         "data-pattern": pattern,
         "data-source-trait": sourceTrait,
-        children
+        children: /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait, children })
       }
     );
   }
@@ -37944,7 +37967,7 @@ function UISlotComponent({
       className: cn("ui-slot", `ui-slot-${slot}`, className),
       "data-pattern": content.pattern,
       "data-source-trait": content.sourceTrait,
-      children: wrappedContent
+      children: /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait: content.sourceTrait, children: wrappedContent })
     }
   );
 }
@@ -38052,7 +38075,7 @@ function SlotPortal({
   });
   if (!portalRoot) return null;
   const slotId = `slot-${slot}`;
-  const slotContent = /* @__PURE__ */ jsxRuntime.jsx(SlotContentRenderer, { content, onDismiss });
+  const slotContent = /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait: content.sourceTrait, children: /* @__PURE__ */ jsxRuntime.jsx(SlotContentRenderer, { content, onDismiss }) });
   let wrapper;
   switch (slot) {
     case "modal":
@@ -38884,6 +38907,18 @@ function OrbitalProvider({
   );
 }
 OrbitalProvider.displayName = "OrbitalProvider";
+var TraitScopeContext = React116.createContext(null);
+function TraitScopeProvider2({
+  orbital,
+  trait,
+  children
+}) {
+  const value = React116.useMemo(() => ({ orbital, trait }), [orbital, trait]);
+  return /* @__PURE__ */ jsxRuntime.jsx(TraitScopeContext.Provider, { value, children });
+}
+function useTraitScope2() {
+  return React116.useContext(TraitScopeContext);
+}
 
 // providers/OfflineModeProvider.tsx
 init_offline_executor();
@@ -38923,8 +38958,10 @@ exports.OfflineModeProvider = OfflineModeProvider;
 exports.OrbitalProvider = OrbitalProvider;
 exports.SelectionContext = SelectionContext;
 exports.SelectionProvider = SelectionProvider;
+exports.TraitScopeProvider = TraitScopeProvider2;
 exports.VerificationProvider = VerificationProvider;
 exports.useOfflineMode = useOfflineMode;
 exports.useOptionalOfflineMode = useOptionalOfflineMode;
 exports.useSelection = useSelection;
 exports.useSelectionOptional = useSelectionOptional;
+exports.useTraitScope = useTraitScope2;

package/dist/providers/index.d.ts

@@ -7,6 +7,8 @@
 export { OrbitalProvider, type OrbitalProviderProps } from './OrbitalProvider';
 export type { ThemeDefinition } from '../context/ThemeContext';
 export { EventBusProvider, EventBusContext } from './EventBusProvider';
+export { TraitScopeProvider, useTraitScope } from './TraitScopeProvider';
+export type { TraitScope, TraitScopeProviderProps } from './TraitScopeProvider';
 export { SelectionProvider, SelectionContext, useSelection, useSelectionOptional } from './SelectionProvider';
 export type { SelectionContextType } from './SelectionProvider';
 export { VerificationProvider } from './VerificationProvider';

package/dist/providers/index.js

@@ -1,7 +1,7 @@
 import * as React116 from 'react';
-import React116__default, { createContext, useContext, useRef, useEffect, useCallback, Suspense, useState, useMemo, useLayoutEffect, lazy, useId } from 'react';
+import React116__default, { createContext, useContext, useMemo, useRef, useEffect, useCallback, Suspense, useState, useLayoutEffect, lazy, useId } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { EventBusContext } from '@almadar/ui/providers';
+import { EventBusContext, useTraitScope, TraitScopeProvider } from '@almadar/ui/providers';
 import { clsx } from 'clsx';
 import { twMerge } from 'tailwind-merge';
 import * as LucideIcons from 'lucide-react';
@@ -391,7 +391,23 @@ function getGlobalEventBus() {
 }
 function useEventBus() {
   const context = useContext(EventBusContext);
-  return context ?? getGlobalEventBus() ?? fallbackEventBus;
+  const baseBus = context ?? getGlobalEventBus() ?? fallbackEventBus;
+  const scope = useTraitScope();
+  return useMemo(() => {
+    if (!scope) return baseBus;
+    return {
+      ...baseBus,
+      emit: (type, payload, source) => {
+        if (typeof type === "string" && type.startsWith("UI:")) {
+          const tail = type.slice(3);
+          const qualified = tail.includes(".") ? type : `UI:${scope.orbital}.${scope.trait}.${tail}`;
+          baseBus.emit(qualified, payload, source);
+          return;
+        }
+        baseBus.emit(type, payload, source);
+      }
+    };
+  }, [baseBus, scope]);
 }
 function useEventListener(event, handler) {
   const eventBus = useEventBus();
@@ -18606,8 +18622,7 @@ function formatValue(value, format) {
 }
 function DataGrid({
   entity,
-  fields: fieldsProp,
-  columns: columnsProp,
+  fields,
   itemActions,
   cols,
   gap = "md",
@@ -18628,7 +18643,6 @@ function DataGrid({
   const { t } = useTranslate();
   const [selectedIds, setSelectedIds] = useState(/* @__PURE__ */ new Set());
   const [visibleCount, setVisibleCount] = useState(pageSize || Infinity);
-  const fields = fieldsProp ?? columnsProp ?? [];
   const allData = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
@@ -18971,8 +18985,7 @@ function groupData(items, field) {
 }
 function DataList({
   entity,
-  fields: fieldsProp,
-  columns: columnsProp,
+  fields,
   itemActions,
   gap = "none",
   variant = "default",
@@ -19001,7 +19014,6 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React116__default.useState(pageSize || Infinity);
-  const fields = fieldsProp ?? columnsProp ?? [];
   const allData = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
@@ -37813,6 +37825,17 @@ function renderContainedPortal(slot, content, onDismiss) {
       return /* @__PURE__ */ jsx(Box, { id: slotId, children: slotContent });
   }
 }
+function MaybeTraitScope({
+  sourceTrait,
+  children
+}) {
+  const schemaCtx = useEntitySchemaOptional();
+  const orbital = sourceTrait !== void 0 && schemaCtx !== null ? schemaCtx.orbitalsByTrait.get(sourceTrait) : void 0;
+  if (sourceTrait !== void 0 && orbital !== void 0) {
+    return /* @__PURE__ */ jsx(TraitScopeProvider, { orbital, trait: sourceTrait, children });
+  }
+  return /* @__PURE__ */ jsx(Fragment, { children });
+}
 function UISlotComponent({
   slot,
   portal = false,
@@ -37840,11 +37863,11 @@ function UISlotComponent({
             className: cn("ui-slot", `ui-slot-${slot}`, className),
             "data-pattern": pattern,
             "data-source-trait": sourceTrait,
-            children
+            children: /* @__PURE__ */ jsx(MaybeTraitScope, { sourceTrait, children })
           }
         );
       }
-      return /* @__PURE__ */ jsx(CompiledPortal, { slot, className, pattern, sourceTrait, children });
+      return /* @__PURE__ */ jsx(CompiledPortal, { slot, className, pattern, sourceTrait, children: /* @__PURE__ */ jsx(MaybeTraitScope, { sourceTrait, children }) });
     }
     return /* @__PURE__ */ jsx(
       Box,
@@ -37853,7 +37876,7 @@ function UISlotComponent({
         className: cn("ui-slot", `ui-slot-${slot}`, className),
         "data-pattern": pattern,
         "data-source-trait": sourceTrait,
-        children
+        children: /* @__PURE__ */ jsx(MaybeTraitScope, { sourceTrait, children })
       }
     );
   }
@@ -37899,7 +37922,7 @@ function UISlotComponent({
       className: cn("ui-slot", `ui-slot-${slot}`, className),
       "data-pattern": content.pattern,
       "data-source-trait": content.sourceTrait,
-      children: wrappedContent
+      children: /* @__PURE__ */ jsx(MaybeTraitScope, { sourceTrait: content.sourceTrait, children: wrappedContent })
     }
   );
 }
@@ -38007,7 +38030,7 @@ function SlotPortal({
   });
   if (!portalRoot) return null;
   const slotId = `slot-${slot}`;
-  const slotContent = /* @__PURE__ */ jsx(SlotContentRenderer, { content, onDismiss });
+  const slotContent = /* @__PURE__ */ jsx(MaybeTraitScope, { sourceTrait: content.sourceTrait, children: /* @__PURE__ */ jsx(SlotContentRenderer, { content, onDismiss }) });
   let wrapper;
   switch (slot) {
     case "modal":
@@ -38839,6 +38862,18 @@ function OrbitalProvider({
   );
 }
 OrbitalProvider.displayName = "OrbitalProvider";
+var TraitScopeContext = createContext(null);
+function TraitScopeProvider2({
+  orbital,
+  trait,
+  children
+}) {
+  const value = useMemo(() => ({ orbital, trait }), [orbital, trait]);
+  return /* @__PURE__ */ jsx(TraitScopeContext.Provider, { value, children });
+}
+function useTraitScope2() {
+  return useContext(TraitScopeContext);
+}
 
 // providers/OfflineModeProvider.tsx
 init_offline_executor();
@@ -38872,4 +38907,4 @@ function useOptionalOfflineMode() {
   return useContext(OfflineModeContext);
 }
 
-export { EventBusContext2 as EventBusContext, EventBusProvider, OfflineModeProvider, OrbitalProvider, SelectionContext, SelectionProvider, VerificationProvider, useOfflineMode, useOptionalOfflineMode, useSelection, useSelectionOptional };
+export { EventBusContext2 as EventBusContext, EventBusProvider, OfflineModeProvider, OrbitalProvider, SelectionContext, SelectionProvider, TraitScopeProvider2 as TraitScopeProvider, VerificationProvider, useOfflineMode, useOptionalOfflineMode, useSelection, useSelectionOptional, useTraitScope2 as useTraitScope };

package/dist/runtime/EntitySchemaContext.d.ts

@@ -29,6 +29,14 @@ export interface EntitySchemaContextValue {
      * etc.) and an enum field renders as a plain text input. Closes VR3.
      */
     traitLinkedEntities: ReadonlyMap<string, string>;
+    /**
+     * Per-trait owning-orbital name. Same shape as `traitLinkedEntities`,
+     * built from `schema.orbitals[].traits[]`. UISlotRenderer uses this
+     * to wrap each slot's rendered subtree in `TraitScopeProvider` so
+     * descendant pure components (Button, etc.) emit qualified
+     * `UI:Orbital.Trait.EVENT` keys via the scoped useEventBus.
+     */
+    orbitalsByTrait: ReadonlyMap<string, string>;
 }
 export interface EntitySchemaProviderProps {
     /** Entity definitions from resolved schema */
@@ -40,6 +48,13 @@ export interface EntitySchemaProviderProps {
      * legacy V1 string-entity-name lookup.
      */
     traitLinkedEntities?: ReadonlyMap<string, string>;
+    /**
+     * Per-trait owning-orbital name. Required for the runtime path's
+     * trait-scoped event qualification (Button etc. emit qualified keys
+     * via TraitScopeProvider). Optional for back-compat with consumers
+     * that don't yet thread the orbital map through.
+     */
+    orbitalsByTrait?: ReadonlyMap<string, string>;
     /** Children */
     children: React.ReactNode;
 }
@@ -50,7 +65,7 @@ export interface EntitySchemaProviderProps {
  * Actual entity rows arrive via `@payload.data` on the rendering trait's
  * success transition — they do NOT live in this context.
  */
-export declare function EntitySchemaProvider({ entities, traitLinkedEntities, children, }: EntitySchemaProviderProps): React.ReactElement;
+export declare function EntitySchemaProvider({ entities, traitLinkedEntities, orbitalsByTrait, children, }: EntitySchemaProviderProps): React.ReactElement;
 /**
  * Access entity schema definitions.
  * Use this for field metadata (form building, filter enrichment).

package/dist/runtime/index.cjs

@@ -183,7 +183,23 @@ function getGlobalEventBus() {
 }
 function useEventBus() {
   const context = React115.useContext(providers.EventBusContext);
-  return context ?? getGlobalEventBus() ?? fallbackEventBus;
+  const baseBus = context ?? getGlobalEventBus() ?? fallbackEventBus;
+  const scope = providers.useTraitScope();
+  return React115.useMemo(() => {
+    if (!scope) return baseBus;
+    return {
+      ...baseBus,
+      emit: (type, payload, source) => {
+        if (typeof type === "string" && type.startsWith("UI:")) {
+          const tail = type.slice(3);
+          const qualified = tail.includes(".") ? type : `UI:${scope.orbital}.${scope.trait}.${tail}`;
+          baseBus.emit(qualified, payload, source);
+          return;
+        }
+        baseBus.emit(type, payload, source);
+      }
+    };
+  }, [baseBus, scope]);
 }
 function useEventListener(event, handler) {
   const eventBus = useEventBus();
@@ -785,6 +801,7 @@ var init_usePullToRefresh = __esm({
 function EntitySchemaProvider({
   entities,
   traitLinkedEntities,
+  orbitalsByTrait,
   children
 }) {
   const entitiesMap = React115.useMemo(() => {
@@ -797,12 +814,16 @@ function EntitySchemaProvider({
   const linkedMap = React115.useMemo(() => {
     return traitLinkedEntities ?? /* @__PURE__ */ new Map();
   }, [traitLinkedEntities]);
+  const orbitalsMap = React115.useMemo(() => {
+    return orbitalsByTrait ?? /* @__PURE__ */ new Map();
+  }, [orbitalsByTrait]);
   const contextValue = React115.useMemo(
     () => ({
       entities: entitiesMap,
-      traitLinkedEntities: linkedMap
+      traitLinkedEntities: linkedMap,
+      orbitalsByTrait: orbitalsMap
     }),
-    [entitiesMap, linkedMap]
+    [entitiesMap, linkedMap, orbitalsMap]
   );
   return /* @__PURE__ */ jsxRuntime.jsx(EntitySchemaContext.Provider, { value: contextValue, children });
 }
@@ -18551,8 +18572,7 @@ function formatValue(value, format) {
 }
 function DataGrid({
   entity,
-  fields: fieldsProp,
-  columns: columnsProp,
+  fields,
   itemActions,
   cols,
   gap = "md",
@@ -18573,7 +18593,6 @@ function DataGrid({
   const { t } = useTranslate();
   const [selectedIds, setSelectedIds] = React115.useState(/* @__PURE__ */ new Set());
   const [visibleCount, setVisibleCount] = React115.useState(pageSize || Infinity);
-  const fields = fieldsProp ?? columnsProp ?? [];
   const allData = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
@@ -18916,8 +18935,7 @@ function groupData(items, field) {
 }
 function DataList({
   entity,
-  fields: fieldsProp,
-  columns: columnsProp,
+  fields,
   itemActions,
   gap = "none",
   variant = "default",
@@ -18946,7 +18964,6 @@ function DataList({
   const eventBus = useEventBus();
   const { t } = useTranslate();
   const [visibleCount, setVisibleCount] = React115__namespace.default.useState(pageSize || Infinity);
-  const fields = fieldsProp ?? columnsProp ?? [];
   const allData = Array.isArray(entity) ? entity : entity ? [entity] : [];
   const data = pageSize > 0 ? allData.slice(0, visibleCount) : allData;
   const hasMoreLocal = pageSize > 0 && visibleCount < allData.length;
@@ -37540,6 +37557,17 @@ function renderContainedPortal(slot, content, onDismiss) {
       return /* @__PURE__ */ jsxRuntime.jsx(Box, { id: slotId, children: slotContent });
   }
 }
+function MaybeTraitScope({
+  sourceTrait,
+  children
+}) {
+  const schemaCtx = useEntitySchemaOptional();
+  const orbital = sourceTrait !== void 0 && schemaCtx !== null ? schemaCtx.orbitalsByTrait.get(sourceTrait) : void 0;
+  if (sourceTrait !== void 0 && orbital !== void 0) {
+    return /* @__PURE__ */ jsxRuntime.jsx(providers.TraitScopeProvider, { orbital, trait: sourceTrait, children });
+  }
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children });
+}
 function UISlotComponent({
   slot,
   portal = false,
@@ -37567,11 +37595,11 @@ function UISlotComponent({
             className: cn("ui-slot", `ui-slot-${slot}`, className),
             "data-pattern": pattern,
             "data-source-trait": sourceTrait,
-            children
+            children: /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait, children })
           }
         );
       }
-      return /* @__PURE__ */ jsxRuntime.jsx(CompiledPortal, { slot, className, pattern, sourceTrait, children });
+      return /* @__PURE__ */ jsxRuntime.jsx(CompiledPortal, { slot, className, pattern, sourceTrait, children: /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait, children }) });
     }
     return /* @__PURE__ */ jsxRuntime.jsx(
       Box,
@@ -37580,7 +37608,7 @@ function UISlotComponent({
         className: cn("ui-slot", `ui-slot-${slot}`, className),
         "data-pattern": pattern,
         "data-source-trait": sourceTrait,
-        children
+        children: /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait, children })
       }
     );
   }
@@ -37626,7 +37654,7 @@ function UISlotComponent({
       className: cn("ui-slot", `ui-slot-${slot}`, className),
       "data-pattern": content.pattern,
       "data-source-trait": content.sourceTrait,
-      children: wrappedContent
+      children: /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait: content.sourceTrait, children: wrappedContent })
     }
   );
 }
@@ -37734,7 +37762,7 @@ function SlotPortal({
   });
   if (!portalRoot) return null;
   const slotId = `slot-${slot}`;
-  const slotContent = /* @__PURE__ */ jsxRuntime.jsx(SlotContentRenderer, { content, onDismiss });
+  const slotContent = /* @__PURE__ */ jsxRuntime.jsx(MaybeTraitScope, { sourceTrait: content.sourceTrait, children: /* @__PURE__ */ jsxRuntime.jsx(SlotContentRenderer, { content, onDismiss }) });
   let wrapper;
   switch (slot) {
     case "modal":
@@ -39304,6 +39332,24 @@ function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate, onLoc
     }
     return map;
   }, [schema]);
+  const traitLinkedEntitiesMap = React115.useMemo(() => {
+    const map = /* @__PURE__ */ new Map();
+    if (ir) {
+      for (const page of ir.pages.values()) {
+        for (const binding of page.traits) {
+          if (binding.linkedEntity) {
+            map.set(binding.trait.name, binding.linkedEntity);
+          }
+        }
+      }
+    }
+    return map;
+  }, [ir]);
+  const orbitalsByTraitMap = React115.useMemo(
+    () => new Map(Object.entries(orbitalsByTrait)),
+    [orbitalsByTrait]
+  );
+  const entitiesArray = React115.useMemo(() => Array.from(allEntities.values()), [allEntities]);
   const pageOrbitalNames = React115.useMemo(() => {
     const set = /* @__PURE__ */ new Set();
     for (const binding of allPageTraits) {
@@ -39347,20 +39393,9 @@ function SchemaRunner({ schema, serverUrl, mockData, pageName, onNavigate, onLoc
   const inner = /* @__PURE__ */ jsxRuntime.jsx(providers.VerificationProvider, { enabled: true, children: /* @__PURE__ */ jsxRuntime.jsx(SlotsProvider, { children: /* @__PURE__ */ jsxRuntime.jsxs(
     EntitySchemaProvider,
     {
-      entities: Array.from(allEntities.values()),
-      traitLinkedEntities: (() => {
-        const map = /* @__PURE__ */ new Map();
-        if (ir) {
-          for (const page of ir.pages.values()) {
-            for (const binding of page.traits) {
-              if (binding.linkedEntity) {
-                map.set(binding.trait.name, binding.linkedEntity);
-              }
-            }
-          }
-        }
-        return map;
-      })(),
+      entities: entitiesArray,
+      traitLinkedEntities: traitLinkedEntitiesMap,
+      orbitalsByTrait: orbitalsByTraitMap,
       children: [
         /* @__PURE__ */ jsxRuntime.jsx(
           TraitInitializer,