fcr-ui-scene 3.5.1 → 3.6.0

package/lib/modules/components/security-menu/index.js

@@ -57,7 +57,7 @@ var SecurityMenu = (0, _mobxReact.observer)(function (props) {
     hasAllowWriteBoardPermission = privilege.hasAllowWriteBoardPermission,
     hasWaitingRoomPermission = privilege.hasWaitingRoomPermission,
     isWaterMarkEnabled = privilege.isWaterMarkEnabled,
-    isMulti = privilege.isMulti,
+    setAllowWaterMarkLine = privilege.setAllowWaterMarkLine,
     setAllowWaterMark = privilege.setAllowWaterMark,
     hasWatermarkEnablePermission = privilege.hasWatermarkEnablePermission,
     hasWatermarkDisablePermission = privilege.hasWatermarkDisablePermission,
@@ -67,7 +67,9 @@ var SecurityMenu = (0, _mobxReact.observer)(function (props) {
     hasDisallowChangeNamePermission = privilege.hasDisallowChangeNamePermission,
     setAllowChangeSelfName = privilege.setAllowChangeSelfName,
     hasEnableJoinWithAudioPermission = privilege.hasEnableJoinWithAudioPermission,
-    setAllowJoinWithMuteAudio = privilege.setAllowJoinWithMuteAudio;
+    hasEnableJoinWithVideoPermission = privilege.hasEnableJoinWithVideoPermission,
+    setAllowJoinWithMuteAudio = privilege.setAllowJoinWithMuteAudio,
+    setAllowJoinWithMutedVideo = privilege.setAllowJoinWithMutedVideo;
   allActions.push({
     title: transI18n('fmt_security_setting_label_security_setting'),
     key: 'meeting_security_title',
@@ -109,23 +111,6 @@ var SecurityMenu = (0, _mobxReact.observer)(function (props) {
       }
     });
   }
-  if (hasEnableJoinWithAudioPermission()) {
-    allActions.push({
-      title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
-        checked: checkedStateMap.enableJoinWithAudio,
-        label: transI18n('fmt_security_options_silence'),
-        styleType: "white"
-      }),
-      key: 'enable_join_with_audio',
-      type: 'primary',
-      onButtonClick: function onButtonClick() {
-        setCheckedStateMap(_objectSpread(_objectSpread({}, checkedStateMap), {
-          enableJoinWithAudio: !checkedStateMap.enableJoinWithAudio
-        }));
-        setAllowJoinWithMuteAudio(!checkedStateMap.enableJoinWithAudio);
-      }
-    });
-  }
 
   /** 主持人和联席主持人 可以进行开启单行双行水印 */
   if (hasWatermarkEnablePermission() && hasWatermarkDisablePermission()) {
@@ -149,26 +134,49 @@ var SecurityMenu = (0, _mobxReact.observer)(function (props) {
               },
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
                 type: _type.FcrIconType.FCR_HELPQUESTION,
-                size: 16
+                size: 16,
+                colors: {
+                  iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+                }
               })
             })
           })]
         }), checkedStateMap.enableWatermark && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
           className: "room-control-options-watermark-btns",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-            className: "room-control-options-watermark-btn ".concat(isMulti() ? '' : 'room-control-options-watermark-btn--active'),
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            className: "room-control-options-watermark-btn ".concat(privilege.targetLoadingWatermarkLineTypeIsMulti ? '' : 'room-control-options-watermark-btn--active'),
             onClick: function onClick(e) {
               e.stopPropagation();
-              setAllowWaterMark(isWaterMarkEnabled(), _type2.FcrLineType.SINGLE_ROW);
+              setAllowWaterMarkLine(isWaterMarkEnabled(), _type2.FcrLineType.SINGLE_ROW);
             },
