Skip to content

3230 refactor internal components into internal folder #3263

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.

Sign up for GitHub

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 3 commits into from
Jun 5, 2023
Merged

3230 refactor internal components into internal folder #3263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b8e10f
remove snapshot change
agreenberry May 9, 2023
6cf5a7b
Delete silly-pets-work.md
agreenberry May 9, 2023
fdae1f6
Merge branch 'main' into 3230-refactor-internal-components-into-inter…
agreenberry May 9, 2023
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
8 changes: 4 additions & 4 deletions src/CheckboxGroup/CheckboxGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {ChangeEvent, ChangeEventHandler, FC} from 'react'
import CheckboxOrRadioGroup, {CheckboxOrRadioGroupProps} from '../_CheckboxOrRadioGroup'
import CheckboxOrRadioGroupCaption from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupCaption'
import CheckboxOrRadioGroupLabel from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupLabel'
import CheckboxOrRadioGroupValidation from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupValidation'
import CheckboxOrRadioGroup, {CheckboxOrRadioGroupProps} from '../internal/components/CheckboxOrRadioGroup'
import CheckboxOrRadioGroupCaption from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupCaption'
import CheckboxOrRadioGroupLabel from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel'
import CheckboxOrRadioGroupValidation from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation'
import {useRenderForcingRef} from '../hooks'
import {SxProp} from '../sx'
import FormControl from '../FormControl'
Expand Down
2 changes: 1 addition & 1 deletion src/FormControl/FormControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Select from '../Select'
import TextInput from '../TextInput'
import TextInputWithTokens from '../TextInputWithTokens'
import Textarea from '../Textarea'
import {CheckboxOrRadioGroupContext} from '../_CheckboxOrRadioGroup'
import {CheckboxOrRadioGroupContext} from '../internal/components/CheckboxOrRadioGroup'
import ValidationAnimationContainer from '../_ValidationAnimationContainer'
import {get} from '../constants'
import InlineAutocomplete from '../drafts/InlineAutocomplete'
Expand Down
8 changes: 4 additions & 4 deletions src/RadioGroup/RadioGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, {ChangeEvent, ChangeEventHandler, createContext, FC} from 'react'
import CheckboxOrRadioGroup, {CheckboxOrRadioGroupProps} from '../_CheckboxOrRadioGroup'
import CheckboxOrRadioGroupCaption from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupCaption'
import CheckboxOrRadioGroupLabel from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupLabel'
import CheckboxOrRadioGroupValidation from '../_CheckboxOrRadioGroup/_CheckboxOrRadioGroupValidation'
import CheckboxOrRadioGroup, {CheckboxOrRadioGroupProps} from '../internal/components/CheckboxOrRadioGroup'
import CheckboxOrRadioGroupCaption from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupCaption'
import CheckboxOrRadioGroupLabel from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupLabel'
import CheckboxOrRadioGroupValidation from '../internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroupValidation'
import {useRenderForcingRef} from '../hooks'
import {SxProp} from '../sx'

Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/CheckboxOrRadioGroup.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import '@testing-library/jest-dom/extend-expect'
import {render, within} from '@testing-library/react'
import {Checkbox, FormControl, Radio, SSRProvider, TextInput} from '..'
import {behavesAsComponent, checkExports} from '../utils/testing'
import CheckboxOrRadioGroup, {CheckboxOrRadioGroupContext} from '../_CheckboxOrRadioGroup'
import CheckboxOrRadioGroup, {CheckboxOrRadioGroupContext} from '../internal/components/CheckboxOrRadioGroup'

const INPUT_GROUP_LABEL = 'Choices'

