@nolwenture/formik-jsonschema-form 0.25.0 → 0.25.1

package/dist/FormPdf.stories.js

@@ -70,7 +70,12 @@ export const CompletePdfSchema = {
             array: ["First field", "Second field"],
             partiallyFixedArray: ["Hello", "To you"],
             enumArray: [2, 4],
-            nested: { string: "This is a string inside a nested object" },
+            nested: {
+                string: "This is a string inside a nested object",
+                number: 987,
+                date: "2021-12-09",
+                enum: 1,
+            },
             objectArray: [
                 {
                     string: "this is a string in an object in an array",

package/dist/pdfFields/ArrayField.js

@@ -1,28 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useField, useFormikContext } from "formik";
+import { useField } from "formik";
 import { useContext, useMemo } from "react";
 import { FormPdfRegistry } from "../FormPdf";
-import { useExtractUiSchema, useSetDefault } from "../hooks";
+import { useSetDefault } from "../hooks";
 import { getEnums } from "../utils";
-import { styled } from "styled-components";
-const ArrayFieldPdf = styled.div ``;
 export const ArrayField = (props) => {
-    const { fields: { SchemaField }, templates: { ArrayFieldTemplate }, components: { ArrayFieldItem, ArrayFieldList }, useItemsAsAdditionalItems, } = useContext(FormPdfRegistry);
+    const { fields: { SchemaField }, templates: { ArrayFieldTemplate }, components: { ArrayFieldItem }, } = useContext(FormPdfRegistry);
     useSetDefault(props);
-    const { name, schema, uiSchema } = props;
-    const { type, props: inputProps } = useExtractUiSchema(uiSchema);
-    const [{ value }, _, { setValue }] = useField(name);
-    const { items } = useMemo(() => {
-        let items = schema.items && typeof schema.items !== "boolean" ? schema.items : [];
-        if (!Array.isArray(items)) {
-            items = [items];
-        }
-        return {
-            items: items.filter((item) => typeof item !== "boolean"),
-        };
-    }, [schema]);
-    const { disabled } = useExtractUiSchema(uiSchema);
-    const { values } = useFormikContext();
+    const { name, uiSchema } = props;
+    const [{ value }, _] = useField(name);
     const findEnumInProps = props.schema.additionalItems
         ? { schema: props.schema.additionalItems }
         : props;

package/dist/pdfFields/BooleanField.js

@@ -2,14 +2,14 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import { FormPdfRegistry } from "../FormPdf";
 import { useExtractUiSchema, useSetDefault } from "../hooks";
-import { useFormikContext } from "formik";
+import { getIn, useFormikContext } from "formik";
 export const BooleanField = (props) => {
     const { templates: { FieldTemplate }, components: { BooleanFieldPdf, BooleanFieldWrapper }, } = useContext(FormPdfRegistry);
     useSetDefault(props);
     const { name, uiSchema } = props;
-    const { label, props: inputProps } = useExtractUiSchema(uiSchema);
+    const { label } = useExtractUiSchema(uiSchema);
     const { values } = useFormikContext();
-    const value = values[name];
+    const value = getIn(values, name);
     function findLabel(label) {
         if (typeof label === "object" && label !== null) {
             switch (value) {

package/dist/pdfFields/DateField.js

@@ -1,16 +1,15 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import { FormPdfRegistry } from "../FormPdf";
-import { useExtractUiSchema, useSetDefault } from "../hooks";
-import { useFormikContext } from "formik";
+import { useSetDefault } from "../hooks";
+import { getIn, useFormikContext } from "formik";
 import { styled } from "styled-components";
 const DateFieldPdf = styled.div ``;
 export const DateField = (props) => {
-    const { templates: { FieldTemplate }, components: {}, } = useContext(FormPdfRegistry);
+    const { templates: { FieldTemplate }, } = useContext(FormPdfRegistry);
     useSetDefault(props);
-    const { name, uiSchema } = props;
+    const { name } = props;
     const { values } = useFormikContext();
-    const { props: inputProps } = useExtractUiSchema(uiSchema);
-    const value = values[name];
+    const value = getIn(values, name);
     return (_jsx(FieldTemplate, Object.assign({}, props, { children: _jsx(DateFieldPdf, { children: value }) })));
 };

package/dist/pdfFields/EJSField.js

@@ -2,7 +2,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import { useSetDefault } from "../hooks";
 import ejs from "ejs";
-import { useFormikContext } from "formik";
+import { getIn, useFormikContext } from "formik";
 import { getDescription, getTitle } from "../utils";
 import { FormPdfRegistry } from "../FormPdf";
 export const EJSField = (props) => {
@@ -18,7 +18,7 @@ export const EJSField = (props) => {
             __html: ejs.render(template.toString(), {
                 title,
                 description,
-                value: values[name],
+                value: getIn(values, name),
             }),
         } }));
 };

package/dist/pdfFields/NullField.js

@@ -3,6 +3,5 @@ import { useContext } from "react";
 import { FormRegistry } from "../Form";
 export const NullField = (props) => {
     const { templates: { FieldTemplate }, } = useContext(FormRegistry);
-    const { name } = props;
     return _jsx(FieldTemplate, Object.assign({}, props));
 };

package/dist/pdfFields/ObjectField.js

@@ -26,11 +26,11 @@ const useObjectField = (name) => {
 };
 export const ObjectField = (props) => {
     var _a, _b;
-    const { fields: { SchemaField }, templates: { ObjectFieldTemplate, CollapsibleObjectFieldTemplate }, components: { ObjectFieldItem }, hideUnmarkedAdditionalProperties, } = useContext(FormPdfRegistry);
+    const { fields: { SchemaField }, templates: { ObjectFieldTemplate, CollapsibleObjectFieldTemplate }, } = useContext(FormPdfRegistry);
     useSetDefault(props);
     const { name, schema, uiSchema } = props;
     const { value, setValue } = useObjectField(name);
-    const [{ properties, additionalProperties, required }, valuesToRemove] = useMemo(() => {
+    const [{ properties }, valuesToRemove] = useMemo(() => {
         return resolveSchema(schema, value);
     }, [schema, value]);
     useEffect(() => {
@@ -42,8 +42,6 @@ export const ObjectField = (props) => {
             setValue(newValue);
         }
     }, [valuesToRemove]);
-    const propertyKeys = useMemo(() => Object.keys(properties || {}), [properties]);
-    const additionalValues = useMemo(() => Object.fromEntries(Object.entries(value || {}).filter(([key, value]) => !propertyKeys.includes(key))), [value, propertyKeys]);
     const FieldTemplateComponent = ((_b = (_a = props.uiSchema) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.isCollapsible)
         ? CollapsibleObjectFieldTemplate
         : ObjectFieldTemplate;

package/dist/pdfFields/SearchMultiTagSelectField.js

@@ -1,11 +1,9 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useContext, useMemo } from "react";
-import { FormRegistry } from "../Form";
+import { useMemo } from "react";
 import { getEnums } from "../utils/getEnums";
 import { useExtractUiSchema, useSetDefault } from "../hooks";
 import { ArrayField } from "./ArrayField";
 export const SearchMultiTagSelectField = (props) => {
-    const { templates: { FieldTemplate }, } = useContext(FormRegistry);
     useSetDefault(props);
     const { name, uiSchema } = props;
     const { placeholder, emptySearchMessage, props: inputProps, } = useExtractUiSchema(uiSchema);

package/dist/pdfFields/StringField.js

@@ -1,27 +1,20 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useMemo } from "react";
 import { FormPdfRegistry } from "../FormPdf";
-import { useExtractUiSchema, useSetDefault } from "../hooks";
-import { useFormikContext } from "formik";
+import { useSetDefault } from "../hooks";
+import { getIn, useFormikContext } from "formik";
 import { getEnums } from "../utils";
-function getValueByPath(obj, path) {
-    const parts = path
-        .split(".")
-        .flatMap((part) => part.replace(/\[(\d+)\]/g, ".$1").split("."));
-    return parts.reduce((acc, part) => acc && acc[part], obj);
-}
 export const StringField = (props) => {
     var _a, _b;
     const { templates: { FieldTemplate }, components: { StringFieldPdf }, } = useContext(FormPdfRegistry);
     useSetDefault(props);
-    const { name, uiSchema = {}, schema } = props;
+    const { name } = props;
     const { values } = useFormikContext();
-    const { type, placeholder, props: inputProps } = useExtractUiSchema(uiSchema);
     const enums = useMemo(() => getEnums(props), [props]);
-    let value = values[name] !== undefined ? values[name] : getValueByPath(values, name);
+    let value = getIn(values, name);
     if (enums !== undefined) {
         value =
             (_b = (_a = enums.values.find((element) => element.const === value)) === null || _a === void 0 ? void 0 : _a.title) !== null && _b !== void 0 ? _b : value;
     }
-    return (_jsx(FieldTemplate, Object.assign({}, props, { children: _jsx(StringFieldPdf, { name: name, "data-keyword": values[name], value: value }) })));
+    return (_jsx(FieldTemplate, Object.assign({}, props, { children: _jsx(StringFieldPdf, { name: name, "data-keyword": values[name], children: value }) })));
 };

package/dist/pdfFields/TextAreaField.js

@@ -1,13 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useContext } from "react";
 import { FormPdfRegistry } from "../FormPdf";
-import { useExtractUiSchema, useSetDefault } from "../hooks";
-import { useFormikContext } from "formik";
+import { useSetDefault } from "../hooks";
+import { getIn, useFormikContext } from "formik";
 export const TextAreaField = (props) => {
     const { templates: { FieldTemplate }, components: { TextAreaPdf }, } = useContext(FormPdfRegistry);
     useSetDefault(props);
     const { name, uiSchema } = props;
-    const { props: inputProps } = useExtractUiSchema(uiSchema);
     const { values } = useFormikContext();
-    return (_jsx(FieldTemplate, Object.assign({}, props, { children: _jsx(TextAreaPdf, { name: name, children: values[name] }) })));
+    const value = getIn(values, name);
+    return (_jsx(FieldTemplate, Object.assign({}, props, { children: _jsx(TextAreaPdf, { name: name, children: value }) })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nolwenture/formik-jsonschema-form",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "description": "Formik form generation from json schema",
   "author": "Antti Vikman <antti.vikman@nolwenture.com>",
   "contributors": [