-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
TextControl: Convert component to TypeScript #40633
Merged
+185
−119
Merged
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
890237f
TextControl: Covert component to TypeScript
ef3a12e
Don't export unforwarded component
fd4032c
Apply suggestions from code review
e5fe71c
Move WordPressComponentProps to the component
0224055
Merge branch 'trunk' into refactor/text-control-to-typescript
1667458
Update CHANGELOG.md
e30a8dd
Update storybook
ecb0f67
Merge branch 'trunk' into refactor/text-control-to-typescript
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
/** | ||
* External dependencies | ||
*/ | ||
import type { ChangeEvent, ForwardedRef } from 'react'; | ||
|
||
/** | ||
* WordPress dependencies | ||
*/ | ||
import { useInstanceId } from '@wordpress/compose'; | ||
import { forwardRef } from '@wordpress/element'; | ||
|
||
/** | ||
* Internal dependencies | ||
*/ | ||
import BaseControl from '../base-control'; | ||
import type { WordPressComponentProps } from '../ui/context'; | ||
import type { TextControlProps } from './types'; | ||
|
||
function UnforwardedTextControl( | ||
props: WordPressComponentProps< TextControlProps, 'input', false >, | ||
ref: ForwardedRef< HTMLInputElement > | ||
) { | ||
const { | ||
label, | ||
hideLabelFromVision, | ||
value, | ||
help, | ||
className, | ||
onChange, | ||
type = 'text', | ||
...additionalProps | ||
} = props; | ||
const instanceId = useInstanceId( TextControl ); | ||
const id = `inspector-text-control-${ instanceId }`; | ||
const onChangeValue = ( event: ChangeEvent< HTMLInputElement > ) => | ||
onChange( event.target.value ); | ||
|
||
return ( | ||
<BaseControl | ||
label={ label } | ||
hideLabelFromVision={ hideLabelFromVision } | ||
id={ id } | ||
help={ help } | ||
className={ className } | ||
> | ||
<input | ||
className="components-text-control__input" | ||
type={ type } | ||
id={ id } | ||
value={ value } | ||
onChange={ onChangeValue } | ||
aria-describedby={ !! help ? id + '__help' : undefined } | ||
ref={ ref } | ||
{ ...additionalProps } | ||
/> | ||
</BaseControl> | ||
); | ||
} | ||
|
||
/** | ||
* TextControl components let users enter and edit text. | ||
* | ||
* | ||
* @example | ||
* ```jsx | ||
* import { TextControl } from '@wordpress/components'; | ||
* import { useState } from '@wordpress/element'; | ||
* | ||
* const MyTextControl = () => { | ||
* const [ className, setClassName ] = useState( '' ); | ||
* | ||
* return ( | ||
* <TextControl | ||
* label="Additional CSS Class" | ||
* value={ className } | ||
* onChange={ ( value ) => setClassName( value ) } | ||
* /> | ||
* ); | ||
* }; | ||
* ``` | ||
*/ | ||
export const TextControl = forwardRef( UnforwardedTextControl ); | ||
|
||
export default TextControl; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
/** | ||
* External dependencies | ||
*/ | ||
import type { ComponentMeta, ComponentStory } from '@storybook/react'; | ||
|
||
/** | ||
* WordPress dependencies | ||
*/ | ||
import { useState } from '@wordpress/element'; | ||
|
||
/** | ||
* Internal dependencies | ||
*/ | ||
import TextControl from '..'; | ||
|
||
const meta: ComponentMeta< typeof TextControl > = { | ||
component: TextControl, | ||
title: 'Components/TextControl', | ||
argTypes: { | ||
onChange: { | ||
action: 'onChange', | ||
}, | ||
value: { | ||
control: { type: null }, | ||
ciampo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}, | ||
}, | ||
parameters: { | ||
controls: { | ||
expanded: true, | ||
}, | ||
docs: { source: { state: 'open' } }, | ||
}, | ||
}; | ||
export default meta; | ||
|
||
const DefaultTemplate: ComponentStory< typeof TextControl > = ( { | ||
onChange, | ||
...args | ||
} ) => { | ||
const [ value, setValue ] = useState( '' ); | ||
|
||
return ( | ||
<TextControl | ||
{ ...args } | ||
value={ value } | ||
onChange={ ( v ) => { | ||
setValue( v ); | ||
onChange( v ); | ||
} } | ||
/> | ||
); | ||
}; | ||
|
||
export const Default: ComponentStory< | ||
typeof TextControl | ||
> = DefaultTemplate.bind( {} ); | ||
Default.args = {}; | ||
|
||
export const WithLabelAndHelpText: ComponentStory< | ||
typeof TextControl | ||
> = DefaultTemplate.bind( {} ); | ||
WithLabelAndHelpText.args = { | ||
...Default.args, | ||
label: 'Label Text', | ||
help: 'Help text to explain the input.', | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/** | ||
* External dependencies | ||
*/ | ||
import type { HTMLInputTypeAttribute } from 'react'; | ||
|
||
/** | ||
* Internal dependencies | ||
*/ | ||
import type { BaseControlProps } from '../base-control/types'; | ||
|
||
export type TextControlProps = Pick< | ||
BaseControlProps, | ||
'className' | 'hideLabelFromVision' | 'help' | 'label' | ||
> & { | ||
/** | ||
* A function that receives the value of the input. | ||
*/ | ||
onChange: ( value: string ) => void; | ||
/** | ||
* The current value of the input. | ||
*/ | ||
value: string | number; | ||
/** | ||
* Type of the input element to render. Defaults to "text". | ||
* | ||
* @default 'text' | ||
*/ | ||
type?: HTMLInputTypeAttribute; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
By the way, sorry about ef3a12e! I fixed up the contributing guide in #40682.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No worries :) Great that you updated the guide. Did follow the guide and seems to cover most of the stuff you need.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oooh, good to hear! 🙌
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the feedback! And of course do let us know if you feel like there's something missing (or something wrong) in the guide 😄