@cube-dev/ui-kit 0.179.0 → 0.180.0

package/dist/components/form/Form/ModernFormRoot.js

@@ -0,0 +1,108 @@
+/** @license MIT | @cube-dev/ui-kit v0.180.0 | Cube Dev Team */
+import { extractStyles } from "../../../utils/styles.js";
+import { useLayoutEffect as useLayoutEffect$1 } from "../../../utils/react/useLayoutEffect.js";
+import { useEvent } from "../../../_internal/hooks/use-event.js";
+import { Provider, useProviderProps } from "../../../provider.js";
+import { useValidationProps } from "../validation/use-validation-props.js";
+import { ModernControllerContext } from "./modern/context.js";
+import { getControllerInternals } from "./modern/controller.js";
+import { FormContext, FormElement, FormPresentationContext, formPropNames } from "./Form.js";
+import { CONTAINER_STYLES, filterBaseProps } from "@tenphi/tasty";
+import { forwardRef, useMemo, useRef } from "react";
+import { jsx } from "react/jsx-runtime";
+
+//#region src/components/form/Form/ModernFormRoot.tsx
+const EMPTY_LEGACY_CONTEXT = {};
+function ModernFormRoot(props, ref) {
+	const { form, qa, name, children, orientation = "vertical", labelPosition: authoredLabelPosition, labelWidth: authoredLabelWidth, labelStyles, necessityIndicator, validateTrigger, requiredMark = true, showValid, isDisabled, isReadOnly, isInvalid, isValid, defaultValues, onSubmit, onSubmitFailed, onValuesChange, ...otherProps } = useValidationProps(useProviderProps(props));
+	const labelPosition = authoredLabelPosition ?? (orientation === "horizontal" ? "side" : "top");
+	const labelWidth = authoredLabelWidth ?? (orientation === "horizontal" ? "auto" : void 0);
+	const { store } = getControllerInternals(form, "<Form>");
+	if (defaultValues !== void 0) throw new Error("A modern <Form> does not accept defaultValues. Seed Form.useController() or use an explicit defaults command.");
+	const binding = useRef(void 0);
+	useLayoutEffect$1(() => {
+		const token = store.bindCallbacks({});
+		binding.current = token;
+		return () => {
+			token.release();
+			if (binding.current === token) binding.current = void 0;
+		};
+	}, [store]);
+	useLayoutEffect$1(() => {
+		binding.current?.update({
+			...onSubmit === void 0 ? {} : { onSubmit },
+			...onSubmitFailed === void 0 ? {} : { onSubmitFailed },
+			...onValuesChange === void 0 ? {} : { onValuesChange }
+		});
+	});
+	const handleSubmit = useEvent((event) => {
+		event.preventDefault();
+		event.stopPropagation();
+		form.submit();
+	});
+	const handleReset = useEvent((event) => {
+		otherProps.onReset?.(event);
+		if (!event.defaultPrevented) {
+			event.preventDefault();
+			form.reset();
+		}
+	});
+	const presentation = useMemo(() => ({
+		labelPosition,
+		labelStyles,
+		orientation,
+		necessityIndicator,
+		validateTrigger,
+		requiredMark,
+		showValid,
+		idPrefix: name
+	}), [
+		labelPosition,
+		labelStyles,
+		orientation,
+		necessityIndicator,
+		validateTrigger,
+		requiredMark,
+		showValid,
+		name
+	]);
+	const styles = extractStyles(otherProps, CONTAINER_STYLES);
+	if (labelWidth) styles["$label-width"] = labelWidth;
+	return /* @__PURE__ */ jsx(FormElement, {
+		...filterBaseProps(otherProps, { propNames: formPropNames }),
+		ref,
+		qa,
+		noValidate: true,
+		styles,
+		mods: {
+			"has-sider": labelPosition === "side",
+			"has-split": labelPosition === "split",
+			horizontal: orientation === "horizontal"
+		},
+		onSubmit: otherProps.action == null ? handleSubmit : void 0,
+		onReset: otherProps.action == null ? handleReset : otherProps.onReset,
+		children: /* @__PURE__ */ jsx(FormContext.Provider, {
+			value: EMPTY_LEGACY_CONTEXT,
+			children: /* @__PURE__ */ jsx(ModernControllerContext.Provider, {
+				value: form,
+				children: /* @__PURE__ */ jsx(FormPresentationContext.Provider, {
+					value: presentation,
+					children: /* @__PURE__ */ jsx(Provider, {
+						insideForm: true,
+						isDisabled,
+						isReadOnly,
+						isInvalid,
+						isValid,
+						children
+					})
+				})
+			})
+		})
+	});
+}
+const _ModernFormRoot = forwardRef(ModernFormRoot);
+_ModernFormRoot.displayName = "ModernFormRoot";
+
+//#endregion
+export { _ModernFormRoot };
+//# sourceMappingURL=ModernFormRoot.js.map

