Merge remote-tracking branch 'origin/main' into next/embeds

* origin/main:
  Video - remove `MediaInsetBorder` when fullscreen (#8476)
  disable avatar preview in searchable people list (#8453)
This commit is contained in:
Eric Bailey
2025-06-11 15:00:54 -05:00
3 changed files with 5 additions and 4 deletions
@@ -1,4 +1,4 @@
import React, {useEffect, useId, useRef, useState} from 'react' import {useEffect, useId, useRef, useState} from 'react'
import {View} from 'react-native' import {View} from 'react-native'
import {type AppBskyEmbedVideo} from '@atproto/api' import {type AppBskyEmbedVideo} from '@atproto/api'
import {msg} from '@lingui/macro' import {msg} from '@lingui/macro'
@@ -28,7 +28,7 @@ export function VideoEmbedInnerWeb({
const videoRef = useRef<HTMLVideoElement>(null) const videoRef = useRef<HTMLVideoElement>(null)
const [focused, setFocused] = useState(false) const [focused, setFocused] = useState(false)
const [hasSubtitleTrack, setHasSubtitleTrack] = useState(false) const [hasSubtitleTrack, setHasSubtitleTrack] = useState(false)
const [hlsLoading, setHlsLoading] = React.useState(false) const [hlsLoading, setHlsLoading] = useState(false)
const figId = useId() const figId = useId()
const {_} = useLingui() const {_} = useLingui()
@@ -101,8 +101,8 @@ export function VideoEmbedInnerWeb({
fullscreenRef={containerRef} fullscreenRef={containerRef}
hasSubtitleTrack={hasSubtitleTrack} hasSubtitleTrack={hasSubtitleTrack}
/> />
<MediaInsetBorder />
</div> </div>
<MediaInsetBorder />
</View> </View>
) )
} }
@@ -1,4 +1,4 @@
import React, {useCallback, useEffect, useRef, useState} from 'react' import {useCallback, useEffect, useRef, useState} from 'react'
import {Pressable, View} from 'react-native' import {Pressable, View} from 'react-native'
import {msg, Trans} from '@lingui/macro' import {msg, Trans} from '@lingui/macro'
import {useLingui} from '@lingui/react' import {useLingui} from '@lingui/react'
@@ -397,6 +397,7 @@ function DefaultProfileCard({
<ProfileCard.Avatar <ProfileCard.Avatar
profile={profile} profile={profile}
moderationOpts={moderationOpts} moderationOpts={moderationOpts}
disabledPreview
/> />
<View style={[a.flex_1]}> <View style={[a.flex_1]}>
<ProfileCard.Name <ProfileCard.Name