Merge branch 'main' into main

trussworks · Oct 25, 2023 · 1cf8a00 · 1cf8a00
2 parents 1f5d3c0 + 59dffd1
commit 1cf8a00
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 100 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/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'