package/dist/components/form/Form/ModernFormRoot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModernFormRoot.js","names":[],"sources":["../../../../src/components/form/Form/ModernFormRoot.tsx"],"sourcesContent":["import { CONTAINER_STYLES, filterBaseProps } from '@tenphi/tasty';\nimport { forwardRef, useMemo, useRef } from 'react';\n\nimport { useEvent } from '../../../_internal/hooks/use-event';\nimport { Provider, useProviderProps } from '../../../provider';\nimport { useLayoutEffect } from '../../../utils/react/useLayoutEffect';\nimport { extractStyles } from '../../../utils/styles';\nimport { useValidationProps } from '../validation/use-validation-props';\n\nimport {\n  FormContext,\n  FormElement,\n  FormPresentationContext,\n  formPropNames,\n} from './Form';\nimport { ModernControllerContext } from './modern/context';\nimport { getControllerInternals } from './modern/controller';\n\nimport type { FormEvent, ReactElement, Ref } from 'react';\nimport type { CubeFormProps, FormPresentationContextValue } from './Form';\nimport type { FormController } from './modern/controller';\nimport type { CallbackBinding, FormCallbacks } from './modern/types';\n\n/** Modern root owns callback bindings; subscriptions stay in descendants. */\nexport interface ModernFormProps<T extends object = Record<string, unknown>>\n  extends Omit<\n    CubeFormProps<T>,\n    'form' | 'defaultValues' | 'onSubmit' | 'onSubmitFailed' | 'onValuesChange'\n  > {\n  form: FormController<T>;\n  defaultValues?: never;\n  onReset?: (event: FormEvent<HTMLFormElement>) => void;\n  onSubmit?: FormCallbacks<T>['onSubmit'];\n  onSubmitFailed?: FormCallbacks<T>['onSubmitFailed'];\n  onValuesChange?: FormCallbacks<T>['onValuesChange'];\n}\n\nconst EMPTY_LEGACY_CONTEXT = {};\n\nfunction ModernFormRoot<T extends object>(\n  props: ModernFormProps<T>,\n  ref: Ref<HTMLFormElement>,\n): ReactElement {\n  const resolved = useValidationProps(useProviderProps(props));\n  const {\n    form,\n    qa,\n    name,\n    children,\n    orientation = 'vertical',\n    labelPosition: authoredLabelPosition,\n    labelWidth: authoredLabelWidth,\n    labelStyles,\n    necessityIndicator,\n    validateTrigger,\n    requiredMark = true,\n    showValid,\n    isDisabled,\n    isReadOnly,\n    isInvalid,\n    isValid,\n    defaultValues,\n    onSubmit,\n    onSubmitFailed,\n    onValuesChange,\n    ...otherProps\n  } = resolved;\n  const labelPosition =\n    authoredLabelPosition ?? (orientation === 'horizontal' ? 'side' : 'top');\n  const labelWidth =\n    authoredLabelWidth ?? (orientation === 'horizontal' ? 'auto' : undefined);\n  const { store } = getControllerInternals(form, '<Form>');\n  if (defaultValues !== undefined) {\n    throw new Error(\n      'A modern <Form> does not accept defaultValues. Seed Form.useController() or use an explicit defaults command.',\n    );\n  }\n  const binding = useRef<CallbackBinding<T> | undefined>(undefined);\n  useLayoutEffect(() => {\n    const token = store.bindCallbacks({});\n    binding.current = token;\n    return () => {\n      token.release();\n      if (binding.current === token) binding.current = undefined;\n    };\n  }, [store]);\n  useLayoutEffect(() => {\n    binding.current?.update({\n      ...(onSubmit === undefined ? {} : { onSubmit }),\n      ...(onSubmitFailed === undefined ? {} : { onSubmitFailed }),\n      ...(onValuesChange === undefined ? {} : { onValuesChange }),\n    });\n  });\n  const handleSubmit = useEvent((event: FormEvent<HTMLFormElement>) => {\n    event.preventDefault();\n    event.stopPropagation();\n    void form.submit();\n  });\n  const handleReset = useEvent((event: FormEvent<HTMLFormElement>) => {\n    otherProps.onReset?.(event);\n    if (!event.defaultPrevented) {\n      event.preventDefault();\n      form.reset();\n    }\n  });\n  const presentation = useMemo<FormPresentationContextValue>(\n    () => ({\n      labelPosition,\n      labelStyles,\n      orientation,\n      necessityIndicator,\n      validateTrigger,\n      requiredMark,\n      showValid,\n      idPrefix: name,\n    }),\n    [\n      labelPosition,\n      labelStyles,\n      orientation,\n      necessityIndicator,\n      validateTrigger,\n      requiredMark,\n      showValid,\n      name,\n    ],\n  );\n  const styles = extractStyles(otherProps, CONTAINER_STYLES);\n  if (labelWidth) styles['$label-width'] = labelWidth;\n\n  return (\n    <FormElement\n      {...filterBaseProps(otherProps, { propNames: formPropNames })}\n      ref={ref}\n      qa={qa}\n      noValidate\n      styles={styles}\n      mods={{\n        'has-sider': labelPosition === 'side',\n        'has-split': labelPosition === 'split',\n        horizontal: orientation === 'horizontal',\n      }}\n      onSubmit={otherProps.action == null ? handleSubmit : undefined}\n      onReset={otherProps.action == null ? handleReset : otherProps.onReset}\n    >\n      <FormContext.Provider value={EMPTY_LEGACY_CONTEXT}>\n        <ModernControllerContext.Provider value={form}>\n          <FormPresentationContext.Provider value={presentation}>\n            <Provider\n              insideForm\n              isDisabled={isDisabled}\n              isReadOnly={isReadOnly}\n              isInvalid={isInvalid}\n              isValid={isValid}\n            >\n              {children}\n            </Provider>\n          </FormPresentationContext.Provider>\n        </ModernControllerContext.Provider>\n      </FormContext.Provider>\n    </FormElement>\n  );\n}\n\nconst _ModernFormRoot = forwardRef(ModernFormRoot) as unknown as <\n  T extends object,\n>(\n  props: ModernFormProps<T> & { ref?: Ref<HTMLFormElement> },\n) => ReactElement;\n\n(_ModernFormRoot as any).displayName = 'ModernFormRoot';\n\nexport { _ModernFormRoot as ModernFormRoot };\n"],"mappings":";;;;;;;;;;;;;;AAqCA,MAAM,uBAAuB,EAAE;AAE/B,SAAS,eACP,OACA,KACc;CAEd,MAAM,EACJ,MACA,IACA,MACA,UACA,cAAc,YACd,eAAe,uBACf,YAAY,oBACZ,aACA,oBACA,iBACA,eAAe,MACf,WACA,YACA,YACA,WACA,SACA,eACA,UACA,gBACA,gBACA,GAAG,eAtBY,mBAAmB,iBAAiB,MAAM,CAAC;CAwB5D,MAAM,gBACJ,0BAA0B,gBAAgB,eAAe,SAAS;CACpE,MAAM,aACJ,uBAAuB,gBAAgB,eAAe,SAAS;CACjE,MAAM,EAAE,UAAU,uBAAuB,MAAM,SAAS;AACxD,KAAI,kBAAkB,OACpB,OAAM,IAAI,MACR,gHACD;CAEH,MAAM,UAAU,OAAuC,OAAU;AACjE,yBAAsB;EACpB,MAAM,QAAQ,MAAM,cAAc,EAAE,CAAC;AACrC,UAAQ,UAAU;AAClB,eAAa;AACX,SAAM,SAAS;AACf,OAAI,QAAQ,YAAY,MAAO,SAAQ,UAAU;;IAElD,CAAC,MAAM,CAAC;AACX,yBAAsB;AACpB,UAAQ,SAAS,OAAO;GACtB,GAAI,aAAa,SAAY,EAAE,GAAG,EAAE,UAAU;GAC9C,GAAI,mBAAmB,SAAY,EAAE,GAAG,EAAE,gBAAgB;GAC1D,GAAI,mBAAmB,SAAY,EAAE,GAAG,EAAE,gBAAgB;GAC3D,CAAC;GACF;CACF,MAAM,eAAe,UAAU,UAAsC;AACnE,QAAM,gBAAgB;AACtB,QAAM,iBAAiB;AACvB,EAAK,KAAK,QAAQ;GAClB;CACF,MAAM,cAAc,UAAU,UAAsC;AAClE,aAAW,UAAU,MAAM;AAC3B,MAAI,CAAC,MAAM,kBAAkB;AAC3B,SAAM,gBAAgB;AACtB,QAAK,OAAO;;GAEd;CACF,MAAM,eAAe,eACZ;EACL;EACA;EACA;EACA;EACA;EACA;EACA;EACA,UAAU;EACX,GACD;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACD,CACF;CACD,MAAM,SAAS,cAAc,YAAY,iBAAiB;AAC1D,KAAI,WAAY,QAAO,kBAAkB;AAEzC,QACE,oBAAC;EACC,GAAI,gBAAgB,YAAY,EAAE,WAAW,eAAe,CAAC;EACxD;EACD;EACJ;EACQ;EACR,MAAM;GACJ,aAAa,kBAAkB;GAC/B,aAAa,kBAAkB;GAC/B,YAAY,gBAAgB;GAC7B;EACD,UAAU,WAAW,UAAU,OAAO,eAAe;EACrD,SAAS,WAAW,UAAU,OAAO,cAAc,WAAW;YAE9D,oBAAC,YAAY;GAAS,OAAO;aAC3B,oBAAC,wBAAwB;IAAS,OAAO;cACvC,oBAAC,wBAAwB;KAAS,OAAO;eACvC,oBAAC;MACC;MACY;MACA;MACD;MACF;MAER;OACQ;MACsB;KACF;IACd;GACX;;AAIlB,MAAM,kBAAkB,WAAW,eAAe;AAMlD,AAAC,gBAAwB,cAAc"}

package/dist/components/form/Form/ResetButton/ResetButton.d.ts

@@ -1,13 +1,14 @@
 
 import { CubeButtonProps } from "../../../actions/Button/Button.js";
 import { FieldTypes } from "../types.js";
+import { FormController } from "../modern/controller.js";
 import { CubeFormInstance } from "../use-form.js";
 import * as react from "react";
 import * as _react_types_shared0 from "@react-types/shared";
 
 //#region src/components/form/Form/ResetButton/ResetButton.d.ts
 interface CubeResetButtonProps<T extends FieldTypes = FieldTypes> extends CubeButtonProps {
-  form?: CubeFormInstance<T>;
+  form?: CubeFormInstance<T> | FormController<T>;
 }
 declare const _ResetButton: react.ForwardRefExoticComponent<Omit<CubeResetButtonProps<FieldTypes>, "ref"> & react.RefAttributes<_react_types_shared0.FocusableRefValue<HTMLElement, HTMLElement>>>;
 //#endregion

package/dist/components/form/Form/ResetButton/ResetButton.js

@@ -1,14 +1,16 @@
-/** @license MIT | @cube-dev/ui-kit v0.179.0 | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.180.0 | Cube Dev Team */
 import { mergeProps } from "../../../../utils/react/mergeProps.js";
 import { useEvent } from "../../../../_internal/hooks/use-event.js";
 import { useProviderProps } from "../../../../provider.js";
 import { Button } from "../../../actions/Button/Button.js";
+import { isModernFormController } from "../backend.js";
 import { useFormProps } from "../Form.js";
+import { ModernResetButton } from "../modern/actions.js";
 import { forwardRef } from "react";
 import { jsx } from "react/jsx-runtime";
 
 //#region src/components/form/Form/ResetButton/ResetButton.tsx
-function ResetButton(props, ref) {
+function LegacyResetButton(props, ref) {
 	const providerProps = useProviderProps({});
 	props = useFormProps(props);
 	const { isDisabled: isContextDisabled } = providerProps;
@@ -30,6 +32,19 @@ function ResetButton(props, ref) {
 		}, otherProps)
 	});
 }
