@applicaster/zapp-react-native-utils 16.0.0-alpha.1052711356 → 16.0.0-alpha.1054344748
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/actionsExecutor/ActionExecutor.ts +50 -3
- package/actionsExecutor/ActionExecutorContext.tsx +97 -19
- package/actionsExecutor/__tests__/ActionExecutor.test.ts +71 -0
- package/actionsExecutor/__tests__/feedDecorator.test.ts +61 -0
- package/actionsExecutor/actions/__tests__/dismissBottomSheet.test.ts +3 -0
- package/actionsExecutor/actions/__tests__/goBack.test.ts +62 -0
- package/actionsExecutor/actions/__tests__/goHome.test.ts +19 -0
- package/actionsExecutor/actions/__tests__/navigateToScreen.test.ts +133 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.inlineItems.test.ts +300 -0
- package/actionsExecutor/actions/__tests__/presentScreen.test.ts +127 -0
- package/actionsExecutor/actions/__tests__/showAlert.test.ts +49 -0
- package/actionsExecutor/actions/__tests__/showToast.test.ts +29 -4
- package/actionsExecutor/actions/dismissBottomSheet.ts +2 -1
- package/actionsExecutor/actions/goBack.ts +60 -0
- package/actionsExecutor/actions/goHome.ts +31 -0
- package/actionsExecutor/actions/index.ts +8 -0
- package/actionsExecutor/actions/navigateToScreen.ts +18 -4
- package/actionsExecutor/actions/openBottomSheet.ts +51 -31
- package/actionsExecutor/actions/presentScreen.ts +78 -0
- package/actionsExecutor/actions/sendCloudEvent.ts +5 -8
- package/actionsExecutor/actions/showAlert.ts +51 -0
- package/actionsExecutor/actions/showToast.ts +62 -6
- package/actionsExecutor/consts.ts +27 -0
- package/actionsExecutor/feedDecorator.ts +6 -6
- package/analyticsUtils/PlayerAnalyticsManager.ts +1 -1
- package/appUtils/HooksManager/index.ts +9 -0
- package/appUtils/playerManager/OverlayObserver/OverlaysObserver.ts +142 -59
- package/appUtils/playerManager/OverlayObserver/__tests__/getUpcomingQueue.test.ts +67 -0
- package/appUtils/playerManager/OverlayObserver/__tests__/liveContent.test.ts +205 -0
- package/appUtils/playerManager/OverlayObserver/__tests__/utils.test.ts +56 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.android.tv.ts +4 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.ios.tv.ts +4 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.ts +24 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.web.ts +4 -0
- package/appUtils/playerManager/OverlayObserver/utils.ts +51 -20
- package/appUtils/playerManager/__tests__/playerContent.test.ts +403 -0
- package/appUtils/playerManager/__tests__/playerFactory.test.ts +1 -1
- package/appUtils/playerManager/__tests__/playerNative.test.ts +114 -0
- package/appUtils/playerManager/__tests__/playerNativeCommand.test.ts +62 -0
- package/appUtils/playerManager/__tests__/playerToolbox.test.ts +97 -0
- package/appUtils/playerManager/__tests__/usePlayerContent.test.tsx +64 -0
- package/appUtils/playerManager/{conts.ts → const.ts} +33 -0
- package/appUtils/playerManager/index.ts +3 -1
- package/appUtils/playerManager/player.ts +125 -3
- package/appUtils/playerManager/playerFactory.ts +1 -1
- package/appUtils/playerManager/playerNative.ts +28 -4
- package/appUtils/playerManager/playerNativeCommand.ts +3 -6
- package/appUtils/playerManager/playerToolbox.ts +192 -0
- package/appUtils/playerManager/usePlayerContent.tsx +43 -0
- package/appUtils/playerManager/usePlayerControllerSetup.tsx +1 -1
- package/appUtils/playerManager/userLanguagePreference.ts +1 -1
- package/arrayUtils/__tests__/reorderByIds.test.ts +63 -0
- package/arrayUtils/index.ts +62 -0
- package/cellUtils/index.ts +30 -3
- package/configurationUtils/__tests__/manifestKeyParser.test.ts +21 -0
- package/configurationUtils/__tests__/modalBlocksParser.test.ts +269 -0
- package/configurationUtils/manifestKeyParser.ts +50 -10
- package/configurationUtils/modalBlocksParser.ts +214 -0
- package/entryActions/__tests__/buildEntryActions.test.ts +235 -0
- package/entryActions/aliasPresentation.ts +108 -0
- package/entryActions/buildEntryActions.ts +167 -0
- package/entryActions/index.ts +15 -0
- package/entryActions/types.ts +39 -0
- package/manifestUtils/__tests__/player.audioControls.test.js +158 -0
- package/manifestUtils/_internals/index.js +8 -3
- package/manifestUtils/defaultManifestConfigurations/generalContent.js +6 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +330 -1
- package/manifestUtils/index.js +3 -0
- package/manifestUtils/modalBlocks.js +304 -0
- package/modalState/ContentViewModel.ts +2 -0
- package/modalState/ModalOrchestrator.ts +23 -9
- package/modalState/RemoteEditableCollection.ts +77 -31
- package/modalState/__tests__/ContentViewModel.test.ts +3 -3
- package/modalState/__tests__/ModalOrchestrator.phase3.test.ts +35 -0
- package/modalState/__tests__/RemoteEditableCollection.test.ts +157 -1
- package/modalState/__tests__/index.test.ts +30 -1
- package/modalState/__tests__/useBottomSheetContent.test.ts +0 -23
- package/modalState/__tests__/useModalStoreState.test.ts +142 -0
- package/modalState/index.ts +6 -1
- package/modalState/store.ts +9 -2
- package/modalState/types.ts +56 -4
- package/modalState/useBottomSheetContent.ts +37 -26
- package/package.json +2 -2
- package/playerUtils/__tests__/contentDataKeys.test.ts +297 -0
- package/playerUtils/__tests__/resolvePlayerActions.test.ts +138 -0
- package/playerUtils/__tests__/resolvePlayerTitleSubtitle.test.ts +180 -0
- package/playerUtils/contentDataKeys.ts +134 -0
- package/playerUtils/index.ts +37 -16
- package/playerUtils/isAudioItem.ts +26 -0
- package/playerUtils/resolvePlayerActions.ts +71 -0
- package/playerUtils/resolvePlayerTitleSubtitle.ts +76 -0
- package/pluginUtils/__tests__/pluginUtils.test.js +32 -0
- package/pluginUtils/index.ts +29 -0
- package/reactHooks/actions/index.ts +67 -2
- package/reactHooks/cell-click/__tests__/index.test.js +64 -0
- package/reactHooks/cell-click/index.ts +21 -14
- package/reactHooks/connection/index.tsx +8 -5
- package/reactHooks/feed/__tests__/useMarkPipesDataStale.test.tsx +243 -0
- package/reactHooks/feed/useMarkPipesDataStale.ts +68 -23
- package/reactHooks/index.ts +2 -0
- package/reactHooks/layout/index.ts +1 -1
- package/reactHooks/navigation/__tests__/index.test.tsx +176 -1
- package/reactHooks/navigation/__tests__/usePresentScreen.test.ts +154 -0
- package/reactHooks/navigation/index.ts +2 -0
- package/reactHooks/navigation/usePresentScreen.ts +157 -0
- package/reactHooks/navigation/useRoute.ts +22 -5
- package/reactHooks/usePluginConfiguration.ts +4 -1
- package/reactHooks/utils/__tests__/index.test.js +22 -2
- package/reactHooks/utils/index.ts +11 -1
- package/uiActionsRegistrator/__tests__/resolveActionIdentifiers.test.ts +93 -0
- package/uiActionsRegistrator/__tests__/subscribe.test.ts +133 -0
- package/uiActionsRegistrator/__tests__/usableActionItems.test.ts +52 -0
- package/uiActionsRegistrator/index.ts +25 -203
- package/uiActionsRegistrator/registry.ts +351 -0
- package/uiActionsRegistrator/resolveActionIdentifiers.ts +100 -0
- package/uiActionsRegistrator/usableActionItems.ts +66 -0
- package/zappFrameworkUtils/localStorageHelper.ts +10 -2
- package/appUtils/playerManager/usePlayerTitleSummaryOverlay.tsx +0 -56
- package/playerUtils/__tests__/getPlayerActionButtons.test.ts +0 -54
- package/playerUtils/getPlayerActionButtons.ts +0 -17
|
@@ -0,0 +1,192 @@
|
|
|
1
|
+
import { getXray } from "../../logger";
|
|
2
|
+
import type { PlayerManager } from "./index";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* X-Ray `player.*` toolbox: lets an agent read and drive the active player without screenshots.
|
|
6
|
+
* Registered by the PlayerManager singleton itself, so it exists wherever players do. Skipped
|
|
7
|
+
* when the installed X-Ray plugin has no React toolbox API.
|
|
8
|
+
*
|
|
9
|
+
* How the player is shown (video modal mode, mini player) is navigation state: see `nav.*`.
|
|
10
|
+
*/
|
|
11
|
+
|
|
12
|
+
type ToolSpec = {
|
|
13
|
+
name: string;
|
|
14
|
+
description: string;
|
|
15
|
+
parameters?: Array<{
|
|
16
|
+
name: string;
|
|
17
|
+
type: "number";
|
|
18
|
+
description: string;
|
|
19
|
+
}>;
|
|
20
|
+
handler: (args: Record<string, unknown>) => unknown;
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
type RegisterReactToolbox = (toolbox: {
|
|
24
|
+
name: string;
|
|
25
|
+
description: string;
|
|
26
|
+
tools: ToolSpec[];
|
|
27
|
+
}) => Promise<void>;
|
|
28
|
+
|
|
29
|
+
let registration: Promise<void> | undefined;
|
|
30
|
+
|
|
31
|
+
const toNumber = (value: unknown) =>
|
|
32
|
+
typeof value === "number" && Number.isFinite(value) ? value : null;
|
|
33
|
+
|
|
34
|
+
const clamp = (value: number, max: number) => Math.min(Math.max(value, 0), max);
|
|
35
|
+
|
|
36
|
+
/** The range a seek can reach: the DVR window on live, the content on VOD. */
|
|
37
|
+
const requireSeekable = (player: {
|
|
38
|
+
getSeekableDuration: () => number | undefined;
|
|
39
|
+
}) => {
|
|
40
|
+
const seekable = toNumber(player.getSeekableDuration());
|
|
41
|
+
|
|
42
|
+
if (!seekable) throw new Error("Seek is not supported");
|
|
43
|
+
|
|
44
|
+
return seekable;
|
|
45
|
+
};
|
|
46
|
+
|
|
47
|
+
const tools = (manager: PlayerManager): ToolSpec[] => {
|
|
48
|
+
const requirePlayer = () => {
|
|
49
|
+
const player = manager.getActivePlayer();
|
|
50
|
+
|
|
51
|
+
if (!player) throw new Error("No active player");
|
|
52
|
+
|
|
53
|
+
return player;
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
return [
|
|
57
|
+
{
|
|
58
|
+
name: "state",
|
|
59
|
+
description:
|
|
60
|
+
"The active player: entry, position and duration in seconds, playing/buffering/ad/live/muted, " +
|
|
61
|
+
"role (Primary, Cell, Chromecast) and casting. active: false when nothing plays.",
|
|
62
|
+
handler: () => {
|
|
63
|
+
const player = manager.getActivePlayer();
|
|
64
|
+
|
|
65
|
+
if (!player) return { active: false, casting: manager.isCasting() };
|
|
66
|
+
|
|
67
|
+
const entry = player.getEntry();
|
|
68
|
+
|
|
69
|
+
return {
|
|
70
|
+
active: true,
|
|
71
|
+
playerId: player.playerId,
|
|
72
|
+
entry: entry ? { id: entry.id, title: entry.title } : null,
|
|
73
|
+
position: toNumber(player.getPosition()),
|
|
74
|
+
duration: toNumber(player.getDuration()),
|
|
75
|
+
// isPlaying() only means "not paused", which is also true before the stream starts.
|
|
76
|
+
playing: !!player.isReadyToPlay() && player.isPlaying(),
|
|
77
|
+
buffering: !!player.isBuffering(),
|
|
78
|
+
readyToPlay: !!player.isReadyToPlay(),
|
|
79
|
+
ad: player.isAd(),
|
|
80
|
+
live: !!player.isLive(),
|
|
81
|
+
muted: !!player.getIsMuted(),
|
|
82
|
+
role: player.playerRole,
|
|
83
|
+
casting: manager.isCasting(),
|
|
84
|
+
};
|
|
85
|
+
},
|
|
86
|
+
},
|
|
87
|
+
{
|
|
88
|
+
name: "play",
|
|
89
|
+
description: "Resume the active player.",
|
|
90
|
+
handler: () => {
|
|
91
|
+
requirePlayer().play();
|
|
92
|
+
|
|
93
|
+
return "OK";
|
|
94
|
+
},
|
|
95
|
+
},
|
|
96
|
+
{
|
|
97
|
+
name: "pause",
|
|
98
|
+
description: "Pause the active player.",
|
|
99
|
+
handler: () => {
|
|
100
|
+
requirePlayer().pause();
|
|
101
|
+
|
|
102
|
+
return "OK";
|
|
103
|
+
},
|
|
104
|
+
},
|
|
105
|
+
{
|
|
106
|
+
name: "seek",
|
|
107
|
+
description:
|
|
108
|
+
"Seek to an absolute position, as the player's console command does: seconds from the start, " +
|
|
109
|
+
"or from the end when negative. Clamped to the seekable range. Where it lands can differ: " +
|
|
110
|
+
"server-side ads snap back to the break before the target; read player.state afterwards.",
|
|
111
|
+
parameters: [
|
|
112
|
+
{
|
|
113
|
+
name: "position",
|
|
114
|
+
type: "number",
|
|
115
|
+
description:
|
|
116
|
+
"Seconds from the start; negative values count back from the end.",
|
|
117
|
+
},
|
|
118
|
+
],
|
|
119
|
+
handler: ({ position }) => {
|
|
120
|
+
const player = requirePlayer();
|
|
121
|
+
const seconds = toNumber(position);
|
|
122
|
+
|
|
123
|
+
if (seconds === null) {
|
|
124
|
+
throw new Error("'position' must be a number of seconds");
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
const seekable = requireSeekable(player);
|
|
128
|
+
|
|
129
|
+
const target =
|
|
130
|
+
seconds >= 0
|
|
131
|
+
? Math.min(seconds, seekable)
|
|
132
|
+
: clamp(seekable + seconds, seekable);
|
|
133
|
+
|
|
134
|
+
player.seekTo(target);
|
|
135
|
+
|
|
136
|
+
return { position: target };
|
|
137
|
+
},
|
|
138
|
+
},
|
|
139
|
+
{
|
|
140
|
+
name: "offset",
|
|
141
|
+
description:
|
|
142
|
+
"Seek relative to the current position, as the player's console command does: positive " +
|
|
143
|
+
"forward, negative back. Clamped to the seekable range.",
|
|
144
|
+
parameters: [
|
|
145
|
+
{
|
|
146
|
+
name: "seconds",
|
|
147
|
+
type: "number",
|
|
148
|
+
description: "Seconds to move: positive forward, negative back.",
|
|
149
|
+
},
|
|
150
|
+
],
|
|
151
|
+
handler: ({ seconds }) => {
|
|
152
|
+
const player = requirePlayer();
|
|
153
|
+
const delta = toNumber(seconds);
|
|
154
|
+
|
|
155
|
+
if (delta === null) throw new Error("'seconds' must be a number");
|
|
156
|
+
|
|
157
|
+
if (delta === 0) throw new Error("Ignored zero relative seek");
|
|
158
|
+
|
|
159
|
+
const seekable = requireSeekable(player);
|
|
160
|
+
const from = toNumber(player.getContentPosition()) ?? 0;
|
|
161
|
+
const target = clamp(from + delta, seekable);
|
|
162
|
+
|
|
163
|
+
player.seekTo(target);
|
|
164
|
+
|
|
165
|
+
return { from, position: target };
|
|
166
|
+
},
|
|
167
|
+
},
|
|
168
|
+
];
|
|
169
|
+
};
|
|
170
|
+
|
|
171
|
+
export const registerPlayerToolbox = (manager: PlayerManager) => {
|
|
172
|
+
if (registration) return registration;
|
|
173
|
+
|
|
174
|
+
const register = (
|
|
175
|
+
getXray() as
|
|
176
|
+
| { registerReactToolbox?: RegisterReactToolbox }
|
|
177
|
+
| null
|
|
178
|
+
| undefined
|
|
179
|
+
)?.registerReactToolbox;
|
|
180
|
+
|
|
181
|
+
if (!register) return Promise.resolve();
|
|
182
|
+
|
|
183
|
+
registration = register({
|
|
184
|
+
name: "player",
|
|
185
|
+
description: "Inspect and control the active player.",
|
|
186
|
+
tools: tools(manager),
|
|
187
|
+
}).catch(() => {
|
|
188
|
+
registration = undefined;
|
|
189
|
+
});
|
|
190
|
+
|
|
191
|
+
return registration;
|
|
192
|
+
};
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { Player, PlayerContent } from "./player";
|
|
3
|
+
import { usePlayer } from "./usePlayer";
|
|
4
|
+
|
|
5
|
+
const EMPTY_CONTENT: PlayerContent = {
|
|
6
|
+
title: null,
|
|
7
|
+
summary: null,
|
|
8
|
+
imageUrl: null,
|
|
9
|
+
};
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Subscribes to the player's resolved Title/Subtitle, the same way
|
|
13
|
+
* `usePlayerState` subscribes to playback state. Modeled on that hook
|
|
14
|
+
* deliberately: one React bridge pattern for everything the manager publishes.
|
|
15
|
+
*
|
|
16
|
+
* Passing no `playerId` uses the active player, which is the right default -
|
|
17
|
+
* only one player instance is live at a time. `usePlayer` additionally swaps
|
|
18
|
+
* to the casting receiver while casting, so this follows cast handover
|
|
19
|
+
* automatically.
|
|
20
|
+
*/
|
|
21
|
+
export const usePlayerContent = (playerId?: string): PlayerContent => {
|
|
22
|
+
const player: Player = usePlayer(playerId);
|
|
23
|
+
|
|
24
|
+
const [content, setContent] = React.useState<PlayerContent>(
|
|
25
|
+
() => player?.getContent() ?? EMPTY_CONTENT
|
|
26
|
+
);
|
|
27
|
+
|
|
28
|
+
React.useEffect(() => {
|
|
29
|
+
if (!player) {
|
|
30
|
+
setContent(EMPTY_CONTENT);
|
|
31
|
+
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const subscription = player
|
|
36
|
+
.getContentObservable()
|
|
37
|
+
.subscribe((next) => setContent(next));
|
|
38
|
+
|
|
39
|
+
return () => subscription.unsubscribe();
|
|
40
|
+
}, [player]);
|
|
41
|
+
|
|
42
|
+
return content;
|
|
43
|
+
};
|
|
@@ -3,7 +3,7 @@ import { useConfiguration } from "../../reactHooks/useConfiguration";
|
|
|
3
3
|
import { useEffect } from "react";
|
|
4
4
|
import { playerManager } from "./index";
|
|
5
5
|
import { useValidatePlayerConfig } from "../../playerUtils/useValidatePlayerConfig";
|
|
6
|
-
import { PlayerRole } from "./
|
|
6
|
+
import { PlayerRole } from "./const";
|
|
7
7
|
import { isAppleTV } from "@applicaster/zapp-react-native-ui-components/Helpers/Platform";
|
|
8
8
|
import { TVSeekController } from "../../reactHooks/player/TVSeekControlller/TVSeekController";
|
|
9
9
|
import { KeyInputHandler } from "../keyInputHandler/KeyInputHandler";
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
|
|
2
2
|
import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
|
|
3
3
|
import { createLogger, utilsLogger } from "../../logger";
|
|
4
|
-
import { userPreferencesNamespace } from "./
|
|
4
|
+
import { userPreferencesNamespace } from "./const";
|
|
5
5
|
|
|
6
6
|
export const preferredAudioLanguageStorageKey = "preferred_audio_language";
|
|
7
7
|
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { reorderByIds } from "../index";
|
|
2
|
+
|
|
3
|
+
describe("reorderByIds", () => {
|
|
4
|
+
const items = [
|
|
5
|
+
{ id: "1", title: "Track 1" },
|
|
6
|
+
{ id: "2", title: "Track 2" },
|
|
7
|
+
{ id: "3", title: "Track 3" },
|
|
8
|
+
{ id: "4", title: "Track 4" },
|
|
9
|
+
];
|
|
10
|
+
|
|
11
|
+
it("returns an empty array if items is empty or nullish", () => {
|
|
12
|
+
expect(reorderByIds([], ["1"])).toEqual([]);
|
|
13
|
+
expect(reorderByIds(null as any, ["1"])).toEqual([]);
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
it("returns a copy of items if orderedIds is empty or nullish", () => {
|
|
17
|
+
expect(reorderByIds(items, [])).toEqual(items);
|
|
18
|
+
expect(reorderByIds(items, null as any)).toEqual(items);
|
|
19
|
+
});
|
|
20
|
+
|
|
21
|
+
it("reorders items based on the provided orderedIds sequence", () => {
|
|
22
|
+
const result = reorderByIds(items, ["3", "1", "4", "2"]);
|
|
23
|
+
|
|
24
|
+
expect(result.map((i) => i.id)).toEqual(["3", "1", "4", "2"]);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it("replaces items in their original slots when reordering a subset", () => {
|
|
28
|
+
const result = reorderByIds(items, ["4", "2"]);
|
|
29
|
+
|
|
30
|
+
expect(result.map((i) => i.id)).toEqual(["1", "4", "3", "2"]);
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
it("ignores IDs in orderedIds that do not exist in items", () => {
|
|
34
|
+
const result = reorderByIds(items, ["unknown", "3", "99", "1"]);
|
|
35
|
+
|
|
36
|
+
expect(result.map((i) => i.id)).toEqual(["3", "2", "1", "4"]);
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it("supports custom getId selector function", () => {
|
|
40
|
+
const customItems = [
|
|
41
|
+
{ key: "a", name: "Alpha" },
|
|
42
|
+
{ key: "b", name: "Beta" },
|
|
43
|
+
{ key: "c", name: "Gamma" },
|
|
44
|
+
];
|
|
45
|
+
|
|
46
|
+
const result = reorderByIds(customItems, ["c", "a"], (item) => item.key);
|
|
47
|
+
|
|
48
|
+
expect(result.map((i) => i.key)).toEqual(["c", "b", "a"]);
|
|
49
|
+
});
|
|
50
|
+
|
|
51
|
+
it("reorders duplicate items when using unique slot identifiers via getId", () => {
|
|
52
|
+
const duplicateItems = [
|
|
53
|
+
{ id: "x", slot: "s1", name: "First X" },
|
|
54
|
+
{ id: "y", slot: "s2", name: "Y" },
|
|
55
|
+
{ id: "x", slot: "s3", name: "Second X" },
|
|
56
|
+
];
|
|
57
|
+
|
|
58
|
+
const result = reorderByIds(duplicateItems, ["s3", "s1"], (i) => i.slot);
|
|
59
|
+
|
|
60
|
+
expect(result).toHaveLength(3);
|
|
61
|
+
expect(result.map((i) => i.name)).toEqual(["Second X", "Y", "First X"]);
|
|
62
|
+
});
|
|
63
|
+
});
|
package/arrayUtils/index.ts
CHANGED
|
@@ -158,3 +158,65 @@ export const allTruthy = (xs: boolean[]) =>
|
|
|
158
158
|
|
|
159
159
|
/** Returns `true` when at least one value in `xs` is truthy. */
|
|
160
160
|
export const anyTruthy = (xs: boolean[]) => xs.some(Boolean);
|
|
161
|
+
|
|
162
|
+
/**
|
|
163
|
+
* Reorders `items` based on an ordered array of IDs (`orderedIds`).
|
|
164
|
+
* Items whose IDs are in `orderedIds` appear first in that exact sequence.
|
|
165
|
+
* Any remaining items not present in `orderedIds` are appended at the end preserving their relative order.
|
|
166
|
+
*/
|
|
167
|
+
export function reorderByIds<T>(
|
|
168
|
+
items: T[],
|
|
169
|
+
orderedIds: string[],
|
|
170
|
+
getId: (item: T) => string = (item: any) => item?.id
|
|
171
|
+
): T[] {
|
|
172
|
+
if (!items || items.length === 0) return [];
|
|
173
|
+
if (!orderedIds || orderedIds.length === 0) return [...items];
|
|
174
|
+
|
|
175
|
+
const itemMap = new Map<string, T>();
|
|
176
|
+
|
|
177
|
+
items.forEach((item) => {
|
|
178
|
+
const id = getId(item);
|
|
179
|
+
|
|
180
|
+
if (
|
|
181
|
+
id !== undefined &&
|
|
182
|
+
id !== null &&
|
|
183
|
+
id !== "" &&
|
|
184
|
+
!itemMap.has(String(id))
|
|
185
|
+
) {
|
|
186
|
+
itemMap.set(String(id), item);
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
const reorderedSubset: T[] = [];
|
|
191
|
+
const orderedIdsSet = new Set<string>();
|
|
192
|
+
|
|
193
|
+
orderedIds.forEach((id) => {
|
|
194
|
+
const strId = String(id);
|
|
195
|
+
const item = itemMap.get(strId);
|
|
196
|
+
|
|
197
|
+
if (item && !orderedIdsSet.has(strId)) {
|
|
198
|
+
reorderedSubset.push(item);
|
|
199
|
+
orderedIdsSet.add(strId);
|
|
200
|
+
}
|
|
201
|
+
});
|
|
202
|
+
|
|
203
|
+
if (reorderedSubset.length === 0) return [...items];
|
|
204
|
+
|
|
205
|
+
let subsetIdx = 0;
|
|
206
|
+
|
|
207
|
+
return items.map((item) => {
|
|
208
|
+
const id = getId(item);
|
|
209
|
+
|
|
210
|
+
if (
|
|
211
|
+
id !== undefined &&
|
|
212
|
+
id !== null &&
|
|
213
|
+
id !== "" &&
|
|
214
|
+
orderedIdsSet.has(String(id)) &&
|
|
215
|
+
subsetIdx < reorderedSubset.length
|
|
216
|
+
) {
|
|
217
|
+
return reorderedSubset[subsetIdx++];
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
return item;
|
|
221
|
+
});
|
|
222
|
+
}
|
package/cellUtils/index.ts
CHANGED
|
@@ -65,11 +65,38 @@ export const isEmptyOrNil = (value: any): boolean =>
|
|
|
65
65
|
*/
|
|
66
66
|
export const getLabel = (dataKeyValue, customDataKeyValue) => (entry) => {
|
|
67
67
|
const label = getKeyForLabel(dataKeyValue, customDataKeyValue);
|
|
68
|
-
const isPath = label &&
|
|
69
|
-
|
|
68
|
+
const isPath = label && label.length > 0;
|
|
69
|
+
|
|
70
|
+
// An unresolved key is rendered as-is, because a data key is allowed to be a
|
|
71
|
+
// literal label ("More") rather than a path. Fall back to the whole key
|
|
72
|
+
// instead of its first segment: "extensions.section" reads as an unresolved
|
|
73
|
+
// path, while "extensions" reads as a legitimate label and hides the problem.
|
|
74
|
+
const fallback = isEmptyOrNil(label) ? "" : label.join(".");
|
|
70
75
|
|
|
71
76
|
try {
|
|
72
|
-
|
|
77
|
+
if (!isPath) {
|
|
78
|
+
return fallback;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
const resolved = label.reduce(
|
|
82
|
+
(value, key) => (value == null ? undefined : value[key]),
|
|
83
|
+
entry
|
|
84
|
+
);
|
|
85
|
+
|
|
86
|
+
if (isNotNil(resolved)) {
|
|
87
|
+
return resolved;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
// A multi-segment key is unambiguously a path, so failing to resolve it is
|
|
91
|
+
// a misconfiguration rather than someone typing a literal label.
|
|
92
|
+
if (label.length > 1) {
|
|
93
|
+
cellUtilsLogger.warning({
|
|
94
|
+
message: `getLabel: data key "${fallback}" was not found on the entry, rendering the key itself`,
|
|
95
|
+
data: { dataKeyValue, customDataKeyValue, entryId: entry?.id },
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
return fallback;
|
|
73
100
|
} catch (error) {
|
|
74
101
|
cellUtilsLogger.warning({
|
|
75
102
|
data: { error, dataKeyValue, customDataKeyValue },
|
|
@@ -176,6 +176,27 @@ describe("getAllSpecificStyles", () => {
|
|
|
176
176
|
});
|
|
177
177
|
});
|
|
178
178
|
|
|
179
|
+
it("should normalize Studio focus alias onto focused state", () => {
|
|
180
|
+
const outStyles = {};
|
|
181
|
+
|
|
182
|
+
const configuration = {
|
|
183
|
+
button_style_focus_background_color: "#FF3B30",
|
|
184
|
+
};
|
|
185
|
+
|
|
186
|
+
getAllSpecificStyles({
|
|
187
|
+
componentName: "button",
|
|
188
|
+
subComponentName: "",
|
|
189
|
+
configuration,
|
|
190
|
+
outStyles,
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
expect(outStyles.focused).toEqual({
|
|
194
|
+
backgroundColor: "#FF3B30",
|
|
195
|
+
});
|
|
196
|
+
|
|
197
|
+
expect(outStyles.focus).toBeUndefined();
|
|
198
|
+
});
|
|
199
|
+
|
|
179
200
|
it("should handle selected state", () => {
|
|
180
201
|
const outStyles = {};
|
|
181
202
|
|