🎥 Make videos programmatically with React
`@remotion/studio`: Fix preview toolbar tooltip flicker
Jonny Burgerce313f187e56
diff --git a/packages/studio/src/components/CheckboardToggle.tsx b/packages/studio/src/components/CheckboardToggle.tsxindex 680ae27172..6027ef30ab 100644--- a/packages/studio/src/components/CheckboardToggle.tsx+++ b/packages/studio/src/components/CheckboardToggle.tsx@@ -9,6 +9,8 @@ import {CheckerboardContext} from '../state/checkerboard';import {ActionTooltip} from './ActionTooltip';import {ControlButton} from './ControlButton';+const buttonStyle: React.CSSProperties = {width: 26};+export const CheckboardToggle: React.FC = () => {const {checkerboard, setCheckerboard} = useContext(CheckerboardContext);@@ -38,6 +40,7 @@ export const CheckboardToggle: React.FC = () => {shortcutsDisabled ? undefined : ariaKeyShortcuts || undefined}onClick={onClick}+ style={buttonStyle}>{(color) => (<svgdiff --git a/packages/studio/src/components/LoopToggle.tsx b/packages/studio/src/components/LoopToggle.tsxindex b49a6f8534..fbb796ac4f 100644--- a/packages/studio/src/components/LoopToggle.tsx+++ b/packages/studio/src/components/LoopToggle.tsx@@ -10,6 +10,7 @@ import {ActionTooltip} from './ActionTooltip';import {ControlButton} from './ControlButton';const accessibilityLabel = 'Loop';+const buttonStyle: React.CSSProperties = {width: 30};export const toggleLoop = (setLoop: React.Dispatch<React.SetStateAction<boolean>>,@@ -46,6 +47,7 @@ export const LoopToggle: React.FC<{}aria-pressed={loop}onClick={onClick}+ style={buttonStyle}>{(color) => (<svg viewBox="0 0 512 512" style={{width: 18, height: 18}}>diff --git a/packages/studio/src/components/MuteToggle.tsx b/packages/studio/src/components/MuteToggle.tsxindex a33ad20924..9a4f5f83c0 100644--- a/packages/studio/src/components/MuteToggle.tsx+++ b/packages/studio/src/components/MuteToggle.tsx@@ -1,3 +1,4 @@+import type {CSSProperties} from 'react';import {useCallback} from 'react';import {BLUE} from '../helpers/colors';import {areKeyboardShortcutsDisabled} from '../helpers/use-keybinding';@@ -10,6 +11,8 @@ import {persistMuteOption} from '../state/mute';import {ActionTooltip} from './ActionTooltip';import {ControlButton} from './ControlButton';+const buttonStyle: CSSProperties = {width: 30};+export const toggleMute = (setMuted: React.Dispatch<React.SetStateAction<boolean>>,) => {@@ -45,6 +48,7 @@ export const MuteToggle: React.FC<{shortcutsDisabled ? undefined : ariaShortcut || undefined}onClick={onClick}+ style={buttonStyle}>{(color) =>muted ? (diff --git a/packages/studio/src/components/OutlineToggle.tsx b/packages/studio/src/components/OutlineToggle.tsxindex f767d21ddd..485aae0428 100644--- a/packages/studio/src/components/OutlineToggle.tsx+++ b/packages/studio/src/components/OutlineToggle.tsx@@ -9,6 +9,8 @@ import {EditorShowOutlinesContext} from '../state/editor-outlines';import {ActionTooltip} from './ActionTooltip';import {ControlButton} from './ControlButton';+const buttonStyle: React.CSSProperties = {width: 26};+export const OutlineToggle: React.FC = () => {const {editorShowOutlines, setEditorShowOutlines} = useContext(EditorShowOutlinesContext,@@ -41,6 +43,7 @@ export const OutlineToggle: React.FC = () => {}aria-pressed={editorShowOutlines}onClick={onClick}+ style={buttonStyle}>{(color) => {const iconColor = editorShowOutlines ? BLUE : color;diff --git a/packages/studio/src/components/PreviewToolbar.tsx b/packages/studio/src/components/PreviewToolbar.tsxindex fae3e2ebb2..d51ec03a9b 100644--- a/packages/studio/src/components/PreviewToolbar.tsx+++ b/packages/studio/src/components/PreviewToolbar.tsx@@ -174,7 +174,6 @@ export const PreviewToolbar: React.FC<{<PreviewToolbarControl><LoopToggle loop={loop} setLoop={setLoop} /></PreviewToolbarControl>- <Spacing x={0.75} /><PreviewToolbarControl><MuteToggle muted={playerMuted} setMuted={setPlayerMuted} /></PreviewToolbarControl>@@ -192,29 +191,22 @@ export const PreviewToolbar: React.FC<{<CheckboardToggle /></PreviewToolbarControl>)}- {isMobileLayout ? null : <Spacing x={0.25} />}{isMobileLayout || !showCompositionControls ? null : (<PreviewToolbarControl><OutlineToggle /></PreviewToolbarControl>)}{isMobileLayout ? null : (- <>- {showCompositionControls ? <Spacing x={0.25} /> : null}- <PreviewToolbarControl>- <RulersAndGuidesToggle showGuides={showCompositionControls} />- </PreviewToolbarControl>- </>+ <PreviewToolbarControl>+ <RulersAndGuidesToggle showGuides={showCompositionControls} />+ </PreviewToolbarControl>)}{readOnlyStudio ||isMobileLayout ||!showCompositionControls ? null : (- <>- <Spacing x={0.25} />- <PreviewToolbarControl>- <SnappingToggle />- </PreviewToolbarControl>- </>+ <PreviewToolbarControl>+ <SnappingToggle />+ </PreviewToolbarControl>)}</>) : null}diff --git a/packages/studio/src/components/RulersAndGuidesToggle.tsx b/packages/studio/src/components/RulersAndGuidesToggle.tsxindex 318ef54b7c..583d03abc3 100644--- a/packages/studio/src/components/RulersAndGuidesToggle.tsx+++ b/packages/studio/src/components/RulersAndGuidesToggle.tsx@@ -10,6 +10,8 @@ import {EditorShowRulersContext} from '../state/editor-rulers';import {ActionTooltip} from './ActionTooltip';import {ControlButton} from './ControlButton';+const buttonStyle: React.CSSProperties = {width: 26};+export const RulersAndGuidesToggle: React.FC<{readonly showGuides: boolean;}> = ({showGuides}) => {@@ -63,6 +65,7 @@ export const RulersAndGuidesToggle: React.FC<{}aria-pressed={rulersOrGuidesAreVisible}onClick={onClick}+ style={buttonStyle}>{(color) => (<svgdiff --git a/packages/studio/src/components/SnappingToggle.tsx b/packages/studio/src/components/SnappingToggle.tsxindex e22e781181..41018897de 100644--- a/packages/studio/src/components/SnappingToggle.tsx+++ b/packages/studio/src/components/SnappingToggle.tsx@@ -10,6 +10,8 @@ import {EditorSnappingContext} from '../state/editor-snapping';import {ActionTooltip} from './ActionTooltip';import {ControlButton} from './ControlButton';+const buttonStyle: React.CSSProperties = {width: 26};+export const SnappingToggle: React.FC = () => {const {editorSnapping, setEditorSnapping} = useContext(EditorSnappingContext);@@ -40,6 +42,7 @@ export const SnappingToggle: React.FC = () => {shortcutsDisabled ? undefined : ariaKeyShortcuts || undefined}onClick={onClick}+ style={buttonStyle}>{(color) => (<MagnetIcon