+function ResetButton(props, ref) {
+	const resolved = useFormProps(props);
+	if (isModernFormController(resolved.form)) return /* @__PURE__ */ jsx(ModernResetButton, {
+		...resolved,
+		form: resolved.form,
+		buttonRef: ref
+	});
+	return /* @__PURE__ */ jsx(LegacyResetButtonWithRef, {
+		...props,
+		ref
+	});
+}
+const LegacyResetButtonWithRef = forwardRef(LegacyResetButton);
 const _ResetButton = forwardRef(ResetButton);
 _ResetButton.displayName = "ResetButton";
 

package/dist/components/form/Form/ResetButton/ResetButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"ResetButton.js","names":[],"sources":["../../../../../src/components/form/Form/ResetButton/ResetButton.tsx"],"sourcesContent":["import { FocusableRef } from '@react-types/shared';\nimport { forwardRef } from 'react';\n\nimport { useEvent } from '../../../../_internal/index';\nimport { useProviderProps } from '../../../../provider';\nimport { mergeProps } from '../../../../utils/react/index';\nimport { Button, CubeButtonProps } from '../../../actions/Button/Button';\nimport { useFormProps } from '../Form';\nimport { FieldTypes } from '../types';\nimport { CubeFormInstance } from '../use-form';\n\nexport interface CubeResetButtonProps<T extends FieldTypes = FieldTypes>\n  extends CubeButtonProps {\n  form?: CubeFormInstance<T>;\n}\n\nfunction ResetButton(\n  props: CubeResetButtonProps,\n  ref: FocusableRef<HTMLElement>,\n) {\n  const providerProps = useProviderProps({} as CubeButtonProps);\n\n  props = useFormProps(props);\n\n  const { isDisabled: isContextDisabled } = providerProps;\n  const { form, isDisabled, ...otherProps } = props;\n\n  const onPress = useEvent(() => {\n    // Use setTimeout to avoid conflict with onBlur handlers\n    setTimeout(() => {\n      form?.resetFields();\n    });\n  });\n\n  const isSomethingDisabled = isDisabled || isContextDisabled;\n\n  return (\n    <Button\n      ref={ref}\n      type=\"primary\"\n      htmlType=\"reset\"\n      isDisabled={form?.isSubmitting || !form?.isTouched}\n      {...mergeProps(\n        {\n          onPress,\n          isDisabled: isSomethingDisabled\n            ? true\n            : form?.isSubmitting || !form?.isTouched,\n        },\n        otherProps,\n      )}\n    />\n  );\n}\n\nconst _ResetButton = forwardRef(ResetButton);\n\n_ResetButton.displayName = 'ResetButton';\n\nexport { _ResetButton as ResetButton };\n"],"mappings":";;;;;;;;;;AAgBA,SAAS,YACP,OACA,KACA;CACA,MAAM,gBAAgB,iBAAiB,EAAE,CAAoB;AAE7D,SAAQ,aAAa,MAAM;CAE3B,MAAM,EAAE,YAAY,sBAAsB;CAC1C,MAAM,EAAE,MAAM,YAAY,GAAG,eAAe;CAE5C,MAAM,UAAU,eAAe;AAE7B,mBAAiB;AACf,SAAM,aAAa;IACnB;GACF;CAEF,MAAM,sBAAsB,cAAc;AAE1C,QACE,oBAAC;EACM;EACL,MAAK;EACL,UAAS;EACT,YAAY,MAAM,gBAAgB,CAAC,MAAM;EACzC,GAAI,WACF;GACE;GACA,YAAY,sBACR,OACA,MAAM,gBAAgB,CAAC,MAAM;GAClC,EACD,WACD;GACD;;AAIN,MAAM,eAAe,WAAW,YAAY;AAE5C,aAAa,cAAc"}
+{"version":3,"file":"ResetButton.js","names":[],"sources":["../../../../../src/components/form/Form/ResetButton/ResetButton.tsx"],"sourcesContent":["import { FocusableRef } from '@react-types/shared';\nimport { forwardRef } from 'react';\n\nimport { useEvent } from '../../../../_internal/index';\nimport { useProviderProps } from '../../../../provider';\nimport { mergeProps } from '../../../../utils/react/index';\nimport { Button, CubeButtonProps } from '../../../actions/Button/Button';\nimport { isModernFormController } from '../backend';\nimport { useFormProps } from '../Form';\nimport { ModernResetButton } from '../modern/actions';\nimport { FieldTypes } from '../types';\nimport { CubeFormInstance } from '../use-form';\n\nimport type { FormController } from '../modern/controller';\n\nexport interface CubeResetButtonProps<T extends FieldTypes = FieldTypes>\n  extends CubeButtonProps {\n  form?: CubeFormInstance<T> | FormController<T>;\n}\n\nfunction LegacyResetButton(\n  props: Omit<CubeResetButtonProps, 'form'> & {\n    form?: CubeFormInstance<FieldTypes>;\n  },\n  ref: FocusableRef<HTMLElement>,\n) {\n  const providerProps = useProviderProps({} as CubeButtonProps);\n\n  props = useFormProps(props);\n\n  const { isDisabled: isContextDisabled } = providerProps;\n  const { form, isDisabled, ...otherProps } = props;\n\n  const onPress = useEvent(() => {\n    // Use setTimeout to avoid conflict with onBlur handlers\n    setTimeout(() => {\n      form?.resetFields();\n    });\n  });\n\n  const isSomethingDisabled = isDisabled || isContextDisabled;\n\n  return (\n    <Button\n      ref={ref}\n      type=\"primary\"\n      htmlType=\"reset\"\n      isDisabled={form?.isSubmitting || !form?.isTouched}\n      {...mergeProps(\n        {\n          onPress,\n          isDisabled: isSomethingDisabled\n            ? true\n            : form?.isSubmitting || !form?.isTouched,\n        },\n        otherProps,\n      )}\n    />\n  );\n}\n\nfunction ResetButton(\n  props: CubeResetButtonProps,\n  ref: FocusableRef<HTMLElement>,\n) {\n  const resolved = useFormProps(props);\n  if (isModernFormController(resolved.form)) {\n    return (\n      <ModernResetButton\n        {...resolved}\n        form={resolved.form as FormController}\n        buttonRef={ref}\n      />\n    );\n  }\n  return (\n    <LegacyResetButtonWithRef\n      {...(props as Omit<CubeResetButtonProps, 'form'> & {\n        form?: CubeFormInstance<FieldTypes>;\n      })}\n      ref={ref}\n    />\n  );\n}\n\nconst LegacyResetButtonWithRef = forwardRef(LegacyResetButton);\nconst _ResetButton = forwardRef(ResetButton);\n\n_ResetButton.displayName = 'ResetButton';\n\nexport { _ResetButton as ResetButton };\n"],"mappings":";;;;;;;;;;;;AAoBA,SAAS,kBACP,OAGA,KACA;CACA,MAAM,gBAAgB,iBAAiB,EAAE,CAAoB;AAE7D,SAAQ,aAAa,MAAM;CAE3B,MAAM,EAAE,YAAY,sBAAsB;CAC1C,MAAM,EAAE,MAAM,YAAY,GAAG,eAAe;CAE5C,MAAM,UAAU,eAAe;AAE7B,mBAAiB;AACf,SAAM,aAAa;IACnB;GACF;CAEF,MAAM,sBAAsB,cAAc;AAE1C,QACE,oBAAC;EACM;EACL,MAAK;EACL,UAAS;EACT,YAAY,MAAM,gBAAgB,CAAC,MAAM;EACzC,GAAI,WACF;GACE;GACA,YAAY,sBACR,OACA,MAAM,gBAAgB,CAAC,MAAM;GAClC,EACD,WACD;GACD;;AAIN,SAAS,YACP,OACA,KACA;CACA,MAAM,WAAW,aAAa,MAAM;AACpC,KAAI,uBAAuB,SAAS,KAAK,CACvC,QACE,oBAAC;EACC,GAAI;EACJ,MAAM,SAAS;EACf,WAAW;GACX;AAGN,QACE,oBAAC;EACC,GAAK;EAGA;GACL;;AAIN,MAAM,2BAA2B,WAAW,kBAAkB;AAC9D,MAAM,eAAe,WAAW,YAAY;AAE5C,aAAa,cAAc"}

