@oxy.so/bloom 4.5.0 → 4.6.1

package/lib/module/loading/LoadingBase.js

@@ -0,0 +1,194 @@
+"use strict";
+
+/**
+ * Everything `Loading` does that is the SAME on both platforms.
+ *
+ * The family forks for one reason: the `top` variant's motion. Native drives
+ * it with react-native-reanimated, whose worklets Babel plugin has no web
+ * equivalent — a static import of it breaks every web bundler, Vite, webpack
+ * and Metro-web alike — so web drives the same motion with CSS transitions.
+ * That is the whole of the difference. The `spinner` and `inline` variants,
+ * the size table, the variant dispatch and the stylesheet were byte-identical
+ * copies in both forks.
+ *
+ * So the two platform pieces are INJECTED rather than imported: `SpinnerIcon`
+ * (itself forked) and `TopLoading`. `bindLoading` is called once at module
+ * scope by each fork, never per render, so the component identities are
+ * stable — the same discipline as `bindAgentChat` and `bindAiChat`.
+ *
+ * NEUTRAL by construction: nothing this module reaches is platform-forked, so
+ * it resolves the same way in Metro, Vite, webpack, SSR and jest. (jest
+ * resolves no platform extensions at all, so logic that moved into a
+ * `.native.*` file would lose its coverage in silence.)
+ */
+import { normalizeBloomSize } from "../appearance/legacy.js";
+import { resolveBloomColors } from "../appearance/colors.js";
+import { useBloomAppearance } from "../appearance/index.js";
+import React, { memo } from 'react';
+import { View, Text, StyleSheet } from 'react-native';
+import { useTheme } from "../theme/use-theme.js";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/** Spinner diameter and label size per `size` token. Read by all three variants. */
+export const SIZE_CONFIG = {
+  xs: {
+    spinner: 16,
+    text: 12
+  },
+  sm: {
+    spinner: 20,
+    text: 13
+  },
+  md: {
+    spinner: 24,
+    text: 15
+  },
+  lg: {
+    spinner: 44,
+    text: 16
+  }
+};
+
+/** The two platform pieces a fork supplies. */
+
+export function bindLoading({
+  SpinnerIcon,
+  TopLoading
+}) {
+  const SpinnerLoading = ({
+    size: sizeProp,
+    color,
+    tone: toneProp,
+    className,
+    text,
+    textStyle,
+    style,
+    showText = true,
+    iconSize,
+    spinnerIcon,
+    testID
+  }) => {
+    const theme = useTheme();
+    const {
+      size,
+      tone
+    } = useBloomAppearance({
+      size: normalizeBloomSize(sizeProp),
+      tone: toneProp
+    }, {
+      size: 'md',
+      tone: 'accent'
+    });
+    const sizeConfig = SIZE_CONFIG[size];
+    const effectiveIconSize = iconSize ?? sizeConfig.spinner;
+    const spinnerColor = className ? 'currentColor' : color ?? resolveBloomColors(theme.colors, tone, 'solid').background;
+    const textColor = color ?? theme.colors.textSecondary;
+    return /*#__PURE__*/_jsxs(View, {
+      style: [styles.container, style],
+      testID: testID,
+      children: [spinnerIcon ?? /*#__PURE__*/_jsx(SpinnerIcon, {
+        size: effectiveIconSize,
+        color: spinnerColor,
+        className: className
+      }), showText && text && /*#__PURE__*/_jsx(Text, {
+        style: [styles.text, {
+          color: textColor,
+          fontSize: sizeConfig.text,
+          marginTop: 8
+        }, textStyle],
+        children: text
+      })]
+    });
+  };
+  const InlineLoading = ({
+    size: sizeProp,
+    color,
+    tone: toneProp,
+    text,
+    style,
+    textStyle,
+    spinnerIcon,
+    testID
+  }) => {
+    const theme = useTheme();
+    const {
+      size,
+      tone
+    } = useBloomAppearance({
+      size: normalizeBloomSize(sizeProp),
+      tone: toneProp
+    }, {
+      size: 'md',
+      tone: 'accent'
+    });
+    const sizeConfig = SIZE_CONFIG[size];
+    const spinnerColor = color ?? resolveBloomColors(theme.colors, tone, 'solid').background;
+    const textColor = theme.colors.textSecondary;
+    return /*#__PURE__*/_jsxs(View, {
+      style: [styles.inlineContainer, style],
+      testID: testID,
+      children: [spinnerIcon ?? /*#__PURE__*/_jsx(SpinnerIcon, {
+        size: sizeConfig.spinner,
+        color: spinnerColor
+      }), text && /*#__PURE__*/_jsx(Text, {
+        style: [{
+          color: textColor,
+          fontSize: sizeConfig.text,
+          marginLeft: 8
+        }, textStyle],
+        children: text
+      })]
+    });
+  };
+  const LoadingComponent = props => {
+    const variant = props.variant ?? 'spinner';
+    switch (variant) {
+      case 'top':
+        return /*#__PURE__*/_jsx(TopLoading, {
+          ...props
+        });
+      case 'inline':
+        return /*#__PURE__*/_jsx(InlineLoading, {
+          ...props
+        });
+      case 'spinner':
+      default:
+        return /*#__PURE__*/_jsx(SpinnerLoading, {
+          ...props
+        });
+    }
+  };
+  const Loading = /*#__PURE__*/memo(LoadingComponent);
+  Loading.displayName = 'Loading';
+  return {
+    Loading
+  };
+}
+export const styles = StyleSheet.create({
+  container: {
+    alignItems: 'center',
+    justifyContent: 'center',
+    padding: 16
+  },
+  text: {
+    textAlign: 'center'
+  },
+  topContainer: {
+    width: '100%',
+    position: 'relative',
+    overflow: 'hidden'
+  },
+  topLoadingView: {
+    width: '100%',
+    alignItems: 'center',
+    justifyContent: 'center',
+    position: 'absolute',
+    top: 0,
+    left: 0
+  },
+  inlineContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center'
+  }
+});
+//# sourceMappingURL=LoadingBase.js.map

