Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@types/jasmine": "^6.0.0",
"@types/node": "^22.14.1",
"@types/shelljs": "0.10.0",
"firebase-tools": "15.14.0",
"firebase-tools": "15.15.0",
"jasmine-core": "^6.0.0",
"jasmine-spec-reporter": "7.0.0",
"karma": "~6.4.4",
Expand Down
23 changes: 12 additions & 11 deletions goldens/youtube-player/index.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { Observable } from 'rxjs';
import { OnChanges } from '@angular/core';
import { OnDestroy } from '@angular/core';
import { SimpleChanges } from '@angular/core';
import * as YT_2 from 'youtube';

// @public
export type PlaceholderImageQuality = 'high' | 'standard' | 'low';
Expand All @@ -24,18 +25,18 @@ export const YOUTUBE_PLAYER_CONFIG: InjectionToken<YouTubePlayerConfig>;
// @public
export class YouTubePlayer implements AfterViewInit, OnChanges, OnDestroy {
constructor();
readonly apiChange: Observable<YT.PlayerEvent>;
readonly apiChange: Observable<YT_2.PlayerEvent>;
disableCookies: boolean;
disablePlaceholder: boolean;
endSeconds: number | undefined;
readonly error: Observable<YT.OnErrorEvent>;
readonly error: Observable<YT_2.OnErrorEvent>;
getAvailablePlaybackRates(): number[];
getAvailableQualityLevels(): YT.SuggestedVideoQuality[];
getAvailableQualityLevels(): YT_2.SuggestedVideoQuality[];
getCurrentTime(): number;
getDuration(): number;
getPlaybackQuality(): YT.SuggestedVideoQuality;
getPlaybackQuality(): YT_2.SuggestedVideoQuality;
getPlaybackRate(): number;
getPlayerState(): YT.PlayerState | undefined;
getPlayerState(): YT_2.PlayerState | undefined;
getVideoEmbedCode(): string;
getVideoLoadedFraction(): number;
getVideoUrl(): string;
Expand Down Expand Up @@ -75,21 +76,21 @@ export class YouTubePlayer implements AfterViewInit, OnChanges, OnDestroy {
pauseVideo(): void;
placeholderButtonLabel: string;
placeholderImageQuality: PlaceholderImageQuality;
readonly playbackQualityChange: Observable<YT.OnPlaybackQualityChangeEvent>;
readonly playbackRateChange: Observable<YT.OnPlaybackRateChangeEvent>;
playerVars: YT.PlayerVars | undefined;
readonly playbackQualityChange: Observable<YT_2.OnPlaybackQualityChangeEvent>;
readonly playbackRateChange: Observable<YT_2.OnPlaybackRateChangeEvent>;
playerVars: YT_2.PlayerVars | undefined;
playVideo(): void;
readonly ready: Observable<YT.PlayerEvent>;
readonly ready: Observable<YT_2.PlayerEvent>;
requestFullscreen(options?: FullscreenOptions): Promise<void>;
seekTo(seconds: number, allowSeekAhead: boolean): void;
setPlaybackRate(playbackRate: number): void;
setVolume(volume: number): void;
protected _shouldShowPlaceholder(): boolean;
showBeforeIframeApiLoads: boolean;
startSeconds: number | undefined;
readonly stateChange: Observable<YT.OnStateChangeEvent>;
readonly stateChange: Observable<YT_2.OnStateChangeEvent>;
stopVideo(): void;
suggestedQuality: YT.SuggestedVideoQuality | undefined;
suggestedQuality: YT_2.SuggestedVideoQuality | undefined;
unMute(): void;
videoId: string | undefined;
get width(): number;
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@angular/forms": "catalog:",
"@angular/platform-browser": "catalog:",
"@types/google.maps": "^3.54.10",
"@types/youtube": "0.1.2",
"@types/youtube": "0.2.0",
"date-fns": "^4.1.0",
"luxon": "^3.7.2",
"moment": "^2.29.1",
Expand Down Expand Up @@ -105,7 +105,7 @@
"dgeni": "^0.4.14",
"dgeni-packages": "^0.30.0",
"esbuild": "^0.28.0",
"firebase-tools": "15.14.0",
"firebase-tools": "15.15.0",
"fs-extra": "^11.0.0",
"glob": "^13.0.0",
"highlight.js": "^11.0.0",
Expand Down
1 change: 1 addition & 0 deletions pkg-externals.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ PKG_EXTERNALS = [
"selenium-webdriver",
"safevalues",
"safevalues/dom",
"youtube",
]

# Creates externals for a given package and its entry-points.
Expand Down
61 changes: 19 additions & 42 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/youtube-player/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ ng_project(
":youtube-player",
"//:node_modules/@angular/core",
"//:node_modules/@angular/platform-browser",
"//:node_modules/@types/youtube",
"//:node_modules/rxjs",
],
)
Expand Down
2 changes: 2 additions & 0 deletions src/youtube-player/fake-youtube-player.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
* found in the LICENSE file at https://angular.dev/license
*/

import type * as YT from 'youtube';

// A re-creation of YT.PlayerState since enum values cannot be bound to the window object.
const playerState = {
UNSTARTED: -1,
Expand Down
2 changes: 1 addition & 1 deletion src/youtube-player/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"homepage": "https://github.com/angular/components/tree/main/src/youtube-player#readme",
"dependencies": {
"@types/youtube": "0.1.2",
"@types/youtube": "0.2.0",
"tslib": "^2.3.0",
"safevalues": "^1.2.0"
},
Expand Down
17 changes: 13 additions & 4 deletions src/youtube-player/youtube-player.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
YouTubePlayer,
} from './youtube-player';
import {PlaceholderImageQuality} from './youtube-player-placeholder';
import type * as YT from 'youtube';

declare var window: Window;

Expand Down Expand Up @@ -200,7 +201,9 @@ describe('YoutubePlayer', () => {
fixture.detectChanges();
events.onReady({target: playerSpy});

const playerVars: YT.PlayerVars = {modestbranding: YT.ModestBranding.Modest};
const playerVars: YT.PlayerVars = {
modestbranding: (window as Window & {YT?: typeof YT}).YT!.ModestBranding.Modest,
};
fixture.componentInstance.playerVars = playerVars;
fixture.changeDetectorRef.markForCheck();
fixture.detectChanges();
Expand Down Expand Up @@ -389,7 +392,9 @@ describe('YoutubePlayer', () => {
fixture.detectChanges();

testComponent.youtubePlayer.playVideo();
expect(testComponent.youtubePlayer.getPlayerState()).toBe(YT.PlayerState.PLAYING);
expect(testComponent.youtubePlayer.getPlayerState()).toBe(
(window as Window & {YT?: typeof YT}).YT!.PlayerState.PLAYING,
);

events.onReady({target: playerSpy});

Expand All @@ -401,7 +406,9 @@ describe('YoutubePlayer', () => {
fixture.detectChanges();

testComponent.youtubePlayer.pauseVideo();
expect(testComponent.youtubePlayer.getPlayerState()).toBe(YT.PlayerState.PAUSED);
expect(testComponent.youtubePlayer.getPlayerState()).toBe(
(window as Window & {YT?: typeof YT}).YT!.PlayerState.PAUSED,
);

events.onReady({target: playerSpy});

Expand All @@ -413,7 +420,9 @@ describe('YoutubePlayer', () => {
fixture.detectChanges();

testComponent.youtubePlayer.stopVideo();
expect(testComponent.youtubePlayer.getPlayerState()).toBe(YT.PlayerState.CUED);
expect(testComponent.youtubePlayer.getPlayerState()).toBe(
(window as Window & {YT?: typeof YT}).YT!.PlayerState.CUED,
);

events.onReady({target: playerSpy});

Expand Down
13 changes: 11 additions & 2 deletions src/youtube-player/youtube-player.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
// Workaround for: https://github.com/bazelbuild/rules_nodejs/issues/1265
/// <reference types="youtube" preserve="true" />

import type * as YT from 'youtube';

import {
ChangeDetectionStrategy,
Component,
Expand Down Expand Up @@ -576,7 +578,10 @@ export class YouTubePlayer implements AfterViewInit, OnChanges, OnDestroy {

// A player can't be created if the API isn't loaded,
// or there isn't a video or playlist to be played.
if (typeof YT === 'undefined' || (!this.videoId && !this.playerVars?.list)) {
if (
typeof (window as Window & {YT?: typeof YT}).YT === 'undefined' ||
(!this.videoId && !this.playerVars?.list)
) {
return;
}

Expand All @@ -597,7 +602,11 @@ export class YouTubePlayer implements AfterViewInit, OnChanges, OnDestroy {
params.videoId = this.videoId;
}
const player = this._ngZone.runOutsideAngular(
() => new YT.Player(this.youtubeContainer.nativeElement, params),
() =>
new (window as Window & {YT?: typeof YT}).YT!.Player(
this.youtubeContainer.nativeElement,
params,
),
);

const whenReady = (event: YT.PlayerEvent) => {
Expand Down
Loading