Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'develop' into feat/#70-TextField-props
  • Loading branch information
Hanna922 committed Apr 29, 2024
1 parent 3ecb08b commit c9c3561
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 5 deletions.
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;
}
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;
}
4 changes: 2 additions & 2 deletions src/components/TextField/SuffixTextField/SuffixTextField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import { TextField } from '../TextField';

import { SuffixTextFieldProps } from './SuffixTextField.type';

export const SuffixTextField = ({ ...props }: SuffixTextFieldProps) => {
return <TextField suffix={props.suffix} {...props} />;
export const SuffixTextField = ({ suffix, ...props }: SuffixTextFieldProps) => {
return <TextField suffix={suffix} {...props} />;
};
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;
}
3 changes: 3 additions & 0 deletions src/components/TextField/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ export type { SimpleTextFieldProps } from './SimpleTextField/SimpleTextField.typ

export { SuffixTextField } from './SuffixTextField/SuffixTextField';
export type { SuffixTextFieldProps } from './SuffixTextField/SuffixTextField.type';

export { PasswordTextField } from './PasswordTextField/PasswordTextField';
export type { PasswordTextFieldProps } from './PasswordTextField/PasswordTextField.type';
3 changes: 3 additions & 0 deletions src/components/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ export type { SimpleTextFieldProps } from './TextField';

export { SuffixTextField } from './TextField';
export type { SuffixTextFieldProps } from './TextField';

export { PasswordTextField } from './TextField';
export type { PasswordTextFieldProps } from './TextField';

0 comments on commit c9c3561

Please sign in to comment.