@uniform-ts/core 0.0.6 → 0.0.8

package/dist/index.js

@@ -657,6 +657,24 @@ function SelectField({
     }
   );
 }
+function useConditionalFields(fields, control, scopeName) {
+  const allValues = reactHookForm.useWatch({ control });
+  const scopedValues = reactHookForm.useWatch({ control, name: scopeName });
+  const values = scopeName ? scopedValues : allValues;
+  return React3.useMemo(() => {
+    return fields.filter((field) => {
+      if (field.meta.hidden) return false;
+      if (typeof field.meta.condition === "function") {
+        return field.meta.condition(values);
+      }
+      return true;
+    }).sort((a, b) => {
+      const orderA = typeof a.meta.order === "number" ? a.meta.order : Infinity;
+      const orderB = typeof b.meta.order === "number" ? b.meta.order : Infinity;
+      return orderA - orderB;
+    });
+  }, [fields, values]);
+}
 function ObjectField({
   field,
   control,
@@ -665,7 +683,7 @@ function ObjectField({
   shouldUnregister
 }) {
   const { classNames, layout } = useAutoFormContext();
-  const children = field.children;
+  const children = useConditionalFields(field.children, control, namePrefix);
   const content = children.map((child, idx) => /* @__PURE__ */ jsxRuntime.jsx(
     FieldRenderer,
     {
@@ -720,7 +738,7 @@ function getDefaultValue(field) {
       return void 0;
   }
 }
-function getRowSummary(row, itemConfig, index) {
+function getRowSummary(row, itemConfig, index, itemSummary) {
   if (itemConfig.type === "object") {
     for (const child of itemConfig.children) {
       const key = child.name.split(".").pop() ?? child.name;
@@ -730,7 +748,7 @@ function getRowSummary(row, itemConfig, index) {
       }
     }
   }
-  return `Item ${index + 1}`;
+  return itemSummary?.(index) ?? `Item ${index + 1}`;
 }
 function ArrayField({ field, control, effectiveName }) {
   const { classNames, layout, labels } = useAutoFormContext();
@@ -781,13 +799,13 @@ function ArrayField({ field, control, effectiveName }) {
   const RowLayout = layout.arrayRowLayout;
   const renderedRows = rows.map((row, index) => {
     const isCollapsed = showCollapse && collapsed.has(index);
-    const collapseButton = showCollapse ? /* @__PURE__ */ jsxRuntime.jsxs(
+    const collapseButton = showCollapse && CollapseBtn ? /* @__PURE__ */ jsxRuntime.jsxs(
       CollapseBtn,
       {
         type: "button",
         className: classNames.arrayCollapse,
         onClick: () => toggleCollapse(index),
-        "aria-label": isCollapsed ? `Expand item ${index + 1}` : `Collapse item ${index + 1}`,
+        "aria-label": isCollapsed ? labels.arrayAriaExpand?.(index) ?? `Expand item ${index + 1}` : labels.arrayAriaCollapse?.(index) ?? `Collapse item ${index + 1}`,
         isCollapsed,
         children: [
           isCollapsed ? labels.arrayExpand ?? "\u25BC" : labels.arrayCollapse ?? "\u25B6",
@@ -805,29 +823,29 @@ function ArrayField({ field, control, effectiveName }) {
         ]
       }
     ) : null;
-    const moveUpButton = showMove && rows.length > 1 ? /* @__PURE__ */ jsxRuntime.jsx(
+    const moveUpButton = showMove && rows.length > 1 && MoveUpBtn ? /* @__PURE__ */ jsxRuntime.jsx(
       MoveUpBtn,
       {
         type: "button",
         className: classNames.arrayMove,
         onClick: () => move(index, index - 1),
         disabled: index === 0,
-        "aria-label": `Move item ${index + 1} up`,
+        "aria-label": labels.arrayAriaMoveUp?.(index) ?? `Move item ${index + 1} up`,
         children: labels.arrayMoveUp ?? "\u2191"
       }
     ) : null;
-    const moveDownButton = showMove && rows.length > 1 ? /* @__PURE__ */ jsxRuntime.jsx(
+    const moveDownButton = showMove && rows.length > 1 && MoveDownBtn ? /* @__PURE__ */ jsxRuntime.jsx(
       MoveDownBtn,
       {
         type: "button",
         className: classNames.arrayMove,
         onClick: () => move(index, index + 1),
         disabled: index === rows.length - 1,
-        "aria-label": `Move item ${index + 1} down`,
+        "aria-label": labels.arrayAriaMoveDown?.(index) ?? `Move item ${index + 1} down`,
         children: labels.arrayMoveDown ?? "\u2193"
       }
     ) : null;
-    const duplicateButton = showDuplicate && !atMax ? /* @__PURE__ */ jsxRuntime.jsx(
+    const duplicateButton = showDuplicate && !atMax && DuplicateBtn ? /* @__PURE__ */ jsxRuntime.jsx(
       DuplicateBtn,
       {
         type: "button",
@@ -838,21 +856,21 @@ function ArrayField({ field, control, effectiveName }) {
           );
           insert(index + 1, values);
         },
-        "aria-label": `Duplicate item ${index + 1}`,
+        "aria-label": labels.arrayAriaDuplicate?.(index) ?? `Duplicate item ${index + 1}`,
         children: labels.arrayDuplicate ?? "Duplicate"
       }
     ) : null;
-    const removeButton = /* @__PURE__ */ jsxRuntime.jsx(
+    const removeButton = RemoveBtn ? /* @__PURE__ */ jsxRuntime.jsx(
       RemoveBtn,
       {
         type: "button",
         className: classNames.arrayRemove,
         onClick: () => remove(index),
         disabled: atMin,
-        "aria-label": `Remove item ${index + 1}`,
+        "aria-label": labels.arrayAriaRemove?.(index) ?? `Remove item ${index + 1}`,
         children: labels.arrayRemove ?? "Remove"
       }
-    );
+    ) : null;
     const fieldContent = !isCollapsed ? /* @__PURE__ */ jsxRuntime.jsx(
       FieldRenderer,
       {
@@ -878,7 +896,7 @@ function ArrayField({ field, control, effectiveName }) {
       row.id
     );
   });
-  const addButton = /* @__PURE__ */ jsxRuntime.jsx(
+  const addButton = AddBtn ? /* @__PURE__ */ jsxRuntime.jsx(
     AddBtn,
     {
       type: "button",
@@ -887,7 +905,7 @@ function ArrayField({ field, control, effectiveName }) {
       onClick: () => append(getDefaultValue(itemConfig)),
       children: labels.arrayAdd ?? "Add"
     }
-  );
+  ) : null;
   const content = /* @__PURE__ */ jsxRuntime.jsx(
     ArrayFieldLayout,
     {
@@ -918,13 +936,22 @@ function CollapseSummary({
   itemConfig,
   isCollapsed
 }) {
+  const { labels } = useAutoFormContext();
+  const fallback = labels.arrayItemSummary?.(index) ?? `Item ${index + 1}`;
   const rowValues = reactHookForm.useWatch({ control, name: `${effectiveName}.${index}` });
   const summary = React3.useMemo(() => {
-    if (!isCollapsed) return `Item ${index + 1}`;
-    if (!rowValues) return `Item ${index + 1}`;
-    return getRowSummary(rowValues, itemConfig, index);
-  }, [isCollapsed, rowValues, itemConfig, index]);
-  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: isCollapsed ? summary : `Item ${index + 1}` });
+    if (!isCollapsed) return fallback;
+    if (!rowValues) return fallback;
+    return getRowSummary(rowValues, itemConfig, index, labels.arrayItemSummary);
+  }, [
+    isCollapsed,
+    rowValues,
+    itemConfig,
+    index,
+    fallback,
+    labels.arrayItemSummary
+  ]);
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: isCollapsed ? summary : fallback });
 }
 function getEffectiveName(field, namePrefix) {
   if (!namePrefix) return field.name;
@@ -1040,22 +1067,6 @@ function FieldRenderer({
     }
   );
 }
-function useConditionalFields(fields, control) {
-  const values = reactHookForm.useWatch({ control });
-  return React3.useMemo(() => {
-    return fields.filter((field) => {
-      if (field.meta.hidden) return false;
-      if (typeof field.meta.condition === "function") {
-        return field.meta.condition(values);
-      }
-      return true;
-    }).sort((a, b) => {
-      const orderA = typeof a.meta.order === "number" ? a.meta.order : Infinity;
-      const orderB = typeof b.meta.order === "number" ? b.meta.order : Infinity;
-      return orderA - orderB;
-    });
-  }, [fields, values]);
-}
 function useSectionGrouping(fields) {
   return React3.useMemo(() => {
     const ungrouped = [];
@@ -1294,6 +1305,12 @@ function buildDefaults(fields) {
   }
   return result;
 }
+
+// src/utils/resolveNullableSlot.ts
+function resolveNullableSlot(slot, fallback) {
+  if (slot === null) return null;
+  return slot ?? fallback;
+}
 function AutoForm(props) {
   const {
     form: uniForm,
@@ -1518,24 +1535,33 @@ function AutoForm(props) {
   const visibleFields = useConditionalFields(fieldsWithDynamic, control);
   const sections = useSectionGrouping(visibleFields);
   const resolvedLayout = React3__namespace.useMemo(() => {
-    const base = layout?.arrayButtons?.base ?? DefaultArrayButton;
+    const base = resolveNullableSlot(
+      layout?.arrayButtons?.base,
+      DefaultArrayButton
+    );
     const slots = layout?.arrayButtons;
     return {
       formWrapper: layout?.formWrapper ?? DefaultFormWrapper,
       sectionWrapper: layout?.sectionWrapper ?? DefaultSectionWrapper,
-      submitButton: layout?.submitButton ?? DefaultSubmitButton,
+      submitButton: resolveNullableSlot(
+        layout?.submitButton,
+        DefaultSubmitButton
+      ),
       arrayRowLayout: layout?.arrayRowLayout ?? DefaultArrayRowLayout,
       arrayFieldLayout: layout?.arrayFieldLayout ?? DefaultArrayFieldLayout,
       objectWrapper: layout?.objectWrapper ?? DefaultObjectWrapper,
       arrayWrapper: layout?.arrayWrapper ?? DefaultArrayWrapper,
       arrayButtons: {
         base,
-        add: slots?.add ?? base,
-        remove: slots?.remove ?? base,
-        moveUp: slots?.moveUp ?? base,
-        moveDown: slots?.moveDown ?? base,
-        duplicate: slots?.duplicate ?? base,
-        collapse: slots?.collapse ?? DefaultArrayCollapseButton
+        add: resolveNullableSlot(slots?.add, base),
+        remove: resolveNullableSlot(slots?.remove, base),
+        moveUp: resolveNullableSlot(slots?.moveUp, base),
+        moveDown: resolveNullableSlot(slots?.moveDown, base),
+        duplicate: resolveNullableSlot(slots?.duplicate, base),
+        collapse: resolveNullableSlot(
+          slots?.collapse,
+          DefaultArrayCollapseButton
+        )
       },
       loadingFallback: layout?.loadingFallback ?? /* @__PURE__ */ jsxRuntime.jsx("p", { children: "Loading\u2026" })
     };
@@ -1557,6 +1583,7 @@ function AutoForm(props) {
   const contextValue = React3__namespace.useMemo(
     () => ({
       registry,
+      fieldConfigs: mergedFields,
       fieldOverrides: fieldOverridesProp,
       fieldWrapper: resolvedFieldWrapper,
       layout: resolvedLayout,
@@ -1565,10 +1592,12 @@ function AutoForm(props) {
       coercions,
       messages,
       labels,
-      formMethods
+      formMethods,
+      control
     }),
     [
       registry,
+      mergedFields,
       fieldOverridesProp,
       resolvedFieldWrapper,
       resolvedLayout,
@@ -1577,7 +1606,8 @@ function AutoForm(props) {
       coercions,
       messages,
       labels,
-      formMethods
+      formMethods,
+      control
     ]
   );
   if (isLoadingDefaults) {
@@ -1621,13 +1651,13 @@ function AutoForm(props) {
             section.title
           );
         }),
-        /* @__PURE__ */ jsxRuntime.jsx(
+        SubmitButton ? /* @__PURE__ */ jsxRuntime.jsx(
           SubmitButton,
           {
             isSubmitting: formState.isSubmitting,
             label: labels.submit ?? "Submit"
           }
-        )
+        ) : null
       ] })
     }
   ) });
@@ -1726,6 +1756,34 @@ var UniForm = class {
 function createForm(schema) {
   return new UniForm(schema);
 }
+function findArrayConfig(fields, name) {
+  for (const field of fields) {
+    if (field.name === name) {
+      return field.type === "array" ? field : void 0;
+    }
+    if (field.type === "object") {
+      const found = findArrayConfig(field.children, name);
+      if (found) return found;
+    }
+  }
+  return void 0;
+}
+function useArrayField(fieldName) {
+  const { control, fieldConfigs } = useAutoFormContext();
+  const result = reactHookForm.useFieldArray({ control, name: fieldName });
+  const rowCount = result.fields.length;
+  const config = findArrayConfig(fieldConfigs, fieldName);
+  const minItems = config?.minItems;
+  const maxItems = config?.maxItems;
+  const canAdd = maxItems == null || rowCount < maxItems;
+  const atMin = minItems != null && rowCount <= minItems;
+  return {
+    ...result,
+    rowCount,
+    canAdd,
+    atMin
+  };
+}
 
 exports.AutoForm = AutoForm;
 exports.DefaultArrayButton = DefaultArrayButton;
@@ -1749,6 +1807,7 @@ exports.defaultRegistry = defaultRegistry;
 exports.introspectObjectSchema = introspectObjectSchema;
 exports.introspectSchema = introspectSchema;
 exports.mergeRegistries = mergeRegistries;
+exports.useArrayField = useArrayField;
 exports.useAutoFormContext = useAutoFormContext;
 exports.useConditionalFields = useConditionalFields;
 exports.useFormPersistence = useFormPersistence;