@fogpipe/forma-react 0.12.0 → 0.13.0

package/src/context.ts

@@ -17,7 +17,9 @@ export const FormaContext = createContext<UseFormaReturn | null>(null);
 export function useFormaContext(): UseFormaReturn {
   const context = useContext(FormaContext);
   if (!context) {
-    throw new Error("useFormaContext must be used within a FormaContext.Provider");
+    throw new Error(
+      "useFormaContext must be used within a FormaContext.Provider",
+    );
   }
   return context;
 }

package/src/index.ts

@@ -20,7 +20,12 @@ export type {
 
 // Hook
 export { useForma } from "./useForma.js";
-export type { UseFormaOptions, UseFormaReturn, PageState, WizardHelpers } from "./useForma.js";
+export type {
+  UseFormaOptions,
+  UseFormaReturn,
+  PageState,
+  WizardHelpers,
+} from "./useForma.js";
 
 // Components
 export { FormRenderer } from "./FormRenderer.js";

package/src/types.ts

@@ -2,7 +2,12 @@
  * Type definitions for forma-react components
  */
 
-import type { Forma, FieldDefinition, FieldError, SelectOption } from "@fogpipe/forma-core";
+import type {
+  Forma,
+  FieldDefinition,
+  FieldError,
+  SelectOption,
+} from "@fogpipe/forma-core";
 
 /**
  * Base props shared by all field components
@@ -52,7 +57,10 @@ export interface BaseFieldProps {
 /**
  * Props for text-based fields (text, email, password, url, textarea)
  */
-export interface TextFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface TextFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "text" | "email" | "password" | "url" | "textarea";
   value: string;
   onChange: (value: string) => void;
@@ -61,7 +69,10 @@ export interface TextFieldProps extends Omit<BaseFieldProps, "value" | "onChange
 /**
  * Props for number fields
  */
-export interface NumberFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface NumberFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "number";
   value: number | null;
   onChange: (value: number | null) => void;
@@ -73,7 +84,10 @@ export interface NumberFieldProps extends Omit<BaseFieldProps, "value" | "onChan
 /**
  * Props for integer fields
  */
-export interface IntegerFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface IntegerFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "integer";
   value: number | null;
   onChange: (value: number | null) => void;
@@ -85,7 +99,10 @@ export interface IntegerFieldProps extends Omit<BaseFieldProps, "value" | "onCha
 /**
  * Props for boolean fields
  */
-export interface BooleanFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface BooleanFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "boolean";
   value: boolean;
   onChange: (value: boolean) => void;
@@ -94,7 +111,10 @@ export interface BooleanFieldProps extends Omit<BaseFieldProps, "value" | "onCha
 /**
  * Props for date fields
  */
-export interface DateFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface DateFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "date";
   value: string | null;
   onChange: (value: string | null) => void;
@@ -103,7 +123,10 @@ export interface DateFieldProps extends Omit<BaseFieldProps, "value" | "onChange
 /**
  * Props for datetime fields
  */
-export interface DateTimeFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface DateTimeFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "datetime";
   value: string | null;
   onChange: (value: string | null) => void;
@@ -112,7 +135,10 @@ export interface DateTimeFieldProps extends Omit<BaseFieldProps, "value" | "onCh
 /**
  * Props for select fields (single selection)
  */
-export interface SelectFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface SelectFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "select";
   value: string | null;
   onChange: (value: string | null) => void;
@@ -122,7 +148,10 @@ export interface SelectFieldProps extends Omit<BaseFieldProps, "value" | "onChan
 /**
  * Props for multi-select fields
  */
-export interface MultiSelectFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface MultiSelectFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "multiselect";
   value: string[];
   onChange: (value: string[]) => void;
@@ -189,7 +218,10 @@ export interface ArrayHelpers {
   /** Swap items at two indices */
   swap: (indexA: number, indexB: number) => void;
   /** Get field props for an item field */
-  getItemFieldProps: (index: number, fieldName: string) => ArrayItemFieldPropsResult;
+  getItemFieldProps: (
+    index: number,
+    fieldName: string,
+  ) => ArrayItemFieldPropsResult;
   /** Minimum number of items allowed */
   minItems: number;
   /** Maximum number of items allowed */
@@ -203,7 +235,10 @@ export interface ArrayHelpers {
 /**
  * Props for array fields
  */
-export interface ArrayFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface ArrayFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "array";
   value: unknown[];
   onChange: (value: unknown[]) => void;
@@ -217,7 +252,10 @@ export interface ArrayFieldProps extends Omit<BaseFieldProps, "value" | "onChang
 /**
  * Props for object fields
  */
-export interface ObjectFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface ObjectFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "object";
   value: Record<string, unknown>;
   onChange: (value: Record<string, unknown>) => void;
@@ -236,7 +274,10 @@ export interface ComputedFieldProps extends Omit<BaseFieldProps, "onChange"> {
 /**
  * Props for array item fields (within array context)
  */
-export interface ArrayItemFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface ArrayItemFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   /** The field type */
   fieldType: string;
   /** Current value */
@@ -252,7 +293,10 @@ export interface ArrayItemFieldProps extends Omit<BaseFieldProps, "value" | "onC
 /**
  * Props for display fields (read-only presentation content)
  */
-export interface DisplayFieldProps extends Omit<BaseFieldProps, "value" | "onChange"> {
+export interface DisplayFieldProps extends Omit<
+  BaseFieldProps,
+  "value" | "onChange"
+> {
   fieldType: "display";
   /** Static content (markdown/text) */
   content?: string;

package/src/useForma.ts

@@ -237,6 +237,23 @@ function getDefaultBooleanValues(spec: Forma): Record<string, boolean> {
   return defaults;
 }
 
+/**
+ * Get default values from field definitions.
+ * Collects `defaultValue` from each field that specifies one.
+ * These are applied after boolean defaults but before initialData,
+ * so explicit defaults override type-implicit defaults,
+ * and runtime initialData overrides everything.
+ */
+function getFieldDefaults(spec: Forma): Record<string, unknown> {
+  const defaults: Record<string, unknown> = {};
+  for (const [fieldPath, fieldDef] of Object.entries(spec.fields)) {
+    if (fieldDef.defaultValue !== undefined) {
+      defaults[fieldPath] = fieldDef.defaultValue;
+    }
+  }
+  return defaults;
+}
+
 /**
  * Main Forma hook
  */
@@ -264,7 +281,11 @@ export function useForma(options: UseFormaOptions): UseFormaReturn {
   }, [inputSpec, referenceData]);
 
   const [state, dispatch] = useReducer(formReducer, {
-    data: { ...getDefaultBooleanValues(spec), ...initialData }, // Boolean defaults merged UNDER initialData
+    data: {
+      ...getDefaultBooleanValues(spec),
+      ...getFieldDefaults(spec),
+      ...initialData,
+    },
     touched: {},
     isSubmitting: false,
     isSubmitted: false,
@@ -448,8 +469,15 @@ export function useForma(options: UseFormaOptions): UseFormaReturn {
   }, [immediateValidation, onSubmit, state.data]);
 
   const resetForm = useCallback(() => {
-    dispatch({ type: "RESET", initialData });
-  }, [initialData]);
+    dispatch({
+      type: "RESET",
+      initialData: {
+        ...getDefaultBooleanValues(spec),
+        ...getFieldDefaults(spec),
+        ...initialData,
+      },
+    });
+  }, [spec, initialData]);
 
   // Wizard helpers
   const wizard = useMemo((): WizardHelpers | null => {