🎥 Make videos programmatically with React
Fix remaining Studio hover states and submenu delays
Jonny Burger3ab9fdecd11e
diff --git a/packages/browser-studio/e2e/browser-studio.test.ts b/packages/browser-studio/e2e/browser-studio.test.tsindex fae72f6d03..4a54402744 100644--- a/packages/browser-studio/e2e/browser-studio.test.ts+++ b/packages/browser-studio/e2e/browser-studio.test.ts@@ -1573,6 +1573,12 @@ test('clears hover backgrounds and tooltips even if pointer leave events are losawait page.locator('iframe').dispatchEvent('pointerout');await expect(hoveredOutline).toHaveCount(0, {timeout: 5000});await neutralArea.hover();+ // Native tracking must recover entry into a timeline row too, even when+ // React cannot synthesize an enter from the suppressed pointerout event.+ await solid.hover();+ await expect(hoveredOutline).toHaveCount(1);+ await neutralArea.hover();+ await expect(hoveredOutline).toHaveCount(0);await studio.getByRole('button', {name: 'Assets', exact: true}).click();const assetFolder = studio.getByRole('group', {@@ -1686,6 +1692,133 @@ test('clears hover backgrounds and tooltips even if pointer leave events are losthrow new Error('Expected the Studio iframe to be visible');}+ // Shared controls must also recover without their own leave callbacks.+ await studio.getByRole('button', {name: 'Settings', exact: true}).click();+ const modelsTab = studio.getByRole('button', {name: 'Models', exact: true});+ await page.mouse.move(iframeBox.x + iframeBox.width + 12, 100);+ await modelsTab.hover();+ await expect+ .poll(() => getBackgroundColor(modelsTab), {timeout: 5000})+ .toBe('rgba(255, 255, 255, 0.06)');+ await page.mouse.move(iframeBox.x + iframeBox.width + 12, 100);+ await expect+ .poll(() => getBackgroundColor(modelsTab), {timeout: 5000})+ .toBe('rgba(0, 0, 0, 0)');+ await studio.getByRole('button', {name: 'Close dialog'}).click();++ const sourceLocation = studio.getByRole('group', {+ name: 'Inspector source location',+ });+ const copyContext = sourceLocation.getByRole('button', {+ name: 'Copy context for agents',+ });+ await sourceLocation.hover();+ await expect+ .poll(() =>+ copyContext.evaluate((element) =>+ element.checkVisibility({checkOpacity: true}),+ ),+ )+ .toBe(true);+ await page.mouse.move(iframeBox.x + iframeBox.width + 12, 100);+ await expect+ .poll(() =>+ copyContext.evaluate((element) =>+ element.checkVisibility({checkOpacity: true}),+ ),+ )+ .toBe(false);+ await copyContext.focus();+ await expect(copyContext).toBeFocused();+ await expect+ .poll(() =>+ copyContext.evaluate((element) =>+ element.checkVisibility({checkOpacity: true}),+ ),+ )+ .toBe(true);++ await studio+ .getByRole('button', {name: 'Export the current composition (R)'})+ .click();+ const containerInput = studio.getByRole('button', {+ name: 'Container',+ exact: true,+ });+ const outputName = studio.getByRole('textbox', {name: 'Output name'});+ for (const input of [containerInput, outputName]) {+ await input.hover();+ await expect(input).toHaveCSS('border-color', 'rgba(255, 255, 255, 0.05)');+ await page.mouse.move(iframeBox.x + iframeBox.width + 12, 100);+ await expect(input).toHaveCSS('border-color', 'rgba(0, 0, 0, 0.6)');+ }++ await outputName.focus();+ const focusedBorder = await outputName.evaluate(+ (element) => window.getComputedStyle(element).borderColor,+ );+ await outputName.hover();+ await page.mouse.move(iframeBox.x + iframeBox.width + 12, 100);+ await expect(outputName).toBeFocused();+ await expect(outputName).toHaveCSS('border-color', focusedBorder);+ await studio.getByRole('button', {name: 'Close dialog'}).click();++ await studio.getByRole('button', {name: 'View', exact: true}).click();+ const leftSidebarMenu = studio.getByRole('button', {+ name: 'Left Sidebar',+ exact: true,+ });+ const responsive = studio.getByRole('button', {+ name: 'Responsive',+ exact: true,+ });+ await leftSidebarMenu.hover();+ await expect(responsive).toBeVisible();+ await page.keyboard.press('Escape');+ await studio.getByRole('button', {name: 'View', exact: true}).click();+ await leftSidebarMenu.hover();+ await page.mouse.move(iframeBox.x + iframeBox.width + 12, 100);+ await page.waitForTimeout(200);+ await expect(responsive).toHaveCount(0);+ // Keyboard selection must not inherit a different row's hover timer.+ await leftSidebarMenu.hover();+ await page.keyboard.press('ArrowDown');+ await page.waitForTimeout(200);+ await expect(responsive).toHaveCount(0);+ await page.keyboard.press('ArrowRight');+ await expect(responsive).toBeVisible();+ await page.keyboard.press('Escape');++ await studio.getByRole('button', {name: 'View', exact: true}).click();+ await studio.getByRole('button', {name: 'Show Rulers', exact: true}).click();+ const ruler = studio.getByLabel('Horizontal ruler', {exact: true});+ const rulerBox = await ruler.boundingBox();+ if (rulerBox === null) {+ throw new Error('Expected a visible ruler to create a guide');+ }++ await page.mouse.move(+ rulerBox.x + rulerBox.width / 2,+ rulerBox.y + rulerBox.height / 2,+ );+ await page.mouse.down();+ await page.mouse.move(rulerBox.x + rulerBox.width / 2, rulerBox.y + 80, {+ steps: 5,+ });+ await page.mouse.up();+ const guide = studio.locator('.__remotion_editor_guide');+ await expect(guide).toHaveCount(1);+ await page.keyboard.press('Escape');+ await neutralArea.hover();+ const guideLine = guide.locator('.__remotion_editor_guide_content');+ const idleGuideColor = await getBackgroundColor(guideLine);+ await guide.hover({position: {x: 20, y: 4}});+ await expect+ .poll(() => getBackgroundColor(guideLine))+ .not.toBe(idleGuideColor);+ await page.mouse.move(iframeBox.x + iframeBox.width + 12, 100);+ await expect.poll(() => getBackgroundColor(guideLine)).toBe(idleGuideColor);+const loop = studio.getByRole('button', {name: 'Loop', exact: true});const loopTooltip = studio.getByRole('tooltip').filter({hasText: 'Loop'});await loop.hover();diff --git a/packages/player/src/observe-hover.ts b/packages/player/src/observe-hover.tsindex 449ea4bb14..daf4db4d9c 100644--- a/packages/player/src/observe-hover.ts+++ b/packages/player/src/observe-hover.ts@@ -6,10 +6,12 @@ export const observeHover = ({element,onHoverChange,onPointerMove,+ initialPointerEvent,}: {- element: HTMLElement;+ element: HTMLElement | SVGElement;onHoverChange: (hovered: boolean) => void;onPointerMove: (() => void) | null;+ initialPointerEvent: PointerEvent | null;}): (() => void) => {const {ownerDocument} = element;const ownerWindow = ownerDocument.defaultView;@@ -66,7 +68,8 @@ export const observeHover = ({animationFrame = ownerWindow?.requestAnimationFrame(reconcileHover) ?? null;};- const onPointerEnter = (event: PointerEvent) => {+ const onPointerEnter = (nativeEvent: Event) => {+ const event = nativeEvent as PointerEvent;if (event.pointerType === 'touch' || hovered || disposed) {return;}@@ -93,13 +96,15 @@ export const observeHover = ({onHoverChange(true);};- const onPointerLeave = (event: PointerEvent) => {+ const onPointerLeave = (nativeEvent: Event) => {+ const event = nativeEvent as PointerEvent;if (event.pointerType !== 'touch') {onLeave();}};- const onMove = (event: PointerEvent) => {+ const onMove = (nativeEvent: Event) => {+ const event = nativeEvent as PointerEvent;if (event.pointerType === 'touch' || disposed) {return;}@@ -127,6 +132,13 @@ export const observeHover = ({element.addEventListener('pointerenter', onPointerEnter);element.addEventListener('pointerleave', onPointerLeave);element.addEventListener('pointermove', onMove);+ // Event-handler consumers attach after the native enter was dispatched.+ // Seed only from that real pointer event, never from a mount-time :hover+ // sample, which can also be left behind by touch input.+ if (initialPointerEvent !== null) {+ onPointerEnter(initialPointerEvent);+ }+return () => {disposed = true;onLeave();diff --git a/packages/player/src/use-hover-state.ts b/packages/player/src/use-hover-state.tsindex 56e79793b5..0f95ce5fe8 100644--- a/packages/player/src/use-hover-state.ts+++ b/packages/player/src/use-hover-state.ts@@ -88,6 +88,7 @@ export const useHoverState = (current.addEventListener('pointerdown', onPointerDown);const stopObserving = observeHover({+ initialPointerEvent: null,element: current,onHoverChange: (isHovered) => {if (isHovered) {diff --git a/packages/sdk/src/canvas-outline-overlay.tsx b/packages/sdk/src/canvas-outline-overlay.tsxindex a400c85da9..22d0c53585 100644--- a/packages/sdk/src/canvas-outline-overlay.tsx+++ b/packages/sdk/src/canvas-outline-overlay.tsx@@ -242,11 +242,19 @@ const CanvasOutlineElement = React.memo('canvas',);const onHoverChange = useCallback(- (key: string | null) => {+ (key: string | null, element?: SVGElement) => {if (key === null) {- onPointerLeave();+ onPointerLeave(element ? {currentTarget: element} : undefined);} else {- onPointerEnter();+ onPointerEnter(+ element+ ? {+ currentTarget: element,+ nativeEvent: null,+ pointerType: null,+ }+ : undefined,+ );}},[onPointerEnter, onPointerLeave],@@ -649,6 +657,24 @@ export const CanvasOutlineOverlay = React.memo(controller.hover.clear('canvas');};}, [controller.hover]);+ useLayoutEffect(() => {+ if (container === null) {+ return;+ }++ setHovered(false);+ return PlayerInternals.observeHover({+ element: container,+ initialPointerEvent: null,+ onPointerMove: null,+ onHoverChange: (isHovered) => {+ setHovered(isHovered);+ if (!isHovered) {+ controller.hover.clear('canvas');+ }+ },+ });+ }, [container, controller.hover]);// Gestures read the latest state through refs so the outline elements// keep a stable editing object.@@ -896,11 +922,6 @@ export const CanvasOutlineOverlay = React.memo(tabIndex={0}role="group"aria-label="Canvas selection"- onPointerEnter={() => setHovered(true)}- onPointerLeave={() => {- setHovered(false);- controller.hover.clear('canvas');- }}onPointerDown={(event) => {if (event.button !== 0) {return;diff --git a/packages/sdk/src/canvas-outline-polygon.tsx b/packages/sdk/src/canvas-outline-polygon.tsxindex b39078b146..7606269207 100644--- a/packages/sdk/src/canvas-outline-polygon.tsx+++ b/packages/sdk/src/canvas-outline-polygon.tsx@@ -1,4 +1,12 @@-import React, {forwardRef, memo, useCallback, useMemo} from 'react';+import {PlayerInternals} from '@remotion/player';+import React, {+ forwardRef,+ memo,+ useImperativeHandle,+ useLayoutEffect,+ useMemo,+ useRef,+} from 'react';import type {CanvasOutline} from './outline-geometry';export type CanvasOutlinePolygonProps = Omit<@@ -22,7 +30,7 @@ export type CanvasOutlinePolygonProps = Omit<readonly interactive: boolean;readonly fill: string;readonly stroke: string;- readonly onHoverChange: (key: string | null) => void;+ readonly onHoverChange: (key: string | null, element?: SVGElement) => void;};/** Shared outline geometry and hover behavior, with editing handlers supplied by the host. */@@ -42,6 +50,12 @@ export const CanvasOutlinePolygon = memo(},ref,) => {+ const polygonRef = useRef<SVGPolygonElement>(null);+ useImperativeHandle(+ ref,+ () => polygonRef.current as SVGPolygonElement,+ [],+ );const points = useMemo(() => outline.points.map((point) => `${point.x},${point.y}`).join(' '),[outline.points],@@ -53,22 +67,33 @@ export const CanvasOutlinePolygon = memo(: `matrix(${outline.path.matrix.a} ${outline.path.matrix.b} ${outline.path.matrix.c} ${outline.path.matrix.d} ${outline.path.matrix.e} ${outline.path.matrix.f})`,[outline.path],);- const onPointerEnter = useCallback(() => {- if (!dragging) {- onHoverChange(outline.key);+ useLayoutEffect(() => {+ const element = polygonRef.current;+ if (element === null) {+ return;}++ const stopObserving = PlayerInternals.observeHover({+ element,+ initialPointerEvent: null,+ onPointerMove: null,+ onHoverChange: (hovered) => {+ if (!dragging) {+ onHoverChange(hovered ? outline.key : null, element);+ }+ },+ });+ return () => {+ stopObserving();+ onHoverChange(null, element);+ };}, [dragging, onHoverChange, outline.key]);- const onPointerLeave = useCallback(() => {- if (!dragging) {- onHoverChange(null);- }- }, [dragging, onHoverChange]);return (<g><polygon{...props}- ref={ref}+ ref={polygonRef}data-remotion-canvas-outline-key={outline.key}data-remotion-directly-selected-outline={directlySelected ? 'true' : undefined@@ -80,8 +105,6 @@ export const CanvasOutlinePolygon = memo(strokeWidth={2}vectorEffect="non-scaling-stroke"pointerEvents={interactive ? 'all' : 'none'}- onPointerEnter={onPointerEnter}- onPointerLeave={onPointerLeave}/>{matrixTransform === null ? null : (<pathdiff --git a/packages/sdk/src/hover.ts b/packages/sdk/src/hover.tsindex dddcd82c9a..26413a217a 100644--- a/packages/sdk/src/hover.ts+++ b/packages/sdk/src/hover.ts@@ -1,5 +1,6 @@+import {PlayerInternals} from '@remotion/player';import type {Dispatch, SetStateAction} from 'react';-import {useCallback, useMemo} from 'react';+import {useCallback, useLayoutEffect, useMemo} from 'react';import type {SequenceNodePathInfo} from './get-timeline-sequence-sort-key';import {getCanvasSequenceSelectionKey} from './selection';import {timelineSequenceNodePathToKey} from './timeline-sequence-node-path-to-key';@@ -18,6 +19,63 @@ export type CanvasHoverController = {readonly clear: (source: CanvasHover['source'] | null) => void;};+type HoverElement = HTMLElement | SVGElement;+type HoverEvent = {+ readonly currentTarget: HoverElement;+ readonly nativeEvent: PointerEvent | null;+ readonly pointerType: string | null;+};++// A row, its track, and several canvas handles can represent the same sequence.+// Keep their claims separate so one element's late leave cannot clear another.+const hoverClaims = new WeakMap<+ CanvasHoverController,+ Map<object, {hover: CanvasHover; element: HoverElement | null}>+>();++const updateHoverClaim = (+ controller: CanvasHoverController,+ token: object,+ element: HoverElement | null,+ hover: CanvasHover | null,+) => {+ let claims = hoverClaims.get(controller);+ if (hover !== null) {+ if (!claims) {+ claims = new Map();+ hoverClaims.set(controller, claims);+ }++ claims.delete(token);+ claims.set(token, {hover, element});+ controller.setHoveredSequence(hover);+ return;+ }++ const previous = claims?.get(token);+ if (!claims || !previous) {+ return;+ }++ claims.delete(token);+ const current = controller.getSnapshot();+ if (+ current?.key !== previous.hover.key ||+ current.nodePathKey !== previous.hover.nodePathKey ||+ current.source !== previous.hover.source+ ) {+ return;+ }++ const fallback = [...claims.values()].reverse().find((claim) => {+ return (+ claim.element === null ||+ (claim.element.isConnected && claim.element.matches(':hover'))+ );+ });+ controller.setHoveredSequence(fallback?.hover ?? null);+};+export const createCanvasHoverController = (): CanvasHoverController => {let hoveredSequence: CanvasHover | null = null;const listeners = new Set<() => void>();@@ -102,35 +160,111 @@ export const useCanvasSequenceHover = ([nodePathInfo],);const hovered = useIsCanvasSequenceHovered(controller, nodePathKey);+ const handlers = useMemo(() => {+ const tokens = new Map<HoverElement | null, object>();+ const observers = new Map<HoverElement, () => void>();+ let attachedElement: HoverElement | null = null;+ const setHover = (element: HoverElement | null, active: boolean) => {+ if (sequenceKey === null || nodePathKey === null) {+ return;+ }- const onPointerEnter = useCallback(() => {- if (sequenceKey === null || nodePathKey === null) {- return;- }+ let token = tokens.get(element);+ if (!token) {+ if (!active) {+ return;+ }- controller.setHoveredSequence({- key: sequenceKey,- nodePathKey,- source,- });- }, [controller, nodePathKey, sequenceKey, source]);+ token = {};+ tokens.set(element, token);+ }++ updateHoverClaim(+ controller,+ token,+ element,+ active ? {key: sequenceKey, nodePathKey, source} : null,+ );+ if (!active) {+ tokens.delete(element);+ }+ };++ const observe = (element: HoverElement, event: PointerEvent | null) => {+ if (observers.has(element)) {+ return;+ }- const onPointerLeave = useCallback(() => {- controller.setHoveredSequence((currentHover) => {- if (- currentHover?.source !== source ||- currentHover.key !== sequenceKey ||- currentHover.nodePathKey !== nodePathKey- ) {- return currentHover;+ observers.set(+ element,+ PlayerInternals.observeHover({+ element,+ initialPointerEvent: event,+ onPointerMove: null,+ onHoverChange: (active) => setHover(element, active),+ }),+ );+ };++ const dispose = () => {+ for (const stopObserving of observers.values()) {+ stopObserving();+ }++ observers.clear();+ for (const element of tokens.keys()) {+ setHover(element, false);}- return null;- });+ tokens.clear();+ };++ return {+ dispose,+ connect: () => {+ if (attachedElement !== null) {+ observe(attachedElement, null);+ }+ },+ ref: (element: HoverElement | null) => {+ if (element === attachedElement) {+ return;+ }++ dispose();+ attachedElement = element;+ if (element !== null) {+ observe(element, null);+ }+ },+ onPointerEnter: (event?: HoverEvent) => {+ if (event?.pointerType === 'touch') {+ return;+ }++ if (event?.nativeEvent) {+ observe(event.currentTarget, event.nativeEvent);+ }++ setHover(event?.currentTarget ?? null, true);+ },+ onPointerLeave: (event?: Pick<HoverEvent, 'currentTarget'>) => {+ setHover(event?.currentTarget ?? null, false);+ },+ };}, [controller, nodePathKey, sequenceKey, source]);+ useLayoutEffect(() => {+ handlers.connect();+ return handlers.dispose;+ }, [handlers]);return useMemo(- () => ({hovered, onPointerEnter, onPointerLeave}),- [hovered, onPointerEnter, onPointerLeave],+ () => ({+ hovered,+ onPointerEnter: handlers.onPointerEnter,+ onPointerLeave: handlers.onPointerLeave,+ ref: handlers.ref,+ }),+ [handlers, hovered],);};diff --git a/packages/studio/src/components/ActionTooltip.tsx b/packages/studio/src/components/ActionTooltip.tsxindex bc94521bec..f31e7050bb 100644--- a/packages/studio/src/components/ActionTooltip.tsx+++ b/packages/studio/src/components/ActionTooltip.tsx@@ -127,6 +127,7 @@ export const ActionTooltip: React.FC<{}const unobserve = PlayerInternals.observeHover({+ initialPointerEvent: null,element: trigger,onPointerMove: null,onHoverChange: (hovered) => {diff --git a/packages/studio/src/components/EditorGuides/Guide.tsx b/packages/studio/src/components/EditorGuides/Guide.tsxindex 4abfac890a..d7c99cb1be 100644--- a/packages/studio/src/components/EditorGuides/Guide.tsx+++ b/packages/studio/src/components/EditorGuides/Guide.tsx@@ -1,4 +1,12 @@-import {memo, useCallback, useContext, useMemo, useRef} from 'react';+import {PlayerInternals} from '@remotion/player';+import {+ memo,+ useCallback,+ useContext,+ useLayoutEffect,+ useMemo,+ useRef,+} from 'react';import {NoReactInternals} from 'remotion/no-react';import {getEditorGuideColor,@@ -48,14 +56,29 @@ const GuideComp: React.FC<{);const pointerDownPositionRef = useRef<GuidePointerDownPosition | null>(null);const hasMovedGuideRef = useRef(false);+ const guideRef = useRef<HTMLDivElement>(null);- const onPointerEnter = useCallback(() => {- setHoveredGuideId(() => guide.id);- }, [guide.id, setHoveredGuideId]);+ useLayoutEffect(() => {+ const element = guideRef.current;+ if (element === null) {+ return;+ }- const onPointerLeave = useCallback(() => {- setHoveredGuideId(() => null);- }, [setHoveredGuideId]);+ const stopObserving = PlayerInternals.observeHover({+ element,+ initialPointerEvent: null,+ onPointerMove: null,+ onHoverChange: (hovered) => {+ setHoveredGuideId((current) =>+ hovered ? guide.id : current === guide.id ? null : current,+ );+ },+ });+ return () => {+ stopObserving();+ setHoveredGuideId((current) => (current === guide.id ? null : current));+ };+ }, [guide.id, setHoveredGuideId]);const isVerticalGuide = guide.orientation === 'vertical';@@ -258,13 +281,12 @@ const GuideComp: React.FC<{return (<ContextMenu getItems={getContextMenuItems}><div+ ref={guideRef}style={guideStyle}onPointerDown={onPointerDown}onClick={onClick}className="__remotion_editor_guide"{...{[PREVENT_CLEAR_SELECTION_ON_POINTER_DOWN_ATTR]: 'true'}}- onPointerEnter={onPointerEnter}- onPointerLeave={onPointerLeave}><div style={guideContentStyle} className={guideClassName} /></div>diff --git a/packages/studio/src/components/EffectPickerModal.tsx b/packages/studio/src/components/EffectPickerModal.tsxindex fc7aba3c0b..a895e0a56d 100644--- a/packages/studio/src/components/EffectPickerModal.tsx+++ b/packages/studio/src/components/EffectPickerModal.tsx@@ -14,11 +14,13 @@ import React, {useState,} from 'react';import {+ CURRENT_COLOR,LIGHT_TEXT,TRANSPARENT,WHITE,WHITE_ALPHA_06,} from '../helpers/colors';+import {HOVERABLE_CLASS_NAME, hoverableStyle} from '../helpers/hoverable';import {useKeybinding} from '../helpers/use-keybinding';import {ExternalLinkIcon} from '../icons/external-link';import {@@ -64,7 +66,6 @@ const aboutEffectsRow: React.CSSProperties = {const aboutEffectsLink: React.CSSProperties = {alignItems: 'center',- color: LIGHT_TEXT,cursor: 'default',display: 'inline-flex',fontFamily: 'sans-serif',@@ -73,11 +74,12 @@ const aboutEffectsLink: React.CSSProperties = {lineHeight: '14px',minWidth: 0,textDecoration: 'none',-};--const aboutEffectsLinkHovered: React.CSSProperties = {- ...aboutEffectsLink,- color: WHITE,+ ...hoverableStyle({+ idleBackground: TRANSPARENT,+ hoverBackground: TRANSPARENT,+ idleColor: LIGHT_TEXT,+ hoverColor: WHITE,+ }),};const aboutEffectsLabel: React.CSSProperties = {@@ -150,7 +152,6 @@ const EffectPickerResult: React.FC<{readonly selected: boolean;readonly onSelected: (item: EffectCatalogItem) => void;}> = ({item, selected, onSelected}) => {- const [hovered, setHovered] = useState(false);const [previewLoaded, setPreviewLoaded] = useState(false);const ref = useRef<HTMLDivElement>(null);@@ -159,16 +160,14 @@ const EffectPickerResult: React.FC<{const style = useMemo((): React.CSSProperties => {return {...resultContainer,- backgroundColor: hovered || selected ? WHITE_ALPHA_06 : TRANSPARENT,- };- }, [hovered, selected]);-- const labelStyle = useMemo((): React.CSSProperties => {- return {- ...label,- color: selected || hovered ? WHITE : LIGHT_TEXT,+ ...hoverableStyle({+ idleBackground: selected ? WHITE_ALPHA_06 : TRANSPARENT,+ hoverBackground: WHITE_ALPHA_06,+ idleColor: selected ? WHITE : LIGHT_TEXT,+ hoverColor: WHITE,+ }),};- }, [hovered, selected]);+ }, [selected]);const onClick = useCallback(() => {onSelected(item);@@ -200,9 +199,8 @@ const EffectPickerResult: React.FC<{<divref={ref}style={style}+ className={HOVERABLE_CLASS_NAME}onClick={onClick}- onMouseEnter={() => setHovered(true)}- onMouseLeave={() => setHovered(false)}><div style={previewFrame}><img@@ -216,7 +214,7 @@ const EffectPickerResult: React.FC<{onLoad={() => setPreviewLoaded(true)}/></div>- <div style={labelStyle}>{item.label}</div>+ <div style={label}>{item.label}</div></div></ContextMenu>);@@ -226,7 +224,6 @@ const EffectPickerContent: React.FC<{readonly state: AddEffectModalState;}> = ({state}) => {const {setSelectedModal} = useContext(SetSelectedModalContext);- const [aboutEffectsHovered, setAboutEffectsHovered] = useState(false);const [query, setQuery] = useState('');const [selectedIndex, setSelectedIndex] = useState(0);const inputRef = useRef<HTMLInputElement>(null);@@ -353,16 +350,13 @@ const EffectPickerContent: React.FC<{href="https://remotion.dev/effects"target="_blank"rel="noopener noreferrer"- style={- aboutEffectsHovered ? aboutEffectsLinkHovered : aboutEffectsLink- }- onMouseEnter={() => setAboutEffectsHovered(true)}- onMouseLeave={() => setAboutEffectsHovered(false)}+ style={aboutEffectsLink}+ className={HOVERABLE_CLASS_NAME}><span style={aboutEffectsLabel}>About effects</span><ExternalLinkIconaria-hidden="true"- color={aboutEffectsHovered ? WHITE : LIGHT_TEXT}+ color={CURRENT_COLOR}style={aboutEffectsIcon}/></a>diff --git a/packages/studio/src/components/InlineEditableTitle.tsx b/packages/studio/src/components/InlineEditableTitle.tsxindex 8e731cbd83..5f6535881d 100644--- a/packages/studio/src/components/InlineEditableTitle.tsx+++ b/packages/studio/src/components/InlineEditableTitle.tsx@@ -9,8 +9,9 @@ import {INPUT_BACKGROUND,TRANSPARENT,WHITE,- getBackgroundFromHoverState,+ WHITE_ALPHA_06,} from '../helpers/colors';+import {HOVERABLE_CLASS_NAME, hoverableStyle} from '../helpers/hoverable';import {INSPECTOR_PANEL_HORIZONTAL_PADDING} from './InspectorPanelLayout';import {COMPACT_CONTROL_ROW_HEIGHT} from './layout';@@ -124,7 +125,6 @@ export const InlineEditableTitle: React.FC<{'aria-label': ariaLabel,}) => {const [isEditing, setIsEditing] = useState(false);- const [isHovered, setIsHovered] = useState(false);const [draftValue, setDraftValue] = useState(value);const inputRef = useRef<HTMLInputElement>(null);const cancelledRef = useRef(false);@@ -211,18 +211,21 @@ export const InlineEditableTitle: React.FC<{);const isInteractive = canRename || onClick !== undefined;- const backgroundColor = isEditing- ? INPUT_BACKGROUND- : getBackgroundFromHoverState({- hovered: isHovered && isInteractive,- selected: false,- });const isInspectorSize = size === 'inspector';const innerStyle = useMemo((): React.CSSProperties => {return {...(isInspectorSize ? inspectorTitleInner : titleInner),- backgroundColor,+ ...hoverableStyle({+ idleBackground: isEditing ? INPUT_BACKGROUND : TRANSPARENT,+ hoverBackground: isEditing+ ? INPUT_BACKGROUND+ : isInteractive+ ? WHITE_ALPHA_06+ : TRANSPARENT,+ idleColor: WHITE,+ hoverColor: WHITE,+ }),cursor: isEditing? 'text': isInspectorSize@@ -233,7 +236,7 @@ export const InlineEditableTitle: React.FC<{userSelect: isEditing ? 'text' : 'none',width: isEditing || isInspectorSize ? '100%' : undefined,};- }, [backgroundColor, isEditing, isInspectorSize, isInteractive]);+ }, [isEditing, isInspectorSize, isInteractive]);const gridItemStyle = isInspectorSize? inspectorTitleGridItem: titleGridItem;@@ -247,8 +250,7 @@ export const InlineEditableTitle: React.FC<{><spanstyle={innerStyle}- onMouseEnter={() => setIsHovered(true)}- onMouseLeave={() => setIsHovered(false)}+ className={HOVERABLE_CLASS_NAME}onClick={isEditing || !isInteractive ? undefined : handleClick}><spandiff --git a/packages/studio/src/components/InspectorLocationCopy.tsx b/packages/studio/src/components/InspectorLocationCopy.tsxindex eab5dcfdc1..1ff62c9f09 100644--- a/packages/studio/src/components/InspectorLocationCopy.tsx+++ b/packages/studio/src/components/InspectorLocationCopy.tsx@@ -1,7 +1,11 @@-import React, {useCallback, useMemo, useState} from 'react';+import React, {useCallback, useMemo} from 'react';import type {OriginalPosition} from '../error-overlay/react-overlay/utils/get-source-map';import {copyText} from '../helpers/copy-text';import {formatContextForAgents} from '../helpers/format-file-location';+import {+ HOVER_GROUP_CLASS_NAME,+ HOVER_GROUP_REVEAL_KEEP_SPACE_CLASS_NAME,+} from '../helpers/hoverable';import {useCopyFeedback} from '../helpers/use-copy-feedback';import {CopyIcon} from '../icons/copy';import {ActionTooltip} from './ActionTooltip';@@ -47,8 +51,6 @@ export const InspectorLocationCopy: React.FC<{readonly name: string | null;readonly openInEditorLocation: OriginalPosition | null;}> = ({children, location, name, openInEditorLocation}) => {- const [hovered, setHovered] = useState(false);- const [focusedWithin, setFocusedWithin] = useState(false);const {copied, markCopied} = useCopyFeedback();const contextForAgents = useMemo(() => {return formatContextForAgents({@@ -84,26 +86,18 @@ export const InspectorLocationCopy: React.FC<{[contextForAgents, markCopied],);- const showAction = hovered || focusedWithin;-return (<divaria-label="Inspector source location"role="group"style={row}- onPointerEnter={() => setHovered(true)}- onPointerLeave={() => setHovered(false)}- onFocus={() => setFocusedWithin(true)}- onBlur={() => setFocusedWithin(false)}+ className={HOVER_GROUP_CLASS_NAME}><div style={content}>{children}</div>{contextForAgents || openInEditorLocation ? (<div- style={{- ...action,- opacity: showAction ? 1 : 0,- pointerEvents: showAction ? 'auto' : 'none',- }}+ style={action}+ className={HOVER_GROUP_REVEAL_KEEP_SPACE_CLASS_NAME}><InspectorOpenInEditorannotationName={name}diff --git a/packages/studio/src/components/Menu/MenuSubItem.tsx b/packages/studio/src/components/Menu/MenuSubItem.tsxindex 844fc38bd3..19cdc88c51 100644--- a/packages/studio/src/components/Menu/MenuSubItem.tsx+++ b/packages/studio/src/components/Menu/MenuSubItem.tsx@@ -89,6 +89,8 @@ export const MenuSubItem: React.FC<{disabled,}) => {const [hovered, setHovered] = useState(false);+ const hoveredRef = useRef(false);+ const hoverTimer = useRef<ReturnType<typeof setTimeout> | null>(null);const ref = useRef<HTMLDivElement>(null);const size = PlayerInternals.useElementSize(ref, {triggerOnWindowResize: true,@@ -113,29 +115,50 @@ export const MenuSubItem: React.FC<{}if (subMenu) {+ onItemSelected(id);setSubMenuActivated('with-mouse');- setHovered(true);return;}onActionChosen(id, e);},- [disabled, id, onActionChosen, setSubMenuActivated, subMenu],+ [+ disabled,+ id,+ onActionChosen,+ onItemSelected,+ setSubMenuActivated,+ subMenu,+ ],);- const onPointerEnter = useCallback(() => {- if (disabled) {+ useEffect(() => {+ const element = ref.current;+ hoveredRef.current = false;+ setHovered(false);+ if (!element || disabled) {return;}- onItemSelected(id);- setHovered(true);+ return PlayerInternals.observeHover({+ initialPointerEvent: null,+ element,+ onHoverChange: (isHovered) => {+ hoveredRef.current = isHovered;+ if (!isHovered && hoverTimer.current !== null) {+ clearTimeout(hoverTimer.current);+ hoverTimer.current = null;+ }++ setHovered(isHovered);+ if (isHovered) {+ onItemSelected(id);+ }+ },+ onPointerMove: null,+ });}, [disabled, id, onItemSelected]);- const onPointerLeave = useCallback(() => {- setHovered(false);- }, []);-const onQuitSubmenu = useCallback(() => {setSubMenuActivated(false);}, [setSubMenuActivated]);@@ -166,15 +189,23 @@ export const MenuSubItem: React.FC<{}, [mobileLayout, selected, size, subMenu, subMenuActivated]);useEffect(() => {- if (!hovered || !subMenu) {+ if (!hovered || !selected || !subMenu || disabled) {return;}- const hi = setTimeout(() => {- setSubMenuActivated('with-mouse');+ hoverTimer.current = setTimeout(() => {+ hoverTimer.current = null;+ if (hoveredRef.current && ref.current?.matches(':hover')) {+ setSubMenuActivated('with-mouse');+ }}, 100);- return () => clearTimeout(hi);- }, [hovered, selected, setSubMenuActivated, subMenu]);+ return () => {+ if (hoverTimer.current !== null) {+ clearTimeout(hoverTimer.current);+ hoverTimer.current = null;+ }+ };+ }, [disabled, hovered, selected, setSubMenuActivated, subMenu]);useEffect(() => {if (selected) {@@ -189,8 +220,6 @@ export const MenuSubItem: React.FC<{<divref={ref}aria-label={typeof label === 'string' ? label : undefined}- onPointerEnter={onPointerEnter}- onPointerLeave={onPointerLeave}style={style}onPointerUp={onPointerUp}role="button"diff --git a/packages/studio/src/components/NewComposition/ComboBox.tsx b/packages/studio/src/components/NewComposition/ComboBox.tsxindex 4ab754cdca..f56d4813cb 100644--- a/packages/studio/src/components/NewComposition/ComboBox.tsx+++ b/packages/studio/src/components/NewComposition/ComboBox.tsx@@ -2,13 +2,13 @@ import {PlayerInternals} from '@remotion/player';import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';import ReactDOM from 'react-dom';import {+ BLACK_ALPHA_60,INPUT_BACKGROUND,LIGHT_TEXT,- WHITE_ALPHA_05,- BLACK_ALPHA_60,SELECTED_BACKGROUND,WHITE,} from '../../helpers/colors';+import {INPUT_HOVER_CLASS_NAME} from '../../helpers/hoverable';import {useMobileLayout} from '../../helpers/mobile-layout';import {noop} from '../../helpers/noop';import {CaretDown} from '../../icons/caret';@@ -125,7 +125,6 @@ export const Combobox: React.FC<{size: controlSize = 'default',unhoveredIconColor = LIGHT_TEXT,}) => {- const [hovered, setIsHovered] = useState(false);const [opened, setOpened] = useState(false);const ref = useRef<HTMLButtonElement>(null);const {tabIndex, currentZIndex} = useZIndex();@@ -154,8 +153,6 @@ export const Combobox: React.FC<{return;}- const onMouseEnter = () => setIsHovered(true);- const onMouseLeave = () => setIsHovered(false);const onPointerDown = (e: PointerEvent) => {// Prevent deselection of currently selected itemse.stopPropagation();@@ -197,14 +194,10 @@ export const Combobox: React.FC<{});};- current.addEventListener('mouseenter', onMouseEnter);- current.addEventListener('mouseleave', onMouseLeave);current.addEventListener('pointerdown', onPointerDown);current.addEventListener('click', onClick);return () => {- current.removeEventListener('mouseenter', onMouseEnter);- current.removeEventListener('mouseleave', onMouseLeave);current.removeEventListener('pointerdown', onPointerDown);current.removeEventListener('click', onClick);};@@ -290,13 +283,12 @@ export const Combobox: React.FC<{display: 'inline-flex',flexDirection: 'row',alignItems: 'center',+ '--remotion-studio-input-idle-icon': unhoveredIconColor,borderColor: opened? SELECTED_BACKGROUND- : hovered- ? WHITE_ALPHA_05- : BLACK_ALPHA_60,- };- }, [controlSize, customStyle, hovered, opened]);+ : `var(--remotion-studio-input-hover-border, ${BLACK_ALPHA_60})`,+ } as React.CSSProperties;+ }, [controlSize, customStyle, opened, unhoveredIconColor]);const selectedLabelStyle =controlSize === 'small'@@ -313,7 +305,7 @@ export const Combobox: React.FC<{tabIndex={tabIndex}type="button"style={style}- className={MENU_INITIATOR_CLASSNAME}+ className={`${MENU_INITIATOR_CLASSNAME} ${INPUT_HOVER_CLASS_NAME}`}>{selected ? (<div@@ -328,7 +320,11 @@ export const Combobox: React.FC<{) : null}<Spacing x={controlSize === 'default' ? 1 : 0.5} />{' '}<CaretDown- color={hovered || opened ? WHITE : unhoveredIconColor}+ color={+ opened+ ? WHITE+ : `var(--remotion-studio-input-hover-icon, ${unhoveredIconColor})`+ }small={controlSize === 'small'}/></button>diff --git a/packages/studio/src/components/NewComposition/MenuContent.tsx b/packages/studio/src/components/NewComposition/MenuContent.tsxindex 9963dc223d..7d29a0adde 100644--- a/packages/studio/src/components/NewComposition/MenuContent.tsx+++ b/packages/studio/src/components/NewComposition/MenuContent.tsx@@ -1,3 +1,4 @@+import {PlayerInternals} from '@remotion/player';import type {PointerEvent, SetStateAction} from 'react';import React, {useCallback,@@ -68,6 +69,10 @@ export const MenuContent: React.FC<{const [subMenuActivated, setSubMenuActivated] =useState<SubMenuActivated>(false);+ const subMenuActivatedRef = useRef(subMenuActivated);+ useEffect(() => {+ subMenuActivatedRef.current = subMenuActivated;+ }, [subMenuActivated]);const typeaheadQueryRef = useRef('');const typeaheadTimeoutRef = useRef<number | null>(null);@@ -390,17 +395,17 @@ export const MenuContent: React.FC<{return;}- const onPointerLeave = () => {- if (subMenuActivated) {- return;- }-- setSelectedItem(null);- };-- current.addEventListener('pointerleave', onPointerLeave);- return () => current.removeEventListener('pointerleave', onPointerLeave);- }, [onHide, subMenuActivated]);+ return PlayerInternals.observeHover({+ initialPointerEvent: null,+ element: current,+ onHoverChange: (hovered) => {+ if (!hovered && !subMenuActivatedRef.current) {+ setSelectedItem(null);+ }+ },+ onPointerMove: null,+ });+ }, []);return (<MenuTreeContext.Provider value={menuTreeId}>diff --git a/packages/studio/src/components/NewComposition/RemInput.tsx b/packages/studio/src/components/NewComposition/RemInput.tsxindex 1522f0127e..742ad3349d 100644--- a/packages/studio/src/components/NewComposition/RemInput.tsx+++ b/packages/studio/src/components/NewComposition/RemInput.tsx@@ -8,14 +8,14 @@ import React, {useState,} from 'react';import {+ BLACK_ALPHA_60,FAIL_COLOR,INPUT_BACKGROUND,- WHITE_ALPHA_05,- BLACK_ALPHA_60,SELECTED_BACKGROUND,WARNING_COLOR,WHITE,} from '../../helpers/colors';+import {INPUT_HOVER_CLASS_NAME} from '../../helpers/hoverable';import {useZIndex} from '../../state/z-index';export type RemInputStatus = 'error' | 'warning' | 'ok';@@ -56,11 +56,9 @@ const compactInputStyle: React.CSSProperties = {export const getInputBorderColor = ({status,isFocused,- isHovered,}: {status: 'error' | 'warning' | 'ok';isFocused: boolean;- isHovered: boolean;}) =>status === 'warning'? WARNING_COLOR@@ -68,16 +66,13 @@ export const getInputBorderColor = ({? FAIL_COLOR: isFocused? SELECTED_BACKGROUND- : isHovered- ? WHITE_ALPHA_05- : BLACK_ALPHA_60;+ : `var(--remotion-studio-input-hover-border, ${BLACK_ALPHA_60})`;const RemInputForwardRef: React.ForwardRefRenderFunction<HTMLInputElement,Props> = ({status, rightAlign, small = false, ...props}, ref) => {const [isFocused, setIsFocused] = useState(false);- const [isHovered, setIsHovered] = useState(false);const inputRef = useRef<HTMLInputElement>(null);const {tabIndex} = useZIndex();@@ -87,11 +82,11 @@ const RemInputForwardRef: React.ForwardRefRenderFunction<...inputBaseStyle,...(small ? compactInputStyle : null),width: '100%',- borderColor: getInputBorderColor({isFocused, isHovered, status}),+ borderColor: getInputBorderColor({isFocused, status}),textAlign: rightAlign ? 'right' : 'left',...(props.style ?? {}),};- }, [isFocused, isHovered, rightAlign, props.style, small, status]);+ }, [isFocused, rightAlign, props.style, small, status]);useImperativeHandle(ref, () => {return inputRef.current as HTMLInputElement;@@ -106,23 +101,25 @@ const RemInputForwardRef: React.ForwardRefRenderFunction<const onFocus = () => setIsFocused(true);const onBlur = () => setIsFocused(false);- const onMouseEnter = () => setIsHovered(true);- const onMouseLeave = () => setIsHovered(false);current.addEventListener('focus', onFocus);current.addEventListener('blur', onBlur);- current.addEventListener('mouseenter', onMouseEnter);- current.addEventListener('mouseleave', onMouseLeave);return () => {current.removeEventListener('focus', onFocus);current.removeEventListener('blur', onBlur);- current.removeEventListener('mouseenter', onMouseEnter);- current.removeEventListener('mouseleave', onMouseLeave);};}, [inputRef]);- return <input ref={inputRef} tabIndex={tabIndex} {...props} style={style} />;+ return (+ <input+ ref={inputRef}+ tabIndex={tabIndex}+ {...props}+ className={`${INPUT_HOVER_CLASS_NAME} ${props.className ?? ''}`}+ style={style}+ />+ );};export const RemotionInput = forwardRef(RemInputForwardRef);diff --git a/packages/studio/src/components/NewComposition/RemTextarea.tsx b/packages/studio/src/components/NewComposition/RemTextarea.tsxindex 9fa1cb6cc1..fff4e32236 100644--- a/packages/studio/src/components/NewComposition/RemTextarea.tsx+++ b/packages/studio/src/components/NewComposition/RemTextarea.tsx@@ -7,6 +7,7 @@ import React, {useState,} from 'react';import {INPUT_BACKGROUND, WHITE} from '../../helpers/colors';+import {INPUT_HOVER_CLASS_NAME} from '../../helpers/hoverable';import {useZIndex} from '../../state/z-index';import {VERTICAL_SCROLLBAR_CLASSNAME} from '../Menu/is-menu-item';import {@@ -43,7 +44,6 @@ const RemTextareaFRFunction: React.ForwardRefRenderFunction<Props> = ({status, small = false, ...props}, ref) => {const [isFocused, setIsFocused] = useState(false);- const [isHovered, setIsHovered] = useState(false);const inputRef = useRef<HTMLTextAreaElement>(null);const {tabIndex} = useZIndex();@@ -57,10 +57,10 @@ const RemTextareaFRFunction: React.ForwardRefRenderFunction<...inputBaseStyle,...(small ? compactInputStyle : null),width: '100%',- borderColor: getInputBorderColor({isFocused, isHovered, status}),+ borderColor: getInputBorderColor({isFocused, status}),...(props.style ?? {}),};- }, [isFocused, isHovered, props.style, small, status]);+ }, [isFocused, props.style, small, status]);useEffect(() => {if (!inputRef.current) {@@ -70,8 +70,6 @@ const RemTextareaFRFunction: React.ForwardRefRenderFunction<const {current} = inputRef;const onFocus = () => setIsFocused(true);const onBlur = () => setIsFocused(false);- const onMouseEnter = () => setIsHovered(true);- const onMouseLeave = () => setIsHovered(false);const onKeyDown = (e: KeyboardEvent) => {if (!inputRef.current) {return;@@ -121,15 +119,11 @@ const RemTextareaFRFunction: React.ForwardRefRenderFunction<current.addEventListener('focus', onFocus);current.addEventListener('blur', onBlur);- current.addEventListener('mouseenter', onMouseEnter);- current.addEventListener('mouseleave', onMouseLeave);current.addEventListener('keydown', onKeyDown);return () => {current.removeEventListener('focus', onFocus);current.removeEventListener('blur', onBlur);- current.removeEventListener('mouseenter', onMouseEnter);- current.removeEventListener('mouseleave', onMouseLeave);current.removeEventListener('keydown', onKeyDown);};}, [inputRef]);@@ -139,7 +133,7 @@ const RemTextareaFRFunction: React.ForwardRefRenderFunction<ref={inputRef}tabIndex={tabIndex}{...props}- className={VERTICAL_SCROLLBAR_CLASSNAME}+ className={`${VERTICAL_SCROLLBAR_CLASSNAME} ${INPUT_HOVER_CLASS_NAME} ${props.className ?? ''}`}style={style}/>);diff --git a/packages/studio/src/components/Preview.tsx b/packages/studio/src/components/Preview.tsxindex 6998ad5b42..ec409cdd3f 100644--- a/packages/studio/src/components/Preview.tsx+++ b/packages/studio/src/components/Preview.tsx@@ -201,6 +201,7 @@ const CompWhenItHasDimensions: React.FC<{setCanvasHovered(false);setCanvasDragHovered(false);const stopObservingHover = PlayerInternals.observeHover({+ initialPointerEvent: null,element: compositionContainer,onHoverChange: setCanvasHovered,onPointerMove: null,diff --git a/packages/studio/src/components/QuickSwitcher/QuickSwitcherResult.tsx b/packages/studio/src/components/QuickSwitcher/QuickSwitcherResult.tsxindex f4731b2ea4..983d160d65 100644--- a/packages/studio/src/components/QuickSwitcher/QuickSwitcherResult.tsx+++ b/packages/studio/src/components/QuickSwitcher/QuickSwitcherResult.tsx@@ -4,16 +4,17 @@ import React, {useEffect,useMemo,useRef,- useState,} from 'react';import type {_InternalTypes} from 'remotion';import {+ CURRENT_COLOR,LIGHT_TEXT,TRANSPARENT,WHITE,WHITE_ALPHA_06,} from '../../helpers/colors';import type {AssetFileType} from '../../helpers/get-preview-file-type';+import {HOVERABLE_CLASS_NAME, hoverableStyle} from '../../helpers/hoverable';import {noop} from '../../helpers/noop';import {useKeybinding} from '../../helpers/use-keybinding';import {ExpandedFolderIcon} from '../../icons/folder';@@ -122,7 +123,6 @@ export const QuickSwitcherResult: React.FC<{readonly result: TQuickSwitcherResult;readonly selected: boolean;}> = ({result, selected}) => {- const [hovered, setIsHovered] = useState(false);const ref = useRef<HTMLDivElement>(null);const keybindings = useKeybinding();const onSelected = result.type === 'folder' ? null : result.onSelected;@@ -153,28 +153,6 @@ export const QuickSwitcherResult: React.FC<{setSelectedModal,]);- useEffect(() => {- if (result.type === 'folder') {- return;- }-- const {current} = ref;- if (!current) {- return;- }-- const onMouseEnter = () => setIsHovered(true);- const onMouseLeave = () => setIsHovered(false);-- current.addEventListener('mouseenter', onMouseEnter);- current.addEventListener('mouseleave', onMouseLeave);-- return () => {- current.removeEventListener('mouseenter', onMouseEnter);- current.removeEventListener('mouseleave', onMouseLeave);- };- }, [result.type]);-useEffect(() => {if (!selected || onSelected === null) {return;@@ -205,25 +183,31 @@ export const QuickSwitcherResult: React.FC<{result.type === 'folder' || result.type === 'composition'? 16 + result.level * 8: container.paddingLeft,- backgroundColor:- result.type !== 'folder' && (hovered || selected)- ? WHITE_ALPHA_06- : TRANSPARENT,+ ...hoverableStyle({+ idleBackground:+ result.type !== 'folder' && selected ? WHITE_ALPHA_06 : TRANSPARENT,+ hoverBackground:+ result.type === 'folder' ? TRANSPARENT : WHITE_ALPHA_06,+ idleColor:+ selected &&+ result.type !== 'folder' &&+ result.type !== 'search-result'+ ? WHITE+ : LIGHT_TEXT,+ hoverColor:+ result.type === 'folder' || result.type === 'search-result'+ ? LIGHT_TEXT+ : WHITE,+ }),};- }, [hovered, result, selected]);+ }, [result, selected]);const labelStyle = useMemo(() => {return {...(result.type === 'search-result' ? searchLabel : label),- color:- result.type === 'search-result' || result.type === 'folder'- ? LIGHT_TEXT- : selected || hovered- ? WHITE- : LIGHT_TEXT,fontSize: QUICK_SWITCHER_RESULT_LABEL_FONT_SIZE,};- }, [hovered, result.type, selected]);+ }, [result.type]);const row = (<div@@ -231,33 +215,25 @@ export const QuickSwitcherResult: React.FC<{ref={ref}data-annotation-composition-id={composition?.id}style={style}+ className={HOVERABLE_CLASS_NAME}onClick={onSelected ?? undefined}>{result.type === 'composition' ? (result.compositionType === 'still' ? (- <StillIcon- color={selected || hovered ? WHITE : LIGHT_TEXT}- style={iconStyle}- />+ <StillIcon color={CURRENT_COLOR} style={iconStyle} />) : (- <FilmIcon- color={selected || hovered ? WHITE : LIGHT_TEXT}- style={iconStyle}- />+ <FilmIcon color={CURRENT_COLOR} style={iconStyle} />)) : result.type === 'folder' ? (- <ExpandedFolderIcon color={LIGHT_TEXT} style={iconStyle} />+ <ExpandedFolderIcon color={CURRENT_COLOR} style={iconStyle} />) : result.type === 'asset' ? (<AssetFileIconfileType={result.fileType}- color={selected || hovered ? WHITE : LIGHT_TEXT}+ color={CURRENT_COLOR}style={iconStyle}/>) : result.type === 'select-file' ? (- <UploadIcon- color={selected || hovered ? WHITE : LIGHT_TEXT}- style={selectFileIconStyle}- />+ <UploadIcon color={CURRENT_COLOR} style={selectFileIconStyle} />) : null}<Spacing x={1} /><div style={labelContainer}>diff --git a/packages/studio/src/components/SelectedOutlinePolygon.tsx b/packages/studio/src/components/SelectedOutlinePolygon.tsxindex 504b92bfa0..9182c7aa3f 100644--- a/packages/studio/src/components/SelectedOutlinePolygon.tsx+++ b/packages/studio/src/components/SelectedOutlinePolygon.tsx@@ -76,7 +76,10 @@ const SelectedOutlinePolygonUnmemoized: React.FC<{readonly hovered: boolean;readonly outline: SelectedOutline;readonly onDraggingChange: (dragging: boolean) => void;- readonly onHoverChange: (key: string | null) => void;+ readonly onHoverChange: (+ key: string | null,+ element: SVGElement | null,+ ) => void;readonly onSnapPointsChange: (snapPoints: readonly SelectedOutlineSnapPoint[],) => void;@@ -130,6 +133,11 @@ const SelectedOutlinePolygonUnmemoized: React.FC<{const {editorSnapping} = useContext(EditorSnappingContext);const {editorShowGuides, guidesList} = useContext(EditorShowGuidesContext);const polygonRef = useRef<SVGPolygonElement>(null);+ const onPolygonHoverChange = React.useCallback(+ (key: string | null, element?: SVGElement) =>+ onHoverChange(key, element ?? null),+ [onHoverChange],+ );const {selectItems} = useTimelineSelection();const [effectDropHovered, setEffectDropHovered] = useState(false);useEffect(() => {@@ -454,7 +462,7 @@ const SelectedOutlinePolygonUnmemoized: React.FC<{stroke={BLUE}visible={visible || effectDropHovered}interactive={hasTarget}- onHoverChange={onHoverChange}+ onHoverChange={onPolygonHoverChange}onPointerDown={onPointerDown}onPointerDownCapture={dragAwareDoubleClick.beginPointerGesture}onClick={onClick}diff --git a/packages/studio/src/components/SelectedOutlineRotationCornerHandle.tsx b/packages/studio/src/components/SelectedOutlineRotationCornerHandle.tsxindex 842783d54c..fd3f2f628f 100644--- a/packages/studio/src/components/SelectedOutlineRotationCornerHandle.tsx+++ b/packages/studio/src/components/SelectedOutlineRotationCornerHandle.tsx@@ -1,4 +1,5 @@-import React, {useContext, useMemo, useRef} from 'react';+import {PlayerInternals} from '@remotion/player';+import React, {useContext, useLayoutEffect, useMemo, useRef} from 'react';import {Internals} from 'remotion';import {TRANSPARENT} from '../helpers/colors';import {startCapturedPointerSession} from '../helpers/pointer-session';@@ -53,7 +54,10 @@ export const SelectedOutlineRotationCornerHandle: React.FC<{readonly onDraggingChange: (dragging: boolean) => void;readonly onContextMenuOpen: SelectedOutlineContextMenuOpenHandler;readonly onContextMenuOpenChange: (open: boolean) => void;- readonly onHoverChange: (key: string | null) => void;+ readonly onHoverChange: (+ key: string | null,+ element: SVGElement | null,+ ) => void;readonly onSelect: (item: TimelineSelection,interaction: TimelineSelectionInteraction,@@ -82,9 +86,31 @@ export const SelectedOutlineRotationCornerHandle: React.FC<{);const {editorSnapping} = useContext(EditorSnappingContext);const rotationDrag = target?.rotationDrag ?? null;+ const hasRotationDrag = rotationDrag !== null;const selected = target?.selected ?? false;const containsSelection = target?.containsSelection ?? false;const circleRef = useRef<SVGCircleElement>(null);+ useLayoutEffect(() => {+ const element = circleRef.current;+ if (element === null) {+ return;+ }++ const stopObserving = PlayerInternals.observeHover({+ element,+ initialPointerEvent: null,+ onPointerMove: null,+ onHoverChange: (hovered) => {+ if (!dragging) {+ onHoverChange(hovered ? outline.key : null, element);+ }+ },+ });+ return () => {+ stopObserving();+ onHoverChange(null, element);+ };+ }, [dragging, hasRotationDrag, onHoverChange, outline.key]);const cornerInfo = useMemo(() => getSelectedOutlineRotationCornerInfo(outline.points, corner),[corner, outline.points],@@ -345,16 +371,6 @@ export const SelectedOutlineRotationCornerHandle: React.FC<{data-remotion-studio-rotation-corner-contains-selection={containsSelection}- onPointerEnter={() => {- if (!dragging) {- onHoverChange(outline.key);- }- }}- onPointerLeave={() => {- if (!dragging) {- onHoverChange(null);- }- }}onPointerDown={onPointerDown}/><ContextMenuForTargetdiff --git a/packages/studio/src/components/SelectedOutlineScaleEdgeLine.tsx b/packages/studio/src/components/SelectedOutlineScaleEdgeLine.tsxindex 85f8420511..f732a4760a 100644--- a/packages/studio/src/components/SelectedOutlineScaleEdgeLine.tsx+++ b/packages/studio/src/components/SelectedOutlineScaleEdgeLine.tsx@@ -1,4 +1,5 @@-import React, {useContext, useMemo, useRef} from 'react';+import {PlayerInternals} from '@remotion/player';+import React, {useContext, useLayoutEffect, useMemo, useRef} from 'react';import {Internals} from 'remotion';import {TRANSPARENT} from '../helpers/colors';import {startCapturedPointerSession} from '../helpers/pointer-session';@@ -47,7 +48,10 @@ export const SelectedOutlineScaleEdgeLine: React.FC<{readonly onDraggingChange: (dragging: boolean) => void;readonly onContextMenuOpen: SelectedOutlineContextMenuOpenHandler;readonly onContextMenuOpenChange: (open: boolean) => void;- readonly onHoverChange: (key: string | null) => void;+ readonly onHoverChange: (+ key: string | null,+ element: SVGElement | null,+ ) => void;readonly onSelect: (item: TimelineSelection,interaction: TimelineSelectionInteraction,@@ -80,6 +84,28 @@ export const SelectedOutlineScaleEdgeLine: React.FC<{() => getSelectedOutlineScaleEdgeInfo(outline.points, edge),[edge, outline.points],);+ const showHandle = scaleDrag !== null && edgeInfo !== null;+ useLayoutEffect(() => {+ const element = lineRef.current;+ if (element === null) {+ return;+ }++ const stopObserving = PlayerInternals.observeHover({+ element,+ initialPointerEvent: null,+ onPointerMove: null,+ onHoverChange: (hovered) => {+ if (!dragging) {+ onHoverChange(hovered ? outline.key : null, element);+ }+ },+ });+ return () => {+ stopObserving();+ onHoverChange(null, element);+ };+ }, [dragging, onHoverChange, outline.key, showHandle]);const onPointerDown = React.useCallback((event: React.PointerEvent<SVGLineElement>) => {@@ -278,16 +304,6 @@ export const SelectedOutlineScaleEdgeLine: React.FC<{data-remotion-studio-scale-edge-contains-selection={target?.containsSelection ?? false}- onPointerEnter={() => {- if (!dragging) {- onHoverChange(outline.key);- }- }}- onPointerLeave={() => {- if (!dragging) {- onHoverChange(null);- }- }}onPointerDown={onPointerDown}/><ContextMenuForTargetdiff --git a/packages/studio/src/components/Tabs/index.tsx b/packages/studio/src/components/Tabs/index.tsxindex e3f979ffe9..ce7f996d6e 100644--- a/packages/studio/src/components/Tabs/index.tsx+++ b/packages/studio/src/components/Tabs/index.tsx@@ -1,4 +1,4 @@-import React, {useCallback, useMemo, useState} from 'react';+import React, {useCallback, useMemo} from 'react';import {BACKGROUND,BLUE,@@ -8,6 +8,7 @@ import {TAB_HOVER_BACKGROUND,WHITE,} from '../../helpers/colors';+import {HOVERABLE_CLASS_NAME, hoverableStyle} from '../../helpers/hoverable';import {useZIndex} from '../../state/z-index';const tabsContainer: React.CSSProperties = {@@ -40,7 +41,6 @@ const selectorButton: React.CSSProperties = {display: 'flex',flexDirection: 'row',fontSize: 13,- color: 'inherit',alignItems: 'center',cursor: 'default',userSelect: 'none',@@ -55,17 +55,8 @@ export const Tab: React.FC<{readonly style?: React.CSSProperties;readonly selected: boolean;}> = ({children, onClick, onDragEnter, onDragLeave, style, selected}) => {- const [hovered, setHovered] = useState(false);const {tabIndex} = useZIndex();- const onPointerEnter = useCallback(() => {- setHovered(true);- }, []);-- const onPointerLeave = useCallback(() => {- setHovered(false);- }, []);-const onKeyDown = useCallback((event: React.KeyboardEvent<HTMLDivElement>) => {if (@@ -82,29 +73,28 @@ export const Tab: React.FC<{const definiteStyle: React.CSSProperties = useMemo(() => ({...selectorButton,- backgroundColor: selected- ? BACKGROUND- : hovered- ? TAB_HOVER_BACKGROUND- : INPUT_BACKGROUND,- color: selected ? WHITE : LIGHT_TEXT,+ ...hoverableStyle({+ idleBackground: selected ? BACKGROUND : INPUT_BACKGROUND,+ hoverBackground: selected ? BACKGROUND : TAB_HOVER_BACKGROUND,+ idleColor: selected ? WHITE : LIGHT_TEXT,+ hoverColor: selected ? WHITE : LIGHT_TEXT,+ }),borderTop: selected ? '2px solid ' + BLUE : BORDER_TRANSPARENT_2PX,boxShadow: selected ? 'none' : undefined,...style,}),- [hovered, selected, style],+ [selected, style],);return (<divstyle={definiteStyle}+ className={HOVERABLE_CLASS_NAME}role="button"onClick={onClick}onDragEnter={onDragEnter}onDragLeave={onDragLeave}tabIndex={tabIndex}- onPointerLeave={onPointerLeave}- onPointerEnter={onPointerEnter}onKeyDown={onKeyDown}>{children}diff --git a/packages/studio/src/components/Tabs/vertical.tsx b/packages/studio/src/components/Tabs/vertical.tsxindex 487160f9cd..6ccee0350d 100644--- a/packages/studio/src/components/Tabs/vertical.tsx+++ b/packages/studio/src/components/Tabs/vertical.tsx@@ -1,10 +1,12 @@-import React, {useCallback, useMemo, useState} from 'react';+import React, {useMemo} from 'react';import {+ CURRENT_COLOR,WHITE_ALPHA_06,LIGHT_TEXT,TRANSPARENT,WHITE,} from '../../helpers/colors';+import {HOVERABLE_CLASS_NAME, hoverableStyle} from '../../helpers/hoverable';import {useBreakpoint} from '../../helpers/use-breakpoint';import {useZIndex} from '../../state/z-index';import {ActionTooltip} from '../ActionTooltip';@@ -20,7 +22,6 @@ const selectorButton: React.CSSProperties = {flexDirection: 'row',fontFamily: 'sans-serif',fontSize: 14,- color: 'inherit',alignItems: 'center',userSelect: 'none',WebkitUserSelect: 'none',@@ -40,43 +41,35 @@ export const VerticalTab: React.FC<{readonly selected: boolean;readonly autoFocus?: boolean;}> = ({children, onClick, renderIcon, style, selected, autoFocus}) => {- const [hovered, setHovered] = useState(false);const {tabIndex} = useZIndex();const isCompact = useBreakpoint(compactTabBreakpoint);- const onPointerEnter = useCallback(() => {- setHovered(true);- }, []);-- const onPointerLeave = useCallback(() => {- setHovered(false);- }, []);-- const color = selected || hovered ? WHITE : LIGHT_TEXT;-const definiteStyle: React.CSSProperties = useMemo(() => {return {...selectorButton,- backgroundColor: selected || hovered ? WHITE_ALPHA_06 : TRANSPARENT,- color,+ ...hoverableStyle({+ idleBackground: selected ? WHITE_ALPHA_06 : TRANSPARENT,+ hoverBackground: WHITE_ALPHA_06,+ idleColor: selected ? WHITE : LIGHT_TEXT,+ hoverColor: WHITE,+ }),boxShadow: 'none',...style,...(isCompact ? compactSelectorButton : null),};- }, [color, hovered, isCompact, selected, style]);+ }, [isCompact, selected, style]);const button = (<buttonaria-label={children}autoFocus={autoFocus}style={definiteStyle}+ className={HOVERABLE_CLASS_NAME}type="button"onClick={onClick}tabIndex={tabIndex}- onPointerLeave={onPointerLeave}- onPointerEnter={onPointerEnter}>- {renderIcon ? renderIcon(color) : null}+ {renderIcon ? renderIcon(CURRENT_COLOR) : null}{isCompact ? null : children}</button>);diff --git a/packages/studio/src/components/Timeline/TimelineRowChrome.tsx b/packages/studio/src/components/Timeline/TimelineRowChrome.tsxindex 36de2e73a8..0e0ede2ce2 100644--- a/packages/studio/src/components/Timeline/TimelineRowChrome.tsx+++ b/packages/studio/src/components/Timeline/TimelineRowChrome.tsx@@ -61,7 +61,7 @@ export const TimelineRowKeyframeControlsColumn: React.FC<{);};-export const TimelineRowChrome: React.FC<{+type TimelineRowChromeProps = {readonly depth: number;readonly eye: React.ReactNode;readonly keyframeControls?: React.ReactNode;@@ -83,30 +83,34 @@ export const TimelineRowChrome: React.FC<{readonly onDragOver?: (e: React.DragEvent<HTMLDivElement>) => void;readonly onDrop?: (e: React.DragEvent<HTMLDivElement>) => void;readonly onDoubleClick?: (e: React.MouseEvent<HTMLDivElement>) => void;- readonly onPointerEnter?: () => void;- readonly onPointerLeave?: () => void;-}> = ({- depth,- eye,- keyframeControls,- arrow,- children,- style,- selected,- selectable,- onSelect,- showSelectedBackground,- containsSelection,- hovered = false,- outerHeight,- showBottomBorder,- onDragLeave,- onDragOver,- onDrop,- onDoubleClick,- onPointerEnter,- onPointerLeave,-}) => {+};++const TimelineRowChromeForwardRef: React.ForwardRefRenderFunction<+ HTMLDivElement,+ TimelineRowChromeProps+> = (+ {+ depth,+ eye,+ keyframeControls,+ arrow,+ children,+ style,+ selected,+ selectable,+ onSelect,+ showSelectedBackground,+ containsSelection,+ hovered = false,+ outerHeight,+ showBottomBorder,+ onDragLeave,+ onDragOver,+ onDrop,+ onDoubleClick,+ },+ ref,+) => {const {basePadding, rowBorderRadius, rowHorizontalMargin} = useContext(TimelineRowLayoutContext,);@@ -252,6 +256,7 @@ export const TimelineRowChrome: React.FC<{if (outerStyle) {return (<div+ ref={ref}style={outerStyle}onDragLeave={onDragLeave}onDragOver={onDragOver}@@ -260,8 +265,6 @@ export const TimelineRowChrome: React.FC<{onPointerDown={selectable ? onPointerDown : undefined}onClick={onClick}onContextMenu={selectable ? onContextMenu : undefined}- onPointerEnter={onPointerEnter}- onPointerLeave={onPointerLeave}><div style={innerRowStyle}>{chrome}</div></div>@@ -270,6 +273,7 @@ export const TimelineRowChrome: React.FC<{return (<div+ ref={ref}onDragLeave={onDragLeave}onDragOver={onDragOver}onDrop={onDrop}@@ -277,11 +281,14 @@ export const TimelineRowChrome: React.FC<{onPointerDown={selectable ? onPointerDown : undefined}onClick={onClick}onContextMenu={selectable ? onContextMenu : undefined}- onPointerEnter={onPointerEnter}- onPointerLeave={onPointerLeave}style={innerRowStyle}>{chrome}</div>);};++export const TimelineRowChrome = React.forwardRef<+ HTMLDivElement,+ TimelineRowChromeProps+>(TimelineRowChromeForwardRef);diff --git a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsxindex f2a7c93718..541dbf8388 100644--- a/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx+++ b/packages/studio/src/components/Timeline/TimelineSequenceItem.tsx@@ -383,8 +383,7 @@ const TimelineSequenceItemInner: React.FC<{const propStatusesRef = useContext(Internals.VisualModePropStatusesRefContext,);- const {hovered, onPointerEnter, onPointerLeave} =- useTimelineSequenceHover(nodePathInfo);+ const {hovered, ref: hoverRef} = useTimelineSequenceHover(nodePathInfo);const {previewServerState} = useContext(StudioServerConnectionCtx);const previewConnected = previewServerState.type === 'connected';const previewInteractive = previewConnected && isStudioInteractivityEnabled();@@ -1662,6 +1661,7 @@ const TimelineSequenceItemInner: React.FC<{const trackRow = (<TimelineRowChrome+ ref={hoverRef}depth={nestedDepth}eye={showVisibilityToggle ? (@@ -1690,8 +1690,6 @@ const TimelineSequenceItemInner: React.FC<{onDoubleClick={canHandleSequenceDoubleClick ? onSequenceDoubleClick : undefined}- onPointerEnter={onPointerEnter}- onPointerLeave={onPointerLeave}><div style={labelContainerStyle}>{connectedCompositions.length > 0 ? (diff --git a/packages/studio/src/components/Timeline/TimelineTrack.tsx b/packages/studio/src/components/Timeline/TimelineTrack.tsxindex f24bfcda56..d740adbe1e 100644--- a/packages/studio/src/components/Timeline/TimelineTrack.tsx+++ b/packages/studio/src/components/Timeline/TimelineTrack.tsx@@ -28,9 +28,7 @@ const TimelineTrackUnmemoized: React.FC<{const {previewServerState} = useContext(StudioServerConnectionCtx);const previewServerConnected = previewServerState.type === 'connected';const timelineWidth = useContext(TimelineWidthContext);- const {hovered, onPointerEnter, onPointerLeave} = useTimelineSequenceHover(- track.nodePathInfo,- );+ const {hovered, ref: hoverRef} = useTimelineSequenceHover(track.nodePathInfo);const rowHighlightBackground = useTimelineRowHighlightBackground(track.nodePathInfo,{@@ -54,7 +52,7 @@ const TimelineTrackUnmemoized: React.FC<{getIsExpanded(track.nodePathInfo);return (- <div onPointerEnter={onPointerEnter} onPointerLeave={onPointerLeave}>+ <div ref={hoverRef}><divstyle={layerStyle}{...getSequenceAnnotationAttributes({diff --git a/packages/studio/src/components/use-selected-outline-control-target.ts b/packages/studio/src/components/use-selected-outline-control-target.tsindex 000c5bffe3..917dd28fe8 100644--- a/packages/studio/src/components/use-selected-outline-control-target.ts+++ b/packages/studio/src/components/use-selected-outline-control-target.ts@@ -39,11 +39,19 @@ export const useSelectedOutlineControlTarget = ({? getLatestTargetByKey(layoutTarget.key): undefined;const onHoverChange = React.useCallback(- (key: string | null) => {+ (key: string | null, element: SVGElement | null) => {if (key === null) {- onPointerLeave();+ onPointerLeave(element === null ? undefined : {currentTarget: element});} else if (targetRef.current?.key === key) {- onPointerEnter();+ onPointerEnter(+ element === null+ ? undefined+ : {+ currentTarget: element,+ nativeEvent: null,+ pointerType: null,+ },+ );}},[onPointerEnter, onPointerLeave],diff --git a/packages/studio/src/helpers/hoverable.ts b/packages/studio/src/helpers/hoverable.tsindex c9d88d110f..cd7b0a1217 100644--- a/packages/studio/src/helpers/hoverable.ts+++ b/packages/studio/src/helpers/hoverable.ts@@ -1,5 +1,11 @@import type React from 'react';-import {TRANSPARENT} from './colors';+import {+ BLACK_ALPHA_60,+ LIGHT_TEXT,+ TRANSPARENT,+ WHITE,+ WHITE_ALPHA_05,+} from './colors';// Purely visual hover styling must be driven by CSS `:hover` rather than// React state: When the Studio runs in an <iframe> (like in Browser Studio),@@ -13,7 +19,10 @@ import {TRANSPARENT} from './colors';export const HOVERABLE_CLASS_NAME = '__remotion-hoverable';export const HOVER_GROUP_CLASS_NAME = '__remotion-hover-group';export const HOVER_GROUP_REVEAL_CLASS_NAME = '__remotion-hover-group-reveal';+export const HOVER_GROUP_REVEAL_KEEP_SPACE_CLASS_NAME =+ '__remotion-hover-group-reveal-keep-space';export const FOCUS_VISIBLE_ONLY_CLASS_NAME = '__remotion-focus-visible-only';+export const INPUT_HOVER_CLASS_NAME = '__remotion-input-hover';const BG_VARIABLE = '--remotion-studio-hoverable-bg';const HOVER_BG_VARIABLE = '--remotion-studio-hoverable-hover-bg';@@ -54,6 +63,8 @@ export const hoverableStyle = ({const hoverable = `.${HOVERABLE_CLASS_NAME}.${HOVERABLE_CLASS_NAME}`;const hoverGroup = `.${HOVER_GROUP_CLASS_NAME}`;const reveal = `.${HOVER_GROUP_REVEAL_CLASS_NAME}.${HOVER_GROUP_REVEAL_CLASS_NAME}`;+const revealKeepSpace = `.${HOVER_GROUP_REVEAL_KEEP_SPACE_CLASS_NAME}.${HOVER_GROUP_REVEAL_KEEP_SPACE_CLASS_NAME}`;+const inputHover = `.${INPUT_HOVER_CLASS_NAME}`;export const makeHoverableCSS = () => `${hoverable} {@@ -69,7 +80,17 @@ export const makeHoverableCSS = () => `flex-shrink: 0;}+ ${inputHover} {+ --remotion-studio-input-hover-border: ${BLACK_ALPHA_60};+ --remotion-studio-input-hover-icon: var(--remotion-studio-input-idle-icon, ${LIGHT_TEXT});+ }+@media (hover: hover) {+ ${inputHover}:hover {+ --remotion-studio-input-hover-border: ${WHITE_ALPHA_05};+ --remotion-studio-input-hover-icon: ${WHITE};+ }+${hoverable}:hover {background-color: var(${HOVER_BG_VARIABLE}, var(${BG_VARIABLE}, ${TRANSPARENT}));}@@ -99,5 +120,17 @@ export const makeHoverableCSS = () => `width: auto;overflow: visible;}++ ${hoverGroup} ${revealKeepSpace} {+ opacity: 0;+ pointer-events: none;+ }++ ${hoverGroup}:hover ${revealKeepSpace},+ ${hoverGroup}:focus-within ${revealKeepSpace},+ ${hoverGroup}:has([aria-expanded="true"]) ${revealKeepSpace} {+ opacity: 1;+ pointer-events: auto;+ }}`;