@applicaster/zapp-react-native-ui-components 12.0.0-alpha.5251355865 → 12.0.0-alpha.5350212300
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/BaseFocusable/index.tsx +1 -1
- package/Components/Cell/Cell.tsx +7 -3
- package/Components/Cell/CellWithFocusable.tsx +38 -19
- package/Components/Cell/TvOSCellComponent.tsx +2 -2
- package/Components/ErrorScreen/index.tsx +1 -1
- package/Components/FocusableCell/index.tsx +7 -7
- package/Components/FocusableGroup/index.tsx +1 -0
- package/Components/FocusableList/FocusableChild.ts +24 -14
- package/Components/FocusableList/FocusableItem.tsx +1 -1
- package/Components/FocusableList/FocusableListItemWrapper.tsx +76 -0
- package/Components/FocusableList/hooks/useCellState.android.ts +3 -1
- package/Components/FocusableList/index.tsx +26 -25
- package/Components/GeneralContentScreen/GeneralContentScreen.tsx +6 -3
- package/Components/GeneralContentScreen/utils/__tests__/useCurationAPI.test.js +13 -6
- package/Components/GeneralContentScreen/utils/useCurationAPI.ts +1 -1
- package/Components/HandlePlayable/HandlePlayable.tsx +3 -0
- package/Components/Image/Image.android.tsx +3 -25
- package/Components/Image/Image.tsx +18 -2
- package/Components/Image/utils/index.ts +39 -0
- package/Components/Layout/TV/ScreenLayoutContextProvider.tsx +2 -2
- package/Components/Layout/TV/__tests__/__snapshots__/index.test.tsx.snap +41 -1
- package/Components/Layout/TV/index.tsx +124 -25
- package/Components/MasterCell/DefaultComponents/Image/Image.android.tsx +9 -26
- package/Components/MasterCell/DefaultComponents/Image/Image.ios.tsx +5 -3
- package/Components/MasterCell/DefaultComponents/Image/hooks/useImageSize.ts +65 -0
- package/Components/MasterCell/DefaultComponents/LiveImage/index.tsx +17 -2
- package/Components/MasterCell/DefaultComponents/SecondaryImage/Image.tsx +3 -2
- package/Components/MasterCell/DefaultComponents/Toggle.tsx +5 -1
- package/Components/MasterCell/DefaultComponents/__tests__/image.test.js +1 -1
- package/Components/MasterCell/utils/index.ts +16 -5
- package/Components/PlayerContainer/PlayerContainer.tsx +63 -31
- package/Components/PlayerContainer/ProgramInfo/index.tsx +3 -1
- package/Components/PlayerImageBackground/index.tsx +34 -8
- package/Components/River/ComponentsMap/ComponentsMap.tsx +85 -22
- package/Components/River/TV/River.tsx +2 -3
- package/Components/River/__tests__/componentsMap.test.js +7 -0
- package/Components/River/useScreenConfiguration.ts +2 -2
- package/Components/RouteManager/index.tsx +2 -2
- package/Components/Screen/TV/index.web.tsx +159 -0
- package/Components/Screen/__tests__/Screen.test.tsx +5 -1
- package/Components/Screen/__tests__/__snapshots__/Screen.test.tsx.snap +14 -0
- package/Components/Screen/index.tsx +49 -29
- package/Components/ScreenResolver/index.tsx +3 -1
- package/Components/Tabs/TV/styles.ts +1 -1
- package/Components/VideoLive/PlayerLiveImageComponent.tsx +31 -28
- package/Components/VideoLive/__tests__/PlayerLiveImageComponent.test.tsx +45 -3
- package/Components/VideoLive/__tests__/__snapshots__/PlayerLiveImageComponent.test.tsx.snap +18 -28
- package/Components/VideoModal/ModalAnimation/AnimatedPlayerModalWrapper.tsx +78 -0
- package/Components/VideoModal/ModalAnimation/AnimatedScrollModal.tsx +342 -0
- package/Components/VideoModal/ModalAnimation/AnimatedVideoPlayerComponent.tsx +151 -0
- package/Components/VideoModal/ModalAnimation/AnimationComponent.tsx +438 -0
- package/Components/VideoModal/ModalAnimation/ModalAnimationContext.tsx +143 -0
- package/Components/VideoModal/ModalAnimation/index.ts +15 -0
- package/Components/VideoModal/ModalAnimation/utils.ts +299 -0
- package/Components/VideoModal/PlayerWrapper.tsx +64 -41
- package/Components/VideoModal/VideoModal.tsx +8 -25
- package/Components/VideoModal/__tests__/PlayerWrapper.test.tsx +6 -1
- package/Components/VideoModal/__tests__/__snapshots__/PlayerWrapper.test.tsx.snap +151 -119
- package/Components/VideoModal/utils.ts +3 -3
- package/Components/Viewport/ViewportTracker/ViewportTracker.tsx +1 -1
- package/Components/Viewport/ViewportTracker/index.tsx +1 -0
- package/Components/Viewport/utils.js +1 -1
- package/Components/ZappUIComponent/index.tsx +22 -12
- package/Contexts/MenuToggleContext/{index.js → index.ts} +16 -0
- package/Contexts/ScreenContext/__tests__/__snapshots__/index.test.tsx.snap +3 -0
- package/Contexts/ScreenContext/__tests__/index.test.tsx +27 -0
- package/Contexts/ScreenContext/index.tsx +94 -28
- package/Contexts/ZappPipesContext/ZappPipesEntryContext.ts +1 -1
- package/Decorators/ComponentsMapWrapper/withComponentsMapProvider.tsx +7 -2
- package/package.json +5 -5
- package/Components/VideoModal/hooks/usePosition.ts +0 -50
- /package/Contexts/{index.js → index.ts} +0 -0
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import FastImage, { Source } from "@applicaster/react-native-fast-image";
|
|
2
|
+
import { useMemo } from "react";
|
|
3
|
+
import { ImageRequireSource } from "react-native";
|
|
4
|
+
|
|
5
|
+
function getSourceCache(cache: Source["cache"]) {
|
|
6
|
+
return cache || FastImage.cacheControl.web;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export const useImageSource = (source?: Source | ImageRequireSource) => {
|
|
10
|
+
return useMemo(() => {
|
|
11
|
+
if (source) {
|
|
12
|
+
if (typeof source === "number") {
|
|
13
|
+
return source;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
return {
|
|
17
|
+
uri: source.uri,
|
|
18
|
+
headers: source.headers,
|
|
19
|
+
priority: source.priority,
|
|
20
|
+
cache: getSourceCache(source?.cache),
|
|
21
|
+
maxWidth: source.maxWidth,
|
|
22
|
+
maxHeight: source.maxHeight,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
return undefined;
|
|
27
|
+
}, [
|
|
28
|
+
...(typeof source === "object"
|
|
29
|
+
? [
|
|
30
|
+
source?.uri,
|
|
31
|
+
source?.priority,
|
|
32
|
+
source?.cache,
|
|
33
|
+
source?.headers,
|
|
34
|
+
source?.maxWidth,
|
|
35
|
+
source?.maxHeight,
|
|
36
|
+
]
|
|
37
|
+
: []),
|
|
38
|
+
]);
|
|
39
|
+
};
|
|
@@ -60,7 +60,7 @@ export function ScreenLayoutContextProvider(props: {
|
|
|
60
60
|
initialState
|
|
61
61
|
);
|
|
62
62
|
|
|
63
|
-
const
|
|
63
|
+
const screenLayoutValue = React.useMemo(
|
|
64
64
|
() => ({
|
|
65
65
|
...screenLayout,
|
|
66
66
|
setScreenLayout,
|
|
@@ -69,7 +69,7 @@ export function ScreenLayoutContextProvider(props: {
|
|
|
69
69
|
);
|
|
70
70
|
|
|
71
71
|
return (
|
|
72
|
-
<ScreenLayoutContext.Provider value={
|
|
72
|
+
<ScreenLayoutContext.Provider value={screenLayoutValue}>
|
|
73
73
|
{props.children}
|
|
74
74
|
</ScreenLayoutContext.Provider>
|
|
75
75
|
);
|
|
@@ -14,6 +14,46 @@ exports[`Layout TV renders 1`] = `
|
|
|
14
14
|
<View
|
|
15
15
|
backgroundImageUrl="http://applicaster.com"
|
|
16
16
|
testID="background-component"
|
|
17
|
-
|
|
17
|
+
>
|
|
18
|
+
<View
|
|
19
|
+
style={
|
|
20
|
+
Array [
|
|
21
|
+
Object {
|
|
22
|
+
"position": "absolute",
|
|
23
|
+
"top": 0,
|
|
24
|
+
"width": 1920,
|
|
25
|
+
"zIndex": 10,
|
|
26
|
+
},
|
|
27
|
+
Object {
|
|
28
|
+
"maxHeight": 10,
|
|
29
|
+
},
|
|
30
|
+
]
|
|
31
|
+
}
|
|
32
|
+
testID="nav-bar-container"
|
|
33
|
+
>
|
|
34
|
+
<View
|
|
35
|
+
isVisible={true}
|
|
36
|
+
menuPlugin={
|
|
37
|
+
Object {
|
|
38
|
+
"module": [Function],
|
|
39
|
+
"name": "resolved-menu-plug",
|
|
40
|
+
"type": "menu",
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
navigationProps={
|
|
44
|
+
Object {
|
|
45
|
+
"assets": undefined,
|
|
46
|
+
"home": undefined,
|
|
47
|
+
"nav_items": undefined,
|
|
48
|
+
"rules": undefined,
|
|
49
|
+
"selected": undefined,
|
|
50
|
+
"styles": undefined,
|
|
51
|
+
"title": "",
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
testID="nav-bar-component"
|
|
55
|
+
/>
|
|
56
|
+
</View>
|
|
57
|
+
</View>
|
|
18
58
|
</View>
|
|
19
59
|
`;
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import * as R from "ramda";
|
|
3
|
+
import { View, StyleSheet } from "react-native";
|
|
3
4
|
import { usePickFromState } from "@applicaster/zapp-react-native-redux/hooks";
|
|
4
5
|
import { useNavigation } from "@applicaster/zapp-react-native-utils/reactHooks/navigation";
|
|
5
6
|
import { useTheme } from "@applicaster/zapp-react-native-utils/theme";
|
|
7
|
+
import { useNavbarState } from "@applicaster/zapp-react-native-utils/reactHooks/screen/useScreenContext";
|
|
8
|
+
import { isApplePlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
6
9
|
|
|
7
10
|
import {
|
|
8
11
|
getNavigationProps,
|
|
12
|
+
getPathAttributes,
|
|
9
13
|
resolveNavigationPlugin,
|
|
10
14
|
routeIsPlayerScreen,
|
|
11
15
|
} from "@applicaster/zapp-react-native-utils/navigationUtils";
|
|
@@ -17,9 +21,25 @@ import { ScreenContainer } from "./ScreenContainer";
|
|
|
17
21
|
import { TransitionOverlay } from "./TransitionOverlay";
|
|
18
22
|
|
|
19
23
|
import { ScreenLayoutContextProvider } from "./ScreenLayoutContextProvider";
|
|
20
|
-
import { isApplePlatform } from "@applicaster/zapp-react-native-utils/reactUtils";
|
|
21
24
|
import { PathnameContext } from "../../../Contexts/PathnameContext";
|
|
22
|
-
|
|
25
|
+
|
|
26
|
+
import { FocusableGroup } from "../../FocusableGroup";
|
|
27
|
+
import { Screen } from "../../Screen/TV/index.web";
|
|
28
|
+
|
|
29
|
+
export const ScreenDataContext = React.createContext(null);
|
|
30
|
+
|
|
31
|
+
const styles = StyleSheet.create({
|
|
32
|
+
container: {
|
|
33
|
+
position: "absolute",
|
|
34
|
+
width: 1920,
|
|
35
|
+
height: 1080,
|
|
36
|
+
backgroundColor: "black",
|
|
37
|
+
// opacity: 0.5,
|
|
38
|
+
|
|
39
|
+
borderWidth: 4,
|
|
40
|
+
borderColor: "magenta",
|
|
41
|
+
},
|
|
42
|
+
});
|
|
23
43
|
|
|
24
44
|
type Components = {
|
|
25
45
|
NavBar: React.ComponentType<any>;
|
|
@@ -27,16 +47,73 @@ type Components = {
|
|
|
27
47
|
};
|
|
28
48
|
|
|
29
49
|
type ComponentsExtraProps = {
|
|
30
|
-
Background?: Record<string, any>;
|
|
31
50
|
NavBar?: Record<string, any>;
|
|
51
|
+
Background?: Record<string, any>;
|
|
32
52
|
};
|
|
33
53
|
|
|
34
54
|
type Props = {
|
|
35
55
|
Components: Components;
|
|
36
|
-
|
|
37
|
-
|
|
56
|
+
componentsExtraProps?: ComponentsExtraProps;
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
const StackNavigator = ({ Components }: Props) => {
|
|
60
|
+
// @ts-ignore
|
|
61
|
+
const { mainStack, currentRoute } = useNavigation();
|
|
62
|
+
|
|
63
|
+
// console.log("debug_2", "DEBUG", { mainStack });
|
|
64
|
+
|
|
65
|
+
const renderScreen = ({ route, action, key, state }, index) => {
|
|
66
|
+
const pathAttributes = getPathAttributes({ pathname: route });
|
|
67
|
+
|
|
68
|
+
if (R.isEmpty(pathAttributes)) {
|
|
69
|
+
return null;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
// console.log("debug_2", "StackNavigator - renderScreen", {
|
|
73
|
+
// index,
|
|
74
|
+
// route,
|
|
75
|
+
// state,
|
|
76
|
+
// key,
|
|
77
|
+
// action,
|
|
78
|
+
// });
|
|
79
|
+
|
|
80
|
+
const id = `${route}`;
|
|
81
|
+
|
|
82
|
+
return (
|
|
83
|
+
<FocusableGroup
|
|
84
|
+
id={id}
|
|
85
|
+
preferredFocus={route === currentRoute}
|
|
86
|
+
excludeFromFocusSearching
|
|
87
|
+
key={id}
|
|
88
|
+
>
|
|
89
|
+
<View style={styles.container}>
|
|
90
|
+
<ScreenDataContext.Provider value={state}>
|
|
91
|
+
<PathnameContext.Provider value={route}>
|
|
92
|
+
<Screen route={route} Components={Components} />
|
|
93
|
+
</PathnameContext.Provider>
|
|
94
|
+
</ScreenDataContext.Provider>
|
|
95
|
+
</View>
|
|
96
|
+
</FocusableGroup>
|
|
97
|
+
);
|
|
98
|
+
};
|
|
99
|
+
|
|
100
|
+
return mainStack.map(renderScreen);
|
|
101
|
+
};
|
|
102
|
+
|
|
103
|
+
const TransitionerTV = ({ componentsExtraProps, Components }: Props) => {
|
|
104
|
+
return (
|
|
105
|
+
<>
|
|
106
|
+
<ScreenLayoutContextProvider>
|
|
107
|
+
<StackNavigator
|
|
108
|
+
componentsExtraProps={componentsExtraProps}
|
|
109
|
+
Components={Components}
|
|
110
|
+
/>
|
|
111
|
+
</ScreenLayoutContextProvider>
|
|
112
|
+
</>
|
|
113
|
+
);
|
|
38
114
|
};
|
|
39
115
|
|
|
116
|
+
// @ts-ignore
|
|
40
117
|
const Layout = ({ Components, ComponentsExtraProps, children }: Props) => {
|
|
41
118
|
const navigator = useNavigation();
|
|
42
119
|
const theme = useTheme();
|
|
@@ -98,32 +175,54 @@ const Layout = ({ Components, ComponentsExtraProps, children }: Props) => {
|
|
|
98
175
|
}
|
|
99
176
|
|
|
100
177
|
return (
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
>
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
178
|
+
// @ts-ignore
|
|
179
|
+
<TransitionerTV
|
|
180
|
+
componentsExtraProps={ComponentsExtraProps}
|
|
181
|
+
Components={Components}
|
|
182
|
+
>
|
|
183
|
+
<LayoutContainer>
|
|
184
|
+
<ScreenLayoutContextProvider>
|
|
185
|
+
<Components.Background
|
|
186
|
+
backgroundColor={backgroundColor}
|
|
187
|
+
backgroundImageUrl={backgroundImageUrl}
|
|
188
|
+
{...R.omit(["ref"])(ComponentsExtraProps?.Background)}
|
|
189
|
+
>
|
|
190
|
+
{!isTVOS ? navBarContainer : null}
|
|
191
|
+
{navBarReady ? (
|
|
192
|
+
/**
|
|
111
193
|
Need to re-mount this component on each navigation event
|
|
112
194
|
It's a hack to work around the fact that we don't support
|
|
113
195
|
correct screen rendering in our navigator (shared currentRoute state)
|
|
114
196
|
**/
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
197
|
+
<PathnameContext.Provider value={navigator.currentRoute}>
|
|
198
|
+
<ScreenContainer>{children}</ScreenContainer>
|
|
199
|
+
</PathnameContext.Provider>
|
|
200
|
+
) : null}
|
|
201
|
+
{/** Render NavBarContainer over ScreenContainer to let tvOS native
|
|
120
202
|
focus manager works correctly to focus nav bar items first **/}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
203
|
+
{isTVOS ? navBarContainer : null}
|
|
204
|
+
<TransitionOverlay />
|
|
205
|
+
</Components.Background>
|
|
206
|
+
</ScreenLayoutContextProvider>
|
|
207
|
+
</LayoutContainer>
|
|
208
|
+
</TransitionerTV>
|
|
126
209
|
);
|
|
127
210
|
};
|
|
128
211
|
|
|
129
212
|
export default Layout;
|
|
213
|
+
|
|
214
|
+
/// Transitioner:
|
|
215
|
+
/*
|
|
216
|
+
Component: Transitioner
|
|
217
|
+
Responsibilities:
|
|
218
|
+
- Transitione between screens.
|
|
219
|
+
Tehere is no transition on Tv so no need for transitioner.
|
|
220
|
+
|
|
221
|
+
Component: StackNavigator
|
|
222
|
+
Responsibilities:
|
|
223
|
+
- Render the screens in the stack.
|
|
224
|
+
- Render the NavBar? I guess navbar should be part of the screen
|
|
225
|
+
- Render the screen.
|
|
226
|
+
|
|
227
|
+
Q
|
|
228
|
+
*/
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import { ImageStyle, View } from "react-native";
|
|
3
3
|
import * as R from "ramda";
|
|
4
|
-
import
|
|
4
|
+
import { QBImage } from "@applicaster/zapp-react-native-ui-components/Components/Image";
|
|
5
5
|
import { toBooleanWithDefaultFalse } from "@applicaster/zapp-react-native-utils/booleanUtils";
|
|
6
|
-
import { toFiniteNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
|
|
7
6
|
|
|
8
7
|
import { useImageSourceWithDefault, useCheckFailedUri } from "./hooks";
|
|
8
|
+
import useImageSize from "./hooks/useImageSize";
|
|
9
9
|
|
|
10
10
|
type Source = {
|
|
11
11
|
uri: string;
|
|
@@ -19,32 +19,13 @@ type Props = Record<string, any> & {
|
|
|
19
19
|
withDimensions: (source: Source) => Source;
|
|
20
20
|
};
|
|
21
21
|
|
|
22
|
-
const MemoizedImage = React.memo(
|
|
23
|
-
|
|
24
|
-
const normalize = Math.ceil;
|
|
22
|
+
const MemoizedImage = React.memo(QBImage, R.equals);
|
|
25
23
|
|
|
26
24
|
const isValidExternalSource = (source): boolean =>
|
|
27
25
|
source?.uri?.startsWith("http") ||
|
|
28
26
|
source?.uri?.startsWith("data:image") ||
|
|
29
27
|
source?.uri?.startsWith("file://");
|
|
30
28
|
|
|
31
|
-
const isValidSize = (size: unknown): boolean =>
|
|
32
|
-
toFiniteNumberWithDefault(0, size) > 0;
|
|
33
|
-
|
|
34
|
-
const getSourceWithMaxSizes = (applyMaxSize, style, source) => {
|
|
35
|
-
const { width, height } = style;
|
|
36
|
-
|
|
37
|
-
if (!applyMaxSize || !isValidSize(width) || !isValidSize(height)) {
|
|
38
|
-
return source;
|
|
39
|
-
}
|
|
40
|
-
|
|
41
|
-
return {
|
|
42
|
-
...source,
|
|
43
|
-
maxWidth: normalize(width),
|
|
44
|
-
maxHeight: normalize(height),
|
|
45
|
-
};
|
|
46
|
-
};
|
|
47
|
-
|
|
48
29
|
export default function Image({
|
|
49
30
|
style,
|
|
50
31
|
uri,
|
|
@@ -82,10 +63,12 @@ export default function Image({
|
|
|
82
63
|
|
|
83
64
|
const applyMaxSize = toBooleanWithDefaultFalse(otherProps?.applyMaxSize);
|
|
84
65
|
|
|
85
|
-
const sourceWithMaxSizes =
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
66
|
+
const sourceWithMaxSizes = useImageSize({
|
|
67
|
+
style,
|
|
68
|
+
applyMaxSize,
|
|
69
|
+
source,
|
|
70
|
+
withDimensions,
|
|
71
|
+
});
|
|
89
72
|
|
|
90
73
|
if (isFailedToLoadUri(uri) || !isValidExternalSource(source)) {
|
|
91
74
|
return <View style={style} />;
|
|
@@ -43,14 +43,16 @@ function Image({
|
|
|
43
43
|
[source, error]
|
|
44
44
|
);
|
|
45
45
|
|
|
46
|
+
const _source = shouldRenderImg
|
|
47
|
+
? withDimensions(source)
|
|
48
|
+
: defaultPlaceHolderImage;
|
|
49
|
+
|
|
46
50
|
return (
|
|
47
51
|
// @ts-ignore
|
|
48
52
|
<MemoizedImage
|
|
49
53
|
style={style as ImageStyle}
|
|
50
54
|
onError={() => setErrorState(true)}
|
|
51
|
-
source={
|
|
52
|
-
shouldRenderImg ? withDimensions(source) : defaultPlaceHolderImage
|
|
53
|
-
}
|
|
55
|
+
source={_source?.uri ? _source : undefined}
|
|
54
56
|
{...R.omit(["source"], otherProps)}
|
|
55
57
|
/>
|
|
56
58
|
);
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { ImageStyle } from "react-native";
|
|
3
|
+
import { toFiniteNumberWithDefault } from "@applicaster/zapp-react-native-utils/numberUtils";
|
|
4
|
+
|
|
5
|
+
type Source = {
|
|
6
|
+
uri: string;
|
|
7
|
+
};
|
|
8
|
+
|
|
9
|
+
type Props = Record<string, any> & {
|
|
10
|
+
style: ImageStyle;
|
|
11
|
+
uri?: string;
|
|
12
|
+
placeholderImage?: string;
|
|
13
|
+
entry?: ZappEntry | ZappFeed;
|
|
14
|
+
withDimensions: (source: Source) => Source;
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
const normalize = Math.ceil;
|
|
18
|
+
|
|
19
|
+
const isValidSize = (size: unknown): boolean =>
|
|
20
|
+
toFiniteNumberWithDefault(0, size) > 0;
|
|
21
|
+
|
|
22
|
+
type WidthDimensions = { aspectRatio?: number; width: number; height?: number };
|
|
23
|
+
type HeightDimensions = {
|
|
24
|
+
aspectRatio?: number;
|
|
25
|
+
width?: number;
|
|
26
|
+
height: number;
|
|
27
|
+
};
|
|
28
|
+
type FullDimensions = { aspectRatio?: number; width: number; height: number };
|
|
29
|
+
type Dimensions = WidthDimensions | HeightDimensions | FullDimensions;
|
|
30
|
+
|
|
31
|
+
const calculateDimensions = ({ aspectRatio, width, height }: Dimensions) => {
|
|
32
|
+
if (aspectRatio) {
|
|
33
|
+
return {
|
|
34
|
+
width: width || height * aspectRatio,
|
|
35
|
+
height: height || width / aspectRatio,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
return { width, height };
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
const getSourceWithMaxSizes = (applyMaxSize, style, source) => {
|
|
43
|
+
const { width, height } = calculateDimensions(style);
|
|
44
|
+
|
|
45
|
+
if (!applyMaxSize || !isValidSize(width) || !isValidSize(height)) {
|
|
46
|
+
return source;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
return {
|
|
50
|
+
...source,
|
|
51
|
+
maxWidth: normalize(width),
|
|
52
|
+
maxHeight: normalize(height),
|
|
53
|
+
};
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
export default function useImageSize(props: Props) {
|
|
57
|
+
const { style, applyMaxSize, source, withDimensions } = props;
|
|
58
|
+
|
|
59
|
+
const sourceWithMaxSizes = React.useMemo(
|
|
60
|
+
() => withDimensions(getSourceWithMaxSizes(applyMaxSize, style, source)),
|
|
61
|
+
[applyMaxSize, style?.height, style?.width, source?.uri, withDimensions]
|
|
62
|
+
);
|
|
63
|
+
|
|
64
|
+
return sourceWithMaxSizes;
|
|
65
|
+
}
|
|
@@ -18,6 +18,7 @@ type LiveImageProps = {
|
|
|
18
18
|
imageKey?: string;
|
|
19
19
|
state: "focused" | "unfocused" | "selected";
|
|
20
20
|
audio_muted_by_default?: boolean;
|
|
21
|
+
uri: string; // cover image url
|
|
21
22
|
};
|
|
22
23
|
|
|
23
24
|
const DEFAULT_PLAYER_IDENTIFIER = "QuickBrickPlayerPlugin";
|
|
@@ -176,10 +177,23 @@ const getPlayerConfig = (player_screen_id, actionIdentifier) => {
|
|
|
176
177
|
const positionAbsolute: ViewStyle = { position: "absolute" };
|
|
177
178
|
|
|
178
179
|
const LiveImageComponent = (props: LiveImageProps) => {
|
|
179
|
-
const {
|
|
180
|
+
const {
|
|
181
|
+
item,
|
|
182
|
+
style: componentStyle,
|
|
183
|
+
cellUUID,
|
|
184
|
+
imageKey,
|
|
185
|
+
actionIdentifier,
|
|
186
|
+
state,
|
|
187
|
+
} = props;
|
|
180
188
|
|
|
181
189
|
const component = useUIComponentContext();
|
|
182
190
|
|
|
191
|
+
// Fix for blinking on state change
|
|
192
|
+
const style = React.useMemo(
|
|
193
|
+
() => ({ ...componentStyle, backgroundColor: "transparent" }),
|
|
194
|
+
[componentStyle]
|
|
195
|
+
);
|
|
196
|
+
|
|
183
197
|
const componentType = React.useMemo(
|
|
184
198
|
() => getPropComponentType(component),
|
|
185
199
|
[component?.id]
|
|
@@ -209,10 +223,11 @@ const LiveImageComponent = (props: LiveImageProps) => {
|
|
|
209
223
|
|
|
210
224
|
return (
|
|
211
225
|
<>
|
|
212
|
-
<Image {...props} />
|
|
226
|
+
<Image {...props} applyMaxSize />
|
|
213
227
|
{isShouldRender && (
|
|
214
228
|
<View style={[style, positionAbsolute]}>
|
|
215
229
|
<PlayerLiveImage
|
|
230
|
+
uri={props.uri}
|
|
216
231
|
playerId={cellUUID}
|
|
217
232
|
playerPluginId={playerPluginId}
|
|
218
233
|
screenConfig={screenConfig}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import * as React from "react";
|
|
2
2
|
import { isNil } from "ramda";
|
|
3
|
-
import {
|
|
3
|
+
import { ImageStyle, View } from "react-native";
|
|
4
4
|
import {
|
|
5
5
|
FIT_POSITION,
|
|
6
6
|
IMAGE_SIZING_FIT,
|
|
7
7
|
IMAGE_SIZING_FILL,
|
|
8
8
|
} from "@applicaster/zapp-react-native-utils/manifestUtils/secondaryImage";
|
|
9
|
+
import { QBImage as Image } from "@applicaster/zapp-react-native-ui-components/Components/Image";
|
|
9
10
|
|
|
10
11
|
import { useGetImageDimensions } from "./hooks";
|
|
11
12
|
import {
|
|
@@ -59,7 +60,7 @@ const SecondaryImageComponent = (props: Props) => {
|
|
|
59
60
|
|
|
60
61
|
return (
|
|
61
62
|
<View style={style} onLayout={onAsyncRender}>
|
|
62
|
-
<
|
|
63
|
+
<Image
|
|
63
64
|
{...props}
|
|
64
65
|
source={{ uri }}
|
|
65
66
|
style={{
|
|
@@ -23,7 +23,11 @@ export const Toggle = (props: Props) => {
|
|
|
23
23
|
iosBackgroundColor,
|
|
24
24
|
} = style;
|
|
25
25
|
|
|
26
|
-
const isSelected = React.useMemo(
|
|
26
|
+
const isSelected = React.useMemo(
|
|
27
|
+
() => cellState === "selected",
|
|
28
|
+
[item?.id, cellState]
|
|
29
|
+
);
|
|
30
|
+
|
|
27
31
|
const actionContext = useActions(action?.identifier);
|
|
28
32
|
|
|
29
33
|
const [actionState, setActionState] = useState(
|
|
@@ -125,13 +125,24 @@ export const useFilterChildren = <
|
|
|
125
125
|
|
|
126
126
|
const filteredChildren = children.filter((child) => {
|
|
127
127
|
const item = child.props.item;
|
|
128
|
-
const
|
|
128
|
+
const actionIdentifier = child.props.pluginIdentifier;
|
|
129
|
+
const action = actions.actions[actionIdentifier];
|
|
130
|
+
|
|
129
131
|
// context value of specific plugin
|
|
130
|
-
|
|
132
|
+
if (action?.module && action.module.context) {
|
|
133
|
+
const currentValue = action.module.context._currentValue;
|
|
134
|
+
|
|
135
|
+
return currentValue?.isActionAvailable
|
|
136
|
+
? currentValue.isActionAvailable(item)
|
|
137
|
+
: true;
|
|
138
|
+
}
|
|
131
139
|
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
:
|
|
140
|
+
masterCellLogger.error({
|
|
141
|
+
message: `Action plugin for ${actionIdentifier} could not be found, check the configuration of your action button`,
|
|
142
|
+
data: { item, action: child.props.pluginIdentifier },
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
return false;
|
|
135
146
|
});
|
|
136
147
|
|
|
137
148
|
return filteredChildren;
|