@videojs/react 10.0.0-beta.25 → 10.0.0-beta.26

package/docs/concepts/skins.md

@@ -55,7 +55,9 @@ tsx
 
 ### Example of ejected
 
-Skin.tsx
+VideoPlayer.tsx
+
+player.ts
 
 skin.css
 
@@ -63,10 +65,12 @@ skin.css
 'use client';
 
 import { type CSSProperties, type ComponentProps, forwardRef, type ReactNode, isValidElement } from 'react';
-import { AirPlayEnterIcon, AirPlayExitIcon, CaptionsOffIcon, CaptionsOnIcon, CastEnterIcon, CastExitIcon, CheckIcon, ChevronIcon, FullscreenEnterIcon, FullscreenExitIcon, GearIcon, PauseIcon, PipEnterIcon, PipExitIcon, PlayIcon, QualityIcon, RestartIcon, SeekIcon, SpeechIcon, SpeedIcon, SpinnerIcon, VolumeHighIcon, VolumeLowIcon, VolumeOffIcon } from '@videojs/react/icons';
-import { createPlayer, Poster, Container, usePlayer, AirPlayButton, useAudioTrackOptions, BufferingIndicator, useCaptionsOptions, CastButton, Controls, ErrorDialog, FullscreenButton, Gesture, Hotkey, Menu, MuteButton, PiPButton, PlayButton, usePlaybackRateOptions, Popover, useQualityOptions, SeekButton, SeekIndicator, Slider, StatusAnnouncer, StatusIndicator, Time, TimeSlider, Tooltip, VolumeIndicator, VolumeSlider, type RenderProp } from '@videojs/react';
-import { Video, videoFeatures } from '@videojs/react/video';
+import { audioText, captionsText, playbackRateText, qualityText, settingsText, speedText } from '@videojs/core/i18n/text/menu';
+import { AirPlayEnterIcon, AirPlayExitIcon, CaptionsOffIcon, CaptionsOnIcon, CastEnterIcon, CastExitIcon, CheckIcon, ChevronIcon, FullscreenEnterIcon, FullscreenExitIcon, GearIcon, PauseIcon, PipEnterIcon, PipExitIcon, PlayIcon, QualityIcon, RestartIcon, SpeechIcon, SpeedIcon, SpinnerIcon, VolumeHighIcon, VolumeLowIcon, VolumeOffIcon } from '@videojs/react/icons';
+import { Poster, useTranslator, Container, usePlayer, AirPlayButton, useAudioTrackOptions, BufferingIndicator, CaptionsButton, useCaptionsOptions, CastButton, Controls, ErrorDialog, FullscreenButton, Gesture, Hotkey, Menu, MuteButton, PiPButton, PlayButton, usePlaybackRateOptions, Popover, useQualityOptions, SeekIndicator, Slider, StatusAnnouncer, StatusIndicator, Time, TimeSlider, Tooltip, VolumeIndicator, VolumeSlider, type RenderProp } from '@videojs/react';
+import { Video } from '@videojs/react/video';
 import './player.css';
+import { Player } from './player';
 
 const TOP_STATUS_ACTIONS = ['toggleSubtitles', 'toggleFullscreen', 'togglePictureInPicture'] as const;
 
