fcr-ui-scene-mobile 3.4.0 → 3.4.1

package/lib/common/security-store.d.ts

@@ -92,7 +92,8 @@ export declare class FcrSecurityStore {
     hasDisallowWriteBoardPermission(): boolean;
     hasAllowScreenShareAndBoardPermission(): boolean;
     hasAllowWaterMarkPermission(): boolean;
-    isMulti: () => boolean;
+    /** 当前是否是多行水印 */
+    isWatermarkMultiRow: () => boolean;
     getAllowedOperations(targetUserRole: FcrUserRole, _isSelf: boolean): string[];
     allowShare(state: FcrSharePermissionState): Promise<void>;
     setAllowWriteBoard(state: FcrSharePermissionState): Promise<void>;

package/lib/common/security-store.js

@@ -346,7 +346,8 @@ var FcrSecurityStore = exports.FcrSecurityStore = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "hasWatermarkDisablePermission", function () {
       return _this._hasPermission(_type3.FcrPermissionAction.RoomDisableWatermark, _type3.FcrPrivilegeUserRole.PARTICIPANT);
     });
-    (0, _defineProperty2["default"])(this, "isMulti", (0, _mobxUtils.computedFn)(function () {
+    /** 当前是否是多行水印 */
+    (0, _defineProperty2["default"])(this, "isWatermarkMultiRow", (0, _mobxUtils.computedFn)(function () {
       var _info$info3;
       var info = _this.securityInfos.find(function (_ref17) {
         var info = _ref17.info;

package/lib/error-fallback.d.ts

@@ -0,0 +1,2 @@
+import { FallbackProps } from 'react-error-boundary';
+export declare const ErrorFallback: ({}: FallbackProps) => import("react/jsx-runtime").JSX.Element;

package/lib/error-fallback.js

@@ -0,0 +1,21 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ErrorFallback = void 0;
+var _objectDestructuringEmpty2 = _interopRequireDefault(require("@babel/runtime/helpers/objectDestructuringEmpty"));
+var _jsxRuntime = require("react/jsx-runtime");
+var ErrorFallback = exports.ErrorFallback = function ErrorFallback(_ref) {
+  (0, _objectDestructuringEmpty2["default"])(_ref);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: "fcr-mobile-full-screen-error",
+    style: {
+      width: '100%',
+      height: '100%',
+      backgroundColor: 'transparent'
+    }
+  });
+};

package/lib/modules/action-bar/more-popup/index.js

@@ -24,7 +24,7 @@ var FcrMobileMorePopup = exports.FcrMobileMorePopup = (0, _mobxReact.observer)(f
     setSetting = settingStore.setSetting;
   var setAllowWaterMark = securityStore.setAllowWaterMark,
     isWaterMarkEnabled = securityStore.isWaterMarkEnabled,
-    isMulti = securityStore.isMulti;
+    isWatermarkMultiRow = securityStore.isWatermarkMultiRow;
   var waterMarkEnabled = isWaterMarkEnabled();
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_popup.FcrPopup, {
     showCloseButton: true,
@@ -105,13 +105,13 @@ var FcrMobileMorePopup = exports.FcrMobileMorePopup = (0, _mobxReact.observer)(f
             }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
               className: "fcr-mobile-more-cfg-card-item-linechoose",
               children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-                className: "fcr-mobile-more-cfg-card-item-btn ".concat(isMulti() ? '' : 'active'),
+                className: "fcr-mobile-more-cfg-card-item-btn ".concat(isWatermarkMultiRow() ? '' : 'active'),
                 onClick: function onClick() {
                   setAllowWaterMark(waterMarkEnabled, _type.FcrLineType.SINGLE_ROW);
                 },
                 children: (0, _i18n.transI18n)('fmt_security_setting_mobile_option_watermark_style_single')
               }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-                className: "fcr-mobile-more-cfg-card-item-btn ".concat(isMulti() ? 'active' : ''),
+                className: "fcr-mobile-more-cfg-card-item-btn ".concat(isWatermarkMultiRow() ? 'active' : ''),
                 onClick: function onClick() {
                   setAllowWaterMark(waterMarkEnabled, _type.FcrLineType.MULTI_ROW);
                 },

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

@@ -51,7 +51,6 @@ export default class ActionBarStore {
     private _roomObserver;
     private _uiEventObserver;
     private _streamObserver;
-    private _deviceObserver;
     private _observer;
     private _openedDialogIdMap;
     private _participantVisible;
@@ -105,7 +104,7 @@ export default class ActionBarStore {
     get isScreenShareAndBoardEnabled(): boolean;
     get isBoardWriteEnabled(): boolean;
     get isWaterMarkEnabled(): boolean;
-    get isMulti(): boolean;
+    get isWatermarkMultiRow(): boolean;
     get isPstnUser(): boolean;
     get cameraEnabled(): boolean;
     get cameraId(): string;
@@ -191,6 +190,5 @@ export default class ActionBarStore {
     private _handleCloudRecordingStateUpdated;
     private _handleStreamsAddedOrUpdated;
     setParticipantsPopoverOpened(visible: boolean): void;
-    private _handleMicrophoneChanged;
 }
 export {};

package/lib/modules/action-bar/store.js

@@ -96,7 +96,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type6 = require("fcr-core/lib/room-control/type");
 var _type7 = require("fcr-core/lib/room-control/privilege-control/type");
 var _ActionBarStore;
-var _initProto, _init_users, _init_newMessageTooltipVisible, _init_newMessageCount, _init_latestMessage, _init_totalUser, _init_totalWaitingRoomUser, _init_liveStreamingState, _init_currentMenuIs, _init_cloudRecordingState, _init_localUserRole, _init_localUser, _init_connectionSettingVisible, _init_connectType, _init_folded, _init_boardOwnerUser, _init_hasScreenShare, _init_showArrow, _init_phoneMicEnabled, _init_isNewWaitingRoomUserEnter, _init_chatTabIndex, _init_popoverOpened, _init_participantsPopoverOpened, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _toggleLayoutBarLockDecs, _showNewMessageTooltipDecs, _hideNewMessageTooltipDecs, _switchMenuDecs, _assignHostDecs, _setPopoverOpenedDecs, _toggleFoldDecs, _setShowArrowDecs, _setEnableWaitingRoomDecs, _kickOutWaitingRoomAllMemberDecs, _moveToMainRoomAllMemberDecs, _handleRemoteUsersJoinedDecs, _handleRemoteUsersLeftDecs, _handleAllUserCountUpdatedDecs, _getWaitingRoomUserCountDecs, _handleRemoteWaitingUserLeftDecs, _handleRemoteWaitingUserJoinedDecs, _handleUserInfoUpdatedDecs, _handleLiveStreamingStateUpdatedDecs, _handleNewMessageEventDecs, _init__handleNewMessageEvent, _handleChatVisibleDecs, _handlerTraceScreenCaptureStateUpdateDecs, _operateWaitingRoomDecs, _handleCloudRecordingStateUpdatedDecs, _handleStreamsAddedOrUpdatedDecs, _handleMicrophoneChangedDecs, _ref;
+var _initProto, _init_users, _init_newMessageTooltipVisible, _init_newMessageCount, _init_latestMessage, _init_totalUser, _init_totalWaitingRoomUser, _init_liveStreamingState, _init_currentMenuIs, _init_cloudRecordingState, _init_localUserRole, _init_localUser, _init_connectionSettingVisible, _init_connectType, _init_folded, _init_boardOwnerUser, _init_hasScreenShare, _init_showArrow, _init_phoneMicEnabled, _init_isNewWaitingRoomUserEnter, _init_chatTabIndex, _init_popoverOpened, _init_participantsPopoverOpened, _pauseCloudRecordingDecs, _resumeCloudRecordingDecs, _stopCloudRecordingDecs, _toggleLayoutBarLockDecs, _showNewMessageTooltipDecs, _hideNewMessageTooltipDecs, _switchMenuDecs, _assignHostDecs, _setPopoverOpenedDecs, _toggleFoldDecs, _setShowArrowDecs, _setEnableWaitingRoomDecs, _kickOutWaitingRoomAllMemberDecs, _moveToMainRoomAllMemberDecs, _handleRemoteUsersJoinedDecs, _handleRemoteUsersLeftDecs, _handleAllUserCountUpdatedDecs, _getWaitingRoomUserCountDecs, _handleRemoteWaitingUserLeftDecs, _handleRemoteWaitingUserJoinedDecs, _handleUserInfoUpdatedDecs, _handleLiveStreamingStateUpdatedDecs, _handleNewMessageEventDecs, _init__handleNewMessageEvent, _handleChatVisibleDecs, _handlerTraceScreenCaptureStateUpdateDecs, _operateWaitingRoomDecs, _handleCloudRecordingStateUpdatedDecs, _handleStreamsAddedOrUpdatedDecs, _ref;
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -148,7 +148,7 @@ _ref = (_pauseCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(
   leading: true
 })], _stopCloudRecordingDecs = [_decorator.bound, (0, _decorator.debounced)(500, {
   leading: true
-})], _toggleLayoutBarLockDecs = [_mobx.action, _mobx.action.bound], _showNewMessageTooltipDecs = [_mobx.action, _mobx.action.bound], _hideNewMessageTooltipDecs = [_mobx.action, _mobx.action.bound], _switchMenuDecs = [_mobx.action, _mobx.action.bound], _assignHostDecs = [_mobx.action, _mobx.action.bound], _setPopoverOpenedDecs = [_mobx.action, _mobx.action.bound], _toggleFoldDecs = [_mobx.action, _mobx.action.bound], _setShowArrowDecs = [_mobx.action, _mobx.action.bound], _setEnableWaitingRoomDecs = [_mobx.action, _mobx.action.bound], _kickOutWaitingRoomAllMemberDecs = [_mobx.action, _mobx.action.bound], _moveToMainRoomAllMemberDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUsersJoinedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUsersLeftDecs = [_mobx.action, _mobx.action.bound], _handleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], _getWaitingRoomUserCountDecs = [_mobx.action, _mobx.action.bound], _handleRemoteWaitingUserLeftDecs = [_mobx.action, _mobx.action.bound], _handleRemoteWaitingUserJoinedDecs = [_mobx.action, _mobx.action.bound], _handleUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleLiveStreamingStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleNewMessageEventDecs = [_mobx.action, _mobx.action.bound], _handleChatVisibleDecs = [_mobx.action, _mobx.action.bound], _handlerTraceScreenCaptureStateUpdateDecs = [_mobx.action, _mobx.action.bound], _operateWaitingRoomDecs = [_mobx.action, _mobx.action.bound], _handleCloudRecordingStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedOrUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleMicrophoneChangedDecs = [_mobx.action, _mobx.action.bound], "logger");
+})], _toggleLayoutBarLockDecs = [_mobx.action, _mobx.action.bound], _showNewMessageTooltipDecs = [_mobx.action, _mobx.action.bound], _hideNewMessageTooltipDecs = [_mobx.action, _mobx.action.bound], _switchMenuDecs = [_mobx.action, _mobx.action.bound], _assignHostDecs = [_mobx.action, _mobx.action.bound], _setPopoverOpenedDecs = [_mobx.action, _mobx.action.bound], _toggleFoldDecs = [_mobx.action, _mobx.action.bound], _setShowArrowDecs = [_mobx.action, _mobx.action.bound], _setEnableWaitingRoomDecs = [_mobx.action, _mobx.action.bound], _kickOutWaitingRoomAllMemberDecs = [_mobx.action, _mobx.action.bound], _moveToMainRoomAllMemberDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUsersJoinedDecs = [_mobx.action, _mobx.action.bound], _handleRemoteUsersLeftDecs = [_mobx.action, _mobx.action.bound], _handleAllUserCountUpdatedDecs = [_mobx.action, _mobx.action.bound], _getWaitingRoomUserCountDecs = [_mobx.action, _mobx.action.bound], _handleRemoteWaitingUserLeftDecs = [_mobx.action, _mobx.action.bound], _handleRemoteWaitingUserJoinedDecs = [_mobx.action, _mobx.action.bound], _handleUserInfoUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleLiveStreamingStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleNewMessageEventDecs = [_mobx.action, _mobx.action.bound], _handleChatVisibleDecs = [_mobx.action, _mobx.action.bound], _handlerTraceScreenCaptureStateUpdateDecs = [_mobx.action, _mobx.action.bound], _operateWaitingRoomDecs = [_mobx.action, _mobx.action.bound], _handleCloudRecordingStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleStreamsAddedOrUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
   function ActionBarStore(args) {
     var _this = this;
@@ -180,9 +180,6 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       onStreamsUpdated: this._handleStreamsAddedOrUpdated.bind(this),
       onStreamsRemoved: this._handleStreamsAddedOrUpdated.bind(this)
     });
-    (0, _defineProperty2["default"])(this, "_deviceObserver", {
-      onMicrophoneChanged: this._handleMicrophoneChanged.bind(this)
-    });
     (0, _defineProperty2["default"])(this, "_openedDialogIdMap", new Map());
     (0, _defineProperty2["default"])(this, "_participantVisible", false);
     (0, _defineProperty2["default"])(this, "_chatVisible", false);
@@ -203,7 +200,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _J, _init_localUserRole(this));
     _classPrivateFieldInitSpec(this, _K, _init_localUser(this));
     _classPrivateFieldInitSpec(this, _L, _init_connectionSettingVisible(this, false));
-    _classPrivateFieldInitSpec(this, _M, _init_connectType(this, _type3.ConnectType.COMPUTER));
+    _classPrivateFieldInitSpec(this, _M, _init_connectType(this, _type3.ConnectType.PHONE));
     _classPrivateFieldInitSpec(this, _N, _init_folded(this, false));
     _classPrivateFieldInitSpec(this, _O, _init_boardOwnerUser(this, null));
     _classPrivateFieldInitSpec(this, _P, _init_hasScreenShare(this, false));
@@ -244,7 +241,6 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     this._roomControl.addObserver(this._roomObserver);
     this._streamControl.addObserver(this._streamObserver);
     this._uiEventStore.addObserver(this._uiEventObserver);
-    this._deviceStore.addObserver(this._deviceObserver);
     this._observer = {
       onScreenCaptureStateUpdated: this._handlerTraceScreenCaptureStateUpdate.bind(this)
     };
@@ -534,9 +530,9 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       return this._securityStore.isWaterMarkEnabled();
     }
   }, {
-    key: "isMulti",
+    key: "isWatermarkMultiRow",
     get: function get() {
-      return this._securityStore.isMulti();
+      return this._securityStore.isWatermarkMultiRow();
     }
   }, {
     key: "isPstnUser",
@@ -768,7 +764,6 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
       this._roomControl.removeObserver(this._roomObserver);
       this._streamControl.removeObserver(this._streamObserver);
       this._uiEventStore.removeObserver(this._uiEventObserver);
-      this._deviceStore.removeObserver(this._deviceObserver);
     }
   }, {
     key: "allowJoinWithMuteAudio",
@@ -1380,7 +1375,6 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
         return connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
       });
       var hasPstnStream = !!pstnStream;