-            children: transI18n('fmt_security_setting_mobile_option_watermark_style_single')
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-            className: "room-control-options-watermark-btn ".concat(isMulti() ? 'room-control-options-watermark-btn--active' : ''),
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              className: "btn-label",
+              children: transI18n('fmt_security_setting_mobile_option_watermark_style_single')
+            }), !privilege.targetLoadingWatermarkLineTypeIsMulti && !privilege.canOperateWatermark ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+              type: _type.FcrIconType.FCR_RESET,
+              size: 22,
+              className: "fcr-watermark-rotate-icon",
+              colors: {
+                iconPrimary: 'var(--fcr_ui_scene_ramp_brand6)'
+              }
+            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {})]
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+            className: "room-control-options-watermark-btn ".concat(privilege.targetLoadingWatermarkLineTypeIsMulti ? 'room-control-options-watermark-btn--active' : ''),
             onClick: function onClick(e) {
               e.stopPropagation();
-              setAllowWaterMark(isWaterMarkEnabled(), _type2.FcrLineType.MULTI_ROW);
+              setAllowWaterMarkLine(isWaterMarkEnabled(), _type2.FcrLineType.MULTI_ROW);
             },
-            children: transI18n('fmt_security_setting_mobile_option_watermark_style_multi')
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+              className: "btn-label",
+              children: transI18n('fmt_security_setting_mobile_option_watermark_style_multi')
+            }), privilege.targetLoadingWatermarkLineTypeIsMulti && !privilege.canOperateWatermark ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+              type: _type.FcrIconType.FCR_RESET,
+              size: 22,
+              className: "fcr-watermark-rotate-icon",
+              colors: {
+                iconPrimary: 'var(--fcr_ui_scene_ramp_brand6)'
+              }
+            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {})]
           })]
         })]
       }),
@@ -187,6 +195,50 @@ var SecurityMenu = (0, _mobxReact.observer)(function (props) {
     key: '',
     type: 'line'
   });
+  allActions.push({
+    title: transI18n('fmt_meeting_setting_labels_audio_video_settings'),
+    key: 'allow_attendee_title',
+    type: 'title'
+  });
+  if (hasEnableJoinWithAudioPermission()) {
+    allActions.push({
+      title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+        checked: checkedStateMap.enableJoinWithAudio,
+        label: transI18n('fmt_premeeting_setting_label_mute_join_meeting'),
+        styleType: "white"
+      }),
+      key: 'enable_join_with_audio',
+      type: 'primary',
+      onButtonClick: function onButtonClick() {
+        setCheckedStateMap(_objectSpread(_objectSpread({}, checkedStateMap), {
+          enableJoinWithAudio: !checkedStateMap.enableJoinWithAudio
+        }));
+        setAllowJoinWithMuteAudio(!checkedStateMap.enableJoinWithAudio);
+      }
+    });
+  }
+  if (hasEnableJoinWithVideoPermission()) {
+    allActions.push({
+      title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+        checked: checkedStateMap.joinWithCloseVideo,
+        label: transI18n('fmt_meeting_setting_options_disable_video'),
+        styleType: "white"
+      }),
+      key: 'join_with_close_audio',
+      type: 'primary',
+      onButtonClick: function onButtonClick() {
+        setCheckedStateMap(_objectSpread(_objectSpread({}, checkedStateMap), {
+          joinWithCloseVideo: !checkedStateMap.joinWithCloseVideo
+        }));
+        setAllowJoinWithMutedVideo(!checkedStateMap.joinWithCloseVideo);
+      }
+    });
+  }
+  allActions.push({
+    title: '',
+    key: '',
+    type: 'line'
+  });
   allActions.push({
     title: transI18n('fmt_screenshare_options_allow'),
     key: 'allow_attendee_title',

package/lib/modules/components/tab-frame/index.css

@@ -31,10 +31,10 @@
 
 .fcr-tabs-frame-content {
   --top: 48px;
-  /* position: absolute; */
   top: var(--top);
   height: calc(100% - var(--top));
   width: 100%;
   display: flex;
   justify-content: center;
+  padding: 0px 12px 12px 12px;
 }

package/lib/modules/control-bar/components/meeting-details/index.css

@@ -24,7 +24,7 @@
   word-break: break-all;
   text-align: left;
   min-height: 34px;
-  line-height: 34px;
+  line-height: 23px;
 }
 
 .meeting-details__content-meeting-id,

package/lib/modules/control-bar/components/meeting-details/index.js

@@ -22,7 +22,6 @@ require("./index.css");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _store = require("../../store");
 var _enums = require("../../enums");
-var _meetingDetail = require("../../../../utilities/meeting-detail");
 var _jsxRuntime = require("react/jsx-runtime");
 var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function () {
   var t = (0, _i18n.useI18n)();
@@ -45,9 +44,8 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
     setShowMeetingDetailPortal = _useContext.setShowMeetingDetailPortal,
     showToast = _useContext.showToast,
     meetingId = _useContext.meetingId,
-    startTime = _useContext.startTime,
-    roomDuration = _useContext.roomDuration,
-    meetingTime = _useContext.meetingTime;
+    meetingTime = _useContext.meetingTime,
+    roomDetailCopyText = _useContext.roomDetailCopyText;
   var getShareLink = function getShareLink() {
     var info = {
       roomId: roomId,
@@ -62,7 +60,6 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
   }, []);
   if (!roomName || !userName) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
   var displayMeetingId = (0, _tools.renderMeetingId)(meetingId, roomId);
-  var detailText = (0, _meetingDetail.generateMeetingDetail)(userName, roomName, (0, _meetingDetail.generateMeetingDuration)(startTime !== null && startTime !== void 0 ? startTime : 0, roomDuration), shareLink, displayMeetingId, password !== null && password !== void 0 ? password : '');
   function handleCopyMeetingId(copyContent) {
     if (!copyContent) return;
     var content = meetingId ? copyContent : copyContent.replace(/\s+/g, '');
@@ -120,7 +117,7 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
       copyIcon: _type.FcrIconType.FCR_RESET,
       copyText: t('fmt_meeting_call_voice_call_button_copy_info')
     });
-    (0, _copyText.copyText)(detailText).then(function () {
+    (0, _copyText.copyText)(roomDetailCopyText).then(function () {
       copyTimer = setTimeout(function () {
         setCopyInfoState({
           copyState: _enums.CopyState.COPIED,
@@ -175,7 +172,10 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
             type: _type.FcrIconType.FCR_COPY_ICON,
-            size: 20
+            size: 20,
+            colors: {
+              iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+            }
           })
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -190,7 +190,10 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
             type: _type.FcrIconType.FCR_COPY_ICON,
-            size: 20
+            size: 20,
+            colors: {
+              iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+            }
           })
         })]
       }), !!password && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -207,7 +210,10 @@ var MeetingDetails = exports.MeetingDetails = (0, _mobxReact.observer)(function
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
             type: _type.FcrIconType.FCR_COPY_ICON,
-            size: 20
+            size: 20,
+            colors: {
+              iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+            }
           })
         })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

