Skip to content

Commit 03c7dcc

Browse files
authored
Merge pull request Expensify#66620 from software-mansion-labs/@OlGierd03/correct-color-scroll-bar-in-help-panel
Fix Help Panel scroll bar color in dark mode
2 parents 5a9ccad + 8dbc552 commit 03c7dcc

1 file changed

Lines changed: 22 additions & 16 deletions

File tree

src/components/SidePanel/HelpModal/index.tsx

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {Animated, View} from 'react-native';
44
// @ts-expect-error This is a workaround to display HelpPane on top of everything,
55
// Modal from react-native can't be used here, as it would block interactions with the rest of the app
66
import ModalPortal from 'react-native-web/dist/exports/Modal/ModalPortal';
7+
import ColorSchemeWrapper from '@components/ColorSchemeWrapper';
78
import FocusTrapForModal from '@components/FocusTrap/FocusTrapForModal';
89
import HelpContent from '@components/SidePanel/HelpComponents/HelpContent';
910
import HelpOverlay from '@components/SidePanel/HelpComponents/HelpOverlay';
@@ -63,23 +64,28 @@ function Help({sidePanelTranslateX, closeSidePanel, shouldHideSidePanelBackdrop}
6364

6465
return (
6566
<ModalPortal>
66-
<FocusTrapForModal active={!isExtraLargeScreenWidth}>
67-
<View style={styles.sidePanelContainer}>
68-
<View>
69-
{!shouldHideSidePanelBackdrop && (
70-
<HelpOverlay
71-
onBackdropPress={closeSidePanel}
72-
isRHPVisible={isRHPVisible}
73-
/>
74-
)}
67+
<ColorSchemeWrapper>
68+
<FocusTrapForModal active={!isExtraLargeScreenWidth}>
69+
<View style={styles.sidePanelContainer}>
70+
<View>
71+
{!shouldHideSidePanelBackdrop && (
72+
<HelpOverlay
73+
onBackdropPress={closeSidePanel}
74+
isRHPVisible={isRHPVisible}
75+
/>
76+
)}
77+
</View>
78+
<Animated.View
79+
style={[
80+
styles.sidePanelContent(shouldUseNarrowLayout, isExtraLargeScreenWidth),
81+
{transform: [{translateX: sidePanelTranslateX.current}], paddingTop, paddingBottom},
82+
]}
83+
>
84+
<HelpContent closeSidePanel={closeSidePanel} />
85+
</Animated.View>
7586
</View>
76-
<Animated.View
77-
style={[styles.sidePanelContent(shouldUseNarrowLayout, isExtraLargeScreenWidth), {transform: [{translateX: sidePanelTranslateX.current}], paddingTop, paddingBottom}]}
78-
>
79-
<HelpContent closeSidePanel={closeSidePanel} />
80-
</Animated.View>
81-
</View>
82-
</FocusTrapForModal>
87+
</FocusTrapForModal>
88+
</ColorSchemeWrapper>
8389
</ModalPortal>
8490
);
8591
}

0 commit comments

Comments
 (0)