-      this.connectType = hasPstnStream ? _type3.ConnectType.PHONE : this.microphoneId ? _type3.ConnectType.COMPUTER : _type3.ConnectType.NONE;
       if (hasPstnStream) {
         this.phoneMicEnabled = pstnStream.streamType === _type4.AgoraRteMediaStreamType.BOTH || pstnStream.audioSourceState === _fcrCore.FcrMediaSourceState.OPEN;
       }
@@ -1390,15 +1384,10 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
     value: function setParticipantsPopoverOpened(visible) {
       this.participantsPopoverOpened = visible;
     }
-  }, {
-    key: "_handleMicrophoneChanged",
-    value: function _handleMicrophoneChanged(microphoneId) {
-      this.connectType = microphoneId ? _type3.ConnectType.COMPUTER : _type3.ConnectType.NONE;
-    }
   }]);
 }();
 _ActionBarStore = ActionBarStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ActionBarStore, [[_mobx.observable, 1, "users"], [_mobx.observable, 1, "newMessageTooltipVisible"], [_mobx.observable, 1, "newMessageCount"], [_mobx.observable, 1, "latestMessage"], [_mobx.observable, 1, "totalUser"], [_mobx.observable, 1, "totalWaitingRoomUser"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "currentMenuIs"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "localUserRole"], [_mobx.observable, 1, "localUser"], [_mobx.observable, 1, "connectionSettingVisible"], [_mobx.observable, 1, "connectType"], [_mobx.observable, 1, "folded"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "hasScreenShare"], [_mobx.observable, 1, "showArrow"], [_mobx.observable, 1, "phoneMicEnabled"], [_mobx.observable, 1, "isNewWaitingRoomUserEnter"], [_mobx.observable, 1, "chatTabIndex"], [_mobx.observable, 1, "popoverOpened"], [_mobx.observable, 1, "participantsPopoverOpened"], [_mobx.computed, 3, "remoteUsers"], [_mobx.computed, 3, "hasStartScreenSharePermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasEnableStartAudioPermission"], [_mobx.computed, 3, "hasEnableChangeNamePermission"], [_mobx.computed, 3, "hasEnableStartVideoPermission"], [_mobx.computed, 3, "hasLockRoomPermission"], [_mobx.computed, 3, "hasWaitingRoomPermission"], [_mobx.computed, 3, "hasWatermarkDisablePermission"], [_mobx.computed, 3, "hasEnableStartSharePermission"], [_mobx.computed, 3, "hasAllowWriteBoardPermission"], [_mobx.computed, 3, "hasCloseWriteBoardPermission"], [_mobx.computed, 3, "hasAllowScreenShareAndBoardPermission"], [_mobx.computed, 3, "hasAllowChatPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "isScreenShareAndBoardEnabled"], [_mobx.computed, 3, "isBoardWriteEnabled"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isMulti"], [_mobx.computed, 3, "isPstnUser"], [_mobx.computed, 3, "cameraId"], [_mobx.computed, 3, "cameraList"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "microphoneId"], [_mobx.computed, 3, "microphoneVolumeLevel"], [_mobx.computed, 3, "microphoneList"], [_mobx.computed, 3, "speakerId"], [_mobx.computed, 3, "speakerList"], [_mobx.computed, 3, "allNewMessage"], [_mobx.computed, 3, "isMainRoom"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_showNewMessageTooltipDecs, 18, "showNewMessageTooltip"], [_hideNewMessageTooltipDecs, 18, "hideNewMessageTooltip"], [_switchMenuDecs, 18, "switchMenu"], [_mobx.computed, 3, "isLocked"], [_decorator.bound, 2, "isWaitingRoomEnabled"], [_decorator.bound, 2, "enableCamera"], [_decorator.bound, 2, "enableMicrophone"], [_decorator.bound, 2, "closeSpeaker"], [_decorator.bound, 2, "setAllowBoardWrite"], [_decorator.bound, 2, "setAllowScreenShare"], [_decorator.bound, 2, "closeBoard"], [_assignHostDecs, 18, "assignHost"], [_decorator.bound, 2, "leave"], [_decorator.bound, 2, "keepPhoneAudioConnection"], [_setPopoverOpenedDecs, 18, "setPopoverOpened"], [_decorator.bound, 2, "getRoomType"], [_decorator.bound, 2, "end"], [_decorator.bound, 2, "allowJoinWithMuteAudio"], [_decorator.bound, 2, "setAllowJoinWithMuteAudio"], [_decorator.bound, 2, "isLockRoomEnabled"], [_decorator.bound, 2, "setLockRoomEnabled"], [_decorator.bound, 2, "setAllowShareScreen"], [_decorator.bound, 2, "allowShareScreen"], [_decorator.bound, 2, "allowWriteBoard"], [_decorator.bound, 2, "allowChat"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "allowUnmuteSelfAudio"], [_decorator.bound, 2, "setAllowUnmuteSelfAudio"], [_decorator.bound, 2, "allowUnmuteSelfVideo"], [_decorator.bound, 2, "setAllowUnmuteSelfVideo"], [_decorator.bound, 2, "toggleChat"], [_decorator.bound, 2, "openChat"], [_decorator.bound, 2, "closeChat"], [_decorator.bound, 2, "toggleParticipants"], [_decorator.bound, 2, "openParticipants"], [_decorator.bound, 2, "closeParticipants"], [_decorator.bound, 2, "startScreenShare"], [_decorator.bound, 2, "openWhiteboard"], [_decorator.bound, 2, "closeWhiteboard"], [_decorator.bound, 2, "closeLiveStreamingDialog"], [_decorator.bound, 2, "toggleConnection"], [_decorator.bound, 2, "openConnection"], [_decorator.bound, 2, "closeConnection"], [_toggleFoldDecs, 18, "toggleFold"], [_setShowArrowDecs, 18, "setShowArrow"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_kickOutWaitingRoomAllMemberDecs, 18, "kickOutWaitingRoomAllMember"], [_moveToMainRoomAllMemberDecs, 18, "moveToMainRoomAllMember"], [_decorator.bound, 2, "_interceptShareScreen"], [_handleRemoteUsersJoinedDecs, 18, "_handleRemoteUsersJoined"], [_handleRemoteUsersLeftDecs, 18, "_handleRemoteUsersLeft"], [_handleAllUserCountUpdatedDecs, 18, "_handleAllUserCountUpdated"], [_getWaitingRoomUserCountDecs, 18, "_getWaitingRoomUserCount"], [_handleRemoteWaitingUserLeftDecs, 18, "_handleRemoteWaitingUserLeft"], [_handleRemoteWaitingUserJoinedDecs, 18, "_handleRemoteWaitingUserJoined"], [_handleUserInfoUpdatedDecs, 18, "_handleUserInfoUpdated"], [_handleLiveStreamingStateUpdatedDecs, 18, "_handleLiveStreamingStateUpdated"], [_handleChatVisibleDecs, 18, "_handleChatVisible"], [_handlerTraceScreenCaptureStateUpdateDecs, 18, "_handlerTraceScreenCaptureStateUpdate"], [_decorator.bound, 2, "setAllowWaterMark"], [_decorator.bound, 2, "setWaterMarkLineType"], [_decorator.bound, 2, "_onEvent"], [_operateWaitingRoomDecs, 18, "_operateWaitingRoom"], [_handleCloudRecordingStateUpdatedDecs, 18, "_handleCloudRecordingStateUpdated"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_decorator.bound, 2, "setParticipantsPopoverOpened"], [_handleMicrophoneChangedDecs, 18, "_handleMicrophoneChanged"], [_handleNewMessageEventDecs, 16, "_handleNewMessageEvent"]], []).e, 24);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_ActionBarStore, [[_mobx.observable, 1, "users"], [_mobx.observable, 1, "newMessageTooltipVisible"], [_mobx.observable, 1, "newMessageCount"], [_mobx.observable, 1, "latestMessage"], [_mobx.observable, 1, "totalUser"], [_mobx.observable, 1, "totalWaitingRoomUser"], [_mobx.observable, 1, "liveStreamingState"], [_mobx.observable, 1, "currentMenuIs"], [_mobx.observable, 1, "cloudRecordingState"], [_mobx.observable, 1, "localUserRole"], [_mobx.observable, 1, "localUser"], [_mobx.observable, 1, "connectionSettingVisible"], [_mobx.observable, 1, "connectType"], [_mobx.observable, 1, "folded"], [_mobx.observable, 1, "boardOwnerUser"], [_mobx.observable, 1, "hasScreenShare"], [_mobx.observable, 1, "showArrow"], [_mobx.observable, 1, "phoneMicEnabled"], [_mobx.observable, 1, "isNewWaitingRoomUserEnter"], [_mobx.observable, 1, "chatTabIndex"], [_mobx.observable, 1, "popoverOpened"], [_mobx.observable, 1, "participantsPopoverOpened"], [_mobx.computed, 3, "remoteUsers"], [_mobx.computed, 3, "hasStartScreenSharePermission"], [_mobx.computed, 3, "hasStartLiveStreamingPermission"], [_mobx.computed, 3, "hasEnableStartAudioPermission"], [_mobx.computed, 3, "hasEnableChangeNamePermission"], [_mobx.computed, 3, "hasEnableStartVideoPermission"], [_mobx.computed, 3, "hasLockRoomPermission"], [_mobx.computed, 3, "hasWaitingRoomPermission"], [_mobx.computed, 3, "hasWatermarkDisablePermission"], [_mobx.computed, 3, "hasEnableStartSharePermission"], [_mobx.computed, 3, "hasAllowWriteBoardPermission"], [_mobx.computed, 3, "hasCloseWriteBoardPermission"], [_mobx.computed, 3, "hasAllowScreenShareAndBoardPermission"], [_mobx.computed, 3, "hasAllowChatPermission"], [_mobx.computed, 3, "hasStartCloudRecordingPermission"], [_mobx.computed, 3, "hasAssignHostBeforeLeavingPermission"], [_mobx.computed, 3, "hasEndRoomPermission"], [_mobx.computed, 3, "isScreenShareAndBoardEnabled"], [_mobx.computed, 3, "isBoardWriteEnabled"], [_mobx.computed, 3, "isWaterMarkEnabled"], [_mobx.computed, 3, "isWatermarkMultiRow"], [_mobx.computed, 3, "isPstnUser"], [_mobx.computed, 3, "cameraId"], [_mobx.computed, 3, "cameraList"], [_mobx.computed, 3, "microphoneEnabled"], [_mobx.computed, 3, "microphoneId"], [_mobx.computed, 3, "microphoneVolumeLevel"], [_mobx.computed, 3, "microphoneList"], [_mobx.computed, 3, "speakerId"], [_mobx.computed, 3, "speakerList"], [_mobx.computed, 3, "allNewMessage"], [_mobx.computed, 3, "isMainRoom"], [_pauseCloudRecordingDecs, 2, "pauseCloudRecording"], [_resumeCloudRecordingDecs, 2, "resumeCloudRecording"], [_stopCloudRecordingDecs, 2, "stopCloudRecording"], [_decorator.bound, 2, "startCloudRecording"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_showNewMessageTooltipDecs, 18, "showNewMessageTooltip"], [_hideNewMessageTooltipDecs, 18, "hideNewMessageTooltip"], [_switchMenuDecs, 18, "switchMenu"], [_mobx.computed, 3, "isLocked"], [_decorator.bound, 2, "isWaitingRoomEnabled"], [_decorator.bound, 2, "enableCamera"], [_decorator.bound, 2, "enableMicrophone"], [_decorator.bound, 2, "closeSpeaker"], [_decorator.bound, 2, "setAllowBoardWrite"], [_decorator.bound, 2, "setAllowScreenShare"], [_decorator.bound, 2, "closeBoard"], [_assignHostDecs, 18, "assignHost"], [_decorator.bound, 2, "leave"], [_decorator.bound, 2, "keepPhoneAudioConnection"], [_setPopoverOpenedDecs, 18, "setPopoverOpened"], [_decorator.bound, 2, "getRoomType"], [_decorator.bound, 2, "end"], [_decorator.bound, 2, "allowJoinWithMuteAudio"], [_decorator.bound, 2, "setAllowJoinWithMuteAudio"], [_decorator.bound, 2, "isLockRoomEnabled"], [_decorator.bound, 2, "setLockRoomEnabled"], [_decorator.bound, 2, "setAllowShareScreen"], [_decorator.bound, 2, "allowShareScreen"], [_decorator.bound, 2, "allowWriteBoard"], [_decorator.bound, 2, "allowChat"], [_decorator.bound, 2, "setAllowChat"], [_decorator.bound, 2, "allowUnmuteSelfAudio"], [_decorator.bound, 2, "setAllowUnmuteSelfAudio"], [_decorator.bound, 2, "allowUnmuteSelfVideo"], [_decorator.bound, 2, "setAllowUnmuteSelfVideo"], [_decorator.bound, 2, "toggleChat"], [_decorator.bound, 2, "openChat"], [_decorator.bound, 2, "closeChat"], [_decorator.bound, 2, "toggleParticipants"], [_decorator.bound, 2, "openParticipants"], [_decorator.bound, 2, "closeParticipants"], [_decorator.bound, 2, "startScreenShare"], [_decorator.bound, 2, "openWhiteboard"], [_decorator.bound, 2, "closeWhiteboard"], [_decorator.bound, 2, "closeLiveStreamingDialog"], [_decorator.bound, 2, "toggleConnection"], [_decorator.bound, 2, "openConnection"], [_decorator.bound, 2, "closeConnection"], [_toggleFoldDecs, 18, "toggleFold"], [_setShowArrowDecs, 18, "setShowArrow"], [_setEnableWaitingRoomDecs, 18, "setEnableWaitingRoom"], [_kickOutWaitingRoomAllMemberDecs, 18, "kickOutWaitingRoomAllMember"], [_moveToMainRoomAllMemberDecs, 18, "moveToMainRoomAllMember"], [_decorator.bound, 2, "_interceptShareScreen"], [_handleRemoteUsersJoinedDecs, 18, "_handleRemoteUsersJoined"], [_handleRemoteUsersLeftDecs, 18, "_handleRemoteUsersLeft"], [_handleAllUserCountUpdatedDecs, 18, "_handleAllUserCountUpdated"], [_getWaitingRoomUserCountDecs, 18, "_getWaitingRoomUserCount"], [_handleRemoteWaitingUserLeftDecs, 18, "_handleRemoteWaitingUserLeft"], [_handleRemoteWaitingUserJoinedDecs, 18, "_handleRemoteWaitingUserJoined"], [_handleUserInfoUpdatedDecs, 18, "_handleUserInfoUpdated"], [_handleLiveStreamingStateUpdatedDecs, 18, "_handleLiveStreamingStateUpdated"], [_handleChatVisibleDecs, 18, "_handleChatVisible"], [_handlerTraceScreenCaptureStateUpdateDecs, 18, "_handlerTraceScreenCaptureStateUpdate"], [_decorator.bound, 2, "setAllowWaterMark"], [_decorator.bound, 2, "setWaterMarkLineType"], [_decorator.bound, 2, "_onEvent"], [_operateWaitingRoomDecs, 18, "_operateWaitingRoom"], [_handleCloudRecordingStateUpdatedDecs, 18, "_handleCloudRecordingStateUpdated"], [_handleStreamsAddedOrUpdatedDecs, 18, "_handleStreamsAddedOrUpdated"], [_decorator.bound, 2, "setParticipantsPopoverOpened"], [_handleNewMessageEventDecs, 16, "_handleNewMessageEvent"]], []).e, 24);
 _init_users = _applyDecs$e[0];
 _init_newMessageTooltipVisible = _applyDecs$e[1];
 _init_newMessageCount = _applyDecs$e[2];

