Skip to content

Commit cbbd856

Browse files
committed
fix: SideMain 콘텐츠 클리핑 구조 조정
1 parent 2b305df commit cbbd856

File tree

1 file changed

+49
-43
lines changed

1 file changed

+49
-43
lines changed

components/common/side-main.tsx

Lines changed: 49 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -200,52 +200,58 @@ const SideMain = ({
200200
)}
201201

202202
<div
203-
ref={containerRef}
204203
className={cn(
205-
"grow overflow-x-hidden web:rounded-lg web:scrollbar-thin mo:scrollbar-hidden",
206-
canScrollContent ? "overflow-y-auto" : "overflow-y-hidden touch-pan-y",
207-
withNav ? "pb-20 mo:pb-24" : "pb-12",
208-
headerTitle && fullHeight
209-
? isMobileApp
210-
? "mo:pt-24"
211-
: "mo:pt-10"
212-
: "",
213-
deviceType === "ios-mobile-app" && withNav ? "pb-28" : "",
214-
shouldEnableDrawerDrag && isDrawerDragging ? "touch-none" : "",
215-
bodyStyle
204+
"grow overflow-hidden web:rounded-lg"
216205
)}
217-
style={{
218-
overscrollBehaviorY: shouldEnableDrawerDrag ? "contain" : undefined,
219-
}}
220-
onScroll={onScroll}
221-
onPointerDown={handleContainerPointerDown}
222-
onPointerMove={handleContainerPointerMove}
223-
onPointerUp={handleContainerPointerEnd}
224-
onPointerCancel={handleContainerPointerEnd}
225-
onTouchStart={handleContainerTouchStart}
226-
onTouchMove={handleContainerTouchMove}
227-
onTouchEnd={handleContainerTouchEnd}
228-
onTouchCancel={handleContainerTouchEnd}
229206
>
230-
{!fullHeight && dragable && (
231-
<div
232-
className="sticky top-0 z-20 py-3 overflow-hidden backdrop-blur-sm bg-surface/92 dark:bg-black/55 rounded-t-3xl web:hidden cursor-grab active:cursor-grabbing touch-none"
233-
onPointerDown={handleGrabberPointerDown}
234-
onPointerMove={handleGrabberPointerMove}
235-
onPointerUp={handleGrabberPointerEnd}
236-
onPointerCancel={handleGrabberPointerEnd}
237-
onTouchStart={handleGrabberTouchStart}
238-
onTouchMove={handleGrabberTouchMove}
239-
onTouchEnd={handleGrabberTouchEnd}
240-
onTouchCancel={handleGrabberTouchEnd}
241-
role="button"
242-
aria-label="드로워 높이 조절"
243-
tabIndex={0}
244-
>
245-
<div className="w-1/6 h-1 mx-auto rounded-lg bg-grey" />
246-
</div>
247-
)}
248-
{children}
207+
<div
208+
ref={containerRef}
209+
className={cn(
210+
"h-full overflow-x-hidden web:scrollbar-thin mo:scrollbar-hidden",
211+
canScrollContent ? "overflow-y-auto" : "overflow-y-hidden touch-pan-y",
212+
withNav ? "pb-20 mo:pb-24" : "pb-12",
213+
headerTitle && fullHeight
214+
? isMobileApp
215+
? "mo:pt-24"
216+
: "mo:pt-10"
217+
: "",
218+
deviceType === "ios-mobile-app" && withNav ? "pb-28" : "",
219+
shouldEnableDrawerDrag && isDrawerDragging ? "touch-none" : "",
220+
bodyStyle
221+
)}
222+
style={{
223+
overscrollBehaviorY: shouldEnableDrawerDrag ? "contain" : undefined,
224+
}}
225+
onScroll={onScroll}
226+
onPointerDown={handleContainerPointerDown}
227+
onPointerMove={handleContainerPointerMove}
228+
onPointerUp={handleContainerPointerEnd}
229+
onPointerCancel={handleContainerPointerEnd}
230+
onTouchStart={handleContainerTouchStart}
231+
onTouchMove={handleContainerTouchMove}
232+
onTouchEnd={handleContainerTouchEnd}
233+
onTouchCancel={handleContainerTouchEnd}
234+
>
235+
{!fullHeight && dragable && (
236+
<div
237+
className="sticky top-0 z-20 py-3 overflow-hidden backdrop-blur-sm bg-surface/92 dark:bg-black/55 rounded-t-3xl web:hidden cursor-grab active:cursor-grabbing touch-none"
238+
onPointerDown={handleGrabberPointerDown}
239+
onPointerMove={handleGrabberPointerMove}
240+
onPointerUp={handleGrabberPointerEnd}
241+
onPointerCancel={handleGrabberPointerEnd}
242+
onTouchStart={handleGrabberTouchStart}
243+
onTouchMove={handleGrabberTouchMove}
244+
onTouchEnd={handleGrabberTouchEnd}
245+
onTouchCancel={handleGrabberTouchEnd}
246+
role="button"
247+
aria-label="드로워 높이 조절"
248+
tabIndex={0}
249+
>
250+
<div className="w-1/6 h-1 mx-auto rounded-lg bg-grey" />
251+
</div>
252+
)}
253+
{children}
254+
</div>
249255
</div>
250256

251257
{withNav && (

0 commit comments

Comments
 (0)