diff --git a/src/components/LockScroll/index.tsx b/src/components/LockScroll/index.tsx new file mode 100644 index 0000000000..7ae45f7717 --- /dev/null +++ b/src/components/LockScroll/index.tsx @@ -0,0 +1,3 @@ +export function LockScroll() { + return null +} diff --git a/src/components/LockScroll/index.web.tsx b/src/components/LockScroll/index.web.tsx new file mode 100644 index 0000000000..2110a3cd01 --- /dev/null +++ b/src/components/LockScroll/index.web.tsx @@ -0,0 +1,3 @@ +import {RemoveScrollBar} from 'react-remove-scroll-bar' + +export const LockScroll = RemoveScrollBar diff --git a/src/components/dialogs/BlockingAnnouncements/AnnouncementDialog.tsx b/src/components/dialogs/BlockingAnnouncements/AnnouncementDialog.tsx index 58254abcc7..7119823759 100644 --- a/src/components/dialogs/BlockingAnnouncements/AnnouncementDialog.tsx +++ b/src/components/dialogs/BlockingAnnouncements/AnnouncementDialog.tsx @@ -1,15 +1,20 @@ -import {createContext, useMemo, useContext, useState, ReactNode} from 'react' -import {View, ScrollView, useWindowDimensions} from 'react-native' -// import {FocusScope} from 'radix-ui/internal' -// import {RemoveScrollBar} from 'react-remove-scroll-bar' +import { + createContext, + type ReactNode, + useContext, + useMemo, + useState, +} from 'react' +import {ScrollView, useWindowDimensions, View} from 'react-native' import {useSafeAreaInsets} from 'react-native-safe-area-context' import {LinearGradient} from 'expo-linear-gradient' -import {FocusScope} from '#/components/FocusScope' -import {isNative, isAndroid} from '#/platform/detection' -import {atoms as a, useTheme, useBreakpoints, web, flatten} from '#/alf' -import {transparentifyColor} from '#/alf/util/colorGeneration' +import {isAndroid, isNative} from '#/platform/detection' import {useA11y} from '#/state/a11y' +import {atoms as a, flatten, useBreakpoints, useTheme, web} from '#/alf' +import {transparentifyColor} from '#/alf/util/colorGeneration' +import {FocusScope} from '#/components/FocusScope' +import {LockScroll} from '#/components/LockScroll' const GUTTER = 24 @@ -50,21 +55,34 @@ export function AnnouncementDialog({ const insets = useSafeAreaInsets() return ( - - - - + <> + - {/* */} + + {gtPhone ? ( + + + + ) : ( + + )} + - + ) } diff --git a/src/components/dialogs/BlockingAnnouncements/index.tsx b/src/components/dialogs/BlockingAnnouncements/index.tsx index c1d993db95..7f20853e38 100644 --- a/src/components/dialogs/BlockingAnnouncements/index.tsx +++ b/src/components/dialogs/BlockingAnnouncements/index.tsx @@ -1,3 +1,5 @@ +import {View} from 'react-native' + import {AnnouncementDialogOuter} from '#/components/dialogs/BlockingAnnouncements/AnnouncementDialog' import * as PolicyUpdate20250801 from '#/components/dialogs/BlockingAnnouncements/PolicyUpdate20250801' import {createPortalGroup} from '#/components/Portal' @@ -5,9 +7,16 @@ import {createPortalGroup} from '#/components/Portal' const portalGroup = createPortalGroup() export const Provider = portalGroup.Provider -export const Outlet = portalGroup.Outlet export const Portal = portalGroup.Portal +export function Outlet() { + return ( + + + + ) +} + export function BlockingAnnouncements() { const policyUpdate20250801 = PolicyUpdate20250801.useLocalState()