package/lib/modules/control-bar/components/more-actions/index.js

@@ -25,9 +25,7 @@ var _copyText = require("../../../../utilities/copyText");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _enums = require("../../enums");
-var _tools = require("../../../../utilities/tools");
 var _type3 = require("../../../../type");
-var _meetingDetail = require("../../../../utilities/meeting-detail");
 var _jsxRuntime = require("react/jsx-runtime");
 var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(function (props) {
   var ref = (0, _react.useRef)(null);
@@ -52,10 +50,8 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
     roomId = _useContext$roomInfo.roomId,
     roomName = _useContext$roomInfo.roomName,
     userName = _useContext.localUser.userName,
-    meetingId = _useContext.meetingId,
-    startTime = _useContext.startTime,
-    roomDuration = _useContext.roomDuration,
-    isRoomDetailSupported = _useContext.isRoomDetailSupported;
+    isRoomDetailSupported = _useContext.isRoomDetailSupported,
+    roomDetailCopyText = _useContext.roomDetailCopyText;
   var transI18n = (0, _i18n.useI18n)();
   var onItemClick = function onItemClick(item) {
     if (item.onClick) {
@@ -65,22 +61,8 @@ var MorePopoverContent = exports.MorePopoverContent = (0, _mobxReact.observer)(f
     closePopover();
     handleMoreClick(item.key);
   };
-  var getShareLink = function getShareLink() {
-    var info = {
-      roomId: roomId,
-      roomName: roomName,
-      userName: userName
-    };
-    var baseLink = "".concat(inviteLink);
-    return baseLink;
-  };
-  var shareLink = (0, _react.useMemo)(function () {
-    return getShareLink();
-  }, []);
-  var displayMeetingId = (0, _tools.renderMeetingId)(meetingId, roomId);
-  var detailText = (0, _meetingDetail.generateMeetingDetail)(userName, roomName, (0, _meetingDetail.generateMeetingDuration)(startTime, roomDuration), shareLink, displayMeetingId, password || '');
   var handleCopyMeetingDetail = (0, _react.useCallback)(function () {
-    (0, _copyText.copyText)(detailText).then(function () {
+    (0, _copyText.copyText)(roomDetailCopyText).then(function () {
       showToast({
         type: 'info',
         content: transI18n('fmt_statusbar_status_coppied')

package/lib/modules/control-bar/components/share-state-nav/index.js

@@ -43,15 +43,9 @@ var ShareStateNav = exports.ShareStateNav = (0, _mobxReact.observer)(function (p
   var onShareStateNavTransferPosition = props.onShareStateNavTransferPosition,
     currentPosition = props.currentPosition;
   var _useContext = (0, _react.useContext)(_store.StoreContext),
-    roomDuration = _useContext.roomDuration,
     isMuteAudio = _useContext.isMuteAudio,
     cloudRecordingState = _useContext.cloudRecordingState,
-    meetingTime = _useContext.meetingTime,
-    totalHourText = _useContext.totalHourText,
-    totalMinuteText = _useContext.totalMinuteText;
-  var totalMins = (0, _react.useMemo)(function () {
-    return Math.floor(roomDuration / 1000 / 60);
-  }, [roomDuration]);
+    meetingTime = _useContext.meetingTime;
   var transI18n = (0, _i18n.useI18n)();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "share-state-nav fcr-flex fcr-items-center \n                 fcr-justify-center share-action-nav__can-draggable \n                ".concat(currentPosition === _enums.TransferPosition.TOP ? 'share-state-nav-top' : 'share-state-nav-bottom'),
@@ -71,22 +65,12 @@ var ShareStateNav = exports.ShareStateNav = (0, _mobxReact.observer)(function (p
           isMicrophoneMuted: isMuteAudio
         })
       })
-    }), cloudRecordingState !== _type2.FcrRecordingState.Stopped && cloudRecordingState !== _type2.FcrRecordingState.Paused && /*#__PURE__*/(0, _jsxRuntime.jsx)(RecordingOn, {}), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    }), cloudRecordingState !== _type2.FcrRecordingState.Stopped && cloudRecordingState !== _type2.FcrRecordingState.Paused && /*#__PURE__*/(0, _jsxRuntime.jsx)(RecordingOn, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "share-state-nav__meeting-elapsed-time",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         className: (0, _classnames["default"])(),
         children: meetingTime
-      }), roomDuration > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
-        trigger: "hover",
-        mouseEnterDelay: 0,
-        content: transI18n('fmt_popup_label_meetingduration', {
-          reason1: totalMins
-        }),
-        placement: "bottom",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
-          children: ["(", totalHourText, totalMinuteText, ")"]
-        })
-      })]
+      })
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "share-state-nav__stop-share fcr-flex fcr-items-center fcr-justify-center",
       onClick: props.onStopShare,

