fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib-es/scenes/main-scene.js

@@ -20,23 +20,24 @@ import "core-js/modules/esnext.iterator.map.js";
 import "core-js/modules/web.timers.js";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-import { transI18n } from 'agora-ui-foundation/lib/i18n';
 import ReactDOM from 'react-dom';
 import { ActionBarMainSceneUIModule } from '../modules/action-bar/main-scene';
 import { AudioStreamUIModule } from '../modules/audio-stream';
 import { ChatUIModule } from '../modules/chat';
 import { SubtitlesHistoryUIModule } from '../modules/subtitles-history';
 import { ControlBarUIModule } from '../modules/control-bar';
-import { ChatDialog, windowConfig as chatDialogWindowConfig } from '../modules/dialog/dialogs/chat';
-import { ConnectionGatewayDialog, windowConfig as connectionGatewayDialogWindowConfig } from '../modules/dialog/dialogs/connection-gateway';
-import { ControlBarDialog, windowConfig as controlBarDialogWindowConfig } from '../modules/dialog/dialogs/control-bar';
-import { InterpreterDialog, windowConfig as interpreterDialogWindowConfig } from '../modules/dialog/dialogs/interpreter';
-import { InviteDialog, windowConfig as inviteDialogWindowConfig } from '../modules/dialog/dialogs/invite';
-import { LiveStreamingDialog, windowConfig as liveStreamingDialogWindowConfig } from '../modules/dialog/dialogs/live-streaming';
-import { ParticipantDialog, windowConfig as participantDialogWindowConfig } from '../modules/dialog/dialogs/participant';
-import { revokeHostWindowConfig, SystemPreferenceDialog } from '../modules/dialog/dialogs/system-preference';
+import { ChatDialog, electronWindowConfig as chatDialogWindowConfig, webDialogConfig as chatWebDialogConfig } from '../modules/dialog/dialogs/chat';
+import { ConnectionGatewayDialog, electronWindowConfig as connectionGatewayDialogWindowConfig, webDialogConfig as connectionGatewayWebDialogConfig } from '../modules/dialog/dialogs/connection-gateway';
+import { ControlBarDialog, electronWindowConfig as controlBarDialogWindowConfig } from '../modules/dialog/dialogs/control-bar';
+import { InterpreterDialog, electronWindowConfig as interpreterDialogWindowConfig, webDialogConfig as interpreterWebDialogConfig } from '../modules/dialog/dialogs/interpreter';
+import { InviteDialog, electronWindowConfig as inviteDialogWindowConfig } from '../modules/dialog/dialogs/invite';
+import { LiveStreamingDialog, electronWindowConfig as liveStreamingDialogWindowConfig } from '../modules/dialog/dialogs/live-streaming';
+import { ParticipantDialog, electronWindowConfig as participantDialogWindowConfig, webDialogConfig as participantWebDialogConfig } from '../modules/dialog/dialogs/participant';
+import { electronRevokeHostWindowConfig, webRevokeHostWindowConfig, SystemPreferenceDialog } from '../modules/dialog/dialogs/system-preference';
 import { WhiteboardDialog } from '../modules/dialog/dialogs/whiteboard';
-import { VideoWindowDialog, windowConfig as videoWindowConfig } from '../modules/dialog/dialogs/video-window';
+import { VideoWindowDialog, electronWindowConfig as videoWindowConfig } from '../modules/dialog/dialogs/video-window';
+import { AnnotationMask, electronWindowConfig as annotationMaskWindowConfig } from '../modules/dialog/dialogs/annotation-mask';
+import { AnnotationTool, electronWindowConfig as annotationToolWindowConfig } from '../modules/dialog/dialogs/annotation-tool';
 import { InterpreterUIModule } from '../modules/interpreter';
 import { InviteUIModule } from '../modules/invite';
 import { LayoutUIModule } from '../modules/layout';
@@ -57,24 +58,27 @@ import { FcrBaseUIScene } from '../base';
 import { PcAudioConnectionUIModule } from '../modules/pc-audio-connect/main-scene';
 import { PhoneAudioConnectionUIModule } from '../modules/phone-audio-connect';
 import { jsonstring } from 'agora-foundation/lib/utilities/misc';
-import { WidgetDialog, windowConfig as widgetDialogWindowConfig } from '../modules/dialog/dialogs/widget';
+import { WidgetDialog, electronWindowConfig as widgetDialogWindowConfig } from '../modules/dialog/dialogs/widget';
 import { WebWidgetUIModule } from '../modules/widget';
