Skip to content

Commit 5984550

Browse files
authored
chore: move all non adapter components out of UI (#316)
1 parent 1a9a44e commit 5984550

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+22
-22
lines changed

src/components/Common/UI/FieldCaption/FieldCaption.tsx renamed to src/components/Common/FieldCaption/FieldCaption.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useTranslation } from 'react-i18next'
22
import classNames from 'classnames'
3-
import { VisuallyHidden } from '../../VisuallyHidden'
3+
import { VisuallyHidden } from '../VisuallyHidden'
44
import styles from './FieldCaption.module.scss'
55

66
export interface FieldCaptionProps {

src/components/Common/UI/HorizontalFieldLayout/HorizontalFieldLayout.tsx renamed to src/components/Common/HorizontalFieldLayout/HorizontalFieldLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import classNames from 'classnames'
2-
import { VisuallyHidden } from '../../VisuallyHidden'
2+
import { VisuallyHidden } from '../VisuallyHidden'
33
import { FieldErrorMessage } from '../FieldErrorMessage'
44
import { FieldDescription } from '../FieldDescription'
55
import styles from './HorizontalFieldLayout.module.scss'

src/components/Common/UI/Checkbox/Checkbox.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { ChangeEvent } from 'react'
22
import { useFieldIds } from '../hooks/useFieldIds'
3-
import { HorizontalFieldLayout } from '../HorizontalFieldLayout'
43
import styles from './Checkbox.module.scss'
54
import type { CheckboxProps } from './CheckboxTypes'
5+
import { HorizontalFieldLayout } from '@/components/Common/HorizontalFieldLayout'
66
import IconChecked from '@/assets/icons/checkbox.svg?react'
77

88
export const Checkbox = ({

src/components/Common/UI/Checkbox/CheckboxTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { InputHTMLAttributes, Ref } from 'react'
2-
import type { SharedHorizontalFieldLayoutProps } from '../HorizontalFieldLayout/HorizontalFieldLayoutTypes'
2+
import type { SharedHorizontalFieldLayoutProps } from '@/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes'
33

44
export interface CheckboxProps
55
extends SharedHorizontalFieldLayoutProps,

src/components/Common/UI/CheckboxGroup/CheckboxGroup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {
99
import { useCheckboxGroupItem } from 'react-aria'
1010
import type { AriaCheckboxProps } from 'react-aria'
1111
import type React from 'react'
12-
import { Fieldset } from '../Fieldset'
1312
import { Checkbox } from '../Checkbox'
1413
import styles from './CheckboxGroup.module.scss'
1514
import type { CheckboxGroupProps } from './CheckboxGroupTypes'
15+
import { Fieldset } from '@/components/Common/Fieldset'
1616
import { useForkRef } from '@/hooks/useForkRef/useForkRef'
1717

1818
// Checkbox implementation specific to React Aria to get our checkbox to connect

src/components/Common/UI/CheckboxGroup/CheckboxGroupTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { FieldsetHTMLAttributes, Ref } from 'react'
2-
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
2+
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
33

44
export type CheckboxGroupOption = {
55
label: React.ReactNode

src/components/Common/UI/ComboBox/ComboBox.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import {
1010
import { useTranslation } from 'react-i18next'
1111
import { useMemo } from 'react'
1212
import classNames from 'classnames'
13-
import { FieldLayout } from '../FieldLayout'
1413
import { useFieldIds } from '../hooks/useFieldIds'
1514
import styles from './ComboBox.module.scss'
1615
import type { ComboBoxProps } from './ComboBoxTypes'
16+
import { FieldLayout } from '@/components/Common/FieldLayout'
1717
import { useTheme } from '@/contexts/ThemeProvider'
1818
import AlertCircle from '@/assets/icons/alert-circle.svg?react'
1919
import CaretDown from '@/assets/icons/caret-down.svg?react'

src/components/Common/UI/ComboBox/ComboBoxTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { InputHTMLAttributes, Ref, FocusEvent } from 'react'
2-
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
2+
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
33

44
export interface ComboBoxOption {
55
label: string

src/components/Common/UI/DatePicker/DatePicker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import {
1515
import { useTranslation } from 'react-i18next'
1616
import classNames from 'classnames'
1717
import { parseDate } from '@internationalized/date'
18-
import { FieldLayout } from '../FieldLayout'
1918
import { useFieldIds } from '../hooks/useFieldIds'
2019
import styles from './DatePicker.module.scss'
2120
import type { DatePickerProps } from './DatePickerTypes'
21+
import { FieldLayout } from '@/components/Common/FieldLayout'
2222
import { useTheme } from '@/contexts/ThemeProvider'
2323
import CaretDown from '@/assets/icons/caret-down.svg?react'
2424
import CaretRight from '@/assets/icons/caret-right.svg?react'

src/components/Common/UI/DatePicker/DatePickerTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { InputHTMLAttributes, Ref, FocusEvent } from 'react'
2-
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
2+
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
33

44
export interface DatePickerProps
55
extends SharedFieldLayoutProps,

src/components/Common/UI/NumberInput/NumberInput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { useMemo } from 'react'
22
import { Group, NumberField as AriaNumberField } from 'react-aria-components'
33
import classNames from 'classnames'
4-
import { FieldLayout } from '../FieldLayout'
54
import { Input } from '../Input'
65
import { useFieldIds } from '../hooks/useFieldIds'
76
import styles from './NumberInput.module.scss'
87
import type { NumberInputProps } from './NumberInputTypes'
8+
import { FieldLayout } from '@/components/Common/FieldLayout'
99
import { useLocale } from '@/contexts/LocaleProvider'
1010

1111
export function NumberInput({

src/components/Common/UI/NumberInput/NumberInputTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { FocusEventHandler, InputHTMLAttributes, Ref } from 'react'
2-
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
32
import type { InputProps } from '../Input/InputTypes'
3+
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
44

55
export interface NumberInputProps
66
extends SharedFieldLayoutProps,

src/components/Common/UI/Radio/Radio.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { ChangeEvent } from 'react'
22
import classNames from 'classnames'
33
import { useFieldIds } from '../hooks/useFieldIds'
4-
import { HorizontalFieldLayout } from '../HorizontalFieldLayout'
54
import styles from './Radio.module.scss'
65
import type { RadioProps } from './RadioTypes'
6+
import { HorizontalFieldLayout } from '@/components/Common/HorizontalFieldLayout'
77

88
export const Radio = ({
99
name,

src/components/Common/UI/Radio/RadioTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { InputHTMLAttributes, Ref } from 'react'
2-
import type { SharedHorizontalFieldLayoutProps } from '../HorizontalFieldLayout/HorizontalFieldLayoutTypes'
2+
import type { SharedHorizontalFieldLayoutProps } from '@/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes'
33

44
export interface RadioProps
55
extends SharedHorizontalFieldLayoutProps,

src/components/Common/UI/RadioGroup/RadioGroup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import {
99
import { useRadio } from 'react-aria'
1010
import type { AriaRadioProps } from 'react-aria'
1111
import type React from 'react'
12-
import { Fieldset } from '../Fieldset'
1312
import { Radio } from '../Radio'
1413
import styles from './RadioGroup.module.scss'
1514
import type { RadioGroupProps } from './RadioGroupTypes'
15+
import { Fieldset } from '@/components/Common/Fieldset'
1616
import { useForkRef } from '@/hooks/useForkRef/useForkRef'
1717

1818
// Radio implementation specific to React Aria to get our radio to connect

src/components/Common/UI/RadioGroup/RadioGroupTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { FieldsetHTMLAttributes, Ref } from 'react'
2-
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
2+
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
33

44
export type RadioGroupOption = {
55
label: React.ReactNode

src/components/Common/UI/Select/Select.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import { useTranslation } from 'react-i18next'
1111
import { useMemo } from 'react'
1212
import classNames from 'classnames'
1313
import { useFieldIds } from '../hooks/useFieldIds'
14-
import { FieldLayout } from '../FieldLayout'
1514
import styles from './Select.module.scss'
1615
import type { SelectProps } from './SelectTypes'
16+
import { FieldLayout } from '@/components/Common/FieldLayout'
1717
import CaretDown from '@/assets/icons/caret-down.svg?react'
1818
import AlertCircle from '@/assets/icons/alert-circle.svg?react'
1919
import { useTheme } from '@/contexts/ThemeProvider'

src/components/Common/UI/Select/SelectTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { FocusEvent, Ref, SelectHTMLAttributes } from 'react'
2-
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
2+
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
33

44
export interface SelectOption {
55
value: string

src/components/Common/UI/Switch/Switch.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { Switch as _Switch } from 'react-aria-components'
22
import classNames from 'classnames'
33
import { useRef, useEffect } from 'react'
44
import { useFieldIds } from '../hooks/useFieldIds'
5-
import { HorizontalFieldLayout } from '../HorizontalFieldLayout'
65
import styles from './Switch.module.scss'
76
import type { SwitchProps } from './SwitchTypes'
7+
import { HorizontalFieldLayout } from '@/components/Common/HorizontalFieldLayout'
88

99
export function Switch({
1010
name,

src/components/Common/UI/Switch/SwitchTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { FocusEvent, InputHTMLAttributes, Ref } from 'react'
2-
import type { SharedHorizontalFieldLayoutProps } from '../HorizontalFieldLayout/HorizontalFieldLayoutTypes'
2+
import type { SharedHorizontalFieldLayoutProps } from '@/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes'
33

44
export interface SwitchProps
55
extends SharedHorizontalFieldLayoutProps,

src/components/Common/UI/TextInput/TextInput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import type { ChangeEvent } from 'react'
2-
import { FieldLayout } from '../FieldLayout'
32
import { Input } from '../Input'
43
import { useFieldIds } from '../hooks/useFieldIds'
54
import type { TextInputProps } from './TextInputTypes'
5+
import { FieldLayout } from '@/components/Common/FieldLayout'
66

77
export function TextInput({
88
name,

src/components/Common/UI/TextInput/TextInputTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Ref, InputHTMLAttributes } from 'react'
2-
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
32
import type { InputProps } from '../Input/InputTypes'
3+
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'
44

55
export interface TextInputProps
66
extends SharedFieldLayoutProps,

0 commit comments

Comments
 (0)