fcr-ui-scene 3.3.1 → 3.4.1

package/lib/modules/action-bar/device/index.js

@@ -19,18 +19,18 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _popover = require("agora-ui-foundation/lib/components/popover");
 var _radio = require("agora-ui-foundation/lib/components/radio");
 var _mobxReact = require("mobx-react");
-var _context = require("../context");
-var _store = require("../../setting/store");
-var _type2 = require("../type");
+var _store = require("../store");
+var _store2 = require("../../setting/store");
 var _mic = require("agora-ui-foundation/lib/components/icon/mic");
 var _iconPhoneCall = require("agora-ui-foundation/lib/components/icon-phone-call");
+var _deviceStore = require("../../../common/device-store");
 var _jsxRuntime = require("react/jsx-runtime");
 var AudioRecordinDeviceIcon = exports.AudioRecordinDeviceIcon = (0, _mobxReact.observer)(function (_ref) {
   var _ref$size = _ref.size,
     size = _ref$size === void 0 ? 32 : _ref$size,
     _ref$micEnabled = _ref.micEnabled,
     micEnabled = _ref$micEnabled === void 0 ? false : _ref$micEnabled;
-  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     microphoneVolumeLevel = _useContext.microphoneVolumeLevel;
   var muteColor = {
     iconPrimary: "var(--fcr_ui_scene_ramp_red6)",
@@ -48,7 +48,7 @@ var AudioRecordinDeviceIcon = exports.AudioRecordinDeviceIcon = (0, _mobxReact.o
   });
 });
 var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(function () {
-  var _useContext2 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext2 = (0, _react.useContext)(_store.ActionBarContext),
     microphoneEnabled = _useContext2.microphoneEnabled,
     enableMicrophone = _useContext2.enableMicrophone,
     toggleLayoutBarLock = _useContext2.toggleLayoutBarLock,
@@ -83,7 +83,7 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
         className: "fcr-action-bar-device",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
           className: "fcr-action-bar-device-inner",
-          children: [connectType === _type2.ConnectType.NONE && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          children: [connectType === _deviceStore.ConnectType.NONE && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             onClick: function onClick() {
               return openConnection('computer');
             },
@@ -98,7 +98,7 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
               className: "fcr-action-bar-device-text",
               children: transI18n('fmt_toolbar_label_connectaudio')
             })]
-          }), connectType === _type2.ConnectType.COMPUTER && (!noMic ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          }), connectType === _deviceStore.ConnectType.COMPUTER && (!noMic ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             onClick: function onClick() {
               enableMicrophone(!microphoneEnabled);
             },
@@ -117,7 +117,7 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
               className: "fcr-action-bar-device-text",
               children: transI18n('fmt_internalsetting_status_nodevice')
             })]
