agora-ui-foundation 3.7.2 → 3.7.3

package/lib/components/participants/attendee/index.d.ts

@@ -54,11 +54,13 @@ export interface ParticipantsMoreActionsProps {
     onParticipantsButtonClick: (action: ParticipantActionType, userId: string) => void;
     hasPinnedStream: boolean;
     hideActions: string[];
+    isLocalCameraInSecondaryWindow: boolean;
 }
 export interface IFcrParticipantItemProps {
     user: User;
     hasPinnedStream: boolean;
     hideActions?: string[];
     onParticipantsButtonClick?: (action: ParticipantActionType, userId: string) => void;
+    isLocalCameraInSecondaryWindow: boolean;
 }
 export declare const FcrParticipant: FC<IFcrParticipantItemProps>;

package/lib/components/participants/attendee/index.js

@@ -72,7 +72,8 @@ var FcrParticipant = exports.FcrParticipant = function FcrParticipant(props) {
     _props$onParticipants = props.onParticipantsButtonClick,
     onParticipantsButtonClick = _props$onParticipants === void 0 ? function () {} : _props$onParticipants,
     _props$hideActions = props.hideActions,
-    hideActions = _props$hideActions === void 0 ? [] : _props$hideActions;
+    hideActions = _props$hideActions === void 0 ? [] : _props$hideActions,
+    isLocalCameraInSecondaryWindow = props.isLocalCameraInSecondaryWindow;
   var userId = user.userId,
     _user$userName = user.userName,
     userName = _user$userName === void 0 ? '' : _user$userName,
@@ -144,6 +145,7 @@ var FcrParticipant = exports.FcrParticipant = function FcrParticipant(props) {
             hideActions: hideActions,
             hasPinnedStream: hasPinnedStream,
             onParticipantsButtonClick: onParticipantsButtonClick,
+            isLocalCameraInSecondaryWindow: isLocalCameraInSecondaryWindow,
             user: user
           })
         }),

package/lib/components/participants/index.d.ts

@@ -12,5 +12,6 @@ export interface ParticipantProps {
     searchText?: string;
     onInvite?: () => void;
     hasPinnedStream: boolean;
+    isLocalCameraInSecondaryWindow: boolean;
 }
 export declare const FcrParticipants: (props: ParticipantProps) => import("react/jsx-runtime").JSX.Element;

package/lib/components/participants/index.js

@@ -36,7 +36,7 @@ var cache = new _reactVirtualized.CellMeasurerCache({
   fixedWidth: true,
   defaultHeight: 52
 });
-var userRowRenderer = function userRowRenderer(userList, userRenderer, hasPinnedStream, toggleParticipantAction) {
+var userRowRenderer = function userRowRenderer(userList, userRenderer, hasPinnedStream, toggleParticipantAction, isLocalCameraInSecondaryWindow) {
   return function (renderProps) {
     var key = renderProps.key,
       parent = renderProps.parent,
@@ -57,7 +57,8 @@ var userRowRenderer = function userRowRenderer(userList, userRenderer, hasPinned
           children: userRenderer ? userRenderer(userList[index]) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_attendee.FcrParticipant, {
             hasPinnedStream: hasPinnedStream,
             user: userList[index],
-            onParticipantsButtonClick: toggleParticipantAction
+            onParticipantsButtonClick: toggleParticipantAction,
+            isLocalCameraInSecondaryWindow: isLocalCameraInSecondaryWindow
           })
         });
       }
@@ -74,6 +75,7 @@ var FcrParticipants = exports.FcrParticipants = function FcrParticipants(props)
     hasPinnedStream = _props.hasPinnedStream,
     toggleParticipantAction = _props.toggleParticipantAction,
     toggleRoomControlAction = _props.toggleRoomControlAction,
+    isLocalCameraInSecondaryWindow = _props.isLocalCameraInSecondaryWindow,
     footer = _props.footer,
     header = _props.header;
 
