Skip to content

Commit

Permalink
Conflict 해결
Browse files Browse the repository at this point in the history
Co-authored-by: Yong <[email protected]>
Co-authored-by: kwon Jaeeun <[email protected]>
Co-authored-by: rookedsysc <[email protected]>
  • Loading branch information
4 people committed Apr 6, 2024
1 parent b2fbae4 commit 7e44677
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
5 changes: 2 additions & 3 deletions src/app/provider/global-styled-provider.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import { createGlobalStyle } from "styled-components";
import reset from "styled-reset";


export const GlobalStyle = createGlobalStyle`
html, body, div, span, applet, object, iframe,
Expand Down Expand Up @@ -52,7 +50,7 @@ export const GlobalStyle = createGlobalStyle`
table {
border-collapse: collapse;
border-spacing: 0;
}
* {
box-sizing: border-box;
}
Expand All @@ -62,6 +60,7 @@ export const GlobalStyle = createGlobalStyle`
color: ${(props) => props.theme.colors.white};
}
`;

export const GlobalStyleProvider = () => {
return (
<>
Expand Down
6 changes: 4 additions & 2 deletions src/features/search-Input/ui/search-input.ui.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ const Input = styled.input`
`;

export const SearchInput = () => {
const [value, setValue] = useState();
const onChange = () => {};
const [value, setValue] = useState("");
const onChange: React.ChangeEventHandler<HTMLInputElement> = (event) => {
setValue(event.target.value);
};
return <Input placeholder="Search" value={value} onChange={onChange} />;
};

0 comments on commit 7e44677

Please sign in to comment.