@qredence/fleet 0.6.1 → 0.6.3

package/dist/web/server/{chunk-5UCAJBAH.js → chunk-5RTGRTPD.js}

@@ -1,32 +1,34 @@
-import {
-  activeElement,
-  ownerDocument
-} from "./chunk-WNCAL4HN.js";
 import {
   useControlled
-} from "./chunk-S3PQ6HKH.js";
+} from "./chunk-OVJYUWSQ.js";
+import {
+  activeElement,
+  ownerDocument,
+  useTimeout
+} from "./chunk-HQ5TEXHT.js";
 import {
   useBaseUiId
-} from "./chunk-MNBGB2SP.js";
+} from "./chunk-E5HALE4M.js";
 import {
   EMPTY_OBJECT,
   NOOP,
   createChangeEventDetails,
   formatErrorMessage,
-  isElement,
   none,
   useIsoLayoutEffect,
   useRefWithInit,
   useRenderElement,
   useStableCallback
-} from "./chunk-XIB6XNUX.js";
+} from "./chunk-XJ6TGSUB.js";
 import {
   cn
-} from "./chunk-DJMHPJBP.js";
+} from "./chunk-CHEC7TWB.js";
 
-// web/app/dist/server/assets/input-D7s_8uNk.js
+// web/app/dist/server/assets/input-DDk_UbLl.js
 import * as React$1 from "react";
 import { jsx } from "react/jsx-runtime";
