@nolwenture/formik-jsonschema-form 2.0.0 → 2.0.2

package/README.md

@@ -211,8 +211,10 @@ The `createValidationSchema` function generates a Yup validation schema from you
 ```tsx
 createValidationSchema(
   { schema, uiSchema },  // Schema and optional UI schema
-  definitions,           // Optional external definitions
-  { localize }           // Optional localization function
+  {                      // Optional options object
+    localize,            // Localization function i18next t compatible
+    definitions,         // Use these definitions instead of definitions in schema
+  }
 )
 ```
 
@@ -244,7 +246,6 @@ import { useTranslation } from 'react-i18next';
 const { t } = useTranslation();
 const validationSchema = createValidationSchema(
   { schema, uiSchema },
-  {},
   { localize: t }
 );
 ```

package/dist/cjs/FormView/components/Field.js

@@ -117,9 +117,9 @@ exports.MultipleChoiceFieldWrapper = styled_components_1.default.div `
     align-items: start;
   }
   padding-left: ${(props) => props.theme.spacing.l};
-  -webkit-column-break-inside: avoid;
-  page-break-inside: avoid;
-  break-inside: avoid;
+  -webkit-column-break-inside: auto;
+  page-break-inside: auto;
+  break-inside: auto;
 `;
 const BooleanFieldValue = ({ name, className, value, label, }) => {
     return ((0, jsx_runtime_1.jsx)("div", { className: className, children: value === true ? ((0, jsx_runtime_1.jsxs)(Selected, { children: [(0, jsx_runtime_1.jsx)(SelectedBox, { children: (0, jsx_runtime_1.jsx)(exports.SelectedIcon, {}) }), (0, jsx_runtime_1.jsx)(styledComponents_1.MultipleChoiceFieldLabel, { children: label !== undefined ? label : "Selected" })] })) : ((0, jsx_runtime_1.jsxs)(Selected, { children: [(0, jsx_runtime_1.jsx)(NotSelectedBox, {}), (0, jsx_runtime_1.jsx)(styledComponents_1.MultipleChoiceFieldLabel, { children: label !== undefined ? label : "Not selected" })] })) }));

package/dist/cjs/utils/createValidationSchema.js

@@ -173,9 +173,9 @@ function getYupType(schema) {
             throw new Error(`createValidationSchema: Unsupported schema type: ${type}`);
     }
 }
-function createValidationSchema(schemas, definitions = {}, options) {
+function createValidationSchema(schemas, options) {
     const { schema, uiSchema = {} } = schemas;
-    const { localize, conditionsContext = {}, condition } = options ?? {};
+    const { localize, definitions, conditionsContext = {}, condition } = options ?? {};
     if (!schema?.properties) {
         return Yup.object().shape({});
     }
@@ -189,10 +189,7 @@ function createValidationSchema(schemas, definitions = {}, options) {
         const defaultMsg = DEFAULT_ERROR_MESSAGES[key];
         return typeof defaultMsg === "function" ? defaultMsg(params) : defaultMsg;
     };
-    const schemaDefinitions = {
-        ...definitions,
-        ...(schema.definitions ?? {}),
-    };
+    const schemaDefinitions = (definitions ?? schema.definitions ?? {});
     const requiredFields = schema.required;
     function getValue(givenSchema, key, required) {
         const { schema } = (0, solveReferences_1.solveReferences)(givenSchema, schemaDefinitions, {}, {});
@@ -204,8 +201,9 @@ function createValidationSchema(schemas, definitions = {}, options) {
             yupSchema = createValidationSchema({
                 schema,
                 uiSchema: fieldUiSchema
-            }, schemaDefinitions, {
+            }, {
                 localize,
+                definitions: schemaDefinitions,
                 conditionsContext,
             });
             type = type ?? "object";
@@ -389,8 +387,9 @@ function createValidationSchema(schemas, definitions = {}, options) {
         return validationSchema.concat(createValidationSchema({
             schema: solvedSchemas.schema,
             uiSchema
-        }, schemaDefinitions, {
+        }, {
             localize,
+            definitions: schemaDefinitions,
             conditionsContext,
             condition: conditionalValidation.condition
         }));

package/dist/esm/FormView/components/Field.js

@@ -111,9 +111,9 @@ export const MultipleChoiceFieldWrapper = styled.div `
     align-items: start;
   }
   padding-left: ${(props) => props.theme.spacing.l};
-  -webkit-column-break-inside: avoid;
-  page-break-inside: avoid;
-  break-inside: avoid;
+  -webkit-column-break-inside: auto;
+  page-break-inside: auto;
+  break-inside: auto;
 `;
 export const BooleanFieldValue = ({ name, className, value, label, }) => {
     return (_jsx("div", { className: className, children: value === true ? (_jsxs(Selected, { children: [_jsx(SelectedBox, { children: _jsx(SelectedIcon, {}) }), _jsx(MultipleChoiceFieldLabel, { children: label !== undefined ? label : "Selected" })] })) : (_jsxs(Selected, { children: [_jsx(NotSelectedBox, {}), _jsx(MultipleChoiceFieldLabel, { children: label !== undefined ? label : "Not selected" })] })) }));

package/dist/esm/utils/createValidationSchema.js

@@ -137,9 +137,9 @@ function getYupType(schema) {
             throw new Error(`createValidationSchema: Unsupported schema type: ${type}`);
     }
 }
-export function createValidationSchema(schemas, definitions = {}, options) {
+export function createValidationSchema(schemas, options) {
     const { schema, uiSchema = {} } = schemas;
-    const { localize, conditionsContext = {}, condition } = options ?? {};
+    const { localize, definitions, conditionsContext = {}, condition } = options ?? {};
     if (!schema?.properties) {
         return Yup.object().shape({});
     }
@@ -153,10 +153,7 @@ export function createValidationSchema(schemas, definitions = {}, options) {
         const defaultMsg = DEFAULT_ERROR_MESSAGES[key];
         return typeof defaultMsg === "function" ? defaultMsg(params) : defaultMsg;
     };
-    const schemaDefinitions = {
-        ...definitions,
-        ...(schema.definitions ?? {}),
-    };
+    const schemaDefinitions = (definitions ?? schema.definitions ?? {});
     const requiredFields = schema.required;
     function getValue(givenSchema, key, required) {
         const { schema } = solveReferences(givenSchema, schemaDefinitions, {}, {});
@@ -168,8 +165,9 @@ export function createValidationSchema(schemas, definitions = {}, options) {
             yupSchema = createValidationSchema({
                 schema,
                 uiSchema: fieldUiSchema
-            }, schemaDefinitions, {
+            }, {
                 localize,
+                definitions: schemaDefinitions,
                 conditionsContext,
             });
             type = type ?? "object";
@@ -353,8 +351,9 @@ export function createValidationSchema(schemas, definitions = {}, options) {
         return validationSchema.concat(createValidationSchema({
             schema: solvedSchemas.schema,
             uiSchema
-        }, schemaDefinitions, {
+        }, {
             localize,
+            definitions: schemaDefinitions,
             conditionsContext,
             condition: conditionalValidation.condition
         }));

package/dist/types/utils/createValidationSchema.d.ts

@@ -22,8 +22,9 @@ type ConditionsContext = {
 export declare function createValidationSchema(schemas: {
     schema: Schema;
     uiSchema?: UiSchema;
-}, definitions?: Schema, options?: {
+}, options?: {
     localize?: LocalizeType;
+    definitions?: Schema;
     conditionsContext?: Record<string, ConditionsContext[]>;
     condition?: Condition;
 }): Yup.ObjectSchema<{}, Yup.AnyObject, {}, "">;

package/package.json

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