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.

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

Jump to bottom

chore(TextInput): size audit #10589

Merged
merged 7 commits into from
Feb 2, 2022
Merged

chore(TextInput): size audit #10589

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
02c73a6
chore(TextInput): size audit
sstrubberg Jan 31, 2022
e70eb57
chore(TextInput): re-added defaultProps
sstrubberg Feb 1, 2022
1da2080
chore(TextInput): updated public snapshot
sstrubberg Feb 1, 2022
1a93a01
Merge branch 'main' into size-audit-textinput
sstrubberg Feb 2, 2022
23f24a6
chore(TextInput): moved defaultProps, updated public api snapshot
sstrubberg Feb 2, 2022
2ad8678
chore(TextInput): updated default props
sstrubberg Feb 2, 2022
0bc2706
Merge branch 'main' into size-audit-textinput
kodiakhq[bot] Feb 2, 2022
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
13 changes: 0 additions & 13 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7196,19 +7196,6 @@ Map {
},
"render": [Function],
},
"defaultProps": Object {
"disabled": false,
"helperText": "",
"inline": false,
"invalid": false,
"invalidText": "",
"light": false,
"onChange": [Function],
"onClick": [Function],
"type": "text",
"warn": false,
"warnText": "",
},
"propTypes": Object {
"className": Object {
"type": "string",
Expand Down
54 changes: 21 additions & 33 deletions packages/react/src/components/TextInput/TextInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,30 @@ import ControlledPasswordInput from './ControlledPasswordInput';
import { textInputProps } from './util';
import { FormContext } from '../FluidForm';
import { useFeatureFlag } from '../FeatureFlags';
import * as FeatureFlags from '@carbon/feature-flags';
import { usePrefix } from '../../internal/usePrefix';

const TextInput = React.forwardRef(function TextInput(
{
labelText,
className,
id,
placeholder,
type,
onChange,
onClick,
disabled = false,
helperText,
hideLabel,
disabled,
invalid,
id,
inline = false,
invalid = false,
invalidText,
warn,
warnText,
helperText,
light,
size,
inline,
labelText,
light = false,
onChange = () => {},
onClick = () => {},
placeholder,
readOnly,
...other
size = 'md',
type = 'text',
warn = false,
warnText,
...rest
},
ref
) {
Expand Down Expand Up @@ -86,7 +87,7 @@ const TextInput = React.forwardRef(function TextInput(
disabled: normalizedProps.disabled,
readOnly,
['aria-describedby']: helperText && normalizedProps.helperId,
...other,
...rest,
};
const inputWrapperClasses = classNames(
[
Expand Down Expand Up @@ -267,10 +268,11 @@ TextInput.propTypes = {
readOnly: PropTypes.bool,

/**
* Specify the size of the Text Input. Currently supports either `sm`, 'md' (default) or 'lg` as an option.
* TODO V11: remove `xl` (replaced with lg)
* Specify the size of the Text Input. Currently supports the following:
*/
size: PropTypes.oneOf(['sm', 'md', 'lg', 'xl']),
size: FeatureFlags.enabled('enable-v11-release')
? PropTypes.oneOf(['sm', 'md', 'lg'])
: PropTypes.oneOf(['sm', 'md', 'lg', 'xl']),

/**
* Specify the type of the `<input>`
Expand All @@ -293,18 +295,4 @@ TextInput.propTypes = {
warnText: PropTypes.node,
};

TextInput.defaultProps = {
disabled: false,
type: 'text',
onChange: () => {},
onClick: () => {},
invalid: false,
invalidText: '',
warn: false,
warnText: '',
helperText: '',
light: false,
inline: false,
};

export default TextInput;