@deftui/addons 0.2.3 → 0.2.5

package/dist/modal-registry/provider.mjs

@@ -14,6 +14,7 @@ function ModalRenderer({ view, onPresent, onError }) {
 	}, child.id)) : null;
 	const { root: Root, component: Content } = view.definition;
 	return /* @__PURE__ */ jsxs(Root, {
+		...view.rootConfig,
 		...view.rootProps,
 		children: [/* @__PURE__ */ jsx(Content, {
 			...view.props,

package/dist/modal-registry/registry.mjs

@@ -41,6 +41,9 @@ function createModalRegistry(options) {
 	function getServerSnapshot() {
 		return EMPTY;
 	}
+	function getServerOpenSnapshot() {
+		return false;
+	}
 	function createRootProps(instance) {
 		return {
 			open: instance.phase !== "closing",
@@ -57,13 +60,14 @@ function createModalRegistry(options) {
 			const children = [...instance.children].map(build);
 			const open = instance.phase !== "closing";
 			const existing = instance.view;
-			if (existing && existing.definition === instance.definition && existing.props === instance.props && existing.rootProps.open === open && sameViews(existing.children, children)) return existing;
+			if (existing && existing.definition === instance.definition && existing.props === instance.props && existing.rootConfig === instance.rootConfig && existing.rootProps.open === open && sameViews(existing.children, children)) return existing;
 			return instance.view = {
 				id: instance.id,
 				definition: instance.definition,
 				props: instance.props,
 				modal: instance.modal,
 				rootProps: createRootProps(instance),
+				rootConfig: instance.rootConfig,
 				children
 			};
 		}
@@ -201,6 +205,19 @@ function createModalRegistry(options) {
 			if (!parent || parent.phase !== "active") throw new Error("A child call cannot be opened from a settled parent.");
 			parentId = id;
 		}
+		if (options?.id) for (const instance of instances.values()) {
+			if (instance.phase !== "active" || instance.definition !== definition || instance.dedupeKey !== options.id) continue;
+			instance.props = {
+				...instance.props,
+				...props
+			};
+			if (options.rootProps) instance.rootConfig = {
+				...instance.rootConfig,
+				...options.rootProps
+			};
+			publish();
+			return instance.call;
+		}
 		const id = nextId++;
 		let resolveResult;
 		let rejectResult;
@@ -231,6 +248,8 @@ function createModalRegistry(options) {
 			parentId,
 			children: /* @__PURE__ */ new Set(),
 			props,
+			rootConfig: { ...options?.rootProps },
+			dedupeKey: options?.id,
 			phase: "active",
 			presented: false,
 			resolveResult,
@@ -252,10 +271,28 @@ function createModalRegistry(options) {
 	function dismissAll() {
 		for (const instance of [...roots].reverse()) finish(instance, { status: "dismissed" });
 	}
+	function dismissTop() {
+		let top;
+		for (const instance of instances.values()) {
+			if (instance.phase !== "active") continue;
+			if (!top || instance.id > top.id) top = instance;
+		}
+		if (top) finish(top, { status: "dismissed" });
+	}
+	function isAnyModalOpen() {
+		for (const instance of instances.values()) if (instance.phase !== "closing") return true;
+		return false;
+	}
+	function useAnyModalOpen() {
+		return useSyncExternalStore(subscribe, isAnyModalOpen, getServerOpenSnapshot);
+	}
 	const registry = {
 		Provider,
 		define,
-		dismissAll
+		dismissAll,
+		dismissTop,
+		isAnyModalOpen,
+		useAnyModalOpen
 	};
 	if (cache && options) cache.set(options.key, registry);
 	return registry;

package/dist/modal-registry/types.d.mts

@@ -6,9 +6,11 @@ export interface ModalRootProps {
   onOpenChangeComplete: (open: boolean) => void;
 }
 /** A Base UI root component controlled by the registry. */
-export type ModalRootComponent = ComponentType<ModalRootProps & {
+export type ModalRootComponent<RootProps extends object = {}> = ComponentType<ModalRootProps & RootProps & {
   children?: ReactNode;
 }>;
+/** Root props the caller may override for one call. */
+export type ModalRootOverrides<RootProps extends object> = Partial<Omit<RootProps, keyof ModalRootProps | "children">>;
 /** Per-call controls exposed to the modal component. */
 export interface ModalController<Props extends object = {}, Output = void> {
   /** The current call, suitable for `show(..., { parent: modal.call })`. */
@@ -41,18 +43,23 @@ export interface ModalCall<Props, Output> extends Promise<ModalResult<Output>>,
   dismiss: () => void;
 }
 /** A callable definition doubles as a Fast Refresh-compatible component handle. */
-export type ModalDefinition<Props extends object = {}, Output = void> = FunctionComponent<{}> & {
+export type ModalDefinition<Props extends object = {}, Output = void, RootProps extends object = {}> = FunctionComponent<{}> & {
   /** Open this definition through its owning registry. */
-  readonly show: ModalShow<Props, Output>;
+  readonly show: ModalShow<Props, Output, RootProps>;
 };
-export interface ModalShowOptions {
+export interface ModalShowOptions<RootProps extends object = {}> {
+  /** Reuse the active call with the same id for this definition. */
+  id?: string;
   /** Render this call inside the parent call's root. */
   parent?: ModalHandle;
+  /** Root props to shallow-merge for this call. */
+  rootProps?: ModalRootOverrides<RootProps>;
 }
 type ModalArguments<Props> = {} extends Props ? [props?: Props] : [props: Props];
-interface ModalShow<Props, Output> {
+type ModalShowOptionsArguments<Props, RootProps extends object> = {} extends Props ? [props: Props | undefined, options: ModalShowOptions<RootProps>] : [props: Props, options: ModalShowOptions<RootProps>];
+interface ModalShow<Props, Output, RootProps extends object = {}> {
   (...args: ModalArguments<Props>): ModalCall<Props, Output>;
-  (props: Props, options: ModalShowOptions): ModalCall<Props, Output>;
+  (...args: ModalShowOptionsArguments<Props, RootProps>): ModalCall<Props, Output>;
 }
 export interface ModalRegistry {
   /** Mount once around the application. Unmounting dismisses pending calls. */
@@ -60,9 +67,15 @@ export interface ModalRegistry {
     children?: ReactNode;
   }>;
   /** Register a modal component. The registry controls the root and injects child calls through its children. */
-  define<Props extends object, Output = void>(root: ModalRootComponent, component: ComponentType<Modal<Props, Output>>): ModalDefinition<Props, Output>;
+  define<Props extends object, Output = void, RootProps extends object = {}>(root: ModalRootComponent<RootProps>, component: ComponentType<Modal<Props, Output>>): ModalDefinition<Props, Output, RootProps>;
   /** Dismiss every active call, waiting for children to exit before their parents. */
   dismissAll: () => void;
+  /** Dismiss the most recently opened active call. */
+  dismissTop: () => void;
+  /** Whether at least one modal root is open. Closing roots no longer count. */
+  isAnyModalOpen: () => boolean;
+  /** Reactive form of `isAnyModalOpen` for React components. */
+  useAnyModalOpen: () => boolean;
 }
 export interface ModalRegistryOptions {
   /** The registration module's `import.meta.hot`. */

package/dist/modal.d.mts

@@ -1,3 +1,3 @@
-import { Modal, ModalCall, ModalController, ModalDefinition, ModalHandle, ModalRegistry, ModalRegistryOptions, ModalResult, ModalRootComponent, ModalRootProps, ModalShowOptions } from "./modal-registry/types.mjs";
+import { Modal, ModalCall, ModalController, ModalDefinition, ModalHandle, ModalRegistry, ModalRegistryOptions, ModalResult, ModalRootComponent, ModalRootOverrides, ModalRootProps, ModalShowOptions } from "./modal-registry/types.mjs";
 import { createModalRegistry } from "./modal-registry/registry.mjs";
-export { type Modal, type ModalCall, type ModalController, type ModalDefinition, type ModalHandle, type ModalRegistry, type ModalRegistryOptions, type ModalResult, type ModalRootComponent, type ModalRootProps, type ModalShowOptions, createModalRegistry };
+export { type Modal, type ModalCall, type ModalController, type ModalDefinition, type ModalHandle, type ModalRegistry, type ModalRegistryOptions, type ModalResult, type ModalRootComponent, type ModalRootOverrides, type ModalRootProps, type ModalShowOptions, createModalRegistry };

package/dist/react-hook-form/field.d.mts

@@ -10,6 +10,12 @@ interface RHFFieldProps<Values extends FieldValues, Name extends FieldPath<Value
   label?: React.ReactNode;
   /** Supporting text referenced by the control's aria-describedby. */
   description?: React.ReactNode;
+  /**
+   * Associates the label with the control's ID via htmlFor.
+   *
+   * @default false
+   */
+  associateLabel?: boolean;
   /**
    * Injects id, aria-invalid, and aria-describedby into a single non-Fragment element returned by children.
    *

package/dist/react-hook-form/field.mjs

@@ -4,7 +4,7 @@ import { useController } from "react-hook-form";
 import { jsx, jsxs } from "react/jsx-runtime";
 // src/react-hook-form/field.tsx
 function RHFField(props) {
-	const { label, description, injectControlProps = true, children, ...controllerProps } = props;
+	const { label, associateLabel = false, description, injectControlProps = true, children, ...controllerProps } = props;
 	const id = useId();
 	const controller = useController(controllerProps);
 	const hasError = Boolean(controller.fieldState.error?.message);
@@ -23,7 +23,7 @@ function RHFField(props) {
 		"data-disabled": controller.field.disabled,
 		children: [
 			label != null && /* @__PURE__ */ jsx(Field.Label, {
-				htmlFor: controlId,
+				htmlFor: associateLabel ? controlId : void 0,
 				children: label
 			}),
 			control ? cloneElement(control, {

package/dist/react-hook-form/widgets/combobox.d.mts

@@ -1,10 +1,11 @@
 import { OnValueChange, Options } from "./types.mjs";
 import { Combobox } from "@deftui/react";
 import { ComponentProps } from "react";
-type Props<V extends string> = {
+type Props<V extends string> // oxfmt-ignore
+ = Omit<ComponentProps<typeof Combobox>, "items" | "children"> & Pick<ComponentProps<typeof Combobox.Input>, "size" | "placeholder" | "showClear" | "className"> & {
   options: Options<V>;
   emptyLabel?: string;
   onChange?: OnValueChange;
-} & Omit<ComponentProps<typeof Combobox>, "items" | "children"> & Pick<ComponentProps<typeof Combobox.Input>, "size" | "placeholder" | "showClear" | "className">;
+};
 export declare function RHFCombobox<V extends string>(props: Props<V>): import("react").JSX.Element;
 export {};

package/dist/react-hook-form/widgets/select.d.mts

@@ -1,9 +1,10 @@
 import { OnValueChange, Options } from "./types.mjs";
 import { Select } from "@deftui/react";
 import { ComponentProps } from "react";
-type Props<V extends string> = {
+type Props<V extends string> // oxfmt-ignore
+ = Omit<ComponentProps<typeof Select>, "items" | "children"> & Pick<ComponentProps<typeof Select.Trigger>, "size" | "className"> & Pick<ComponentProps<typeof Select.Value>, "placeholder" | "className"> & {
   options: Options<V>;
   onChange?: OnValueChange;
-} & Omit<ComponentProps<typeof Select>, "items" | "children"> & Pick<ComponentProps<typeof Select.Trigger>, "size" | "className"> & Pick<ComponentProps<typeof Select.Value>, "placeholder" | "className">;
+};
 export declare function RHFSelect<V extends string>(props: Props<V>): import("react").JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deftui/addons",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/KiriRainCat/deftui.git",
@@ -40,7 +40,7 @@
     "fix": "vp check --fix"
   },
   "devDependencies": {
-    "@deftui/react": "^0.2.3",
+    "@deftui/react": "^0.2.5",
     "@tanstack/react-router": "^1.170.46",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",
@@ -49,7 +49,7 @@
     "vite-plus": "catalog:"
   },
   "peerDependencies": {
-    "@deftui/react": "^0.2.3",
+    "@deftui/react": "^0.2.5",
     "@tanstack/react-router": "^1.170.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",