Skip to content

Commit

Permalink
fix: 버그 수정사항 반영한 develop into main (#17)
Browse files Browse the repository at this point in the history
* chore: changeLog 추가

* chore: modify template

* input 매개변수 및 마진 값 수정 (#12)

* (#11) refactor: setState -> onChange로 변경

* (#11) fix: margin left 6px 추가

* (#14) feat: modal 매개변수로 children 추가 (#15)

* fix: input label 옵셔널

* fix: modal children 옵셔널

* fix: search setState -> onChange

* fix: index에서 name CheckBox로 export
  • Loading branch information
조상현 authored Dec 20, 2022
1 parent 1d37f13 commit 5a32d46
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/components/input/Label.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Text } from '../styleGuide/text/Text';

export interface labelPropsType {
label: string;
label?: string;
}

export const Label = ({ label }: labelPropsType) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/modal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface propsType extends headerPropsType, contentPropsType {
inputList?: JSX.Element[];
buttonList: JSX.Element[];
close: () => void;
children: ReactNode;
children?: ReactNode;
}

export const Modal = ({
Expand Down
12 changes: 4 additions & 8 deletions src/components/search/index.tsx
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
import styled, { css } from 'styled-components';
import { Search } from '../styleGuide/icon/Search';
import { Dispatch, SetStateAction } from 'react';
import { ChangeEvent } from 'react';
import { marginCssType, marginToCss } from '../../utils/distance';

interface PropsType extends marginCssType {
className?: string;
value: string;
setState: Dispatch<SetStateAction<string>>;
onChange: (e: ChangeEvent<HTMLInputElement>) => void;
disabled?: boolean;
}

export const SearchBox = ({
className,
value,
setState,
onChange,
disabled,
}: PropsType) => {
return (
<_Wrapper className={className} disabled={disabled}>
<Search colorKey="gray5" size={28} className={className} />
<_Input
value={value}
onChange={(e) => setState(e.target.value)}
disabled={disabled}
/>
<_Input value={value} onChange={onChange} disabled={disabled} />
</_Wrapper>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export * from './components/button/Button';
export * from './components/checkBox';
export * as CheckBox from './components/checkBox';
export * from './components/dropdown';
export * from './components/input';
export * from './components/radio/Radio';
Expand Down

0 comments on commit 5a32d46

Please sign in to comment.