-          })), connectType === _type2.ConnectType.PHONE && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          })), connectType === _deviceStore.ConnectType.PHONE && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_iconPhoneCall.FcrIconPhoneCall, {
               isMuted: !phoneMicEnabled
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -131,17 +131,17 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
           onVisibleChange: handlePopoverVisibleChanged,
           trigger: "click",
           content: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-            children: [connectType === _type2.ConnectType.NONE && /*#__PURE__*/(0, _jsxRuntime.jsx)(NoConnectionPopoverContent, {
+            children: [connectType === _deviceStore.ConnectType.NONE && /*#__PURE__*/(0, _jsxRuntime.jsx)(NoConnectionPopoverContent, {
               onItemClick: function onItemClick() {
                 handlePopoverVisibleChanged(false);
                 setPopoverOpened(false);
               }
-            }), connectType === _type2.ConnectType.COMPUTER && /*#__PURE__*/(0, _jsxRuntime.jsx)(AudioDeviceListPopoverContent, {
+            }), connectType === _deviceStore.ConnectType.COMPUTER && /*#__PURE__*/(0, _jsxRuntime.jsx)(AudioDeviceListPopoverContent, {
               setPopoverOpened: setPopoverOpened,
               onConnectClick: function onConnectClick() {
                 handlePopoverVisibleChanged(false);
               }
-            }), connectType === _type2.ConnectType.PHONE && /*#__PURE__*/(0, _jsxRuntime.jsx)(PhonePopoverContent, {
+            }), connectType === _deviceStore.ConnectType.PHONE && /*#__PURE__*/(0, _jsxRuntime.jsx)(PhonePopoverContent, {
               onItemClick: function onItemClick() {
                 handlePopoverVisibleChanged(false);
                 setPopoverOpened(false);
@@ -168,7 +168,7 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
 });
 var CameraDevice = exports.CameraDevice = (0, _mobxReact.observer)(function () {
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext3 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext3 = (0, _react.useContext)(_store.ActionBarContext),
     cameraEnabled = _useContext3.cameraEnabled,
     enableCamera = _useContext3.enableCamera,
     toggleLayoutBarLock = _useContext3.toggleLayoutBarLock,
@@ -290,7 +290,7 @@ var VideoDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref2) {
   var onMoreClick = _ref2.onMoreClick,
     setPopoverOpened = _ref2.setPopoverOpened;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext4 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext4 = (0, _react.useContext)(_store.ActionBarContext),
     openDeviceSettingDialog = _useContext4.openDeviceSettingDialog,
     cameraList = _useContext4.cameraList,
     cameraId = _useContext4.cameraId,
@@ -304,7 +304,7 @@ var VideoDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref2) {
   var openDeviceSetting = function openDeviceSetting(videoActiveTab) {
     setPopoverOpened(false);
     openDeviceSettingDialog({
-      activeTab: _store.DeviceSettingTab.VIDEO,
+      activeTab: _store2.DeviceSettingTab.VIDEO,
       videoActiveTab: videoActiveTab
     });
   };
@@ -381,7 +381,7 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
   var onConnectClick = _ref3.onConnectClick,
     setPopoverOpened = _ref3.setPopoverOpened;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext5 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext5 = (0, _react.useContext)(_store.ActionBarContext),
     openDeviceSettingDialog = _useContext5.openDeviceSettingDialog,
     microphoneId = _useContext5.microphoneId,
     setMicrophoneId = _useContext5.setMicrophoneId,
@@ -391,8 +391,7 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
     speakerList = _useContext5.speakerList,
     openConnection = _useContext5.openConnection,
     connectType = _useContext5.connectType,
-    closeConnection = _useContext5.closeConnection,
-    closeSpeaker = _useContext5.closeSpeaker;
+    closeConnection = _useContext5.closeConnection;
   var microphoneOptions = microphoneList.map(function (device) {
     return {
       text: device.deviceName,
@@ -408,7 +407,7 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
   var openDeviceSetting = function openDeviceSetting() {
     setPopoverOpened(false);
     openDeviceSettingDialog({
-      activeTab: _store.DeviceSettingTab.AUDIO
+      activeTab: _store2.DeviceSettingTab.AUDIO
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -478,12 +477,11 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-device-popover-content-more",
-      children: [connectType === _type2.ConnectType.COMPUTER && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      children: [connectType === _deviceStore.ConnectType.COMPUTER && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "fcr-device-popover-content-more-item fcr-device-popover-content-more-item--danger",
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           onClick: function onClick() {
             setMicrophoneId('');
-            closeSpeaker();
             closeConnection();
           },
           children: transI18n('fmt_device_label_audio_list_leaveComputerAudio')
@@ -517,13 +515,13 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
 var NoConnectionPopoverContent = (0, _mobxReact.observer)(function (_ref4) {
   var onItemClick = _ref4.onItemClick;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext6 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext6 = (0, _react.useContext)(_store.ActionBarContext),
     openDeviceSettingDialog = _useContext6.openDeviceSettingDialog,
     openConnection = _useContext6.openConnection;
   var openDeviceSetting = function openDeviceSetting() {
     onItemClick();
     openDeviceSettingDialog({
-      activeTab: _store.DeviceSettingTab.AUDIO
+      activeTab: _store2.DeviceSettingTab.AUDIO
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -569,13 +567,13 @@ var NoConnectionPopoverContent = (0, _mobxReact.observer)(function (_ref4) {
 var PhonePopoverContent = (0, _mobxReact.observer)(function (_ref5) {
   var onItemClick = _ref5.onItemClick;
   var transI18n = (0, _i18n.useI18n)();
-  var _useContext7 = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext7 = (0, _react.useContext)(_store.ActionBarContext),
     openDeviceSettingDialog = _useContext7.openDeviceSettingDialog,
     openConnection = _useContext7.openConnection;
   var openDeviceSetting = function openDeviceSetting() {
     onItemClick();
     openDeviceSettingDialog({
-      activeTab: _store.DeviceSettingTab.AUDIO
+      activeTab: _store2.DeviceSettingTab.AUDIO
     });
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

package/lib/modules/action-bar/index.css

@@ -62,10 +62,25 @@ html {
   position: relative;
 }
 
+.fcr-action-bar-device-extra,
 .fcr-action-bar-extra {
+  border-radius: var(--fcr_cornerradius_xs);
+  position: absolute;
+  right: 3px;
+  top: 3px;
+  width: 18px;
+  height: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   cursor: pointer;
 }
 
+.fcr-action-bar-device-extra:hover,
+.fcr-action-bar-extra:hover {
+  background: var(--fcr_web_ui_scene_hover2);
+}
+
 @media screen and (max-width: 430px) {
   .fcr-action-bar-item-wrapper {
     min-width: 55px;
@@ -152,16 +167,24 @@ html {
   align-items: center;
 }
 
+.fcr-action-bar--popover {
+  max-width: none;
+}
+
 .fcr-action-bar--popover .fcr-drop-menu {
   text-align: left;
 }
 
+.fcr-tooltip-arrow {
+  z-index: 1;
+}
+
 .fcr-action-bar--popover .fcr-checkbox-input-wrapper {
   border-color: transparent;
 }
 
 .fcr-action-bar--popover .fcr-tooltip-inner {
-  border: none;
+  border: none !important;
   box-shadow: var(--fcr_web_light_dropup_m) !important;
 }
 .fcr-screen-share--popover .fcr-button > p {
@@ -172,8 +195,12 @@ html {
 }
 
 .fcr-action-bar--fold-wrap {
-  width: 100%;
+  width: 50%;
   display: flex;
+  position: absolute;
+  top: -21px;
+  justify-content: center;
+  z-index: 4;
   /* position: absolute;
   inset: auto auto 0px 0px; */
 }
@@ -181,7 +208,6 @@ html {
 .fcr-action-bar--fold-btn {
   width: 70px;
   height: 22px;
-  margin-left: 50%;
 }
 
 .fcr-action-bar--fold {
@@ -200,7 +226,7 @@ html {
 
 .fcr-action-bar--fold-hotarea {
   width: 100%;
-  height: 22px;
+  /* height: 22px; */
   display: flex;
 }
 
@@ -258,6 +284,29 @@ html {
   border-radius: var(--fcr_cornerradius_s);
 }
 
+.fcr-action-bar-smaller-micphone .device-control-extra {
+  display: none;
+}
+.fcr-action-bar-smaller-micphone .device-control {
+  min-width: none;
+}
+.fcr-action-bar-smaller-micphone .device-control:hover {
+  background: none;
+}
+
 .security-drop-menu-checkbox .fcr-checkbox-label {
   color: inherit;
 }
+.fcr-action-bar-small-end {
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: 0;
+  border: none;
+  background-color: transparent;
+  overflow: hidden;
+}
+
+.fcr-secuirty-tooltip {
+  max-width: unset !important;
+}

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

@@ -1,26 +1,12 @@
 import { UIModule } from '../../base';
 import './index.css';
-import { FcrDesktopMediaControl, FcrStreamControl, FcrUserControl } from 'agora-edu-core';
-import { FcrUIEventStore } from '../../common/event-store';
-import { FcrDeviceStore } from '../../common/device-store';
-import { FcrSecurityStore } from '../../common/security-store';
-import { FcrDeviceStreamStore } from '../../common/device-stream-store';
-import { FcrMainRoomControl, FcrWaitingRoomControl } from 'agora-edu-core/lib/room-control/type';
-interface FcrActionBarUIModuleArgs {
-    roomControl: FcrMainRoomControl | FcrWaitingRoomControl;
-    userControl: FcrUserControl;
-    uiEventStore: FcrUIEventStore;
-    deviceStore: FcrDeviceStore;
-    deviceStreamStore: FcrDeviceStreamStore;
-    securityStore: FcrSecurityStore;
-    streamControl: FcrStreamControl;
-    mediaControl: FcrDesktopMediaControl;
-}
+import { StoreConfig } from '../../type';
 export declare class FcrActionBarUIModule extends UIModule {
     private _store;
-    constructor(args: FcrActionBarUIModuleArgs);
+    private _securityStore;
+    private _deviceControlStore;
+    constructor(args: StoreConfig);
     getComponent(): import("react/jsx-runtime").JSX.Element;
     onProcessEvent(event: RendererCustomEvent): void;
     onUnload(): void;
 }
-export {};

package/lib/modules/action-bar/index.dev.js

@@ -1,8 +1,25 @@
 "use strict";
 
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.object.define-properties.js");
+require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.get-own-property-descriptors.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.for-each.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.join.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _ = require(".");
 var _reactDom = _interopRequireDefault(require("react-dom"));
@@ -13,7 +30,10 @@ var _securityStore = require("../../common/security-store");
 var _deviceStreamStore = require("../../common/device-stream-store");
 var _eventStore = require("../../common/event-store");
 var _deviceStore = require("../../common/device-store");
+var _roomStore = require("../../common/room-store");
 var _jsxRuntime = require("react/jsx-runtime");
+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; }
 var App = (0, _root.hot)(function () {
   return null;
 });
@@ -36,7 +56,7 @@ var Layout = function Layout(props) {
   });
 };
 window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-  var engine, roomId, roomControl, userRole, userName, userControl, uiEventStore, securityStore, deviceStore, deviceStreamStore, uiModule, App;
+  var engine, roomId, roomControl, userRole, userName, userControl, uiEventStore, securityStore, deviceStore, config, deviceStreamStore, uiModule, App;
   return _regenerator["default"].wrap(function _callee$(_context) {
     while (1) switch (_context.prev = _context.next) {
       case 0:
@@ -59,25 +79,29 @@ window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default
       case 9:
         userControl = roomControl.getUserControl();
         uiEventStore = new _eventStore.FcrUIEventStore();
-        securityStore = new _securityStore.FcrSecurityStore(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), roomControl.getRoomSessionControl(), uiEventStore);
-        deviceStore = new _deviceStore.FcrDeviceStore(userName, engine.getDesktopMediaControl());
-        deviceStreamStore = new _deviceStreamStore.FcrDeviceStreamStore({
+        securityStore = new _securityStore.FcrSecurityStore(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), uiEventStore);
+        deviceStore = new _deviceStore.FcrDeviceStore(engine.getDesktopMediaControl(), uiEventStore);
+        config = {
           mediaControl: engine.getDesktopMediaControl(),
           roomControl: roomControl,
           securityStore: securityStore,
           deviceStore: deviceStore,
-          uiEventStore: uiEventStore
-        });
-        uiModule = new _.FcrActionBarUIModule({
-          roomControl: roomControl,
-          userControl: userControl,
-          securityStore: securityStore,
-          deviceStore: deviceStore,
-          deviceStreamStore: deviceStreamStore,
           uiEventStore: uiEventStore,
-          mediaControl: engine.getDesktopMediaControl(),
-          streamControl: roomControl.getStreamControl()
-        });
+          roomStore: new _roomStore.FcrRoomStore(uiEventStore, deviceStore, {}, engine),
+          streamControl: roomControl.getStreamControl(),
+          userControl: userControl,
+          privilegeControl: roomControl.getPrivilegeControl(),
+          interpreterControl: roomControl.getInterpreterControl(),
+          chatRoomControl: roomControl.getChatRoomControl(),
+          engine: null,
+          remoteVideoRenderManager: null,
+          config: null,
+          parameters: null
+        };
+        deviceStreamStore = new _deviceStreamStore.FcrDeviceStreamStore(config);
+        uiModule = new _.FcrActionBarUIModule(_objectSpread(_objectSpread({}, config), {}, {
+          deviceStreamStore: deviceStreamStore
+        }));
         App = (0, _root.hot)(function () {
           (0, _hooks.useUnmount)(function () {
             uiModule === null || uiModule === void 0 || uiModule.release();
@@ -89,7 +113,7 @@ window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default
         _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(Layout, {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {})
         }), document.querySelector('#root'));
-      case 17:
+      case 18:
       case "end":
         return _context.stop();
     }

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

@@ -1,8 +1,17 @@
 "use strict";
 
+require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.define-property.js");
+require("core-js/modules/es.object.get-own-property-descriptor.js");
+require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.reflect.construct.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -14,13 +23,14 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _base = require("../../base");
 var _view = require("./view");
-var _store = _interopRequireDefault(require("./store"));
-var _context = require("./context");
+var _store = _interopRequireWildcard(require("./store"));
 require("./index.css");
+var _securityStore = require("../../common/security-store");
+var _store2 = require("../components/device-control/store");
 var _constant = require("../../utilities/constant");
-var _rendererEvent = require("../../utilities/renderer-event");
-var _store2 = require("../setting/store");
 var _jsxRuntime = require("react/jsx-runtime");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(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; })(); }
 var FcrActionBarUIModule = exports.FcrActionBarUIModule = /*#__PURE__*/function (_UIModule) {
@@ -29,76 +39,30 @@ var FcrActionBarUIModule = exports.FcrActionBarUIModule = /*#__PURE__*/function
     (0, _classCallCheck2["default"])(this, FcrActionBarUIModule);
     _this = _callSuper(this, FcrActionBarUIModule);
     _this._store = new _store["default"](args);
+    _this._securityStore = args.securityStore;
+    _this._deviceControlStore = new _store2.DeviceControlStore(args.mediaControl, args.roomControl, args.userControl, args.streamControl, args.deviceStreamStore, args.uiEventStore, args.deviceStore);
     return _this;
   }
   (0, _inherits2["default"])(FcrActionBarUIModule, _UIModule);
   return (0, _createClass2["default"])(FcrActionBarUIModule, [{
     key: "getComponent",
     value: function getComponent() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.ActionBarContext.Provider, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.ActionBarContext.Provider, {
         value: this._store,
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.FcrActionBar, {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityStore.SecurityStoreContext.Provider, {
+          value: this._securityStore,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_store2.DeviceControlStoreContext.Provider, {
+            value: this._deviceControlStore,
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.FcrActionBar, {})
+          })
+        })
       });
     }
   }, {
     key: "onProcessEvent",
     value: function onProcessEvent(event) {
-      if (event.action === _constant.RendererEventAction.FRAGMENT_LOADED && event.payload === 'control-bar') {
-        (0, _rendererEvent.sendEvent)({
-          action: _constant.RendererEventAction.CLOUD_RECORDING_STATE_CHANGED,
-          payload: this._store.cloudRecordingState
-        });
-        (0, _rendererEvent.sendEvent)({
-          action: _constant.RendererEventAction.USER_ROLE_CHANGED,
-          payload: this._store.localUserRole
-        });
-      }
-      if (event.action === _constant.RendererEventAction.STOP_BOARD_SHARE) {
-        this._store.closeWhiteboard();
-      }
-      if (event.action === _constant.RendererEventAction.OPEN_VIDEO_SETTING) {
-        this._store.openDeviceSettingDialog({
-          activeTab: _store2.DeviceSettingTab.VIDEO,
-          videoActiveTab: 'basic'
-        });
-      }
-      if (event.action === _constant.RendererEventAction.OPEN_VIDEO_FILTER) {
-        this._store.openDeviceSettingDialog({
-          activeTab: _store2.DeviceSettingTab.VIDEO,
-          videoActiveTab: 'beauty-filter'
-        });
-      }
-      if (event.action === _constant.RendererEventAction.OPEN_VIRTUAL_BACKGROUND) {
-        this._store.openDeviceSettingDialog({
-          activeTab: _store2.DeviceSettingTab.VIDEO,
-          videoActiveTab: 'virtual-background'
-        });
-      }
-      if (event.action === _constant.RendererEventAction.OPEN_AUDIO_SETTING) {
-        this._store.openDeviceSettingDialog({
-          activeTab: _store2.DeviceSettingTab.AUDIO
-        });
-      }
-      if (event.action === _constant.RendererEventAction.LEAVE_ROOM) {
-        this._store.leave();
-      }
-      if (event.action === _constant.RendererEventAction.KEEP_PHONE_AUDIO_CONNECTION) {
-        this._store.keepPhoneAudioConnection();
-      }
-      if (event.action === _constant.RendererEventAction.END_ROOM) {
-        this._store.end();
-      }
-      if (event.action === _constant.RendererEventAction.REISSUE_CONTROLBAR_INFO) {
-        this._store.fetchNewestLeavingRoomCompProps();
-      }
-      if (event.action === _constant.RendererEventAction.ASSIGN_HOST) {
-        this._store.assignHost(event.payload);
-      }
       if (event.action === _constant.RendererEventAction.CALL_CLOSE_MAIN_WINDOW) {
-        this._store.setPopoverOpened(true);
-      }
-      if (event.action === _constant.RendererEventAction.FRAGMENT_SET_ENABLE_WAITING_ROOM) {
-        this._store.setEnableWaitingRoom(event.payload.allow, true);
+        this._store.setStateBarLeaveMeeting(true);
       }
     }
   }, {

package/lib/modules/action-bar/leave/assign-host.d.ts

@@ -1,5 +1,5 @@
 import './index.css';
-import { FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrUserInfo } from 'fcr-core/lib/type';
 interface AssignHostProps {
     remoteUsers: FcrUserInfo[];
     assignHost: (user: FcrUserInfo) => void;

package/lib/modules/action-bar/leave/index.css

@@ -114,3 +114,13 @@
   color: var(--fcr_ui_scene_icontext3);
   cursor: not-allowed;
 }
+.fcr-action-bar--leave-meeting-portal {
+  width: 255px;
+  position: absolute;
+  top: 2px;
+  left: 10px;
+  z-index: 999;
+  background-color: var(--fcr_ui_scene_white10);
+  border-radius: var(--fcr_cornerradius_l);
+  box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
+}