package/dist/components/form/Form/SubmitButton/SubmitButton.d.ts

@@ -1,13 +1,14 @@
 
 import { CubeButtonProps } from "../../../actions/Button/Button.js";
 import { FieldTypes } from "../types.js";
+import { FormController } from "../modern/controller.js";
 import { CubeFormInstance } from "../use-form.js";
 import * as react from "react";
 import * as _react_types_shared0 from "@react-types/shared";
 
 //#region src/components/form/Form/SubmitButton/SubmitButton.d.ts
 interface CubeSubmitButtonProps<T extends FieldTypes = FieldTypes> extends CubeButtonProps {
-  form?: CubeFormInstance<T>;
+  form?: CubeFormInstance<T> | FormController<T>;
 }
 declare const _SubmitButton: react.ForwardRefExoticComponent<Omit<CubeSubmitButtonProps<FieldTypes>, "ref"> & react.RefAttributes<_react_types_shared0.FocusableRefValue<HTMLElement, HTMLElement>>>;
 //#endregion

package/dist/components/form/Form/SubmitButton/SubmitButton.js

@@ -1,12 +1,14 @@
-/** @license MIT | @cube-dev/ui-kit v0.179.0 | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.180.0 | Cube Dev Team */
 import { useProviderProps } from "../../../../provider.js";
 import { Button } from "../../../actions/Button/Button.js";
+import { isModernFormController } from "../backend.js";
 import { useFormProps } from "../Form.js";
+import { ModernSubmitButton } from "../modern/actions.js";
 import { forwardRef } from "react";
 import { jsx } from "react/jsx-runtime";
 
 //#region src/components/form/Form/SubmitButton/SubmitButton.tsx
-function SubmitButton(props, ref) {
+function LegacySubmitButton(props, ref) {
 	const providerProps = useProviderProps({});
 	props = useFormProps(props);
 	const { isDisabled: isContextDisabled } = providerProps;
@@ -22,6 +24,19 @@ function SubmitButton(props, ref) {
 		...otherProps
 	});
 }
+function SubmitButton(props, ref) {
+	const resolved = useFormProps(props);
+	if (isModernFormController(resolved.form)) return /* @__PURE__ */ jsx(ModernSubmitButton, {
+		...resolved,
+		form: resolved.form,
+		buttonRef: ref
+	});
+	return /* @__PURE__ */ jsx(LegacySubmitButtonWithRef, {
+		...props,
+		ref
+	});
+}
+const LegacySubmitButtonWithRef = forwardRef(LegacySubmitButton);
 const _SubmitButton = forwardRef(SubmitButton);
 _SubmitButton.displayName = "SubmitButton";
 

package/dist/components/form/Form/SubmitButton/SubmitButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubmitButton.js","names":[],"sources":["../../../../../src/components/form/Form/SubmitButton/SubmitButton.tsx"],"sourcesContent":["import { FocusableRef } from '@react-types/shared';\nimport { forwardRef } from 'react';\n\nimport { useProviderProps } from '../../../../provider';\nimport { Button, CubeButtonProps } from '../../../actions/Button/Button';\nimport { useFormProps } from '../Form';\nimport { FieldTypes } from '../types';\nimport { CubeFormInstance } from '../use-form';\n\nexport interface CubeSubmitButtonProps<T extends FieldTypes = FieldTypes>\n  extends CubeButtonProps {\n  form?: CubeFormInstance<T>;\n}\n\nfunction SubmitButton(\n  props: CubeSubmitButtonProps,\n  ref: FocusableRef<HTMLElement>,\n) {\n  const providerProps = useProviderProps({} as CubeButtonProps);\n\n  props = useFormProps(props);\n\n  const { isDisabled: isContextDisabled } = providerProps;\n\n  props = useFormProps(props);\n\n  const { form, isDisabled, ...otherProps } = props;\n  const isSomethingDisabled = isDisabled || isContextDisabled;\n\n  return (\n    <Button\n      ref={ref}\n      type=\"primary\"\n      htmlType=\"submit\"\n      isLoading={form?.isSubmitting}\n      isDisabled={\n        isSomethingDisabled || form?.isSubmitting ? true : form?.isInvalid\n      }\n      {...otherProps}\n    />\n  );\n}\n\nconst _SubmitButton = forwardRef(SubmitButton);\n\n_SubmitButton.displayName = 'SubmitButton';\n\nexport { _SubmitButton as SubmitButton };\n"],"mappings":";;;;;;;;AAcA,SAAS,aACP,OACA,KACA;CACA,MAAM,gBAAgB,iBAAiB,EAAE,CAAoB;AAE7D,SAAQ,aAAa,MAAM;CAE3B,MAAM,EAAE,YAAY,sBAAsB;AAE1C,SAAQ,aAAa,MAAM;CAE3B,MAAM,EAAE,MAAM,YAAY,GAAG,eAAe;CAC5C,MAAM,sBAAsB,cAAc;AAE1C,QACE,oBAAC;EACM;EACL,MAAK;EACL,UAAS;EACT,WAAW,MAAM;EACjB,YACE,uBAAuB,MAAM,eAAe,OAAO,MAAM;EAE3D,GAAI;GACJ;;AAIN,MAAM,gBAAgB,WAAW,aAAa;AAE9C,cAAc,cAAc"}
+{"version":3,"file":"SubmitButton.js","names":[],"sources":["../../../../../src/components/form/Form/SubmitButton/SubmitButton.tsx"],"sourcesContent":["import { FocusableRef } from '@react-types/shared';\nimport { forwardRef } from 'react';\n\nimport { useProviderProps } from '../../../../provider';\nimport { Button, CubeButtonProps } from '../../../actions/Button/Button';\nimport { isModernFormController } from '../backend';\nimport { useFormProps } from '../Form';\nimport { ModernSubmitButton } from '../modern/actions';\nimport { FieldTypes } from '../types';\nimport { CubeFormInstance } from '../use-form';\n\nimport type { FormController } from '../modern/controller';\n\nexport interface CubeSubmitButtonProps<T extends FieldTypes = FieldTypes>\n  extends CubeButtonProps {\n  form?: CubeFormInstance<T> | FormController<T>;\n}\n\nfunction LegacySubmitButton(\n  props: Omit<CubeSubmitButtonProps, 'form'> & {\n    form?: CubeFormInstance<FieldTypes>;\n  },\n  ref: FocusableRef<HTMLElement>,\n) {\n  const providerProps = useProviderProps({} as CubeButtonProps);\n\n  props = useFormProps(props);\n\n  const { isDisabled: isContextDisabled } = providerProps;\n\n  props = useFormProps(props);\n\n  const { form, isDisabled, ...otherProps } = props;\n  const isSomethingDisabled = isDisabled || isContextDisabled;\n\n  return (\n    <Button\n      ref={ref}\n      type=\"primary\"\n      htmlType=\"submit\"\n      isLoading={form?.isSubmitting}\n      isDisabled={\n        isSomethingDisabled || form?.isSubmitting ? true : form?.isInvalid\n      }\n      {...otherProps}\n    />\n  );\n}\n\nfunction SubmitButton(\n  props: CubeSubmitButtonProps,\n  ref: FocusableRef<HTMLElement>,\n) {\n  const resolved = useFormProps(props);\n  if (isModernFormController(resolved.form)) {\n    return (\n      <ModernSubmitButton\n        {...resolved}\n        form={resolved.form as FormController}\n        buttonRef={ref}\n      />\n    );\n  }\n  return (\n    <LegacySubmitButtonWithRef\n      {...(props as Omit<CubeSubmitButtonProps, 'form'> & {\n        form?: CubeFormInstance<FieldTypes>;\n      })}\n      ref={ref}\n    />\n  );\n}\n\nconst LegacySubmitButtonWithRef = forwardRef(LegacySubmitButton);\nconst _SubmitButton = forwardRef(SubmitButton);\n\n_SubmitButton.displayName = 'SubmitButton';\n\nexport { _SubmitButton as SubmitButton };\n"],"mappings":";;;;;;;;;;AAkBA,SAAS,mBACP,OAGA,KACA;CACA,MAAM,gBAAgB,iBAAiB,EAAE,CAAoB;AAE7D,SAAQ,aAAa,MAAM;CAE3B,MAAM,EAAE,YAAY,sBAAsB;AAE1C,SAAQ,aAAa,MAAM;CAE3B,MAAM,EAAE,MAAM,YAAY,GAAG,eAAe;CAC5C,MAAM,sBAAsB,cAAc;AAE1C,QACE,oBAAC;EACM;EACL,MAAK;EACL,UAAS;EACT,WAAW,MAAM;EACjB,YACE,uBAAuB,MAAM,eAAe,OAAO,MAAM;EAE3D,GAAI;GACJ;;AAIN,SAAS,aACP,OACA,KACA;CACA,MAAM,WAAW,aAAa,MAAM;AACpC,KAAI,uBAAuB,SAAS,KAAK,CACvC,QACE,oBAAC;EACC,GAAI;EACJ,MAAM,SAAS;EACf,WAAW;GACX;AAGN,QACE,oBAAC;EACC,GAAK;EAGA;GACL;;AAIN,MAAM,4BAA4B,WAAW,mBAAmB;AAChE,MAAM,gBAAgB,WAAW,aAAa;AAE9C,cAAc,cAAc"}

