npm - agora-appbuilder-core - Versions diffs - 4.0.0-beta.7 → 4.0.0-beta.9 - Mend

agora-appbuilder-core 4.0.0-beta.7 → 4.0.0-beta.9

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.

Files changed (4) hide show

package/package.json +1 -1
package/template/src/components/DeviceConfigure.tsx +1 -1
package/template/src/pages/video-call/VideoRenderer.tsx +99 -100
package/template/src/utils/useMuteToggleLocal.ts +2 -2

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.9",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [

package/template/src/components/DeviceConfigure.tsx CHANGED Viewed

@@ -239,7 +239,7 @@ const DeviceConfigure: React.FC<Props> = (props: any) => {
     const logTag = 'useEffect[rtc,store]';
-    if (activeDeviceId && deviceList.length !== 0) {
+    if (activeDeviceId) {
       // If stream exists and selected devices are empty, check for devices again
       if (!selectedCam || selectedCam.trim().length == 0) {
         log(logTag, 'cam: Device list populated but No selected cam');

package/template/src/pages/video-call/VideoRenderer.tsx CHANGED Viewed

@@ -35,102 +35,115 @@ const VideoRenderer: React.FC<VideoRendererProps> = ({user, isMax = false}) => {
     currentLayout === getPinnedLayoutName();
   const [videoTileWidth, setVideoTileWidth] = useState(0);
   const [avatarSize, setAvatarSize] = useState(100);
+  const videoMoreMenuRef = useRef(null);
+  const [actionMenuVisible, setActionMenuVisible] = React.useState(false);
   return (
-    <PlatformWrapper isHovered={isHovered} setIsHovered={setIsHovered}>
-      <View
-        onLayout={({
-          nativeEvent: {
-            layout: {x, y, width, height},
-          },
-        }) => {
-          setVideoTileWidth(width);
-          setAvatarSize(Math.floor(width * 0.35));
+    <>
+      <UserActionMenuOptionsOptions
+        actionMenuVisible={actionMenuVisible}
+        setActionMenuVisible={(flag) => {
+          //once user clicks action menu item -> hide the action menu and set parent isHovered false
+          if (!flag) {
+            setIsHovered(false);
+          }
+          setActionMenuVisible(flag);
         }}
-        style={[
-          maxStyle.container,
-          activeSpeaker
-            ? maxStyle.activeContainerStyle
-            : user.video
-            ? maxStyle.noVideoStyle
-            : maxStyle.nonActiveContainerStyle,
-        ]}>
-        {!showReplacePin && !showPinForMe && (
-          <ScreenShareNotice uid={user.uid} isMax={isMax} />
-        )}
-        <NetworkQualityPill user={user} />
-        <MaxVideoView
-          fallback={() => {
-            return FallbackLogo(
-              user?.name,
-              activeSpeaker,
-              (showReplacePin || showPinForMe) && !isMobileUA() ? true : false,
-              isMax,
-              avatarSize,
-            );
-          }}
-          user={user}
-          containerStyle={{
-            width: '100%',
-            height: '100%',
+        user={user}
+        btnRef={videoMoreMenuRef}
+        from={'video-tile'}
+      />
+      <PlatformWrapper isHovered={isHovered} setIsHovered={setIsHovered}>
+        <View
+          onLayout={({
+            nativeEvent: {
+              layout: {x, y, width, height},
+            },
+          }) => {
+            setVideoTileWidth(width);
+            setAvatarSize(Math.floor(width * 0.35));
           }}
-          key={user.uid}
-        />
-        <NameWithMicIcon
-          videoTileWidth={videoTileWidth}
-          user={user}
-          isMax={isMax}
-        />
-        {user.uid !== rtcProps?.screenShareUid &&
-        (isHovered || isMobileUA()) ? (
-          <MoreMenu
-            isMax={isMax}
-            pinnedUid={pinnedUid}
-            user={user}
-            setIsHovered={setIsHovered}
-          />
-        ) : (
-          <></>
-        )}
-        {(showReplacePin || showPinForMe) && !isMobileUA() ? (
-          <IconButton
-            onPress={() => {
-              dispatch({type: 'UserPin', value: [user.uid]});
-            }}
-            containerStyle={maxStyle.replacePinContainer}
-            btnTextProps={{
-              text: showReplacePin ? 'Replace Pin' : 'Pin for me',
-              textColor: $config.VIDEO_AUDIO_TILE_TEXT_COLOR,
-              textStyle: {
-                marginTop: 0,
-                fontWeight: '700',
-                marginLeft: 6,
-              },
+          style={[
+            maxStyle.container,
+            activeSpeaker
+              ? maxStyle.activeContainerStyle
+              : user.video
+              ? maxStyle.noVideoStyle
+              : maxStyle.nonActiveContainerStyle,
+          ]}>
+          {!showReplacePin && !showPinForMe && (
+            <ScreenShareNotice uid={user.uid} isMax={isMax} />
+          )}
+          <NetworkQualityPill user={user} />
+          <MaxVideoView
+            fallback={() => {
+              return FallbackLogo(
+                user?.name,
+                activeSpeaker,
+                (showReplacePin || showPinForMe) && !isMobileUA()
+                  ? true
+                  : false,
+                isMax,
+                avatarSize,
+              );
             }}
-            iconProps={{
-              name: 'pin-filled',
-              iconSize: 20,
-              iconType: 'plain',
-              tintColor: $config.VIDEO_AUDIO_TILE_TEXT_COLOR,
+            user={user}
+            containerStyle={{
+              width: '100%',
+              height: '100%',
             }}
+            key={user.uid}
           />
-        ) : (
-          <></>
-        )}
-      </View>
-    </PlatformWrapper>
+          <NameWithMicIcon
+            videoTileWidth={videoTileWidth}
+            user={user}
+            isMax={isMax}
+          />
+          {user.uid !== rtcProps?.screenShareUid &&
+          (isHovered || actionMenuVisible || isMobileUA()) ? (
+            <MoreMenu
+              videoMoreMenuRef={videoMoreMenuRef}
+              setActionMenuVisible={setActionMenuVisible}
+            />
+          ) : (
+            <></>
+          )}
+          {(showReplacePin || showPinForMe) && !isMobileUA() ? (
+            <IconButton
+              onPress={() => {
+                dispatch({type: 'UserPin', value: [user.uid]});
+              }}
+              containerStyle={maxStyle.replacePinContainer}
+              btnTextProps={{
+                text: showReplacePin ? 'Replace Pin' : 'Pin for me',
+                textColor: $config.VIDEO_AUDIO_TILE_TEXT_COLOR,
+                textStyle: {
+                  marginTop: 0,
+                  fontWeight: '700',
+                  marginLeft: 6,
+                },
+              }}
+              iconProps={{
+                name: 'pin-filled',
+                iconSize: 20,
+                iconType: 'plain',
+                tintColor: $config.VIDEO_AUDIO_TILE_TEXT_COLOR,
+              }}
+            />
+          ) : (
+            <></>
+          )}
+        </View>
+      </PlatformWrapper>
+    </>
   );
 };
 interface MoreMenuProps {
-  user: RenderInterface;
-  isMax: boolean;
-  pinnedUid: UidType;
-  setIsHovered: (isHovered: boolean) => void;
+  setActionMenuVisible: (f: boolean) => void;
+  videoMoreMenuRef: any;
 }
-const MoreMenu = ({user, isMax, pinnedUid, setIsHovered}: MoreMenuProps) => {
-  const videoMoreMenuRef = useRef(null);
+const MoreMenu = ({setActionMenuVisible, videoMoreMenuRef}: MoreMenuProps) => {
   const {activeUids} = useRender();
-  const [actionMenuVisible, setActionMenuVisible] = React.useState(false);
   const {currentLayout} = useLayout();
   const reduceSpace =
     isMobileUA() &&
@@ -139,29 +152,15 @@ const MoreMenu = ({user, isMax, pinnedUid, setIsHovered}: MoreMenuProps) => {
   return (
     <>
       <View
+        ref={videoMoreMenuRef}
+        collapsable={false}
         style={{
           position: 'absolute',
           right: reduceSpace ? 2 : 8,
           bottom: reduceSpace ? 2 : 8,
           zIndex: 999,
         }}>
-        <UserActionMenuOptionsOptions
-          actionMenuVisible={actionMenuVisible}
-          setActionMenuVisible={(flag) => {
-            //once user clicks action menu item -> hide the action menu and set parent isHovered false
-            if (!flag) {
-              setIsHovered(false);
-            }
-            setActionMenuVisible(flag);
-          }}
-          user={user}
-          btnRef={videoMoreMenuRef}
-          from={'video-tile'}
-        />
         <IconButton
-          setRef={(ref) => {
-            videoMoreMenuRef.current = ref;
-          }}
           onPress={() => {
             setActionMenuVisible(true);
           }}

package/template/src/utils/useMuteToggleLocal.ts CHANGED Viewed

@@ -13,7 +13,7 @@ import {useLocalUserInfo, useRtc} from 'customization-api';
 import {useContext, useEffect, useRef, useState} from 'react';
 import {ToggleState} from '../../agora-rn-uikit/src/Contexts/PropsContext';
-import {isWebInternal} from './common';
+import {isMobileUA, isWebInternal} from './common';
 import {AppState} from 'react-native';
 export enum MUTE_LOCAL_TYPE {
@@ -32,7 +32,7 @@ function useMuteToggleLocal() {
   const isCamON = useRef(local.video);
   useEffect(() => {
-    if ($config.AUDIO_ROOM) return;
+    if ($config.AUDIO_ROOM || !isMobileUA()) return;
     const subscription = AppState.addEventListener('change', (nextAppState) => {
       appState.current = nextAppState;
       setAppStateVisible(appState.current);