Expand Down Expand Up @@ -39,7 +39,7 @@ describe('CheckboxOrRadioGroup', () => {
</SSRProvider>
),
})
checkExports('_CheckboxOrRadioGroup', {
checkExports('internal/components/CheckboxOrRadioGroup', {
default: CheckboxOrRadioGroup,
CheckboxOrRadioGroupContext,
})
Expand Down
22 changes: 11 additions & 11 deletions ...kboxOrRadioGroup/CheckboxOrRadioGroup.tsx → ...kboxOrRadioGroup/CheckboxOrRadioGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React from 'react'
import styled from 'styled-components'
import Box from '../Box'
import ValidationAnimationContainer from '../_ValidationAnimationContainer'
import {get} from '../constants'
import {useSSRSafeId} from '../utils/ssr'
import CheckboxOrRadioGroupCaption from './_CheckboxOrRadioGroupCaption'
import CheckboxOrRadioGroupLabel from './_CheckboxOrRadioGroupLabel'
import CheckboxOrRadioGroupValidation from './_CheckboxOrRadioGroupValidation'
import VisuallyHidden from '../_VisuallyHidden'
import {useSlots} from '../hooks/useSlots'
import {SxProp} from '../sx'
import Box from '../../../Box'
import ValidationAnimationContainer from '../../../_ValidationAnimationContainer'
import {get} from '../../../constants'
import {useSSRSafeId} from '../../../utils/ssr'
import CheckboxOrRadioGroupCaption from './CheckboxOrRadioGroupCaption'
import CheckboxOrRadioGroupLabel from './CheckboxOrRadioGroupLabel'
import CheckboxOrRadioGroupValidation from './CheckboxOrRadioGroupValidation'
import VisuallyHidden from '../../../_VisuallyHidden'
import {useSlots} from '../../../hooks/useSlots'
import {SxProp} from '../../../sx'

export type CheckboxOrRadioGroupProps = {
/**
Expand Down Expand Up @@ -153,7 +153,7 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
)
}

export type {CheckboxOrRadioGroupLabelProps} from './_CheckboxOrRadioGroupLabel'
export type {CheckboxOrRadioGroupLabelProps} from './CheckboxOrRadioGroupLabel'
export default Object.assign(CheckboxOrRadioGroup, {
Caption: CheckboxOrRadioGroupCaption,
Label: CheckboxOrRadioGroupLabel,
Expand Down
4 changes: 2 additions & 2 deletions ...dioGroup/_CheckboxOrRadioGroupCaption.tsx → ...adioGroup/CheckboxOrRadioGroupCaption.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import Text from '../Text'
import {SxProp} from '../sx'
import Text from '../../../Text'
import {SxProp} from '../../../sx'
import {CheckboxOrRadioGroupContext} from './CheckboxOrRadioGroup'

const CheckboxOrRadioGroupCaption: React.FC<React.PropsWithChildren<SxProp>> = ({children, sx}) => {
Expand Down
6 changes: 3 additions & 3 deletions ...RadioGroup/_CheckboxOrRadioGroupLabel.tsx → ...rRadioGroup/CheckboxOrRadioGroupLabel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import Box from '../Box'
import VisuallyHidden from '../_VisuallyHidden'
import {SxProp} from '../sx'
import Box from '../../../Box'
import VisuallyHidden from '../../../_VisuallyHidden'
import {SxProp} from '../../../sx'
import {CheckboxOrRadioGroupContext} from './CheckboxOrRadioGroup'

export type CheckboxOrRadioGroupLabelProps = {
Expand Down
6 changes: 3 additions & 3 deletions ...Group/_CheckboxOrRadioGroupValidation.tsx → ...oGroup/CheckboxOrRadioGroupValidation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import InputValidation from '../_InputValidation'
import {SxProp} from '../sx'
import {FormValidationStatus} from '../utils/types/FormValidationStatus'
import InputValidation from '../../../_InputValidation'
import {SxProp} from '../../../sx'
import {FormValidationStatus} from '../../../utils/types/FormValidationStatus'
import {CheckboxOrRadioGroupContext} from './CheckboxOrRadioGroup'

export type CheckboxOrRadioGroupValidationProps = {
Expand Down
0 src/_CheckboxOrRadioGroup/index.ts → .../components/CheckboxOrRadioGroup/index.ts
View file
Open in desktop
File renamed without changes.