package/dist/components/form/Form/SubmitError.js

@@ -1,13 +1,14 @@
-/** @license MIT | @cube-dev/ui-kit v0.179.0 | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.180.0 | Cube Dev Team */
 import { useI18n } from "../../../i18n/useI18n.js";
+import { ModernControllerContext } from "./modern/context.js";
 import { FormContext } from "./Form.js";
+import { useFormSelector } from "./modern/react.js";
 import { Alert } from "../../content/Alert/Alert.js";
 import { forwardRef, isValidElement, useContext } from "react";
 import { jsx } from "react/jsx-runtime";
 
 //#region src/components/form/Form/SubmitError.tsx
-function SubmitError(props, ref) {
-	let { submitError } = useContext(FormContext);
+function ErrorAlert({ submitError, ...props }, ref) {
 	const { t } = useI18n();
 	if (!submitError) return null;
 	if (!isValidElement(submitError) && typeof submitError !== "string") submitError = t("form.internalError", "Internal error");
@@ -18,6 +19,28 @@ function SubmitError(props, ref) {
 		children: submitError
 	});
 }
+const ForwardedErrorAlert = forwardRef(ErrorAlert);
+function ModernSubmitError({ form, alertRef, ...props }) {
+	const submitError = useFormSelector(form, (state) => state.submitError);
+	return /* @__PURE__ */ jsx(ForwardedErrorAlert, {
+		...props,
+		ref: alertRef,
+		submitError
+	});
+}
+function SubmitError(props, ref) {
+	const modern = useContext(ModernControllerContext);
+	const legacy = useContext(FormContext);
+	return modern ? /* @__PURE__ */ jsx(ModernSubmitError, {
+		...props,
+		form: modern,
+		alertRef: ref
+	}) : /* @__PURE__ */ jsx(ForwardedErrorAlert, {
+		...props,
+		ref,
+		submitError: legacy.submitError
+	});
+}
 /**
 * An alert that shows a form error message received from the onSubmit callback.
 */

package/dist/components/form/Form/SubmitError.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubmitError.js","names":[],"sources":["../../../../src/components/form/Form/SubmitError.tsx"],"sourcesContent":["import {\n  ForwardedRef,\n  forwardRef,\n  isValidElement,\n  ReactNode,\n  useContext,\n} from 'react';\n\nimport { useI18n } from '../../../i18n';\nimport { Alert, CubeAlertProps } from '../../content/Alert/index';\n\nimport { FormContext } from './Form';\n\ntype SubmitErrorContextProps = {\n  submitError?: unknown;\n};\n\nfunction SubmitError(props: CubeAlertProps, ref: ForwardedRef<HTMLDivElement>) {\n  let { submitError } = useContext(FormContext) as SubmitErrorContextProps;\n  const { t } = useI18n();\n\n  if (!submitError) {\n    return null;\n  }\n\n  if (\n    !isValidElement(submitError as ReactNode) &&\n    typeof submitError !== 'string'\n  ) {\n    submitError = t('form.internalError', 'Internal error');\n  }\n\n  return (\n    <Alert ref={ref} theme=\"danger\" {...props}>\n      {submitError as ReactNode}\n    </Alert>\n  );\n}\n\n/**\n * An alert that shows a form error message received from the onSubmit callback.\n */\nconst _SubmitError = forwardRef(SubmitError);\n\n_SubmitError.displayName = 'SubmitError';\n\nexport { _SubmitError as SubmitError };\n"],"mappings":";;;;;;;;AAiBA,SAAS,YAAY,OAAuB,KAAmC;CAC7E,IAAI,EAAE,gBAAgB,WAAW,YAAY;CAC7C,MAAM,EAAE,MAAM,SAAS;AAEvB,KAAI,CAAC,YACH,QAAO;AAGT,KACE,CAAC,eAAe,YAAyB,IACzC,OAAO,gBAAgB,SAEvB,eAAc,EAAE,sBAAsB,iBAAiB;AAGzD,QACE,oBAAC;EAAW;EAAK,OAAM;EAAS,GAAI;YACjC;GACK;;;;;AAOZ,MAAM,eAAe,WAAW,YAAY;AAE5C,aAAa,cAAc"}
+{"version":3,"file":"SubmitError.js","names":[],"sources":["../../../../src/components/form/Form/SubmitError.tsx"],"sourcesContent":["import {\n  ForwardedRef,\n  forwardRef,\n  isValidElement,\n  ReactNode,\n  useContext,\n} from 'react';\n\nimport { useI18n } from '../../../i18n';\nimport { Alert, CubeAlertProps } from '../../content/Alert/index';\n\nimport { FormContext } from './Form';\nimport { ModernControllerContext } from './modern/context';\nimport { useFormSelector } from './modern/react';\n\nimport type { FormController } from './modern/controller';\n\ntype SubmitErrorContextProps = {\n  submitError?: unknown;\n};\n\nfunction ErrorAlert(\n  { submitError, ...props }: CubeAlertProps & SubmitErrorContextProps,\n  ref: ForwardedRef<HTMLDivElement>,\n) {\n  const { t } = useI18n();\n\n  if (!submitError) {\n    return null;\n  }\n\n  if (\n    !isValidElement(submitError as ReactNode) &&\n    typeof submitError !== 'string'\n  ) {\n    submitError = t('form.internalError', 'Internal error');\n  }\n\n  return (\n    <Alert ref={ref} theme=\"danger\" {...props}>\n      {submitError as ReactNode}\n    </Alert>\n  );\n}\n\nconst ForwardedErrorAlert = forwardRef(ErrorAlert);\n\nfunction ModernSubmitError({\n  form,\n  alertRef,\n  ...props\n}: CubeAlertProps & {\n  form: FormController<any>;\n  alertRef: ForwardedRef<HTMLDivElement>;\n}) {\n  const submitError = useFormSelector(form, (state) => state.submitError);\n  return (\n    <ForwardedErrorAlert {...props} ref={alertRef} submitError={submitError} />\n  );\n}\n\nfunction SubmitError(props: CubeAlertProps, ref: ForwardedRef<HTMLDivElement>) {\n  const modern = useContext(ModernControllerContext);\n  const legacy = useContext(FormContext) as SubmitErrorContextProps;\n  return modern ? (\n    <ModernSubmitError {...props} form={modern} alertRef={ref} />\n  ) : (\n    <ForwardedErrorAlert\n      {...props}\n      ref={ref}\n      submitError={legacy.submitError}\n    />\n  );\n}\n\n/**\n * An alert that shows a form error message received from the onSubmit callback.\n */\nconst _SubmitError = forwardRef(SubmitError);\n\n_SubmitError.displayName = 'SubmitError';\n\nexport { _SubmitError as SubmitError };\n"],"mappings":";;;;;;;;;;AAqBA,SAAS,WACP,EAAE,aAAa,GAAG,SAClB,KACA;CACA,MAAM,EAAE,MAAM,SAAS;AAEvB,KAAI,CAAC,YACH,QAAO;AAGT,KACE,CAAC,eAAe,YAAyB,IACzC,OAAO,gBAAgB,SAEvB,eAAc,EAAE,sBAAsB,iBAAiB;AAGzD,QACE,oBAAC;EAAW;EAAK,OAAM;EAAS,GAAI;YACjC;GACK;;AAIZ,MAAM,sBAAsB,WAAW,WAAW;AAElD,SAAS,kBAAkB,EACzB,MACA,UACA,GAAG,SAIF;CACD,MAAM,cAAc,gBAAgB,OAAO,UAAU,MAAM,YAAY;AACvE,QACE,oBAAC;EAAoB,GAAI;EAAO,KAAK;EAAuB;GAAe;;AAI/E,SAAS,YAAY,OAAuB,KAAmC;CAC7E,MAAM,SAAS,WAAW,wBAAwB;CAClD,MAAM,SAAS,WAAW,YAAY;AACtC,QAAO,SACL,oBAAC;EAAkB,GAAI;EAAO,MAAM;EAAQ,UAAU;GAAO,GAE7D,oBAAC;EACC,GAAI;EACC;EACL,aAAa,OAAO;GACpB;;;;;AAON,MAAM,eAAe,WAAW,YAAY;AAE5C,aAAa,cAAc"}

