@octanejs/base-ui 0.1.53 → 0.1.55

package/UPSTREAM.md

@@ -27,6 +27,18 @@ in CI and none otherwise. The byte-exact configuration is retained under
 `audit/repository-fixtures/`. Test identities, assertions, skips, and todos remain
 subject to the same strict report validation after retries.
 
+The `#test-utils` facades scope the unchanged upstream `waitSingleFrame` helper
+in the corresponding renderer's `act()`, so frame-driven transition updates
+commit before focus and DOM assertions. The pristine runner uses a virtual
+facade over its selected upstream root; pristine bytes, test identities,
+assertions, and warning checks remain unchanged.
+
+The adapted Accordion CSS-transition suite explicitly enables animation waiting
+and restores the prior test flag afterward, matching neighboring upstream motion
+tests. The pinned setup disables animation waiting globally; without the local
+opt-in, the authored 300ms exit transition is bypassed. This fixture correction
+preserves every assertion and registration and leaves the pristine suite unchanged.
+
 Native source and adapted type tests pass strict `tsrx-tsc` checks with declaration
 checking enabled. The formal public type gate also passes. All 79 Base UI public entries and 2,073 entry/export pairs have consumer assertions, including 31 retained Octane compatibility exports.
 The gate verifies the npm tarball integrity and installed declaration bytes before

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/base-ui",
-  "version": "0.1.53",
+  "version": "0.1.55",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -430,11 +430,11 @@
   },
   "dependencies": {
     "@floating-ui/utils": "^0.2.12",
-    "@octanejs/base-ui-utils": "0.1.1",
-    "@octanejs/floating-ui": "0.1.53"
+    "@octanejs/base-ui-utils": "0.1.3",
+    "@octanejs/floating-ui": "0.1.55"
   },
   "peerDependencies": {
-    "octane": "^0.2.5",
+    "octane": "^0.4.0",
     "date-fns": "^4.0.0",
     "@date-fns/tz": "^1.2.0",
     "luxon": "^3.7.2"
@@ -467,9 +467,9 @@
     "typescript-pristine-native": "npm:typescript@7.0.2",
     "jsdom": "27.4.0",
     "semver": "7.8.5",
-    "octane": "0.2.12",
-    "@octanejs/testing-library": "0.1.51",
-    "@octanejs/remix-router": "0.1.48"
+    "octane": "0.4.2",
+    "@octanejs/testing-library": "0.1.53",
+    "@octanejs/remix-router": "0.1.50"
   },
   "imports": {
     "#prehydration/tabs/indicator": {

package/src/accordion/item/AccordionItem.tsrx

@@ -134,11 +134,9 @@ export const AccordionItem = function AccordionItem(
 	});
 
 	return (
-		<CollapsibleRootContext.Provider value={collapsibleContext}>
-			<AccordionItemContext.Provider value={accordionItemContext}>
-				{element}
-			</AccordionItemContext.Provider>
-		</CollapsibleRootContext.Provider>
+		<CollapsibleRootContext value={collapsibleContext}>
+			<AccordionItemContext value={accordionItemContext}>{element}</AccordionItemContext>
+		</CollapsibleRootContext>
 	);
 };
 

package/src/accordion/root/AccordionRoot.tsrx

@@ -127,9 +127,9 @@ export const AccordionRoot = function AccordionRoot<Value = any>(
 	});
 
 	return (
-		<AccordionRootContext.Provider value={contextValue}>
+		<AccordionRootContext value={contextValue}>
 			<CompositeList elementsRef={accordionItemRefs}>{element}</CompositeList>
-		</AccordionRootContext.Provider>
+		</AccordionRootContext>
 	);
 };
 

package/src/avatar/root/AvatarRoot.tsrx

@@ -40,7 +40,7 @@ export const AvatarRoot = function AvatarRoot(
 		stateAttributesMapping: avatarStateAttributesMapping,
 	});
 
-	return <AvatarRootContext.Provider value={contextValue}>{element}</AvatarRootContext.Provider>;
+	return <AvatarRootContext value={contextValue}>{element}</AvatarRootContext>;
 };
 
 export type ImageLoadingStatus = 'idle' | 'loading' | 'loaded' | 'error';

package/src/checkbox/root/CheckboxRoot.tsrx

