-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feat/#70-TextField-props
- Loading branch information
Showing
6 changed files
with
14 additions
and
5 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
src/components/TextField/PasswordTextField/PasswordTextField.type.ts
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 |
---|---|---|
@@ -1,6 +1,6 @@ | ||
import { TextFieldProps } from '../TextField.type'; | ||
|
||
export interface PasswordTextFieldProps extends TextFieldProps { | ||
export interface PasswordTextFieldProps extends Omit<TextFieldProps, 'suffix' | 'searchPrefix'> { | ||
/** 입력된 내용을 보지 못하게 할 것인지 나타내는 속성 */ | ||
isMarked?: boolean; | ||
} |
2 changes: 1 addition & 1 deletion
2
src/components/TextField/SimpleTextField/SimpleTextField.type.ts
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 |
---|---|---|
@@ -1,6 +1,6 @@ | ||
import { TextFieldProps } from '../TextField.type'; | ||
|
||
export interface SimpleTextFieldProps extends TextFieldProps { | ||
export interface SimpleTextFieldProps extends Omit<TextFieldProps, 'suffix' | 'searchPrefix'> { | ||
/** x 버튼을 클릭했을 때 이벤트 핸들러 */ | ||
onClickClearButton?: () => void; | ||
} |
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
5 changes: 4 additions & 1 deletion
5
src/components/TextField/SuffixTextField/SuffixTextField.type.ts
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 |
---|---|---|
@@ -1,3 +1,6 @@ | ||
import { TextFieldProps } from '../TextField.type'; | ||
|
||
export interface SuffixTextFieldProps extends TextFieldProps {} | ||
export interface SuffixTextFieldProps extends Omit<TextFieldProps, 'searchPrefix'> { | ||
/** TextField 오른쪽에 들어갈 텍스트 */ | ||
suffix?: string; | ||
} |
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 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