package/dist/components/form/Form/backend.d.ts

@@ -0,0 +1,25 @@
+
+import { FormController } from "./modern/controller.js";
+
+//#region src/components/form/Form/backend.d.ts
+/**
+ * Nominal branding for the two Form backends (modernization plan §5.1).
+ *
+ * The legacy engine (`CubeFormInstance`) and the modern controller are not
+ * structurally interchangeable: each carries this symbol with its backend
+ * kind, the `<Form>` facade dispatches on it before any backend hook runs, and
+ * the legacy field adapter refuses a controller it cannot bind.
+ *
+ * Modern controllers support creation, selectors, fields, validation, and submission.
+ * Legacy-only APIs reject them explicitly.
+ */
+declare const FORM_BACKEND: unique symbol;
+interface LegacyFormBrand {
+  readonly [FORM_BACKEND]: 'legacy';
+}
+interface ModernFormBrand {
+  readonly [FORM_BACKEND]: 'modern';
+}
+//#endregion
+export { FORM_BACKEND, LegacyFormBrand, ModernFormBrand };
+//# sourceMappingURL=backend.d.ts.map

package/dist/components/form/Form/backend.js

@@ -0,0 +1,30 @@
+/** @license MIT | @cube-dev/ui-kit v0.180.0 | Cube Dev Team */
+//#region src/components/form/Form/backend.ts
+/**
+* Nominal branding for the two Form backends (modernization plan §5.1).
+*
+* The legacy engine (`CubeFormInstance`) and the modern controller are not
+* structurally interchangeable: each carries this symbol with its backend
+* kind, the `<Form>` facade dispatches on it before any backend hook runs, and
+* the legacy field adapter refuses a controller it cannot bind.
+*
+* Modern controllers support creation, selectors, fields, validation, and submission.
+* Legacy-only APIs reject them explicitly.
+*/
+const FORM_BACKEND = Symbol.for("@cube-dev/ui-kit/form-backend");
+/**
+* Only a modern brand is ever checked. Anything else — a branded legacy
+* instance, but also an unbranded object — counts as legacy on purpose: Cloud
+* narrows form props to structural types and its tests pass plain mocks, and
+* the legacy engine has always accepted them.
+*/
+function isModernFormController(value) {
+	return !!value && typeof value === "object" && value[FORM_BACKEND] === "modern";
+}
+function modernBackendUnavailableError(receiver) {
+	return /* @__PURE__ */ new Error(`${receiver} received a modern form controller, but this legacy API does not support modern controllers. Use named inputs or useFieldProps with a modern controller; Form.Item and Form.useForm() remain legacy-only.`);
+}
+
+//#endregion
+export { FORM_BACKEND, isModernFormController, modernBackendUnavailableError };
+//# sourceMappingURL=backend.js.map

package/dist/components/form/Form/backend.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backend.js","names":[],"sources":["../../../../src/components/form/Form/backend.ts"],"sourcesContent":["/**\n * Nominal branding for the two Form backends (modernization plan §5.1).\n *\n * The legacy engine (`CubeFormInstance`) and the modern controller are not\n * structurally interchangeable: each carries this symbol with its backend\n * kind, the `<Form>` facade dispatches on it before any backend hook runs, and\n * the legacy field adapter refuses a controller it cannot bind.\n *\n * Modern controllers support creation, selectors, fields, validation, and submission.\n * Legacy-only APIs reject them explicitly.\n */\nexport const FORM_BACKEND: unique symbol = Symbol.for(\n  '@cube-dev/ui-kit/form-backend',\n);\n\nexport interface LegacyFormBrand {\n  readonly [FORM_BACKEND]: 'legacy';\n}\n\nexport interface ModernFormBrand {\n  readonly [FORM_BACKEND]: 'modern';\n}\n\nexport type { FormController } from './modern/controller';\n\n/**\n * Only a modern brand is ever checked. Anything else — a branded legacy\n * instance, but also an unbranded object — counts as legacy on purpose: Cloud\n * narrows form props to structural types and its tests pass plain mocks, and\n * the legacy engine has always accepted them.\n */\nexport function isModernFormController(\n  value: unknown,\n): value is ModernFormBrand {\n  return (\n    !!value &&\n    typeof value === 'object' &&\n    (value as Record<PropertyKey, unknown>)[FORM_BACKEND] === 'modern'\n  );\n}\n\nexport function modernBackendUnavailableError(receiver: string): Error {\n  return new Error(\n    `${receiver} received a modern form controller, but this legacy API does not support modern controllers. Use named inputs or useFieldProps with a modern controller; Form.Item and Form.useForm() remain legacy-only.`,\n  );\n}\n"],"mappings":";;;;;;;;;;;;;AAWA,MAAa,eAA8B,OAAO,IAChD,gCACD;;;;;;;AAkBD,SAAgB,uBACd,OAC0B;AAC1B,QACE,CAAC,CAAC,SACF,OAAO,UAAU,YAChB,MAAuC,kBAAkB;;AAI9D,SAAgB,8BAA8B,UAAyB;AACrE,wBAAO,IAAI,MACT,GAAG,SAAS,2MACb"}

package/dist/components/form/Form/index.d.ts

@@ -1,7 +1,13 @@
 
+import { FormPath } from "./modern/values.js";
+import { ModernValidationContext } from "./modern/validation.js";
 import { FieldTypes, Fields } from "./types.js";
+import { FormValueAtPath } from "./modern/path-types.js";
+import { FormChange, ModernSubmitContext, SetValueOptions } from "./modern/types.js";
+import { FormController, ModernFieldValidationResult, ModernFormState, ModernSubmitResult, ModernValidationResult, ModernValidationRule, UseFormControllerOptions } from "./modern/controller.js";
 import { CubeFormInstance, useForm } from "./use-form.js";
-import { CubeFormProps, FormContext, useFormProps } from "./Form.js";
+import { ModernFormProps } from "./ModernFormRoot.js";
+import { CubeFormProps, FormContext, FormRootComponent, FormScopeMask, useFormProps } from "./Form.js";
 import { CubeSubmitButtonProps, _SubmitButton } from "./SubmitButton/SubmitButton.js";
 import "./SubmitButton/index.js";
 import { CubeResetButtonProps, _ResetButton } from "./ResetButton/ResetButton.js";
@@ -9,6 +15,8 @@ import "./ResetButton/index.js";
 import { CubeAlertProps } from "../../content/Alert/types.js";
 import "../../content/Alert/index.js";
 import { Field } from "./Field.js";
+import { useFormControllerContext } from "./modern/context.js";
+import { FormSelectorOptions, FormSubscribe, FormSubscribeProps, useFormController, useFormSelector } from "./modern/react.js";
 import { _SubmitError } from "./SubmitError.js";
 import { FieldReturnValue, UseFieldProps } from "./use-field/types.js";
 import { UseFieldParams, useField } from "./use-field/use-field.js";
@@ -18,17 +26,23 @@ import * as react from "react";
 import * as _react_types_shared0 from "@react-types/shared";
 
 //#region src/components/form/Form/index.d.ts