@@ -391,13 +391,13 @@ export const CheckboxRoot = function CheckboxRoot(
 	}, [registerChildId, parent, value, renderedId]);
 
 	return (
-		<CheckboxRootContext.Provider value={state}>
+		<CheckboxRootContext value={state}>
 			{element}
 			{!checked && !groupContext && name && !parent && uncheckedValue !== undefined && (
 				<input type="hidden" form={form} name={name} value={uncheckedValue} disabled={disabled} />
 			)}
 			<input {...inputProps} suppressHydrationWarning />
-		</CheckboxRootContext.Provider>
+		</CheckboxRootContext>
 	);
 };
 

package/src/checkbox-group/CheckboxGroup.tsrx

@@ -175,9 +175,7 @@ export const CheckboxGroup = function CheckboxGroup(
 		stateAttributesMapping: fieldValidityMapping,
 	});
 
-	return (
-		<CheckboxGroupContext.Provider value={contextValue}>{element}</CheckboxGroupContext.Provider>
-	);
+	return <CheckboxGroupContext value={contextValue}>{element}</CheckboxGroupContext>;
 };
 
 export interface CheckboxGroupState extends FieldRootState {

package/src/collapsible/root/CollapsibleRoot.tsrx

@@ -66,11 +66,7 @@ export const CollapsibleRoot = function CollapsibleRoot(
 		stateAttributesMapping: collapsibleStateAttributesMapping,
 	});
 
-	return (
-		<CollapsibleRootContext.Provider value={contextValue}>
-			{element}
-		</CollapsibleRootContext.Provider>
-	);
+	return <CollapsibleRootContext value={contextValue}>{element}</CollapsibleRootContext>;
 };
 
 export interface CollapsibleRootState extends Pick<

package/src/combobox/chip/ComboboxChip.tsrx

@@ -130,9 +130,7 @@ export const ComboboxChip = function ComboboxChip(
 		[index],
 	);
 
-	return (
-		<ComboboxChipContext.Provider value={contextValue}>{element}</ComboboxChipContext.Provider>
-	);
+	return <ComboboxChipContext value={contextValue}>{element}</ComboboxChipContext>;
 };
 
 export interface ComboboxChipState {

package/src/combobox/chips/ComboboxChips.tsrx

@@ -62,9 +62,9 @@ export const ComboboxChips = function ComboboxChips(
 	);
 
 	return (
-		<ComboboxChipsContext.Provider value={contextValue}>
+		<ComboboxChipsContext value={contextValue}>
 			<CompositeList elementsRef={chipsRef}>{element}</CompositeList>
-		</ComboboxChipsContext.Provider>
+		</ComboboxChipsContext>
 	);
 };
 

package/src/combobox/collection/GroupCollectionContext.tsrx

@@ -16,11 +16,7 @@ export function GroupCollectionProvider(props: GroupCollectionProvider.Props) {
 
 	const contextValue = React.useMemo(() => ({ items }), [items]);
 
-	return (
-		<GroupCollectionContext.Provider value={contextValue}>
-			{children}
-		</GroupCollectionContext.Provider>
-	);
+	return <GroupCollectionContext value={contextValue}>{children}</GroupCollectionContext>;
 }
 
 namespace GroupCollectionProvider {

package/src/combobox/group/ComboboxGroup.tsrx

@@ -48,7 +48,7 @@ export const ComboboxGroup = function ComboboxGroup(
 	});
 
 	const wrappedElement = (
-		<ComboboxGroupContext.Provider value={contextValue}>{element}</ComboboxGroupContext.Provider>
+		<ComboboxGroupContext value={contextValue}>{element}</ComboboxGroupContext>
 	);
 
 	if (items) {

package/src/combobox/input/ComboboxInput.tsrx

@@ -457,9 +457,7 @@ export const ComboboxInput = function ComboboxInput(
 	});
 
 	const renderedInput = hasPositionerParent ? (
-		<FieldRootContext.Provider value={DEFAULT_FIELD_ROOT_CONTEXT}>
-			{element}
-		</FieldRootContext.Provider>
+		<FieldRootContext value={DEFAULT_FIELD_ROOT_CONTEXT}>{element}</FieldRootContext>
 	) : (
 		element
 	);

package/src/combobox/item/ComboboxItem.tsrx

@@ -213,9 +213,7 @@ function ComboboxItemInner(props: ComboboxItemInnerProps) {
 		[selected, textRef],
 	);
 
