From fa84a736b58deba0364f6b5d9c7a97e58e1ed66c Mon Sep 17 00:00:00 2001
From: Alexander Zech <alexzech@gmx.de>
Date: Tue, 28 Feb 2023 15:37:12 -0800
Subject: [PATCH 1/2] fix: classname contains undefined

---
 src/context/json_schema_provider.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/context/json_schema_provider.js b/src/context/json_schema_provider.js
index ffa58446..79c5256c 100644
--- a/src/context/json_schema_provider.js
+++ b/src/context/json_schema_provider.js
@@ -47,9 +47,10 @@ class JSONSchemaFormDataProvider extends ContextProvider {
     get uiSchemaStyled() {
         const schema = this.uiSchema;
         return _.each(schema, (v, k, l) => {
-            l[k] = { ...v, ...this.defaultFieldStyles };
-            // retain any prior class attributes
-            l[k].classNames = `${v.classNames} ${this.defaultClassNames}`;
+            l[k].classNames = v.classNames
+                ? `${v.classNames} ${this.defaultClassNames}`
+                : this.defaultClassNames;
+            return null;
         });
     }
 }

From 708c510d22387be482e5502ba23b019340073b42 Mon Sep 17 00:00:00 2001
From: Alexander Zech <alexzech@gmx.de>
Date: Tue, 7 Mar 2023 20:09:57 -0800
Subject: [PATCH 2/2] chore: adjust logic of default class names and field
 styles

---
 src/context/json_schema_provider.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/context/json_schema_provider.js b/src/context/json_schema_provider.js
index 79c5256c..56f6b4e6 100644
--- a/src/context/json_schema_provider.js
+++ b/src/context/json_schema_provider.js
@@ -47,9 +47,8 @@ class JSONSchemaFormDataProvider extends ContextProvider {
     get uiSchemaStyled() {
         const schema = this.uiSchema;
         return _.each(schema, (v, k, l) => {
-            l[k].classNames = v.classNames
-                ? `${v.classNames} ${this.defaultClassNames}`
-                : this.defaultClassNames;
+            l[k] = { ...v, ...this.defaultFieldStyles };
+            l[k].classNames = `${v.classNames || ""} ${this.defaultClassNames || ""}`;
             return null;
         });
     }