Bring video cropping in line with images (#7462)

* Mimic image cropping for videos on web

* Same on native

src/view/com/util/post-embeds/VideoEmbed.tsx

@@ -5,9 +5,9 @@ import {AppBskyEmbedVideo} from '@atproto/api'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {clamp} from '#/lib/numbers'
+import {ConstrainedImage} from '#/view/com/util/images/AutoSizedImage'
 import {VideoEmbedInnerNative} from '#/view/com/util/post-embeds/VideoEmbedInner/VideoEmbedInnerNative'
-import {atoms as a} from '#/alf'
+import {atoms as a, useTheme} from '#/alf'
 import {Button} from '#/components/Button'
 import {useThrottledValue} from '#/components/hooks/useThrottledValue'
 import {PlayButtonIcon} from '#/components/video/PlayButtonIcon'
@@ -16,9 +16,11 @@ import * as VideoFallback from './VideoEmbedInner/VideoFallback'
 
 interface Props {
   embed: AppBskyEmbedVideo.View
+  crop?: 'none' | 'square' | 'constrained'
 }
 
-export function VideoEmbed({embed}: Props) {
+export function VideoEmbed({embed, crop}: Props) {
+  const t = useTheme()
   const [key, setKey] = useState(0)
 
   const renderError = useCallback(
@@ -28,26 +30,51 @@ export function VideoEmbed({embed}: Props) {
     [key],
   )
 
-  let aspectRatio = 16 / 9
+  let aspectRatio: number | undefined
-  if (embed.aspectRatio) {
+  const dims = embed.aspectRatio
-    const {width, height} = embed.aspectRatio
+  if (dims) {
-    aspectRatio = width / height
+    aspectRatio = dims.width / dims.height
-    aspectRatio = clamp(aspectRatio, 1 / 1, 3 / 1)
+    if (Number.isNaN(aspectRatio)) {
+      aspectRatio = undefined
+    }
   }
 
+  let constrained: number | undefined
+  let max: number | undefined
+  if (aspectRatio !== undefined) {
+    const ratio = 1 / 2 // max of 1:2 ratio in feeds
+    constrained = Math.max(aspectRatio, ratio)
+    max = Math.max(aspectRatio, 0.25) // max of 1:4 in thread
+  }
+  const cropDisabled = crop === 'none'
+
+  const contents = (
+    <ErrorBoundary renderError={renderError} key={key}>
+      <InnerWrapper embed={embed} />
+    </ErrorBoundary>
+  )
+
   return (
-    <View
+    <View style={[a.pt_xs]}>
-      style={[
+      {cropDisabled ? (
-        a.w_full,
+        <View
-        a.rounded_md,
+          style={[
-        a.overflow_hidden,
+            a.w_full,
-        {aspectRatio},
+            a.overflow_hidden,
-        {backgroundColor: 'black'},
+            {aspectRatio: max ?? 1},
-        a.mt_xs,
+            a.rounded_md,
-      ]}>
+            a.overflow_hidden,
-      <ErrorBoundary renderError={renderError} key={key}>
+            t.atoms.bg_contrast_25,
-        <InnerWrapper embed={embed} />
+          ]}>
-      </ErrorBoundary>
+          {contents}
+        </View>
+      ) : (
+        <ConstrainedImage
+          fullBleed={crop === 'square'}
+          aspectRatio={constrained || 1}>
+          {contents}
+        </ConstrainedImage>
+      )}
     </View>
   )
 }

src/view/com/util/post-embeds/VideoEmbed.web.tsx

@@ -5,7 +5,7 @@ import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {isFirefox} from '#/lib/browser'
-import {clamp} from '#/lib/numbers'
+import {ConstrainedImage} from '#/view/com/util/images/AutoSizedImage'
 import {
   HLSUnsupportedError,
   VideoEmbedInnerWeb,
@@ -18,7 +18,13 @@ import {ErrorBoundary} from '../ErrorBoundary'
 import {useActiveVideoWeb} from './ActiveVideoWebContext'
 import * as VideoFallback from './VideoEmbedInner/VideoFallback'
 
-export function VideoEmbed({embed}: {embed: AppBskyEmbedVideo.View}) {
+export function VideoEmbed({
+  embed,
+  crop,
+}: {
+  embed: AppBskyEmbedVideo.View
+  crop?: 'none' | 'square' | 'constrained'
+}) {
   const ref = useRef<HTMLDivElement>(null)
   const {active, setActive, sendPosition, currentActiveView} =
     useActiveVideoWeb()
@@ -52,42 +58,58 @@ export function VideoEmbed({embed}: {embed: AppBskyEmbedVideo.View}) {
     [key],
   )
 
-  let aspectRatio = 16 / 9
+  let aspectRatio: number | undefined
-
+  const dims = embed.aspectRatio
-  if (embed.aspectRatio) {
+  if (dims) {
-    const {width, height} = embed.aspectRatio
+    aspectRatio = dims.width / dims.height
-    // min: 3/1, max: square
+    if (Number.isNaN(aspectRatio)) {
-    aspectRatio = clamp(width / height, 1 / 1, 3 / 1)
+      aspectRatio = undefined
+    }
   }
 
+  let constrained: number | undefined
+  let max: number | undefined
+  if (aspectRatio !== undefined) {
+    const ratio = 1 / 2 // max of 1:2 ratio in feeds
+    constrained = Math.max(aspectRatio, ratio)
+    max = Math.max(aspectRatio, 0.25) // max of 1:4 in thread
+  }
+  const cropDisabled = crop === 'none'
+
+  const contents = (
+    <div
+      ref={ref}
+      style={{display: 'flex', flex: 1, cursor: 'default'}}
+      onClick={evt => evt.stopPropagation()}>
+      <ErrorBoundary renderError={renderError} key={key}>
+        <ViewportObserver
+          sendPosition={sendPosition}
+          isAnyViewActive={currentActiveView !== null}>
+          <VideoEmbedInnerWeb
+            embed={embed}
+            active={active}
+            setActive={setActive}
+            onScreen={onScreen}
+            lastKnownTime={lastKnownTime}
+          />
+        </ViewportObserver>
+      </ErrorBoundary>
+    </div>
+  )
+
   return (
-    <View
+    <View style={[a.pt_xs]}>
-      style={[
+      {cropDisabled ? (
-        a.w_full,
+        <View style={[a.w_full, a.overflow_hidden, {aspectRatio: max ?? 1}]}>
-        {aspectRatio},
+          {contents}
-        {backgroundColor: 'black'},
+        </View>
-        a.relative,
+      ) : (
-        a.rounded_md,
+        <ConstrainedImage
-        a.mt_xs,
+          fullBleed={crop === 'square'}
-      ]}>
+          aspectRatio={constrained || 1}>
-      <div
+          {contents}
-        ref={ref}
+        </ConstrainedImage>
-        style={{display: 'flex', flex: 1, cursor: 'default'}}
+      )}
-        onClick={evt => evt.stopPropagation()}>
-        <ErrorBoundary renderError={renderError} key={key}>
-          <ViewportObserver
-            sendPosition={sendPosition}
-            isAnyViewActive={currentActiveView !== null}>
-            <VideoEmbedInnerWeb
-              embed={embed}
-              active={active}
-              setActive={setActive}
-              onScreen={onScreen}
-              lastKnownTime={lastKnownTime}
-            />
-          </ViewportObserver>
-        </ErrorBoundary>
-      </div>
     </View>
   )
 }

src/view/com/util/post-embeds/index.tsx

@@ -237,7 +237,16 @@ export function PostEmbeds({
   if (AppBskyEmbedVideo.isView(embed)) {
     return (
       <ContentHider modui={moderation?.ui('contentMedia')}>
-        <VideoEmbed embed={embed} />
+        <VideoEmbed
+          embed={embed}
+          crop={
+            viewContext === PostEmbedViewContext.ThreadHighlighted
+              ? 'none'
+              : viewContext === PostEmbedViewContext.FeedEmbedRecordWithMedia
+              ? 'square'
+              : 'constrained'
+          }
+        />
       </ContentHider>
     )
   }