-	return (
-		<ComboboxItemContext.Provider value={contextValue}>{element}</ComboboxItemContext.Provider>
-	);
+	return <ComboboxItemContext value={contextValue}>{element}</ComboboxItemContext>;
 }
 
 /**

package/src/combobox/portal/ComboboxPortal.tsrx

@@ -29,9 +29,9 @@ export const ComboboxPortal = function ComboboxPortal(
 	}
 
 	return (
-		<ComboboxPortalContext.Provider value={keepMounted}>
+		<ComboboxPortalContext value={keepMounted}>
 			<FloatingPortal ref={forwardedRef} {...portalProps} />
-		</ComboboxPortalContext.Provider>
+		</ComboboxPortalContext>
 	);
 };
 

package/src/combobox/positioner/ComboboxPositioner.tsrx

@@ -126,7 +126,7 @@ export const ComboboxPositioner = function ComboboxPositioner(
 	});
 
 	return (
-		<ComboboxPositionerContext.Provider value={positioning}>
+		<ComboboxPositionerContext value={positioning}>
 			{mounted && modal && (
 				<InternalBackdrop
 					inert={inertValue(!open)}
@@ -134,7 +134,7 @@ export const ComboboxPositioner = function ComboboxPositioner(
 				/>
 			)}
 			{element}
-		</ComboboxPositionerContext.Provider>
+		</ComboboxPositionerContext>
 	);
 };
 

package/src/combobox/root/AriaCombobox.tsrx

@@ -1641,17 +1641,15 @@ export function AriaCombobox<Value = any, Mode extends SelectionMode = 'none', I
 	);
 
 	return (
-		<ComboboxRootContext.Provider value={store}>
-			<ComboboxFloatingContext.Provider value={floatingRootContext}>
-				<ComboboxHasItemsContext.Provider value={hasItems}>
-					<ComboboxDerivedItemsContext.Provider value={itemsContextValue}>
-						<ComboboxInputValueContext.Provider value={inputValue}>
-							{children}
-						</ComboboxInputValueContext.Provider>
-					</ComboboxDerivedItemsContext.Provider>
-				</ComboboxHasItemsContext.Provider>
-			</ComboboxFloatingContext.Provider>
-		</ComboboxRootContext.Provider>
+		<ComboboxRootContext value={store}>
+			<ComboboxFloatingContext value={floatingRootContext}>
+				<ComboboxHasItemsContext value={hasItems}>
+					<ComboboxDerivedItemsContext value={itemsContextValue}>
+						<ComboboxInputValueContext value={inputValue}>{children}</ComboboxInputValueContext>
+					</ComboboxDerivedItemsContext>
+				</ComboboxHasItemsContext>
+			</ComboboxFloatingContext>
+		</ComboboxRootContext>
 	);
 }
 

package/src/combobox/row/ComboboxRow.tsrx

@@ -24,7 +24,7 @@ export const ComboboxRow = function ComboboxRow(
 		props: [{ role: 'row' }, elementProps],
 	});
 
-	return <ComboboxRowContext.Provider value>{element}</ComboboxRowContext.Provider>;
+	return <ComboboxRowContext value>{element}</ComboboxRowContext>;
 };
 
 export interface ComboboxRowState {}

package/src/combobox/value/ComboboxValue.tsrx

@@ -26,7 +26,7 @@ export function ComboboxValue(props: ComboboxValue.Props): React.ReactElement {
 	const shouldCheckNullItemLabel = !hasSelectedValue && placeholder != null && childrenProp == null;
 	const hasNullLabel = store.useState('hasNullItemLabel', shouldCheckNullItemLabel);
 
-	let children = null;
+	let children: React.OctaneNode = null;
 	if (typeof childrenProp === 'function' && !React.isChildrenBlock(childrenProp)) {
 		children = childrenProp(selectedValue);
 	} else if (childrenProp != null) {

package/src/context-menu/root/ContextMenuRoot.tsrx

@@ -44,11 +44,11 @@ export function ContextMenuRoot(props: ContextMenuRoot.Props) {
 	);
 
 	return (
-		<ContextMenuRootContext.Provider value={contextValue}>
-			<MenuRootContext.Provider value={undefined}>
+		<ContextMenuRootContext value={contextValue}>
+			<MenuRootContext value={undefined}>
 				<Menu.Root {...props} />
-			</MenuRootContext.Provider>
-		</ContextMenuRootContext.Provider>
+			</MenuRootContext>
+		</ContextMenuRootContext>
 	);
 }
 

package/src/csp-provider/CSPProvider.tsrx

@@ -19,7 +19,7 @@ export function CSPProvider(props: CSPProvider.Props) {
 		[nonce, disableStyleElements],
 	);
 
-	return <CSPContext.Provider value={contextValue}>{children}</CSPContext.Provider>;
+	return <CSPContext value={contextValue}>{children}</CSPContext>;
 }
 
 export interface CSPProviderState {}

package/src/dialog/portal/DialogPortal.tsrx

@@ -31,14 +31,14 @@ export const DialogPortal = function DialogPortal(
 	}
 
 	return (
-		<DialogPortalContext.Provider value={keepMounted}>
+		<DialogPortalContext value={keepMounted}>
 			<FloatingPortal ref={forwardedRef} {...portalProps}>
 				{mounted && modal === true && (
 					<InternalBackdrop ref={store.context.internalBackdropRef} inert={inertValue(!open)} />
 				)}
 				{props.children}
 			</FloatingPortal>
-		</DialogPortalContext.Provider>
+		</DialogPortalContext>
 	);
 };
 

package/src/dialog/root/useRenderDialogRoot.tsrx

@@ -89,7 +89,7 @@ export function useRenderDialogRoot<Payload>(
 	const shouldRenderInteractions = open || mounted;
 
 	return (
-		<DialogRootContext.Provider value={store as DialogStore<unknown>}>
+		<DialogRootContext value={store as DialogStore<unknown>}>
 			{handle && <PopupHandleAttachment handle={handle} store={store} />}
 			{shouldRenderInteractions && (
 				<DialogInteractions
@@ -101,7 +101,7 @@ export function useRenderDialogRoot<Payload>(
 			{typeof children === 'function' && !React.isChildrenBlock(children)
 				? children({ payload })
 				: children}
-		</DialogRootContext.Provider>
+		</DialogRootContext>
 	);
 }
 

package/src/direction-provider/DirectionProvider.tsrx

@@ -15,9 +15,7 @@ export const DirectionProvider: React.FC<DirectionProvider.Props> = function Dir
 ) {
 	const { direction = 'ltr' } = props;
 	const contextValue = React.useMemo(() => ({ direction }), [direction]);
-	return (
-		<DirectionContext.Provider value={contextValue}>{props.children}</DirectionContext.Provider>
-	);
+	return <DirectionContext value={contextValue}>{props.children}</DirectionContext>;
 };
 
 export interface DirectionProviderState {}

package/src/drawer/popup/DrawerPopup.tsrx

@@ -234,7 +234,7 @@ export const DrawerPopup = function DrawerPopup(
 			return undefined;
 		}
 
-		const resizeObserver = new ResizeObserver(measureHeight);
+		const resizeObserver = React.createResizeObserver(measureHeight);
 
 		resizeObserver.observe(popupElement);
 		return () => {

package/src/drawer/provider/DrawerProvider.tsrx

@@ -51,9 +51,7 @@ export function DrawerProvider(props: DrawerProvider.Props) {
 		[active, removeDrawer, setDrawerOpen, visualStateStore],
 	);
 
-	return (
-		<DrawerProviderContext.Provider value={contextValue}>{children}</DrawerProviderContext.Provider>
-	);
+	return <DrawerProviderContext value={contextValue}>{children}</DrawerProviderContext>;
 }
 
 export interface DrawerProviderState {}

package/src/drawer/root/DrawerRoot.tsrx

@@ -247,7 +247,7 @@ export function DrawerRoot<Payload = unknown>(props: DrawerRoot.Props<Payload>)
 		children: resolvedChildren,
 	});
 
-	return <DrawerRootContext.Provider value={contextValue}>{dialog}</DrawerRootContext.Provider>;
+	return <DrawerRootContext value={contextValue}>{dialog}</DrawerRootContext>;
 }
 
 export interface DrawerRootState {}

package/src/drawer/root/useDrawerSnapPoints.ts

@@ -109,7 +109,7 @@ export function useDrawerSnapPoints() {
 			return undefined;
 		}
 
-		const resizeObserver = new ResizeObserver(measureViewportHeight);
+		const resizeObserver = React.createResizeObserver(measureViewportHeight);
 		resizeObserver.observe(viewportElement);
 		return () => {
 			resizeObserver.disconnect();

package/src/drawer/viewport/DrawerViewport.tsrx

@@ -1022,9 +1022,7 @@ export const DrawerViewport = function DrawerViewport(
 			className={className}
 			style={style}
 		>
-			<DrawerViewportContext.Provider value={swipeProviderValue}>
-				{children}
-			</DrawerViewportContext.Provider>
+			<DrawerViewportContext value={swipeProviderValue}>{children}</DrawerViewportContext>
 		</DialogViewport>
 	);
 };

package/src/drawer/virtual-keyboard-provider/DrawerVirtualKeyboardProvider.tsrx

@@ -648,9 +648,7 @@ export function DrawerVirtualKeyboardProvider(props: DrawerVirtualKeyboardProvid
 	);
 
 	return (
-		<DrawerVirtualKeyboardContext.Provider value={contextValue}>
-			{children}
-		</DrawerVirtualKeyboardContext.Provider>
+		<DrawerVirtualKeyboardContext value={contextValue}>{children}</DrawerVirtualKeyboardContext>
 	);
 }
 

package/src/field/item/FieldItem.tsrx

@@ -44,7 +44,7 @@ export const FieldItem = function FieldItem(
 
 	return (
 		<LabelableProvider>
-			<FieldItemContext.Provider value={fieldItemContext}>{element}</FieldItemContext.Provider>
+			<FieldItemContext value={fieldItemContext}>{element}</FieldItemContext>
 		</LabelableProvider>
 	);
 };

package/src/field/root/FieldRoot.tsrx

@@ -192,7 +192,7 @@ const FieldRootInner = function FieldRootInner(
 		stateAttributesMapping: fieldValidityMapping,
 	});
 
-	return <FieldRootContext.Provider value={contextValue}>{element}</FieldRootContext.Provider>;
+	return <FieldRootContext value={contextValue}>{element}</FieldRootContext>;
 };
 
 /**

package/src/fieldset/root/FieldsetRoot.tsrx

@@ -54,9 +54,7 @@ export const FieldsetRoot = function FieldsetRoot(
 		[legendId, setLegendId, disabled],
 	);
 
-	return (
-		<FieldsetRootContext.Provider value={contextValue}>{element}</FieldsetRootContext.Provider>
-	);
+	return <FieldsetRootContext value={contextValue}>{element}</FieldsetRootContext>;
 };
 
 export interface FieldsetRootState {

package/src/floating-ui-react/components/FloatingDelayGroup.tsrx

@@ -87,7 +87,7 @@ export function FloatingDelayGroup(props: FloatingDelayGroupProps): React.ReactE
 	}, [delay, currentIdRef, delayRef, initialDelayRef]);
 
 	return (
-		<FloatingDelayGroupContext.Provider
+		<FloatingDelayGroupContext
 			value={React.useMemo(
 				() => ({
 					hasProvider: true,
@@ -102,7 +102,7 @@ export function FloatingDelayGroup(props: FloatingDelayGroupProps): React.ReactE
 			)}
 		>
 			{children}
-		</FloatingDelayGroupContext.Provider>
+		</FloatingDelayGroupContext>
 	);
 }
 

package/src/floating-ui-react/components/FloatingPortal.tsrx

@@ -254,7 +254,7 @@ export const FloatingPortal = function FloatingPortal(
 	return (
 		<React.Fragment>
 			{portalSubtree}
-			<PortalContext.Provider value={portalContextValue}>
+			<PortalContext value={portalContextValue}>
 				{shouldRenderGuards && portalNode && (
 					<FocusGuard
 						data-type="outside"
@@ -296,7 +296,7 @@ export const FloatingPortal = function FloatingPortal(
 						}}
 					/>
 				)}
-			</PortalContext.Provider>
+			</PortalContext>
 		</React.Fragment>
 	);
 };

package/src/floating-ui-react/components/FloatingTree.tsrx

@@ -65,9 +65,9 @@ export function FloatingNode(props: FloatingNodeProps): React.ReactElement {
 	const parentId = useFloatingParentNodeId();
 
 	return (
-		<FloatingNodeContext.Provider value={React.useMemo(() => ({ id, parentId }), [id, parentId])}>
+		<FloatingNodeContext value={React.useMemo(() => ({ id, parentId }), [id, parentId])}>
 			{children}
-		</FloatingNodeContext.Provider>
+		</FloatingNodeContext>
 	);
 }
 
@@ -91,5 +91,5 @@ export function FloatingTree(props: FloatingTreeProps): React.ReactElement {
 	const { children, externalTree } = props;
 
 	const tree = useRefWithInit(() => externalTree ?? new FloatingTreeStore()).current;
-	return <FloatingTreeContext.Provider value={tree}>{children}</FloatingTreeContext.Provider>;
+	return <FloatingTreeContext value={tree}>{children}</FloatingTreeContext>;
 }

package/src/form/Form.tsrx

@@ -171,7 +171,7 @@ export const Form = function Form<FormValues extends Record<string, any> = Recor
 		[formRef, validationMode, errors, clearErrors],
 	);
 
-	return <FormContext.Provider value={contextValue}>{element}</FormContext.Provider>;
+	return <FormContext value={contextValue}>{element}</FormContext>;
 };
 
 export type FormSubmitEventReason = typeof REASONS.none;

package/src/internals/composite/list/CompositeList.tsrx

@@ -211,9 +211,7 @@ export function CompositeList<Metadata>(props: CompositeList.Props<Metadata>) {
 		[register, unregister, subscribeMapChange, nextIndexRef],
 	);
 
-	return (
-		<CompositeListContext.Provider value={contextValue}>{children}</CompositeListContext.Provider>
-	);
+	return <CompositeListContext value={contextValue}>{children}</CompositeListContext>;
 }
 
 function createMap<Metadata>() {

package/src/internals/composite/root/CompositeRoot.tsrx

@@ -81,7 +81,7 @@ export function CompositeRoot<Metadata extends {}, State extends Record<string,
 	);
 
 	return (
-		<CompositeRootContext.Provider value={contextValue}>
+		<CompositeRootContext value={contextValue}>
 			<CompositeList<Metadata>
 				elementsRef={elementsRef}
 				onMapChange={(newMap) => {
@@ -91,7 +91,7 @@ export function CompositeRoot<Metadata extends {}, State extends Record<string,
 			>
 				{element}
 			</CompositeList>
-		</CompositeRootContext.Provider>
+		</CompositeRootContext>
 	);
 }
 

package/src/internals/labelable-provider/LabelableProvider.tsrx

@@ -103,9 +103,7 @@ export const LabelableProvider: React.FC<LabelableProvider.Props> = function Lab
 		],
 	);
 
-	return (
-		<LabelableContext.Provider value={contextValue}>{props.children}</LabelableContext.Provider>
-	);
+	return <LabelableContext value={contextValue}>{props.children}</LabelableContext>;
 };
 
 export interface LabelableProviderState {}

package/src/menu/checkbox-item/MenuCheckboxItem.tsrx

@@ -109,9 +109,7 @@ export const MenuCheckboxItem = function MenuCheckboxItem(
 		ref: [itemRef, forwardedRef, listItem.ref],
 	});
 
-	return (
-		<MenuCheckboxItemContext.Provider value={state}>{element}</MenuCheckboxItemContext.Provider>
-	);
+	return <MenuCheckboxItemContext value={state}>{element}</MenuCheckboxItemContext>;
 };
 
 export interface MenuCheckboxItemState {

package/src/menu/group/MenuGroup.tsrx

@@ -29,7 +29,7 @@ export const MenuGroup = function MenuGroup(
 		},
 	});
 
-	return <MenuGroupContext.Provider value={setLabelId}>{element}</MenuGroupContext.Provider>;
+	return <MenuGroupContext value={setLabelId}>{element}</MenuGroupContext>;
 };
 
 export interface MenuGroupProps extends BaseUIComponentProps<'div', MenuGroupState> {

package/src/menu/portal/MenuPortal.tsrx

@@ -32,10 +32,10 @@ export const MenuPortal = function MenuPortal(
 	const portalOwnerRole = parent.type === 'menu' || parent.type === 'menubar' ? 'group' : undefined;
 
 	return (
-		<MenuPortalContext.Provider value={keepMounted}>
+		<MenuPortalContext value={keepMounted}>
 			{/* The hidden `aria-owns` owner needs `group` only under role-constrained parents. */}
 			<FloatingPortal ref={forwardedRef} {...portalProps} portalOwnerRole={portalOwnerRole} />
-		</MenuPortalContext.Provider>
+		</MenuPortalContext>
 	);
 };
 

package/src/menu/positioner/MenuPositioner.tsrx

@@ -300,7 +300,7 @@ export const MenuPositioner = function MenuPositioner(
 	}
 
 	return (
-		<MenuPositionerContext.Provider value={positioner}>
+		<MenuPositionerContext value={positioner}>
 			{shouldRenderBackdrop && (
 				<InternalBackdrop
 					ref={
@@ -320,7 +320,7 @@ export const MenuPositioner = function MenuPositioner(
 					{element}
 				</CompositeList>
 			</FloatingNode>
-		</MenuPositionerContext.Provider>
+		</MenuPositionerContext>
 	);
 };