package/lib/modules/member-layout/view.js

@@ -69,7 +69,7 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     participantCount = participantStore.participantCount;
   var isWaterMarkEnabled = securityStore.isWaterMarkEnabled,
     getWaterMarkContent = securityStore.getWaterMarkContent,
-    isMulti = securityStore.isMulti;
+    isWatermarkMultiRow = securityStore.isWatermarkMultiRow;
   var autoPlayFailedDialogShow = deviceStore.autoPlayFailedDialogShow,
     setAutoPlayFailedDialogShow = deviceStore.setAutoPlayFailedDialogShow;
   var memberLayoutRef = (0, _react.useRef)(null);
@@ -202,9 +202,9 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_mobile.FcrMobileWaterMark, {
     content: isWaterMarkEnabled() ? [getWaterMarkContent()] : [],
-    width: isMulti() ? 140 : window.screen.width,
-    height: isMulti() ? 80 : containerHeight,
-    multiLine: Boolean(isMulti()),
+    width: isWatermarkMultiRow() ? 140 : window.screen.width,
+    height: isWatermarkMultiRow() ? 80 : containerHeight,
+    multiLine: Boolean(isWatermarkMultiRow()),
     children: [(shareScreenUser.userId || hasShareBoard) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareToast["default"], {
       isShareBoard: hasShareBoard
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/ui-manager.d.ts

@@ -23,6 +23,8 @@ export declare class DefaultSceneUIManager {
     _eventToastUIModule: any;
     constructor(_sceneConfig: FcrUISceneConfig, _engine: FcrCoreEngine, _observable: AgoraObservable<FcrUISceneObserver>);
     private _initWhiteBoardUIModule;
+    private _renderWithErrorBoundary;
+    private _logError;
     private _initChatUIModule;
     render(dom: HTMLElement): void;
     private renderMainMobile;

package/lib/ui-manager.js

@@ -76,6 +76,8 @@ var _audioStream = require("./modules/audio-stream");
 var _type6 = require("fcr-core/lib/type");
 var _toast = require("agora-ui-foundation/lib/components/toast");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _reactErrorBoundary = require("react-error-boundary");
+var _errorFallback = require("./error-fallback");
 var _jsxRuntime = require("react/jsx-runtime");
 var _DefaultSceneUIManager;
 var _initProto;
@@ -115,6 +117,31 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
       });
       return this._whiteBoradUIModule;
     }
+  }, {
+    key: "_renderWithErrorBoundary",
+    value: function _renderWithErrorBoundary(layoutComponent, spaceName) {
+      var _this = this;
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactErrorBoundary.ErrorBoundary, {
+        FallbackComponent: _errorFallback.ErrorFallback,
+        onError: function onError(error, info) {
+          return _this._logError(error, info, spaceName);
+        },
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          style: {
+            width: '100vw',
+            height: '100vh'
+          },
+          children: layoutComponent
+        })
+      });
+    }
+  }, {
+    key: "_logError",
+    value: function _logError(error, info, space) {
+      var errorMessage = "[DefaultSceneUIManager H5]: ErrorBoundary wrap ".concat(space, " error:");
+      var componentStackMessage = "componentStack: ".concat(info.componentStack);
+      this.logger.error("".concat(errorMessage, "\n") + "  Error: ".concat(error.message, "\n") + "  Stack: ".concat(error.stack, "\n") + "  ".concat(componentStackMessage));
+    }
   }, {
     key: "_initChatUIModule",
     value: function _initChatUIModule() {
@@ -131,7 +158,7 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
   }, {
     key: "render",
     value: function render(dom) {
-      var _this = this;
+      var _this2 = this;
       this._dom = dom;
       if (!this._dom) {
         this.logger.error('Scene UI cannot be rendered as dom is not exist');
@@ -142,12 +169,12 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
           return _regenerator["default"].wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                return _context.abrupt("return", _this._engine.login().then(function () {
-                  return _this._handleJoinRoom();
+                return _context.abrupt("return", _this2._engine.login().then(function () {
+                  return _this2._handleJoinRoom();
                 }).then(function () {
-                  _this.renderMainMobile();
+                  _this2.renderMainMobile();
                 })["catch"](function (e) {
-                  _this._observable.notifyObservers('onLaunchFailure', _this._sceneConfig.roomId, e);
+                  _this2._observable.notifyObservers('onLaunchFailure', _this2._sceneConfig.roomId, e);
                 }));
               case 1:
               case "end":
@@ -165,7 +192,7 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
     key: "renderMainMobile",
     value: function renderMainMobile() {
       var _this$_initChatUIModu,
-        _this2 = this;
+        _this3 = this;
       /**
        * Common Stores
        */
@@ -252,25 +279,25 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
           participantStore: this._participantStore,
           securityStore: this._securityStore
         },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        children: this._renderWithErrorBoundary(/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           style: {
             width: '100vw',
             height: '100vh'
           },
           children: layoutComponent
-        })
+        }), 'h5-mainroom')
       }), this._dom);
       this._eventObserver = {
         onEvent: function onEvent(action, payload) {
           if (action === _constant.UIAction.EXIT_ROOM) {
-            _this2._observable.notifyObservers('onExited', _this2._sceneConfig.roomId, payload.reason, _this2._mainRoomControl);
+            _this3._observable.notifyObservers('onExited', _this3._sceneConfig.roomId, payload.reason, _this3._mainRoomControl);
           }
         }
       };
       this._roomObserver = {
         onRoomStateUpdated: function onRoomStateUpdated(roomId, state) {
           if (state === _type6.FcrRoomState.Closed) {
-            _this2._observable.notifyObservers('onExited', roomId, _type.FcrUIExitReason.CLOSE_ROOM);
+            _this3._observable.notifyObservers('onExited', roomId, _type.FcrUIExitReason.CLOSE_ROOM);
           }
         }
       };