-import { RenameDialog, windowConfig as renameDialogWindowConfig } from '../modules/dialog/dialogs/rename';
-import { ConfirmLeaveMeetingDialog, windowConfig as confirmLeaveMeetingDialogWindowConfig } from '../modules/dialog/dialogs/confirm-leave-meeting';
-import { EndMeetingDialog, windowConfig as endMeetingDialogWindowConfig } from '../modules/dialog/dialogs/end-meeting';
-import { SubWindowDialog, windowConfig as subWindowDialogWindowConfig } from '../modules/dialog/dialogs/sub-window';
+import { RenameDialog, electronWindowConfig as renameDialogWindowConfig } from '../modules/dialog/dialogs/rename';
+import { ConfirmEndMeetingDialog, electronWindowConfig as confirmLeaveMeetingDialogWindowConfig } from '../modules/dialog/dialogs/confirm-leave-meeting';
+import { ExitMeetingNoticeDialog, electronWindowConfig as endMeetingDialogWindowConfig } from '../modules/dialog/dialogs/end-meeting-notice';
+import { SubWindowDialog, electronWindowConfig as subWindowDialogWindowConfig } from '../modules/dialog/dialogs/sub-window';
 import { FcrUISecondaryWindowModule } from '../modules/secondary-window';
 import { FcrUIObjectKeys } from '../object-manager';
 import { createLogger } from '../utilities/logger';
-import { ShareScreenSelectionDialog, windowConfig as shareScreenSelectionDialogWindowConfig } from '../modules/dialog/dialogs/share-screen-selection';
+import { ShareScreenSelectionDialog, electronWindowConfig as shareScreenSelectionDialogWindowConfig } from '../modules/dialog/dialogs/share-screen-selection';
 import { StateBarMainSceneUIModule } from '../modules/state-bar/main-scene';
-import { MuteAllDialog, windowConfig as muteAllDialogWindowConfig } from '../modules/dialog/dialogs/mute-all';
-import { ControlBarLeaveMeetingDialog, windowConfig as controlBarLeaveMeetingDialogWindowConfig } from '../modules/dialog/dialogs/control-bar-leave-meeting';
+import { MuteAllDialog, electronWindowConfig as muteAllDialogWindowConfig } from '../modules/dialog/dialogs/mute-all';
+import { ControlBarLeaveMeetingDialog, electronWindowConfig as controlBarLeaveMeetingDialogWindowConfig } from '../modules/dialog/dialogs/control-bar-leave-meeting';
 import { CaptionUIModule } from '../modules/caption';
-import { SubtitlesHistoryDialog, windowConfig as subtitlesHistoryDialogWindowConfig } from '../modules/dialog/dialogs/subtitles-history';
-import { isMac } from '../utilities/platform';
+import { SubtitlesHistoryDialog, electronWindowConfig as subtitlesHistoryDialogWindowConfig, webDialogConfig as subtitlesHistoryWebDialogConfig } from '../modules/dialog/dialogs/subtitles-history';
+import { isMac } from 'agora-foundation/lib/utilities/env';
 import { isElectron } from 'agora-foundation/lib/utilities/env';
-import { CaptionDialog, windowConfig as captionDialogWindowConfig } from '../modules/dialog/dialogs/caption';
+import { CaptionDialog, electronWindowConfig as captionDialogWindowConfig } from '../modules/dialog/dialogs/caption';
+import { AnnotationUIModule } from '../modules/annotation';
+import { FcrUIToastKey } from '../modules/toast-manager/type';
+import { ToastManagerUIModule } from '../modules/toast-manager';
 import { jsx as _jsx } from "react/jsx-runtime";
 export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
   function FcrMainUIScene(args) {
@@ -148,7 +152,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             });
           }
         }
