From edf8d1074fff6fff55de6889d1b6cfbd743feff3 Mon Sep 17 00:00:00 2001
From: Heath Chiavettone <heath.chiavettone@freenome.com>
Date: Mon, 22 Aug 2022 17:54:03 -0700
Subject: [PATCH 1/2] Fix hidden widget in several themes and SelectWidget in
 bootstrap-4 - Updated the `FieldTemplate` in `chakra-ui`, `material-ui`,
 `mui` and `semantic-ui` to properly implement the hidden field - Updated
 `SelectWidget` in `bootstrap-4` to fix missing `htmlFor` and the `disabled`
 state when `readonly` - Updated snapshots to verify fixes - Also removed the
 `test:update` script from `core`, `utils` and `validator-ajv6` because they
 are useless

---
 .../src/SelectWidget/SelectWidget.tsx          |  8 +++++---
 .../test/__snapshots__/Array.test.tsx.snap     |  2 +-
 .../test/__snapshots__/Form.test.tsx.snap      |  2 +-
 .../src/FieldTemplate/FieldTemplate.tsx        |  2 +-
 .../test/__snapshots__/Form.test.tsx.snap      | 18 +++++++++++++-----
 packages/core/package.json                     |  1 -
 .../src/FieldTemplate/FieldTemplate.tsx        |  2 +-
 .../test/__snapshots__/Form.test.tsx.snap      | 18 +++++++++++++-----
 .../mui/src/FieldTemplate/FieldTemplate.tsx    |  2 +-
 .../mui/test/__snapshots__/Form.test.tsx.snap  | 18 +++++++++++++-----
 .../src/FieldTemplate/FieldTemplate.js         |  2 +-
 .../test/__snapshots__/Form.test.js.snap       | 18 +++++++++++++-----
 packages/utils/package.json                    |  3 +--
 packages/validator-ajv6/package.json           |  3 +--
 14 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx b/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx
