feat(prejoin/native): update react-native-video dep and unmount LargeVideo is Prejoin is not focused

3 years ago · e8de9b4d66
parent 6fe353cfa4
commit e8de9b4d66
4 changed files with 29 additions and 45 deletions
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -149,6 +149,8 @@ PODS:
  - nanopb/encode (2.30908.0)
  - ObjectiveDropboxOfficial (6.2.3)
  - PromisesObjC (2.1.1)
+  - PromisesSwift (2.1.1):
+    - PromisesObjC (= 2.1.1)
  - RCT-Folly (2021.06.28.00-v2):
    - boost
    - DoubleConversion
@ -374,10 +376,11 @@ PODS:
    - React-Core
  - react-native-splash-screen (3.3.0):
    - React-Core
-  - react-native-video (5.2.0):
+  - react-native-video (6.0.0-alpha.1):
    - React-Core
-    - react-native-video/Video (= 5.2.0)
-  - react-native-video/Video (5.2.0):
+    - react-native-video/Video (= 6.0.0-alpha.1)
+  - react-native-video/Video (6.0.0-alpha.1):
+    - PromisesSwift
    - React-Core
  - react-native-webrtc (1.100.1):
    - React-Core
@ -569,6 +572,7 @@ SPEC REPOS:
    - nanopb
    - ObjectiveDropboxOfficial
    - PromisesObjC
+    - PromisesSwift

 EXTERNAL SOURCES:
  amplitude-react-native:
@ -716,6 +720,7 @@ SPEC CHECKSUMS:
  nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
  ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53
  PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
+  PromisesSwift: 99fddfe4a0ec88a56486644c0da106694c92a604
  RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8
  RCTRequired: 00581111c53531e39e3c6346ef0d2c0cf52a5a37
  RCTTypeSafety: 07e03ee7800e7dd65cba8e52ad0c2edb06c96604
@ -738,7 +743,7 @@ SPEC CHECKSUMS:
  react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
  react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81
  react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
-  react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28
+  react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b
  react-native-webrtc: 206a0ac12a5633d2ec4605174d7c9f12f0d674b2
  react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
  React-perflogger: 30ab8d6db10e175626069e742eead3ebe8f24fd5
--- a/package-lock.json
+++ b/package-lock.json
@ -107,7 +107,7 @@
        "react-native-svg-transformer": "1.0.0",
        "react-native-tab-view": "3.1.1",
        "react-native-url-polyfill": "1.3.0",
-        "react-native-video": "https://git@github.com/jitsi/react-native-video#4f6dad990d17ce42894df993780b5386a9c11b85",
+        "react-native-video": "https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
        "react-native-watch-connectivity": "1.0.11",
        "react-native-webrtc": "1.100.1",
        "react-native-webview": "11.15.1",
@ -8740,11 +8740,6 @@
      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz",
      "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw=="
    },
-    "node_modules/eme-encryption-scheme-polyfill": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.0.3.tgz",
-      "integrity": "sha512-44CNFMsqzHdKHrzWxlS7xZ8KUHn5XutBqpmCuWzNIynmAyFInHrrD3ozv/RvK9ZhgV6QY6Easx8EWAmxteNodg=="
-    },
    "node_modules/emoji-regex": {
      "version": "6.5.1",
      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.5.1.tgz",
@ -15995,14 +15990,14 @@
      }
    },
    "node_modules/react-native-video": {
-      "version": "5.2.0",
-      "resolved": "git+https://git@github.com/jitsi/react-native-video.git#4f6dad990d17ce42894df993780b5386a9c11b85",
-      "integrity": "sha512-zA5KlpwZfuU9DkI62xkCRcUqvLZG30z5Ac00NZ3gbxqQF60PK/FEGyM8lB5QBsjt0ZlAYgUh2q+snAU7HgN/yQ==",
+      "version": "6.0.0-alpha.1",
+      "resolved": "git+https://git@github.com/react-native-video/react-native-video.git#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
+      "integrity": "sha512-ep7IawO/T8Ch250ZQgpiGmKzWaHLdpSRhXyGZTY4RG2kXmWD0BdIfORj/p1LouPLGjy0k3CXaVYt9a/KI0ZAcA==",
      "license": "MIT",
      "dependencies": {
+        "deprecated-react-native-prop-types": "^2.2.0",
        "keymirror": "^0.1.1",
-        "prop-types": "^15.7.2",
-        "shaka-player": "^2.5.9"
+        "prop-types": "^15.7.2"
      }
    },
    "node_modules/react-native-watch-connectivity": {
@ -17017,14 +17012,6 @@
      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
    },
-    "node_modules/shaka-player": {
-      "version": "2.5.23",
-      "resolved": "https://registry.npmjs.org/shaka-player/-/shaka-player-2.5.23.tgz",
-      "integrity": "sha512-3MC9k0OXJGw8AZ4n/ZNCZS2yDxx+3as5KgH6Tx4Q5TRboTBBCu6dYPI5vp1DxKeyU12MBN1Zcbs7AKzXv2EnCg==",
-      "dependencies": {
-        "eme-encryption-scheme-polyfill": "^2.0.1"
-      }
-    },
    "node_modules/shallow-clone": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