@@ -77,6 +81,7 @@ function MenuChevron({ flipped = false }: { flipped?: boolean }): ReactNode {
 }
 
 function SettingsMenu(): ReactNode {
+  const t = useTranslator();
   const playbackRate = usePlaybackRateOptions();
   const quality = useQualityOptions();
   const audioTrack = useAudioTrackOptions();
@@ -90,7 +95,7 @@ function SettingsMenu(): ReactNode {
 
   return (
     <Menu.Root side="top" align="center">
-      <Menu.Trigger aria-label="Settings" className="media-button--settings" render={<Button />}>
+      <Menu.Trigger aria-label={t(settingsText)} className="media-button--settings" render={<Button />}>
         <GearIcon className="media-icon media-icon--settings" />
       </Menu.Trigger>
       <Menu.Content className="media-surface media-popover media-menu media-menu--settings">
@@ -104,7 +109,7 @@ function SettingsMenu(): ReactNode {
                   render={(props) => (
                     <div {...props}>
                       <QualityIcon className="media-icon" />
-                      <span>Quality</span>
+                      <span>{t(qualityText)}</span>
                       <span className="media-menu__hint">
                         <Menu.ItemValue className="media-menu__hint-label" />
                         <MenuChevron />
@@ -115,14 +120,14 @@ function SettingsMenu(): ReactNode {
                 <Menu.Content className="media-menu__panel">
                   <Menu.Back className="media-menu__back">
                     <MenuChevron flipped />
-                    Quality
+                    {t(qualityText)}
                   </Menu.Back>
                   <Menu.Separator className="media-menu__separator" />
                   <Menu.RadioGroup
                     className="media-menu__group"
                     value={quality.value}
                     onValueChange={quality.setValue}
-                    aria-label="Quality"
+                    aria-label={t(qualityText)}
                   >
                     {quality.options.map((option) => (
                       <Menu.RadioItem
@@ -158,7 +163,7 @@ function SettingsMenu(): ReactNode {
                   render={(props) => (
                     <div {...props}>
                       <SpeechIcon className="media-icon" />
-                      <span>Audio</span>
+                      <span>{t(audioText)}</span>
                       <span className="media-menu__hint">
                         <Menu.ItemValue className="media-menu__hint-label" />
                         <MenuChevron />
@@ -169,14 +174,14 @@ function SettingsMenu(): ReactNode {
                 <Menu.Content className="media-menu__panel">
                   <Menu.Back className="media-menu__back">
                     <MenuChevron flipped />
-                    Audio
+                    {t(audioText)}
                   </Menu.Back>
                   <Menu.Separator className="media-menu__separator" />
                   <Menu.RadioGroup
                     className="media-menu__group"
                     value={audioTrack.value}
                     onValueChange={audioTrack.setValue}
-                    aria-label="Audio tracks"
+                    aria-label={t(audioText)}
                   >
                     {audioTrack.options.map((option) => (
                       <Menu.RadioItem
@@ -208,7 +213,7 @@ function SettingsMenu(): ReactNode {
                   render={(props) => (
                     <div {...props}>
                       <SpeedIcon className="media-icon" />
-                      <span>Speed</span>
+                      <span>{t(speedText)}</span>
                       <span className="media-menu__hint">
                         <Menu.ItemValue className="media-menu__hint-label" />
                         <MenuChevron />
@@ -219,14 +224,14 @@ function SettingsMenu(): ReactNode {
                 <Menu.Content className="media-menu__panel">
                   <Menu.Back className="media-menu__back">
                     <MenuChevron flipped />
-                    Speed
+                    {t(speedText)}
                   </Menu.Back>
                   <Menu.Separator className="media-menu__separator" />
                   <Menu.RadioGroup
                     className="media-menu__group"
                     value={playbackRate.value}
                     onValueChange={playbackRate.setValue}
-                    aria-label="Playback rate"
+                    aria-label={t(playbackRateText)}
                   >
                     {playbackRate.options.map((option) => (
                       <Menu.RadioItem
@@ -258,7 +263,7 @@ function SettingsMenu(): ReactNode {
                   render={(props) => (
                     <div {...props}>
                       <CaptionsOffIcon className="media-icon" />
-                      <span>Captions</span>
+                      <span>{t(captionsText)}</span>
                       <span className="media-menu__hint">
                         <Menu.ItemValue className="media-menu__hint-label" />
                         <MenuChevron />
@@ -269,14 +274,14 @@ function SettingsMenu(): ReactNode {
                 <Menu.Content className="media-menu__panel">
                   <Menu.Back className="media-menu__back">
                     <MenuChevron flipped />
-                    Captions
+                    {t(captionsText)}
                   </Menu.Back>
                   <Menu.Separator className="media-menu__separator" />
                   <Menu.RadioGroup
                     className="media-menu__group"
                     value={captions.value}
                     onValueChange={captions.setValue}
-                    aria-label="Captions"
+                    aria-label={t(captionsText)}
                   >
                     {captions.options.map((option) => (
                       <Menu.RadioItem
@@ -306,14 +311,88 @@ function SettingsMenu(): ReactNode {
   );
 }
 
+function CastControl() {
+  return (
+    <Tooltip.Root side="top">
+      <Tooltip.Trigger
+        render={
+          <CastButton className="media-button--cast" render={<Button />}>
+            <CastEnterIcon className="media-icon media-icon--cast-enter" />
+            <CastExitIcon className="media-icon media-icon--cast-exit" />
+          </CastButton>
+        }
+      />
+      <Tooltip.Popup className="media-surface media-tooltip">
+        <Tooltip.Label />
+        <Tooltip.Shortcut className="media-tooltip__kbd" />
+      </Tooltip.Popup>
+    </Tooltip.Root>
+  );
+}
+
+function AirPlayControl() {
+  return (
+    <Tooltip.Root side="top">
+      <Tooltip.Trigger
+        render={
+          <AirPlayButton className="media-button--airplay" render={<Button />}>
+            <AirPlayEnterIcon className="media-icon media-icon--airplay-enter" />
+            <AirPlayExitIcon className="media-icon media-icon--airplay-exit" />
+          </AirPlayButton>
+        }
+      />
+      <Tooltip.Popup className="media-surface media-tooltip">
+        <Tooltip.Label />
+        <Tooltip.Shortcut className="media-tooltip__kbd" />
+      </Tooltip.Popup>
+    </Tooltip.Root>
+  );
+}
+
+function PiPControl() {
+  return (
+    <Tooltip.Root side="top">
+      <Tooltip.Trigger
+        render={
+          <PiPButton className="media-button--pip" render={<Button />}>
+            <PipEnterIcon className="media-icon media-icon--pip-enter" />
+            <PipExitIcon className="media-icon media-icon--pip-exit" />
+          </PiPButton>
+        }
+      />
+      <Tooltip.Popup className="media-surface media-tooltip">
+        <Tooltip.Label />
+        <Tooltip.Shortcut className="media-tooltip__kbd" />
+      </Tooltip.Popup>
+    </Tooltip.Root>
+  );
+}
+
+function FullscreenControl() {
+  return (
+    <Tooltip.Root side="top">
+      <Tooltip.Trigger
+        render={
+          <FullscreenButton className="media-button--fullscreen" render={<Button />}>
+            <FullscreenEnterIcon className="media-icon media-icon--fullscreen-enter" />
+            <FullscreenExitIcon className="media-icon media-icon--fullscreen-exit" />
+          </FullscreenButton>
+        }
+      />
+      <Tooltip.Popup className="media-surface media-tooltip">
+        <Tooltip.Label />
+        <Tooltip.Shortcut className="media-tooltip__kbd" />
+      </Tooltip.Popup>
+    </Tooltip.Root>
+  );
+}
+
 // ================================================================
 // Player
 // ================================================================
 
 const SEEK_TIME = 10;
 
-export const Player = createPlayer({ features: videoFeatures });
-
 export interface VideoPlayerProps {
   src: string;
   style?: CSSProperties;
@@ -360,155 +439,87 @@ export function VideoPlayer({ src, className, poster, placeholder, style, ...res
           <ErrorDialog.Popup className="media-error">
             <div className="media-error__dialog media-surface">
               <div className="media-error__content">
-                <ErrorDialog.Title className="media-error__title">Something went wrong.</ErrorDialog.Title>
+                <ErrorDialog.Title className="media-error__title"></ErrorDialog.Title>
                 <ErrorDialog.Description className="media-error__description" />
               </div>
               <div className="media-error__actions">
-                <ErrorDialog.Close className="media-button media-button--primary">OK</ErrorDialog.Close>
+                <ErrorDialog.Close className="media-button media-button--primary"></ErrorDialog.Close>
               </div>
             </div>
           </ErrorDialog.Popup>
         </ErrorDialog.Root>
 
-        <Controls.Root className="media-surface media-controls">
+        <Controls.Root className="media-surface media-controls media-controls--root">
           <Tooltip.Provider>
-            <div className="media-button-group">
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <PlayButton className="media-button--play" render={<Button />}>
-                      <RestartIcon className="media-icon media-icon--restart" />
-                      <PlayIcon className="media-icon media-icon--play" />
-                      <PauseIcon className="media-icon media-icon--pause" />
-                    </PlayButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <SeekButton seconds={-SEEK_TIME} className="media-button--seek" render={<Button />}>
-                      <span className="media-icon__container">
-                        <SeekIcon className="media-icon media-icon--seek media-icon--flipped" />
-                        <span className="media-icon__label">{SEEK_TIME}</span>
-                      </span>
-                    </SeekButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <SeekButton seconds={SEEK_TIME} className="media-button--seek" render={<Button />}>
-                      <span className="media-icon__container">
-                        <SeekIcon className="media-icon media-icon--seek" />
-                        <span className="media-icon__label">{SEEK_TIME}</span>
-                      </span>
-                    </SeekButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-            </div>
-
-            <div className="media-time-controls">
-              <Time.Value type="current" className="media-time" />
-              <TimeSlider.Root className="media-slider">
-                <TimeSlider.Track className="media-slider__track">
-                  <TimeSlider.Fill className="media-slider__fill" />
-                  <TimeSlider.Buffer className="media-slider__buffer" />
-                </TimeSlider.Track>
-                <TimeSlider.Thumb className="media-slider__thumb" />
-
-                <div className="media-surface media-thumbnail media-slider__thumbnail">
-                  <Slider.Thumbnail className="media-thumbnail__image" />
-                  <TimeSlider.Value type="pointer" className="media-time media-thumbnail__time" />
-                  <SpinnerIcon className="media-thumbnail__spinner media-icon" />
-                </div>
-                <TimeSlider.Preview className="media-slider__preview">
-                  <TimeSlider.Value type="pointer" className="media-time media-slider__value" />
-                </TimeSlider.Preview>
-              </TimeSlider.Root>
-              <Time.Value toggle type="remaining" className="media-time" />
-            </div>
+            <div className="media-surface media-controls media-controls--primary">
+              <div className="media-button-group">
+                <Tooltip.Root side="top">
+                  <Tooltip.Trigger
+                    render={
+                      <PlayButton className="media-button--play" render={<Button />}>
+                        <RestartIcon className="media-icon media-icon--restart" />
+                        <PlayIcon className="media-icon media-icon--play" />
+                        <PauseIcon className="media-icon media-icon--pause" />
+                      </PlayButton>
+                    }
+                  />
+                  <Tooltip.Popup className="media-surface media-tooltip">
+                    <Tooltip.Label />
+                    <Tooltip.Shortcut className="media-tooltip__kbd" />
+                  </Tooltip.Popup>
+                </Tooltip.Root>
+
+                <VolumePopover />
+              </div>
 
-            <div className="media-button-group">
-              <VolumePopover />
+              <div className="media-time-controls">
+                <Time.Value type="current" className="media-time" />
+                <TimeSlider.Root className="media-slider">
+                  <TimeSlider.Track className="media-slider__track">
+                    <TimeSlider.Fill className="media-slider__fill" />
+                    <TimeSlider.Buffer className="media-slider__buffer" />
+                  </TimeSlider.Track>
+                  <TimeSlider.Thumb className="media-slider__thumb" />
+
+                  <div className="media-surface media-thumbnail media-slider__thumbnail">
+                    <Slider.Thumbnail className="media-thumbnail__image" />
+                    <TimeSlider.Value type="pointer" className="media-time media-thumbnail__time" />
+                    <SpinnerIcon className="media-thumbnail__spinner media-icon" />
+                  </div>
+                  <TimeSlider.Preview className="media-slider__preview">
+                    <TimeSlider.Value type="pointer" className="media-time media-slider__value" />
+                  </TimeSlider.Preview>
+                </TimeSlider.Root>
+                <Time.Value toggle type="remaining" className="media-time" />
+              </div>
 
-              <SettingsMenu />
+              <div className="media-button-group">
+                <Tooltip.Root side="top">
+                  <Tooltip.Trigger
+                    render={
+                      <CaptionsButton className="media-button--captions" render={<Button />}>
+                        <CaptionsOffIcon className="media-icon media-icon--captions-off" />
+                        <CaptionsOnIcon className="media-icon media-icon--captions-on" />
+                      </CaptionsButton>
+                    }
+                  />
+                  <Tooltip.Popup className="media-surface media-tooltip">
+                    <Tooltip.Label />
+                    <Tooltip.Shortcut className="media-tooltip__kbd" />
+                  </Tooltip.Popup>
+                </Tooltip.Root>
+
+                <SettingsMenu />
+              </div>
+            </div>
 
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <CastButton className="media-button--cast" render={<Button />}>
-                      <CastEnterIcon className="media-icon media-icon--cast-enter" />
-                      <CastExitIcon className="media-icon media-icon--cast-exit" />
-                    </CastButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <AirPlayButton className="media-button--airplay" render={<Button />}>
-                      <AirPlayEnterIcon className="media-icon media-icon--airplay-enter" />
-                      <AirPlayExitIcon className="media-icon media-icon--airplay-exit" />
-                    </AirPlayButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <PiPButton className="media-button--pip" render={<Button />}>
-                      <PipEnterIcon className="media-icon media-icon--pip-enter" />
-                      <PipExitIcon className="media-icon media-icon--pip-exit" />
-                    </PiPButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
-
-              <Tooltip.Root side="top">
-                <Tooltip.Trigger
-                  render={
-                    <FullscreenButton className="media-button--fullscreen" render={<Button />}>
-                      <FullscreenEnterIcon className="media-icon media-icon--fullscreen-enter" />
-                      <FullscreenExitIcon className="media-icon media-icon--fullscreen-exit" />
-                    </FullscreenButton>
-                  }
-                />
-                <Tooltip.Popup className="media-surface media-tooltip">
-                  <Tooltip.Label />
-                  <Tooltip.Shortcut className="media-tooltip__kbd" />
-                </Tooltip.Popup>
-              </Tooltip.Root>
+            <div className="media-surface media-controls media-controls--secondary">
+              <div className="media-button-group">
+                <CastControl />
+                <AirPlayControl />
+                <PiPControl />
+                <FullscreenControl />
+              </div>
             </div>
           </Tooltip.Provider>
         </Controls.Root>
@@ -542,7 +553,7 @@ export function VideoPlayer({ src, className, poster, placeholder, style, ...res
         <Gesture type="doubletap" action="seekStep" value={SEEK_TIME} region="right" />
 
         {/* Input Feedback */}
-        <StatusAnnouncer />
+        <StatusAnnouncer className="media-sr-only" />
         <div className="media-input-feedback">
           <VolumeIndicator.Root className="media-surface media-input-feedback-island media-input-feedback-island--volume">
             <VolumeIndicator.Fill className="media-input-feedback-island__content">
@@ -640,6 +651,25 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 }
 ```
 ```
+import { createPlayer } from '@videojs/react';
+import { videoFeatures } from '@videojs/react/video';
+
+export const Player = createPlayer({ features: videoFeatures });
+```
+```
+.media-sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  white-space: nowrap;
+  border: 0;
+  clip: rect(0, 0, 0, 0);
+}
+
+
 /* ==========================================================================
    Reset
    ========================================================================== */
@@ -673,10 +703,24 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
    ========================================================================== */
 
 .media-default-skin {
+  /* Colors */
   --media-current-shadow-color: oklch(from currentColor 0 0 0 / clamp(0, calc((l - 0.5) * 0.5), 0.15));
   --media-current-shadow-color-subtle: oklch(from var(--media-current-shadow-color) l c h / calc(alpha * 0.4));
-  --media-icon-size: 18px;
-  --media-color-scrollbar-thumb: oklch(from currentColor l c h / 0.3);
+  --scrollbar-thumb-color: oklch(from currentColor l c h / 0.3);
+
+  /* Scaling (used in video fullscreen) */
+  --scale: 1;
+  /* What value and unit to use - 1rem assumes the document font size remains at the default 16px */
+  --base-size: 1rem;
+  --size: calc(var(--base-size) * var(--scale));
+  /* Create a Tailwind-like spacing unit */
+  --spacing: calc(var(--size) / 4);
+  --font-size-medium: calc(0.9375 * var(--size)); /* 15px */
+  --font-size-base: calc(0.8125 * var(--size)); /* 13px */
+  --font-size-small: calc(0.6875 * var(--size)); /* 11px */
+  --font-size-tiny: calc(0.5625 * var(--size)); /* 9px */
+  --media-icon-size: calc(1.125 * var(--size)); /* 18px */
+
   position: relative;
   display: block;
   width: 100%;
@@ -688,16 +732,16 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     ui-sans-serif,
     system-ui,
     sans-serif;
-  font-size: 0.8125rem; /* 13px at 100% font size */
+  font-size: var(--font-size-base);
   -webkit-font-smoothing: auto;
   -moz-osx-font-smoothing: auto;
   line-height: 1.5;
   letter-spacing: normal;
   outline: 2px solid transparent;
   outline-offset: -4px;
-  scrollbar-color: var(--media-color-scrollbar-thumb) transparent;
+  scrollbar-color: var(--scrollbar-thumb-color) transparent;
   scrollbar-width: thin;
-  border-radius: var(--media-border-radius, 2rem);
+  border-radius: var(--media-border-radius, 1.75rem);
   isolation: isolate;
   transition-timing-function: ease-out;
   transition-duration: 100ms;
@@ -709,12 +753,12 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 
   &::-webkit-scrollbar-thumb {
-    background: var(--media-color-scrollbar-thumb);
+    background: var(--scrollbar-thumb-color);
     border-radius: 9999px;
   }
 
   @media (prefers-reduced-transparency: reduce) or (prefers-contrast: more) {
-    --media-color-scrollbar-thumb: oklch(from currentColor l c h / 0.8);
+    --scrollbar-thumb-color: oklch(from currentColor l c h / 0.8);
     scrollbar-width: auto;
   }
 }
@@ -739,7 +783,9 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     pointer-events: none;
     content: "";
     border-radius: inherit;
-    box-shadow: inset 0 0 0 1px var(--media-surface-inner-border-color);
+    box-shadow:
+      inset 0 1px 0 0 var(--media-surface-inner-border-color),
+      inset 0 0 0 1px oklch(from var(--media-surface-inner-border-color) l c h / calc(alpha * 0.5));
   }
 }
 
@@ -850,7 +896,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 .media-default-skin .media-error__actions {
   display: flex;
-  gap: 0.5rem;
+  gap: calc(var(--spacing) * 2);
 
   & > * {
     flex: 1;
@@ -866,13 +912,17 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
    ========================================================================== */
 
 .media-default-skin .media-controls {
+  --media-popover-side-offset: calc(var(--spacing) * (var(--base-side-offset, 2) + 1));
+  --media-tooltip-side-offset: var(--media-popover-side-offset);
+  --media-popover-boundary-offset: calc(var(--spacing) * var(--base-boundary-offset, 2));
+  --media-tooltip-boundary-offset: var(--media-popover-boundary-offset);
+
   display: flex;
-  column-gap: 0.075rem;
   align-items: center;
-  padding: 0.375rem;
+  padding: calc(var(--spacing) * 1);
   container: media-controls / inline-size;
   text-shadow: 0 1px 0 var(--media-current-shadow-color);
-  border-radius: 1.5rem;
+  border-radius: calc(Infinity * 1px);
 }
 
 /* ==========================================================================
@@ -882,10 +932,15 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-default-skin .media-time-controls {
   display: flex;
   flex: 1;
-  gap: 0.75rem;
+  gap: calc(var(--spacing) * 2.5);
   align-items: center;
-  padding-inline: 0.5rem;
   container: media-time-controls / inline-size;
+
+  & .media-time:last-child {
+    @container media-time-controls (width < 10rem) {
+      display: none;
+    }
+  }
 }
 
 .media-default-skin .media-time {
@@ -896,7 +951,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   cursor: pointer;
   outline: 2px solid transparent;
   outline-offset: -2px;
-  border-radius: 0.25rem;
+  border-radius: calc(var(--spacing) * 1);
   transition-timing-function: ease-out;
   transition-duration: 100ms;
   transition-property: outline-color, outline-offset;
@@ -917,8 +972,9 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   flex-shrink: 0;
   align-items: center;
   justify-content: center;
+  height: calc(var(--spacing) * 9);
   min-height: 0;
-  padding: 0.5rem 1rem;
+  padding: calc(var(--spacing) * 2) calc(var(--spacing) * 4);
   text-align: center;
   touch-action: manipulation;
   cursor: pointer;
@@ -926,7 +982,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   outline: 2px solid transparent;
   outline-offset: -2px;
   border: none;
-  border-radius: calc(infinity * 1px);
+  border-radius: calc(Infinity * 1px);
   transition-timing-function: ease-out;
   transition-duration: 150ms;
   transition-property: background-color, outline-offset, scale;
@@ -938,20 +994,15 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     outline-offset: 2px;
   }
 
-  &:active {
+  &:active:not([aria-disabled="true"]) {
     scale: 0.98;
   }
 
-  &[disabled] {
+  &[aria-disabled="true"] {
     cursor: not-allowed;
     opacity: 0.5;
     filter: grayscale(1);
   }
-
-  &[data-availability="unavailable"],
-  &[data-availability="unsupported"] {
-    display: none;
-  }
 }
 
 /* Primary button variant */
@@ -979,11 +1030,10 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 /* Icon button variant */
 .media-default-skin .media-button--icon {
   display: grid;
-  width: 2.25rem;
   aspect-ratio: 1;
   padding: 0;
 
-  &:active {
+  &:active:not([aria-disabled="true"]) {
     scale: 0.9;
   }
 
@@ -1007,7 +1057,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     position: absolute;
     right: -1px;
     bottom: -3px;
-    font-size: 10px;
+    font-size: 0.715em; /* 10px */
     font-weight: 500;
     font-variant-numeric: tabular-nums;
     letter-spacing: -0.05em;
@@ -1036,8 +1086,6 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 /* Settings button */
 .media-default-skin .media-button--settings {
-  display: none;
-
   & .media-icon--settings {
     transition: transform 150ms ease-in-out;
 
@@ -1051,21 +1099,17 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 }
 
-.media-default-skin .media-button-group:has([data-availability="available"]) .media-button--settings {
-  display: grid;
-}
-
 /* Live button — wide pill button with a status dot (gray → red at the live
    edge) rendered via ::before, and "LIVE" text rendered as the button's own
    text content. */
 .media-default-skin .media-button--live {
   display: inline-flex;
-  gap: 0.4rem;
+  gap: calc(var(--spacing) * 1.5);
   align-items: center;
   width: auto;
   aspect-ratio: auto;
-  padding: 0.5rem 0.75rem;
-  font-size: 0.75rem;
+  padding: calc(var(--spacing) * 2) calc(var(--spacing) * 3);
+  font-size: var(--font-size-small);
   font-weight: 600;
   line-height: 1;
   text-transform: uppercase;
@@ -1074,8 +1118,8 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   &::before {
     display: inline-block;
     flex-shrink: 0;
-    width: 0.5rem;
-    height: 0.5rem;
+    width: calc(var(--spacing) * 2);
+    height: calc(var(--spacing) * 2);
     content: "";
     background-color: oklch(from currentColor l c h / 0.4);
     border-radius: 50%;
@@ -1093,12 +1137,8 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 .media-default-skin .media-button-group {
   display: flex;
-  gap: 0.075rem;
+  gap: 1px;
   align-items: center;
-
-  @container media-root (width > 42rem) {
-    gap: 0.125rem;
-  }
 }
 
 /* ==========================================================================
@@ -1106,14 +1146,14 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
    ========================================================================== */
 
 .media-default-skin .media-badge {
-  padding: 0.125rem 0.375rem;
-  font-size: 0.6875rem;
+  padding: calc(var(--spacing) * 0.5) calc(var(--spacing) * 1.5);
+  font-size: var(--font-size-small);
   font-weight: 500;
   line-height: 1;
   color: oklch(from currentColor l c h / 0.85);
   white-space: nowrap;
   background-color: oklch(from currentColor l c h / 0.1);
-  border-radius: calc(infinity * 1px);
+  border-radius: calc(Infinity * 1px);
 }
 
 /* ==========================================================================
@@ -1204,7 +1244,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-default-skin .media-thumbnail {
   pointer-events: none;
   background-color: oklch(0 0 0 / 0.9);
-  border-radius: 0.75rem;
+  border-radius: calc(var(--spacing) * 3);
 
   & .media-thumbnail__image {
     position: relative;
@@ -1216,7 +1256,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
       position: absolute;
       inset: 0;
       content: "";
-      background-image: linear-gradient(to top, oklch(0 0 0 / 0.8), oklch(0 0 0 / 0.3), oklch(0 0 0 / 0));
+      background-image: linear-gradient(to top, oklch(0 0 0 / 0.5), oklch(0 0 0 / 0.1), oklch(0 0 0 / 0));
       border-radius: inherit;
     }
   }
@@ -1224,7 +1264,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   & .media-thumbnail__time {
     position: absolute;
     inset-inline: 0;
-    bottom: 0.5rem;
+    bottom: calc(var(--spacing) * 2);
     text-align: center;
   }
 
@@ -1272,210 +1312,204 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   border-radius: calc(infinity * 1px);
 
   &[data-orientation="horizontal"] {
-    width: 100%;
-    min-width: 5rem;
-    height: 2rem;
+    width: var(--slider-width, 100%);
+    min-width: calc(var(--spacing) * 20);
+    height: var(--slider-height, calc(var(--spacing) * 8));
   }
-
   &[data-orientation="vertical"] {
-    width: 2rem;
-    height: 5rem;
+    width: var(--slider-width, calc(var(--spacing) * 8));
+    height: var(--slider-height, calc(var(--spacing) * 20));
   }
-}
 
-/* Track */
-.media-default-skin .media-slider__track {
-  position: relative;
-  overflow: hidden;
-  user-select: none;
-  border-radius: inherit;
-  isolation: isolate;
-
-  &[data-orientation="horizontal"] {
-    width: 100%;
-    height: 0.25rem;
-  }
-
-  &[data-orientation="vertical"] {
-    width: 0.25rem;
-    height: 100%;
-  }
-}
-
-/* Thumb */
-.media-default-skin .media-slider__thumb {
-  position: absolute;
-  z-index: 10;
-  width: 0.625rem;
-  height: 0.625rem;
-  user-select: none;
-  outline: 4px solid transparent;
-  outline-offset: -4px;
-  background-color: currentColor;
-  border-radius: calc(infinity * 1px);
-  box-shadow:
-    0 0 0 1px var(--media-current-shadow-color, oklch(0 0 0 / 0.1)),
-    0 1px 3px 0 oklch(0 0 0 / 0.35),
-    0 1px 2px -1px oklch(0 0 0 / 0.35);
-  opacity: 0;
-  translate: -50% -50%;
-  transition-timing-function: ease-out;
-  transition-duration: 150ms;
-  transition-property: opacity, height, width, outline-offset;
-
-  &[data-orientation="horizontal"] {
-    top: 50%;
-    left: var(--media-slider-fill);
-  }
-
-  &[data-orientation="vertical"] {
-    top: calc(100% - var(--media-slider-fill));
-    left: 50%;
-  }
+  /* Track */
+  & .media-slider__track {
+    position: relative;
+    overflow: hidden;
+    user-select: none;
+    border-radius: inherit;
+    isolation: isolate;
 
-  &:hover,
-  &:focus {
-    outline-color: oklch(from currentColor l c h / 0.15);
-    outline-offset: 0;
+    &[data-orientation="horizontal"] {
+      width: 100%;
+      height: calc(var(--spacing) * 1);
+    }
+    &[data-orientation="vertical"] {
+      width: calc(var(--spacing) * 1);
+      height: 100%;
+    }
   }
 
-  &::after {
+  /* Thumb */
+  & .media-slider__thumb {
     position: absolute;
-    inset: -4px;
-    content: "";
-    border-radius: inherit;
-    box-shadow: 0 0 0 2px currentColor;
+    z-index: 10;
+    width: calc(var(--spacing) * 2.5);
+    height: calc(var(--spacing) * 2.5);
+    user-select: none;
+    outline: 4px solid transparent;
+    outline-offset: -4px;
+    background-color: currentColor;
+    border-radius: calc(Infinity * 1px);
+    box-shadow:
+      0 0 0 1px var(--media-current-shadow-color, oklch(0 0 0 / 0.1)),
+      0 1px 3px 0 oklch(0 0 0 / 0.35),
+      0 1px 2px -1px oklch(0 0 0 / 0.35);
+    opacity: 0;
+    translate: -50% -50%;
     transition-timing-function: ease-out;
     transition-duration: 150ms;
-    transition-property: opacity, scale;
-  }
+    transition-property: opacity, height, width, outline-offset;
 
-  &:not(:focus-visible)::after {
-    opacity: 0;
-    scale: 0.5;
-  }
-}
+    &[data-orientation="horizontal"] {
+      top: 50%;
+      left: var(--media-slider-fill);
+    }
+    &[data-orientation="vertical"] {
+      top: calc(100% - var(--media-slider-fill));
+      left: 50%;
+    }
 
-.media-default-skin .media-slider:active .media-slider__thumb,
-.media-default-skin .media-slider__thumb--persistent {
-  width: 0.75rem;
-  height: 0.75rem;
-}
+    &:hover,
+    &:focus {
+      outline-color: oklch(from currentColor l c h / 0.15);
+      outline-offset: 0;
+    }
 
-.media-default-skin .media-slider:hover .media-slider__thumb,
-.media-default-skin .media-slider__thumb:focus-visible,
-.media-default-skin .media-slider__thumb--persistent {
-  opacity: 1;
-}
+    &::after {
+      position: absolute;
+      inset: -4px;
+      content: "";
+      border-radius: inherit;
+      box-shadow: 0 0 0 2px currentColor;
+      transition-timing-function: ease-out;
+      transition-duration: 150ms;
+      transition-property: opacity, scale;
+    }
 
-/* Preview */
-.media-default-skin .media-slider__preview {
-  & .media-slider__value,
-  &::before {
-    opacity: 0;
-    scale: 0.5;
-    transition-timing-function: ease-out;
-    transition-duration: 200ms;
-    transition-property: opacity, scale;
+    &:not(:focus-visible)::after {
+      opacity: 0;
+      scale: 0.5;
+    }
   }
 
-  & .media-slider__value {
-    position: absolute;
-    bottom: 2.25rem;
-    text-shadow: 0 1px 0 var(--media-current-shadow-color);
-    filter: blur(8px);
-    translate: -50% 0.5rem;
-    transition-property: filter, opacity, scale, translate;
+  &:active .media-slider__thumb,
+  &:focus-within .media-slider__thumb,
+  & .media-slider__thumb--persistent {
+    width: calc(var(--spacing) * 3);
+    height: calc(var(--spacing) * 3);
   }
 
-  &::before {
-    display: block;
-    min-width: 0.25rem;
-    height: 0.25rem;
-    content: "";
-    background-color: currentColor;
-    border-radius: 100%;
-    box-shadow:
-      0 0 0 1px var(--media-current-shadow-color, oklch(0 0 0 / 0.15)),
-      0 1px 2px 0 oklch(0 0 0 / 0.35);
-  }
-
-  &[data-pointing] .media-slider__value,
-  &[data-pointing]:not([data-dragging])::before {
+  &:hover .media-slider__thumb,
+  & .media-slider__thumb:focus-visible,
+  & .media-slider__thumb--persistent {
     opacity: 1;
-    scale: 1;
-  }
-  &[data-pointing] .media-slider__value {
-    filter: blur(0);
-    translate: -50% 0;
   }
-}
-
-/* Shared track fills */
-.media-default-skin .media-slider__buffer,
-.media-default-skin .media-slider__fill {
-  position: absolute;
-  pointer-events: none;
-  border-radius: inherit;
-}
-
-.media-default-skin .media-slider__buffer[data-orientation="horizontal"],
-.media-default-skin .media-slider__fill[data-orientation="horizontal"] {
-  inset-block: 0;
-  left: 0;
-}
 
-.media-default-skin .media-slider__buffer[data-orientation="vertical"],
-.media-default-skin .media-slider__fill[data-orientation="vertical"] {
-  inset-inline: 0;
-  bottom: 0;
-}
+  /* Preview */
+  & .media-slider__preview {
+    & .media-slider__value,
+    &::before {
+      opacity: 0;
+      scale: 0.5;
+      transition-timing-function: ease-out;
+      transition-duration: 200ms;
+      transition-property: opacity, scale;
+    }
 
-/* Buffer */
-.media-default-skin .media-slider__buffer {
-  background-color: oklch(from currentColor l c h / 0.2);
-  transition-timing-function: ease-out;
-  transition-duration: 0.25s;
+    & .media-slider__value {
+      position: absolute;
+      bottom: calc(var(--spacing) * 9);
+      text-shadow: 0 1px 0 var(--media-current-shadow-color);
+      filter: blur(8px);
+      translate: -50% calc(var(--spacing) * 2);
+      transition-property: filter, opacity, scale, translate;
+    }
 
-  &[data-orientation="horizontal"] {
-    width: var(--media-slider-buffer);
-    transition-property: width;
-  }
+    &::before {
+      display: block;
+      min-width: calc(var(--spacing) * 1);
+      height: calc(var(--spacing) * 1);
+      content: "";
+      background-color: currentColor;
+      border-radius: 100%;
+      box-shadow:
+        0 0 0 1px var(--media-current-shadow-color, oklch(0 0 0 / 0.15)),
+        0 1px 2px 0 oklch(0 0 0 / 0.35);
+    }
 
-  &[data-orientation="vertical"] {
-    height: var(--media-slider-buffer);
-    transition-property: height;
+    &[data-pointing] .media-slider__value,
+    &[data-pointing]:not([data-dragging])::before {
+      opacity: 1;
+      scale: 1;
+    }
+    &[data-pointing] .media-slider__value {
+      filter: blur(0);
+      translate: -50% 0;
+    }
   }
-}
 
-/* Fill */
-.media-default-skin .media-slider__fill {
-  background-color: currentColor;
+  /* Shared track fills */
+  & .media-slider__buffer,
+  & .media-slider__fill {
+    position: absolute;
+    pointer-events: none;
+    border-radius: inherit;
 
-  &[data-orientation="horizontal"] {
-    width: var(--media-slider-fill);
+    &[data-orientation="horizontal"],
+    &[data-orientation="horizontal"] {
+      inset-block: 0;
+      left: 0;
+    }
+    &[data-orientation="vertical"],
+    &[data-orientation="vertical"] {
+      inset-inline: 0;
+      bottom: 0;
+    }
   }
 
-  &[data-orientation="vertical"] {
-    height: var(--media-slider-fill);
-  }
-}
+  /* Buffer */
+  & .media-slider__buffer {
+    background-color: oklch(from currentColor l c h / 0.2);
+    transition-timing-function: ease-out;
+    transition-duration: 0.25s;
 
-/* Dragging — thumb and fill follow the pointer position */
-.media-default-skin .media-slider[data-dragging] .media-slider__thumb[data-orientation="horizontal"] {
-  left: var(--media-slider-pointer);
-}
+    &[data-orientation="horizontal"] {
+      width: var(--media-slider-buffer);
+      transition-property: width;
+    }
+    &[data-orientation="vertical"] {
+      height: var(--media-slider-buffer);
+      transition-property: height;
+    }
+  }
 
-.media-default-skin .media-slider[data-dragging] .media-slider__thumb[data-orientation="vertical"] {
-  top: calc(100% - var(--media-slider-pointer));
-}
+  /* Fill */
+  & .media-slider__fill {
+    background-color: currentColor;
 
-.media-default-skin .media-slider[data-dragging] .media-slider__fill[data-orientation="horizontal"] {
-  width: var(--media-slider-pointer);
-}
+    &[data-orientation="horizontal"] {
+      width: var(--media-slider-fill);
+    }
+    &[data-orientation="vertical"] {
+      height: var(--media-slider-fill);
+    }
+  }
 
-.media-default-skin .media-slider[data-dragging] .media-slider__fill[data-orientation="vertical"] {
-  height: var(--media-slider-pointer);
+  /* Dragging — thumb and fill follow the pointer position */
+  &[data-dragging] {
+    & .media-slider__thumb[data-orientation="horizontal"] {
+      left: var(--media-slider-pointer);
+    }
+    & .media-slider__thumb[data-orientation="vertical"] {
+      top: calc(100% - var(--media-slider-pointer));
+    }
+    & .media-slider__fill[data-orientation="horizontal"] {
+      width: var(--media-slider-pointer);
+    }
+    & .media-slider__fill[data-orientation="vertical"] {
+      height: var(--media-slider-pointer);
+    }
+  }
 }
 
 /* ==========================================================================
@@ -1492,7 +1526,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 .media-default-skin .media-popover,
 .media-default-skin .media-tooltip {
-  --popup-translate-distance: 0.5rem;
+  --popup-translate-distance: calc(0.5 * var(--base-size));
   margin: 0;
   overflow: visible;
   color: inherit;
@@ -1574,8 +1608,8 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 }
 .media-default-skin .media-popover--volume {
-  padding: 0.75rem 0;
-  border-radius: calc(infinity * 1px);
+  padding: calc(var(--spacing) * 3) 0;
+  border-radius: calc(Infinity * 1px);
 
   &:has(media-volume-slider[data-availability="unsupported"]) {
     display: none;
@@ -1583,15 +1617,15 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 }
 
 .media-default-skin .media-tooltip {
-  padding: 0.25rem 0.625rem;
-  font-size: 0.75rem;
+  padding: calc(var(--spacing) * 1) calc(var(--spacing) * 2.5);
+  font-size: var(--font-size-base);
   white-space: nowrap;
-  border-radius: calc(infinity * 1px);
+  border-radius: calc(Infinity * 1px);
 
   /* `display: flex` must not apply while closed — it overrides UA `[popover]` hiding. */
   &[data-open] {
     display: flex;
-    column-gap: 0.25rem;
+    column-gap: calc(var(--spacing) * 1);
     align-items: center;
   }
 
@@ -1608,12 +1642,12 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     min-width: 1.5em;
     padding: 0.1em;
     font-family: inherit;
-    font-size: 90%;
+    font-size: var(--font-size-small);
     font-weight: 600;
     line-height: 1.25;
     text-align: center;
     background-color: oklch(from currentColor l c h / 0.3);
-    border-radius: 0.25rem;
+    border-radius: calc(var(--spacing) * 1);
   }
 }
 
@@ -1624,11 +1658,12 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 .media-default-skin .media-menu {
   --menu-transition-duration: 250ms;
-  --menu-max-height: 14rem;
-  --menu-padding: 0.25rem;
-  --menu-border-radius: 0.75rem;
+  --menu-max-height: calc(var(--spacing) * 56);
+  --menu-padding: calc(var(--spacing) * 1);
+  --menu-border-radius: calc(var(--spacing) * 3);
   --menu-item-border-radius: calc(var(--menu-border-radius) - var(--menu-padding));
   box-sizing: border-box;
+  min-width: max-content;
   max-width: var(--media-popover-available-width, none);
   max-height: min(var(--media-popover-available-height, var(--menu-max-height)), var(--menu-max-height));
   padding: var(--menu-padding);
@@ -1697,15 +1732,16 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 
   & .media-menu__separator {
-    margin-block: 0.25rem;
+    margin-block: calc(var(--spacing) * 1);
     border-bottom: 1px solid oklch(0 0 0 / 0.1);
     box-shadow: 0 1px 0 0 oklch(1 0 0 / 0.075);
   }
 
   & .media-menu__group {
+    anchor-scope: --media-menu-item-highlight-anchor;
     display: flex;
     flex-direction: column;
-    gap: 0.125rem;
+    gap: calc(var(--spacing) * 0.5);
 
     @supports (top: anchor(top)) {
       &::before {
@@ -1724,9 +1760,9 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   & .media-menu__item,
   & .media-menu__back {
     display: flex;
-    gap: 0.375rem;
+    gap: calc(var(--spacing) * 1.5);
     align-items: center;
-    padding: 0.375rem 0.5rem;
+    padding: calc(var(--spacing) * 1.5) calc(var(--spacing) * 2);
     text-align: left;
     text-shadow: 0 1px 0 var(--media-current-shadow-color);
     cursor: pointer;
@@ -1746,11 +1782,6 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     &:hover,
     &[data-highlighted] {
       background-color: oklch(from currentColor l c h / 0.1);
-
-      @supports (top: anchor(top)) {
-        anchor-name: --media-menu-item-highlight-anchor;
-        background-color: transparent;
-      }
     }
 
     & .media-icon {
@@ -1762,7 +1793,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
   & .media-menu__indicator {
     flex-shrink: 0;
-    margin-right: -0.25rem;
+    margin-right: calc(var(--spacing) * -1);
     margin-left: auto;
     opacity: 0;
 
@@ -1790,12 +1821,20 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     &[data-availability="unsupported"] {
       display: none;
     }
+
+    &:hover,
+    &[data-highlighted] {
+      @supports (top: anchor(top)) {
+        anchor-name: --media-menu-item-highlight-anchor;
+        background-color: transparent;
+      }
+    }
   }
 
   & .media-menu__tier {
     padding-top: 1px;
-    padding-left: 0.125rem;
-    font-size: 0.5625rem;
+    padding-left: calc(var(--spacing) * 0.5);
+    font-size: var(--font-size-tiny);
     font-weight: 600;
     line-height: 1;
     color: oklch(from currentColor l c h / 0.7);
@@ -1803,36 +1842,35 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
   & .media-menu__back {
     width: 100%;
-    margin-bottom: 0.125rem;
+    margin-bottom: calc(var(--spacing) * 0.5);
   }
 
   & .media-menu__hint {
     display: inline-flex;
-    gap: 0.25rem;
+    gap: calc(var(--spacing) * 1);
     align-items: center;
     min-width: 0;
-    padding-left: 0.5rem;
+    padding-left: calc(var(--spacing) * 2);
     margin-left: auto;
-    font-size: 0.75rem;
     color: oklch(from currentColor l c h / 0.65);
   }
 
   & .media-menu__hint-label {
-    max-width: 6rem;
+    max-width: calc(var(--spacing) * 24);
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
 
   & .media-menu__chevron {
-    width: 0.875rem;
-    height: 0.875rem;
+    width: calc(var(--spacing) * 3.5);
+    height: calc(var(--spacing) * 3.5);
   }
 
   /* Settings menu */
   &.media-menu--settings {
     width: var(--media-menu-width);
-    min-width: 12rem;
+    min-width: calc(var(--spacing) * 48);
     height: var(--media-menu-height);
     overflow: hidden;
     /* Add height and width transitions. */
@@ -1856,15 +1894,15 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-default-skin {
   --media-caption-track-duration: var(--media-controls-transition-duration);
   --media-caption-track-delay: 25ms;
-  --media-caption-track-y: -0.5rem;
+  --media-caption-track-y: calc(var(--spacing) * -2);
 
   &:has(.media-controls[data-visible]) {
-    --media-caption-track-y: -5.5rem;
+    --media-caption-track-y: calc(var(--spacing) * -22);
   }
 
   @container media-root (width > 42rem) {
     &:has(.media-controls[data-visible]) > * {
-      --media-caption-track-y: -3.5rem;
+      --media-caption-track-y: calc(var(--spacing) * -14);
     }
   }
 }
@@ -1884,19 +1922,13 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 .media-default-skin .media-input-feedback {
   position: absolute;
-  inset-inline: 0;
-  top: 0;
-  bottom: 3.5rem; /* Shift up a little in smaller containers */
+  inset: 0;
   display: grid;
   grid-template-columns: 1fr 1fr 1fr;
   align-items: center;
   justify-items: center;
   color: var(--media-color-primary, oklch(1 0 0));
   pointer-events: none;
-
-  @container media-root (width > 24rem) {
-    bottom: 0;
-  }
 }
 
 /* --- Feedback islands ------------------------------------------------------- */
@@ -1904,7 +1936,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-default-skin .media-input-feedback-island {
   --media-surface-background-color: oklch(0 0 0 / 0.25);
   position: absolute;
-  top: 0.75rem;
+  top: calc(var(--spacing) * 3);
   font-weight: 500;
   color: inherit;
   pointer-events: none;
@@ -1915,11 +1947,11 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
   .media-input-feedback-island__content {
     display: flex;
-    gap: 0.5rem;
+    gap: calc(var(--spacing) * 2);
     align-items: center;
     justify-content: space-between;
     width: 100%;
-    padding: 0.25rem 0.625rem;
+    padding: calc(var(--spacing) * 1) calc(var(--spacing) * 2.5);
 
     /* Increase contrast of the content */
     * {
@@ -1971,7 +2003,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 }
 
 .media-default-skin .media-input-feedback-island--volume {
-  width: min(80%, 12rem);
+  width: min(80%, calc(var(--spacing) * 48));
 
   .media-input-feedback-island__content {
     --media-progress-fill: var(--media-volume-fill);
@@ -2018,7 +2050,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   grid-row: 1;
   grid-column: 2;
   place-content: center;
-  padding: 1rem;
+  padding: calc(var(--spacing) * 4);
   text-align: center;
 
   /* Central bubble (play, pause) */
@@ -2049,10 +2081,10 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
   /* Directional bubbles (seek) */
   &[data-direction] {
-    gap: 0.25rem;
+    gap: calc(var(--spacing) * 1);
 
     @container media-root (width > 24rem) {
-      padding: 1.5rem;
+      padding: calc(var(--spacing) * 6);
     }
   }
 
@@ -2088,7 +2120,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 
   @media (prefers-reduced-motion: no-preference) {
-    .media-icon--seek {
+    &[data-direction] .media-icon--seek {
       transition-timing-function: ease-in-out;
       transition-duration: 200ms;
       transition-property: translate, opacity;
@@ -2240,22 +2272,24 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   );
   --media-border-color: oklch(0 0 0 / 0.1);
   --media-surface-background-color: oklch(1 0 0 / 0.1);
-  --media-surface-inner-border-color: oklch(1 0 0 / 0.05);
+  --media-surface-inner-border-color: oklch(1 0 0 / 0.1);
   --media-surface-outer-border-color: oklch(0 0 0 / 0.1);
   --media-surface-shadow-color: oklch(0 0 0 / 0.15);
   --media-surface-backdrop-filter: blur(16px) saturate(1.5);
-  --media-video-border-radius: var(--media-border-radius, 2rem);
+
+  /* We have to create an alias so that the shadow DOM can inherit the custom property value */
+  --media-video-border-radius: var(--media-border-radius, 1.75rem);
+
   --media-controls-transition-duration: 100ms;
   --media-controls-transition-timing-function: ease-out;
+
   --media-error-dialog-transition-duration: 350ms;
   --media-error-dialog-transition-delay: 100ms;
   --media-error-dialog-transition-timing-function: var(--media-spring-timing-function);
+
   --media-popup-transition-duration: 100ms;
   --media-popup-transition-timing-function: ease-out;
-  --media-tooltip-side-offset: 0.75rem;
-  --media-tooltip-boundary-offset: 0.5rem;
-  --media-popover-side-offset: 0.5rem;
-  --media-popover-boundary-offset: 0.5rem;
+
   overflow: clip;
   background: oklch(0 0 0);
 
@@ -2276,7 +2310,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     --media-surface-outer-border-color: transparent;
   }
 
-  &:has(.media-controls:not([data-visible])) {
+  &:has(.media-controls--root:not([data-visible])) {
     /* Slight delay to hide controls on non-touch devices after interaction */
     @media (pointer: fine) {
       --media-controls-transition-duration: 300ms;
@@ -2302,6 +2336,20 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
   &:fullscreen {
     --media-border-radius: 0;
+
+    &::after {
+      display: none;
+    }
+
+    @media (width >= 1280px) {
+      --scale: 1.25;
+    }
+    @media (width >= 1536px) {
+      --scale: 1.5;
+    }
+    @media (width >= 1920px) {
+      --scale: 1.75;
+    }
   }
 }
 
@@ -2321,12 +2369,13 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-default-skin--video .media-error__dialog {
   display: flex;
   flex-direction: column;
-  gap: 0.75rem;
-  max-width: 18rem;
-  padding: 0.75rem;
+  gap: calc(var(--spacing) * 3);
+  width: 100%;
+  max-width: calc(var(--spacing) * 72);
+  padding: calc(var(--spacing) * 3);
   color: oklch(1 0 0);
   text-shadow: 0 1px 0 oklch(0 0 0 / 0.25);
-  border-radius: 1.75rem;
+  border-radius: calc(var(--spacing) * 7);
   transition-delay: var(--media-error-dialog-transition-delay);
   transition-timing-function: var(--media-error-dialog-transition-timing-function);
   transition-duration: var(--media-error-dialog-transition-duration);
@@ -2345,86 +2394,155 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-default-skin--video .media-error__content {
   display: flex;
   flex-direction: column;
-  gap: 0.5rem;
-  padding: 0.5rem 0.5rem 0.375rem;
+  gap: calc(var(--spacing) * 2);
+  padding: calc(var(--spacing) * 2) calc(var(--spacing) * 2) calc(var(--spacing) * 1.5);
   text-shadow: inherit;
 }
 
 .media-default-skin--video .media-error__title {
-  font-size: 1rem;
+  font-size: var(--font-size-medium);
 }
 
 /* ==========================================================================
    Controls (hide/show behavior)
    ========================================================================== */
 
-.media-default-skin--video .media-controls {
-  position: absolute;
-  inset-inline: 0.5rem;
-  bottom: 0.5rem;
+.media-default-skin--video .media-controls--root {
+  --inset-factor: 2;
+  --inset: calc(var(--spacing) * var(--inset-factor));
+  --base-boundary-offset: var(--inset-factor);
+
   z-index: 10;
-  flex-wrap: wrap;
+  display: contents;
   color: var(--media-color-primary, oklch(1 0 0));
-  transform-origin: bottom;
   transition-timing-function: var(--media-controls-transition-timing-function);
-  transition-duration: var(--media-controls-transition-duration);
+  /* Speed up the entry transition */
+  transition-duration: calc(var(--media-controls-transition-duration) / 2);
 
-  @media (pointer: fine) {
-    transition-property: scale, filter, opacity;
-    will-change: scale, filter, opacity;
+  & .media-controls--primary,
+  & .media-controls--secondary {
+    position: absolute;
+    z-index: 10;
   }
 
-  @media (pointer: coarse) {
-    transition-property: scale, opacity;
-    will-change: scale, opacity;
+  & .media-controls--primary {
+    inset-inline: var(--inset);
+    bottom: var(--inset);
+    transform-origin: bottom;
   }
 
-  &:not([data-visible]) {
-    pointer-events: none;
-    opacity: 0;
-    scale: 0.95;
+  & .media-controls--secondary {
+    top: var(--inset);
+    right: var(--inset);
+    container-type: normal;
+    transform-origin: top;
+  }
 
-    @media (pointer: fine) and (prefers-reduced-motion: no-preference) {
-      filter: blur(8px);
+  @container media-root (width < 32rem) {
+    & .media-controls--primary,
+    & .media-controls--secondary {
+      transition-timing-function: inherit;
+      transition-duration: inherit;
+
+      @media (pointer: fine) {
+        transition-property: filter, opacity, scale, translate;
+        will-change: filter, opacity, scale, translate;
+      }
+
+      @media (pointer: coarse) {
+        transition-property: opacity, scale, translate;
+        will-change: opacity, scale, translate;
+      }
     }
 
-    @media (prefers-reduced-motion: reduce) {
-      scale: 1;
+    &:after {
+      display: none;
     }
-  }
 
-  & .media-time-controls {
-    flex: 0 0 100%;
-    order: -1;
-    padding-inline: 0.625rem;
+    &:not([data-visible]) {
+      & .media-controls--primary,
+      & .media-controls--secondary {
+        pointer-events: none;
+        opacity: 0;
+        scale: 0.95;
+        transition-duration: var(--media-controls-transition-duration);
+
+        @media (pointer: fine) and (prefers-reduced-motion: no-preference) {
+          filter: blur(8px);
+        }
+
+        @media (prefers-reduced-motion: reduce) {
+          scale: 1;
+        }
+      }
+
+      & .media-controls--primary {
+        @media (prefers-reduced-motion: no-preference) {
+          translate: 0 4px;
+        }
+      }
+
+      & .media-controls--secondary {
+        @media (prefers-reduced-motion: no-preference) {
+          translate: 0 -4px;
+        }
+      }
+    }
   }
 
-  & .media-button-group:first-child {
-    flex: 1;
-    text-align: left;
+  @container media-root (width >= 32rem) {
+    position: absolute;
+    inset-inline: var(--inset);
+    bottom: var(--inset);
+    display: flex;
+    transform-origin: bottom;
+
+    & .media-controls--primary,
+    & .media-controls--secondary {
+      display: contents;
+
+      &::after {
+        display: none;
+      }
+    }
+
+    &:not([data-visible]) {
+      pointer-events: none;
+      opacity: 0;
+      scale: 0.95;
+      transition-duration: var(--media-controls-transition-duration);
+
+      @media (pointer: fine) and (prefers-reduced-motion: no-preference) {
+        filter: blur(8px);
+      }
+
+      @media (prefers-reduced-motion: reduce) {
+        scale: 1;
+      }
+
+      @media (prefers-reduced-motion: no-preference) {
+        translate: 0 4px;
+      }
+    }
   }
 
-  & .media-button-group:last-child {
+  & .media-time-controls {
     flex: 1;
-    justify-content: end;
+    padding-inline: calc(var(--spacing) * 3);
   }
 
-  @container media-root (width > 42rem) {
-    inset-inline: 0.75rem;
-    bottom: 0.75rem;
-    flex-wrap: nowrap;
-    column-gap: 0.125rem;
-    padding: 0.25rem;
+  @media (pointer: fine) {
+    transition-property: filter, opacity, scale, translate;
+    will-change: filter, opacity, scale, translate;
+  }
 
-    & .media-time-controls {
-      flex: 1;
-      order: unset;
-    }
+  @media (pointer: coarse) {
+    transition-property: opacity, scale, translate;
+    will-change: opacity, scale, translate;
+  }
 
-    & .media-button-group:first-child,
-    & .media-button-group:last-child {
-      flex: 0 0 auto;
-    }
+  @container media-root (width > 42rem) {
+    --inset-factor: 3;
   }
 }
 
@@ -2433,7 +2551,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 }
 
 /* Hide cursor when controls are hidden */
-.media-default-skin--video:has(.media-controls:not([data-visible])) {
+.media-default-skin--video:has(.media-controls--root:not([data-visible])) {
   cursor: none;
 }
 
@@ -2447,32 +2565,21 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 }
 
 .media-default-skin--video .media-slider__thumbnail {
-  --media-slider-thumbnail-max-width: 11rem;
-  --media-slider-thumbnail-max-height: 8rem;
-  --media-slider-thumbnail-padding: -1.125rem;
+  --max-width: calc(var(--spacing) * 44);
+  --max-height: calc(var(--spacing) * 32);
+  --padding: calc(var(--spacing) * -4.5);
   /**
     Inset is the difference between the container width and the slider (100%) width.
     Divided by 2 as we render the time on both sides.
   */
-  --media-slider-thumbnail-inset: calc((100cqi - 100%) / 2);
+  --inset: calc((100cqi - 100%) / 2);
 
   position: absolute;
-  bottom: calc(100% + 1.2rem);
+  bottom: calc(100% + calc(var(--spacing) * 4.8));
   left: clamp(
-    calc(
-      var(--media-slider-thumbnail-max-width) /
-      2 +
-      var(--media-slider-thumbnail-padding) -
-      var(--media-slider-thumbnail-inset)
-    ),
+    calc(var(--max-width) / 2 + var(--padding) - var(--inset)),
     var(--media-slider-pointer),
-    calc(
-      100% -
-      var(--media-slider-thumbnail-max-width) /
-      2 -
-      var(--media-slider-thumbnail-padding) +
-      var(--media-slider-thumbnail-inset)
-    )
+    calc(100% - var(--max-width) / 2 - var(--padding) + var(--inset))
   );
   pointer-events: none;
   opacity: 0;
@@ -2485,8 +2592,8 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   transition-property: scale, opacity, filter;
 
   & .media-thumbnail__image {
-    max-width: var(--media-slider-thumbnail-max-width);
-    max-height: var(--media-slider-thumbnail-max-height);
+    max-width: var(--max-width);
+    max-height: var(--max-height);
   }
 }
 .media-default-skin--video .media-slider[data-pointing] .media-slider__thumbnail:has([role="img"]:not([data-hidden])) {