@@ -130,7 +132,7 @@ var FcrParticipants = exports.FcrParticipants = function FcrParticipants(props)
             height: height,
             rowCount: userList.length,
             rowHeight: cache.rowHeight,
-            rowRenderer: userRowRenderer(userList, userRenderer, hasPinnedStream, toggleParticipantAction)
+            rowRenderer: userRowRenderer(userList, userRenderer, hasPinnedStream, toggleParticipantAction, isLocalCameraInSecondaryWindow)
           });
         }
       })

package/lib/components/participants/mobile.js

@@ -56,7 +56,8 @@ var userRowRenderer = function userRowRenderer(userList, userRenderer, hasPinned
           children: userRenderer ? userRenderer(userList[index]) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_attendee.FcrParticipant, {
             hasPinnedStream: hasPinnedStream,
             user: userList[index],
-            onParticipantsButtonClick: toggleParticipantAction
+            onParticipantsButtonClick: toggleParticipantAction,
+            isLocalCameraInSecondaryWindow: false // mobile participants do not have secondary windows
           })
         });
       }

package/lib/components/participants/participants-more/index.js

@@ -51,7 +51,8 @@ var FcrParticipantsMoreActions = exports.FcrParticipantsMoreActions = function F
   var onParticipantsButtonClick = props.onParticipantsButtonClick,
     hasPinnedStream = props.hasPinnedStream,
     hideActions = props.hideActions,
-    user = props.user;
+    user = props.user,
+    isLocalCameraInSecondaryWindow = props.isLocalCameraInSecondaryWindow;
   var isMe = user.isMe,
     userId = user.userId,
     hasVideo = user.hasVideo,
@@ -62,6 +63,17 @@ var FcrParticipantsMoreActions = exports.FcrParticipantsMoreActions = function F
     allowedOperations = user.allowedOperations;
   var cameraStateType = !hasVideo ? 'primary' : 'danger';
 
+  /**
+   * 如果当前用户的类型是 'meeting-system' 且没有视频流，则不显示固定选项。
+   * 如果当前用户是自己且摄像头的视频流显示在副窗口中，也不显示固定选项。
+   */
+  var isShowPinOption = true;
+  if (userType === 'meeting-system' && !hasVideo) {
+    isShowPinOption = false;
+  } else if (isMe && isLocalCameraInSecondaryWindow) {
+    isShowPinOption = false;
+  }
+
   // 定义所有操作菜单
   var allOperationMenu = [{
     icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_cameraState.CameraState, {
@@ -115,7 +127,7 @@ var FcrParticipantsMoreActions = exports.FcrParticipantsMoreActions = function F
     }) : hasPinnedStream ? (0, _i18next.t)('fmt_attendies_options_replacefixed') : (0, _i18next.t)('fmt_attendies_options_fixfirst'),
     key: 'pin',
     type: isPin ? 'danger' : 'primary',
-    canOperation: userType === 'normal' || userType === 'phone' || userType === 'meeting-system' && hasVideo,
+    canOperation: isShowPinOption,
     onButtonClick: handleButtonClick(isPin ? _attendee.ParticipantActionType.REMOVE_PIN : _attendee.ParticipantActionType.ADD_PIN, userId, onParticipantsButtonClick),
     group: 'own_view'
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-ui-foundation",
-  "version": "3.7.2",
+  "version": "3.7.3",
   "license": "MIT",
   "files": [
     "lib",
@@ -12,7 +12,7 @@
   "dependencies": {
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
-    "agora-foundation": "~3.7.2",
+    "agora-foundation": "~3.7.3",
     "classnames": "^2.5.1",
     "i18next": "^23.10.1",
     "normalize.css": "^8.0.1",
@@ -51,7 +51,7 @@
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
     "@types/webpack-env": "^1.18.4",
-    "agora-toolchain": "~3.7.2",
+    "agora-toolchain": "~3.7.3",
     "core-js": "^3.33.3",
     "eslint": "^9.0.0",
     "node-html-parser": "^6.1.13",