Merge branch 'main' into m7adeel-combo_box-label

trussworks · Oct 30, 2023 · 180d6a5 · 180d6a5
2 parents 4cb9640 + c7f00d3
commit 180d6a5
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 105 deletions.
diff --git a/src/components/forms/Dropdown/Dropdown.stories.tsx b/src/components/forms/Dropdown/Dropdown.stories.tsx
diff --git a/src/components/forms/Dropdown/Dropdown.test.tsx b/src/components/forms/Dropdown/Dropdown.test.tsx
diff --git a/src/components/forms/Dropdown/Dropdown.tsx b/src/components/forms/Dropdown/Dropdown.tsx
diff --git a/src/components/forms/Form/Form.stories.tsx b/src/components/forms/Form/Form.stories.tsx
@@ -4,14 +4,14 @@ import { Form } from './Form'
 
 import { Alert } from '../../Alert/Alert'
 import { Button } from '../../Button/Button'
-import { Dropdown } from '../Dropdown/Dropdown'
 import { ErrorMessage } from '../ErrorMessage/ErrorMessage'
 import { Fieldset } from '../Fieldset/Fieldset'
 import { FormGroup } from '../FormGroup/FormGroup'
 import { Label } from '../Label/Label'
 import { RequiredMarker } from '../Label/RequiredMarker'
 import { TextInput } from '../TextInput/TextInput'
 import { Textarea } from '../Textarea/Textarea'
+import { Select } from '../Select/Select'
 
 export default {
   title: 'Components/Form templates',
@@ -129,7 +129,7 @@ export const addressForm = (): React.ReactElement => (
       <Label htmlFor="state" requiredMarker>
         State, territory, or military post
       </Label>
-      <Dropdown id="state" name="state" required>
+      <Select id="state" name="state" required>
         <option>- Select -</option>
         <option value="AL">Alabama</option>
         <option value="AK">Alaska</option>
@@ -188,7 +188,7 @@ export const addressForm = (): React.ReactElement => (
         <option value="AE">AE - Armed Forces Europe</option>
         <option value="AE">AE - Armed Forces Middle East</option>
         <option value="AP">AP - Armed Forces Pacific</option>
-      </Dropdown>
+      </Select>
 
       <Label htmlFor="zip">ZIP Code</Label>
       <TextInput

diff --git a/src/components/forms/TimePicker/TimePicker.stories.tsx b/src/components/forms/TimePicker/TimePicker.stories.tsx
@@ -39,7 +39,7 @@ export const completeTimePicker = (
     <TimePicker
       id="appointment-time"
       name="appointment-time"
-      label="Appointment Time"
+      label="Appointment time"
       hint="hh:mm"
       onChange={noop}
       disabled={argTypes.disabled}
@@ -54,6 +54,7 @@ export const defaultTimePicker = (
     <TimePicker
       id="appointment-time"
       name="appointment-time"
+      label="Appointment time"
       onChange={noop}
       disabled={argTypes.disabled}
     />
@@ -67,7 +68,7 @@ export const withMinAndMaxTimes = (
     <TimePicker
       id="appointment-time"
       name="appointment-time"
-      label="Appointment Time"
+      label="Appointment time"
       hint="hh:mm (9:00am - 5:00pm)"
       minTime="9:00"
       maxTime="17:00"
@@ -84,7 +85,7 @@ export const withDefaultValue = (
     <TimePicker
       id="appointment-time"
       name="appointment-time"
-      label="Appointment Time"
+      label="Appointment time"
       hint="hh:mm"
       defaultValue="12:00"
       onChange={noop}

diff --git a/src/components/forms/TimePicker/TimePicker.test.tsx b/src/components/forms/TimePicker/TimePicker.test.tsx
@@ -12,6 +12,7 @@ describe('TimePicker Component', () => {
   const testProps = {
     id: 'appointment-time',
     name: 'appointment-time',
+    label: 'Appointment time',
     onChange: jest.fn(),
   }
 

diff --git a/src/components/forms/TimePicker/TimePicker.tsx b/src/components/forms/TimePicker/TimePicker.tsx
@@ -18,7 +18,7 @@ type BaseTimePickerProps = {
   id: string
   name: string
   onChange: (val?: string) => void
-  label?: string
+  label: string
   defaultValue?: string
   disabled?: boolean
   minTime?: string

diff --git a/src/index.ts b/src/index.ts
@@ -51,7 +51,6 @@ export { DateInput } from './components/forms/DateInput/DateInput'
 export { DateInputGroup } from './components/forms/DateInputGroup/DateInputGroup'
 export { DatePicker } from './components/forms/DatePicker/DatePicker'
 export { DateRangePicker } from './components/forms/DateRangePicker/DateRangePicker'
-export { Dropdown } from './components/forms/Dropdown/Dropdown'
 export { ErrorMessage } from './components/forms/ErrorMessage/ErrorMessage'
 export { Fieldset } from './components/forms/Fieldset/Fieldset'
 export { FileInput } from './components/forms/FileInput/FileInput'

diff --git a/yarn.lock b/yarn.lock
@@ -16237,4 +16237,4 @@ zip-stream@^4.1.0:
 zwitch@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
-  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==
+  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==