From 04cea05063ac2adfc05b0273dcb1fbe69c3bf461 Mon Sep 17 00:00:00 2001 From: Rahim Date: Thu, 1 Oct 2026 14:10:19 -0700 Subject: [PATCH 1/2] fix(html): type preset tags from the define entries that register them The bundled declarations for the player and skin define entries were `export {}`, so `import '@videojs/html/video/player'` (and `import 'video.js'`) left `querySelector('video-player')` typed as `Element`. Move each `HTMLElementTagNameMap` augmentation beside its `safeDefine`, as define/ui and define/media already do. --- packages/html/src/define/audio/compat-skin.ts | 6 ++++++ packages/html/src/define/audio/neutral-skin.ts | 6 ++++++ packages/html/src/define/audio/player.ts | 6 ++++++ packages/html/src/define/audio/skin.ts | 6 ++++++ packages/html/src/define/background/player.ts | 6 ++++++ packages/html/src/define/background/skin.ts | 6 ++++++ packages/html/src/define/live-audio/compat-skin.ts | 6 ++++++ packages/html/src/define/live-audio/neutral-skin.ts | 6 ++++++ packages/html/src/define/live-audio/player.ts | 6 ++++++ packages/html/src/define/live-audio/skin.ts | 6 ++++++ packages/html/src/define/live-video/compat-skin.ts | 6 ++++++ packages/html/src/define/live-video/neutral-skin.ts | 6 ++++++ packages/html/src/define/live-video/player.ts | 6 ++++++ packages/html/src/define/live-video/skin.ts | 6 ++++++ packages/html/src/define/video/compat-skin.ts | 6 ++++++ packages/html/src/define/video/neutral-skin.ts | 6 ++++++ packages/html/src/define/video/player.ts | 6 ++++++ packages/html/src/define/video/skin.ts | 6 ++++++ packages/html/src/presets/audio/compat-skin.ts | 6 ------ packages/html/src/presets/audio/neutral-skin.ts | 6 ------ packages/html/src/presets/audio/player.ts | 6 ------ packages/html/src/presets/audio/skin.ts | 6 ------ packages/html/src/presets/background/player.ts | 6 ------ packages/html/src/presets/live-audio/compat-skin.ts | 6 ------ packages/html/src/presets/live-audio/neutral-skin.ts | 6 ------ packages/html/src/presets/live-audio/player.ts | 6 ------ packages/html/src/presets/live-audio/skin.ts | 6 ------ packages/html/src/presets/live-video/compat-skin.ts | 6 ------ packages/html/src/presets/live-video/neutral-skin.ts | 6 ------ packages/html/src/presets/live-video/player.ts | 6 ------ packages/html/src/presets/live-video/skin.ts | 6 ------ packages/html/src/presets/video/compat-skin.ts | 6 ------ packages/html/src/presets/video/neutral-skin.ts | 6 ------ packages/html/src/presets/video/player.ts | 6 ------ packages/html/src/presets/video/skin.ts | 6 ------ packages/skins/src/presets/background/html/skin.ts | 6 ------ 36 files changed, 108 insertions(+), 108 deletions(-) diff --git a/packages/html/src/define/audio/compat-skin.ts b/packages/html/src/define/audio/compat-skin.ts index 0aed396431..802f76b7da 100644 --- a/packages/html/src/define/audio/compat-skin.ts +++ b/packages/html/src/define/audio/compat-skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/compat-audio/register'; safeDefine(CompatAudioSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [CompatAudioSkinElement.tagName]: CompatAudioSkinElement; + } +} diff --git a/packages/html/src/define/audio/neutral-skin.ts b/packages/html/src/define/audio/neutral-skin.ts index 06c5b6c7e2..b8be77a690 100644 --- a/packages/html/src/define/audio/neutral-skin.ts +++ b/packages/html/src/define/audio/neutral-skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/neutral-audio/register'; safeDefine(NeutralAudioSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [NeutralAudioSkinElement.tagName]: NeutralAudioSkinElement; + } +} diff --git a/packages/html/src/define/audio/player.ts b/packages/html/src/define/audio/player.ts index 60bbc3cfe6..f4c00eb4cc 100644 --- a/packages/html/src/define/audio/player.ts +++ b/packages/html/src/define/audio/player.ts @@ -2,3 +2,9 @@ import { AudioPlayerElement } from '../../presets/audio/player'; import { safeDefine } from '../../registration/safe-define'; safeDefine(AudioPlayerElement); + +declare global { + interface HTMLElementTagNameMap { + [AudioPlayerElement.tagName]: AudioPlayerElement; + } +} diff --git a/packages/html/src/define/audio/skin.ts b/packages/html/src/define/audio/skin.ts index 086aee0be0..b07eb27a87 100644 --- a/packages/html/src/define/audio/skin.ts +++ b/packages/html/src/define/audio/skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/default-audio/register'; safeDefine(AudioSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [AudioSkinElement.tagName]: AudioSkinElement; + } +} diff --git a/packages/html/src/define/background/player.ts b/packages/html/src/define/background/player.ts index fcab698a6a..13a90e9ce8 100644 --- a/packages/html/src/define/background/player.ts +++ b/packages/html/src/define/background/player.ts @@ -2,3 +2,9 @@ import { BackgroundVideoPlayerElement } from '../../presets/background/player'; import { safeDefine } from '../../registration/safe-define'; safeDefine(BackgroundVideoPlayerElement); + +declare global { + interface HTMLElementTagNameMap { + [BackgroundVideoPlayerElement.tagName]: BackgroundVideoPlayerElement; + } +} diff --git a/packages/html/src/define/background/skin.ts b/packages/html/src/define/background/skin.ts index ff4da08c97..dca346a194 100644 --- a/packages/html/src/define/background/skin.ts +++ b/packages/html/src/define/background/skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../ui/container'; safeDefine(BackgroundVideoSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [BackgroundVideoSkinElement.tagName]: BackgroundVideoSkinElement; + } +} diff --git a/packages/html/src/define/live-audio/compat-skin.ts b/packages/html/src/define/live-audio/compat-skin.ts index b9978fa071..511c208d33 100644 --- a/packages/html/src/define/live-audio/compat-skin.ts +++ b/packages/html/src/define/live-audio/compat-skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/compat-live-audio/register'; safeDefine(CompatLiveAudioSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [CompatLiveAudioSkinElement.tagName]: CompatLiveAudioSkinElement; + } +} diff --git a/packages/html/src/define/live-audio/neutral-skin.ts b/packages/html/src/define/live-audio/neutral-skin.ts index b00c9919cd..0715a1cf9f 100644 --- a/packages/html/src/define/live-audio/neutral-skin.ts +++ b/packages/html/src/define/live-audio/neutral-skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/neutral-live-audio/register'; safeDefine(NeutralLiveAudioSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [NeutralLiveAudioSkinElement.tagName]: NeutralLiveAudioSkinElement; + } +} diff --git a/packages/html/src/define/live-audio/player.ts b/packages/html/src/define/live-audio/player.ts index 5cb3d65774..b79fd70bf5 100644 --- a/packages/html/src/define/live-audio/player.ts +++ b/packages/html/src/define/live-audio/player.ts @@ -2,3 +2,9 @@ import { LiveAudioPlayerElement } from '../../presets/live-audio/player'; import { safeDefine } from '../../registration/safe-define'; safeDefine(LiveAudioPlayerElement); + +declare global { + interface HTMLElementTagNameMap { + [LiveAudioPlayerElement.tagName]: LiveAudioPlayerElement; + } +} diff --git a/packages/html/src/define/live-audio/skin.ts b/packages/html/src/define/live-audio/skin.ts index 22f32bcfc2..f721090a2b 100644 --- a/packages/html/src/define/live-audio/skin.ts +++ b/packages/html/src/define/live-audio/skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/default-live-audio/register'; safeDefine(LiveAudioSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [LiveAudioSkinElement.tagName]: LiveAudioSkinElement; + } +} diff --git a/packages/html/src/define/live-video/compat-skin.ts b/packages/html/src/define/live-video/compat-skin.ts index c3bcf9872a..5eca74fcd9 100644 --- a/packages/html/src/define/live-video/compat-skin.ts +++ b/packages/html/src/define/live-video/compat-skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/compat-live-video/register'; safeDefine(CompatLiveVideoSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [CompatLiveVideoSkinElement.tagName]: CompatLiveVideoSkinElement; + } +} diff --git a/packages/html/src/define/live-video/neutral-skin.ts b/packages/html/src/define/live-video/neutral-skin.ts index ae540e592d..da11fc2cf2 100644 --- a/packages/html/src/define/live-video/neutral-skin.ts +++ b/packages/html/src/define/live-video/neutral-skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/neutral-live-video/register'; safeDefine(NeutralLiveVideoSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [NeutralLiveVideoSkinElement.tagName]: NeutralLiveVideoSkinElement; + } +} diff --git a/packages/html/src/define/live-video/player.ts b/packages/html/src/define/live-video/player.ts index 3a73b02235..6cab10f189 100644 --- a/packages/html/src/define/live-video/player.ts +++ b/packages/html/src/define/live-video/player.ts @@ -2,3 +2,9 @@ import { LiveVideoPlayerElement } from '../../presets/live-video/player'; import { safeDefine } from '../../registration/safe-define'; safeDefine(LiveVideoPlayerElement); + +declare global { + interface HTMLElementTagNameMap { + [LiveVideoPlayerElement.tagName]: LiveVideoPlayerElement; + } +} diff --git a/packages/html/src/define/live-video/skin.ts b/packages/html/src/define/live-video/skin.ts index da0b995c1f..7528ca6cbd 100644 --- a/packages/html/src/define/live-video/skin.ts +++ b/packages/html/src/define/live-video/skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/default-live-video/register'; safeDefine(LiveVideoSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [LiveVideoSkinElement.tagName]: LiveVideoSkinElement; + } +} diff --git a/packages/html/src/define/video/compat-skin.ts b/packages/html/src/define/video/compat-skin.ts index b6af48d35f..22fc5265fb 100644 --- a/packages/html/src/define/video/compat-skin.ts +++ b/packages/html/src/define/video/compat-skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/compat-video/register'; safeDefine(CompatVideoSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [CompatVideoSkinElement.tagName]: CompatVideoSkinElement; + } +} diff --git a/packages/html/src/define/video/neutral-skin.ts b/packages/html/src/define/video/neutral-skin.ts index 49c821de7e..121ccbf6f5 100644 --- a/packages/html/src/define/video/neutral-skin.ts +++ b/packages/html/src/define/video/neutral-skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/neutral-video/register'; safeDefine(NeutralVideoSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [NeutralVideoSkinElement.tagName]: NeutralVideoSkinElement; + } +} diff --git a/packages/html/src/define/video/player.ts b/packages/html/src/define/video/player.ts index b87ee86258..aea150f387 100644 --- a/packages/html/src/define/video/player.ts +++ b/packages/html/src/define/video/player.ts @@ -2,3 +2,9 @@ import { VideoPlayerElement } from '../../presets/video/player'; import { safeDefine } from '../../registration/safe-define'; safeDefine(VideoPlayerElement); + +declare global { + interface HTMLElementTagNameMap { + [VideoPlayerElement.tagName]: VideoPlayerElement; + } +} diff --git a/packages/html/src/define/video/skin.ts b/packages/html/src/define/video/skin.ts index 4456fa7197..8da76719e6 100644 --- a/packages/html/src/define/video/skin.ts +++ b/packages/html/src/define/video/skin.ts @@ -3,3 +3,9 @@ import { safeDefine } from '../../registration/safe-define'; import '../../internal/skins/default-video/register'; safeDefine(VideoSkinElement); + +declare global { + interface HTMLElementTagNameMap { + [VideoSkinElement.tagName]: VideoSkinElement; + } +} diff --git a/packages/html/src/presets/audio/compat-skin.ts b/packages/html/src/presets/audio/compat-skin.ts index 07a91d6ff8..3ccaa153a8 100644 --- a/packages/html/src/presets/audio/compat-skin.ts +++ b/packages/html/src/presets/audio/compat-skin.ts @@ -11,9 +11,3 @@ export class CompatAudioSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [CompatAudioSkinElement.tagName]: CompatAudioSkinElement; - } -} diff --git a/packages/html/src/presets/audio/neutral-skin.ts b/packages/html/src/presets/audio/neutral-skin.ts index 2771163de9..c6a0f69028 100644 --- a/packages/html/src/presets/audio/neutral-skin.ts +++ b/packages/html/src/presets/audio/neutral-skin.ts @@ -11,9 +11,3 @@ export class NeutralAudioSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [NeutralAudioSkinElement.tagName]: NeutralAudioSkinElement; - } -} diff --git a/packages/html/src/presets/audio/player.ts b/packages/html/src/presets/audio/player.ts index a6479aac68..a77aca9a1c 100644 --- a/packages/html/src/presets/audio/player.ts +++ b/packages/html/src/presets/audio/player.ts @@ -12,9 +12,3 @@ export const PlayerController = AudioPlayerController; export class AudioPlayerElement extends PlayerElement { static readonly tagName = 'audio-player'; } - -declare global { - interface HTMLElementTagNameMap { - [AudioPlayerElement.tagName]: AudioPlayerElement; - } -} diff --git a/packages/html/src/presets/audio/skin.ts b/packages/html/src/presets/audio/skin.ts index 6762022357..9c8f10c8fe 100644 --- a/packages/html/src/presets/audio/skin.ts +++ b/packages/html/src/presets/audio/skin.ts @@ -11,9 +11,3 @@ export class AudioSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [AudioSkinElement.tagName]: AudioSkinElement; - } -} diff --git a/packages/html/src/presets/background/player.ts b/packages/html/src/presets/background/player.ts index 99f8303d60..1346167ea8 100644 --- a/packages/html/src/presets/background/player.ts +++ b/packages/html/src/presets/background/player.ts @@ -12,9 +12,3 @@ export const PlayerController = BackgroundVideoPlayerController; export class BackgroundVideoPlayerElement extends PlayerElement { static readonly tagName = 'background-video-player'; } - -declare global { - interface HTMLElementTagNameMap { - [BackgroundVideoPlayerElement.tagName]: BackgroundVideoPlayerElement; - } -} diff --git a/packages/html/src/presets/live-audio/compat-skin.ts b/packages/html/src/presets/live-audio/compat-skin.ts index e74d375857..13ac532e1c 100644 --- a/packages/html/src/presets/live-audio/compat-skin.ts +++ b/packages/html/src/presets/live-audio/compat-skin.ts @@ -11,9 +11,3 @@ export class CompatLiveAudioSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [CompatLiveAudioSkinElement.tagName]: CompatLiveAudioSkinElement; - } -} diff --git a/packages/html/src/presets/live-audio/neutral-skin.ts b/packages/html/src/presets/live-audio/neutral-skin.ts index 0def20acc2..b95768eeda 100644 --- a/packages/html/src/presets/live-audio/neutral-skin.ts +++ b/packages/html/src/presets/live-audio/neutral-skin.ts @@ -11,9 +11,3 @@ export class NeutralLiveAudioSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [NeutralLiveAudioSkinElement.tagName]: NeutralLiveAudioSkinElement; - } -} diff --git a/packages/html/src/presets/live-audio/player.ts b/packages/html/src/presets/live-audio/player.ts index c3872262da..86cbb264d1 100644 --- a/packages/html/src/presets/live-audio/player.ts +++ b/packages/html/src/presets/live-audio/player.ts @@ -12,9 +12,3 @@ export const PlayerController = LiveAudioPlayerController; export class LiveAudioPlayerElement extends PlayerElement { static readonly tagName = 'live-audio-player'; } - -declare global { - interface HTMLElementTagNameMap { - [LiveAudioPlayerElement.tagName]: LiveAudioPlayerElement; - } -} diff --git a/packages/html/src/presets/live-audio/skin.ts b/packages/html/src/presets/live-audio/skin.ts index 77f483a6d1..93b0ebd97b 100644 --- a/packages/html/src/presets/live-audio/skin.ts +++ b/packages/html/src/presets/live-audio/skin.ts @@ -11,9 +11,3 @@ export class LiveAudioSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [LiveAudioSkinElement.tagName]: LiveAudioSkinElement; - } -} diff --git a/packages/html/src/presets/live-video/compat-skin.ts b/packages/html/src/presets/live-video/compat-skin.ts index df8953448b..27c6aea910 100644 --- a/packages/html/src/presets/live-video/compat-skin.ts +++ b/packages/html/src/presets/live-video/compat-skin.ts @@ -11,9 +11,3 @@ export class CompatLiveVideoSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [CompatLiveVideoSkinElement.tagName]: CompatLiveVideoSkinElement; - } -} diff --git a/packages/html/src/presets/live-video/neutral-skin.ts b/packages/html/src/presets/live-video/neutral-skin.ts index 9fe7eeaa09..70cfd9d126 100644 --- a/packages/html/src/presets/live-video/neutral-skin.ts +++ b/packages/html/src/presets/live-video/neutral-skin.ts @@ -11,9 +11,3 @@ export class NeutralLiveVideoSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [NeutralLiveVideoSkinElement.tagName]: NeutralLiveVideoSkinElement; - } -} diff --git a/packages/html/src/presets/live-video/player.ts b/packages/html/src/presets/live-video/player.ts index 82fa595e1d..c22fa47e02 100644 --- a/packages/html/src/presets/live-video/player.ts +++ b/packages/html/src/presets/live-video/player.ts @@ -12,9 +12,3 @@ export const PlayerController = LiveVideoPlayerController; export class LiveVideoPlayerElement extends PlayerElement { static readonly tagName = 'live-video-player'; } - -declare global { - interface HTMLElementTagNameMap { - [LiveVideoPlayerElement.tagName]: LiveVideoPlayerElement; - } -} diff --git a/packages/html/src/presets/live-video/skin.ts b/packages/html/src/presets/live-video/skin.ts index 722619eb7d..3ca95ed5b3 100644 --- a/packages/html/src/presets/live-video/skin.ts +++ b/packages/html/src/presets/live-video/skin.ts @@ -11,9 +11,3 @@ export class LiveVideoSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [LiveVideoSkinElement.tagName]: LiveVideoSkinElement; - } -} diff --git a/packages/html/src/presets/video/compat-skin.ts b/packages/html/src/presets/video/compat-skin.ts index 60b8ed31da..15028befcd 100644 --- a/packages/html/src/presets/video/compat-skin.ts +++ b/packages/html/src/presets/video/compat-skin.ts @@ -11,9 +11,3 @@ export class CompatVideoSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [CompatVideoSkinElement.tagName]: CompatVideoSkinElement; - } -} diff --git a/packages/html/src/presets/video/neutral-skin.ts b/packages/html/src/presets/video/neutral-skin.ts index 411a4e685f..b44c56c78d 100644 --- a/packages/html/src/presets/video/neutral-skin.ts +++ b/packages/html/src/presets/video/neutral-skin.ts @@ -11,9 +11,3 @@ export class NeutralVideoSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [NeutralVideoSkinElement.tagName]: NeutralVideoSkinElement; - } -} diff --git a/packages/html/src/presets/video/player.ts b/packages/html/src/presets/video/player.ts index 43a9297d58..1d86a86b89 100644 --- a/packages/html/src/presets/video/player.ts +++ b/packages/html/src/presets/video/player.ts @@ -18,9 +18,3 @@ export const PlayerController = VideoPlayerController; export class VideoPlayerElement extends PlayerElement { static readonly tagName = 'video-player'; } - -declare global { - interface HTMLElementTagNameMap { - [VideoPlayerElement.tagName]: VideoPlayerElement; - } -} diff --git a/packages/html/src/presets/video/skin.ts b/packages/html/src/presets/video/skin.ts index 716a9b31b5..8ca628a528 100644 --- a/packages/html/src/presets/video/skin.ts +++ b/packages/html/src/presets/video/skin.ts @@ -11,9 +11,3 @@ export class VideoSkinElement extends SkinElement { static styles = createShadowStyle(styles); static template = template; } - -declare global { - interface HTMLElementTagNameMap { - [VideoSkinElement.tagName]: VideoSkinElement; - } -} diff --git a/packages/skins/src/presets/background/html/skin.ts b/packages/skins/src/presets/background/html/skin.ts index 6bd341db2a..5b3cfa2d4b 100644 --- a/packages/skins/src/presets/background/html/skin.ts +++ b/packages/skins/src/presets/background/html/skin.ts @@ -33,9 +33,3 @@ export class BackgroundVideoSkinElement extends ReactiveElement { } } } - -declare global { - interface HTMLElementTagNameMap { - [BackgroundVideoSkinElement.tagName]: BackgroundVideoSkinElement; - } -} From 0da80c4d86b5747e6b8513e8b1e05af3a9fdaf58 Mon Sep 17 00:00:00 2001 From: Rahim Date: Thu, 1 Oct 2026 13:29:23 -0700 Subject: [PATCH 2/2] fix(store): stop installing react into plain html projects `react-compiler-runtime` requires `react` as a peer, so npm installed React into every `@videojs/html` app through `@videojs/store`. Drop the compiler from store's three hooks and memoize them by hand. `useStore` now keys its callbacks on whether a selector exists, so an inline selector no longer resubscribes every render. --- packages/store/package.json | 3 +-- .../src/react/hooks/tests/use-store.test.tsx | 18 ++++++++++++++++++ packages/store/src/react/hooks/use-selector.ts | 6 +++--- packages/store/src/react/hooks/use-snapshot.ts | 5 ++--- packages/store/src/react/hooks/use-store.ts | 12 ++++++++++-- packages/store/vite.config.ts | 2 -- pnpm-lock.yaml | 3 --- 7 files changed, 34 insertions(+), 15 deletions(-) diff --git a/packages/store/package.json b/packages/store/package.json index 3f54827301..3d8d4e71b0 100644 --- a/packages/store/package.json +++ b/packages/store/package.json @@ -52,8 +52,7 @@ "clean": "rimraf --glob dist types '*.tsbuildinfo'" }, "dependencies": { - "@videojs/utils": "workspace:*", - "react-compiler-runtime": "^1.0.0" + "@videojs/utils": "workspace:*" }, "devDependencies": { "@testing-library/react": "^16.3.0", diff --git a/packages/store/src/react/hooks/tests/use-store.test.tsx b/packages/store/src/react/hooks/tests/use-store.test.tsx index d8bafb88a9..85790ea16c 100644 --- a/packages/store/src/react/hooks/tests/use-store.test.tsx +++ b/packages/store/src/react/hooks/tests/use-store.test.tsx @@ -80,5 +80,23 @@ describe('useStore', () => { expect(renderCount).toBe(1); expect(result.current).toBe(1); }); + + it('keeps one subscription across re-renders with an inline selector', async () => { + const { store } = createTestStore(); + const subscribe = vi.spyOn(store, 'subscribe'); + + const { result } = renderHook(() => useStore(store, (s) => s.volume)); + + await act(async () => { + await store.setVolume(0.5); + }); + + await act(async () => { + await store.setVolume(0.25); + }); + + expect(result.current).toBe(0.25); + expect(subscribe).toHaveBeenCalledTimes(1); + }); }); }); diff --git a/packages/store/src/react/hooks/use-selector.ts b/packages/store/src/react/hooks/use-selector.ts index 4cbe32f519..2b55f1e631 100644 --- a/packages/store/src/react/hooks/use-selector.ts +++ b/packages/store/src/react/hooks/use-selector.ts @@ -1,6 +1,6 @@ 'use client'; -import { useRef, useSyncExternalStore } from 'react'; +import { useCallback, useRef, useSyncExternalStore } from 'react'; import { type Comparator, type Selector, shallowEqual } from '../../core/shallow-equal'; @@ -24,14 +24,14 @@ export function useSelector( ): R { const cache = useRef(undefined); - const getSelectedSnapshot = () => { + const getSelectedSnapshot = useCallback(() => { const next = selector(getSnapshot()); if (cache.current !== undefined && isEqual(cache.current, next)) return cache.current; cache.current = next; return next; - }; + }, [getSnapshot, selector, isEqual]); return useSyncExternalStore(subscribe, getSelectedSnapshot, getSelectedSnapshot); } diff --git a/packages/store/src/react/hooks/use-snapshot.ts b/packages/store/src/react/hooks/use-snapshot.ts index 8d20f37a6f..c659b44676 100644 --- a/packages/store/src/react/hooks/use-snapshot.ts +++ b/packages/store/src/react/hooks/use-snapshot.ts @@ -25,9 +25,8 @@ export function useSnapshot(state: State): T; export function useSnapshot(state: State, selector: Selector, isEqual?: Comparator): R; export function useSnapshot(state: State, selector?: Selector, isEqual?: Comparator) { - // React Compiler cannot track external mutable state reads across subscriptions. - 'use no memo'; - + // Fresh callbacks resubscribe every render on purpose: memoizing them breaks the dialog and menu transition tests in + // @videojs/react, which rely on the snapshot re-check that resubscribing triggers. return useSelector( (cb) => state.subscribe(cb), () => state.current, diff --git a/packages/store/src/react/hooks/use-store.ts b/packages/store/src/react/hooks/use-store.ts index 65e10eee32..33b0caf8bf 100644 --- a/packages/store/src/react/hooks/use-store.ts +++ b/packages/store/src/react/hooks/use-store.ts @@ -1,6 +1,8 @@ 'use client'; import { identity, noop } from '@videojs/utils/function'; +import { isFunction } from '@videojs/utils/predicate'; +import { useMemo } from 'react'; import type { AnyStore, InferStoreState } from '../../core/store'; import { type Comparator, type Selector, useSelector } from './use-selector'; @@ -44,8 +46,14 @@ export function useStore( ): R; export function useStore(store: AnyStore, selector?: Selector, isEqual?: Comparator) { - const subscribe = selector ? (cb: () => void) => store.subscribe(cb) : noopSubscribe, - getSnapshot = selector ? () => store.state : () => store; + const hasSelector = isFunction(selector); + + // Keyed on whether a selector exists, not its identity, so an inline selector does not resubscribe every render. + const subscribe = useMemo( + () => (hasSelector ? (cb: () => void) => store.subscribe(cb) : noopSubscribe), + [store, hasSelector] + ), + getSnapshot = useMemo(() => (hasSelector ? () => store.state : () => store), [store, hasSelector]); return useSelector(subscribe, getSnapshot, selector ?? identity, isEqual); } diff --git a/packages/store/vite.config.ts b/packages/store/vite.config.ts index 2a40d8b6f7..e8c12394f2 100644 --- a/packages/store/vite.config.ts +++ b/packages/store/vite.config.ts @@ -2,7 +2,6 @@ import { defineConfig } from 'vite-plus'; import type { UserConfig as PackUserConfig } from 'vite-plus/pack'; import { type PackageBuildMode, packageBuildConfig, packageBuildModes } from '../../build/pack.ts'; -import { reactCompilerPlugin } from '../../build/react-compiler.ts'; import { cachedTaskInputs, packageTestTask, workspaceTaskDependencies } from '../../build/task.ts'; const createPackConfig = (mode: PackageBuildMode): PackUserConfig => ({ @@ -12,7 +11,6 @@ const createPackConfig = (mode: PackageBuildMode): PackUserConfig => ({ html: './src/html/index.ts', react: './src/react/index.ts', }, - plugins: [reactCompilerPlugin({ include: /[/\\]src[/\\]react[/\\]/ })], }); export default defineConfig({ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index efada0e520..dd725555f2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1290,9 +1290,6 @@ importers: '@videojs/utils': specifier: workspace:* version: link:../utils - react-compiler-runtime: - specifier: ^1.0.0 - version: 1.0.0(react@19.2.8) devDependencies: '@testing-library/react': specifier: ^16.3.0