diff --git a/package.json b/package.json index 8f42dae4b5..21973ba6d4 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "@bsky.app/expo-image-crop-tool": "^0.5.0", "@bsky.app/expo-translate-text": "^0.2.9", "@bsky.app/react-native-mmkv": "2.12.5", - "@bsky.app/sift": "^0.3.1", + "@bsky.app/sift": "^0.3.2", "@bsky.app/tapper": "^0.5.0", "@discord/bottom-sheet": "bluesky-social/react-native-bottom-sheet", "@emoji-mart/data": "^1.2.1", diff --git a/src/components/Composer/index.tsx b/src/components/Composer/index.tsx index fe2e45cac5..058e0ea750 100644 --- a/src/components/Composer/index.tsx +++ b/src/components/Composer/index.tsx @@ -8,7 +8,6 @@ import Animated, { useAnimatedStyle, useSharedValue, } from 'react-native-reanimated' -import {useSafeAreaInsets} from 'react-native-safe-area-context' import {useSift, type UseSiftReturn} from '@bsky.app/sift' import { facets, @@ -121,7 +120,6 @@ export function Composer({ ...rest }: ComposerProps) { const {theme: t, fonts} = useAlf() - const insets = useSafeAreaInsets() /* * Meat and potatoes @@ -140,7 +138,6 @@ export function Composer({ offset: a.p_sm.padding, placement: autocompletePlacement, dynamicWidth: IS_WEB, - insets, }) /* @@ -306,7 +303,13 @@ export function Composer({ {IS_WEB && ( + style={[a.absolute, a.inset_0, a.z_10, {overflow: 'hidden'}]} + ref={node => { + if (IS_WEB && node) { + // @ts-ignore web only a11y + node.setAttribute('inert', '') + } + }}> setActiveFacet(null)} @@ -382,10 +386,12 @@ export function Composer({ */ function AutocompleteInner({ + inverted, sift, activeFacet, onDismiss, }: { + inverted?: boolean sift: UseSiftReturn activeFacet: TapperActiveFacet onDismiss: () => void @@ -410,7 +416,7 @@ function AutocompleteInner({ return items && items.length ? ( { diff --git a/yarn.lock b/yarn.lock index 56bf8fb518..c737205bb4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2411,10 +2411,10 @@ resolved "https://registry.yarnpkg.com/@bsky.app/react-native-mmkv/-/react-native-mmkv-2.12.5.tgz#eb17d31a6158c74393f617a1763ac223ff3f83a6" integrity sha512-3vUz1nQY1DiKIPAWRkpp5ZGxH5f2G6Ui0UuQuEYjYv81xx1qFcSzS9KQ2sHcOKYdkOM9amWV2Q8TQCxt1lrAHg== -"@bsky.app/sift@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@bsky.app/sift/-/sift-0.3.1.tgz#f529832001bcd64950c214e85aec055a1f2edcdb" - integrity sha512-jG9GDh0Yh4vBM98BP4HvBp8VBqnt+280tFx9Gh/bWYtZdiN1xfrTkqWqRkvxyujgpXlyoemREUn+7dGs8Bl60A== +"@bsky.app/sift@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@bsky.app/sift/-/sift-0.3.2.tgz#04122bf665fad3a7eb90e1d689028ec9a209c56f" + integrity sha512-u48gzcA5QNkvfWzH+gnouXxLulrgA6yIc7NwSBnEZt9XwZfClLfvEDjRk/VxU4AJlEwQRhY2ZC593H0oo+5/bQ== "@bsky.app/tapper@^0.5.0": version "0.5.0"