@@ -301,7 +328,7 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
     key: "_createRoomControl",
     value: function () {
       var _createRoomControl2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(roomId) {
-        var _this3 = this;
+        var _this4 = this;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -311,8 +338,8 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
                   return _regenerator["default"].wrap(function _callee2$(_context2) {
                     while (1) switch (_context2.prev = _context2.next) {
                       case 0:
-                        engine = _this3._engine;
-                        config = _this3._sceneConfig;
+                        engine = _this4._engine;
+                        config = _this4._sceneConfig;
                         if (engine) {
                           _context2.next = 4;
                           break;
@@ -377,22 +404,22 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
     key: "_handleJoinRoom",
     value: function () {
       var _handleJoinRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var _this4 = this;
+        var _this5 = this;
         return _regenerator["default"].wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               return _context4.abrupt("return", this._createRoomControl(this._sceneConfig.roomId).then(function (room) {
                 var roomInfo = room.getRoomInfo();
                 if ((roomInfo === null || roomInfo === void 0 ? void 0 : roomInfo.roomType) === _type5.FcrRoomType.Mainroom) {
-                  _this4._mainRoomControl = room;
-                  _this4._mainRoomControl.addObserver(_this4._roomObserver);
+                  _this5._mainRoomControl = room;
+                  _this5._mainRoomControl.addObserver(_this5._roomObserver);
                   // @ts-ignore
                   window.__mainRoom_control = room;
                   return _type5.FcrRoomType.Mainroom;
                 } else if ((roomInfo === null || roomInfo === void 0 ? void 0 : roomInfo.roomType) === _type5.FcrRoomType.Waitingroom) {
-                  _this4._waitingRoomControl = room;
-                  if (_this4._waitingRoomControl) {
-                    _this4._waitingRoomControl.leave();
+                  _this5._waitingRoomControl = room;
+                  if (_this5._waitingRoomControl) {
+                    _this5._waitingRoomControl.leave();
                   }
                   _toast.FcrToastApi.open({
                     toastProps: {
@@ -403,7 +430,7 @@ var DefaultSceneUIManager = exports.DefaultSceneUIManager = /*#__PURE__*/functio
                   throw new Error('host_enabled_waiting_room');
                 }
               })["catch"](function (e) {
-                _this4._observable.notifyObservers('onLaunchFailure', _this4._sceneConfig.roomId, e);
+                _this5._observable.notifyObservers('onLaunchFailure', _this5._sceneConfig.roomId, e);
                 throw e;
               }));
             case 1:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fcr-ui-scene-mobile",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "main": "lib/index.js",
   "repository": "ssh://git@git.agoralab.co/aduc/fcr-ui-scene-mobile.git",
   "author": "agora.io",
@@ -14,27 +14,28 @@
   "dependencies": {
     "@react-spring/web": "^9.7.3",
     "@use-gesture/react": "^10.3.1",
+    "agora-foundation": "^3.4.1",
+    "agora-ui-foundation": "^3.4.1",
     "classnames": "^2.5.1",
     "core-js": "^3.33.3",
     "dayjs": "^1.10.4",
+    "fcr-core": "^3.4.1",
     "js-md5": "^0.8.3",
+    "jszip": "^3.10.1",
     "lodash": "^4.17.21",
     "mobx": "^6.12.3",
     "mobx-react": "^9.1.1",
     "mobx-utils": "^6.0.8",
+    "pidusage": "^3.0.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-rnd": "^10.4.1",
+    "react-error-boundary": "^5.0.0",
     "react-use-measure": "^2.1.1",
     "react-virtualized": "^9.22.5",
-    "tinycolor2": "^1.6.0",
-    "pidusage": "^3.0.2",
     "systeminformation": "^5.22.11",
-    "jszip": "^3.10.1",
-    "winston": "^3.16.0",
-    "agora-foundation": "^3.4.0",
-    "agora-ui-foundation": "^3.4.0",
-    "fcr-core": "^3.4.0"
+    "tinycolor2": "^1.6.0",
+    "winston": "^3.16.0"
   },
   "devDependencies": {
     "@babel/core": "^7.23.5",
@@ -49,13 +50,13 @@
     "@types/react-dom": "^17.0.11",
     "@types/react-virtualized": "^9.21.30",
     "@types/tinycolor2": "^1.4.6",
+    "agora-toolchain": "^3.4.1",
     "core-js": "^3.33.3",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.2",
     "prettier": "^3.2.5",
     "react-hot-loader": "^4.13.1",
-    "tslib": "^2.6.2",
-    "agora-toolchain": "^3.4.0"
+    "tslib": "^2.6.2"
   },
   "lint-staged": {
     "*.{ts,tsx,html,css}": "prettier --write"