@octanejs/aria 0.0.12 → 0.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/aria",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -46,10 +46,10 @@
     "clsx": "^2.1.1"
   },
   "peerDependencies": {
-    "octane": "0.1.18"
+    "octane": "0.1.20"
   },
   "devDependencies": {
-    "@tsrx/react": "^0.2.54",
+    "@tsrx/react": "^0.2.56",
     "esbuild": "^0.28.1",
     "react": "^19.2.7",
     "react-aria": "3.50.0",
@@ -57,7 +57,7 @@
     "react-dom": "^19.2.7",
     "react-stately": "3.48.0",
     "vitest": "^4.1.10",
-    "octane": "0.1.18"
+    "octane": "0.1.20"
   },
   "scripts": {
     "test": "vitest run"

package/src/components/ComboBox.ts

@@ -18,6 +18,7 @@ import {
 	useContext,
 	useMemo,
 	useRef,
+	isChildrenBlock,
 	useState,
 } from 'octane';
 
@@ -162,7 +163,7 @@ export const ComboBox: <T, M extends SelectionMode = 'single'>(
 			createElement(ListBoxContext.Provider, {
 				value: { items: props.items ?? props.defaultItems },
 				children:
-					typeof children === 'function'
+					typeof children === 'function' && !isChildrenBlock(children)
 						? children({
 								isOpen: false,
 								isDisabled,

package/src/components/Popover.ts

@@ -15,6 +15,7 @@ import {
 	useEffect,
 	useMemo,
 	useRef,
+	isChildrenBlock,
 	useState,
 } from 'octane';
 
@@ -164,7 +165,9 @@ export function Popover(props: PopoverProps): any {
 	// If we are in a hidden tree, we still need to preserve our children.
 	if (isHidden) {
 		let children = props.children;
-		if (typeof children === 'function') {
+		// A `.tsrx` `@{ … }` body compiles children to a tagged BLOCK function,
+		// which is not a render prop; calling it here would throw.
+		if (typeof children === 'function' && !isChildrenBlock(children)) {
 			children = children({
 				trigger: props.trigger || null,
 				placement: 'bottom',

package/src/components/Select.ts

@@ -13,7 +13,15 @@
 // RAC component needs the package dictionary). Hooks are hoisted out of argument object
 // literals per the binding convention; explicit dependency arrays are preserved verbatim.
 import type { Collection as ICollection, Node } from '@react-types/shared';
-import { Fragment, createContext, createElement, useContext, useMemo, useRef } from 'octane';
+import {
+	Fragment,
+	createContext,
+	createElement,
+	useContext,
+	useMemo,
+	useRef,
+	isChildrenBlock,
+} from 'octane';
 
 import { CollectionBuilder } from '../collections/CollectionBuilder';
 import { createHideableComponent } from '../collections/Hidden';
@@ -187,7 +195,7 @@ export const Select: <T, M extends SelectionMode = 'single'>(
 	let { children, isDisabled = false, isInvalid = false, isRequired = false } = props;
 	let content = useMemo(
 		() =>
-			typeof children === 'function'
+			typeof children === 'function' && !isChildrenBlock(children)
 				? children({
 						isOpen: false,
 						isDisabled,

package/src/components/Tabs.ts

@@ -20,7 +20,15 @@ import type {
 	Orientation,
 	PressEvents,
 } from '@react-types/shared';
-import { createContext, createElement, useContext, useMemo, useRef, useState } from 'octane';
+import {
+	createContext,
+	createElement,
+	isChildrenBlock,
+	useContext,
+	useMemo,
+	useRef,
+	useState,
+} from 'octane';
 
 import { CollectionNode } from '../collections/BaseCollection';
 import { CollectionBuilder, createLeafComponent } from '../collections/CollectionBuilder';
@@ -250,7 +258,12 @@ export function Tabs(props: TabsProps): any {
 	let { children, orientation = 'horizontal' } = props;
 	children = useMemo(
 		() =>
-			typeof children === 'function' ? children({ orientation, defaultChildren: null }) : children,
+			// A `.tsrx` `@{ … }` body compiles children to a tagged BLOCK function,
+			// which is not the render prop upstream expects here — calling it with
+			// render values instead of a scope throws.
+			typeof children === 'function' && !isChildrenBlock(children)
+				? children({ orientation, defaultChildren: null })
+				: children,
 		[children, orientation],
 		subSlot(slot, 'children'),
 	);

package/src/components/index.ts

@@ -297,6 +297,11 @@ export type { DragAndDropHooks, DragAndDropOptions } from './useDragAndDrop';
 // re-exports from the hooks surface, as upstream's index does
 export { VisuallyHidden } from '../visually-hidden/VisuallyHidden';
 export type { VisuallyHiddenProps } from '../visually-hidden/VisuallyHidden';
+// Upstream RAC's Focusable.d.ts is literally `export { Focusable } from
+// 'react-aria/Focusable'` — the same component the hooks surface already
+// exports, published under both entry points.
+export { Focusable } from '../interactions/useFocusable';
+export type { FocusableProps } from '../interactions/useFocusable';
 export type { Placement } from '../overlays/useOverlayPosition';
 export { useFilter } from '../i18n/useFilter';
 export type { Filter } from '../i18n/useFilter';

package/src/components/utils.ts

@@ -10,7 +10,7 @@
 // hook from `../utils/useSlot`; React's CSSProperties/ReactNode/JSX-intrinsics types → minimal
 // structural aliases (`E extends string`); explicit dep arrays are preserved verbatim.
 import type { AriaLabelingProps, DOMProps as SharedDOMProps } from '@react-types/shared';
-import { type Context, createElement, useContext, useMemo, useRef } from 'octane';
+import { type Context, createElement, isChildrenBlock, useContext, useMemo, useRef } from 'octane';
 
 import { S, splitSlot, subSlot } from '../internal';
 import { type MergableRef, mergeRefs } from '../utils/mergeRefs';
@@ -246,7 +246,13 @@ export function useRenderProps(...args: any[]): RenderPropsHookRetVal<any, any>
 				computedStyle = style;
 			}
 
-			if (typeof children === 'function') {
+			// A `.tsrx` component authored with `@{ … }` compiles its children to a
+			// BLOCK FUNCTION, which the compiler tags via markChildrenBlock. Upstream
+			// only ever sees a render prop here, so a bare typeof check would invoke
+			// that block with render values instead of a scope and crash — the
+			// idiomatic authoring form for every RAC component. Same guard the
+			// base-ui binding uses for its own render props.
+			if (typeof children === 'function' && !isChildrenBlock(children)) {
 				computedChildren = children({ ...values, defaultChildren });
 			} else if (children == null) {
 				computedChildren = defaultChildren;
@@ -277,7 +283,15 @@ export function composeRenderProps<T, U, V extends T>(
 	wrap: (prevValue: T, renderProps: U) => V,
 ): (renderProps: U) => V {
 	return (renderProps) =>
-		wrap(typeof value === 'function' ? (value as any)(renderProps) : value, renderProps);
+		wrap(
+			// Same guard as useRenderProps: a `.tsrx` component authored with
+			// `@{ … }` compiles its children to a tagged BLOCK function, which is
+			// not a render prop. Calling it with render values instead of a scope
+			// throws, and this helper is how components forward their own children
+			// (e.g. shadcn's Checkbox wrapping its indicator around them).
+			typeof value === 'function' && !isChildrenBlock(value) ? (value as any)(renderProps) : value,
+			renderProps,
+		);
 }
 
 export type WithRef<T, E> = T & { ref?: MergableRef<E> };