-        if (dialogKey === FcrUIDialogKey.LEAVE_MEETING) {
+        if (dialogKey === FcrUIDialogKey.CONFIRM_END_MEETING) {
           window.setAlwaysOnTop(true, isMac() ? 'floating' : 'normal');
           if (isMac()) {
             window.setVisibleOnAllWorkspaces(true, {
@@ -177,6 +181,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
       var whiteBoradUIModule = new FcrWhiteboardUIModule(this);
       var actionBarUIModule = new ActionBarMainSceneUIModule(this);
       var controlbarUIModule = new ControlBarUIModule(this);
+      var annotationUIModule = new AnnotationUIModule(this);
       var layoutModule = new LayoutUIModule(this);
       var captionUIModule = new CaptionUIModule(this);
       var eventNotificationUIModule = new NotificationUIModule(this);
@@ -186,6 +191,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
       var phoneAudioConnection = new PhoneAudioConnectionUIModule(this);
       var webWidgetUIModule = new WebWidgetUIModule(this);
       var displayDistributionModule = new FcrUISecondaryWindowModule(this);
+      var toastManagerUIModule = new ToastManagerUIModule(this);
       var localVideoRenderProvider = this.objectManager.getObject(FcrUIObjectKeys.P_LOCAL_VIDEO_RENDER_PROVIDER);
       var remoteVideoRenderProvider = this.objectManager.getObject(FcrUIObjectKeys.P_REMOTE_VIDEO_RENDER_PROVIDER);
       var dialogProvider = this.objectManager.getObject(FcrUIObjectKeys.P_DIALOG_PROVIDER);
@@ -210,6 +216,8 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
       this.addSubNode(webWidgetUIModule);
       this.addSubNode(displayDistributionModule);
       this.addSubNode(captionUIModule);
+      this.addSubNode(annotationUIModule);
+      this.addSubNode(toastManagerUIModule);
       // add dialogs
       dialogProvider.addDialogs([{
         key: FcrUIDialogKey.INTERPRETER,
@@ -224,7 +232,8 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             children: interpreterUIModule.getComponent()
           }, dialogId);
         },
-        windowConfig: interpreterDialogWindowConfig
+        electronWindowConfig: interpreterDialogWindowConfig,
+        webDialogConfig: interpreterWebDialogConfig
       }, {
         key: FcrUIDialogKey.WIDGET,
         component: function component(_ref4) {
@@ -238,7 +247,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             children: webWidgetUIModule.getComponent(params)
           }, dialogId);
         },
-        windowConfig: widgetDialogWindowConfig
+        electronWindowConfig: widgetDialogWindowConfig
       }, {
         key: FcrUIDialogKey.PARTICIPANT,
         component: function component(_ref5) {
@@ -254,7 +263,8 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             children: participantsModule.getComponent()
           }, dialogId);
         },
-        windowConfig: participantDialogWindowConfig
+        electronWindowConfig: participantDialogWindowConfig,
+        webDialogConfig: participantWebDialogConfig
       }, {
         key: FcrUIDialogKey.SUBTITLES_HISTORY,
         component: function component(_ref6) {
@@ -270,7 +280,8 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             children: subtitlesHistoryModule.getComponent()
           }, dialogId);
         },
-        windowConfig: subtitlesHistoryDialogWindowConfig
+        electronWindowConfig: subtitlesHistoryDialogWindowConfig,
+        webDialogConfig: subtitlesHistoryWebDialogConfig
       }, {
         key: FcrUIDialogKey.CAPTION,
         component: function component(_ref7) {
@@ -287,7 +298,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             children: captionUIModule.getComponent()
           }, dialogId);
         },
-        windowConfig: captionDialogWindowConfig
+        electronWindowConfig: captionDialogWindowConfig
       }, {
         key: FcrUIDialogKey.LIVE_STREAMING,
         component: function component(_ref8) {
@@ -301,7 +312,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             children: liveStreamingUIModule.getComponent()
           }, dialogId);
         },
-        windowConfig: liveStreamingDialogWindowConfig
+        electronWindowConfig: liveStreamingDialogWindowConfig
       }, {
         key: FcrUIDialogKey.INVITE,
         component: function component(_ref9) {
@@ -317,7 +328,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             })
           }, dialogId);
         },
-        windowConfig: inviteDialogWindowConfig
+        electronWindowConfig: inviteDialogWindowConfig
       }, {
         key: FcrUIDialogKey.CHAT,
         component: function component(_ref0) {
@@ -336,7 +347,8 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             })
           }, dialogId);
         },
-        windowConfig: chatDialogWindowConfig
+        electronWindowConfig: chatDialogWindowConfig,
+        webDialogConfig: chatWebDialogConfig
       }, {
         key: FcrUIDialogKey.VIDEO_WINDOW,
         component: function component(_ref1) {
@@ -350,7 +362,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             children: videoWindowModule.getComponent()
           }, dialogId);
         },
