Skip to content
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

feat(TextInput): Convert UnstyledTextInput to use CSS modules behind feature flag #5254

Merged
merged 6 commits into from
Nov 12, 2024
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
5 changes: 5 additions & 0 deletions .changeset/late-swans-knock.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": minor
---

Convert UnstyledTextInput to use CSS Modules behing feature flag
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.UnstyledTextInput {
height: 100%;
}
10 changes: 8 additions & 2 deletions packages/react/src/TextInputWithTokens/TextInputWithTokens.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,11 @@ import type {TokenSizeKeys} from '../Token/TokenBase'

import type {TextInputSizes} from '../internal/components/TextInputWrapper'
import TextInputWrapper, {textInputHorizPadding} from '../internal/components/TextInputWrapper'
import UnstyledTextInput from '../internal/components/UnstyledTextInput'
import UnstyledTextInput, {TEXT_INPUT_CSS_MODULES_FEATURE_FLAG} from '../internal/components/UnstyledTextInput'
import TextInputInnerVisualSlot from '../internal/components/TextInputInnerVisualSlot'
import {useFeatureFlag} from '../FeatureFlags'

import styles from './TextInputWithTokens.module.css'

// eslint-disable-next-line @typescript-eslint/no-explicit-any
type AnyReactComponent = React.ComponentType<React.PropsWithChildren<any>>
Expand Down Expand Up @@ -250,6 +253,8 @@ function TextInputWithTokensInnerComponent<TokenComponentType extends AnyReactCo
const showTrailingLoadingIndicator =
loading && (loaderPosition === 'trailing' || (loaderPosition === 'auto' && !LeadingVisual))

const enabled = useFeatureFlag(TEXT_INPUT_CSS_MODULES_FEATURE_FLAG)

return (
<TextInputWrapper
block={block}
Expand Down Expand Up @@ -329,7 +334,8 @@ function TextInputWithTokensInnerComponent<TokenComponentType extends AnyReactCo
onBlur={handleInputBlur}
onKeyDown={handleInputKeyDown}
type="text"
sx={{height: '100%'}}
sx={enabled ? undefined : {height: '100%'}}
className={enabled ? styles.UnstyledTextInput : undefined}
aria-invalid={validationStatus === 'error' ? 'true' : 'false'}
{...inputPropsRest}
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.Input {
width: 100%;
font-family: inherit;
font-size: inherit;
color: inherit;
background-color: transparent;
border: 0;
appearance: none;

&:focus {
outline: 0;
}
}
51 changes: 37 additions & 14 deletions packages/react/src/internal/components/UnstyledTextInput.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,42 @@
import styled from 'styled-components'
import sx from '../../sx'
import sx, {type SxProp} from '../../sx'
import {toggleStyledComponent} from '../utils/toggleStyledComponent'
import React from 'react'
import {useFeatureFlag} from '../../FeatureFlags'

const UnstyledTextInput = styled.input`
border: 0;
font-size: inherit;
font-family: inherit;
background-color: transparent;
-webkit-appearance: none;
color: inherit;
width: 100%;
&:focus {
outline: 0;
}
import styles from './UnstyledTextInput.module.css'
import {clsx} from 'clsx'

${sx};
`
export const TEXT_INPUT_CSS_MODULES_FEATURE_FLAG = 'primer_react_css_modules_team'

type ToggledUnstyledTextInputProps = React.ComponentPropsWithoutRef<'input'> & SxProp

const ToggledUnstyledTextInput = toggleStyledComponent(
TEXT_INPUT_CSS_MODULES_FEATURE_FLAG,
'input',
styled.input`
border: 0;
font-size: inherit;
font-family: inherit;
background-color: transparent;
-webkit-appearance: none;
color: inherit;
width: 100%;
&:focus {
outline: 0;
}

${sx};
`,
)

const UnstyledTextInput = React.forwardRef<HTMLInputElement, ToggledUnstyledTextInputProps>(function UnstyledTextInput(
{className, ...rest},
forwardRef,
) {
const enabled = useFeatureFlag(TEXT_INPUT_CSS_MODULES_FEATURE_FLAG)
return <ToggledUnstyledTextInput ref={forwardRef} {...rest} className={clsx(className, enabled && styles.Input)} />
})
UnstyledTextInput.displayName = 'UnstyledTextInput'

export default UnstyledTextInput
Loading