Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion src/components/SelectTag/TagSheet/TagSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import Text from "@/components/ui/Text/Text";

import useOnClickOutside from "@/hooks/common/useClickOutside";
import { useFocus } from "@/hooks/common/useFocus";
import { useKeyboardResize } from "@/hooks/common/useKeyboardResize";

interface TagSheetProps {
isOpen: boolean;
Expand All @@ -23,6 +24,8 @@ interface TagSheetProps {
const TagSheet = ({ isOpen, tagList, handleClose, handleTagAdd }: TagSheetProps) => {
const { isFocus, onFocus, onBlur } = useFocus({ defaultFocus: true });

const { keyboardVisible, keyboardHeight } = useKeyboardResize();

const [newTag, setNewTag] = useState("");

const modalRef = useRef<HTMLDivElement>(null);
Expand Down Expand Up @@ -103,7 +106,14 @@ const TagSheet = ({ isOpen, tagList, handleClose, handleTagAdd }: TagSheetProps)
)}
</div>

<Button text="추가하기" disabled={isInputError || isInputEmpty} onClick={handleAddTag} />
<Button
text="추가하기"
disabled={isInputError || isInputEmpty}
onClick={handleAddTag}
style={{
transform: `translateY(-${keyboardVisible ? keyboardHeight : 0}px)`,
}}
/>
</Dialog.Content>
</Dialog.Portal>
</Dialog.Root>
Expand Down

This file was deleted.

7 changes: 0 additions & 7 deletions src/components/common/SafeAreaWrapper/SafeAreaWrapper.tsx

This file was deleted.

49 changes: 49 additions & 0 deletions src/hooks/common/useKeyboardResize.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { useState, useEffect } from "react";

export const useKeyboardResize = () => {
const [keyboardVisible, setKeyboardVisible] = useState(false);
const [keyboardHeight, setKeyboardHeight] = useState(0);

useEffect(() => {
let timeoutId: NodeJS.Timeout;

const handleVisualViewportChange = () => {
clearTimeout(timeoutId);

timeoutId = setTimeout(() => {
if (window.visualViewport) {
const isKeyboardVisible = window.visualViewport.height < window.innerHeight;
const newKeyboardHeight = isKeyboardVisible
? window.innerHeight - window.visualViewport.height
: 0;

if (isKeyboardVisible && newKeyboardHeight === 0) {
setTimeout(() => {
if (window.visualViewport) {
setKeyboardHeight(window.innerHeight - window.visualViewport.height);
}
}, 300);
} else {
setKeyboardHeight(newKeyboardHeight);
}

setKeyboardVisible(isKeyboardVisible);
}
}, 100);
};

if (window.visualViewport) {
window.visualViewport.addEventListener("resize", handleVisualViewportChange);
handleVisualViewportChange();
}

return () => {
if (window.visualViewport) {
window.visualViewport.removeEventListener("resize", handleVisualViewportChange);
}
clearTimeout(timeoutId);
};
}, []);

return { keyboardVisible, keyboardHeight };
};
7 changes: 2 additions & 5 deletions src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";

import AppRouter from "@/router/AppRouter";

import SafeAreaWrapper from "@/components/common/SafeAreaWrapper/SafeAreaWrapper";
import { AppBridgeProvider } from "@/components/provider/AppBridgeProvider/AppBridgeProvider";
import ReactQueryClientProvider from "@/components/provider/ReactQueryClientProvider";
import { UserAgentProvider } from "@/components/provider/UserAgentProvider";
Expand All @@ -18,10 +17,8 @@ ReactDom.createRoot(document.getElementById("root")!).render(
<ReactQueryClientProvider>
<UserAgentProvider>
<AppBridgeProvider>
<SafeAreaWrapper>
<AppRouter />
<ReactQueryDevtools initialIsOpen={false} />
</SafeAreaWrapper>
<AppRouter />
<ReactQueryDevtools initialIsOpen={false} />
</AppBridgeProvider>
</UserAgentProvider>
</ReactQueryClientProvider>
Expand Down