🎥 Make videos programmatically with React
Show layer name tooltips only for clipped text
JonnyBurger78cd467a09bd
diff --git a/packages/studio/src/components/ActionTooltip.tsx b/packages/studio/src/components/ActionTooltip.tsxindex 078fe86e46..e146ca946e 100644--- a/packages/studio/src/components/ActionTooltip.tsx+++ b/packages/studio/src/components/ActionTooltip.tsx@@ -51,7 +51,7 @@ let visibleTooltipCount = 0;let lastTooltipHiddenAt: number | null = null;const TOOLTIP_SKIP_DELAY_WINDOW = 300;-export const ActionTooltip: React.FC<{+type ActionTooltipProps = {readonly label: React.ReactNode;readonly shortcut: string | null;/** Hover delay in milliseconds. Pass null to show immediately. */@@ -60,7 +60,13 @@ export const ActionTooltip: React.FC<{readonly side?: 'top' | 'right';readonly triggerStyle?: React.CSSProperties;readonly children: React.ReactNode;-}> = ({+};++const Tooltip: React.FC<+ ActionTooltipProps & {+ readonly overflowTarget: React.RefObject<HTMLElement | null> | null;+ }+> = ({label,shortcut,delay,@@ -68,6 +74,7 @@ export const ActionTooltip: React.FC<{side = 'top',triggerStyle,children,+ overflowTarget,}) => {const triggerRef = useRef<HTMLSpanElement>(null);const tooltipRef = useRef<HTMLDivElement>(null);@@ -110,15 +117,33 @@ export const ActionTooltip: React.FC<{setPosition(null);}, []);+ const canShow = useCallback(() => {+ if (overflowTarget === null) {+ return true;+ }++ const element = overflowTarget.current;+ return (+ element !== null &&+ (element.scrollWidth > element.clientWidth ||+ element.scrollHeight > element.clientHeight)+ );+ }, [overflowTarget]);+const show = useCallback(() => {if (timer.current !== null) {clearTimeout(timer.current);timer.current = null;}+ if (!canShow()) {+ hide();+ return;+ }+setActive(true);setVisible(true);- }, []);+ }, [canShow, hide]);useLayoutEffect(() => {const trigger = triggerRef.current;@@ -134,7 +159,7 @@ export const ActionTooltip: React.FC<{return;}- if (!hovered) {+ if (!hovered || !canShow()) {hide();return;}@@ -171,7 +196,22 @@ export const ActionTooltip: React.FC<{timer.current = null;}};- }, [hide, show]);+ }, [canShow, hide, show]);++ useEffect(() => {+ const element = overflowTarget?.current;+ if (!active || !element) {+ return;+ }++ const observer = new ResizeObserver(() => {+ if (!canShow()) {+ hide();+ }+ });+ observer.observe(element);+ return () => observer.disconnect();+ }, [active, canShow, hide, overflowTarget]);useEffect(() => {if (!active) {@@ -221,6 +261,11 @@ export const ActionTooltip: React.FC<{return;}+ if (!canShow()) {+ hide();+ return;+ }+const trigger = triggerRef.current.getBoundingClientRect();const tooltip = tooltipRef.current.getBoundingClientRect();if (side === 'right') {@@ -258,7 +303,7 @@ export const ActionTooltip: React.FC<{),),});- }, [label, shortcut, side, visible]);+ }, [canShow, hide, label, shortcut, side, visible]);return (<>@@ -310,3 +355,15 @@ export const ActionTooltip: React.FC<{</>);};++export const ActionTooltip: React.FC<ActionTooltipProps> = (props) => {+ return <Tooltip {...props} overflowTarget={null} />;+};++export const ClippedTextTooltip: React.FC<+ ActionTooltipProps & {+ readonly overflowTarget: React.RefObject<HTMLElement | null>;+ }+> = (props) => {+ return <Tooltip {...props} />;+};diff --git a/packages/studio/src/components/Timeline/TimelineSequenceName.tsx b/packages/studio/src/components/Timeline/TimelineSequenceName.tsxindex e5ab3af489..69019cefb2 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceName.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceName.tsx@@ -1,6 +1,6 @@import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';import {BLACK, TRANSPARENT, WHITE_ALPHA_72} from '../../helpers/colors';-import {ActionTooltip} from '../ActionTooltip';+import {ClippedTextTooltip} from '../ActionTooltip';import {getTimelineColor,getTimelineSelectedLabelStyle,@@ -56,6 +56,7 @@ export const TimelineSequenceName: React.FC<{chevronSlot,}) => {const inputRef = useRef<HTMLInputElement>(null);+ const nameTextRef = useRef<HTMLSpanElement>(null);const [draftName, setDraftName] = useState(displayName);const cancelNextBlurRef = useRef(false);const style = useMemo((): React.CSSProperties => {@@ -184,7 +185,8 @@ export const TimelineSequenceName: React.FC<{clipPath: chevronSlot === 'occupied' ? 'inset(0)' : undefined,}}>- <ActionTooltip+ <ClippedTextTooltip+ overflowTarget={nameTextRef}label={editableDisplayName}shortcut={null}delay={800}@@ -212,23 +214,31 @@ export const TimelineSequenceName: React.FC<{width: 'max-content',}}>- <span style={nameTextStyle}>{text}</span>- </ActionTooltip>+ <span ref={nameTextRef} style={nameTextStyle}>+ {text}+ </span>+ </ClippedTextTooltip></div>);}return (- <ActionTooltip+ <ClippedTextTooltip+ overflowTarget={nameTextRef}label={editableDisplayName}shortcut={null}delay={800}dismissOnClicktriggerStyle={style}>- <span role="group" aria-label={text} style={nameTextStyle}>+ <span+ ref={nameTextRef}+ role="group"+ aria-label={text}+ style={nameTextStyle}+ >{text}</span>- </ActionTooltip>+ </ClippedTextTooltip>);};