@bloom-housing/ui-components 4.2.2-alpha.2 → 4.2.2-alpha.3

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.2.2-alpha.3](https://github.com/bloom-housing/bloom/compare/@bloom-housing/ui-components@4.2.2-alpha.2...@bloom-housing/ui-components@4.2.2-alpha.3) (2022-04-18)
+
+
+### Features
+
+* refactor ada form fields ([#2612](https://github.com/bloom-housing/bloom/issues/2612)) ([f516f21](https://github.com/bloom-housing/bloom/commit/f516f2164249cea5b622b6bb5cd6efb5455003ca))
+
+
+
+
+
 ## [4.2.2-alpha.2](https://github.com/bloom-housing/bloom/compare/@bloom-housing/ui-components@4.2.2-alpha.1...@bloom-housing/ui-components@4.2.2-alpha.2) (2022-04-14)
 
 **Note:** Version bump only for package @bloom-housing/ui-components

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bloom-housing/ui-components",
-  "version": "4.2.2-alpha.2",
+  "version": "4.2.2-alpha.3",
   "author": "Sean Albert <sean.albert@exygy.com>",
   "description": "Shared user interface components for Bloom affordable housing system",
   "homepage": "https://github.com/bloom-housing/bloom/tree/master/shared/ui-components",
@@ -100,5 +100,5 @@
     "tailwindcss": "2.2.10",
     "typesafe-actions": "^5.1.0"
   },
-  "gitHead": "6a1daa540cc0bd206fc89d9444b187502c80e712"
+  "gitHead": "b6c84fb42e0ac23c78b8886db058957a7feb03a1"
 }

package/src/forms/FieldGroup.tsx

@@ -5,37 +5,38 @@ import { UseFormMethods, RegisterOptions } from "react-hook-form"
 import { Field } from "./Field"
 import { t } from "../helpers/translator"
 
-interface FieldSingle {
-  id: string
-  label: string
-  value?: string
+export interface FieldSingle {
+  additionalText?: boolean
   dataTestId?: string
   defaultChecked?: boolean
-  description?: React.ReactNode
   defaultText?: string
+  description?: React.ReactNode
   disabled?: boolean
-  note?: string
+  id: string
   inputProps?: Record<string, unknown>
+  label: string
+  uniqueName?: boolean
+  note?: string
   subFields?: FieldSingle[]
   type?: string
-  additionalText?: boolean
+  value?: string
 }
 
 interface FieldGroupProps {
+  dataTestId?: string
   error?: boolean
   errorMessage?: string
-  name: string
-  type?: string
-  groupLabel?: string
+  fieldClassName?: string
+  fieldGroupClassName?: string
+  fieldLabelClassName?: string
   fields?: FieldSingle[]
+  groupLabel?: string
   groupNote?: string
   groupSubNote?: string
+  name: string
   register: UseFormMethods["register"]
+  type?: string
   validation?: RegisterOptions
-  fieldGroupClassName?: string
-  fieldClassName?: string
-  fieldLabelClassName?: string
-  dataTestId?: string
 }
 
 const FieldGroup = ({
@@ -75,7 +76,7 @@ const FieldGroup = ({
           type={type}
           id={item.id}
           defaultValue={item.value || item.id}
-          name={subfieldsExist() ? `${name}-${item.value}` : name}
+          name={subfieldsExist() || item.uniqueName ? `${name}-${item.value}` : name}
           onClick={(e) => {
             // We cannot reliably target an individual checkbox in a field group since they have the same name, so we keep track on our own
             if (e.currentTarget.checked) {
@@ -152,7 +153,7 @@ const FieldGroup = ({
     )
   }
   return (
-    <>
+    <div>
       {groupLabel && <label className="field-label--caps">{groupLabel}</label>}
       {groupNote && <p className="field-note mb-4">{groupNote}</p>}
 
@@ -176,7 +177,7 @@ const FieldGroup = ({
           {errorMessage}
         </ErrorMessage>
       )}
-    </>
+    </div>
   )
 }
 

package/src/locales/general.json

@@ -98,6 +98,7 @@
   "application.contact.yourPhoneNumber": "Your Phone Number",
   "application.contact.zip": "Zip",
   "application.contact.zipCode": "Zipcode",
+  "application.details.adaPriorities": "ADA Priorities Selected",
   "application.edited": "Edited",
   "application.financial.income.instruction1": "Add up your total gross (pre-tax) household income from wages, benefits and other sources from all household members.",
   "application.financial.income.instruction2": "You only need to provide an estimated total right now. The actual total will be calculated if you are selected.",