@applicaster/zapp-react-native-ui-components 12.0.0-alpha.6631650374 → 12.0.0-alpha.7101461483
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/Components/FastImage/index.android.js +1 -1
- package/Components/GeneralContentScreen/GeneralContentScreen.tsx +5 -5
- package/Components/HandlePlayable/HandlePlayable.tsx +1 -1
- package/Components/MasterCell/DefaultComponents/BorderContainerView/index.tsx +0 -1
- package/Components/MasterCell/DefaultComponents/CellBadge/index.tsx +21 -8
- package/Components/MasterCell/SharedUI/CollapsibleTextContainer/index.ts +10 -6
- package/Components/MasterCell/utils/index.ts +2 -2
- package/Components/ModalComponent/BottomSheetModalContent.tsx +121 -0
- package/Components/ModalComponent/Button/Item.tsx +82 -0
- package/Components/ModalComponent/Button/ItemIcon.tsx +60 -0
- package/Components/ModalComponent/Button/ItemLabel.tsx +101 -0
- package/Components/ModalComponent/Button/assets.ts +4 -0
- package/Components/ModalComponent/Button/index.tsx +111 -0
- package/Components/ModalComponent/Header/CloseButton.tsx +59 -0
- package/Components/ModalComponent/Header/Title.tsx +70 -0
- package/Components/ModalComponent/Header/assets.ts +4 -0
- package/Components/ModalComponent/Header/index.tsx +71 -0
- package/Components/ModalComponent/Header/utils.ts +79 -0
- package/Components/ModalComponent/index.tsx +38 -0
- package/Components/ModalComponent/utils.ts +126 -0
- package/Components/Screen/__tests__/Screen.test.tsx +0 -4
- package/Components/TrackedView/index.tsx +6 -3
- package/Components/VideoLive/LiveImageManager.ts +42 -13
- package/Components/VideoLive/PlayerLiveImageComponent.tsx +79 -73
- package/Components/VideoModal/PlayerDetails.tsx +3 -0
- package/Components/VideoModal/PlayerWrapper.tsx +4 -2
- package/Components/index.js +2 -0
- package/package.json +5 -5
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { View, Text } from "react-native";
|
|
3
|
+
import { useIsRTL } from "@applicaster/zapp-react-native-utils/localizationUtils";
|
|
4
|
+
|
|
5
|
+
import { textTransform } from "@applicaster/zapp-react-native-utils/cellUtils/";
|
|
6
|
+
|
|
7
|
+
export type TitleProps = {
|
|
8
|
+
text: string;
|
|
9
|
+
letterSpacing: number;
|
|
10
|
+
lineHeight: number;
|
|
11
|
+
fontFamily: string;
|
|
12
|
+
fontSize: number;
|
|
13
|
+
color: string;
|
|
14
|
+
marginTop: number;
|
|
15
|
+
marginLeft: number;
|
|
16
|
+
marginRight: number;
|
|
17
|
+
marginBottom: number;
|
|
18
|
+
transform: string;
|
|
19
|
+
numberOfLines: number;
|
|
20
|
+
};
|
|
21
|
+
|
|
22
|
+
export function Title(props: TitleProps) {
|
|
23
|
+
const {
|
|
24
|
+
text,
|
|
25
|
+
letterSpacing,
|
|
26
|
+
lineHeight,
|
|
27
|
+
fontFamily,
|
|
28
|
+
fontSize,
|
|
29
|
+
color,
|
|
30
|
+
marginTop,
|
|
31
|
+
marginBottom,
|
|
32
|
+
marginLeft,
|
|
33
|
+
marginRight,
|
|
34
|
+
numberOfLines,
|
|
35
|
+
transform,
|
|
36
|
+
} = props;
|
|
37
|
+
|
|
38
|
+
const isRTL = useIsRTL();
|
|
39
|
+
const writingDirection = isRTL ? "rtl" : "ltr";
|
|
40
|
+
|
|
41
|
+
if (!text) return null;
|
|
42
|
+
|
|
43
|
+
return (
|
|
44
|
+
<View
|
|
45
|
+
style={{
|
|
46
|
+
marginTop,
|
|
47
|
+
marginBottom,
|
|
48
|
+
marginLeft,
|
|
49
|
+
marginRight,
|
|
50
|
+
}}
|
|
51
|
+
>
|
|
52
|
+
{!!text?.length && (
|
|
53
|
+
<Text
|
|
54
|
+
style={{
|
|
55
|
+
letterSpacing,
|
|
56
|
+
fontFamily,
|
|
57
|
+
fontSize,
|
|
58
|
+
lineHeight,
|
|
59
|
+
color,
|
|
60
|
+
writingDirection,
|
|
61
|
+
}}
|
|
62
|
+
numberOfLines={numberOfLines}
|
|
63
|
+
ellipsizeMode="tail"
|
|
64
|
+
>
|
|
65
|
+
{textTransform(transform, text)}
|
|
66
|
+
</Text>
|
|
67
|
+
)}
|
|
68
|
+
</View>
|
|
69
|
+
);
|
|
70
|
+
}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
/* eslint-disable max-len */
|
|
2
|
+
|
|
3
|
+
export const defaultCloseAsset: string =
|
|
4
|
+
"data:image/png;base64,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";
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import React, { useMemo } from "react";
|
|
2
|
+
import { View, StyleSheet, LayoutChangeEvent } from "react-native";
|
|
3
|
+
import { Title, TitleProps } from "./Title";
|
|
4
|
+
import { CloseButton, CloseButtonProps } from "./CloseButton";
|
|
5
|
+
import { getCloseButtonProps, getTitleProps } from "./utils";
|
|
6
|
+
import { PluginConfiguration } from "../index";
|
|
7
|
+
|
|
8
|
+
type Props = {
|
|
9
|
+
dismiss: () => void;
|
|
10
|
+
configuration: PluginConfiguration;
|
|
11
|
+
width: number;
|
|
12
|
+
onLayout?: (event: LayoutChangeEvent) => void;
|
|
13
|
+
summary?: string;
|
|
14
|
+
title?: string;
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
const styles = StyleSheet.create({
|
|
18
|
+
container: {
|
|
19
|
+
flexDirection: "row",
|
|
20
|
+
alignItems: "center",
|
|
21
|
+
},
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
export function ModalHeader(props: Props) {
|
|
25
|
+
const { configuration, dismiss, width, onLayout, summary, title } = props;
|
|
26
|
+
|
|
27
|
+
const closeButtonProps = useMemo<CloseButtonProps>(
|
|
28
|
+
() => ({
|
|
29
|
+
...getCloseButtonProps(configuration),
|
|
30
|
+
close: dismiss,
|
|
31
|
+
}),
|
|
32
|
+
[configuration, dismiss]
|
|
33
|
+
);
|
|
34
|
+
|
|
35
|
+
const titleProps = useMemo<TitleProps>(
|
|
36
|
+
() => ({
|
|
37
|
+
...getTitleProps(configuration, "title"),
|
|
38
|
+
text: title,
|
|
39
|
+
}),
|
|
40
|
+
[configuration, title]
|
|
41
|
+
);
|
|
42
|
+
|
|
43
|
+
const summaryProps = useMemo<TitleProps>(
|
|
44
|
+
() => ({
|
|
45
|
+
...getTitleProps(configuration, "summary"),
|
|
46
|
+
text: summary,
|
|
47
|
+
}),
|
|
48
|
+
[configuration, summary]
|
|
49
|
+
);
|
|
50
|
+
|
|
51
|
+
const buttonsContainerWidth =
|
|
52
|
+
configuration.modal_bottom_sheet_close_width +
|
|
53
|
+
configuration.modal_bottom_sheet_close_margin_left +
|
|
54
|
+
configuration.modal_bottom_sheet_close_margin_right;
|
|
55
|
+
|
|
56
|
+
return (
|
|
57
|
+
<View onLayout={onLayout} style={styles.container}>
|
|
58
|
+
<View
|
|
59
|
+
style={{
|
|
60
|
+
width: width - buttonsContainerWidth,
|
|
61
|
+
}}
|
|
62
|
+
>
|
|
63
|
+
{title && <Title {...titleProps} />}
|
|
64
|
+
{summary && <Title {...summaryProps} />}
|
|
65
|
+
</View>
|
|
66
|
+
<View style={{ width: buttonsContainerWidth }}>
|
|
67
|
+
<CloseButton {...closeButtonProps} />
|
|
68
|
+
</View>
|
|
69
|
+
</View>
|
|
70
|
+
);
|
|
71
|
+
}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import * as R from "ramda";
|
|
2
|
+
import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
3
|
+
import { PluginConfiguration } from "../index";
|
|
4
|
+
|
|
5
|
+
export function getCloseButtonProps(config: PluginConfiguration) {
|
|
6
|
+
const {
|
|
7
|
+
modal_bottom_sheet_close_asset,
|
|
8
|
+
modal_bottom_sheet_close_focus_asset,
|
|
9
|
+
modal_bottom_sheet_close_height,
|
|
10
|
+
modal_bottom_sheet_close_width,
|
|
11
|
+
modal_bottom_sheet_close_switch,
|
|
12
|
+
modal_bottom_sheet_close_margin_bottom,
|
|
13
|
+
modal_bottom_sheet_close_margin_left,
|
|
14
|
+
modal_bottom_sheet_close_margin_right,
|
|
15
|
+
modal_bottom_sheet_close_margin_top,
|
|
16
|
+
} = config;
|
|
17
|
+
|
|
18
|
+
return {
|
|
19
|
+
asset: modal_bottom_sheet_close_asset,
|
|
20
|
+
assetFocused: modal_bottom_sheet_close_focus_asset,
|
|
21
|
+
enabled: modal_bottom_sheet_close_switch,
|
|
22
|
+
width: modal_bottom_sheet_close_width,
|
|
23
|
+
height: modal_bottom_sheet_close_height,
|
|
24
|
+
marginTop: modal_bottom_sheet_close_margin_top,
|
|
25
|
+
marginBottom: modal_bottom_sheet_close_margin_bottom,
|
|
26
|
+
marginLeft: modal_bottom_sheet_close_margin_left,
|
|
27
|
+
marginRight: modal_bottom_sheet_close_margin_right,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export function getTextValue(
|
|
32
|
+
config: PluginConfiguration,
|
|
33
|
+
entry: ZappEntry,
|
|
34
|
+
key: string
|
|
35
|
+
): string {
|
|
36
|
+
const keyValue = config[key];
|
|
37
|
+
|
|
38
|
+
if (entry) {
|
|
39
|
+
const keyPath = R.split(".", keyValue);
|
|
40
|
+
|
|
41
|
+
return R.path(keyPath, entry);
|
|
42
|
+
} else {
|
|
43
|
+
return keyValue;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
function getConfigKey(
|
|
48
|
+
config: PluginConfiguration,
|
|
49
|
+
suffix: string,
|
|
50
|
+
key: "title" | "summary"
|
|
51
|
+
) {
|
|
52
|
+
return config?.[`modal_bottom_sheet_${key}_${suffix}`];
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export function getTitleProps(
|
|
56
|
+
config: PluginConfiguration,
|
|
57
|
+
key: "title" | "summary"
|
|
58
|
+
) {
|
|
59
|
+
return {
|
|
60
|
+
enabled: getConfigKey(config, "switch", key),
|
|
61
|
+
letterSpacing: platformSelect({
|
|
62
|
+
ios: getConfigKey(config, "ios_letter_spacing", key),
|
|
63
|
+
android: getConfigKey(config, "android_letter_spacing", key),
|
|
64
|
+
}),
|
|
65
|
+
fontFamily: platformSelect({
|
|
66
|
+
ios: getConfigKey(config, "family_ios_font_selector", key),
|
|
67
|
+
android: getConfigKey(config, "family_android_font_selector", key),
|
|
68
|
+
}),
|
|
69
|
+
lineHeight: getConfigKey(config, "line_height", key),
|
|
70
|
+
fontSize: getConfigKey(config, "font_size", key),
|
|
71
|
+
color: getConfigKey(config, "font_color", key),
|
|
72
|
+
marginTop: getConfigKey(config, "margin_top", key),
|
|
73
|
+
marginBottom: getConfigKey(config, "margin_bottom", key),
|
|
74
|
+
marginLeft: getConfigKey(config, "margin_left", key),
|
|
75
|
+
marginRight: getConfigKey(config, "margin_right", key),
|
|
76
|
+
numberOfLines: getConfigKey(config, "number_of_lines", key),
|
|
77
|
+
transform: getConfigKey(config, "transform", key),
|
|
78
|
+
};
|
|
79
|
+
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import React, { useCallback, useState } from "react";
|
|
2
|
+
|
|
3
|
+
import { BasicMeasurementsPortal as MeasurementsPortal } from "@applicaster/zapp-react-native-ui-components/Components/MeasurmentsPortal";
|
|
4
|
+
import { BottomSheetModalContent } from "./BottomSheetModalContent";
|
|
5
|
+
|
|
6
|
+
export type PluginConfiguration = {
|
|
7
|
+
[key: string]: any;
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
type Props = {
|
|
11
|
+
actionPlugins?: [QuickBrickPlugin];
|
|
12
|
+
configuration?: PluginConfiguration;
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
export function ModalComponent(props: ModalBottomSheetContentProps & Props) {
|
|
16
|
+
const [height, setHeight] = useState(0);
|
|
17
|
+
|
|
18
|
+
const onLayout = useCallback(
|
|
19
|
+
({ nativeEvent }) => {
|
|
20
|
+
if (height === 0) {
|
|
21
|
+
setHeight(nativeEvent.layout.height);
|
|
22
|
+
}
|
|
23
|
+
},
|
|
24
|
+
[height]
|
|
25
|
+
);
|
|
26
|
+
|
|
27
|
+
if (height === 0) {
|
|
28
|
+
return (
|
|
29
|
+
<MeasurementsPortal
|
|
30
|
+
Component={BottomSheetModalContent}
|
|
31
|
+
componentProps={props}
|
|
32
|
+
onLayout={onLayout}
|
|
33
|
+
/>
|
|
34
|
+
);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
return <BottomSheetModalContent {...props} />;
|
|
38
|
+
}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
import { platformSelect } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
2
|
+
import { PluginConfiguration } from "./index";
|
|
3
|
+
|
|
4
|
+
export function defaultItemProps(
|
|
5
|
+
config: PluginConfiguration,
|
|
6
|
+
maxWidth: number
|
|
7
|
+
) {
|
|
8
|
+
const {
|
|
9
|
+
modal_bottom_sheet_item_background_color,
|
|
10
|
+
modal_bottom_sheet_item_focus_background_color,
|
|
11
|
+
modal_bottom_sheet_item_selected_background_color,
|
|
12
|
+
modal_bottom_sheet_item_focusected_background_color,
|
|
13
|
+
modal_bottom_sheet_item_corner_radius,
|
|
14
|
+
modal_bottom_sheet_item_margin_bottom,
|
|
15
|
+
modal_bottom_sheet_item_margin_left,
|
|
16
|
+
modal_bottom_sheet_item_margin_right,
|
|
17
|
+
modal_bottom_sheet_item_margin_top,
|
|
18
|
+
modal_bottom_sheet_item_padding_bottom,
|
|
19
|
+
modal_bottom_sheet_item_padding_left,
|
|
20
|
+
modal_bottom_sheet_item_padding_right,
|
|
21
|
+
modal_bottom_sheet_item_padding_top,
|
|
22
|
+
} = config;
|
|
23
|
+
|
|
24
|
+
return {
|
|
25
|
+
backgroundColor: modal_bottom_sheet_item_background_color,
|
|
26
|
+
focusedBackgroundColor: modal_bottom_sheet_item_focus_background_color,
|
|
27
|
+
selectedBackgroundColor: modal_bottom_sheet_item_selected_background_color,
|
|
28
|
+
focusectedBackgroundColor:
|
|
29
|
+
modal_bottom_sheet_item_focusected_background_color,
|
|
30
|
+
borderRadius: modal_bottom_sheet_item_corner_radius,
|
|
31
|
+
marginBottom: modal_bottom_sheet_item_margin_bottom,
|
|
32
|
+
marginTop: modal_bottom_sheet_item_margin_top,
|
|
33
|
+
marginLeft: modal_bottom_sheet_item_margin_left,
|
|
34
|
+
marginRight: modal_bottom_sheet_item_margin_right,
|
|
35
|
+
paddingTop: modal_bottom_sheet_item_padding_top,
|
|
36
|
+
paddingBottom: modal_bottom_sheet_item_padding_bottom,
|
|
37
|
+
paddingRight: modal_bottom_sheet_item_padding_right,
|
|
38
|
+
paddingLeft: modal_bottom_sheet_item_padding_left,
|
|
39
|
+
maxWidth,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export function defaultItemLabelProps(
|
|
44
|
+
config: PluginConfiguration,
|
|
45
|
+
sheetWidth: number
|
|
46
|
+
) {
|
|
47
|
+
const {
|
|
48
|
+
modal_bottom_sheet_item_label_android_letter_spacing,
|
|
49
|
+
modal_bottom_sheet_item_label_ios_letter_spacing,
|
|
50
|
+
modal_bottom_sheet_item_label_family_ios_font_selector,
|
|
51
|
+
modal_bottom_sheet_item_label_family_android_font_selector,
|
|
52
|
+
modal_bottom_sheet_item_label_focus_font_color,
|
|
53
|
+
modal_bottom_sheet_item_label_font_color,
|
|
54
|
+
modal_bottom_sheet_item_label_selected_font_color,
|
|
55
|
+
modal_bottom_sheet_item_label_hover_selected_font_color,
|
|
56
|
+
modal_bottom_sheet_item_label_font_size,
|
|
57
|
+
modal_bottom_sheet_item_label_line_height,
|
|
58
|
+
modal_bottom_sheet_item_label_margin_bottom,
|
|
59
|
+
modal_bottom_sheet_item_label_margin_top,
|
|
60
|
+
modal_bottom_sheet_item_label_margin_left,
|
|
61
|
+
modal_bottom_sheet_item_label_margin_right,
|
|
62
|
+
modal_bottom_sheet_item_label_transform,
|
|
63
|
+
modal_bottom_sheet_item_icon_width,
|
|
64
|
+
modal_bottom_sheet_item_icon_margin_left,
|
|
65
|
+
modal_bottom_sheet_item_icon_margin_right,
|
|
66
|
+
modal_bottom_sheet_item_margin_left,
|
|
67
|
+
modal_bottom_sheet_item_margin_right,
|
|
68
|
+
modal_bottom_sheet_item_padding_left,
|
|
69
|
+
modal_bottom_sheet_item_padding_right,
|
|
70
|
+
} = config;
|
|
71
|
+
|
|
72
|
+
const maxWidth =
|
|
73
|
+
sheetWidth -
|
|
74
|
+
(modal_bottom_sheet_item_icon_width +
|
|
75
|
+
modal_bottom_sheet_item_icon_margin_left +
|
|
76
|
+
modal_bottom_sheet_item_icon_margin_right +
|
|
77
|
+
modal_bottom_sheet_item_margin_left +
|
|
78
|
+
modal_bottom_sheet_item_margin_right +
|
|
79
|
+
modal_bottom_sheet_item_padding_left +
|
|
80
|
+
modal_bottom_sheet_item_padding_right);
|
|
81
|
+
|
|
82
|
+
return {
|
|
83
|
+
fontFamily: platformSelect({
|
|
84
|
+
ios: modal_bottom_sheet_item_label_family_ios_font_selector,
|
|
85
|
+
android: modal_bottom_sheet_item_label_family_android_font_selector,
|
|
86
|
+
}),
|
|
87
|
+
letterSpacing: platformSelect({
|
|
88
|
+
ios: modal_bottom_sheet_item_label_ios_letter_spacing,
|
|
89
|
+
android: modal_bottom_sheet_item_label_android_letter_spacing,
|
|
90
|
+
}),
|
|
91
|
+
fontSize: modal_bottom_sheet_item_label_font_size,
|
|
92
|
+
color: modal_bottom_sheet_item_label_font_color,
|
|
93
|
+
focusColor: modal_bottom_sheet_item_label_focus_font_color,
|
|
94
|
+
hoverSelectedColor: modal_bottom_sheet_item_label_hover_selected_font_color,
|
|
95
|
+
selectedColor: modal_bottom_sheet_item_label_selected_font_color,
|
|
96
|
+
lineHeight: modal_bottom_sheet_item_label_line_height,
|
|
97
|
+
marginBottom: modal_bottom_sheet_item_label_margin_bottom,
|
|
98
|
+
marginTop: modal_bottom_sheet_item_label_margin_top,
|
|
99
|
+
marginLeft: modal_bottom_sheet_item_label_margin_left,
|
|
100
|
+
marginRight: modal_bottom_sheet_item_label_margin_right,
|
|
101
|
+
transform: modal_bottom_sheet_item_label_transform,
|
|
102
|
+
maxWidth,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
export function defaultItemIconProps(config: PluginConfiguration) {
|
|
107
|
+
const {
|
|
108
|
+
modal_bottom_sheet_item_icon_height,
|
|
109
|
+
modal_bottom_sheet_item_icon_width,
|
|
110
|
+
modal_bottom_sheet_item_icon_margin_bottom,
|
|
111
|
+
modal_bottom_sheet_item_icon_margin_left,
|
|
112
|
+
modal_bottom_sheet_item_icon_margin_right,
|
|
113
|
+
modal_bottom_sheet_item_icon_margin_top,
|
|
114
|
+
modal_bottom_sheet_item_icon_flavour,
|
|
115
|
+
} = config;
|
|
116
|
+
|
|
117
|
+
return {
|
|
118
|
+
width: modal_bottom_sheet_item_icon_width,
|
|
119
|
+
height: modal_bottom_sheet_item_icon_height,
|
|
120
|
+
flavour: modal_bottom_sheet_item_icon_flavour,
|
|
121
|
+
marginTop: modal_bottom_sheet_item_icon_margin_top,
|
|
122
|
+
marginBottom: modal_bottom_sheet_item_icon_margin_bottom,
|
|
123
|
+
marginLeft: modal_bottom_sheet_item_icon_margin_left,
|
|
124
|
+
marginRight: modal_bottom_sheet_item_icon_margin_right,
|
|
125
|
+
};
|
|
126
|
+
}
|
|
@@ -56,10 +56,6 @@ jest.mock("@applicaster/zapp-react-native-utils/reactHooks/screen", () => ({
|
|
|
56
56
|
})),
|
|
57
57
|
}));
|
|
58
58
|
|
|
59
|
-
const {
|
|
60
|
-
useCurrentScreenData,
|
|
61
|
-
} = require("@applicaster/zapp-react-native-utils/reactHooks/screen");
|
|
62
|
-
|
|
63
59
|
const { isNavBarVisible } = require("../navigationHandler");
|
|
64
60
|
|
|
65
61
|
const NavBar = jest.fn((props) => <View testID="navBar" {...props} />);
|
|
@@ -17,9 +17,12 @@ type TrackedViewProps = {
|
|
|
17
17
|
export const TrackedView = memo(function TrackedView(props: TrackedViewProps) {
|
|
18
18
|
const children = props.children;
|
|
19
19
|
|
|
20
|
-
const onPositionUpdated = useCallback(
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
const onPositionUpdated = useCallback(
|
|
21
|
+
(event: TrackedViewNativeProps) => {
|
|
22
|
+
props.onPositionUpdated(event.nativeEvent);
|
|
23
|
+
},
|
|
24
|
+
[props.onPositionUpdated]
|
|
25
|
+
);
|
|
23
26
|
|
|
24
27
|
if (isTV()) {
|
|
25
28
|
return <View {...(props as any)}>{children}</View>;
|
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
import { setUserCellPlayerMutedPreference } from "@applicaster/zapp-react-native-utils/appUtils/playerManager/userCellPlayerMutedPreference";
|
|
7
7
|
import { loggerLiveImageManager } from "./loggerHelper";
|
|
8
8
|
import { isTV } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
9
|
+
import { Component } from "react";
|
|
9
10
|
|
|
10
11
|
const { log_debug, log_info, log_error } = loggerLiveImageManager;
|
|
11
12
|
|
|
@@ -36,7 +37,8 @@ type Position = {
|
|
|
36
37
|
type LiveImageProps = {
|
|
37
38
|
player: Player;
|
|
38
39
|
playerId: string;
|
|
39
|
-
setMode
|
|
40
|
+
setMode?: (type: LiveImageType) => void;
|
|
41
|
+
component: Component;
|
|
40
42
|
// TODO: ...primary, powerCell, tvGallery, etc.
|
|
41
43
|
// type: string;
|
|
42
44
|
};
|
|
@@ -164,7 +166,7 @@ export class LiveImageManager implements PlayerLifecycleListener {
|
|
|
164
166
|
|
|
165
167
|
// Fake close event, because we unmount native view
|
|
166
168
|
item.player?.onPlayerClose();
|
|
167
|
-
item.setMode(LiveImageType.Image);
|
|
169
|
+
item.setMode?.(LiveImageType.Image);
|
|
168
170
|
|
|
169
171
|
if (item === this.currentlyPlaying) {
|
|
170
172
|
this.currentlyPlaying = null;
|
|
@@ -191,8 +193,7 @@ export class LiveImageManager implements PlayerLifecycleListener {
|
|
|
191
193
|
}
|
|
192
194
|
|
|
193
195
|
this.currentlyPlaying = item;
|
|
194
|
-
|
|
195
|
-
item.setMode(LiveImageType.Video);
|
|
196
|
+
item.setMode?.(LiveImageType.Video);
|
|
196
197
|
|
|
197
198
|
if (item.player.playerState.isReadyToPlay) {
|
|
198
199
|
item.player.play();
|
|
@@ -209,6 +210,11 @@ export class LiveImageManager implements PlayerLifecycleListener {
|
|
|
209
210
|
this.pauseItem(item);
|
|
210
211
|
};
|
|
211
212
|
|
|
213
|
+
public onLiveImageCompleted = (_item: LiveImage) => {
|
|
214
|
+
// TODO: Notify listeners that player has died
|
|
215
|
+
// Do not try look for new playable, otherwise you will restart video finish to play
|
|
216
|
+
};
|
|
217
|
+
|
|
212
218
|
public muteAll = () => {
|
|
213
219
|
log_debug("muteAll");
|
|
214
220
|
|
|
@@ -235,6 +241,14 @@ export class LiveImageManager implements PlayerLifecycleListener {
|
|
|
235
241
|
const playerItem = this.findNextPlayableItem();
|
|
236
242
|
|
|
237
243
|
if (playerItem) {
|
|
244
|
+
if (!playerItem.isFullyVisible) {
|
|
245
|
+
log_error(
|
|
246
|
+
`checkPlayerPosition: trying to start playback currently invisible item: ${playerInfo(
|
|
247
|
+
playerItem.player
|
|
248
|
+
)}`
|
|
249
|
+
);
|
|
250
|
+
}
|
|
251
|
+
|
|
238
252
|
// Will also check if it's item that already playing
|
|
239
253
|
this.playLiveImage(playerItem);
|
|
240
254
|
}
|
|
@@ -242,7 +256,6 @@ export class LiveImageManager implements PlayerLifecycleListener {
|
|
|
242
256
|
|
|
243
257
|
onPrimaryPlayerClosed = () => {
|
|
244
258
|
const playerItem = this.findNextPlayableItem();
|
|
245
|
-
|
|
246
259
|
log_info("onPrimaryPlayerClosed: starting to play visible live-image");
|
|
247
260
|
|
|
248
261
|
this.currentlyPlaying = null;
|
|
@@ -356,12 +369,12 @@ export class LiveImageManager implements PlayerLifecycleListener {
|
|
|
356
369
|
// TODO: This branch was used when we had play button to toggle replay.
|
|
357
370
|
// Now we mute button instead but we keep it just in case.
|
|
358
371
|
if (IS_ALLOWED_REPLAY && !isTV() && isCurrentItemEnded) {
|
|
359
|
-
this.currentlyPlaying
|
|
360
|
-
this.currentlyPlaying
|
|
372
|
+
this.currentlyPlaying?.player.seekTo(0);
|
|
373
|
+
this.currentlyPlaying?.player.pause();
|
|
361
374
|
|
|
362
375
|
// TODO: ...Maybe player some other item
|
|
363
376
|
} else {
|
|
364
|
-
item.setMode(LiveImageType.Image);
|
|
377
|
+
item.setMode?.(LiveImageType.Image);
|
|
365
378
|
}
|
|
366
379
|
|
|
367
380
|
// Prevent receiving onEnd event from both `close` and `end` player events
|
|
@@ -377,10 +390,25 @@ export class LiveImageManager implements PlayerLifecycleListener {
|
|
|
377
390
|
};
|
|
378
391
|
|
|
379
392
|
onLiveImageError = (item: LiveImage, error: Error) => {
|
|
380
|
-
item.setMode(LiveImageType.Image);
|
|
393
|
+
item.setMode?.(LiveImageType.Image);
|
|
381
394
|
|
|
382
|
-
|
|
395
|
+
const currentItem = this.currentlyPlaying;
|
|
396
|
+
|
|
397
|
+
log_debug(
|
|
398
|
+
`onLiveImageError: error: ${error.message}, live-image ${playerInfo(
|
|
399
|
+
item.player
|
|
400
|
+
)}, currentPlayingId: ${
|
|
401
|
+
this.currentlyPlaying?.playerId
|
|
402
|
+
}, primaryPlayerId: ${this.primaryPlayer?.playerId}`
|
|
403
|
+
);
|
|
404
|
+
|
|
405
|
+
if (currentItem === item) {
|
|
383
406
|
this.currentlyPlaying = null;
|
|
407
|
+
|
|
408
|
+
log_debug(
|
|
409
|
+
`onLiveImageError: currentitem: ${currentItem.playerId} was removed`
|
|
410
|
+
);
|
|
411
|
+
|
|
384
412
|
// TODO: ...Maybe player some other item
|
|
385
413
|
}
|
|
386
414
|
|
|
@@ -389,8 +417,8 @@ export class LiveImageManager implements PlayerLifecycleListener {
|
|
|
389
417
|
event: {
|
|
390
418
|
item,
|
|
391
419
|
error,
|
|
392
|
-
playerId:
|
|
393
|
-
primaryPlayerId:
|
|
420
|
+
playerId: currentItem?.playerId,
|
|
421
|
+
primaryPlayerId: currentItem?.playerId,
|
|
394
422
|
},
|
|
395
423
|
});
|
|
396
424
|
};
|
|
@@ -446,12 +474,13 @@ export class LiveImage implements QuickBrickPlayer.SharedPlayerCallBacks {
|
|
|
446
474
|
};
|
|
447
475
|
|
|
448
476
|
readonly playerId: string;
|
|
477
|
+
readonly component: Component;
|
|
449
478
|
|
|
450
479
|
constructor(props: LiveImageProps) {
|
|
451
480
|
this.player = props.player;
|
|
452
481
|
this.setMode = props.setMode;
|
|
453
482
|
this.playerId = this.player.playerId;
|
|
454
|
-
|
|
483
|
+
this.component = props.component;
|
|
455
484
|
this.player.addListener({ id: "live-image", listener: this });
|
|
456
485
|
}
|
|
457
486
|
|