+var valid = "data-valid";
+var invalid = "data-invalid";
 var DEFAULT_VALIDITY_STATE = {
   badInput: false,
   customError: false,
@@ -50,8 +52,8 @@ var DEFAULT_FIELD_ROOT_STATE = {
 };
 var fieldValidityMapping = { valid(value) {
   if (value === null) return null;
-  if (value) return { "data-valid": "" };
-  return { "data-invalid": "" };
+  if (value) return { [valid]: "" };
+  return { [invalid]: "" };
 } };
 var DEFAULT_FIELD_ROOT_CONTEXT = {
   invalid: void 0,
@@ -126,6 +128,7 @@ function useRegisterFieldControl(controlRef, id, value, getFormValueOverride, en
 var LabelableContext = /* @__PURE__ */ React$1.createContext({
   controlId: void 0,
   registerControlId: NOOP,
+  resetControlId: NOOP,
   labelId: void 0,
   setLabelId: NOOP,
   messageIds: [],
@@ -136,31 +139,29 @@ function useLabelableContext() {
   return React$1.useContext(LabelableContext);
 }
 function useLabelableId(params = {}) {
-  const { id, implicit = false, controlRef } = params;
-  const { controlId, registerControlId } = useLabelableContext();
-  const defaultId = useBaseUiId(id);
-  const controlIdForEffect = implicit ? controlId : void 0;
+  const { id, enabled = true } = params;
+  const { controlId, registerControlId, resetControlId } = useLabelableContext();
+  const defaultId = useBaseUiId();
   const controlSourceRef = useRefWithInit(() => /* @__PURE__ */ Symbol());
   const hasRegisteredRef = React$1.useRef(false);
-  const hadExplicitIdRef = React$1.useRef(id != null);
+  const hadExplicitIdRef = React$1.useRef(false);
   const unregisterControlId = useStableCallback(() => {
     if (!hasRegisteredRef.current || registerControlId === NOOP) return;
     hasRegisteredRef.current = false;
     registerControlId(controlSourceRef.current, void 0);
   });
   useIsoLayoutEffect(() => {
-    if (registerControlId === NOOP) return;
+    if (!enabled || registerControlId === NOOP) {
+      unregisterControlId();
+      return;
+    }
     let nextId;
-    if (implicit) {
-      const elem = controlRef?.current;
-      if (isElement(elem) && elem.closest("label") != null) nextId = id ?? null;
-      else nextId = controlIdForEffect ?? defaultId;
-    } else if (id != null) {
+    if (id !== void 0) {
       hadExplicitIdRef.current = true;
       nextId = id;
     } else if (hadExplicitIdRef.current) nextId = defaultId;
     else {
-      unregisterControlId();
+      resetControlId();
       return;
     }
     if (nextId === void 0) {
@@ -171,18 +172,17 @@ function useLabelableId(params = {}) {
     registerControlId(controlSourceRef.current, nextId);
   }, [
     id,
-    controlRef,
-    controlIdForEffect,
+    enabled,
     registerControlId,
-    implicit,
+    resetControlId,
     defaultId,
     controlSourceRef,
     unregisterControlId
   ]);
-  React$1.useEffect(() => {
+  useIsoLayoutEffect(() => {
     return unregisterControlId;
   }, [unregisterControlId]);
-  return controlId ?? defaultId;
+  return (enabled ? controlId : void 0) ?? id ?? defaultId;
 }
 var FormContext = /* @__PURE__ */ React$1.createContext({
   elementRef: { current: null },
@@ -190,15 +190,23 @@ var FormContext = /* @__PURE__ */ React$1.createContext({
   errors: {},
   clearErrors: NOOP,
   validationMode: "onSubmit",
-  submitAttemptedRef: { current: false }
+  submitCountRef: { current: 0 }
 });
 function useFormContext() {
   return React$1.useContext(FormContext);
 }
+function useValueChanged(value, onChange) {
+  const valueRef = React$1.useRef(value);
+  const onChangeCallback = useStableCallback(onChange);
+  useIsoLayoutEffect(() => {
+    if (valueRef.current !== value) onChangeCallback(valueRef.current);
+    valueRef.current = value;
+  }, [value, onChangeCallback]);
+}
 var FieldControl = /* @__PURE__ */ React$1.forwardRef(function FieldControl2(componentProps, forwardedRef) {
   const { render, className, id: idProp, name: nameProp, value: valueProp, disabled: disabledProp = false, onValueChange, defaultValue, autoFocus = false, style, ...elementProps } = componentProps;
   const { state: fieldState, name: fieldName, disabled: fieldDisabled, setTouched, setDirty, validityData, setFocused, setFilled, validationMode, validation } = useFieldRootContext();
-  const { clearErrors } = useFormContext();
+  const { clearErrors, elementRef: formElementRef, submitCountRef } = useFormContext();
   const disabled = fieldDisabled || disabledProp;
   const name = fieldName ?? nameProp;
   const state = {
@@ -207,19 +215,6 @@ var FieldControl = /* @__PURE__ */ React$1.forwardRef(function FieldControl2(com
   };
   const { labelId } = useLabelableContext();
   const id = useLabelableId({ id: idProp });
-  useIsoLayoutEffect(() => {
-    const hasExternalValue = valueProp != null;
-    if (validation.inputRef.current?.value || hasExternalValue && valueProp !== "") setFilled(true);
-    else if (hasExternalValue && valueProp === "") setFilled(false);
-  }, [
-    validation.inputRef,
-    setFilled,
-    valueProp
-  ]);
-  const inputRef = React$1.useRef(null);
-  useIsoLayoutEffect(() => {
-    if (autoFocus && inputRef.current === activeElement(ownerDocument(inputRef.current))) setFocused(true);
-  }, [autoFocus, setFocused]);
   const [valueUnwrapped] = useControlled({
     controlled: valueProp,
     default: defaultValue,
@@ -228,8 +223,28 @@ var FieldControl = /* @__PURE__ */ React$1.forwardRef(function FieldControl2(com
   });
   const isControlled = valueProp !== void 0;
   const value = isControlled ? valueUnwrapped : void 0;
+  const serializedValue = value == null ? void 0 : String(value);
   const getValueFromInput = useStableCallback(() => validation.inputRef.current?.value);
-  useRegisterFieldControl(validation.inputRef, id, value, getValueFromInput, !disabled, nameProp);
+  useRegisterFieldControl(validation.inputRef, id, serializedValue, getValueFromInput, !disabled, nameProp);
+  useIsoLayoutEffect(() => {
+    const currentValue = serializedValue ?? validation.inputRef.current?.value;
+    if (currentValue !== void 0) setFilled(currentValue !== "");
+  }, [
+    serializedValue,
+    validation.inputRef,
+    setFilled
+  ]);
+  useValueChanged(serializedValue, () => {
+    if (serializedValue === void 0) return;
+    clearErrors(name);
+    setDirty(serializedValue !== (validityData.initialValue ?? ""));
+    validation.change(serializedValue);
+  });
+  const inputRef = React$1.useRef(null);
+  const enterValidationTimeout = useTimeout();
+  useIsoLayoutEffect(() => {
+    if (autoFocus && inputRef.current === activeElement(ownerDocument(inputRef.current))) setFocused(true);
+  }, [autoFocus, setFocused]);
   return useRenderElement("input", componentProps, {
     ref: [forwardedRef, inputRef],
     state,
@@ -244,10 +259,12 @@ var FieldControl = /* @__PURE__ */ React$1.forwardRef(function FieldControl2(com
         ...isControlled ? { value } : { defaultValue },
         onChange(event) {
           const inputValue = event.currentTarget.value;
-          onValueChange?.(inputValue, createChangeEventDetails(none, event.nativeEvent));
+          const details = createChangeEventDetails(none, event.nativeEvent);
+          onValueChange?.(inputValue, details);
+          if (isControlled) return;
           setDirty(inputValue !== (validityData.initialValue ?? ""));
           setFilled(inputValue !== "");
-          if (!event.nativeEvent.defaultPrevented) {
+          if (!event.nativeEvent.defaultPrevented && !details.isCanceled) {
             clearErrors(name);
             validation.change(inputValue);
           }
@@ -258,12 +275,27 @@ var FieldControl = /* @__PURE__ */ React$1.forwardRef(function FieldControl2(com
         onBlur(event) {
           setTouched(true);
           setFocused(false);
-          if (validationMode === "onBlur") validation.commit(event.currentTarget.value);
+          if (validationMode === "onBlur") {
+            const inputValue = event.currentTarget.value;
+            validation.commit(inputValue);
+            if (isControlled) queueMicrotask(() => {
+              const nextValue = validation.inputRef.current?.value;
+              if (nextValue !== void 0 && nextValue !== inputValue && nextValue !== (validityData.initialValue ?? "")) validation.commit(nextValue);
+            });
+          }
         },
         onKeyDown(event) {
           if (event.currentTarget.tagName === "INPUT" && event.key === "Enter") {
             setTouched(true);
-            validation.commit(event.currentTarget.value);
+            const value2 = event.currentTarget.value;
+            const form = event.currentTarget.form;
+            if (form && form === formElementRef.current && !event.defaultPrevented) {
+              const input = event.currentTarget;
+              const submitCount = submitCountRef.current;
+              enterValidationTimeout.start(0, () => {
+                if (submitCountRef.current === submitCount) validation.commit(input.value);
+              });
+            } else validation.commit(value2);
           }
         }
       },
@@ -295,5 +327,6 @@ export {
   useLabelableContext,
   useLabelableId,
   useFormContext,
+  useValueChanged,
   Input2 as Input
 };