@applicaster/quick-brick-player 16.0.0-rc.59 → 16.0.0-rc.60
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +6 -6
- package/src/Player/AudioLayer/AudioDescription.tsx +46 -11
- package/src/Player/AudioLayer/AudioPlayerWrapper.tsx +21 -8
- package/src/Player/AudioLayer/Layout/Controls/__tests__/utils.test.ts +66 -0
- package/src/Player/AudioLayer/Layout/Controls/index.tsx +32 -6
- package/src/Player/AudioLayer/Layout/Controls/utils.ts +26 -0
- package/src/Player/AudioLayer/Layout/DockedControls/index.tsx +1 -13
- package/src/Player/AudioLayer/Layout/MobileLayout.tsx +0 -4
- package/src/Player/AudioLayer/Layout/TabletLandscapeLayout.tsx +0 -4
- package/src/Player/AudioLayer/Layout/TabletPortraitLayout.tsx +0 -4
- package/src/Player/AudioLayer/__tests__/AudioDescription.test.tsx +147 -0
- package/src/Player/AudioLayer/__tests__/AudioPlayerWrapper.test.tsx +130 -0
- package/src/Player/AudioLayer/__tests__/usePlaylistNavigation.test.ts +387 -0
- package/src/Player/AudioLayer/usePlaylistNavigation.ts +134 -0
- package/src/Player/__tests__/getNativeProps.test.ts +115 -0
- package/src/Player/__tests__/toNativeMetadata.test.ts +77 -0
- package/src/Player/index.tsx +70 -1
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
import VideoPlayer from "../index";
|
|
2
|
+
import { playerManager } from "@applicaster/zapp-react-native-utils/appUtils";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Pins where `getNativeProps()`'s `metadata` object comes from: the player
|
|
6
|
+
* manager's content channel, looked up by `props.playerId`.
|
|
7
|
+
*
|
|
8
|
+
* This deliberately does NOT depend on tree position. An earlier version read
|
|
9
|
+
* the values from `PlayerContainerContext` via `static contextType`, which
|
|
10
|
+
* made native's props depend on `Player` being rendered inside
|
|
11
|
+
* `PlayerContainerContextProvider` - safe only as long as an exhaustive
|
|
12
|
+
* render-site search stayed true. Reading from the manager removes that whole
|
|
13
|
+
* class of fragility, so the tests below assert the value's source rather than
|
|
14
|
+
* a render-site invariant.
|
|
15
|
+
*
|
|
16
|
+
* Lookup is by id rather than `getActivePlayer()` because these props are
|
|
17
|
+
* handed to this component's own native view: they must describe that player
|
|
18
|
+
* even while a cast session is running.
|
|
19
|
+
*
|
|
20
|
+
* The instance is constructed directly (bypassing `render()`/mount) so this
|
|
21
|
+
* exercises the real `getNativeProps()` without paying for a full render of
|
|
22
|
+
* the ~37KB `VideoPlayer` class tree.
|
|
23
|
+
*/
|
|
24
|
+
|
|
25
|
+
jest.mock("@applicaster/zapp-react-native-utils/appUtils", () => ({
|
|
26
|
+
...jest.requireActual("@applicaster/zapp-react-native-utils/appUtils"),
|
|
27
|
+
playerManager: {
|
|
28
|
+
getPlayerWithId: jest.fn(),
|
|
29
|
+
},
|
|
30
|
+
}));
|
|
31
|
+
|
|
32
|
+
const entry = {
|
|
33
|
+
id: "1",
|
|
34
|
+
title: "Entry Title",
|
|
35
|
+
summary: "Entry Summary",
|
|
36
|
+
} as unknown as ZappEntry;
|
|
37
|
+
|
|
38
|
+
const baseProps = {
|
|
39
|
+
entry,
|
|
40
|
+
pluginConfiguration: {},
|
|
41
|
+
docked: false,
|
|
42
|
+
fullscreen: false,
|
|
43
|
+
inline: false,
|
|
44
|
+
isModal: false,
|
|
45
|
+
isTabletPortrait: false,
|
|
46
|
+
muted: false,
|
|
47
|
+
playerId: "player-1",
|
|
48
|
+
PlayerComponent: "QuickBrickDefaultPlayerView",
|
|
49
|
+
} as unknown as ConstructorParameters<typeof VideoPlayer>[0];
|
|
50
|
+
|
|
51
|
+
const publishContent = (
|
|
52
|
+
content: {
|
|
53
|
+
title: Option<string | number>;
|
|
54
|
+
summary: Option<string | number>;
|
|
55
|
+
} | null
|
|
56
|
+
) => {
|
|
57
|
+
(playerManager.getPlayerWithId as jest.Mock).mockReturnValue(
|
|
58
|
+
content ? { getContent: () => content } : null
|
|
59
|
+
);
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
describe("Player's getNativeProps() reading Title/Subtitle from the manager", () => {
|
|
63
|
+
it("sends the title/summary the player published", () => {
|
|
64
|
+
publishContent({
|
|
65
|
+
title: "Resolved Title",
|
|
66
|
+
summary: "Resolved Summary",
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
const nativeProps = new VideoPlayer(baseProps).getNativeProps();
|
|
70
|
+
|
|
71
|
+
expect(nativeProps.metadata.title).toBe("Resolved Title");
|
|
72
|
+
expect(nativeProps.metadata.subtitle).toBe("Resolved Summary");
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
it("looks the player up by its own id, not the active player", () => {
|
|
76
|
+
publishContent({ title: "Resolved Title", summary: "Resolved Summary" });
|
|
77
|
+
|
|
78
|
+
new VideoPlayer(baseProps).getNativeProps();
|
|
79
|
+
|
|
80
|
+
expect(playerManager.getPlayerWithId).toHaveBeenCalledWith("player-1");
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
it("sends undefined when the player published no text", () => {
|
|
84
|
+
publishContent({ title: null, summary: null });
|
|
85
|
+
|
|
86
|
+
const nativeProps = new VideoPlayer(baseProps).getNativeProps();
|
|
87
|
+
|
|
88
|
+
expect(nativeProps.metadata.title).toBeUndefined();
|
|
89
|
+
expect(nativeProps.metadata.subtitle).toBeUndefined();
|
|
90
|
+
});
|
|
91
|
+
|
|
92
|
+
it("sends undefined rather than crashing when no player is registered", () => {
|
|
93
|
+
publishContent(null);
|
|
94
|
+
|
|
95
|
+
const nativeProps = new VideoPlayer(baseProps).getNativeProps();
|
|
96
|
+
|
|
97
|
+
expect(nativeProps.metadata.title).toBeUndefined();
|
|
98
|
+
expect(nativeProps.metadata.subtitle).toBeUndefined();
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
it("does not fall back to entry.title/entry.summary itself - the resolver owns that fallback", () => {
|
|
102
|
+
// `entry.title`/`entry.summary` are "Entry Title"/"Entry Summary" (see
|
|
103
|
+
// `baseProps`); with nothing published, nativeProps must NOT silently pick
|
|
104
|
+
// those up as a second, redundant fallback layer inside `Player`. The
|
|
105
|
+
// entry-field fallback lives in `resolvePlayerContentText`, reached
|
|
106
|
+
// through the player's own `getContent()`.
|
|
107
|
+
publishContent({ title: null, summary: null });
|
|
108
|
+
|
|
109
|
+
const nativeProps = new VideoPlayer(baseProps).getNativeProps();
|
|
110
|
+
|
|
111
|
+
expect(nativeProps.metadata.title).not.toBe(entry.title);
|
|
112
|
+
expect(nativeProps.metadata.subtitle).not.toBe(entry.summary);
|
|
113
|
+
expect(nativeProps.entry).toBe(entry);
|
|
114
|
+
});
|
|
115
|
+
});
|
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
import { toNativeMetadata } from "../index";
|
|
2
|
+
|
|
3
|
+
// `toNativeMetadata` used to be `resolveNativeTitleSubtitle`, which resolved
|
|
4
|
+
// Title/Subtitle from `entry` + `pluginConfiguration` itself (the dot-path /
|
|
5
|
+
// custom-key / fallback logic). That resolution now happens once in
|
|
6
|
+
// `Player.getContent()` (via `resolvePlayerTitleSubtitle`, already covered by
|
|
7
|
+
// `playerUtils/__tests__/resolvePlayerTitleSubtitle.test.ts` and
|
|
8
|
+
// `playerUtils/__tests__/contentDataKeys.test.ts` - custom-key resolution,
|
|
9
|
+
// fallback-when-unresolvable, and entry-non-mutation are all still asserted
|
|
10
|
+
// there). `toNativeMetadata` only adapts the already-resolved
|
|
11
|
+
// `player.getContent()` value into the `metadata` object the native bridge
|
|
12
|
+
// receives, so this file only covers that adaptation: the shape coercion, and
|
|
13
|
+
// the numeric coercion the native bridge specifically needs (it cannot render
|
|
14
|
+
// a number the way `<Text>` can).
|
|
15
|
+
describe("toNativeMetadata", () => {
|
|
16
|
+
it("returns undefined for both fields when title/summary are null (what the player publishes when there is nothing to show)", () => {
|
|
17
|
+
expect(toNativeMetadata({ title: null, summary: null })).toEqual({
|
|
18
|
+
title: undefined,
|
|
19
|
+
subtitle: undefined,
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
it("returns undefined for both fields when content itself is undefined", () => {
|
|
24
|
+
expect(toNativeMetadata(undefined)).toEqual({
|
|
25
|
+
title: undefined,
|
|
26
|
+
subtitle: undefined,
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
it("passes through string title/summary as-is", () => {
|
|
31
|
+
expect(
|
|
32
|
+
toNativeMetadata({
|
|
33
|
+
title: "Resolved Title",
|
|
34
|
+
summary: "Resolved Summary",
|
|
35
|
+
})
|
|
36
|
+
).toEqual({
|
|
37
|
+
title: "Resolved Title",
|
|
38
|
+
subtitle: "Resolved Summary",
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
it("coerces a numeric title/summary to a string for the native bridge", () => {
|
|
43
|
+
expect(toNativeMetadata({ title: 0, summary: 42 })).toEqual({
|
|
44
|
+
title: "0",
|
|
45
|
+
subtitle: "42",
|
|
46
|
+
});
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
it("handles title and summary independently (one present, one absent)", () => {
|
|
50
|
+
expect(toNativeMetadata({ title: "Only Title", summary: null })).toEqual({
|
|
51
|
+
title: "Only Title",
|
|
52
|
+
subtitle: undefined,
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
it("passes the cover image url through", () => {
|
|
57
|
+
expect(
|
|
58
|
+
toNativeMetadata({
|
|
59
|
+
title: "A Title",
|
|
60
|
+
summary: "A Summary",
|
|
61
|
+
imageUrl: "https://img.test/base.jpg",
|
|
62
|
+
})
|
|
63
|
+
).toEqual({
|
|
64
|
+
title: "A Title",
|
|
65
|
+
subtitle: "A Summary",
|
|
66
|
+
imageUrl: "https://img.test/base.jpg",
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
it("sends undefined rather than an empty string when there is no image", () => {
|
|
71
|
+
// Native treats an empty URI as a load attempt; `undefined` means "none".
|
|
72
|
+
expect(
|
|
73
|
+
toNativeMetadata({ title: "A Title", summary: null, imageUrl: null })
|
|
74
|
+
.imageUrl
|
|
75
|
+
).toBeUndefined();
|
|
76
|
+
});
|
|
77
|
+
});
|
package/src/Player/index.tsx
CHANGED
|
@@ -69,6 +69,60 @@ const styles = StyleSheet.create({
|
|
|
69
69
|
flexImage: { height: "100%", aspectRatio: 1, flex: -1 },
|
|
70
70
|
});
|
|
71
71
|
|
|
72
|
+
/**
|
|
73
|
+
* Coerces the resolver's `Option<string | number>` result into what the
|
|
74
|
+
* native bridge expects: a string, or `undefined` when there is nothing to
|
|
75
|
+
* send.
|
|
76
|
+
*/
|
|
77
|
+
const toNativeTextProp = (
|
|
78
|
+
value: Option<string | number>
|
|
79
|
+
): string | undefined =>
|
|
80
|
+
value === null || value === undefined ? undefined : String(value);
|
|
81
|
+
|
|
82
|
+
export type NativePlayerMetadata = {
|
|
83
|
+
title: string | undefined;
|
|
84
|
+
subtitle: string | undefined;
|
|
85
|
+
imageUrl: string | undefined;
|
|
86
|
+
};
|
|
87
|
+
|
|
88
|
+
/**
|
|
89
|
+
* Adapts the player's resolved Title/Subtitle into the `metadata` object the
|
|
90
|
+
* *native* view receives.
|
|
91
|
+
*
|
|
92
|
+
* The resolution itself (dot-path / key-set logic, entry fallback) does not
|
|
93
|
+
* happen here - the player manager resolves it and publishes it on its content
|
|
94
|
+
* channel (`player.getContent()`). This function only coerces that value's
|
|
95
|
+
* `Option<string | number>` shape into what the native bridge needs: a string,
|
|
96
|
+
* or `undefined` when there is nothing to send.
|
|
97
|
+
*
|
|
98
|
+
* Travels as one `metadata` object rather than two flat props so native has a
|
|
99
|
+
* single place to look for player-facing text, and so adding a field later
|
|
100
|
+
* does not widen the bridge's prop surface again.
|
|
101
|
+
*
|
|
102
|
+
* This intentionally does not touch `entry` - analytics and the downloads
|
|
103
|
+
* feature read `entry.title` / `entry.summary` directly and must keep
|
|
104
|
+
* seeing the original feed values (the downloads feature requires the
|
|
105
|
+
* original entry title). The resolved (possibly customer-configured) text
|
|
106
|
+
* travels in `metadata` instead.
|
|
107
|
+
*
|
|
108
|
+
* Exported as a plain function (rather than inlined as a class method) so
|
|
109
|
+
* it can be unit tested directly without rendering the ~37KB `VideoPlayer`
|
|
110
|
+
* class component.
|
|
111
|
+
*/
|
|
112
|
+
export const toNativeMetadata = (
|
|
113
|
+
content: Option<{
|
|
114
|
+
title: Option<string | number>;
|
|
115
|
+
summary: Option<string | number>;
|
|
116
|
+
imageUrl?: Option<string>;
|
|
117
|
+
}>
|
|
118
|
+
): NativePlayerMetadata => ({
|
|
119
|
+
title: toNativeTextProp(content?.title),
|
|
120
|
+
subtitle: toNativeTextProp(content?.summary),
|
|
121
|
+
// Already a string when present; coerced through the same helper so an
|
|
122
|
+
// empty or nullish value reaches native as `undefined` rather than "".
|
|
123
|
+
imageUrl: toNativeTextProp(content?.imageUrl),
|
|
124
|
+
});
|
|
125
|
+
|
|
72
126
|
type VideoPlayerProps = QuickBrickPlayer.PlayerProps & {
|
|
73
127
|
isCasting?: boolean;
|
|
74
128
|
playNextData?: PlayNextData;
|
|
@@ -1072,6 +1126,15 @@ export default class VideoPlayer extends React.Component<
|
|
|
1072
1126
|
const liveCatchUpEnabled =
|
|
1073
1127
|
this.props.pluginConfiguration?.liveCatchUpEnabled;
|
|
1074
1128
|
|
|
1129
|
+
// Look the player up by id rather than using the active player: these
|
|
1130
|
+
// props are handed to this component's own native player view, so they
|
|
1131
|
+
// must describe that player's content even while a cast session is
|
|
1132
|
+
// running (during which `usePlayer` swaps React consumers over to the
|
|
1133
|
+
// casting receiver).
|
|
1134
|
+
const metadata = toNativeMetadata(
|
|
1135
|
+
playerManager.getPlayerWithId(this.props.playerId)?.getContent()
|
|
1136
|
+
);
|
|
1137
|
+
|
|
1075
1138
|
const nativeProps = {
|
|
1076
1139
|
rate: undefined,
|
|
1077
1140
|
entry,
|
|
@@ -1090,6 +1153,7 @@ export default class VideoPlayer extends React.Component<
|
|
|
1090
1153
|
liveCatchUpEnabled,
|
|
1091
1154
|
playerId: this.props.playerId,
|
|
1092
1155
|
pictureInPictureEnabled,
|
|
1156
|
+
metadata,
|
|
1093
1157
|
seekStep:
|
|
1094
1158
|
(this.props.pluginConfiguration?.seek_duration || SEEK_TIME) * 1000,
|
|
1095
1159
|
accessibilityProps: getAllAccessibilityProps(
|
|
@@ -1146,10 +1210,15 @@ export default class VideoPlayer extends React.Component<
|
|
|
1146
1210
|
return null;
|
|
1147
1211
|
}
|
|
1148
1212
|
|
|
1149
|
-
const
|
|
1213
|
+
const isTvPlatform = isTV();
|
|
1214
|
+
|
|
1215
|
+
const TransportControls = isTvPlatform
|
|
1150
1216
|
? TransportControlsTV
|
|
1151
1217
|
: TransportControlsMobile;
|
|
1152
1218
|
|
|
1219
|
+
// The mobile and TV transport controls read Title/Subtitle from the
|
|
1220
|
+
// player manager's content channel (via `usePlayerContent`) instead of
|
|
1221
|
+
// receiving them as props.
|
|
1153
1222
|
const needToShowDefaultControls = !(
|
|
1154
1223
|
(controls && !castAction?.state?.connected) ||
|
|
1155
1224
|
this.getPlayNextData()
|