Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FE] 맥북에서 키워드 마지막 글자 입력되는 오류 해결(#774) #776

Merged
merged 3 commits into from
Nov 19, 2024
+9 −3
Merged

[FE] 맥북에서 키워드 마지막 글자 입력되는 오류 해결(#774) #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3d2d30
fix: 조합이 완료됐을 때만 키워드 추가하기
chlwlstlf Nov 18, 2024
1308ae2
fix: 빈칸 유니코드 입력했을 때도 예외처리
chlwlstlf Nov 18, 2024
0cbb2fc
design: 로그인 중... 글씨 보이게 하기
chlwlstlf Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions frontend/src/components/common/keyword/Keyword.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,16 @@ const Keyword = ({ currentKeywords, onKeywordsChange, error }: KeywordProps) =>
const trimmedKeyword = keyword.trim();

if (trimmedKeyword === "") return;
if (currentKeywords.includes(trimmedKeyword)) {

if (trimmedKeyword.includes("⠀") || currentKeywords.includes(trimmedKeyword)) {
setKeyword("");
return;
}
onKeywordsChange([...currentKeywords, trimmedKeyword]);
setKeyword("");

if (e.nativeEvent.isComposing === false) {
onKeywordsChange([...currentKeywords, trimmedKeyword]);
setKeyword("");
}
}
};

Expand Down
2 changes: 2 additions & 0 deletions frontend/src/pages/callback/CallbackPage.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import styled, { keyframes } from "styled-components";
import { Z_INDEX } from "@/styles/zIndex";

export const CallbackPageContainer = styled.div`
display: flex;
Expand Down Expand Up @@ -41,6 +42,7 @@ export const LoadingContainer = styled.div`
border-radius: 25px;

p {
z-index: ${Z_INDEX.header};
font: ${({ theme }) => theme.TEXT.medium_bold};
color: ${({ theme }) => theme.COLOR.grey4};
}
Expand Down
Loading