-declare const Form: (<T extends FieldTypes>(props: CubeFormProps<T> & {
-  ref?: react.Ref<HTMLFormElement>;
-}) => react.ReactElement) & {
+declare const Form: FormRootComponent & {
   Item: typeof Field;
   SubmitError: typeof _SubmitError;
   Submit: typeof _SubmitButton;
   Reset: typeof _ResetButton;
   useForm: typeof useForm;
+  useController: typeof useFormController;
+  useSelector: typeof useFormSelector;
+  Subscribe: typeof FormSubscribe;
+  useControllerContext: typeof useFormControllerContext;
 } & {
   Item: typeof Field;
   useForm: typeof useForm;
+  useController: typeof useFormController;
+  useSelector: typeof useFormSelector;
+  Subscribe: typeof FormSubscribe;
+  useControllerContext: typeof useFormControllerContext;
   Submit: react.ForwardRefExoticComponent<Omit<CubeSubmitButtonProps<FieldTypes>, "ref"> & react.RefAttributes<_react_types_shared0.FocusableRefValue<HTMLElement, HTMLElement>>>;
   Reset: react.ForwardRefExoticComponent<Omit<CubeResetButtonProps<FieldTypes>, "ref"> & react.RefAttributes<_react_types_shared0.FocusableRefValue<HTMLElement, HTMLElement>>>;
   SubmitError: react.ForwardRefExoticComponent<CubeAlertProps & react.RefAttributes<HTMLDivElement>>;

package/dist/components/form/Form/index.js

@@ -1,9 +1,11 @@
-/** @license MIT | @cube-dev/ui-kit v0.179.0 | Cube Dev Team */
+/** @license MIT | @cube-dev/ui-kit v0.180.0 | Cube Dev Team */
+import { useFormControllerContext } from "./modern/context.js";
 import { useForm } from "./use-form.js";
-import { FormContext, _Form, useFormProps } from "./Form.js";
+import { FormContext, FormScopeMask, _Form, useFormProps } from "./Form.js";
 import { useField } from "./use-field/use-field.js";
 import { useFieldProps } from "./use-field/use-field-props.js";
 import { Field } from "./Field.js";
+import { FormSubscribe, useFormController, useFormSelector } from "./modern/react.js";
 import { _ResetButton } from "./ResetButton/ResetButton.js";
 import { _SubmitButton } from "./SubmitButton/SubmitButton.js";
 import { _SubmitError } from "./SubmitError.js";
@@ -12,6 +14,10 @@ import { _SubmitError } from "./SubmitError.js";
 const Form = Object.assign(_Form, {
 	Item: Field,
 	useForm,
+	useController: useFormController,
+	useSelector: useFormSelector,
+	Subscribe: FormSubscribe,
+	useControllerContext: useFormControllerContext,
 	Submit: _SubmitButton,
 	Reset: _ResetButton,
 	SubmitError: _SubmitError

package/dist/components/form/Form/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["SubmitButton","ResetButton"],"sources":["../../../../src/components/form/Form/index.ts"],"sourcesContent":["import { CubeAlertProps } from '../../content/Alert/index';\n\nimport { Field } from './Field';\nimport { Form as _Form, FormContext, useFormProps } from './Form';\nimport { ResetButton } from './ResetButton';\nimport { SubmitButton } from './SubmitButton';\nimport { SubmitError } from './SubmitError';\nimport { useForm } from './use-form';\n\nconst Form = Object.assign(\n  _Form as typeof _Form & {\n    Item: typeof Field;\n    SubmitError: typeof SubmitError;\n    Submit: typeof SubmitButton;\n    Reset: typeof ResetButton;\n    useForm: typeof useForm;\n  },\n  {\n    Item: Field,\n    useForm,\n    Submit: SubmitButton,\n    Reset: ResetButton,\n    SubmitError,\n  },\n);\n\nexport * from './SubmitError';\nexport * from './SubmitButton';\nexport * from './ResetButton';\nexport * from './use-field';\nexport { useFormProps, Form, Field, useForm, FormContext };\nexport type { CubeFormProps } from './Form';\nexport type { CubeFormInstance } from './use-form';\nexport type { FieldTypes, Fields } from './types';\nexport type { CubeAlertProps as CubeSubmitErrorProps };\n"],"mappings":";;;;;;;;;;;AASA,MAAM,OAAO,OAAO,OAClB,OAOA;CACE,MAAM;CACN;CACA,QAAQA;CACR,OAAOC;CACP;CACD,CACF"}
+{"version":3,"file":"index.js","names":["SubmitButton","ResetButton"],"sources":["../../../../src/components/form/Form/index.ts"],"sourcesContent":["import { CubeAlertProps } from '../../content/Alert/index';\n\nimport { Field } from './Field';\nimport {\n  Form as _Form,\n  FormContext,\n  FormScopeMask,\n  useFormProps,\n} from './Form';\nimport { useFormControllerContext } from './modern/context';\nimport {\n  FormSubscribe,\n  useFormController,\n  useFormSelector,\n} from './modern/react';\nimport { ResetButton } from './ResetButton';\nimport { SubmitButton } from './SubmitButton';\nimport { SubmitError } from './SubmitError';\nimport { useForm } from './use-form';\n\nconst Form = Object.assign(\n  _Form as typeof _Form & {\n    Item: typeof Field;\n    SubmitError: typeof SubmitError;\n    Submit: typeof SubmitButton;\n    Reset: typeof ResetButton;\n    useForm: typeof useForm;\n    useController: typeof useFormController;\n    useSelector: typeof useFormSelector;\n    Subscribe: typeof FormSubscribe;\n    useControllerContext: typeof useFormControllerContext;\n  },\n  {\n    Item: Field,\n    useForm,\n    useController: useFormController,\n    useSelector: useFormSelector,\n    Subscribe: FormSubscribe,\n    useControllerContext: useFormControllerContext,\n    Submit: SubmitButton,\n    Reset: ResetButton,\n    SubmitError,\n  },\n);\n\nexport * from './SubmitError';\nexport * from './SubmitButton';\nexport * from './ResetButton';\nexport * from './use-field';\nexport { useFormProps, Form, Field, useForm, FormContext, FormScopeMask };\nexport type { CubeFormProps } from './Form';\nexport type { ModernFormProps } from './ModernFormRoot';\nexport type {\n  FormController,\n  ModernFormState,\n  UseFormControllerOptions,\n  ModernValidationRule,\n  ModernValidationResult,\n  ModernFieldValidationResult,\n  ModernSubmitResult,\n} from './modern/controller';\nexport type { FormSelectorOptions, FormSubscribeProps } from './modern/react';\nexport type {\n  FormChange,\n  SetValueOptions,\n  ModernSubmitContext,\n} from './modern/types';\nexport type { ModernValidationContext } from './modern/validation';\nexport type { FormPath } from './modern/values';\nexport type { FormValueAtPath } from './modern/path-types';\nexport type { CubeFormInstance } from './use-form';\nexport type { FieldTypes, Fields } from './types';\nexport type { CubeAlertProps as CubeSubmitErrorProps };\n"],"mappings":";;;;;;;;;;;;;AAoBA,MAAM,OAAO,OAAO,OAClB,OAWA;CACE,MAAM;CACN;CACA,eAAe;CACf,aAAa;CACb,WAAW;CACX,sBAAsB;CACtB,QAAQA;CACR,OAAOC;CACP;CACD,CACF"}

package/dist/components/form/Form/modern/actions.js

@@ -0,0 +1,41 @@
+/** @license MIT | @cube-dev/ui-kit v0.180.0 | Cube Dev Team */
+import { useEvent } from "../../../../_internal/hooks/use-event.js";
+import { useProviderProps } from "../../../../provider.js";
+import { Button } from "../../../actions/Button/Button.js";
+import { useFormSelector } from "./react.js";
+import { jsx } from "react/jsx-runtime";
+
+//#region src/components/form/Form/modern/actions.tsx
+function ModernSubmitButton({ form, buttonRef, ...props }) {
+	const { isDisabled: contextDisabled } = useProviderProps({});
+	const submitting = useFormSelector(form, (state) => state.isSubmitting);
+	const invalid = useFormSelector(form, (state) => state.isInvalid);
+	return /* @__PURE__ */ jsx(Button, {
+		ref: buttonRef,
+		type: "primary",
+		htmlType: "submit",
+		isLoading: submitting,
+		...props,
+		isDisabled: contextDisabled || props.isDisabled || submitting || invalid
+	});
+}
+function ModernResetButton({ form, buttonRef, onPress, ...props }) {
+	const { isDisabled: contextDisabled } = useProviderProps({});
+	const disabled = useFormSelector(form, (state) => state.isSubmitting || !state.isTouched);
+	const reset = useEvent((event) => {
+		form.reset();
+		onPress?.(event);
+	});
+	return /* @__PURE__ */ jsx(Button, {
+		ref: buttonRef,
+		type: "primary",
+		htmlType: "button",
+		...props,
+		onPress: reset,
+		isDisabled: contextDisabled || props.isDisabled || disabled
+	});
+}
+
+//#endregion
+export { ModernResetButton, ModernSubmitButton };
+//# sourceMappingURL=actions.js.map

package/dist/components/form/Form/modern/actions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"actions.js","names":[],"sources":["../../../../../src/components/form/Form/modern/actions.tsx"],"sourcesContent":["import { useEvent } from '../../../../_internal/hooks/use-event';\nimport { useProviderProps } from '../../../../provider';\nimport { Button } from '../../../actions/Button/Button';\n\nimport { useFormSelector } from './react';\n\nimport type { FocusableRef } from '@react-types/shared';\nimport type { CubeButtonProps } from '../../../actions/Button/Button';\nimport type { FormController } from './controller';\n\nexport function ModernSubmitButton({\n  form,\n  buttonRef,\n  ...props\n}: CubeButtonProps & {\n  form: FormController<any>;\n  buttonRef: FocusableRef<HTMLElement>;\n}) {\n  const { isDisabled: contextDisabled } = useProviderProps(\n    {} as CubeButtonProps,\n  );\n  const submitting = useFormSelector(form, (state) => state.isSubmitting);\n  const invalid = useFormSelector(form, (state) => state.isInvalid);\n  return (\n    <Button\n      ref={buttonRef}\n      type=\"primary\"\n      htmlType=\"submit\"\n      isLoading={submitting}\n      {...props}\n      isDisabled={contextDisabled || props.isDisabled || submitting || invalid}\n    />\n  );\n}\n\nexport function ModernResetButton({\n  form,\n  buttonRef,\n  onPress,\n  ...props\n}: CubeButtonProps & {\n  form: FormController<any>;\n  buttonRef: FocusableRef<HTMLElement>;\n}) {\n  const { isDisabled: contextDisabled } = useProviderProps(\n    {} as CubeButtonProps,\n  );\n  const disabled = useFormSelector(\n    form,\n    (state) => state.isSubmitting || !state.isTouched,\n  );\n  const reset = useEvent((event) => {\n    form.reset();\n    onPress?.(event);\n  });\n  return (\n    <Button\n      ref={buttonRef}\n      type=\"primary\"\n      htmlType=\"button\"\n      {...props}\n      onPress={reset}\n      isDisabled={contextDisabled || props.isDisabled || disabled}\n    />\n  );\n}\n"],"mappings":";;;;;;;;AAUA,SAAgB,mBAAmB,EACjC,MACA,WACA,GAAG,SAIF;CACD,MAAM,EAAE,YAAY,oBAAoB,iBACtC,EAAE,CACH;CACD,MAAM,aAAa,gBAAgB,OAAO,UAAU,MAAM,aAAa;CACvE,MAAM,UAAU,gBAAgB,OAAO,UAAU,MAAM,UAAU;AACjE,QACE,oBAAC;EACC,KAAK;EACL,MAAK;EACL,UAAS;EACT,WAAW;EACX,GAAI;EACJ,YAAY,mBAAmB,MAAM,cAAc,cAAc;GACjE;;AAIN,SAAgB,kBAAkB,EAChC,MACA,WACA,SACA,GAAG,SAIF;CACD,MAAM,EAAE,YAAY,oBAAoB,iBACtC,EAAE,CACH;CACD,MAAM,WAAW,gBACf,OACC,UAAU,MAAM,gBAAgB,CAAC,MAAM,UACzC;CACD,MAAM,QAAQ,UAAU,UAAU;AAChC,OAAK,OAAO;AACZ,YAAU,MAAM;GAChB;AACF,QACE,oBAAC;EACC,KAAK;EACL,MAAK;EACL,UAAS;EACT,GAAI;EACJ,SAAS;EACT,YAAY,mBAAmB,MAAM,cAAc;GACnD"}

package/dist/components/form/Form/modern/context.d.ts

@@ -0,0 +1,9 @@
+
+import { FormController } from "./controller.js";
+import "react";
+
+//#region src/components/form/Form/modern/context.d.ts
+declare function useFormControllerContext<T extends object = Record<string, unknown>>(): FormController<T>;
+//#endregion
+export { useFormControllerContext };
+//# sourceMappingURL=context.d.ts.map

package/dist/components/form/Form/modern/context.js

@@ -0,0 +1,14 @@
+/** @license MIT | @cube-dev/ui-kit v0.180.0 | Cube Dev Team */
+import { createContext, useContext } from "react";
+
+//#region src/components/form/Form/modern/context.ts
+const ModernControllerContext = createContext(null);
+function useFormControllerContext() {
+	const controller = useContext(ModernControllerContext);
+	if (!controller) throw new Error("Form.useControllerContext() requires a modern <Form> root. Legacy forms and FormScopeMask do not provide a modern controller.");
+	return controller;
+}
+
+//#endregion
+export { ModernControllerContext, useFormControllerContext };
+//# sourceMappingURL=context.js.map

package/dist/components/form/Form/modern/context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context.js","names":[],"sources":["../../../../../src/components/form/Form/modern/context.ts"],"sourcesContent":["import { createContext, useContext } from 'react';\n\nimport type { FormController } from './controller';\n\nexport const ModernControllerContext =\n  createContext<FormController<any> | null>(null);\n\nexport function useFormControllerContext<\n  T extends object = Record<string, unknown>,\n>(): FormController<T> {\n  const controller = useContext(ModernControllerContext);\n  if (!controller) {\n    throw new Error(\n      'Form.useControllerContext() requires a modern <Form> root. Legacy forms and FormScopeMask do not provide a modern controller.',\n    );\n  }\n  return controller;\n}\n"],"mappings":";;;;AAIA,MAAa,0BACX,cAA0C,KAAK;AAEjD,SAAgB,2BAEO;CACrB,MAAM,aAAa,WAAW,wBAAwB;AACtD,KAAI,CAAC,WACH,OAAM,IAAI,MACR,gIACD;AAEH,QAAO"}

package/dist/components/form/Form/modern/controller.d.ts

@@ -0,0 +1,23 @@
+
+import { FormPath } from "./values.js";
+import { ModernValidationRule as ModernValidationRule$1 } from "./validation.js";
+import { FormValueAtPath } from "./path-types.js";
+import { FormState, FormStore, FormStoreOptions, ModernFieldValidationResult as ModernFieldValidationResult$1, ModernSubmitResult as ModernSubmitResult$1, ModernValidationResult as ModernValidationResult$1, SetValueOptions } from "./types.js";
+import { FORM_BACKEND } from "../backend.js";
+import { ReactNode } from "react";
+
+//#region src/components/form/Form/modern/controller.d.ts
+type ModernValidationRule = ModernValidationRule$1<ReactNode>;
+type ModernValidationResult = ModernValidationResult$1<ReactNode>;
+type ModernFieldValidationResult = ModernFieldValidationResult$1<ReactNode>;
+type ModernSubmitResult = ModernSubmitResult$1<ReactNode>;
+type ModernFormState<T extends object = Record<string, unknown>> = FormState<T, ReactNode>;
+type UseFormControllerOptions<T extends object = Record<string, unknown>> = FormStoreOptions<T>;
+/** Public commands; registration and pipeline state tokens stay internal. */
+type FormController<T extends object = Record<string, unknown>> = Readonly<Pick<FormStore<T, ReactNode>, typeof FORM_BACKEND | 'validate' | 'submit' | 'blur' | 'getSnapshot' | 'getFieldSnapshot' | 'getValues' | 'getActiveValues' | 'subscribe' | 'setValues' | 'batch' | 'setDefaultValues' | 'adoptDefaultValues' | 'reset' | 'touch' | 'setFieldErrors' | 'clearFieldErrors' | 'setSubmitError' | 'clearSubmitError'> & {
+  getValue<const Path extends FormPath>(path: Path): FormValueAtPath<T, Path> | undefined;
+  setValue<const Path extends FormPath>(path: Path, value: FormValueAtPath<T, NoInfer<Path>> | undefined, options?: SetValueOptions): void;
+}>;
+//#endregion
+export { FormController, ModernFieldValidationResult, ModernFormState, ModernSubmitResult, ModernValidationResult, ModernValidationRule, UseFormControllerOptions };
+//# sourceMappingURL=controller.d.ts.map