index 90b2d892dc..90cfa25b27 100644
--- a/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx
+++ b/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx
@@ -41,7 +41,10 @@ const SelectWidget = ({
 
   return (
     <Form.Group>
-      <Form.Label className={rawErrors.length > 0 ? "text-danger" : ""}>
+      <Form.Label
+        className={rawErrors.length > 0 ? "text-danger" : ""}
+        htmlFor={id}
+      >
         {label || schema.title}
         {(label || schema.title) && required ? "*" : null}
       </Form.Label>
@@ -52,8 +55,7 @@ const SelectWidget = ({
         value={typeof value === "undefined" ? emptyValue : value}
         required={required}
         multiple={multiple}
-        disabled={disabled}
-        readOnly={readonly}
+        disabled={disabled && readonly}
         autoFocus={autofocus}
         className={rawErrors.length > 0 ? "is-invalid" : ""}
         onBlur={
diff --git a/packages/bootstrap-4/test/__snapshots__/Array.test.tsx.snap b/packages/bootstrap-4/test/__snapshots__/Array.test.tsx.snap
index 943fd9998e..c1e1338ffc 100644
--- a/packages/bootstrap-4/test/__snapshots__/Array.test.tsx.snap
+++ b/packages/bootstrap-4/test/__snapshots__/Array.test.tsx.snap
@@ -515,6 +515,7 @@ exports[`array fields checkboxes 1`] = `
       >
         <label
           className="form-label"
+          htmlFor="root"
         />
         <select
           autoFocus={false}
@@ -525,7 +526,6 @@ exports[`array fields checkboxes 1`] = `
           onBlur={[Function]}
           onChange={[Function]}
           onFocus={[Function]}
-          readOnly={false}
           required={false}
           value={Array []}
         >
diff --git a/packages/bootstrap-4/test/__snapshots__/Form.test.tsx.snap b/packages/bootstrap-4/test/__snapshots__/Form.test.tsx.snap
index 371d32dc62..1e25b930c1 100644
--- a/packages/bootstrap-4/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/bootstrap-4/test/__snapshots__/Form.test.tsx.snap
@@ -919,6 +919,7 @@ exports[`single fields select field 1`] = `
       >
         <label
           className="form-label"
+          htmlFor="root"
         />
         <select
           autoFocus={false}
@@ -928,7 +929,6 @@ exports[`single fields select field 1`] = `
           onBlur={[Function]}
           onChange={[Function]}
           onFocus={[Function]}
-          readOnly={false}
           value=""
         >
           <option
diff --git a/packages/chakra-ui/src/FieldTemplate/FieldTemplate.tsx b/packages/chakra-ui/src/FieldTemplate/FieldTemplate.tsx
index 3c4a1d3576..0500defad1 100644
--- a/packages/chakra-ui/src/FieldTemplate/FieldTemplate.tsx
+++ b/packages/chakra-ui/src/FieldTemplate/FieldTemplate.tsx
@@ -33,7 +33,7 @@ const FieldTemplate = (props: FieldTemplateProps) => {
   } = props;
 
   if (hidden) {
-    return <>{children}</>;
+    return <div style={{ display: "none" }}>{children}</div>;
   }
 
   return (
diff --git a/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap b/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
index 3b2d5edfc1..c4078be6cb 100644
--- a/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/chakra-ui/test/__snapshots__/Form.test.tsx.snap
@@ -1242,11 +1242,19 @@ exports[`single fields hidden field 1`] = `
       <div
         className="emotion-1"
       >
-        <input
-          id="root_my-field"
-          type="hidden"
-          value=""
-        />
+        <div
+          style={
+            Object {
+              "display": "none",
+            }
+          }
+        >
+          <input
+            id="root_my-field"
+            type="hidden"
+            value=""
+          />
+        </div>
       </div>
     </div>
   </div>
diff --git a/packages/core/package.json b/packages/core/package.json
index 64c8a0a6ed..e881c5b59b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -12,7 +12,6 @@
     "start": "dts watch",
     "test": "dts test",
     "test:watch": "dts test --watch",
-    "test:update": "dts test --u",
     "test-coverage": "dts test --coverage"
   },
   "lint-staged": {
diff --git a/packages/material-ui/src/FieldTemplate/FieldTemplate.tsx b/packages/material-ui/src/FieldTemplate/FieldTemplate.tsx
index efdb5fef3a..88f720ef67 100644
--- a/packages/material-ui/src/FieldTemplate/FieldTemplate.tsx
+++ b/packages/material-ui/src/FieldTemplate/FieldTemplate.tsx
@@ -27,7 +27,7 @@ const FieldTemplate = ({
   registry,
 }: FieldTemplateProps) => {
   if (hidden) {
-    return children;
+    return <div style={{ display: "none" }}>{children}</div>;
   }
   return (
     <WrapIfAdditional
diff --git a/packages/material-ui/test/__snapshots__/Form.test.tsx.snap b/packages/material-ui/test/__snapshots__/Form.test.tsx.snap
index ca18ce83ee..1bb6f86b28 100644
--- a/packages/material-ui/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/material-ui/test/__snapshots__/Form.test.tsx.snap
@@ -899,11 +899,19 @@ exports[`single fields hidden field 1`] = `
           }
         }
       >
-        <input
-          id="root_my-field"
-          type="hidden"
-          value=""
-        />
+        <div
+          style={
+            Object {
+              "display": "none",
+            }
+          }
+        >
+          <input
+            id="root_my-field"
+            type="hidden"
+            value=""
+          />
+        </div>
       </div>
     </div>
   </div>
diff --git a/packages/mui/src/FieldTemplate/FieldTemplate.tsx b/packages/mui/src/FieldTemplate/FieldTemplate.tsx
index 2a40ba4e02..dd6ca5fb33 100644
--- a/packages/mui/src/FieldTemplate/FieldTemplate.tsx
+++ b/packages/mui/src/FieldTemplate/FieldTemplate.tsx
@@ -27,7 +27,7 @@ const FieldTemplate = ({
   registry,
 }: FieldTemplateProps) => {
   if (hidden) {
-    return children;
+    return <div style={{ display: "none" }}>{children}</div>;
   }
   return (
     <WrapIfAdditional
diff --git a/packages/mui/test/__snapshots__/Form.test.tsx.snap b/packages/mui/test/__snapshots__/Form.test.tsx.snap
index 45ed3b33f4..be61c5fbee 100644
--- a/packages/mui/test/__snapshots__/Form.test.tsx.snap
+++ b/packages/mui/test/__snapshots__/Form.test.tsx.snap
@@ -3815,11 +3815,19 @@ exports[`single fields hidden field 1`] = `
           }
         }
       >
-        <input
-          id="root_my-field"
-          type="hidden"
-          value=""
-        />
+        <div
+          style={
+            Object {
+              "display": "none",
+            }
+          }
+        >
+          <input
+            id="root_my-field"
+            type="hidden"
+            value=""
+          />
+        </div>
       </div>
     </div>
   </div>
diff --git a/packages/semantic-ui/src/FieldTemplate/FieldTemplate.js b/packages/semantic-ui/src/FieldTemplate/FieldTemplate.js
index b56a9888c1..93504b0649 100644
--- a/packages/semantic-ui/src/FieldTemplate/FieldTemplate.js
+++ b/packages/semantic-ui/src/FieldTemplate/FieldTemplate.js
@@ -33,7 +33,7 @@ function FieldTemplate({
   );
 
   if (hidden) {
-    return children;
+    return <div style={{ display: "none" }}>{children}</div>;
   }
 
   return (
diff --git a/packages/semantic-ui/test/__snapshots__/Form.test.js.snap b/packages/semantic-ui/test/__snapshots__/Form.test.js.snap
index 7d614feb99..694e3989fa 100644
--- a/packages/semantic-ui/test/__snapshots__/Form.test.js.snap
+++ b/packages/semantic-ui/test/__snapshots__/Form.test.js.snap
@@ -684,11 +684,19 @@ exports[`single fields hidden field 1`] = `
       className="grouped equal width fields"
     >
       
-      <input
-        id="root_my-field"
-        type="hidden"
-        value=""
-      />
+      <div
+        style={
+          Object {
+            "display": "none",
+          }
+        }
+      >
+        <input
+          id="root_my-field"
+          type="hidden"
+          value=""
+        />
+      </div>
     </div>
   </div>
   <button
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 2d85e9b019..53ddf661b0 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -18,8 +18,7 @@
     "cs-format": "prettier \"{src,test}/**/*.ts?(x)\" --write",
     "lint": "eslint src test",
     "precommit": "lint-staged",
-    "test": "dts test",
-    "test:update": "dts test --u"
+    "test": "dts test"
   },
   "lint-staged": {
     "{src,test}/**/*.ts?(x)": [
diff --git a/packages/validator-ajv6/package.json b/packages/validator-ajv6/package.json
index d055c5bf96..bb0aafee12 100644
--- a/packages/validator-ajv6/package.json
+++ b/packages/validator-ajv6/package.json
@@ -19,8 +19,7 @@
     "cs-format": "prettier \"{src,test}/**/*.ts?(x)\" --write",
     "lint": "eslint src test",
     "precommit": "lint-staged",
-    "test": "dts test",
-    "test:update": "dts test --u"
+    "test": "dts test"
   },
   "lint-staged": {
     "{src,test}/**/*.ts?(x)": [

From b3847c03d0fd9b37b28c2bb9b1e754e0f99ebd1f Mon Sep 17 00:00:00 2001
From: Heath Chiavettone <heath.chiavettone@freenome.com>
Date: Wed, 24 Aug 2022 08:01:08 -0700
Subject: [PATCH 2/2] - Responded to reviewer feedback

---
 packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx b/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx
index 90cfa25b27..cd96122fda 100644
--- a/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx
+++ b/packages/bootstrap-4/src/SelectWidget/SelectWidget.tsx
@@ -55,7 +55,7 @@ const SelectWidget = ({
         value={typeof value === "undefined" ? emptyValue : value}
         required={required}
         multiple={multiple}
-        disabled={disabled && readonly}
+        disabled={disabled || readonly}
         autoFocus={autofocus}
         className={rawErrors.length > 0 ? "is-invalid" : ""}
         onBlur={