Skip to content

Commit 76e1d11

Browse files
author
shinhyojeong
committed
Merge branch 'develop' into feat/#206_image-modal
2 parents 92ee936 + a8e7c76 commit 76e1d11

File tree

8 files changed

+11
-18
lines changed

8 files changed

+11
-18
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@emotion/core": "^11.0.0",
2121
"@emotion/react": "^11.10.0",
2222
"@emotion/styled": "^11.10.0",
23-
"@offer-ui/react": "^0.3.1",
23+
"@offer-ui/react": "^0.3.2",
2424
"@suspensive/react": "^1.20.7",
2525
"@tanstack/react-query": "^5.8.3",
2626
"axios": "^1.2.3",

src/components/common/Header/SearchArea/index.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ export const SearchArea = ({ onClose }: SearchAreaProps) => {
66
return (
77
<Styled.SearchAreaWrapper>
88
<Styled.InputWrapper>
9-
<Styled.SearchInput
10-
placeholder="검색어를 입력하세요"
11-
styleType="search"
12-
/>
9+
<Styled.SearchInput placeholder="검색어를 입력하세요" />
1310
<Styled.CancelButton styleType="ghost" onClick={onClose}>
1411
취소
1512
</Styled.CancelButton>

src/components/common/Header/SearchArea/styled.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const InputWrapper = styled.div`
1818
padding: 36px 16px;
1919
`
2020

21-
const SearchInput = styled(Input)`
21+
const SearchInput = styled(Input.Search)`
2222
width: 100%;
2323
margin: 0;
2424
`

src/components/common/Header/index.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,7 @@ const Header = (): ReactElement => {
4747
</Link>
4848
{isActivePath && (
4949
<Styled.InputWrapper>
50-
<Styled.SearchInput
51-
placeholder="검색어를 입력하세요"
52-
styleType="search"
53-
/>
50+
<Styled.SearchInput placeholder="검색어를 입력하세요" />
5451
</Styled.InputWrapper>
5552
)}
5653
</Styled.LogoInputSection>

src/components/common/Header/styled.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const InputWrapper = styled.div`
5252
}
5353
`
5454

55-
const SearchInput = styled(Input)`
55+
const SearchInput = styled(Input.Search)`
5656
width: 426px;
5757
margin: 0;
5858
${({ theme }): string => theme.mediaQuery.tablet || theme.mediaQuery.mobile} {

src/components/messagebox/ChattingRoom/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const ChattingRoom = ({ id, onClose }: ChattingRoomProps) => {
3939
<Chatting messages={MESSAGES_MOCK} userId={1} />
4040
</Styled.ChattingWrapper>
4141
<Styled.InputWrapper>
42-
<Input styleType="chatting" />
42+
<Input.Chatting />
4343
</Styled.InputWrapper>
4444
</Styled.Container>
4545
)

src/pages/post/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ const PostPage = (): ReactElement => {
127127
maxLength={40}
128128
name="title"
129129
placeholder="제목을 입력해주세요(40자 이내)"
130-
styleType="edit"
131130
onChange={handleUpdatePostForm}
132131
/>
133132
<StyledTitleLength styleType="subtitle01M">
@@ -294,7 +293,7 @@ const StyledRadio = styled(Radio)`
294293
`}
295294
`
296295

297-
const StyledTitleInput = styled(Input)`
296+
const StyledTitleInput = styled(Input.Edit)`
298297
${({ theme }): string => `
299298
${theme.input.edit.large}
300299

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1864,10 +1864,10 @@
18641864
"@nodelib/fs.scandir" "2.1.5"
18651865
fastq "^1.6.0"
18661866

1867-
"@offer-ui/react@^0.3.1":
1868-
version "0.3.1"
1869-
resolved "https://registry.yarnpkg.com/@offer-ui/react/-/react-0.3.1.tgz#f5e36879ec083d9a6e4e994c96312c7ee06154ef"
1870-
integrity sha512-D/iQjUUQASCDUNYuRpM4xYHfsBjIN5iNv+DBULEQLHaejpEg+C80cqUK9mhdiAHVVvXGIt3p7P+nycDAHVRoPA==
1867+
"@offer-ui/react@^0.3.2":
1868+
version "0.3.2"
1869+
resolved "https://registry.yarnpkg.com/@offer-ui/react/-/react-0.3.2.tgz#b35fdd96da47fdb57f8f61506617ef7636f11f24"
1870+
integrity sha512-m7OoOoHU3xTl09XIKYlq1PWKjidzLENOXzNA0Ir1ASVFkQcbmcnrWr5yXBQJgxNEKT5n0yAVwf1EiU9NS4ADcQ==
18711871

18721872
"@pkgjs/parseargs@^0.11.0":
18731873
version "0.11.0"

0 commit comments

Comments
 (0)