Skip to content

Commit c59385d

Browse files
malwilleyandrewshie-sentry
authored andcommitted
fix(nav): Fix secondary sidebar scrolling (#93576)
1 parent 88b1e37 commit c59385d

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

static/app/views/nav/secondary/secondarySidebar.tsx

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ export function SecondarySidebar() {
5151
const activeNavGroup = activePrimaryNavGroup ?? defaultActiveNavGroup;
5252

5353
return (
54-
<ResizeWrapper ref={resizableContainerRef} onMouseDown={handleStartResize}>
55-
<NavTourElement
56-
id={stepId}
57-
description={STACKED_NAVIGATION_TOUR_CONTENT[stepId].description}
58-
title={STACKED_NAVIGATION_TOUR_CONTENT[stepId].title}
59-
>
54+
<SecondarySidebarWrapper
55+
id={stepId}
56+
description={STACKED_NAVIGATION_TOUR_CONTENT[stepId].description}
57+
title={STACKED_NAVIGATION_TOUR_CONTENT[stepId].title}
58+
>
59+
<ResizeWrapper ref={resizableContainerRef} onMouseDown={handleStartResize}>
6060
<AnimatePresence mode="wait" initial={false}>
6161
<MotionDiv
6262
key={activeNavGroup}
@@ -77,19 +77,23 @@ export function SecondarySidebar() {
7777
/>
7878
</MotionDiv>
7979
</AnimatePresence>
80-
</NavTourElement>
81-
</ResizeWrapper>
80+
</ResizeWrapper>
81+
</SecondarySidebarWrapper>
8282
);
8383
}
8484

85-
const ResizeWrapper = styled('div')`
86-
position: relative;
87-
right: 0;
85+
const SecondarySidebarWrapper = styled(NavTourElement)`
86+
background: ${p => (p.theme.isChonk ? p.theme.background : p.theme.surface200)};
8887
border-right: 1px solid
8988
${p => (p.theme.isChonk ? p.theme.border : p.theme.translucentGray200)};
90-
background: ${p => (p.theme.isChonk ? p.theme.background : p.theme.surface200)};
89+
position: relative;
9190
z-index: ${p => p.theme.zIndex.sidebarPanel};
9291
height: 100%;
92+
`;
93+
94+
const ResizeWrapper = styled('div')`
95+
right: 0;
96+
height: 100%;
9397
width: ${SECONDARY_SIDEBAR_WIDTH}px;
9498
`;
9599

0 commit comments

Comments
 (0)