@ -26443,11 +26430,6 @@
      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.71.tgz",
      "integrity": "sha512-Hk61vXXKRb2cd3znPE9F+2pLWdIOmP7GjiTj45y6L3W/lO+hSnUSUhq+6lEaERWBdZOHbk2s3YV5c9xVl3boVw=="
    },
-    "eme-encryption-scheme-polyfill": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/eme-encryption-scheme-polyfill/-/eme-encryption-scheme-polyfill-2.0.3.tgz",
-      "integrity": "sha512-44CNFMsqzHdKHrzWxlS7xZ8KUHn5XutBqpmCuWzNIynmAyFInHrrD3ozv/RvK9ZhgV6QY6Easx8EWAmxteNodg=="
-    },
    "emoji-regex": {
      "version": "6.5.1",
      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.5.1.tgz",
@ -31898,13 +31880,13 @@
      }
    },
    "react-native-video": {
-      "version": "git+https://git@github.com/jitsi/react-native-video.git#4f6dad990d17ce42894df993780b5386a9c11b85",
-      "integrity": "sha512-zA5KlpwZfuU9DkI62xkCRcUqvLZG30z5Ac00NZ3gbxqQF60PK/FEGyM8lB5QBsjt0ZlAYgUh2q+snAU7HgN/yQ==",
-      "from": "react-native-video@https://git@github.com/jitsi/react-native-video#4f6dad990d17ce42894df993780b5386a9c11b85",
+      "version": "git+https://git@github.com/react-native-video/react-native-video.git#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
+      "integrity": "sha512-ep7IawO/T8Ch250ZQgpiGmKzWaHLdpSRhXyGZTY4RG2kXmWD0BdIfORj/p1LouPLGjy0k3CXaVYt9a/KI0ZAcA==",
+      "from": "react-native-video@https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
      "requires": {
+        "deprecated-react-native-prop-types": "^2.2.0",
        "keymirror": "^0.1.1",
-        "prop-types": "^15.7.2",
-        "shaka-player": "^2.5.9"
+        "prop-types": "^15.7.2"
      }
    },
    "react-native-watch-connectivity": {
@ -32670,14 +32652,6 @@
      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
    },
-    "shaka-player": {
-      "version": "2.5.23",
-      "resolved": "https://registry.npmjs.org/shaka-player/-/shaka-player-2.5.23.tgz",
-      "integrity": "sha512-3MC9k0OXJGw8AZ4n/ZNCZS2yDxx+3as5KgH6Tx4Q5TRboTBBCu6dYPI5vp1DxKeyU12MBN1Zcbs7AKzXv2EnCg==",
-      "requires": {
-        "eme-encryption-scheme-polyfill": "^2.0.1"
-      }
-    },
    "shallow-clone": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
--- a/package.json
+++ b/package.json
@ -112,7 +112,7 @@
    "react-native-svg-transformer": "1.0.0",
    "react-native-tab-view": "3.1.1",
    "react-native-url-polyfill": "1.3.0",
-    "react-native-video": "https://git@github.com/jitsi/react-native-video#4f6dad990d17ce42894df993780b5386a9c11b85",
+    "react-native-video": "https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52",
    "react-native-watch-connectivity": "1.0.11",
    "react-native-webrtc": "1.100.1",
    "react-native-webview": "11.15.1",
--- a/react/features/prejoin/components/Prejoin.native.tsx
+++ b/react/features/prejoin/components/Prejoin.native.tsx
@ -1,4 +1,5 @@
 /* eslint-disable lines-around-comment */
+import { useIsFocused } from '@react-navigation/native';
 import React, { useCallback, useEffect, useLayoutEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
@ -58,6 +59,7 @@ import styles from './styles';

 const Prejoin: React.FC<PrejoinProps> = ({ navigation }: PrejoinProps) => {
    const dispatch = useDispatch();
+    const isFocused = useIsFocused();
    const { t } = useTranslation();
    const aspectRatio = useSelector(
        (state: any) => state['features/base/responsive-ui']?.aspectRatio
@ -148,9 +150,12 @@ const Prejoin: React.FC<PrejoinProps> = ({ navigation }: PrejoinProps) => {
            safeAreaInsets = { [ 'left' ] }
            style = { contentWrapperStyles }>
            <BrandingImageBackground />
-            <View style = { largeVideoContainerStyles }>
+            {
+                isFocused
+                && <View style = { largeVideoContainerStyles }>
                    <LargeVideo />
                </View>
+            }
            <View style = { contentContainerStyles }>
                <View style = { styles.formWrapper as StyleProp<ViewStyle> }>
                    <Text style = { styles.preJoinTitle as StyleProp<TextStyle> }>