From f3d2d30aa33b44453cd7fdd18144e2616b4be866 Mon Sep 17 00:00:00 2001 From: jinsil Date: Mon, 18 Nov 2024 16:34:58 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=EC=A1=B0=ED=95=A9=EC=9D=B4=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=EB=90=90=EC=9D=84=20=EB=95=8C=EB=A7=8C=20?= =?UTF-8?q?=ED=82=A4=EC=9B=8C=EB=93=9C=20=EC=B6=94=EA=B0=80=ED=95=98?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/common/keyword/Keyword.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/common/keyword/Keyword.tsx b/frontend/src/components/common/keyword/Keyword.tsx index 309c14ea..5ee53967 100644 --- a/frontend/src/components/common/keyword/Keyword.tsx +++ b/frontend/src/components/common/keyword/Keyword.tsx @@ -28,12 +28,16 @@ const Keyword = ({ currentKeywords, onKeywordsChange, error }: KeywordProps) => const trimmedKeyword = keyword.trim(); if (trimmedKeyword === "") return; + if (currentKeywords.includes(trimmedKeyword)) { setKeyword(""); return; } - onKeywordsChange([...currentKeywords, trimmedKeyword]); - setKeyword(""); + + if (e.nativeEvent.isComposing === false) { + onKeywordsChange([...currentKeywords, trimmedKeyword]); + setKeyword(""); + } } }; From 1308ae271458d19ee6d0ea7279ddd98274f1e5fa Mon Sep 17 00:00:00 2001 From: jinsil Date: Mon, 18 Nov 2024 16:35:27 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EB=B9=88=EC=B9=B8=20=EC=9C=A0?= =?UTF-8?q?=EB=8B=88=EC=BD=94=EB=93=9C=20=EC=9E=85=EB=A0=A5=ED=96=88?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=EB=8F=84=20=EC=98=88=EC=99=B8=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/common/keyword/Keyword.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/common/keyword/Keyword.tsx b/frontend/src/components/common/keyword/Keyword.tsx index 5ee53967..bbaa9b2a 100644 --- a/frontend/src/components/common/keyword/Keyword.tsx +++ b/frontend/src/components/common/keyword/Keyword.tsx @@ -29,7 +29,7 @@ const Keyword = ({ currentKeywords, onKeywordsChange, error }: KeywordProps) => if (trimmedKeyword === "") return; - if (currentKeywords.includes(trimmedKeyword)) { + if (trimmedKeyword.includes("⠀") || currentKeywords.includes(trimmedKeyword)) { setKeyword(""); return; } From 0cbb2fc6476440ec9ede952eb916fb9ff807ada0 Mon Sep 17 00:00:00 2001 From: jinsil Date: Mon, 18 Nov 2024 16:40:00 +0900 Subject: [PATCH 3/3] =?UTF-8?q?design:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EC=A4=91...=20=EA=B8=80=EC=94=A8=20=EB=B3=B4=EC=9D=B4=EA=B2=8C?= =?UTF-8?q?=20=ED=95=98=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/callback/CallbackPage.style.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/pages/callback/CallbackPage.style.ts b/frontend/src/pages/callback/CallbackPage.style.ts index 141f145c..014a8fbb 100644 --- a/frontend/src/pages/callback/CallbackPage.style.ts +++ b/frontend/src/pages/callback/CallbackPage.style.ts @@ -1,4 +1,5 @@ import styled, { keyframes } from "styled-components"; +import { Z_INDEX } from "@/styles/zIndex"; export const CallbackPageContainer = styled.div` display: flex; @@ -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}; }