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

package/docs/concepts/skins.md

@@ -19,7 +19,7 @@ tsx
 
 ## Packaged vs. ejected
 
-When you choose a skin you have two options for how you use it: **packaged** or **ejected** . It’s usually easiest to start with a packaged skin and later eject its internal components into your project when you need more customization.
+When you choose a skin you have two options for how you use it: **packaged** or **ejected**. It’s usually easiest to start with a packaged skin and later eject its internal components into your project when you need more customization.
 
 Packaged
 
@@ -55,7 +55,9 @@ tsx
 
 ### Example of ejected
 
-Skin.tsx
+VideoPlayer.tsx
+
+player.ts
 
 skin.css
 
@@ -63,29 +65,325 @@ skin.css
 'use client';
 
 import { type CSSProperties, type ComponentProps, forwardRef, type ReactNode, isValidElement } from 'react';
-import { CaptionsOffIcon, CaptionsOnIcon, CastEnterIcon, CastExitIcon, CheckIcon, ChevronIcon, FullscreenEnterIcon, FullscreenExitIcon, PauseIcon, PipEnterIcon, PipExitIcon, PlayIcon, RestartIcon, SeekIcon, SpinnerIcon, VolumeHighIcon, VolumeLowIcon, VolumeOffIcon } from '@videojs/react/icons';
-import { createPlayer, Poster, Container, usePlayer, BufferingIndicator, CaptionsButton, CastButton, Controls, ErrorDialog, FullscreenButton, Gesture, Hotkey, Menu, MuteButton, PiPButton, PlayButton, PlaybackRateMenu, usePlaybackRateMenu, Popover, 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;
 
 const CENTER_STATUS_ACTIONS = ['togglePaused'] as const;
 
-function PlaybackRateMenuItems(): ReactNode {
-  const { options, setValue, value } = usePlaybackRateMenu();
+function MenuChevron({ flipped = false }: { flipped?: boolean }): ReactNode {
+  return <ChevronIcon className={`media-icon media-menu__chevron ${flipped ? 'media-icon--flipped' : undefined}`} />;
+}
+
+function SettingsMenu(): ReactNode {
+  const t = useTranslator();
+  const playbackRate = usePlaybackRateOptions();
+  const quality = useQualityOptions();
+  const audioTrack = useAudioTrackOptions();
+  const captions = useCaptionsOptions();
+  const hasPlaybackRate = playbackRate?.state.availability === 'available';
+  const hasQuality = quality?.state.availability === 'available';
+  const hasAudioTrack = audioTrack?.state.availability === 'available';
+  const hasCaptions = captions?.state.availability === 'available';
+
+  if (!hasPlaybackRate && !hasQuality && !hasAudioTrack && !hasCaptions) return null;
+
+  return (
+    <Menu.Root side="top" align="center">
+      <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">
+        <Menu.View className="media-menu__panel">
+          <div className="media-menu__group">
+            {hasQuality ? (
+              <Menu.Root>
+                <Menu.Trigger
+                  type="quality"
+                  className="media-menu__item media-menu__item--submenu"
+                  render={(props) => (
+                    <div {...props}>
+                      <QualityIcon className="media-icon" />
+                      <span>{t(qualityText)}</span>
+                      <span className="media-menu__hint">
+                        <Menu.ItemValue className="media-menu__hint-label" />
+                        <MenuChevron />
+                      </span>
+                    </div>
+                  )}
+                />
+                <Menu.Content className="media-menu__panel">
+                  <Menu.Back className="media-menu__back">
+                    <MenuChevron flipped />
+                    {t(qualityText)}
+                  </Menu.Back>
+                  <Menu.Separator className="media-menu__separator" />
+                  <Menu.RadioGroup
+                    className="media-menu__group"
+                    value={quality.value}
+                    onValueChange={quality.setValue}
+                    aria-label={t(qualityText)}
+                  >
+                    {quality.options.map((option) => (
+                      <Menu.RadioItem
+                        key={option.value}
+                        className="media-menu__item"
+                        value={option.value}
+                        disabled={option.disabled}
+                      >
+                        <span>
+                          {option.label}
+                          {option.tier ? <sup className="media-menu__tier">{option.tier}</sup> : null}
+                        </span>
+                        {option.badge ? <span className="media-badge">{option.badge}</span> : null}
+                        <Menu.ItemIndicator
+                          checked={option.value === quality.value}
+                          forceMount
+                          className="media-menu__indicator"
+                        >
+                          <CheckIcon className="media-icon" />
+                        </Menu.ItemIndicator>
+                      </Menu.RadioItem>
+                    ))}
+                  </Menu.RadioGroup>
+                </Menu.Content>
+              </Menu.Root>
+            ) : null}
+
+            {hasAudioTrack ? (
+              <Menu.Root>
+                <Menu.Trigger
+                  type="audio-track"
+                  className="media-menu__item media-menu__item--submenu"
+                  render={(props) => (
+                    <div {...props}>
+                      <SpeechIcon className="media-icon" />
+                      <span>{t(audioText)}</span>
+                      <span className="media-menu__hint">
+                        <Menu.ItemValue className="media-menu__hint-label" />
+                        <MenuChevron />
+                      </span>
+                    </div>
+                  )}
+                />
+                <Menu.Content className="media-menu__panel">
+                  <Menu.Back className="media-menu__back">
+                    <MenuChevron flipped />
+                    {t(audioText)}
+                  </Menu.Back>
+                  <Menu.Separator className="media-menu__separator" />
+                  <Menu.RadioGroup
+                    className="media-menu__group"
+                    value={audioTrack.value}
+                    onValueChange={audioTrack.setValue}
+                    aria-label={t(audioText)}
+                  >
+                    {audioTrack.options.map((option) => (
+                      <Menu.RadioItem
+                        key={option.value}
+                        className="media-menu__item"
+                        value={option.value}
+                        disabled={option.disabled}
+                      >
+                        <span>{option.label}</span>
+                        <Menu.ItemIndicator
+                          checked={option.value === audioTrack.value}
+                          forceMount
+                          className="media-menu__indicator"
+                        >
+                          <CheckIcon className="media-icon" />
+                        </Menu.ItemIndicator>
+                      </Menu.RadioItem>
+                    ))}
+                  </Menu.RadioGroup>
+                </Menu.Content>
+              </Menu.Root>
+            ) : null}
+
+            {hasPlaybackRate ? (
+              <Menu.Root>
+                <Menu.Trigger
+                  type="playback-rate"
+                  className="media-menu__item media-menu__item--submenu"
+                  render={(props) => (
+                    <div {...props}>
+                      <SpeedIcon className="media-icon" />
+                      <span>{t(speedText)}</span>
+                      <span className="media-menu__hint">
+                        <Menu.ItemValue className="media-menu__hint-label" />
+                        <MenuChevron />
+                      </span>
+                    </div>
+                  )}
+                />
+                <Menu.Content className="media-menu__panel">
+                  <Menu.Back className="media-menu__back">
+                    <MenuChevron flipped />
+                    {t(speedText)}
+                  </Menu.Back>
+                  <Menu.Separator className="media-menu__separator" />
+                  <Menu.RadioGroup
+                    className="media-menu__group"
+                    value={playbackRate.value}
+                    onValueChange={playbackRate.setValue}
+                    aria-label={t(playbackRateText)}
+                  >
+                    {playbackRate.options.map((option) => (
+                      <Menu.RadioItem
+                        key={option.value}
+                        className="media-menu__item"
+                        value={option.value}
+                        disabled={option.disabled}
+                      >
+                        <span>{option.label}</span>
+                        <Menu.ItemIndicator
+                          checked={option.value === playbackRate.value}
+                          forceMount
+                          className="media-menu__indicator"
+                        >
+                          <CheckIcon className="media-icon" />
+                        </Menu.ItemIndicator>
+                      </Menu.RadioItem>
+                    ))}
+                  </Menu.RadioGroup>
+                </Menu.Content>
+              </Menu.Root>
+            ) : null}
+
+            {hasCaptions ? (
+              <Menu.Root>
+                <Menu.Trigger
+                  type="captions"
+                  className="media-menu__item media-menu__item--submenu"
+                  render={(props) => (
+                    <div {...props}>
+                      <CaptionsOffIcon className="media-icon" />
+                      <span>{t(captionsText)}</span>
+                      <span className="media-menu__hint">
+                        <Menu.ItemValue className="media-menu__hint-label" />
+                        <MenuChevron />
+                      </span>
+                    </div>
+                  )}
+                />
+                <Menu.Content className="media-menu__panel">
+                  <Menu.Back className="media-menu__back">
+                    <MenuChevron flipped />
+                    {t(captionsText)}
+                  </Menu.Back>
+                  <Menu.Separator className="media-menu__separator" />
+                  <Menu.RadioGroup
+                    className="media-menu__group"
+                    value={captions.value}
+                    onValueChange={captions.setValue}
+                    aria-label={t(captionsText)}
+                  >
+                    {captions.options.map((option) => (
+                      <Menu.RadioItem
+                        key={option.value}
+                        className="media-menu__item"
+                        value={option.value}
+                        disabled={option.disabled}
+                      >
+                        <span>{option.label}</span>
+                        <Menu.ItemIndicator
+                          checked={option.value === captions.value}
+                          forceMount
+                          className="media-menu__indicator"
+                        >
+                          <CheckIcon className="media-icon" />
+                        </Menu.ItemIndicator>
+                      </Menu.RadioItem>
+                    ))}
+                  </Menu.RadioGroup>
+                </Menu.Content>
+              </Menu.Root>
+            ) : null}
+          </div>
+        </Menu.View>
+      </Menu.Content>
+    </Menu.Root>
+  );
+}
+
+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 (
-    <Menu.RadioGroup className="media-menu__group" value={value} onValueChange={setValue} label="Playback rate">
-      {options.map((option) => (
-        <Menu.RadioItem key={option.value} className="media-menu__item" value={option.value} disabled={option.disabled}>
-          <span>{option.label}</span>
-          <Menu.ItemIndicator checked={option.value === value} forceMount className="media-menu__indicator">
-            <CheckIcon className="media-icon" />
-          </Menu.ItemIndicator>
-        </Menu.RadioItem>
-      ))}
-    </Menu.RadioGroup>
+    <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>
   );
 }
 
@@ -95,8 +393,6 @@ function PlaybackRateMenuItems(): ReactNode {
 
 const SEEK_TIME = 10;
 
-export const Player = createPlayer({ features: videoFeatures });
-
 export interface VideoPlayerProps {
   src: string;
   style?: CSSProperties;
@@ -113,10 +409,18 @@ export interface VideoPlayerProps {
  * />
  * ```
  */
-export function VideoPlayer({ src, className, poster, ...rest }: VideoPlayerProps): ReactNode {
+export function VideoPlayer({ src, className, poster, placeholder, style, ...rest }: VideoPlayerProps): ReactNode {
+  const containerStyle = placeholder
+    ? ({ '--media-poster-placeholder': `url(${placeholder})`, ...style } as CSSProperties)
+    : style;
+
   return (
     <Player.Provider>
-      <Container className={`media-default-skin media-default-skin--video ${className ?? ''}`} {...rest}>
+      <Container
+        className={`media-default-skin media-default-skin--video ${className ?? ''}`}
+        style={containerStyle}
+        {...rest}
+      >
         <Video src={src} playsInline />
 
         {poster && (
@@ -126,9 +430,7 @@ export function VideoPlayer({ src, className, poster, ...rest }: VideoPlayerProp
         <BufferingIndicator
           render={(props) => (
             <div {...props} className="media-buffering-indicator">
-              <div className="media-surface">
-                <SpinnerIcon className="media-icon" />
-              </div>
+              <SpinnerIcon className="media-icon" />
             </div>
           )}
         />
@@ -137,136 +439,87 @@ export function VideoPlayer({ src, className, poster, ...rest }: VideoPlayerProp
           <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.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.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.Root>
-            </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-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-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-preview media-slider__preview">
-                  <Slider.Thumbnail className="media-preview__thumbnail" />
-                  <TimeSlider.Value type="pointer" className="media-time media-preview__time" />
-                  <SpinnerIcon className="media-preview__spinner media-icon" />
-                </div>
-              </TimeSlider.Root>
-              <Time.Value type="duration" className="media-time" />
+              <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>
 
-            <div className="media-button-group">
-              <PlaybackRateMenu.Root side="top" align="center">
-                <PlaybackRateMenu.Trigger className="media-button--playback-rate" render={<Button />} />
-                <PlaybackRateMenu.Content className="media-surface media-popover media-menu media-menu--playback-rate">
-                  <PlaybackRateMenuItems />
-                </PlaybackRateMenu.Content>
-              </PlaybackRateMenu.Root>
-
-              <VolumePopover />
-
-              <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.Root>
-
-              <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.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.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.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>
@@ -300,7 +553,7 @@ export function VideoPlayer({ src, className, poster, ...rest }: VideoPlayerProp
         <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">
@@ -398,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
    ========================================================================== */
@@ -431,9 +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;
+  --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%;
@@ -445,14 +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;
-  border-radius: var(--media-border-radius, 2rem);
+  scrollbar-color: var(--scrollbar-thumb-color) transparent;
+  scrollbar-width: thin;
+  border-radius: var(--media-border-radius, 1.75rem);
   isolation: isolate;
   transition-timing-function: ease-out;
   transition-duration: 100ms;
@@ -462,6 +751,16 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     outline-color: currentColor;
     outline-offset: 2px;
   }
+
+  &::-webkit-scrollbar-thumb {
+    background: var(--scrollbar-thumb-color);
+    border-radius: 9999px;
+  }
+
+  @media (prefers-reduced-transparency: reduce) or (prefers-contrast: more) {
+    --scrollbar-thumb-color: oklch(from currentColor l c h / 0.8);
+    scrollbar-width: auto;
+  }
 }
 
 /* ==========================================================================
@@ -484,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));
   }
 }
 
@@ -520,7 +821,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   position: absolute;
   inset: 0;
   pointer-events: none;
-  background-image: linear-gradient(to top, oklch(0 0 0 / 0.5), 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.3) 25%, oklch(0 0 0 / 0));
   border-radius: inherit;
   opacity: 0;
   backdrop-filter: blur(0) saturate(1);
@@ -539,6 +840,12 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   opacity: 1;
 }
 
+.media-default-skin .media-buffering-indicator[data-visible] ~ .media-overlay {
+  background: oklch(0 0 0 / 0.35);
+  opacity: 1;
+  backdrop-filter: blur(8px);
+}
+
 .media-default-skin .media-error[data-open] ~ .media-overlay {
   backdrop-filter: blur(16px) saturate(1.5);
 }
@@ -550,9 +857,9 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-default-skin .media-buffering-indicator {
   position: absolute;
   inset: 0;
+  z-index: 10;
   display: none;
-  align-items: center;
-  justify-content: center;
+  place-content: center;
   color: oklch(1 0 0);
   pointer-events: none;
 
@@ -561,12 +868,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 
   &[data-visible] {
-    display: flex;
-  }
-
-  .media-surface {
-    padding: 0.25rem;
-    border-radius: 100%;
+    display: grid;
   }
 }
 
@@ -594,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;
@@ -610,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);
 }
 
 /* ==========================================================================
@@ -626,16 +932,36 @@ 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 {
   font-variant-numeric: tabular-nums;
 }
 
+.media-default-skin .media-time[role="button"] {
+  cursor: pointer;
+  outline: 2px solid transparent;
+  outline-offset: -2px;
+  border-radius: calc(var(--spacing) * 1);
+  transition-timing-function: ease-out;
+  transition-duration: 100ms;
+  transition-property: outline-color, outline-offset;
+
+  &:focus-visible {
+    outline-color: currentColor;
+    outline-offset: 2px;
+  }
+}
+
 /* ==========================================================================
    Buttons
    ========================================================================== */
@@ -646,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;
@@ -655,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;
@@ -667,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 */
@@ -708,14 +1030,17 @@ 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;
   }
 
+  & .media-icon__container {
+    display: grid;
+  }
+
   & .media-icon {
     grid-area: 1 / 1;
     transition-behavior: allow-discrete;
@@ -732,9 +1057,10 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     position: absolute;
     right: -1px;
     bottom: -3px;
-    font-size: 10px;
-    font-weight: 480;
+    font-size: 0.715em; /* 10px */
+    font-weight: 500;
     font-variant-numeric: tabular-nums;
+    letter-spacing: -0.05em;
   }
 
   &:has(.media-icon--flipped) .media-icon__label {
@@ -758,17 +1084,32 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 }
 
+/* Settings button */
+.media-default-skin .media-button--settings {
+  & .media-icon--settings {
+    transition: transform 150ms ease-in-out;
+
+    @media (prefers-reduced-motion: reduce) {
+      transition-duration: 0ms;
+    }
+  }
+
+  &[aria-expanded="true"] .media-icon--settings {
+    transform: rotate(90deg);
+  }
+}
+
 /* 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;
@@ -777,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%;
@@ -796,12 +1137,23 @@ 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;
-  }
+/* ==========================================================================
+   Badge
+   ========================================================================== */
+
+.media-default-skin .media-badge {
+  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);
 }
 
 /* ==========================================================================
@@ -811,6 +1163,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-default-skin .media-icon__container {
   position: relative;
 }
+
 .media-default-skin .media-icon {
   flex-shrink: 0;
   width: var(--media-icon-size);
@@ -820,102 +1173,6 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   scale: -1 1;
 }
 
-/* ==========================================================================
-   Menus
-   Note: Menus use `.media-popover` styles for positioning and transitions.
-   ========================================================================== */
-
-.media-default-skin .media-popover.media-menu {
-  box-sizing: border-box;
-  min-width: min(6rem, var(--media-popover-available-width, 6rem));
-  max-width: var(--media-popover-available-width, none);
-  max-height: var(--media-popover-available-height, none);
-  padding: 0.375rem;
-  overflow: auto;
-  overscroll-behavior: none;
-  border-radius: 1.25rem;
-
-  &::before {
-    display: none;
-  }
-}
-
-.media-default-skin .media-popover.media-menu .media-menu__group {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  gap: 0.125rem;
-
-  &::before {
-    position: absolute;
-    position-anchor: --media-menu-item-highlight-anchor;
-    inset: anchor(inside);
-    pointer-events: none;
-    content: "";
-    background-color: oklch(from currentColor l c h / 0.1);
-    border-radius: calc(infinity * 1px);
-    transition: inset ease-in-out 100ms;
-  }
-
-  @supports not (top: anchor(top)) {
-    &::before {
-      display: none;
-    }
-  }
-}
-
-.media-default-skin .media-popover.media-menu .media-menu__item {
-  display: flex;
-  gap: 0.5rem;
-  align-items: center;
-  justify-content: space-between;
-  min-height: 2rem;
-  padding: 0 0.75rem;
-  font-variant-numeric: tabular-nums;
-  color: inherit;
-  cursor: pointer;
-  outline: 2px solid transparent;
-  outline-offset: -2px;
-  border-radius: calc(infinity * 1px);
-
-  &:hover,
-  &[data-highlighted] {
-    anchor-name: --media-menu-item-highlight-anchor;
-  }
-
-  @supports not (top: anchor(top)) {
-    &:hover,
-    &[data-highlighted] {
-      background-color: oklch(from currentColor l c h / 0.1);
-    }
-  }
-
-  &:focus-visible {
-    outline-color: currentColor;
-    outline-offset: 2px;
-  }
-
-  &[aria-checked="true"] .media-menu__indicator {
-    opacity: 1;
-  }
-
-  &[aria-disabled="true"] {
-    pointer-events: none;
-    cursor: not-allowed;
-    opacity: 0.5;
-  }
-}
-
-.media-default-skin .media-popover.media-menu .media-menu__indicator {
-  flex-shrink: 0;
-  margin-right: -0.25rem;
-  opacity: 0;
-}
-
-.media-default-skin .media-popover.media-menu .media-menu__indicator .media-icon {
-  filter: drop-shadow(0 1px 0 var(--media-current-shadow-color));
-}
-
 /* ==========================================================================
    Poster Image
    ========================================================================== */
@@ -930,7 +1187,8 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   transition: opacity 0.25s;
 }
 .media-default-skin media-poster:not([data-visible]),
-.media-default-skin > img:not([data-visible]) {
+.media-default-skin > img:not([data-visible]),
+.media-default-skin > img[data-visible]:not([data-loaded]) {
   opacity: 0;
 }
 .media-default-skin media-poster ::slotted(img),
@@ -949,6 +1207,30 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   border-radius: inherit;
 }
 
+/* Blurred placeholder: HTML path targets media-poster::before, React path targets the skin container::before */
+.media-default-skin media-poster::before,
+.media-default-skin::before {
+  position: absolute;
+  inset: 0;
+  pointer-events: none;
+  content: "";
+  background-image: var(--media-poster-placeholder, none);
+  background-repeat: no-repeat;
+  background-position: var(--media-object-position, center);
+  background-size: var(--media-object-fit, contain);
+  filter: blur(var(--media-poster-placeholder-blur, 20px));
+}
+
+/* React path: hidden by default, transitions in while poster loads */
+.media-default-skin::before {
+  opacity: 0;
+  transition: opacity 0.25s;
+}
+/* Show placeholder while the poster is visible but not yet loaded */
+.media-default-skin:has(img[data-visible]:not([data-loaded]))::before {
+  opacity: 1;
+}
+
 .media-default-skin:fullscreen media-poster ::slotted(img),
 .media-default-skin:fullscreen media-poster img,
 .media-default-skin:fullscreen > img {
@@ -956,14 +1238,15 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 }
 
 /* ==========================================================================
-   Media preview
+   Media thumbnail
    ========================================================================== */
-.media-default-skin .media-preview {
+
+.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-preview__thumbnail {
+  & .media-thumbnail__image {
     position: relative;
     display: block;
     overflow: clip;
@@ -973,23 +1256,19 @@ 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;
     }
   }
 
-  & .media-preview__time {
+  & .media-thumbnail__time {
     position: absolute;
     inset-inline: 0;
-    bottom: 0.5rem;
+    bottom: calc(var(--spacing) * 2);
     text-align: center;
   }
 
-  & .media-overlay {
-    opacity: 1;
-  }
-
-  & .media-preview__spinner {
+  & .media-thumbnail__spinner {
     position: absolute;
     top: 50%;
     left: 50%;
@@ -997,22 +1276,22 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     translate: -50% -50%;
   }
 
-  & .media-preview__thumbnail,
-  & .media-preview__spinner {
+  & .media-thumbnail__image,
+  & .media-thumbnail__spinner {
     transition: opacity 150ms ease-out;
   }
 
-  &:not(:has(.media-preview__thumbnail[data-loading])) {
-    & .media-preview__spinner {
+  &:not(:has(.media-thumbnail__image[data-loading])) {
+    & .media-thumbnail__spinner {
       --media-spinner-animation: none;
     }
   }
 
-  &:has(.media-preview__thumbnail[data-loading]) {
-    & .media-preview__thumbnail {
+  &:has(.media-thumbnail__image[data-loading]) {
+    & .media-thumbnail__image {
       opacity: 0;
     }
-    & .media-preview__spinner {
+    & .media-thumbnail__spinner {
       opacity: 1;
     }
   }
@@ -1033,205 +1312,256 @@ 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;
+  /* Track */
+  & .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="horizontal"] {
+      width: 100%;
+      height: calc(var(--spacing) * 1);
+    }
+    &[data-orientation="vertical"] {
+      width: calc(var(--spacing) * 1);
+      height: 100%;
+    }
   }
 
-  &[data-orientation="vertical"] {
-    width: 0.25rem;
-    height: 100%;
-  }
-}
+  /* Thumb */
+  & .media-slider__thumb {
+    position: absolute;
+    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, height, width, outline-offset;
 
-/* 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-subtle, oklch(0 0 0 / 0.1)),
-    0 1px 3px 0 oklch(0 0 0 / 0.15),
-    0 1px 2px -1px oklch(0 0 0 / 0.15);
-  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%;
+    }
 
-  &[data-orientation="horizontal"] {
-    top: 50%;
-    left: var(--media-slider-fill);
+    &:hover,
+    &:focus {
+      outline-color: oklch(from currentColor l c h / 0.15);
+      outline-offset: 0;
+    }
+
+    &::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;
+    }
+
+    &:not(:focus-visible)::after {
+      opacity: 0;
+      scale: 0.5;
+    }
   }
 
-  &[data-orientation="vertical"] {
-    top: calc(100% - var(--media-slider-fill));
-    left: 50%;
+  &:active .media-slider__thumb,
+  &:focus-within .media-slider__thumb,
+  & .media-slider__thumb--persistent {
+    width: calc(var(--spacing) * 3);
+    height: calc(var(--spacing) * 3);
   }
 
-  &:hover,
-  &:focus {
-    outline-color: oklch(from currentColor l c h / 0.25);
-    outline-offset: 0;
-  }
-
-  &::after {
-    position: absolute;
-    inset: -4px;
-    content: "";
-    border-radius: inherit;
-    box-shadow: 0 0 0 2px oklch(1 0 0);
-    transition-timing-function: ease-out;
-    transition-duration: 150ms;
-    transition-property: opacity, scale;
-  }
-
-  &:not(:focus-visible)::after {
-    opacity: 0;
-    scale: 0.5;
+  &:hover .media-slider__thumb,
+  & .media-slider__thumb:focus-visible,
+  & .media-slider__thumb--persistent {
+    opacity: 1;
   }
-}
 
-.media-default-skin .media-slider:active .media-slider__thumb,
-.media-default-skin .media-slider__thumb--persistent {
-  width: 0.75rem;
-  height: 0.75rem;
-}
-
-.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;
-}
+  /* 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;
+    }
 
-/* Shared track fills */
-.media-default-skin .media-slider__buffer,
-.media-default-skin .media-slider__fill {
-  position: absolute;
-  pointer-events: none;
-  border-radius: inherit;
-}
+    & .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;
+    }
 
-.media-default-skin .media-slider__buffer[data-orientation="horizontal"],
-.media-default-skin .media-slider__fill[data-orientation="horizontal"] {
-  inset-block: 0;
-  left: 0;
-}
+    &::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);
+    }
 
-.media-default-skin .media-slider__buffer[data-orientation="vertical"],
-.media-default-skin .media-slider__fill[data-orientation="vertical"] {
-  inset-inline: 0;
-  bottom: 0;
-}
+    &[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;
+    }
+  }
 
-/* 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;
+  /* Shared track fills */
+  & .media-slider__buffer,
+  & .media-slider__fill {
+    position: absolute;
+    pointer-events: none;
+    border-radius: inherit;
 
-  &[data-orientation="horizontal"] {
-    width: var(--media-slider-buffer);
-    transition-property: width;
+    &[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-buffer);
-    transition-property: height;
+  /* Buffer */
+  & .media-slider__buffer {
+    background-color: oklch(from currentColor l c h / 0.2);
+    transition-timing-function: ease-out;
+    transition-duration: 0.25s;
+
+    &[data-orientation="horizontal"] {
+      width: var(--media-slider-buffer);
+      transition-property: width;
+    }
+    &[data-orientation="vertical"] {
+      height: var(--media-slider-buffer);
+      transition-property: height;
+    }
   }
-}
 
-/* Fill */
-.media-default-skin .media-slider__fill {
-  background-color: currentColor;
+  /* Fill */
+  & .media-slider__fill {
+    background-color: currentColor;
 
-  &[data-orientation="horizontal"] {
-    width: var(--media-slider-fill);
+    &[data-orientation="horizontal"] {
+      width: var(--media-slider-fill);
+    }
+    &[data-orientation="vertical"] {
+      height: var(--media-slider-fill);
+    }
   }
 
-  &[data-orientation="vertical"] {
-    height: var(--media-slider-fill);
+  /* 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);
+    }
   }
 }
 
-/* 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);
-}
-
-.media-default-skin .media-slider[data-dragging] .media-slider__thumb[data-orientation="vertical"] {
-  top: calc(100% - var(--media-slider-pointer));
-}
-
-.media-default-skin .media-slider[data-dragging] .media-slider__fill[data-orientation="horizontal"] {
-  width: var(--media-slider-pointer);
-}
-
-.media-default-skin .media-slider[data-dragging] .media-slider__fill[data-orientation="vertical"] {
-  height: var(--media-slider-pointer);
-}
-
 /* ==========================================================================
    Popups & Tooltips
    ========================================================================== */
 
+.media-default-skin {
+  --media-popup-transition:
+    opacity var(--media-popup-transition-timing-function) var(--media-popup-transition-duration),
+    filter var(--media-popup-transition-timing-function) var(--media-popup-transition-duration),
+    transform var(--media-popup-transition-timing-function) var(--media-popup-transition-duration),
+    scale var(--media-popup-transition-timing-function) var(--media-popup-transition-duration);
+}
+
 .media-default-skin .media-popover,
 .media-default-skin .media-tooltip {
+  --popup-translate-distance: calc(0.5 * var(--base-size));
   margin: 0;
   overflow: visible;
   color: inherit;
   border: 0;
-  filter: blur(0px);
-  transition-timing-function: var(--media-popup-transition-timing-function);
-  transition-duration: var(--media-popup-transition-duration);
-  transition-property: scale, opacity, filter;
+  transition: var(--media-popup-transition);
 
   &[data-starting-style],
   &[data-ending-style] {
     opacity: 0;
-    filter: blur(8px);
-    scale: 0.85;
+    filter: blur(4px);
+    /* We have to use transform here for translate as the translate property is used for positioning by core. */
+    transform: translate(var(--popup-translate-x-distance, 0), var(--popup-translate-y-distance, 0));
+    scale: 0.95;
   }
 
-  &[data-instant] {
-    transition-duration: 0ms;
+  &[data-ending-style] {
+    transform: none;
+    /* Speed up the exit transition. */
+    transition-duration: max(0ms, calc(var(--media-popup-transition-duration) - 50ms));
   }
 
   &[data-side="top"] {
+    --popup-translate-y-distance: var(--popup-translate-distance);
     transform-origin: bottom;
   }
   &[data-side="bottom"] {
+    --popup-translate-y-distance: calc(var(--popup-translate-distance) * -1);
     transform-origin: top;
   }
   &[data-side="left"] {
+    --popup-translate-x-distance: var(--popup-translate-distance);
     transform-origin: right;
   }
   &[data-side="right"] {
+    --popup-translate-x-distance: calc(var(--popup-translate-distance) * -1);
     transform-origin: left;
   }
 
@@ -1278,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;
@@ -1287,10 +1617,17 @@ 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: calc(var(--spacing) * 1);
+    align-items: center;
+  }
 
   &[data-side="top"]::before,
   &[data-side="bottom"]::before {
@@ -1300,6 +1637,254 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   &[data-side="right"]::before {
     width: var(--media-tooltip-side-offset);
   }
+
+  & .media-tooltip__kbd {
+    min-width: 1.5em;
+    padding: 0.1em;
+    font-family: inherit;
+    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: calc(var(--spacing) * 1);
+  }
+}
+
+/* ==========================================================================
+   Menus
+   Note: Menus use `.media-popover` styles for positioning and transitions.
+   ========================================================================== */
+
+.media-default-skin .media-menu {
+  --menu-transition-duration: 250ms;
+  --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);
+  overflow: auto;
+  overscroll-behavior: none;
+  border-radius: var(--menu-border-radius);
+
+  @media (prefers-reduced-motion: reduce) {
+    --menu-transition-duration: 0ms;
+  }
+
+  & .media-menu__panel {
+    position: absolute;
+    inset: 0;
+    padding: var(--menu-padding);
+    overflow: auto;
+    overscroll-behavior: none;
+    outline: none;
+    translate: 0 0;
+    transition-timing-function: ease-in-out;
+    transition-duration: var(--menu-transition-duration);
+    transition-property: translate, filter;
+    will-change: translate, filter;
+
+    &[data-starting-style],
+    &[data-ending-style] {
+      overflow: hidden;
+    }
+
+    /* Root settings view — slides out when a submenu is active */
+    &[data-menu-root-view][data-menu-view-state="inactive"] {
+      filter: blur(8px);
+      translate: -100% 0;
+
+      /* Hide the indicator while transitioning */
+      & .media-menu__group::before {
+        display: none;
+      }
+    }
+
+    /* Submenu panels — slide in/out alongside the root view */
+    &[data-submenu] {
+      z-index: 10;
+
+      &:not([data-open], [data-ending-style]) {
+        translate: -100% 0;
+        transition-property: none;
+      }
+
+      &[data-starting-style],
+      &[data-ending-style] {
+        pointer-events: none;
+        filter: blur(8px);
+      }
+
+      &[data-starting-style][data-direction="forward"],
+      &[data-ending-style][data-direction="back"] {
+        translate: 100% 0;
+      }
+
+      &[data-ending-style][data-direction="forward"],
+      &[data-starting-style][data-direction="back"] {
+        translate: -100% 0;
+      }
+    }
+  }
+
+  & .media-menu__separator {
+    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: calc(var(--spacing) * 0.5);
+
+    @supports (top: anchor(top)) {
+      &::before {
+        position: absolute;
+        position-anchor: --media-menu-item-highlight-anchor;
+        inset: anchor(inside);
+        pointer-events: none;
+        content: "";
+        background-color: oklch(from currentColor l c h / 0.1);
+        border-radius: var(--menu-item-border-radius);
+        transition: inset ease-in-out 100ms;
+      }
+    }
+  }
+
+  & .media-menu__item,
+  & .media-menu__back {
+    display: flex;
+    gap: calc(var(--spacing) * 1.5);
+    align-items: center;
+    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;
+    user-select: none;
+    outline: 2px solid transparent;
+    outline-offset: -2px;
+    border-radius: var(--menu-item-border-radius);
+    transition: background-color, color;
+    transition-timing-function: ease-out;
+    transition-duration: 100ms;
+
+    &:focus-visible {
+      outline-color: currentColor;
+      outline-offset: 2px;
+    }
+
+    &:hover,
+    &[data-highlighted] {
+      background-color: oklch(from currentColor l c h / 0.1);
+    }
+
+    & .media-icon {
+      flex-shrink: 0;
+      color: oklch(from currentColor l c h / 0.65);
+      filter: drop-shadow(0 1px 0 var(--media-current-shadow-color));
+    }
+  }
+
+  & .media-menu__indicator {
+    flex-shrink: 0;
+    margin-right: calc(var(--spacing) * -1);
+    margin-left: auto;
+    opacity: 0;
+
+    & .media-icon {
+      filter: drop-shadow(0 1px 0 var(--media-current-shadow-color));
+    }
+  }
+
+  & .media-menu__item {
+    justify-content: space-between;
+    font-variant-numeric: tabular-nums;
+    color: inherit;
+
+    &[aria-disabled="true"] {
+      pointer-events: none;
+      cursor: not-allowed;
+      opacity: 0.5;
+    }
+
+    &[aria-checked="true"] .media-menu__indicator {
+      opacity: 1;
+    }
+
+    &[data-availability="unavailable"],
+    &[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: 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);
+  }
+
+  & .media-menu__back {
+    width: 100%;
+    margin-bottom: calc(var(--spacing) * 0.5);
+  }
+
+  & .media-menu__hint {
+    display: inline-flex;
+    gap: calc(var(--spacing) * 1);
+    align-items: center;
+    min-width: 0;
+    padding-left: calc(var(--spacing) * 2);
+    margin-left: auto;
+    color: oklch(from currentColor l c h / 0.65);
+  }
+
+  & .media-menu__hint-label {
+    max-width: calc(var(--spacing) * 24);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  & .media-menu__chevron {
+    width: calc(var(--spacing) * 3.5);
+    height: calc(var(--spacing) * 3.5);
+  }
+
+  /* Settings menu */
+  &.media-menu--settings {
+    width: var(--media-menu-width);
+    min-width: calc(var(--spacing) * 48);
+    height: var(--media-menu-height);
+    overflow: hidden;
+    /* Add height and width transitions. */
+    transition:
+      var(--media-popup-transition),
+      height var(--media-popup-transition-timing-function) var(--menu-transition-duration),
+      width var(--media-popup-transition-timing-function) var(--menu-transition-duration);
+
+    /* Don't transition width and height on open/close. */
+    &[data-starting-style],
+    &[data-ending-style] {
+      transition: var(--media-popup-transition);
+    }
+  }
 }
 
 /* ==========================================================================
@@ -1309,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);
     }
   }
 }
@@ -1337,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 ------------------------------------------------------- */
@@ -1357,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;
@@ -1368,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 */
     * {
@@ -1424,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);
@@ -1438,126 +2017,127 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
     border-radius: inherit;
     transition: --media-progress-fill 200ms linear;
   }
-}
 
-.media-default-skin .media-input-feedback-island--volume[data-level="high"] .media-icon--volume-high,
-.media-default-skin .media-input-feedback-island--volume[data-level="low"] .media-icon--volume-low,
-.media-default-skin .media-input-feedback-island--volume[data-level="off"] .media-icon--volume-off {
-  display: block;
-}
+  &[data-level="high"] .media-icon--volume-high,
+  &[data-level="low"] .media-icon--volume-low,
+  &[data-level="off"] .media-icon--volume-off {
+    display: block;
+  }
 
-.media-default-skin .media-input-feedback-island--status[data-status="captions-on"] .media-icon--captions-on,
-.media-default-skin .media-input-feedback-island--status[data-status="captions-off"] .media-icon--captions-off,
-.media-default-skin .media-input-feedback-island--status[data-status="fullscreen"] .media-icon--fullscreen-enter,
-.media-default-skin .media-input-feedback-island--status[data-status="exit-fullscreen"] .media-icon--fullscreen-exit,
-.media-default-skin .media-input-feedback-island--status[data-status="pip"] .media-icon--pip-enter,
-.media-default-skin .media-input-feedback-island--status[data-status="exit-pip"] .media-icon--pip-exit {
-  display: block;
+  @media (prefers-reduced-motion: no-preference) {
+    &[data-min],
+    &[data-max] {
+      animation: media-shake 300ms ease-in-out;
+    }
+  }
 }
 
-/* --- Boundary shake ------------------------------------------------------- */
-
-@media (prefers-reduced-motion: no-preference) {
-  .media-default-skin .media-input-feedback-island--volume[data-min],
-  .media-default-skin .media-input-feedback-island--volume[data-max] {
-    animation: media-shake 300ms ease-in-out;
+.media-default-skin .media-input-feedback-island--status {
+  &[data-status="captions-on"] .media-icon--captions-on,
+  &[data-status="captions-off"] .media-icon--captions-off,
+  &[data-status="fullscreen"] .media-icon--fullscreen-enter,
+  &[data-status="exit-fullscreen"] .media-icon--fullscreen-exit,
+  &[data-status="pip"] .media-icon--pip-enter,
+  &[data-status="exit-pip"] .media-icon--pip-exit {
+    display: block;
   }
 }
 
 /* --- Bubble ---------------------------------------------------------------- */
 
 .media-default-skin .media-input-feedback-bubble {
-  display: flex;
-  flex-direction: column;
+  display: grid;
   grid-row: 1;
-  grid-column: 2; /* default to center for status bubbles and undirected seeks */
-  align-items: center;
-  justify-content: center;
-  padding: 1rem;
-  transition: opacity 250ms ease-out;
-
-  @container media-root (width > 24rem) {
-    padding: 2rem;
-  }
+  grid-column: 2;
+  place-content: center;
+  padding: calc(var(--spacing) * 4);
+  text-align: center;
 
-  &[data-starting-style],
-  &[data-ending-style] {
-    opacity: 0;
-    transition-timing-function: ease-in;
+  /* Central bubble (play, pause) */
+  &:not([data-direction]) {
+    background: oklch(0 0 0 / 0.35);
+    border-radius: 100%;
+    backdrop-filter: blur(8px);
+    transition-timing-function: ease-out;
     transition-duration: 200ms;
-  }
-}
-
-/* Direction placement — seek bubbles move to the side implied by their direction. */
-.media-default-skin .media-input-feedback-bubble[data-direction="backward"] {
-  grid-column: 1;
-  justify-self: left;
-}
+    transition-property: opacity, scale;
 
-.media-default-skin .media-input-feedback-bubble:not([data-direction]) {
-  grid-column: 2;
-  transition-timing-function:
-    ease-out, linear(0, 0.12 1.5%, 1.35 9.7%, 2.2 13.9%, 3 19.9%, 2.7 21.8%, 0.62 37.5%, 0.96 50.9%, 1);
-  transition-duration: 600ms;
-  transition-property: opacity, scale;
+    &[data-starting-style],
+    &[data-ending-style] {
+      opacity: 0;
+      scale: 0.85;
+    }
 
-  @media (prefers-reduced-motion: reduce) {
-    transition: opacity 100ms ease-out;
-  }
+    &[data-ending-style] {
+      transition-timing-function: ease-in;
+      transition-duration: 100ms;
+    }
 
-  &[data-starting-style],
-  &[data-ending-style] {
-    opacity: 0;
-    scale: 0.8;
-    transition-timing-function: ease-in;
-    transition-duration: 200ms;
+    @media (prefers-reduced-motion: reduce) {
+      transition-duration: 50ms;
+      transition-property: opacity;
+    }
   }
-}
 
-.media-default-skin .media-input-feedback-bubble[data-direction="forward"] {
-  grid-column: 3;
-  justify-self: right;
-}
+  /* Directional bubbles (seek) */
+  &[data-direction] {
+    gap: calc(var(--spacing) * 1);
 
-/* --- Bubble icons ---------------------------------------------------------- */
+    @container media-root (width > 24rem) {
+      padding: calc(var(--spacing) * 6);
+    }
+  }
 
-.media-default-skin .media-input-feedback-bubble .media-icon {
-  display: none;
-  width: 36px;
-  height: 36px;
-}
+  &[data-direction="backward"] {
+    grid-column: 1;
+    justify-self: left;
+  }
 
-/* seek: seek icon, flipped for backward */
-.media-default-skin .media-input-feedback-bubble[data-direction] .media-icon--seek {
-  display: block;
-}
+  &[data-direction="forward"] {
+    grid-column: 3;
+    justify-self: right;
+  }
 
-.media-default-skin .media-input-feedback-bubble[data-direction="backward"] .media-icon--seek {
-  transform: scaleX(-1);
-}
+  /* Icons */
+  .media-icon {
+    display: none;
+    width: calc(var(--media-icon-size) * 1.5);
+    height: calc(var(--media-icon-size) * 1.5);
 
-@media (prefers-reduced-motion: no-preference) {
-  .media-default-skin
-    .media-input-feedback-bubble[data-direction="forward"]:not([data-starting-style])
-    .media-icon--seek {
-    animation: media-slide-in-forward 300ms ease-in-out;
+    &.media-icon--play {
+      translate: 1px 0;
+    }
   }
 
-  .media-default-skin
-    .media-input-feedback-bubble[data-direction="backward"]:not([data-starting-style])
-    .media-icon--seek {
-    animation: media-slide-in-backward 300ms ease-in-out;
+  &[data-direction] .media-icon--seek,
+  &[data-status="pause"] .media-icon--pause,
+  &[data-status="play"] .media-icon--play {
+    display: block;
   }
 
-  .media-default-skin .media-input-feedback-island--status[data-status]:not([data-starting-style]) .media-icon,
-  .media-default-skin .media-input-feedback-bubble[data-status]:not([data-starting-style]) .media-icon {
-    animation: media-pop-in 250ms ease-out;
+  &[data-direction="backward"] .media-icon--seek {
+    scale: -1 1;
   }
-}
 
-.media-default-skin .media-input-feedback-bubble[data-status="pause"] .media-icon--pause,
-.media-default-skin .media-input-feedback-bubble[data-status="play"] .media-icon--play {
-  display: block;
+  @media (prefers-reduced-motion: no-preference) {
+    &[data-direction] .media-icon--seek {
+      transition-timing-function: ease-in-out;
+      transition-duration: 200ms;
+      transition-property: translate, opacity;
+    }
+
+    &[data-starting-style] .media-icon--seek,
+    &[data-ending-style] .media-icon--seek {
+      opacity: 0;
+    }
+
+    &[data-direction="forward"][data-starting-style] .media-icon--seek {
+      translate: -60% 0;
+    }
+    &[data-direction="backward"][data-starting-style] .media-icon--seek {
+      translate: 60% 0;
+    }
+  }
 }
 
 /* ==========================================================================
@@ -1582,6 +2162,8 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-button--pip .media-icon--pip-exit,
 .media-button--cast .media-icon--cast-enter,
 .media-button--cast .media-icon--cast-exit,
+.media-button--airplay .media-icon--airplay-enter,
+.media-button--airplay .media-icon--airplay-exit,
 .media-button--captions .media-icon--captions-off,
 .media-button--captions .media-icon--captions-on {
   display: none;
@@ -1592,10 +2174,11 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 /* Play: ended → restart */
 .media-button--play[data-ended] .media-icon--restart,
-/* Play: paused (not ended) → play */
+/* Play: paused or not yet started (not ended) → play */
 .media-button--play:not([data-ended])[data-paused] .media-icon--play,
-/* Play: playing (not paused, not ended) → pause */
-.media-button--play:not([data-paused]):not([data-ended]) .media-icon--pause,
+.media-button--play:not([data-ended]):not([data-started]) .media-icon--play,
+/* Play: started and not paused/ended → pause */
+.media-button--play[data-started]:not([data-paused]):not([data-ended]) .media-icon--pause,
 /* Mute: muted → volume off */
 .media-button--mute[data-muted] .media-icon--volume-off,
 /* Mute: volume low (not muted) → volume low */
@@ -1614,6 +2197,10 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 .media-button--cast:not([data-cast-state="connected"]) .media-icon--cast-enter,
 /* Cast: connected → exit */
 .media-button--cast[data-cast-state="connected"] .media-icon--cast-exit,
+/* AirPlay: not connected → enter */
+.media-button--airplay:not([data-airplay-state="connected"]) .media-icon--airplay-enter,
+/* AirPlay: connected → exit */
+.media-button--airplay[data-airplay-state="connected"] .media-icon--airplay-exit,
 /* Captions: not active → captions off */
 .media-button--captions:not([data-active]) .media-icon--captions-off,
 /* Captions: active → captions on */
@@ -1622,6 +2209,17 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   opacity: 1;
 }
 
+/* --- Pause keyframe animations on inactive icons --- */
+
+/* The airplay-exit SVG defines its keyframes against CSS variables (mirroring
+   the spinner pattern). When the AirPlay session isn't active the SVG is
+   still in the DOM — just `display: none` — so its animations would keep
+   running. Set the variables to `none` to short-circuit the keyframes. */
+.media-button--airplay:not([data-airplay-state="connected"]) {
+  --media-icon--airplay__fill-animation: none;
+  --media-icon--airplay__triangle-animation: none;
+}
+
 /* -------------------------------------------------------------------------- */
 /* Global @keyframes for all video skins (CSS & Tailwind)                     */
 /* -------------------------------------------------------------------------- */
@@ -1645,27 +2243,6 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   }
 }
 
-@keyframes media-slide-in-forward {
-  from {
-    translate: -60% 0;
-    opacity: 0;
-  }
-}
-
-@keyframes media-slide-in-backward {
-  from {
-    translate: 60% 0;
-    opacity: 0;
-  }
-}
-
-@keyframes media-pop-in {
-  from {
-    scale: 0.8;
-    opacity: 0;
-  }
-}
-
 /* -------------------------------------------------------------------------- */
 /* Global @properties for all video skins (CSS & Tailwind)                    */
 /* -------------------------------------------------------------------------- */
@@ -1695,22 +2272,25 @@ 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);
 
   @media (prefers-reduced-motion: reduce) {
@@ -1730,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;
@@ -1756,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;
+    }
   }
 }
 
@@ -1775,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);
@@ -1799,88 +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;
-  max-width: 56rem;
-  margin-inline: auto;
+  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;
   }
 }
 
@@ -1889,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;
 }
 
@@ -1902,21 +2564,22 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   box-shadow: 0 0 0 1px oklch(0 0 0 / 0.05);
 }
 
-.media-default-skin--video .media-slider__preview {
-  --media-preview-max-width: 11rem;
-  --media-preview-padding: -1.125rem;
+.media-default-skin--video .media-slider__thumbnail {
+  --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-preview-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-preview-max-width) / 2 + var(--media-preview-padding) - var(--media-preview-inset)),
+    calc(var(--max-width) / 2 + var(--padding) - var(--inset)),
     var(--media-slider-pointer),
-    calc(100% - var(--media-preview-max-width) / 2 - var(--media-preview-padding) + var(--media-preview-inset))
+    calc(100% - var(--max-width) / 2 - var(--padding) + var(--inset))
   );
   pointer-events: none;
   opacity: 0;
@@ -1928,19 +2591,22 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
   transition-duration: 150ms;
   transition-property: scale, opacity, filter;
 
-  & .media-preview__thumbnail {
-    max-width: var(--media-preview-max-width);
-  }
-
-  &:has(.media-preview__thumbnail[data-loading]) {
-    max-height: 6rem;
+  & .media-thumbnail__image {
+    max-width: var(--max-width);
+    max-height: var(--max-height);
   }
 }
-.media-default-skin--video .media-slider[data-pointing] .media-slider__preview:has([role="img"]:not([data-hidden])) {
+.media-default-skin--video .media-slider[data-pointing] .media-slider__thumbnail:has([role="img"]:not([data-hidden])) {
   opacity: 1;
   filter: blur(0);
   scale: 1;
 }
+.media-default-skin--video
+  .media-slider__thumbnail:has([role="img"]:not([data-hidden]))
+  + .media-slider__preview
+  .media-slider__value {
+  display: none;
+}
 
 ```
 
@@ -1948,7 +2614,7 @@ function isRenderProp(value: unknown): value is RenderProp<unknown> {
 
 Each skin is built with specific [features](./features.md) in mind. For example, a video skin renders fullscreen and picture-in-picture controls. An audio skin doesn’t.
 
-You’ll find both a skin and the feature bundle it expects exported from the same path. We call these paths **presets** .
+You’ll find both a skin and the feature bundle it expects exported from the same path. We call these paths **presets**.
 
 Import
 
@@ -1968,11 +2634,17 @@ Feature bundle
 
 Features
 
-[playback](../reference/feature-playback.md), [playbackRate](../reference/feature-playback-rate.md), [volume](../reference/feature-volume.md), [time](../reference/feature-time.md), [source](../reference/feature-source.md), [buffer](../reference/feature-buffer.md), [fullscreen](../reference/feature-fullscreen.md), [pip](../reference/feature-pip.md), [remotePlayback](../reference/feature-remote-playback.md), [controls](../reference/feature-controls.md), [textTrack](../reference/feature-text-tracks.md), [error](../reference/feature-error.md)
+[playback](../reference/feature-playback.md), [playbackRate](../reference/feature-playback-rate.md), [quality](../reference/feature-quality.md), [audioTrack](../reference/feature-audio-track.md), [volume](../reference/feature-volume.md), [time](../reference/feature-time.md), [source](../reference/feature-source.md), [buffer](../reference/feature-buffer.md), [fullscreen](../reference/feature-fullscreen.md), [pip](../reference/feature-pip.md), [remotePlayback](../reference/feature-remote-playback.md), [controls](../reference/feature-controls.md), [textTrack](../reference/feature-text-tracks.md), [error](../reference/feature-error.md)
 
 Skins
 
-`<MinimalVideoSkin>`, `<VideoSkin>`
+`<MinimalVideoSkin>`
+
+`import '@videojs/react/video/minimal-skin.css';`
+
+`<VideoSkin>`
+
+`import '@videojs/react/video/skin.css';`
 
 Default media element
 
@@ -1994,7 +2666,13 @@ Features
 
 Skins
 
-`<MinimalAudioSkin>`, `<AudioSkin>`
+`<MinimalAudioSkin>`
+
+`import '@videojs/react/audio/minimal-skin.css';`
+
+`<AudioSkin>`
+
+`import '@videojs/react/audio/skin.css';`
 
 Default media element
 
@@ -2018,6 +2696,8 @@ Skins
 
 `<BackgroundVideoSkin>`
 
+`import '@videojs/react/background/skin.css';`
+
 Default media element
 
 `<BackgroundVideo>`
@@ -2038,7 +2718,13 @@ Features
 
 Skins
 
-`<MinimalLiveAudioSkin>`, `<LiveAudioSkin>`
+`<MinimalLiveAudioSkin>`
+
+`import '@videojs/react/live-audio/minimal-skin.css';`
+
+`<LiveAudioSkin>`
+
+`import '@videojs/react/live-audio/skin.css';`
 
 Default media element
 
@@ -2060,7 +2746,13 @@ Features
 
 Skins
 
-`<MinimalLiveVideoSkin>`, `<LiveVideoSkin>`
+`<MinimalLiveVideoSkin>`
+
+`import '@videojs/react/live-video/minimal-skin.css';`
+
+`<LiveVideoSkin>`
+
+`import '@videojs/react/live-video/skin.css';`
 
 Default media element
 
@@ -2074,7 +2766,7 @@ Presets are a topic quite a bit bigger than just this guide. To learn more, chec
 
 There are currently two options for styling:
 
-*   Vanilla CSS where you import the stylesheet in your app. This is the default.
+*   Vanilla CSS — import the stylesheet listed for each skin in the [preset table](#skins-features-and-presets). This is the default.
 *   Tailwind where you [eject](../how-to/customize-skins#ejecting) the skin and use Tailwind classnames in your app.
 
 ### Current limitations