@strictly/react-form 0.0.8 → 0.0.10

package/dist/index.js

@@ -52,18 +52,18 @@ function chainAnnotatedFieldConverter(from, to) {
   return function(value, valuePath, context) {
     const {
       required: intermediateRequired,
-      readonly: intermediateDisabled,
+      readonly: intermediateReadonly,
       value: intermediateValue
     } = from(value, valuePath, context);
     const {
       required: finalRequired,
-      readonly: finalDisabled,
+      readonly: finalReadonly,
       value: finalValue
     } = to(intermediateValue, valuePath, context);
     return {
       value: finalValue,
       required: intermediateRequired || finalRequired,
-      readonly: intermediateDisabled || finalDisabled
+      readonly: intermediateReadonly || finalReadonly
     };
   };
 }
@@ -102,6 +102,25 @@ var MaybeIdentityConverter = class {
   }
 };
 
+// field_converters/trimming_string_converter.ts
+var TrimmingStringConverter = class {
+  constructor() {
+  }
+  convert(to) {
+    return {
+      value: to.trim(),
+      required: false,
+      readonly: false
+    };
+  }
+  revert(from) {
+    return {
+      type: 0 /* Success */,
+      value: from.trim()
+    };
+  }
+};
+
 // field_value_factories/prototyping_field_value_factory.ts
 function prototypingFieldValueFactory(prototype) {
   return function() {
@@ -136,6 +155,32 @@ var FieldAdapterBuilder = class _FieldAdapterBuilder {
       reverter
     );
   }
+  nullable() {
+    return this.or(null);
+  }
+  optional() {
+    return this.or(void 0);
+  }
+  or(proto) {
+    function isFrom(v) {
+      return v !== proto;
+    }
+    function isTo(v) {
+      return v !== proto;
+    }
+    return new _FieldAdapterBuilder(
+      (v, valuePath, context) => isFrom(v) ? this.convert(v, valuePath, context) : {
+        value: v,
+        readonly: false,
+        required: false
+      },
+      this.create,
+      (v, valuePath, context) => isTo(v) && this.revert ? this.revert(v, valuePath, context) : {
+        type: 0 /* Success */,
+        value: proto
+      }
+    );
+  }
   withIdentity(isFrom) {
     const identityConverter = new MaybeIdentityConverter({
       convert: this.convert,
@@ -173,6 +218,12 @@ function identityAdapter(prototype, required) {
     unreliableIdentityConverter()
   );
 }
+function trimmingStringAdapter() {
+  return adapterFromTwoWayConverter(
+    new TrimmingStringConverter(),
+    prototypingFieldValueFactory("")
+  );
+}
 function listAdapter() {
   return new FieldAdapterBuilder(
     annotatedIdentityConverter(false),
@@ -400,8 +451,7 @@ var FormPresenter = class {
       convert,
       create
     } = adapter2;
-    const accessor = model.accessors[valuePath];
-    const value = accessor == null ? create(valuePath, model.value) : accessor.value;
+    const value = create(valuePath, model.value);
     const {
       value: displayValue
     } = convert(value, valuePath, model.value);
@@ -422,7 +472,7 @@ var FormPresenter = class {
     const keys = new Set(Object.keys(values));
     return keys.has(valuePath);
   }
-  validateField(model, valuePath) {
+  validateField(model, valuePath, ignoreDefaultValue = false) {
     const {
       convert,
       revert,
@@ -441,6 +491,14 @@ var FormPresenter = class {
     const value = fieldOverride != null ? fieldOverride[0] : storedValue;
     const dirty = storedValue !== value;
     assertExists(revert, "changing field directly not supported {}", valuePath);
+    if (ignoreDefaultValue) {
+      const {
+        value: defaultDisplayValue
+      } = convert(create(valuePath, model.value), valuePath, model.value);
+      if (defaultDisplayValue === value) {
+        return true;
+      }
+    }
     const conversion = revert(value, valuePath, model.value);
     return runInAction(function() {
       switch (conversion.type) {
@@ -511,13 +569,6 @@ var FormPresenter = class {
       );
     });
   }
-  createModel(value) {
-    return new FormModel(
-      this.type,
-      value,
-      this.adapters
-    );
-  }
 };
 var FormModel = class {
   constructor(type, value, adapters) {
@@ -655,16 +706,173 @@ var FormModel = class {
   }
 };
 
-// core/mobx/hooks.ts
+// core/mobx/hooks.tsx
 import {
   useCallback,
+  useMemo as useMemo2
+} from "react";
+
+// util/partial.tsx
+import { observer } from "mobx-react";
+import {
+  forwardRef,
   useMemo
 } from "react";
+import { jsx } from "react/jsx-runtime";
+function createSimplePartialComponent(Component, curriedProps) {
+  return forwardRef(
+    function(exposedProps, ref) {
+      const C = Component;
+      return /* @__PURE__ */ jsx(
+        C,
+        {
+          ref,
+          ...curriedProps,
+          ...exposedProps
+        }
+      );
+    }
+  );
+}
+function createPartialComponent(Component, curriedPropsSource, additionalPropKeys = []) {
+  return forwardRef(
+    function(props, ref) {
+      const C = Component;
+      const [
+        additionalProps,
+        exposedProps
+      ] = additionalPropKeys.reduce(
+        function([
+          additionalProps2,
+          exposedProps2
+        ], key) {
+          const value = props[
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            key
+          ];
+          delete exposedProps2[key];
+          additionalProps2[key] = value;
+          return [
+            additionalProps2,
+            exposedProps2
+          ];
+        },
+        [
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          {},
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          { ...props }
+        ]
+      );
+      const curriedProps = curriedPropsSource(additionalProps);
+      return /* @__PURE__ */ jsx(
+        C,
+        {
+          ref,
+          ...curriedProps,
+          ...exposedProps
+        }
+      );
+    }
+  );
+}
+function usePartialComponent(curriedPropsSource, deps, Component, additionalPropKeys = []) {
+  return useMemo(
+    function() {
+      return createPartialComponent(
+        Component,
+        curriedPropsSource,
+        additionalPropKeys
+      );
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      ...deps,
+      Component,
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      ...additionalPropKeys
+    ]
+  );
+}
+function createPartialObserverComponent(Component, curriedPropsSource, additionalPropKeys = []) {
+  return createUnsafePartialObserverComponent(
+    Component,
+    curriedPropsSource,
+    additionalPropKeys
+  );
+}
+function createUnsafePartialObserverComponent(Component, curriedPropsSource, additionalPropKeys = []) {
+  return observer(
+    forwardRef(
+      function(props, ref) {
+        const C = Component;
+        const [
+          additionalProps,
+          exposedProps
+        ] = additionalPropKeys.reduce(
+          function([
+            additionalProps2,
+            exposedProps2
+          ], key) {
+            const value = props[
+              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+              key
+            ];
+            delete exposedProps2[key];
+            additionalProps2[key] = value;
+            return [
+              additionalProps2,
+              exposedProps2
+            ];
+          },
+          [
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            {},
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            { ...props }
+          ]
+        );
+        const curriedProps = curriedPropsSource(additionalProps);
+        return /* @__PURE__ */ jsx(
+          C,
+          {
+            ref,
+            ...curriedProps,
+            ...exposedProps
+          }
+        );
+      }
+    )
+  );
+}
+function usePartialObserverComponent(curriedPropsSource, deps, Component, additionalPropKeys = []) {
+  return useMemo(
+    function() {
+      return createPartialObserverComponent(
+        Component,
+        curriedPropsSource,
+        additionalPropKeys
+      );
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      ...deps,
+      Component,
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+      ...additionalPropKeys
+    ]
+  );
+}
+
+// core/mobx/hooks.tsx
 function useDefaultMobxFormHooks(presenter, value, {
   onValidFieldSubmit,
-  onValidFormSubmit
-}) {
-  const model = useMemo(function() {
+  onValidFormSubmit,
+  FormFieldsView
+} = {}) {
+  const model = useMemo2(function() {
     return presenter.createModel(value);
   }, [
     presenter,
@@ -697,7 +905,7 @@ function useDefaultMobxFormHooks(presenter, value, {
     function(path) {
       setTimeout(function() {
         if (presenter.isValuePathActive(model, path)) {
-          presenter.validateField(model, path);
+          presenter.validateField(model, path, true);
         }
       }, 100);
     },
@@ -718,12 +926,33 @@ function useDefaultMobxFormHooks(presenter, value, {
       onValidFormSubmit
     ]
   );
+  const FormFields = useMemo2(() => {
+    if (FormFieldsView == null) {
+      return void 0;
+    }
+    return createUnsafePartialObserverComponent(FormFieldsView, () => {
+      return {
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        fields: model.fields,
+        onFieldBlur,
+        onFieldSubmit,
+        onFieldValueChange
+      };
+    });
+  }, [
+    model,
+    FormFieldsView,
+    onFieldBlur,
+    onFieldSubmit,
+    onFieldValueChange
+  ]);
   return {
     model,
     onFieldValueChange,
     onFieldSubmit,
     onFieldBlur,
-    onFormSubmit
+    onFormSubmit,
+    FormFields
   };
 }
 
@@ -1006,25 +1235,6 @@ var SelectStringConverter = class extends AbstractSelectValueTypeConverter {
   }
 };
 
-// field_converters/trimming_string_converter.ts
-var TrimmingStringConverter = class {
-  constructor() {
-  }
-  convert(to) {
-    return {
-      value: to.trim(),
-      required: false,
-      readonly: false
-    };
-  }
-  revert(from) {
-    return {
-      type: 0 /* Success */,
-      value: from.trim()
-    };
-  }
-};
-
 // field_converters/validating_converter.ts
 import {
   validate as validate2
@@ -1081,160 +1291,6 @@ import {
   useMemo as useMemo3
 } from "react";
 
-// util/partial.tsx
-import { observer } from "mobx-react";
-import {
-  forwardRef,
-  useMemo as useMemo2
-} from "react";
-import { jsx } from "react/jsx-runtime";
-function createSimplePartialComponent(Component, curriedProps) {
-  return forwardRef(
-    function(exposedProps, ref) {
-      const C = Component;
-      return /* @__PURE__ */ jsx(
-        C,
-        {
-          ref,
-          ...curriedProps,
-          ...exposedProps
-        }
-      );
-    }
-  );
-}
-function createPartialComponent(Component, curriedPropsSource, additionalPropKeys = []) {
-  return forwardRef(
-    function(props, ref) {
-      const C = Component;
-      const [
-        additionalProps,
-        exposedProps
-      ] = additionalPropKeys.reduce(
-        function([
-          additionalProps2,
-          exposedProps2
-        ], key) {
-          const value = props[
-            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-            key
-          ];
-          delete exposedProps2[key];
-          additionalProps2[key] = value;
-          return [
-            additionalProps2,
-            exposedProps2
-          ];
-        },
-        [
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          {},
-          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-          { ...props }
-        ]
-      );
-      const curriedProps = curriedPropsSource(additionalProps);
-      return /* @__PURE__ */ jsx(
-        C,
-        {
-          ref,
-          ...curriedProps,
-          ...exposedProps
-        }
-      );
-    }
-  );
-}
-function usePartialComponent(curriedPropsSource, deps, Component, additionalPropKeys = []) {
-  return useMemo2(
-    function() {
-      return createPartialComponent(
-        Component,
-        curriedPropsSource,
-        additionalPropKeys
-      );
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      ...deps,
-      Component,
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      ...additionalPropKeys
-    ]
-  );
-}
-function createPartialObserverComponent(Component, curriedPropsSource, additionalPropKeys = []) {
-  return createUnsafePartialObserverComponent(
-    Component,
-    curriedPropsSource,
-    additionalPropKeys
-  );
-}
-function createUnsafePartialObserverComponent(Component, curriedPropsSource, additionalPropKeys = []) {
-  return observer(
-    forwardRef(
-      function(props, ref) {
-        const C = Component;
-        const [
-          additionalProps,
-          exposedProps
-        ] = additionalPropKeys.reduce(
-          function([
-            additionalProps2,
-            exposedProps2
-          ], key) {
-            const value = props[
-              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-              key
-            ];
-            delete exposedProps2[key];
-            additionalProps2[key] = value;
-            return [
-              additionalProps2,
-              exposedProps2
-            ];
-          },
-          [
-            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-            {},
-            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-            { ...props }
-          ]
-        );
-        const curriedProps = curriedPropsSource(additionalProps);
-        return /* @__PURE__ */ jsx(
-          C,
-          {
-            ref,
-            ...curriedProps,
-            ...exposedProps
-          }
-        );
-      }
-    )
-  );
-}
-function usePartialObserverComponent(curriedPropsSource, deps, Component, additionalPropKeys = []) {
-  return useMemo2(
-    function() {
-      return createPartialObserverComponent(
-        Component,
-        curriedPropsSource,
-        additionalPropKeys
-      );
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      ...deps,
-      Component,
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-      ...additionalPropKeys
-    ]
-  );
-}
-
 // mantine/create_checkbox.tsx
 import { jsx as jsx2 } from "react/jsx-runtime";
 function createCheckbox(valuePath, Checkbox) {
@@ -1305,34 +1361,46 @@ function createFieldsView(valuePath, FieldsView, observableProps) {
   function onFieldSubmit(subKey) {
     observableProps.onFieldSubmit?.(toKey(subKey));
   }
-  return observer2(function(props) {
-    const subFields = Object.entries(observableProps.fields).reduce(
-      (acc, [
-        fieldKey,
-        fieldValue
-      ]) => {
-        if (fieldKey.startsWith(valuePath)) {
-          acc[toSubKey(fieldKey)] = fieldValue;
+  const Component = observer2(
+    function(props) {
+      const subFields = Object.entries(observableProps.fields).reduce(
+        (acc, [
+          fieldKey,
+          fieldValue
+        ]) => {
+          if (fieldKey.startsWith(valuePath)) {
+            acc[toSubKey(fieldKey)] = fieldValue;
+          }
+          return acc;
+        },
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        {}
+      );
+      return /* @__PURE__ */ jsx3(
+        FieldsView,
+        {
+          // maybe we can do this in a more type safe way
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/consistent-type-assertions
+          ...props,
+          fields: subFields,
+          onFieldBlur,
+          onFieldFocus,
+          onFieldSubmit,
+          onFieldValueChange
         }
-        return acc;
-      },
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      {}
-    );
-    return /* @__PURE__ */ jsx3(
-      FieldsView,
-      {
-        // maybe we can do this in a more type safe way
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/consistent-type-assertions
-        ...props,
-        fields: subFields,
-        onFieldBlur,
-        onFieldFocus,
-        onFieldSubmit,
-        onFieldValueChange
-      }
-    );
-  });
+      );
+    }
+  );
+  const callbackMapper = (callback) => {
+    return (subFormValuePath, ...args) => {
+      const valuePath2 = toKey(subFormValuePath);
+      return callback(valuePath2, ...args);
+    };
+  };
+  return {
+    Component,
+    callbackMapper
+  };
 }
 
 // mantine/create_form.tsx
@@ -1787,6 +1855,7 @@ export {
   mergeValidators,
   prototypingFieldValueFactory,
   subFormFieldAdapters,
+  trimmingStringAdapter,
   useDefaultMobxFormHooks,
   useMantineFormFields,
   usePartialComponent,

package/field_converters/chain_field_converter.ts

@@ -71,18 +71,18 @@ export function chainAnnotatedFieldConverter<
   return function (value: From, valuePath: ValuePath, context: Context): AnnotatedFieldConversion {
     const {
       required: intermediateRequired,
-      readonly: intermediateDisabled,
+      readonly: intermediateReadonly,
       value: intermediateValue,
     } = from(value, valuePath, context)
     const {
       required: finalRequired,
-      readonly: finalDisabled,
+      readonly: finalReadonly,
       value: finalValue,
     } = to(intermediateValue, valuePath, context)
     return {
       value: finalValue,
       required: intermediateRequired || finalRequired,
-      readonly: intermediateDisabled || finalDisabled,
+      readonly: intermediateReadonly || finalReadonly,
     }
   }
 }