-        windowConfig: videoWindowConfig
+        electronWindowConfig: videoWindowConfig
       }, {
         key: FcrUIDialogKey.CONNECTION_GATEWAY,
         component: function component(_ref10) {
@@ -367,7 +379,8 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             })
           }, dialogId);
         },
-        windowConfig: connectionGatewayDialogWindowConfig
+        electronWindowConfig: connectionGatewayDialogWindowConfig,
+        webDialogConfig: connectionGatewayWebDialogConfig
       }, {
         key: FcrUIDialogKey.WHITEBOARD,
         component: function component(_ref11) {
@@ -380,7 +393,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             params: params
           }, dialogId);
         },
-        windowConfig: {}
+        electronWindowConfig: {}
       }, {
         key: FcrUIDialogKey.SHARE_SCREEN_SELECTION,
         component: function component(_ref12) {
@@ -394,7 +407,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             children: shareScreenModule.getSelectionComponent()
           }, dialogId);
         },
-        windowConfig: shareScreenSelectionDialogWindowConfig
+        electronWindowConfig: shareScreenSelectionDialogWindowConfig
       }, {
         key: FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR,
         component: function component(_ref13) {
@@ -408,116 +421,132 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             children: controlbarUIModule.getComponent()
           }, dialogId);
         },
-        windowConfig: controlBarDialogWindowConfig
+        electronWindowConfig: controlBarDialogWindowConfig
       }, {
-        key: FcrUIDialogKey.SYSTEM_PREFERENCE,
+        key: FcrUIDialogKey.RENAME,
         component: function component(_ref14) {
           var dialogKey = _ref14.dialogKey,
             dialogId = _ref14.dialogId,
             params = _ref14.params;
-          return /*#__PURE__*/_jsx(SystemPreferenceDialog, {
+          return /*#__PURE__*/_jsx(RenameDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            params: params
+            params: params,
+            children: participantsModule.getRenameDialogContent()
           }, dialogId);
         },
-        windowConfig: {}
+        electronWindowConfig: renameDialogWindowConfig
       }, {
-        key: FcrUIDialogKey.RENAME,
+        key: FcrUIDialogKey.CONFIRM_END_MEETING,
         component: function component(_ref15) {
           var dialogKey = _ref15.dialogKey,
             dialogId = _ref15.dialogId,
             params = _ref15.params;
-          return /*#__PURE__*/_jsx(RenameDialog, {
+          return /*#__PURE__*/_jsx(ConfirmEndMeetingDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
             params: params,
-            children: participantsModule.getRenameDialogContent()
+            children: actionBarUIModule.getConfirmEndMeetingComponent(dialogId)
           }, dialogId);
         },
-        windowConfig: renameDialogWindowConfig
+        electronWindowConfig: confirmLeaveMeetingDialogWindowConfig
       }, {
-        key: FcrUIDialogKey.LEAVE_MEETING,
+        key: FcrUIDialogKey.EXIT_MEETING_NOTICE,
         component: function component(_ref16) {
           var dialogKey = _ref16.dialogKey,
             dialogId = _ref16.dialogId,
             params = _ref16.params;
-          return /*#__PURE__*/_jsx(ConfirmLeaveMeetingDialog, {
+          return /*#__PURE__*/_jsx(ExitMeetingNoticeDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            params: params,
-            children: actionBarUIModule.getConfirmLeaveMeetingComponent(dialogId)
+            params: params
           }, dialogId);
         },
-        windowConfig: confirmLeaveMeetingDialogWindowConfig
+        electronWindowConfig: endMeetingDialogWindowConfig
       }, {
-        key: FcrUIDialogKey.END_MEETING,
+        key: FcrUIDialogKey.SUB_WINDOW,
         component: function component(_ref17) {
           var dialogKey = _ref17.dialogKey,
             dialogId = _ref17.dialogId,
             params = _ref17.params;
-          return /*#__PURE__*/_jsx(EndMeetingDialog, {
+          return /*#__PURE__*/_jsx(SubWindowDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            params: params
+            params: params,
+            children: displayDistributionModule.component(shareScreenModule)
           }, dialogId);
         },
-        windowConfig: endMeetingDialogWindowConfig
+        electronWindowConfig: subWindowDialogWindowConfig
       }, {
-        key: FcrUIDialogKey.SUB_WINDOW,
+        key: FcrUIDialogKey.REVOKE_HOST,
         component: function component(_ref18) {
           var dialogKey = _ref18.dialogKey,
             dialogId = _ref18.dialogId,
             params = _ref18.params;
-          return /*#__PURE__*/_jsx(SubWindowDialog, {
+          return /*#__PURE__*/_jsx(SystemPreferenceDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            params: params,
-            children: displayDistributionModule.component(shareScreenModule)
+            params: params
           }, dialogId);
         },
-        windowConfig: subWindowDialogWindowConfig
+        electronWindowConfig: electronRevokeHostWindowConfig,
+        webDialogConfig: webRevokeHostWindowConfig
       }, {
-        key: FcrUIDialogKey.REVOKE_HOST,
+        key: FcrUIDialogKey.MUTE_ALL,
         component: function component(_ref19) {
           var dialogKey = _ref19.dialogKey,
             dialogId = _ref19.dialogId,
             params = _ref19.params;
-          return /*#__PURE__*/_jsx(SystemPreferenceDialog, {
+          return /*#__PURE__*/_jsx(MuteAllDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
-            params: params
+            params: params,
+            children: participantsModule.getMuteAllDialogContent()
           }, dialogId);
         },
-        windowConfig: revokeHostWindowConfig
+        electronWindowConfig: muteAllDialogWindowConfig
       }, {
-        key: FcrUIDialogKey.MUTE_ALL,
+        key: FcrUIDialogKey.CONTROL_BAR_LEAVE_MEETING,
         component: function component(_ref20) {
           var dialogKey = _ref20.dialogKey,
             dialogId = _ref20.dialogId,
             params = _ref20.params;
-          return /*#__PURE__*/_jsx(MuteAllDialog, {
+          return /*#__PURE__*/_jsx(ControlBarLeaveMeetingDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
             params: params,
-            children: participantsModule.getMuteAllDialogContent()
+            children: controlbarUIModule.getLeaveMeetingComponent()
           }, dialogId);
         },
-        windowConfig: muteAllDialogWindowConfig
+        electronWindowConfig: controlBarLeaveMeetingDialogWindowConfig
       }, {
-        key: FcrUIDialogKey.CONTROL_BAR_LEAVE_MEETING,
+        key: FcrUIDialogKey.ANNOTATION_MASK,
         component: function component(_ref21) {
           var dialogKey = _ref21.dialogKey,
             dialogId = _ref21.dialogId,
             params = _ref21.params;
-          return /*#__PURE__*/_jsx(ControlBarLeaveMeetingDialog, {
+          return /*#__PURE__*/_jsx(AnnotationMask, {
             dialogKey: dialogKey,
             dialogId: dialogId,
             params: params,
-            children: controlbarUIModule.getLeaveMeetingComponent()
+            children: annotationUIModule.getBoardComponent()
+          }, dialogId);
+        },
+        electronWindowConfig: annotationMaskWindowConfig
+      }, {
+        key: FcrUIDialogKey.ANNOTATION_TOOLBAR,
+        component: function component(_ref22) {
+          var dialogKey = _ref22.dialogKey,
+            dialogId = _ref22.dialogId,
+            params = _ref22.params;
+          return /*#__PURE__*/_jsx(AnnotationTool, {
+            dialogKey: dialogKey,
+            dialogId: dialogId,
+            params: params,
+            children: annotationUIModule.getBoardToolComponent()
           }, dialogId);
         },
-        windowConfig: controlBarLeaveMeetingDialogWindowConfig
+        electronWindowConfig: annotationToolWindowConfig
       }]);
       var getView = function getView() {
         return /*#__PURE__*/_jsx(FcrVideoTrackRenderContext.Provider, {
@@ -542,7 +571,8 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
               subtitles: captionUIModule.getDraggableComponent(),
               layers: _this2.renderLayers([eventNotificationUIModule.getComponent(), shareScreenModule.getComponent()]),
               whiteboard: whiteBoradUIModule.getComponent(),
-              screenShareControl: shareScreenModule.getControlComponent()
+              screenShareControl: shareScreenModule.getControlComponent(),
+              annotation: annotationUIModule.getComponent()
             })
           }), 'mainroom')
         });
@@ -555,7 +585,7 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
       var dialogProvider = this.objectManager.getObject(FcrUIObjectKeys.P_DIALOG_PROVIDER);
 
       // add dialogs
-      dialogProvider.removeDialogs([FcrUIDialogKey.INTERPRETER, FcrUIDialogKey.WIDGET, FcrUIDialogKey.PARTICIPANT, FcrUIDialogKey.LIVE_STREAMING, FcrUIDialogKey.INVITE, FcrUIDialogKey.CHAT, FcrUIDialogKey.VIDEO_WINDOW, FcrUIDialogKey.CONNECTION_GATEWAY, FcrUIDialogKey.WHITEBOARD, FcrUIDialogKey.SHARE_SCREEN_SELECTION, FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR, FcrUIDialogKey.SYSTEM_PREFERENCE, FcrUIDialogKey.RENAME, FcrUIDialogKey.LEAVE_MEETING, FcrUIDialogKey.END_MEETING, FcrUIDialogKey.SUB_WINDOW, FcrUIDialogKey.SUBTITLES_HISTORY, FcrUIDialogKey.CAPTION]);
+      dialogProvider.removeDialogs([FcrUIDialogKey.INTERPRETER, FcrUIDialogKey.WIDGET, FcrUIDialogKey.PARTICIPANT, FcrUIDialogKey.LIVE_STREAMING, FcrUIDialogKey.INVITE, FcrUIDialogKey.CHAT, FcrUIDialogKey.VIDEO_WINDOW, FcrUIDialogKey.CONNECTION_GATEWAY, FcrUIDialogKey.WHITEBOARD, FcrUIDialogKey.SHARE_SCREEN_SELECTION, FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR, FcrUIDialogKey.RENAME, FcrUIDialogKey.CONFIRM_END_MEETING, FcrUIDialogKey.EXIT_MEETING_NOTICE, FcrUIDialogKey.SUB_WINDOW, FcrUIDialogKey.SUBTITLES_HISTORY, FcrUIDialogKey.CAPTION, FcrUIDialogKey.ANNOTATION_MASK, FcrUIDialogKey.ANNOTATION_TOOLBAR]);
       ReactDOM.unmountComponentAtNode(dom);
     }
   }, {
@@ -603,10 +633,9 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
                 media: media,
                 setting: setting
               }));
