@applicaster/quick-brick-player 13.0.0-rc.121 → 13.0.0-rc.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "13.0.0-rc.121",
+  "version": "13.0.0-rc.123",
   "description": "Quick Brick Player",
   "main": "./src/index.ts",
   "types": "index.d.ts",
@@ -37,9 +37,9 @@
   "dependencies": {
     "@applicaster/quick-brick-mobile-transport-controls": "13.0.0-rc.120",
     "@applicaster/quick-brick-tv-transport-controls": "13.0.0-rc.56",
-    "@applicaster/zapp-react-native-tvos-app": "13.0.0-rc.121",
-    "@applicaster/zapp-react-native-ui-components": "13.0.0-rc.121",
-    "@applicaster/zapp-react-native-utils": "13.0.0-rc.121",
+    "@applicaster/zapp-react-native-tvos-app": "13.0.0-rc.123",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-rc.123",
+    "@applicaster/zapp-react-native-utils": "13.0.0-rc.123",
     "query-string": "7.1.3",
     "react-native-web-linear-gradient": "1.1.2",
     "shaka-player": "4.3.5",

package/src/Player/AudioLayer/Layout/PlayerImage/AnimatedImage.tsx

@@ -8,6 +8,9 @@ import {
   DURATION_TO_MINIMIZE,
   DURATION_TO_MAXIMIZE,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+import { PlayerAnimationStateT } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/ModalAnimationContext";
+
+import { useChangePlayerState } from "./hooks";
 
 const styles = StyleSheet.create({
   container: {
@@ -21,9 +24,10 @@ type Props = PropsWithChildren<{
   entry: ZappEntry;
   style?: ImageStyle | ImageStyle[];
   imageWidth: number;
+  docked: boolean;
 }>;
 
-export const AnimatedImage = ({ entry, style, imageWidth }: Props) => {
+export const AnimatedImage = ({ entry, style, imageWidth, docked }: Props) => {
   const heightAnim = React.useRef(new Animated.Value(imageWidth)).current;
 
   const source = React.useMemo(
@@ -31,27 +35,40 @@ export const AnimatedImage = ({ entry, style, imageWidth }: Props) => {
     [entry]
   );
 
-  const { playerAnimationState, minimisedHeight } = useModalAnimationContext();
+  const { minimisedHeight } = useModalAnimationContext();
+
+  const changePlayerState$ = useChangePlayerState({ docked });
 
   React.useEffect(() => {
-    if (playerAnimationState === PlayerAnimationStateEnum.minimize) {
-      Animated.timing(heightAnim, {
-        toValue: minimisedHeight,
-        duration: DURATION_TO_MINIMIZE,
-        useNativeDriver: false, // width/height can't use native driver
-      }).start();
+    const subscription = changePlayerState$.subscribe({
+      next: (nextPlayerState: PlayerAnimationStateT) => {
+        if (nextPlayerState === PlayerAnimationStateEnum.minimize) {
+          Animated.timing(heightAnim, {
+            toValue: minimisedHeight,
+            duration: DURATION_TO_MINIMIZE,
+            useNativeDriver: false, // width/height can't use native driver
+          }).start();
+        }
+
+        if (nextPlayerState === PlayerAnimationStateEnum.maximize) {
+          Animated.timing(heightAnim, {
+            toValue: imageWidth,
+            duration: DURATION_TO_MAXIMIZE,
+            useNativeDriver: false, // width/height can't use native driver
+          }).start();
+        }
 
-      return;
-    }
+        if (nextPlayerState === PlayerAnimationStateEnum.appear_as_docked) {
+          // minimize image immediatly
+          heightAnim.setValue(minimisedHeight);
+        }
+      },
+    });
 
-    if (playerAnimationState === PlayerAnimationStateEnum.maximize) {
-      Animated.timing(heightAnim, {
-        toValue: imageWidth,
-        duration: DURATION_TO_MAXIMIZE,
-        useNativeDriver: false, // width/height can't use native driver
-      }).start();
-    }
-  }, [playerAnimationState, imageWidth]);
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [changePlayerState$, minimisedHeight, imageWidth]);
 
   if (!source) return null;
 

package/src/Player/AudioLayer/Layout/PlayerImage/hooks/index.ts

@@ -0,0 +1 @@
+export { useChangePlayerState } from "./useChangePlayerState";

package/src/Player/AudioLayer/Layout/PlayerImage/hooks/useChangePlayerState.ts

@@ -0,0 +1,99 @@
+import * as React from "react";
+import { Subject, Observable } from "rxjs";
+
+import { distinctUntilChanged } from "rxjs/operators";
+import { isNil } from "@applicaster/zapp-react-native-utils/utils";
+import { useRefWithInitialValue } from "@applicaster/zapp-react-native-utils/reactHooks/state/useRefWithInitialValue";
+import { usePrevious } from "@applicaster/zapp-react-native-utils/reactHooks/utils";
+import {
+  useModalAnimationContext,
+  PlayerAnimationStateEnum,
+} from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+import { PlayerAnimationStateT } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation/ModalAnimationContext";
+
+const builder = () => {
+  const changePlayerState$ = new Subject<PlayerAnimationStateT>();
+
+  const emitMaximized = (): void => {
+    changePlayerState$.next(PlayerAnimationStateEnum.maximize);
+  };
+
+  const emitMinimized = (): void => {
+    changePlayerState$.next(PlayerAnimationStateEnum.minimize);
+  };
+
+  const emitAppearInDocked = (): void => {
+    // if audio_player was presented in docked mode
+    changePlayerState$.next(PlayerAnimationStateEnum.appear_as_docked);
+  };
+
+  return {
+    emitMaximized,
+    emitMinimized,
+    emitAppearInDocked,
+    changePlayerState$: changePlayerState$.pipe(distinctUntilChanged()),
+  };
+};
+
+export const useChangePlayerState = ({
+  docked,
+}): Observable<PlayerAnimationStateT> => {
+  const changePlayerStateRef =
+    useRefWithInitialValue<ReturnType<typeof builder>>(builder);
+
+  const { playerAnimationState } = useModalAnimationContext();
+
+  const previousPlayerAnimationState = usePrevious(playerAnimationState);
+
+  React.useEffect(() => {
+    if (
+      !docked &&
+      isNil(previousPlayerAnimationState) &&
+      playerAnimationState === PlayerAnimationStateEnum.minimize
+    ) {
+      changePlayerStateRef.current.emitMinimized();
+
+      return;
+    }
+
+    if (
+      !docked &&
+      isNil(previousPlayerAnimationState) &&
+      playerAnimationState === PlayerAnimationStateEnum.maximize
+    ) {
+      changePlayerStateRef.current.emitMaximized();
+
+      return;
+    }
+
+    if (
+      !docked &&
+      previousPlayerAnimationState === PlayerAnimationStateEnum.drag_scroll &&
+      playerAnimationState === PlayerAnimationStateEnum.maximize
+    ) {
+      changePlayerStateRef.current.emitMaximized();
+
+      return;
+    }
+
+    if (
+      !docked &&
+      previousPlayerAnimationState === PlayerAnimationStateEnum.drag_scroll &&
+      playerAnimationState === PlayerAnimationStateEnum.minimize
+    ) {
+      changePlayerStateRef.current.emitMinimized();
+
+      return;
+    }
+
+    if (
+      docked &&
+      isNil(previousPlayerAnimationState) &&
+      isNil(playerAnimationState)
+    ) {
+      changePlayerStateRef.current.emitAppearInDocked();
+    }
+  }, [previousPlayerAnimationState, playerAnimationState, docked]);
+
+  return changePlayerStateRef.current.changePlayerState$;
+};

package/src/Player/AudioLayer/Layout/PlayerImage/index.tsx

@@ -1,10 +1,13 @@
 import * as React from "react";
+import { LayoutChangeEvent, View } from "react-native";
 
 import {
   AnimationComponent,
   ComponentAnimationType,
   useModalAnimationContext,
 } from "@applicaster/zapp-react-native-ui-components/Components/VideoModal/ModalAnimation";
+import { noop } from "@applicaster/zapp-react-native-utils/functionUtils";
+import { toBooleanWithDefaultTrue } from "@applicaster/zapp-react-native-utils/booleanUtils";
 
 import { AnimatedImage } from "./AnimatedImage";
 import { FlexImage } from "./FlexImage";
@@ -12,7 +15,6 @@ import { FlexImage } from "./FlexImage";
 import { styles } from "./styles";
 import { calculateBorderRadius } from "../../utils";
 import { PlayNextData } from "../types";
-import { LayoutChangeEvent, View } from "react-native";
 
 type Props = {
   entry: ZappEntry;
@@ -29,7 +31,7 @@ type Props = {
   docked: boolean;
   imageWidth?: Option<number>;
   verticalOffset: number;
-  onLayoutImage: (event: LayoutChangeEvent) => void;
+  onLayoutImage?: (event: LayoutChangeEvent) => void;
 };
 
 export const PlayerImage = (props: Props) => {
@@ -40,7 +42,7 @@ export const PlayerImage = (props: Props) => {
     verticalOffset,
     imageWidth,
     configuration,
-    onLayoutImage,
+    onLayoutImage = noop,
   } = props;
 
   const {
@@ -50,8 +52,9 @@ export const PlayerImage = (props: Props) => {
     minimisedHeight,
   } = useModalAnimationContext();
 
-  const isShadowEnabled =
-    configuration?.audio_player_artwork_shadow_enabled ?? true;
+  const isShadowEnabled = toBooleanWithDefaultTrue(
+    configuration?.audio_player_artwork_shadow_enabled
+  );
 
   const shouldShowShadow = !docked && isShadowEnabled;
 
@@ -99,6 +102,7 @@ export const PlayerImage = (props: Props) => {
               entry={entry}
               style={[styles.backgroundImageContainer, { borderRadius }]}
               imageWidth={imageWidth}
+              docked={docked}
             />
           )}
         </View>