@nolwenture/formik-jsonschema-form 1.0.0-beta.47 → 1.0.0-beta.49

package/dist/cjs/Form/hooks/useSetDefault.js

@@ -5,19 +5,26 @@ const react_1 = require("react");
 const formik_1 = require("formik");
 const utils_1 = require("../../utils");
 const useSetDefault = (props) => {
-    if (!props.name) {
+    if (!props.name)
         return;
-    }
-    const [{ value }, _, { setValue }] = (0, formik_1.useField)(props.name);
+    const [{ value }, , { setValue }] = (0, formik_1.useField)(props.name);
     (0, react_1.useEffect)(() => {
-        if (!value) {
-            if (props.schema.default) {
-                setValue(props.schema.default);
+        let newValue = value;
+        if (value === "now" && props.schema.format === "date") {
+            const today = new Date().toISOString().split("T")[0];
+            newValue = today;
+        }
+        if (!newValue) {
+            if (props.schema.default !== undefined) {
+                newValue = props.schema.default;
             }
             else if (props.forceDefaultValue) {
-                setValue((0, utils_1.getDefaultValueForType)(props.schema.type));
+                newValue = (0, utils_1.getDefaultValueForType)(props.schema.type);
             }
         }
-    }, []);
+        if (newValue && newValue !== value) {
+            setValue(newValue);
+        }
+    }, [value, props.schema.default, props.forceDefaultValue]);
 };
 exports.useSetDefault = useSetDefault;

package/dist/cjs/FormView/templates/ObjectFieldTemplate/styledComponents.js

@@ -11,18 +11,6 @@ exports.ObjectFieldTemplateWrapper = styled_components_1.default.div `
   &[data-fjsf-level="1"] {
     margin-bottom: ${(props) => props.theme.spacing.xxl};
   }
-
-  &[data-fjsf-level="2"] {
-    -webkit-column-break-inside: avoid;
-    page-break-inside: avoid;
-    break-inside: avoid;
-  }
-
-  &[data-fjsf-level="3"] {
-    -webkit-column-break-inside: avoid;
-    page-break-inside: avoid;
-    break-inside: avoid;
-  }
   
 `;
 exports.ObjectFieldTemplateTitle = styled_components_1.default.div `

package/dist/esm/Form/hooks/useSetDefault.js

@@ -2,18 +2,25 @@ import { useEffect } from "react";
 import { useField } from "formik";
 import { getDefaultValueForType } from "../../utils";
 export const useSetDefault = (props) => {
-    if (!props.name) {
+    if (!props.name)
         return;
-    }
-    const [{ value }, _, { setValue }] = useField(props.name);
+    const [{ value }, , { setValue }] = useField(props.name);
     useEffect(() => {
-        if (!value) {
-            if (props.schema.default) {
-                setValue(props.schema.default);
+        let newValue = value;
+        if (value === "now" && props.schema.format === "date") {
+            const today = new Date().toISOString().split("T")[0];
+            newValue = today;
+        }
+        if (!newValue) {
+            if (props.schema.default !== undefined) {
+                newValue = props.schema.default;
             }
             else if (props.forceDefaultValue) {
-                setValue(getDefaultValueForType(props.schema.type));
+                newValue = getDefaultValueForType(props.schema.type);
             }
         }
-    }, []);
+        if (newValue && newValue !== value) {
+            setValue(newValue);
+        }
+    }, [value, props.schema.default, props.forceDefaultValue]);
 };

package/dist/esm/FormView/templates/ObjectFieldTemplate/styledComponents.js

@@ -4,18 +4,6 @@ export const ObjectFieldTemplateWrapper = styled.div `
   &[data-fjsf-level="1"] {
     margin-bottom: ${(props) => props.theme.spacing.xxl};
   }
-
-  &[data-fjsf-level="2"] {
-    -webkit-column-break-inside: avoid;
-    page-break-inside: avoid;
-    break-inside: avoid;
-  }
-
-  &[data-fjsf-level="3"] {
-    -webkit-column-break-inside: avoid;
-    page-break-inside: avoid;
-    break-inside: avoid;
-  }
   
 `;
 export const ObjectFieldTemplateTitle = styled.div `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nolwenture/formik-jsonschema-form",
-  "version": "1.0.0-beta.47",
+  "version": "1.0.0-beta.49",
   "description": "Formik form generation from json schema",
   "author": "anttivikman <antti.vikman@nolwenture.com>",
   "contributors": [
@@ -124,4 +124,4 @@
       "last 1 safari version"
     ]
   }
-}
+}