package/lib/module/loading/LoadingBase.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["normalizeBloomSize","resolveBloomColors","useBloomAppearance","React","memo","View","Text","StyleSheet","useTheme","jsx","_jsx","jsxs","_jsxs","SIZE_CONFIG","xs","spinner","text","sm","md","lg","bindLoading","SpinnerIcon","TopLoading","SpinnerLoading","size","sizeProp","color","tone","toneProp","className","textStyle","style","showText","iconSize","spinnerIcon","testID","theme","sizeConfig","effectiveIconSize","spinnerColor","colors","background","textColor","textSecondary","styles","container","children","fontSize","marginTop","InlineLoading","inlineContainer","marginLeft","LoadingComponent","props","variant","Loading","displayName","create","alignItems","justifyContent","padding","textAlign","topContainer","width","position","overflow","topLoadingView","top","left","flexDirection"],"sourceRoot":"../../../src","sources":["loading/LoadingBase.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/loading/index.web.js

@@ -1,18 +1,10 @@
 "use strict";
 
-// Web variant of the `./loading` barrel.
-//
-// The default barrel (`./index.ts`) re-exports from `./Loading` and
-// `./SpinnerIcon`, which statically import `react-native-reanimated` and
-// `react-native-svg`. Reanimated has no web build — its worklets Babel plugin
-// is native-only and importing it statically breaks every web bundler (Vite,
-// webpack, Metro-web). The web forks (`./Loading.web`, `./SpinnerIcon.web`)
-// render the same components with CSS keyframes/transitions and no native deps.
-//
-// Web bundlers select this file via the `"browser"` export condition in
-// `package.json`'s `exports['./loading']`; native bundlers fall through to the
-// React Native build above. Types are platform-agnostic, so they come straight
-// from `./types`.
+// AUTO-GENERATED by scripts/generate-platform-exports.mjs — DO NOT EDIT.
+// Source of truth: src/loading/index.ts.
+// Re-run `bun run generate:exports` (or any `bun run build`) after
+// changing that barrel or the set of web-forked subpaths.
+
 export { Loading } from "./Loading.web.js";
 export { SpinnerIcon } from "./SpinnerIcon.web.js";
 //# sourceMappingURL=index.web.js.map

package/lib/module/loading/index.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["Loading","SpinnerIcon"],"sourceRoot":"../../../src","sources":["loading/index.web.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,OAAO,QAAQ,kBAAe;AACvC,SAASC,WAAW,QAAQ,sBAAmB","ignoreList":[]}
+{"version":3,"names":["Loading","SpinnerIcon"],"sourceRoot":"../../../src","sources":["loading/index.web.ts"],"mappings":";;AAAA;AACA;AACA;AACA;;AAEA,SAASA,OAAO,QAAQ,kBAAe;AACvC,SAASC,WAAW,QAAQ,sBAAmB","ignoreList":[]}

package/lib/module/media-flight/index.web.js

@@ -1,14 +1,10 @@
 "use strict";
 
-/**
- * The web barrel, which exists to NAME the `.web` siblings.
- *
- * Export conditions do not apply to relative specifiers, so a bundler that is
- * not Metro reaches `MediaFlightLayer.web.tsx` and `MediaFlightHost.web.tsx`
- * only because this file spells them out. Those two are the whole web fork of
- * this family: the layer that paints each shared media node once, and the host
- * that claims it. Everything else below is the same module on both platforms.
- */
+// AUTO-GENERATED by scripts/generate-platform-exports.mjs — DO NOT EDIT.
+// Source of truth: src/media-flight/index.ts.
+// Re-run `bun run generate:exports` (or any `bun run build`) after
+// changing that barrel or the set of web-forked subpaths.
+
 export { MediaFlightLayer } from "./MediaFlightLayer.web.js";
 export { MediaFlightHost } from "./MediaFlightHost.web.js";
 export { MediaSurface, MediaPoster, EmptyMediaSurface } from "./MediaSurface.js";

package/lib/module/media-flight/index.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["MediaFlightLayer","MediaFlightHost","MediaSurface","MediaPoster","EmptyMediaSurface","useMediaFlight","DEFAULT_FLIGHT_CORNER_RADIUS","flightProgress","handOffFlight","hasFlight","releaseFlight","resetMediaFlight","SURFACE_MOUNT_TIMEOUT_MS","loadExpoVideo","warnExpoVideoUnavailable","provideExpoVideo","resetExpoVideoModule"],"sourceRoot":"../../../src","sources":["media-flight/index.web.ts"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,gBAAgB,QAAQ,2BAAwB;AACzD,SAASC,eAAe,QAAQ,0BAAuB;AACvD,SAASC,YAAY,EAAEC,WAAW,EAAEC,iBAAiB,QAAQ,mBAAgB;AAC7E,SAASC,cAAc,QAAQ,uBAAoB;AACnD,SACEC,4BAA4B,EAC5BC,cAAc,EACdC,aAAa,EACbC,SAAS,EACTC,aAAa,EACbC,gBAAgB,QACX,YAAS;AAChB,SAASC,wBAAwB,QAAQ,gBAAa;AACtD,SACEC,aAAa,EACbC,wBAAwB,EACxBC,gBAAgB,EAChBC,oBAAoB,QAMf,wBAAqB","ignoreList":[]}
+{"version":3,"names":["MediaFlightLayer","MediaFlightHost","MediaSurface","MediaPoster","EmptyMediaSurface","useMediaFlight","DEFAULT_FLIGHT_CORNER_RADIUS","flightProgress","handOffFlight","hasFlight","releaseFlight","resetMediaFlight","SURFACE_MOUNT_TIMEOUT_MS","loadExpoVideo","warnExpoVideoUnavailable","provideExpoVideo","resetExpoVideoModule"],"sourceRoot":"../../../src","sources":["media-flight/index.web.ts"],"mappings":";;AAAA;AACA;AACA;AACA;;AAEA,SAASA,gBAAgB,QAAQ,2BAAwB;AACzD,SAASC,eAAe,QAAQ,0BAAuB;AACvD,SAASC,YAAY,EAAEC,WAAW,EAAEC,iBAAiB,QAAQ,mBAAgB;AAC7E,SAASC,cAAc,QAAQ,uBAAoB;AACnD,SACEC,4BAA4B,EAC5BC,cAAc,EACdC,aAAa,EACbC,SAAS,EACTC,aAAa,EACbC,gBAAgB,QACX,YAAS;AAChB,SAASC,wBAAwB,QAAQ,gBAAa;AACtD,SACEC,aAAa,EACbC,wBAAwB,EACxBC,gBAAgB,EAChBC,oBAAoB,QAMf,wBAAqB","ignoreList":[]}

package/lib/module/menubar/Menubar.js

@@ -1,136 +1,29 @@
 "use strict";
 
 /**
- * `Menubar` — NATIVE. A row of triggers, each opening the same bottom sheet
- * `DropdownMenu` and `ContextMenu` present.
+ * `Menubar` — NATIVE: each menu opens the same bottom sheet `DropdownMenu` and
+ * `ContextMenu` present, because a phone has no room to hang a panel beside a
+ * control and every Bloom overlay resolving to one sheet is what makes the
+ * native surfaces feel like one system.
  *
- * The one genuinely new family in this port: Bloom had no menu bar. Its rows are
- * `floating/menu-rows`, published here under shadcn's `Menubar*` names, so a
- * ported call site keeps every part it wrote.
+ * The bar, the per-menu state and the trigger are identical on both platforms
+ * and live in `MenubarBase`. What forks is this file: the surface a menu opens
+ * into, and which sub-menu the rows get — INLINE on native, because a flyout
+ * needs a pointer.
+ *
+ * Bloom had no menu bar before this family; its rows are `floating/menu-rows`,
+ * published here under the `Menubar*` names so a call site keeps every part it
+ * wrote.
  */
-import React, { useMemo, useRef } from 'react';
+import React, { useMemo } from 'react';
 import { SheetShell } from "../dialog/SheetShell.js";
-import { MENUBAR_CLASS, MENUBAR_TRIGGER_CLASS, MENUBAR_TRIGGER_OPEN_CLASS, MENUBAR_TRIGGER_TEXT_CLASS, MENU_TRIGGER_POPUP } from "../floating/constants.js";
 import { MenuSurfaceProvider } from "../floating/context.js";
 import { createMenuRows } from "../floating/menu-rows.js";
 import { createInlineMenuSub } from "../floating/menu-sub-inline.js";
-import { cx } from "../floating/shared.js";
-import { TriggerSlot } from "../floating/TriggerSlot.js";
 import { useSheetOpenBridge } from "../floating/use-sheet-open-bridge.js";
-import { useControllableState } from "../hooks/use-controllable-state.js";
-import { StyledText, StyledView } from "../styles/styled-primitives.js";
-import { useMenuPalette } from "../floating/menu-palette.js";
-import { menuType } from "../floating/menu-type.js";
-import { MenubarMenuProvider, MenubarProvider, useMenubar, useMenubarMenu } from "./context.js";
+import { useMenubarMenu } from "./context.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-export function Menubar({
-  children,
-  value,
-  defaultValue,
-  onValueChange,
-  label = 'Menu bar',
-  className,
-  style,
-  testID
-}) {
-  const [openValue, setValue] = useControllableState({
-    value,
-    defaultValue,
-    onChange: onValueChange
-  });
-  const context = useMemo(() => ({
-    value: openValue,
-    setValue
-  }), [openValue, setValue]);
-  const palette = useMenuPalette();
-  const barPaint = {
-    backgroundColor: palette.trigger.background,
-    borderColor: palette.trigger.border,
-    boxShadow: palette.trigger.shadow
-  };
-  return /*#__PURE__*/_jsx(MenubarProvider, {
-    value: context,
-    children: /*#__PURE__*/_jsx(StyledView, {
-      role: "menubar",
-      "aria-label": label,
-      testID: testID,
-      className: cx(MENUBAR_CLASS, className)
-      // `shadow-s` reaches WEB through the class; NATIVE takes the same role as
-      // an inline style, because `design-tokens/shadows` is platform-forked and
-      // its own contract is that a multi-layer `box-shadow` is not something to
-      // rely on NativeWind translating to RN elevation. On web the two agree, so
-      // whichever wins paints the same thing.
-      ,
-      style: [barPaint, style],
-      children: children
-    })
-  });
-}
-export function MenubarMenu({
-  children,
-  value
-}) {
-  const bar = useMenubar();
-  const anchorRef = useRef(null);
-  const {
-    setValue
-  } = bar;
-  const context = useMemo(() => ({
-    open: bar.value === value,
-    setOpen: next => setValue(next ? value : undefined),
-    anchorRef
-  }), [bar.value, value, setValue]);
-  return /*#__PURE__*/_jsx(MenubarMenuProvider, {
-    value: context,
-    children: children
-  });
-}
-export function MenubarTrigger({
-  children,
-  asChild,
-  disabled,
-  label,
-  className,
-  style,
-  testID
-}) {
-  const menu = useMenubarMenu();
-  const palette = useMenuPalette();
-
-  // `flex items-center rounded-md px-2 py-1.5`, plus `bg-accent` while its menu
-  // is open and `text-sm font-medium` for the label — the same chrome the web
-  // fork draws, so the bar reads identically on both platforms.
-  const trigger = /*#__PURE__*/_jsx(StyledView, {
-    className: cx(MENUBAR_TRIGGER_CLASS, menu.open && MENUBAR_TRIGGER_OPEN_CLASS, className),
-    style: {
-      backgroundColor: menu.open ? palette.rowHighlight : 'transparent'
-    },
-    children: typeof children === 'string' ? /*#__PURE__*/_jsx(StyledText, {
-      className: MENUBAR_TRIGGER_TEXT_CLASS
-      // `text-body-medium text-text-primary`, in Inter.
-      ,
-      style: [menuType('body-medium'), {
-        color: palette.text
-      }],
-      children: children
-    }) : children
-  });
-  return /*#__PURE__*/_jsx(TriggerSlot, {
-    asChild: asChild,
-    anchorRef: menu.anchorRef,
-    style: style,
-    testID: testID,
-    handle: {
-      onPress: () => menu.setOpen(!menu.open),
-      disabled,
-      accessibilityLabel: label,
-      accessibilityRole: 'button',
-      'aria-haspopup': MENU_TRIGGER_POPUP,
-      'aria-expanded': menu.open
-    },
-    children: asChild ? children : trigger
-  });
-}
+export { Menubar, MenubarMenu, MenubarTrigger } from "./MenubarBase.js";
 export function MenubarContent({
   children,
   label = 'Menu',

package/lib/module/menubar/Menubar.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useMemo","useRef","SheetShell","MENUBAR_CLASS","MENUBAR_TRIGGER_CLASS","MENUBAR_TRIGGER_OPEN_CLASS","MENUBAR_TRIGGER_TEXT_CLASS","MENU_TRIGGER_POPUP","MenuSurfaceProvider","createMenuRows","createInlineMenuSub","cx","TriggerSlot","useSheetOpenBridge","useControllableState","StyledText","StyledView","useMenuPalette","menuType","MenubarMenuProvider","MenubarProvider","useMenubar","useMenubarMenu","jsx","_jsx","Menubar","children","value","defaultValue","onValueChange","label","className","style","testID","openValue","setValue","onChange","context","palette","barPaint","backgroundColor","trigger","background","borderColor","border","boxShadow","shadow","role","MenubarMenu","bar","anchorRef","open","setOpen","next","undefined","MenubarTrigger","asChild","disabled","menu","rowHighlight","color","text","handle","onPress","accessibilityLabel","accessibilityRole","MenubarContent","control","onSheetClose","surface","close","presentation","onClose","contentStyle","rows","MenubarItem","Item","MenubarCheckboxItem","CheckboxItem","MenubarRadioGroup","RadioGroup","MenubarRadioItem","RadioItem","MenubarLabel","Label","MenubarSeparator","Separator","MenubarShortcut","Shortcut","MenubarGroup","Group","MenubarSub","Sub","MenubarSubTrigger","SubTrigger","MenubarSubContent","SubContent"],"sourceRoot":"../../../src","sources":["menubar/Menubar.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useMemo","SheetShell","MenuSurfaceProvider","createMenuRows","createInlineMenuSub","useSheetOpenBridge","useMenubarMenu","jsx","_jsx","Menubar","MenubarMenu","MenubarTrigger","MenubarContent","children","label","style","menu","control","onSheetClose","open","setOpen","surface","close","presentation","onClose","contentStyle","value","rows","MenubarItem","Item","MenubarCheckboxItem","CheckboxItem","MenubarRadioGroup","RadioGroup","MenubarRadioItem","RadioItem","MenubarLabel","Label","MenubarSeparator","Separator","MenubarShortcut","Shortcut","MenubarGroup","Group","MenubarSub","Sub","MenubarSubTrigger","SubTrigger","MenubarSubContent","SubContent"],"sourceRoot":"../../../src","sources":["menubar/Menubar.tsx"],"mappings":";;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AAEtC,SAASC,UAAU,QAAQ,yBAAsB;AACjD,SAASC,mBAAmB,QAAsC,wBAAqB;AACvF,SAASC,cAAc,QAAQ,0BAAuB;AACtD,SAASC,mBAAmB,QAAQ,gCAA6B;AACjE,SAASC,kBAAkB,QAAQ,sCAAmC;AACtE,SAASC,cAAc,QAAQ,cAAW;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAG3C,SAASC,OAAO,EAAEC,WAAW,EAAEC,cAAc,QAAQ,kBAAe;AAEpE,OAAO,SAASC,cAAcA,CAAC;EAAEC,QAAQ;EAAEC,KAAK,GAAG,MAAM;EAAEC;AAA2B,CAAC,EAAE;EACvF,MAAMC,IAAI,GAAGV,cAAc,CAAC,CAAC;EAC7B,MAAM;IAAEW,OAAO;IAAEC;EAAa,CAAC,GAAGb,kBAAkB,CAACW,IAAI,CAACG,IAAI,EAAEH,IAAI,CAACI,OAAO,CAAC;EAC7E,MAAMC,OAAO,GAAGrB,OAAO,CACrB,OAAO;IAAEsB,KAAK,EAAEA,CAAA,KAAMN,IAAI,CAACI,OAAO,CAAC,KAAK,CAAC;IAAEG,YAAY,EAAE;EAAQ,CAAC,CAAC,EACnE,CAACP,IAAI,CACP,CAAC;EAED,oBACER,IAAA,CAACP,UAAU;IAACgB,OAAO,EAAEA,OAAQ;IAACH,KAAK,EAAEA,KAAM;IAACU,OAAO,EAAEN,YAAa;IAACO,YAAY,EAAEV,KAAM;IAAAF,QAAA,eACrFL,IAAA,CAACN,mBAAmB;MAACwB,KAAK,EAAEL,OAAQ;MAAAR,QAAA,EAAEA;IAAQ,CAAsB;EAAC,CAC3D,CAAC;AAEjB;AAEA,MAAMc,IAAI,GAAGxB,cAAc,CAAC,SAAS,EAAEC,mBAAmB,CAAC;AAE3D,OAAO,MAAMwB,WAAW,GAAGD,IAAI,CAACE,IAAI;AACpC,OAAO,MAAMC,mBAAmB,GAAGH,IAAI,CAACI,YAAY;AACpD,OAAO,MAAMC,iBAAiB,GAAGL,IAAI,CAACM,UAAU;AAChD,OAAO,MAAMC,gBAAgB,GAAGP,IAAI,CAACQ,SAAS;AAC9C,OAAO,MAAMC,YAAY,GAAGT,IAAI,CAACU,KAAK;AACtC,OAAO,MAAMC,gBAAgB,GAAGX,IAAI,CAACY,SAAS;AAC9C,OAAO,MAAMC,eAAe,GAAGb,IAAI,CAACc,QAAQ;AAC5C,OAAO,MAAMC,YAAY,GAAGf,IAAI,CAACgB,KAAK;AACtC,OAAO,MAAMC,UAAU,GAAGjB,IAAI,CAACkB,GAAG;AAClC,OAAO,MAAMC,iBAAiB,GAAGnB,IAAI,CAACoB,UAAU;AAChD,OAAO,MAAMC,iBAAiB,GAAGrB,IAAI,CAACsB,UAAU","ignoreList":[]}

package/lib/module/menubar/Menubar.web.js

@@ -1,132 +1,29 @@
 "use strict";
 
 /**
- * `Menubar` — WEB. The bar is the same row of triggers; each menu is an anchored
- * panel from `floating/FloatingPanel` rather than a sheet.
+ * `Menubar` — WEB: each menu is an anchored panel from `floating/FloatingPanel`
+ * rather than a sheet.
+ *
+ * The bar, the per-menu state and the trigger are identical on both platforms
+ * and live in `MenubarBase`. What forks is this file: the surface a menu opens
+ * into, and which sub-menu the rows get — a FLYOUT here, which needs a pointer.
  *
  * `align="start"` and the trigger's own width as `minWidth` are what make a
  * menubar menu hang under its trigger the way a desktop menu bar does, rather
  * than centring like a popover.
  */
-import React, { useCallback, useMemo, useRef } from 'react';
-import { MENUBAR_ALIGN_OFFSET, MENUBAR_CLASS, MENUBAR_MENU_MIN_WIDTH_CLASS, MENUBAR_SIDE_OFFSET, MENUBAR_TRIGGER_CLASS, MENUBAR_TRIGGER_OPEN_CLASS, MENUBAR_TRIGGER_TEXT_CLASS, MENU_TRIGGER_POPUP } from "../floating/constants.js";
+import React, { useCallback, useMemo, useState } from 'react';
+import { MENUBAR_ALIGN_OFFSET, MENUBAR_MENU_MIN_WIDTH_CLASS, MENUBAR_SIDE_OFFSET } from "../floating/constants.js";
 import { MenuSurfaceProvider } from "../floating/context.js";
 import { FloatingPanel } from "../floating/FloatingPanel.js";
+import { hostElement, useMenuPanelKeys } from "../floating/menu-keyboard.js";
 import { createMenuRows } from "../floating/menu-rows.js";
 import { createFlyoutMenuSub } from "../floating/menu-sub-flyout.js";
 import { cx } from "../floating/shared.js";
-import { TriggerSlot } from "../floating/TriggerSlot.js";
 import { useAnchorRect } from "../floating/use-anchor-rect.js";
-import { useControllableState } from "../hooks/use-controllable-state.js";
-import { StyledText, StyledView } from "../styles/styled-primitives.js";
-import { useMenuPalette } from "../floating/menu-palette.js";
-import { menuType } from "../floating/menu-type.js";
-import { MenubarMenuProvider, MenubarProvider, useMenubar, useMenubarMenu } from "./context.js";
+import { useMenubarMenu } from "./context.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-export function Menubar({
-  children,
-  value,
-  defaultValue,
-  onValueChange,
-  label = 'Menu bar',
-  className,
-  style,
-  testID
-}) {
-  const [openValue, setValue] = useControllableState({
-    value,
-    defaultValue,
-    onChange: onValueChange
-  });
-  const context = useMemo(() => ({
-    value: openValue,
-    setValue
-  }), [openValue, setValue]);
-  const palette = useMenuPalette();
-  const barPaint = {
-    backgroundColor: palette.trigger.background,
-    borderColor: palette.trigger.border,
-    boxShadow: palette.trigger.shadow
-  };
-  return /*#__PURE__*/_jsx(MenubarProvider, {
-    value: context,
-    children: /*#__PURE__*/_jsx(StyledView, {
-      role: "menubar",
-      "aria-label": label,
-      testID: testID,
-      className: cx(MENUBAR_CLASS, className),
-      style: [barPaint, style],
-      children: children
-    })
-  });
-}
-export function MenubarMenu({
-  children,
-  value
-}) {
-  const bar = useMenubar();
-  const anchorRef = useRef(null);
-  const {
-    setValue
-  } = bar;
-  const context = useMemo(() => ({
-    open: bar.value === value,
-    setOpen: next => setValue(next ? value : undefined),
-    anchorRef
-  }), [bar.value, value, setValue]);
-  return /*#__PURE__*/_jsx(MenubarMenuProvider, {
-    value: context,
-    children: children
-  });
-}
-export function MenubarTrigger({
-  children,
-  asChild,
-  disabled,
-  label,
-  className,
-  style,
-  testID
-}) {
-  const menu = useMenubarMenu();
-  const palette = useMenuPalette();
-
-  // `flex items-center rounded-md px-2 py-1.5`, plus `bg-accent` while its menu
-  // is open, and `text-sm font-medium` for the label. A menubar trigger is a
-  // BUTTON with chrome of its own, not a bare hit box — leaving it unstyled is
-  // why a Bloom menubar read as loose text against a pill-per-menu bar.
-  // `asChild` still hands the whole thing to the caller.
-  const trigger = /*#__PURE__*/_jsx(StyledView, {
-    className: cx(MENUBAR_TRIGGER_CLASS, menu.open && MENUBAR_TRIGGER_OPEN_CLASS, className),
-    style: {
-      backgroundColor: menu.open ? palette.rowHighlight : 'transparent'
-    },
-    children: typeof children === 'string' ? /*#__PURE__*/_jsx(StyledText, {
-      className: MENUBAR_TRIGGER_TEXT_CLASS
-      // `text-body-medium text-text-primary`, in Inter.
-      ,
-      style: [menuType('body-medium'), {
-        color: palette.text
-      }],
-      children: children
-    }) : children
-  });
-  return /*#__PURE__*/_jsx(TriggerSlot, {
-    asChild: asChild,
-    anchorRef: menu.anchorRef,
-    style: style,
-    testID: testID,
-    handle: {
-      onPress: () => menu.setOpen(!menu.open),
-      disabled,
-      accessibilityLabel: label,
-      accessibilityRole: 'button',
-      'aria-haspopup': MENU_TRIGGER_POPUP,
-      'aria-expanded': menu.open
-    },
-    children: asChild ? children : trigger
-  });
-}
+export { Menubar, MenubarMenu, MenubarTrigger } from "./MenubarBase.js";
 export function MenubarContent({
   children,
   label = 'Menu',
@@ -151,7 +48,14 @@ export function MenubarContent({
     close,
     presentation: 'dropdown'
   }), [close]);
+  const [panel, setPanel] = useState(null);
+  useMenuPanelKeys(hostElement(panel), {
+    open: menu.open,
+    onTab: close,
+    intent: menu.focusIntent
+  });
   return /*#__PURE__*/_jsx(FloatingPanel, {
+    panelRef: setPanel,
     open: menu.open,
     anchor: anchor,
     role: "menu",

package/lib/module/menubar/Menubar.web.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useMemo","useRef","MENUBAR_ALIGN_OFFSET","MENUBAR_CLASS","MENUBAR_MENU_MIN_WIDTH_CLASS","MENUBAR_SIDE_OFFSET","MENUBAR_TRIGGER_CLASS","MENUBAR_TRIGGER_OPEN_CLASS","MENUBAR_TRIGGER_TEXT_CLASS","MENU_TRIGGER_POPUP","MenuSurfaceProvider","FloatingPanel","createMenuRows","createFlyoutMenuSub","cx","TriggerSlot","useAnchorRect","useControllableState","StyledText","StyledView","useMenuPalette","menuType","MenubarMenuProvider","MenubarProvider","useMenubar","useMenubarMenu","jsx","_jsx","Menubar","children","value","defaultValue","onValueChange","label","className","style","testID","openValue","setValue","onChange","context","palette","barPaint","backgroundColor","trigger","background","borderColor","border","boxShadow","shadow","role","MenubarMenu","bar","anchorRef","open","setOpen","next","undefined","MenubarTrigger","asChild","disabled","menu","rowHighlight","color","text","handle","onPress","accessibilityLabel","accessibilityRole","MenubarContent","side","align","sideOffset","alignOffset","dismissible","minWidth","maxWidth","anchor","close","surface","presentation","modal","onDismiss","rows","MenubarItem","Item","MenubarCheckboxItem","CheckboxItem","MenubarRadioGroup","RadioGroup","MenubarRadioItem","RadioItem","MenubarLabel","Label","MenubarSeparator","Separator","MenubarShortcut","Shortcut","MenubarGroup","Group","MenubarSub","Sub","MenubarSubTrigger","SubTrigger","MenubarSubContent","SubContent"],"sourceRoot":"../../../src","sources":["menubar/Menubar.web.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useCallback","useMemo","useState","MENUBAR_ALIGN_OFFSET","MENUBAR_MENU_MIN_WIDTH_CLASS","MENUBAR_SIDE_OFFSET","MenuSurfaceProvider","FloatingPanel","hostElement","useMenuPanelKeys","createMenuRows","createFlyoutMenuSub","cx","useAnchorRect","useMenubarMenu","jsx","_jsx","Menubar","MenubarMenu","MenubarTrigger","MenubarContent","children","label","side","align","sideOffset","alignOffset","dismissible","minWidth","maxWidth","className","style","testID","menu","anchor","anchorRef","open","close","setOpen","surface","presentation","panel","setPanel","onTab","intent","focusIntent","panelRef","role","modal","onDismiss","value","rows","MenubarItem","Item","MenubarCheckboxItem","CheckboxItem","MenubarRadioGroup","RadioGroup","MenubarRadioItem","RadioItem","MenubarLabel","Label","MenubarSeparator","Separator","MenubarShortcut","Shortcut","MenubarGroup","Group","MenubarSub","Sub","MenubarSubTrigger","SubTrigger","MenubarSubContent","SubContent"],"sourceRoot":"../../../src","sources":["menubar/Menubar.web.tsx"],"mappings":"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","ignoreList":[]}