🎥 Make videos programmatically with React
Elements: Remove caption width caps and center basic captions
Jonny Burger2c8edfed0422
diff --git a/packages/docs/elements/captions/basic-captions/basic-captions.tsx b/packages/docs/elements/captions/basic-captions/basic-captions.tsxindex f21b2a6a56..e6ecbb78e5 100644--- a/packages/docs/elements/captions/basic-captions/basic-captions.tsx+++ b/packages/docs/elements/captions/basic-captions/basic-captions.tsx@@ -21,7 +21,6 @@ type BasicCaptionsProps = InteractiveBaseProps &};const defaultCombineTokensWithinMilliseconds = 2000;-const maximumTextWidth = 800;const basicCaptionsSchema = {...Interactive.baseSchema,@@ -54,10 +53,9 @@ const basicCaptionsSchema = {} as const satisfies InteractivitySchema;const BasicCaptionsContent: React.FC<{- readonly captionAreaWidth: number | null;readonly captions: Caption[];readonly combineTokensWithinMilliseconds: number;-}> = ({captionAreaWidth, captions, combineTokensWithinMilliseconds}) => {+}> = ({captions, combineTokensWithinMilliseconds}) => {const frame = useCurrentFrame();const {fps} = useVideoConfig();const pages = useMemo(@@ -92,10 +90,6 @@ const BasicCaptionsContent: React.FC<{fontSize: 64,fontWeight: 400,lineHeight: 1.2,- maxWidth: Math.min(- maximumTextWidth,- captionAreaWidth ?? maximumTextWidth,- ),overflow: 'hidden',padding: '14px 22px',textAlign: 'center',@@ -124,6 +118,7 @@ const BasicCaptionsInner = forwardRef<name,style,width,+ height,...interactiveProps},ref,@@ -145,14 +140,14 @@ const BasicCaptionsInner = forwardRef<style={{alignItems: 'center',display: 'flex',- height: '100%',justifyContent: 'center',- width: '100%',+ marginInline: 'auto',+ width,+ height,...style,}}><BasicCaptionsContent- captionAreaWidth={width ?? null}captions={captions}combineTokensWithinMilliseconds={combineTokensWithinMilliseconds}/>diff --git a/packages/docs/elements/captions/moving-pill-captions/moving-pill-captions.tsx b/packages/docs/elements/captions/moving-pill-captions/moving-pill-captions.tsxindex c434e18b9c..1634802f2f 100644--- a/packages/docs/elements/captions/moving-pill-captions/moving-pill-captions.tsx+++ b/packages/docs/elements/captions/moving-pill-captions/moving-pill-captions.tsx@@ -34,7 +34,6 @@ type MovingPillCaptionsProps = InteractiveBaseProps &};const desiredFontSize = 80;-const maximumTextWidth = 800;const fontWeight = '700';const textColor = '#ffffff';const backgroundColor = '#0b84f3';@@ -124,11 +123,9 @@ const CaptionPage: React.FC<{readonly page: TikTokPage;readonly pageIndex: number;}> = ({captionAreaWidth, currentTimeMs, fps, page, pageIndex}) => {+ const {width: compositionWidth} = useVideoConfig();+ const availableWidth = captionAreaWidth ?? compositionWidth;const fontSize = useMemo(() => {- const availableWidth = Math.min(- maximumTextWidth,- captionAreaWidth ?? maximumTextWidth,- );const maximumTokenWidth = Math.max(1,availableWidth - pillHorizontalPadding * 2,@@ -154,11 +151,11 @@ const CaptionPage: React.FC<{fontWeight,text: page.text,validateFontIsLoaded: true,- withinWidth: maximumTextWidth,+ withinWidth: availableWidth,}).fontSize,...tokenFontSizes,);- }, [captionAreaWidth, page.text, page.tokens]);+ }, [availableWidth, page.text, page.tokens]);const textContainerRef = useRef<HTMLDivElement>(null);const tokenRefs = useRef<Array<HTMLSpanElement | null>>([]);const [tokenLayouts, setTokenLayouts] = useState<TokenLayout[]>([]);@@ -275,7 +272,6 @@ const CaptionPage: React.FC<{fontSize,fontWeight,lineHeight: 1.5,- maxWidth: maximumTextWidth,paintOrder: 'stroke fill',position: 'relative',textAlign: 'center',diff --git a/packages/docs/elements/captions/popping-word-captions/popping-word-captions.tsx b/packages/docs/elements/captions/popping-word-captions/popping-word-captions.tsxindex c5524f928e..c3c25615dd 100644--- a/packages/docs/elements/captions/popping-word-captions/popping-word-captions.tsx+++ b/packages/docs/elements/captions/popping-word-captions/popping-word-captions.tsx@@ -33,7 +33,6 @@ type PoppingWordCaptionsProps = InteractiveBaseProps &};const desiredFontSize = 80;-const maximumTextWidth = 800;const fontWeight = '700';const textColor = '#ffffff';const highlightColor = '#4da3ff';@@ -146,11 +145,9 @@ const CaptionPage: React.FC<{readonly page: TikTokPage;readonly pageIndex: number;}> = ({captionAreaWidth, currentTimeMs, fps, page, pageIndex}) => {+ const {width: compositionWidth} = useVideoConfig();+ const availableWidth = captionAreaWidth ?? compositionWidth;const fontSize = useMemo(() => {- const availableWidth = Math.min(- maximumTextWidth,- captionAreaWidth ?? maximumTextWidth,- );const maximumTokenWidth = Math.max(1, availableWidth / activeWordScale);const tokenFontSizes = page.tokens.map((token) => token.text.trim())@@ -173,11 +170,11 @@ const CaptionPage: React.FC<{fontWeight,text: page.text,validateFontIsLoaded: true,- withinWidth: maximumTextWidth,+ withinWidth: availableWidth,}).fontSize,...tokenFontSizes,);- }, [captionAreaWidth, page.text, page.tokens]);+ }, [availableWidth, page.text, page.tokens]);const activeTokenIndex = getActiveTokenIndex(page.tokens, currentTimeMs);const textStrokeWidth = fontSize / 7;@@ -202,7 +199,6 @@ const CaptionPage: React.FC<{fontSize,fontWeight,lineHeight: 1.5,- maxWidth: maximumTextWidth,paintOrder: 'stroke fill',textAlign: 'center',WebkitTextStroke: `${textStrokeWidth}px #000000`,diff --git a/packages/docs/elements/captions/word-highlight-captions/word-highlight-captions.tsx b/packages/docs/elements/captions/word-highlight-captions/word-highlight-captions.tsxindex bf796efe7d..d848ae2414 100644--- a/packages/docs/elements/captions/word-highlight-captions/word-highlight-captions.tsx+++ b/packages/docs/elements/captions/word-highlight-captions/word-highlight-captions.tsx@@ -31,7 +31,6 @@ type WordHighlightCaptionsProps = InteractiveBaseProps &};const desiredFontSize = 80;-const maximumTextWidth = 800;const fontWeight = '700';const textColor = '#ffffff';const highlightColor = '#4da3ff';@@ -107,11 +106,9 @@ const CaptionPage: React.FC<{readonly page: TikTokPage;readonly pageIndex: number;}> = ({captionAreaWidth, currentTimeMs, page, pageIndex}) => {+ const {width: compositionWidth} = useVideoConfig();+ const availableWidth = captionAreaWidth ?? compositionWidth;const fontSize = useMemo(() => {- const availableWidth = Math.min(- maximumTextWidth,- captionAreaWidth ?? maximumTextWidth,- );const maximumTokenWidth = Math.max(1, availableWidth);const tokenFontSizes = page.tokens.map((token) => token.text.trim())@@ -134,11 +131,11 @@ const CaptionPage: React.FC<{fontWeight,text: page.text,validateFontIsLoaded: true,- withinWidth: maximumTextWidth,+ withinWidth: availableWidth,}).fontSize,...tokenFontSizes,);- }, [captionAreaWidth, page.text, page.tokens]);+ }, [availableWidth, page.text, page.tokens]);const activeTokenIndex = getActiveTokenIndex(page.tokens, currentTimeMs);const textStrokeWidth = fontSize / 7;@@ -163,7 +160,6 @@ const CaptionPage: React.FC<{fontSize,fontWeight,lineHeight: 1.5,- maxWidth: maximumTextWidth,paintOrder: 'stroke fill',textAlign: 'center',WebkitTextStroke: `${textStrokeWidth}px #000000`,