package/lib/modules/control-bar/index.d.ts

@@ -19,6 +19,7 @@ import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 import { FcrUIMeetingTimeSharedDataSource } from '../../shared-data-source/meeting-time';
 import { FcrUIMessageProvider } from '../../providers/message-provider';
 import { FcrUISecuritySharedDataSource } from '../../shared-data-source/security-data';
+import { FcrUIScreenShareDataSource } from '../../shared-data-source/screen-share-data-source';
 export declare class ControlBarUIModule extends UIModule {
     private _store?;
     private _deviceControlStore?;
@@ -41,6 +42,7 @@ export declare class ControlBarUIModule extends UIModule {
     sharedMeetingTimeDataSource?: FcrUIMeetingTimeSharedDataSource;
     messageProvider?: FcrUIMessageProvider;
     sharedSecuritySharedDataSource?: FcrUISecuritySharedDataSource;
+    screenShareDataSource?: FcrUIScreenShareDataSource;
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(props: {

package/lib/modules/control-bar/index.js

@@ -73,7 +73,9 @@ var ControlBarUIModule = exports.ControlBarUIModule = /*#__PURE__*/function (_UI
         abilityProvider: this.abilityProvider,
         sharedMeetingTimeDataSource: this.sharedMeetingTimeDataSource,
         messageProvider: this.messageProvider,
-        sharedSecuritySharedDataSource: this.sharedSecuritySharedDataSource
+        sharedSecuritySharedDataSource: this.sharedSecuritySharedDataSource,
+        dialogProvider: this.dialogProvider,
+        screenShareDataSource: this.screenShareDataSource
       });
       this.privilegeProvider = this.privilegeProvider;
       this.screenShareProvider = this.screenShareProvider;

package/lib/modules/control-bar/store.d.ts

@@ -18,6 +18,8 @@ import { FcrUIMeetingTimeSharedDataSource } from '../../shared-data-source/meeti
 import { CurrentShareScreenWorkArea } from '../../utilities/tools';
 import { FcrUIMessageProvider } from '../../providers/message-provider';
 import { FcrSecurityCheckedStateType, FcrUISecuritySharedDataSource } from '../../shared-data-source/security-data';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
+import { FcrUIScreenShareDataSource } from '../../shared-data-source/screen-share-data-source';
 export default class ControlBarStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
     private _screenBounds;
@@ -38,9 +40,12 @@ export default class ControlBarStore {
     private _sharedMeetingTimeDataSource;
     private _sharedSecuritySharedDataSource;
     private _messageProvider;
+    private _dialogProvider;
+    private _screenShareDataSource;
+    private _dialogObsever;
+    private _participantDialogId;
     accessor leaveConfirmRef: React.ReactNode;
     accessor shareWithAudio: boolean;
-    accessor shareAudioProcessingChannel: AudioProcessingChannel;
     accessor currentShareId: string;
     accessor currentShareType: AgoraRtcScreenCaptureType;
     accessor currentShareBounds: CurrentShareBounds;
@@ -57,6 +62,7 @@ export default class ControlBarStore {
     accessor hiddenShareActionNav: boolean;
     accessor boardOwnerUser: string;
     accessor currentShareDisplayId: number;
+    get shareAudioProcessingChannel(): AudioProcessingChannel;
     get privilegeProvider(): FcrUIPrivilegeProvider;
     get localUser(): import("fcr-core/lib/type").FcrUserInfo;
     get remoteUsers(): import("fcr-core/lib/type").FcrUserInfo[];
@@ -89,7 +95,7 @@ export default class ControlBarStore {
     get isPstnUser(): boolean;
     get localUserRole(): import("fcr-core").FcrUserRole;
     get users(): import("fcr-core/lib/type").FcrUserInfo[];
-    constructor({ uiEventStore, securityStore, roomControl, deviceProvider, sharedLayoutDataSource, roomProvider, sharedChatDataSource, sharedMemberDataSource, localStorageProvider, abilityProvider, sharedMeetingTimeDataSource, messageProvider, sharedSecuritySharedDataSource, }: {
+    constructor({ uiEventStore, securityStore, roomControl, deviceProvider, sharedLayoutDataSource, roomProvider, sharedChatDataSource, sharedMemberDataSource, localStorageProvider, abilityProvider, sharedMeetingTimeDataSource, messageProvider, sharedSecuritySharedDataSource, dialogProvider, screenShareDataSource, }: {
         uiEventStore: FcrUIEventProvider;
         securityStore: FcrUIPrivilegeProvider;
         roomControl: FcrMainRoomControl;
@@ -103,6 +109,8 @@ export default class ControlBarStore {
         sharedMeetingTimeDataSource: FcrUIMeetingTimeSharedDataSource;
         messageProvider: FcrUIMessageProvider;
         sharedSecuritySharedDataSource: FcrUISecuritySharedDataSource;
+        dialogProvider: FcrUIDialogProvider;
+        screenShareDataSource: FcrUIScreenShareDataSource;
     });
     get checkedStateMap(): FcrSecurityCheckedStateType;
     setCheckedStateMap(val: FcrSecurityCheckedStateType): void;
@@ -120,6 +128,7 @@ export default class ControlBarStore {
     stopCloudRecording(): void;
     startCloudRecording(): void;
     showToast(params: any): void;
+    get roomDetailCopyText(): string;
     setShowMeetingDetailPortal(show: boolean): void;
     setEnableWaitingRoom(enable: boolean): void;
     handleLeaveRoom(): void;