Skip to content

chore: move all non adapter components out of UI #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useTranslation } from 'react-i18next'
import classNames from 'classnames'
import { VisuallyHidden } from '../../VisuallyHidden'
import { VisuallyHidden } from '../VisuallyHidden'
import styles from './FieldCaption.module.scss'

export interface FieldCaptionProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import classNames from 'classnames'
import { VisuallyHidden } from '../../VisuallyHidden'
import { VisuallyHidden } from '../VisuallyHidden'
import { FieldErrorMessage } from '../FieldErrorMessage'
import { FieldDescription } from '../FieldDescription'
import styles from './HorizontalFieldLayout.module.scss'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Checkbox/Checkbox.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ChangeEvent } from 'react'
import { useFieldIds } from '../hooks/useFieldIds'
import { HorizontalFieldLayout } from '../HorizontalFieldLayout'
import styles from './Checkbox.module.scss'
import type { CheckboxProps } from './CheckboxTypes'
import { HorizontalFieldLayout } from '@/components/Common/HorizontalFieldLayout'
import IconChecked from '@/assets/icons/checkbox.svg?react'

export const Checkbox = ({
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Checkbox/CheckboxTypes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { InputHTMLAttributes, Ref } from 'react'
import type { SharedHorizontalFieldLayoutProps } from '../HorizontalFieldLayout/HorizontalFieldLayoutTypes'
import type { SharedHorizontalFieldLayoutProps } from '@/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes'

export interface CheckboxProps
extends SharedHorizontalFieldLayoutProps,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/CheckboxGroup/CheckboxGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import {
import { useCheckboxGroupItem } from 'react-aria'
import type { AriaCheckboxProps } from 'react-aria'
import type React from 'react'
import { Fieldset } from '../Fieldset'
import { Checkbox } from '../Checkbox'
import styles from './CheckboxGroup.module.scss'
import type { CheckboxGroupProps } from './CheckboxGroupTypes'
import { Fieldset } from '@/components/Common/Fieldset'
import { useForkRef } from '@/hooks/useForkRef/useForkRef'

// Checkbox implementation specific to React Aria to get our checkbox to connect
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { FieldsetHTMLAttributes, Ref } from 'react'
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'

export type CheckboxGroupOption = {
label: React.ReactNode
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/ComboBox/ComboBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import {
import { useTranslation } from 'react-i18next'
import { useMemo } from 'react'
import classNames from 'classnames'
import { FieldLayout } from '../FieldLayout'
import { useFieldIds } from '../hooks/useFieldIds'
import styles from './ComboBox.module.scss'
import type { ComboBoxProps } from './ComboBoxTypes'
import { FieldLayout } from '@/components/Common/FieldLayout'
import { useTheme } from '@/contexts/ThemeProvider'
import AlertCircle from '@/assets/icons/alert-circle.svg?react'
import CaretDown from '@/assets/icons/caret-down.svg?react'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/ComboBox/ComboBoxTypes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { InputHTMLAttributes, Ref, FocusEvent } from 'react'
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'

export interface ComboBoxOption {
label: string
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/DatePicker/DatePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import {
import { useTranslation } from 'react-i18next'
import classNames from 'classnames'
import { parseDate } from '@internationalized/date'
import { FieldLayout } from '../FieldLayout'
import { useFieldIds } from '../hooks/useFieldIds'
import styles from './DatePicker.module.scss'
import type { DatePickerProps } from './DatePickerTypes'
import { FieldLayout } from '@/components/Common/FieldLayout'
import { useTheme } from '@/contexts/ThemeProvider'
import CaretDown from '@/assets/icons/caret-down.svg?react'
import CaretRight from '@/assets/icons/caret-right.svg?react'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/DatePicker/DatePickerTypes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { InputHTMLAttributes, Ref, FocusEvent } from 'react'
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'

export interface DatePickerProps
extends SharedFieldLayoutProps,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/NumberInput/NumberInput.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { useMemo } from 'react'
import { Group, NumberField as AriaNumberField } from 'react-aria-components'
import classNames from 'classnames'
import { FieldLayout } from '../FieldLayout'
import { Input } from '../Input'
import { useFieldIds } from '../hooks/useFieldIds'
import styles from './NumberInput.module.scss'
import type { NumberInputProps } from './NumberInputTypes'
import { FieldLayout } from '@/components/Common/FieldLayout'
import { useLocale } from '@/contexts/LocaleProvider'

export function NumberInput({
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/NumberInput/NumberInputTypes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { FocusEventHandler, InputHTMLAttributes, Ref } from 'react'
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
import type { InputProps } from '../Input/InputTypes'
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'

export interface NumberInputProps
extends SharedFieldLayoutProps,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Radio/Radio.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { ChangeEvent } from 'react'
import classNames from 'classnames'
import { useFieldIds } from '../hooks/useFieldIds'
import { HorizontalFieldLayout } from '../HorizontalFieldLayout'
import styles from './Radio.module.scss'
import type { RadioProps } from './RadioTypes'
import { HorizontalFieldLayout } from '@/components/Common/HorizontalFieldLayout'

export const Radio = ({
name,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Radio/RadioTypes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { InputHTMLAttributes, Ref } from 'react'
import type { SharedHorizontalFieldLayoutProps } from '../HorizontalFieldLayout/HorizontalFieldLayoutTypes'
import type { SharedHorizontalFieldLayoutProps } from '@/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes'

export interface RadioProps
extends SharedHorizontalFieldLayoutProps,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/RadioGroup/RadioGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import {
import { useRadio } from 'react-aria'
import type { AriaRadioProps } from 'react-aria'
import type React from 'react'
import { Fieldset } from '../Fieldset'
import { Radio } from '../Radio'
import styles from './RadioGroup.module.scss'
import type { RadioGroupProps } from './RadioGroupTypes'
import { Fieldset } from '@/components/Common/Fieldset'
import { useForkRef } from '@/hooks/useForkRef/useForkRef'

// Radio implementation specific to React Aria to get our radio to connect
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/RadioGroup/RadioGroupTypes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { FieldsetHTMLAttributes, Ref } from 'react'
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'

export type RadioGroupOption = {
label: React.ReactNode
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Select/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import { useTranslation } from 'react-i18next'
import { useMemo } from 'react'
import classNames from 'classnames'
import { useFieldIds } from '../hooks/useFieldIds'
import { FieldLayout } from '../FieldLayout'
import styles from './Select.module.scss'
import type { SelectProps } from './SelectTypes'
import { FieldLayout } from '@/components/Common/FieldLayout'
import CaretDown from '@/assets/icons/caret-down.svg?react'
import AlertCircle from '@/assets/icons/alert-circle.svg?react'
import { useTheme } from '@/contexts/ThemeProvider'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Select/SelectTypes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { FocusEvent, Ref, SelectHTMLAttributes } from 'react'
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'

export interface SelectOption {
value: string
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Switch/Switch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { Switch as _Switch } from 'react-aria-components'
import classNames from 'classnames'
import { useRef, useEffect } from 'react'
import { useFieldIds } from '../hooks/useFieldIds'
import { HorizontalFieldLayout } from '../HorizontalFieldLayout'
import styles from './Switch.module.scss'
import type { SwitchProps } from './SwitchTypes'
import { HorizontalFieldLayout } from '@/components/Common/HorizontalFieldLayout'

export function Switch({
name,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/Switch/SwitchTypes.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { FocusEvent, InputHTMLAttributes, Ref } from 'react'
import type { SharedHorizontalFieldLayoutProps } from '../HorizontalFieldLayout/HorizontalFieldLayoutTypes'
import type { SharedHorizontalFieldLayoutProps } from '@/components/Common/HorizontalFieldLayout/HorizontalFieldLayoutTypes'

export interface SwitchProps
extends SharedHorizontalFieldLayoutProps,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/TextInput/TextInput.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { ChangeEvent } from 'react'
import { FieldLayout } from '../FieldLayout'
import { Input } from '../Input'
import { useFieldIds } from '../hooks/useFieldIds'
import type { TextInputProps } from './TextInputTypes'
import { FieldLayout } from '@/components/Common/FieldLayout'

export function TextInput({
name,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/UI/TextInput/TextInputTypes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Ref, InputHTMLAttributes } from 'react'
import type { SharedFieldLayoutProps } from '../FieldLayout/FieldLayoutTypes'
import type { InputProps } from '../Input/InputTypes'
import type { SharedFieldLayoutProps } from '@/components/Common/FieldLayout/FieldLayoutTypes'

export interface TextInputProps
extends SharedFieldLayoutProps,
Expand Down