-              showToast = function showToast(content) {
-                messageProvider.showToast({
-                  type: 'error',
-                  message: content
+              showToast = function showToast(key) {
+                messageProvider.showToastByKey({
+                  key: key
                 });
               };
               allowJoinWithCloseVideo = privilegeProvider.isJoinWithMutedVideoEnabled();
@@ -617,13 +646,13 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
               if (deviceProvider.ifNeedExecuteOpenCamera()) {
                 isJoinWithCloseVideo = allowJoinWithCloseVideo && !hasOpenCameraPrivilege;
                 if (isJoinWithCloseVideo) {
-                  showToast(transI18n('fmt_attendies_toast_host_turned_off_video'));
+                  showToast(FcrUIToastKey.FMT_ATTENDIES_TOAST_HOST_TURNED_OFF_VIDEO);
                 }
                 deviceProvider.setCameraEnabled(hasOpenCameraPrivilege);
               } else {
                 if (deviceProvider.cameraEnabled) {
                   if (allowJoinWithCloseVideo) {
-                    showToast(transI18n('fmt_attendies_toast_host_turned_off_video'));
+                    showToast(FcrUIToastKey.FMT_ATTENDIES_TOAST_HOST_TURNED_OFF_VIDEO);
                     deviceProvider.setCameraEnabled(hasOpenCameraPrivilege);
                   }
                 }
@@ -636,13 +665,13 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
               if (deviceProvider.ifNeedExecuteAutoConnectAudio()) {
                 isJoinWithMuteAudio = allowJoinWithMuteAudio && !hasOpenMicrophonePrivilege && deviceProvider.shouldEnableMicBeforeSession;
                 if (isJoinWithMuteAudio) {
-                  showToast(transI18n('fmt_attendies_toast_host_enabled_mute'));
+                  showToast(FcrUIToastKey.FMT_ATTENDIES_TOAST_HOST_ENABLED_MUTE);
                 }
                 deviceProvider.connectAudio(hasOpenMicrophonePrivilege);
               } else {
                 if (deviceProvider.microphoneEnabled) {
                   if (allowJoinWithMuteAudio) {
-                    showToast(transI18n('fmt_attendies_toast_host_enabled_mute'));
+                    showToast(FcrUIToastKey.FMT_ATTENDIES_TOAST_HOST_ENABLED_MUTE);
                     deviceProvider.setMicrophoneEnabled(hasOpenMicrophonePrivilege);
                   }
                 }
@@ -681,15 +710,16 @@ export var FcrMainUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
       dialogProvider.closeDialog(FcrUIDialogKey.CONNECTION_GATEWAY);
       dialogProvider.closeDialog(FcrUIDialogKey.SHARE_SCREEN_SELECTION);
       dialogProvider.closeDialog(FcrUIDialogKey.SHARE_SCREEN_CONTROL_BAR);
-      dialogProvider.closeDialog(FcrUIDialogKey.SYSTEM_PREFERENCE);
       dialogProvider.closeDialog(FcrUIDialogKey.RENAME);
-      dialogProvider.closeDialog(FcrUIDialogKey.LEAVE_MEETING);
-      dialogProvider.closeDialog(FcrUIDialogKey.END_MEETING);
+      dialogProvider.closeDialog(FcrUIDialogKey.CONFIRM_END_MEETING);
+      dialogProvider.closeDialog(FcrUIDialogKey.EXIT_MEETING_NOTICE);
       dialogProvider.closeDialog(FcrUIDialogKey.SUB_WINDOW);
       dialogProvider.closeDialog(FcrUIDialogKey.REVOKE_HOST);
       dialogProvider.closeDialog(FcrUIDialogKey.MUTE_ALL);
       dialogProvider.closeDialog(FcrUIDialogKey.CONTROL_BAR_LEAVE_MEETING);
-      dialogProvider.closeDialog(FcrUIDialogKey.END_MEETING);
+      dialogProvider.closeDialog(FcrUIDialogKey.EXIT_MEETING_NOTICE);
+      dialogProvider.closeDialog(FcrUIDialogKey.ANNOTATION_MASK);
+      dialogProvider.closeDialog(FcrUIDialogKey.ANNOTATION_TOOLBAR);
       dialogProvider.closeAllConfirms();
     }
   }]);

package/lib-es/scenes/waiting-scene.js

@@ -14,12 +14,12 @@ import { WaitingRoomLayout } from '../modules/waiting-room-layout';
 import ReactDOM from 'react-dom';
 import { ActionBarWaitingSceneUIModule } from '../modules/action-bar/waiting-scene';
 import { ChatUIModule } from '../modules/chat';
-import { ConnectionGatewayDialog, windowConfig as connectionGatewayDialogWindowConfig } from '../modules/dialog/dialogs/connection-gateway';
+import { ConnectionGatewayDialog, electronWindowConfig as connectionGatewayDialogWindowConfig } from '../modules/dialog/dialogs/connection-gateway';
 import { FcrUIDialogKey } from '../utilities/constant';
 import { FcrBaseUIScene } from '../base';
 import { PcAudioConnectionUIModule } from '../modules/pc-audio-connect/waiting-scene';
 import { jsonstring } from 'agora-foundation/lib/utilities/misc';
-import { EndMeetingDialog } from '../modules/dialog/dialogs/end-meeting';
+import { ExitMeetingNoticeDialog } from '../modules/dialog/dialogs/end-meeting-notice';
 import { FcrUIObjectKeys } from '../object-manager';
 import { createLogger } from '../utilities/logger';
 import { StateBarWaitingSceneUIModule } from '../modules/state-bar/waiting-scene';
@@ -65,14 +65,14 @@ export var FcrWaitingUIScene = /*#__PURE__*/function (_FcrBaseUIScene) {
             children: pcAudioConnectionModule.getComponent()
           }, dialogId);
         },
-        windowConfig: connectionGatewayDialogWindowConfig
+        electronWindowConfig: connectionGatewayDialogWindowConfig
       }, {
-        key: FcrUIDialogKey.END_MEETING,
+        key: FcrUIDialogKey.EXIT_MEETING_NOTICE,
         component: function component(_ref2) {
           var dialogKey = _ref2.dialogKey,
             dialogId = _ref2.dialogId,
             params = _ref2.params;
-          return /*#__PURE__*/_jsx(EndMeetingDialog, {
+          return /*#__PURE__*/_jsx(ExitMeetingNoticeDialog, {
             dialogKey: dialogKey,
             dialogId: dialogId,
             params: params