fcr-ui-scene 3.1.1 → 3.3.0

package/lib/modules/action-bar/action-bar-collapes-items.js

@@ -18,6 +18,15 @@ require("core-js/modules/es.function.name.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/esnext.async-iterator.filter.js");
+require("core-js/modules/esnext.async-iterator.find.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.async-iterator.reduce.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.find.js");
+require("core-js/modules/esnext.iterator.map.js");
+require("core-js/modules/esnext.iterator.reduce.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
@@ -60,13 +69,13 @@ var midActionOrderMap = exports.midActionOrderMap = [/*#__PURE__*/(0, _jsxRuntim
 // <Board id="Whiteboard" key="Whiteboard" order={6} />,
 // <BreakoutRoom id="BreakoutRoom" key="BreakoutRoom" order={7} />,
 // <Respond id="Respond" key="Respond" order={8} />,
-(0, _jsxRuntime.jsx)(_settings.Settings, {
-  id: "Settings",
-  order: 9
-}, "Settings"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_liveStreaming.LiveStreaming, {
+(0, _jsxRuntime.jsx)(_liveStreaming.LiveStreaming, {
   id: "LiveStreaming",
+  order: 9
+}, "LiveStreaming"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_settings.Settings, {
+  id: "Settings",
   order: 10
-}, "LiveStreaming"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_more.More, {
+}, "Settings"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_more.More, {
   id: "More",
   order: 11
 }, "More")];

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

@@ -17,8 +17,8 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _avatar = require("agora-ui-foundation/lib/components/avatar");
 var _context = require("../context");
 var _fcr_chat_reddot = _interopRequireDefault(require("../../../../public/assets/fcr_chat_reddot.svg"));
-var _type2 = require("agora-edu-core/lib/type");
 var _mobxReact = require("mobx-react");
+var _type2 = require("agora-edu-core/lib/room-control/chatroom-control/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
@@ -28,10 +28,10 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
   var tooltip = transI18n('fmt_screenshare_controlbar_button_more_chat');
   var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     toggleChat = _useContext.toggleChat,
-    newMessageCount = _useContext.newMessageCount,
     latestMessage = _useContext.latestMessage,
     newMessageTooltipVisible = _useContext.newMessageTooltipVisible,
-    hideNewMessageTooltip = _useContext.hideNewMessageTooltip;
+    hideNewMessageTooltip = _useContext.hideNewMessageTooltip,
+    allNewMessage = _useContext.allNewMessage;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     tooltipVisible = _useState2[0],
@@ -50,11 +50,11 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
   }, [newMessageTooltipVisible]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-action-bar-chat-wrapper",
-    children: [newMessageCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    children: [allNewMessage > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "fcr-action-bar-chat-unread-count",
-      children: newMessageCount > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+      children: allNewMessage > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
         src: _fcr_chat_reddot["default"]
-      }) : newMessageCount
+      }) : allNewMessage
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
       overlayClassName: "fcr-chatroom-tooltip",
       overlayInnerStyle: {

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import ActionBarStore from './store';
 export declare const ActionBarContext: import("react").Context<ActionBarStore>;

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

@@ -1,7 +1,7 @@
 .fcr-action-bar-device {
   border-radius: var(--fcr_cornerradius_s);
   position: relative;
-  width: 71px;
+  min-width: 71px;
   cursor: pointer;
 }
 .fcr-action-bar-device:hover {
@@ -25,7 +25,7 @@
   stop-color: var(--fcr_web_ui_scene_mainicon1);
 }
 .fcr-action-bar-device-text {
-  color: var(--fcr_ui_scene_icontext1);
+  color: var(--fcr_ui_scene_icontext2);
   line-height: 12px;
   font-size: 12px;
   text-align: center;
@@ -155,3 +155,8 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+
+.fcr-device-popover-content-more-item--danger:hover {
+  color: var(--fcr_ui_scene_ramp_red6);
+  background: var(--fcr_ui_scene_ramp_red1);
+}

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

@@ -1,8 +1,8 @@
 import { FC } from 'react';
 import './index.css';
 export declare const AudioRecordinDeviceIcon: ({ size, micEnabled }: {
-    size?: number | undefined;
-    micEnabled?: boolean | undefined;
+    size?: number;
+    micEnabled?: boolean;
 }) => import("react/jsx-runtime").JSX.Element;
 export declare const MicrophoneDevice: FC;
 export declare const CameraDevice: FC;

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

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MicrophoneDevice = exports.CameraDevice = exports.AudioRecordinDeviceIcon = void 0;
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.map.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 require("./index.css");
@@ -50,11 +52,9 @@ var MicrophoneDevice = exports.MicrophoneDevice = (0, _mobxReact.observer)(funct
     microphoneEnabled = _useContext2.microphoneEnabled,
     enableMicrophone = _useContext2.enableMicrophone,
     toggleLayoutBarLock = _useContext2.toggleLayoutBarLock,
-    toggleConnection = _useContext2.toggleConnection,
     openConnection = _useContext2.openConnection,
     connectType = _useContext2.connectType,
     microphoneList = _useContext2.microphoneList,
-    microphoneVolumeLevel = _useContext2.microphoneVolumeLevel,
     phoneMicEnabled = _useContext2.phoneMicEnabled;
   var _useDeviceTooltipVisi = useDeviceTooltipVisible(toggleLayoutBarLock),
     tooltipVisible = _useDeviceTooltipVisi.tooltipVisible,
@@ -391,7 +391,8 @@ var AudioDeviceListPopoverContent = (0, _mobxReact.observer)(function (_ref3) {
     speakerList = _useContext5.speakerList,
     openConnection = _useContext5.openConnection,
     connectType = _useContext5.connectType,
-    closeConnection = _useContext5.closeConnection;
+    closeConnection = _useContext5.closeConnection,
+    closeSpeaker = _useContext5.closeSpeaker;
   var microphoneOptions = microphoneList.map(function (device) {
     return {
       text: device.deviceName,
@@ -478,10 +479,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", {
-        className: "fcr-device-popover-content-more-item",
+        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')

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

@@ -1,6 +1,7 @@
 html {
   --fcr-action-bar-height: 58px;
 }
+
 .fcr-action-bar {
   background: var(--fcr_web_ui_scene_fill2);
   width: 100%;
@@ -14,6 +15,7 @@ html {
   border-top-style: solid;
   z-index: 3;
 }
+
 .fcr-action-bar-hide {
   transform: translateY(var(--fcr-action-bar-height));
 }
@@ -25,9 +27,11 @@ html {
   flex-direction: row;
   align-items: center;
 }
+
 .fcr-action-bar-right {
   padding-right: 12px;
 }
+
 .fcr-action-bar-mid {
   flex: 1;
   flex-shrink: 1;
@@ -35,6 +39,7 @@ html {
   padding: 0 10px;
   justify-content: center;
 }
+
 .fcr-action-bar-collapse {
   display: flex;
   flex-flow: row nowrap;
@@ -42,6 +47,7 @@ html {
   overflow: hidden;
   flex: 1;
 }
+
 .fcr-action-bar-item-wrapper {
   background: transparent;
   width: fit-content;
@@ -55,9 +61,11 @@ html {
   flex-shrink: 0;
   position: relative;
 }
+
 .fcr-action-bar-extra {
   cursor: pointer;
 }
+
 @media screen and (max-width: 430px) {
   .fcr-action-bar-item-wrapper {
     min-width: 55px;
@@ -68,11 +76,16 @@ html {
   outline: 0;
 }
 
-.fcr-action-bar-item:hover,
+.fcr-action-bar-item-wrapper:hover .fcr-action-bar-item {
+  background: var(--fcr_web_ui_scene_hover2);
+  border-radius: var(--fcr_cornerradius_s);
+}
+
 .fcr-action-bar-item-active {
   background: var(--fcr_web_ui_scene_hover2);
   border-radius: var(--fcr_cornerradius_s);
 }
+
 .fcr-action-bar-item {
   flex: 1;
   display: inline-flex;
@@ -81,33 +94,41 @@ html {
   max-width: 100%;
   height: 100%;
 }
+
 .fcr-icon-green path,
 .fcr-icon-green-when-hover:hover path {
   fill: var(--fcr_ui_scene_ramp_green6);
 }
+
 .fcr-icon-blue path {
   fill: var(--fcr_ui_scene_ramp_brand6);
 }
+
 .fcr-checkbox-overlay-style svg path {
   fill: var(--fcr_ui_scene_icontext1);
   transition: all 0.1s ease;
 }
+
 .fcr-checkbox-overlay-style .fcr-checkbox-inner {
   width: 14px;
   height: 14px;
   background: transparent;
 }
+
 .fcr-checkbox-overlay-style .fcr-checkbox-inner svg {
   width: 14px;
   height: 14px;
 }
+
 .fcr-action-bar-item-disabled {
   cursor: not-allowed;
 }
+
 .fcr-action-bar-item-disabled .fcr-action-bar-item-icon,
 .fcr-action-bar-item-disabled .fcr-action-bar-item-text {
   opacity: 0.5;
 }
+
 .fcr-action-bar-item-text {
   color: var(--fcr_ui_scene_icontext2);
   font-weight: 400;
@@ -115,9 +136,11 @@ html {
   line-height: 12px;
   padding: 0 8px;
 }
+
 .fcr-action-bar-item-text span {
   white-space: nowrap;
 }
+
 .fcr-action-bar-cancel-leave {
   margin-right: 15px;
   margin-left: auto;
@@ -128,16 +151,39 @@ html {
   display: flex;
   align-items: center;
 }
+
 .fcr-action-bar--popover .fcr-drop-menu {
   text-align: left;
 }
+
 .fcr-action-bar--popover .fcr-checkbox-input-wrapper {
   border-color: transparent;
 }
+
 .fcr-action-bar--popover .fcr-tooltip-inner {
   border: none;
   box-shadow: var(--fcr_web_light_dropup_m) !important;
 }
+.fcr-screen-share--popover .fcr-button > p {
+  max-width: 140px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.fcr-action-bar--fold-wrap {
+  width: 100%;
+  display: flex;
+  /* position: absolute;
+  inset: auto auto 0px 0px; */
+}
+
+.fcr-action-bar--fold-btn {
+  width: 70px;
+  height: 22px;
+  margin-left: 50%;
+}
+
 .fcr-action-bar--fold {
   width: 70px;
   height: 22px;
@@ -148,26 +194,21 @@ html {
   border-top-right-radius: 8px;
   border: 1px solid var(--fcr_ui_scene_line1);
   border-bottom: none;
-  position: absolute;
-  left: 50%;
-  top: -21px;
-  transform: translateX(-50%);
-  background: #fff;
+  background-color: #fff;
   cursor: pointer;
 }
+
 .fcr-action-bar--fold-hotarea {
-  width: 120px;
-  height: 30px;
+  width: 100%;
+  height: 22px;
   display: flex;
-  position: absolute;
-  left: 50%;
-  top: -30px;
-  transform: translateX(-50%);
 }
+
 .fcr-action-bar--fold svg {
   width: 30px;
   height: 30px;
 }
+
 .fcr-action-bar--unfold {
   width: 52px;
   height: 50px;
@@ -176,18 +217,23 @@ html {
   justify-content: center;
   cursor: pointer;
 }
+
 .fcr-action-bar--unfold svg {
   transform: rotate(90deg);
   width: 40px;
   height: 40px;
 }
+
 .fcr-action-bar-fold-style {
   width: 110px;
   height: 50px;
   position: absolute;
   right: 15px;
   bottom: 15px;
+  border: none;
+  background-color: transparent;
 }
+
 .fcr-action-bar-smaller {
   width: 110px;
   height: 50px;
@@ -200,6 +246,7 @@ html {
   z-index: 1000;
   display: flex;
 }
+
 .fcr-action-bar-smaller-micphone {
   width: 58px;
   height: 50px;
@@ -210,3 +257,7 @@ html {
   box-shadow: var(--fcr_web_light_dropup_m);
   border-radius: var(--fcr_cornerradius_s);
 }
+
+.security-drop-menu-checkbox .fcr-checkbox-label {
+  color: inherit;
+}

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

@@ -1,12 +1,13 @@
 import { UIModule } from '../../base';
 import './index.css';
-import { FcrDesktopMediaControl, FcrMainRoomControl, FcrStreamControl, FcrUserControl } from 'agora-edu-core';
+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;
+    roomControl: FcrMainRoomControl | FcrWaitingRoomControl;
     userControl: FcrUserControl;
     uiEventStore: FcrUIEventStore;
     deviceStore: FcrDeviceStore;

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

@@ -17,7 +17,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var App = (0, _root.hot)(function () {
   return null;
 });
-_reactDom["default"].render( /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.querySelector('#root'));
+_reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.querySelector('#root'));
 var Layout = function Layout(props) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     style: {
@@ -35,7 +35,7 @@ var Layout = function Layout(props) {
     })
   });
 };
-window.__DEV_ENGINE_IS_READY__.then( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+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;
   return _regenerator["default"].wrap(function _callee$(_context) {
     while (1) switch (_context.prev = _context.next) {
@@ -45,13 +45,14 @@ window.__DEV_ENGINE_IS_READY__.then( /*#__PURE__*/(0, _asyncToGenerator2["defaul
         _context.next = 4;
         return engine.login();
       case 4:
-        roomControl = engine.createRoomControl(roomId);
+        roomControl = engine.createMainRoomControl(roomId);
         userRole = _type.FcrUserRole.HOST;
         userName = 'host-user';
         _context.next = 9;
         return roomControl.join({
           userRole: userRole,
           userName: userName,
+          roomToken: window.__DEV_USER_TOKEN__,
           streamLatency: _type.FcrStreamLatencyLevel.ULTRA_LOW,
           createStreamConfigs: []
         });
@@ -59,9 +60,9 @@ window.__DEV_ENGINE_IS_READY__.then( /*#__PURE__*/(0, _asyncToGenerator2["defaul
         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.getMediaControl());
+        deviceStore = new _deviceStore.FcrDeviceStore(userName, engine.getDesktopMediaControl());
         deviceStreamStore = new _deviceStreamStore.FcrDeviceStreamStore({
-          mediaControl: engine.getMediaControl(),
+          mediaControl: engine.getDesktopMediaControl(),
           roomControl: roomControl,
           securityStore: securityStore,
           deviceStore: deviceStore,
@@ -74,7 +75,7 @@ window.__DEV_ENGINE_IS_READY__.then( /*#__PURE__*/(0, _asyncToGenerator2["defaul
           deviceStore: deviceStore,
           deviceStreamStore: deviceStreamStore,
           uiEventStore: uiEventStore,
-          mediaControl: engine.getMediaControl(),
+          mediaControl: engine.getDesktopMediaControl(),
           streamControl: roomControl.getStreamControl()
         });
         App = (0, _root.hot)(function () {
@@ -85,7 +86,7 @@ window.__DEV_ENGINE_IS_READY__.then( /*#__PURE__*/(0, _asyncToGenerator2["defaul
           });
           return uiModule === null || uiModule === void 0 ? void 0 : uiModule.getComponent();
         });
-        _reactDom["default"].render( /*#__PURE__*/(0, _jsxRuntime.jsx)(Layout, {
+        _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(Layout, {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(App, {})
         }), document.querySelector('#root'));
       case 17:

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

@@ -79,6 +79,27 @@ var FcrActionBarUIModule = exports.FcrActionBarUIModule = /*#__PURE__*/function
           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);
+      }
     }
   }, {
     key: "onUnload",

package/lib/modules/action-bar/item-placement.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="react" />
 type ActionBarItemPlacementProps = {
     placement: 'left' | 'mid' | 'right';
 };
 export declare const ActionBarItemPlacement: import("react").ForwardRefExoticComponent<ActionBarItemPlacementProps & {
-    children?: import("react").ReactNode;
+    children?: import("react").ReactNode | undefined;
 } & import("react").RefAttributes<HTMLDivElement>>;
 export {};

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

@@ -10,6 +10,11 @@ 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");
 Object.defineProperty(exports, "__esModule", {

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

@@ -1,6 +1,8 @@
-/// <reference types="react" />
 import './index.css';
+import { FcrUserInfo } from 'agora-edu-core/lib/type';
 interface AssignHostProps {
+    remoteUsers: FcrUserInfo[];
+    assignHost: (user: FcrUserInfo) => void;
     setPopoverOpened: React.Dispatch<React.SetStateAction<boolean>>;
     handleKeepConnect: () => void;
 }

package/lib/modules/action-bar/leave/assign-host.js

@@ -13,19 +13,19 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _mobxReact = require("mobx-react");
 var _react = require("react");
 require("./index.css");
-var _context2 = require("../context");
 var _chatSelect = require("../../chat/chat-select");
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 var AssignHost = exports.AssignHost = (0, _mobxReact.observer)(function (props) {
-  var _useContext = (0, _react.useContext)(_context2.ActionBarContext),
-    remoteUsers = _useContext.remoteUsers,
-    assignHost = _useContext.assignHost;
+  var remoteUsers = props.remoteUsers,
+    assignHost = props.assignHost;
   var _useState = (0, _react.useState)(0),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     selected = _useState2[0],
     setSelected = _useState2[1];
+  var t = (0, _i18n.useI18n)();
   var handleLeave = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var user;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -48,12 +48,12 @@ var AssignHost = exports.AssignHost = (0, _mobxReact.observer)(function (props)
     type: "assign-host",
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "assign-host-title",
-      children: "Assign a New Host"
+      children: t('fmt_toolbar_button_assignnewhost')
     }),
     bottomBar: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "assign-host-bottom",
       onClick: handleLeave,
-      children: "Assign and Leave"
+      children: t('fmt_toolbar_button_assignleave')
     }),
     candidateUsers: remoteUsers,
     selectedUid: remoteUsers[selected].userId,

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

@@ -10,6 +10,11 @@ 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");
 Object.defineProperty(exports, "__esModule", {
@@ -36,15 +41,23 @@ var End = exports.End = (0, _mobxReact.observer)(function (props) {
   var transI18n = (0, _i18n.useI18n)();
   var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     localUserRole = _useContext.localUserRole,
-    toggleLayoutBarLock = _useContext.toggleLayoutBarLock;
+    toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
+    remoteUsers = _useContext.remoteUsers,
+    end = _useContext.end,
+    leave = _useContext.leave,
+    isLocked = _useContext.isLocked,
+    hasAssignHostBeforeLeavingPermission = _useContext.hasAssignHostBeforeLeavingPermission,
+    hasEndRoomPermission = _useContext.hasEndRoomPermission,
+    keepPhoneAudioConnection = _useContext.keepPhoneAudioConnection,
+    isPstnUser = _useContext.isPstnUser,
+    assignHost = _useContext.assignHost,
+    popoverOpened = _useContext.popoverOpened,
+    _setPopoverOpened = _useContext.setPopoverOpened;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     tooltipOpened = _useState2[0],
     setTooltipOpened = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    popoverOpened = _useState4[0],
-    _setPopoverOpened = _useState4[1];
+  // const [popoverOpened, setPopoverOpened] = useState(false);
   var popOverRef = (0, _react.useRef)(false);
   var onTooltipChanged = function onTooltipChanged(v) {
     if (!popoverOpened) {
@@ -79,6 +92,11 @@ var End = exports.End = (0, _mobxReact.observer)(function (props) {
       window.removeEventListener('resize', reflow);
     };
   }, []);
+  (0, _react.useEffect)(function () {
+    if (popoverOpened) {
+      onPopoverChanged(popoverOpened);
+    }
+  }, [popoverOpened]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
     visible: tooltipOpened,
     onVisibleChange: onTooltipChanged,
@@ -97,13 +115,23 @@ var End = exports.End = (0, _mobxReact.observer)(function (props) {
         setPopoverOpened: function setPopoverOpened(value) {
           _setPopoverOpened(value);
           onPopoverChanged(false);
-        }
+        },
+        localUserRole: localUserRole,
+        leave: leave,
+        isLocked: isLocked,
+        hasAssignHostBeforeLeavingPermission: hasAssignHostBeforeLeavingPermission,
+        hasEndRoomPermission: hasEndRoomPermission,
+        keepPhoneAudioConnection: keepPhoneAudioConnection,
+        isPstnUser: isPstnUser,
+        remoteUsers: remoteUsers,
+        end: end,
+        assignHost: assignHost
       }),
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, _objectSpread(_objectSpread({
         shape: "rounded",
         size: "XS"
       }, buttonProps), {}, {
-        children: popoverOpened ? 'Cancel' : localUserRole === _type.FcrUserRole.HOST ? transI18n('fmt_toolbar_button_end') : transI18n('fmt_toolbar_button_leave')
+        children: popoverOpened ? transI18n('fmt_toolbar_button_cancel') : localUserRole === _type.FcrUserRole.HOST ? transI18n('fmt_toolbar_button_end') : transI18n('fmt_toolbar_button_leave')
       }))
     })
   });