fcr-ui-scene 3.4.2 → 3.4.3

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

@@ -1,6 +1,7 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,16 +10,19 @@ var _item = require("../item");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _react = require("react");
-var _context = require("../context");
+var _store = require("../store");
 var _mobxReact = require("mobx-react");
-var _dropMenu = require("./drop-menu");
+var _securityMenu = _interopRequireDefault(require("../../components/security-menu"));
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
+// import { SecurityMenu } from './drop-menu';
+
 var Security = exports.Security = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
     order = _ref.order;
-  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
-    toggleLayoutBarLock = _useContext.toggleLayoutBarLock;
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+    toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
+    setEnableWaitingRoom = _useContext.setEnableWaitingRoom;
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_controlbar_button_security');
   var tooltip = transI18n('fmt_screenshare_controlbar_button_security');
@@ -27,7 +31,9 @@ var Security = exports.Security = (0, _mobxReact.observer)(function (_ref) {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItemWithPopover, {
       popoverProps: {
         trigger: 'click',
-        content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.SecurityMenu, {}),
+        content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_securityMenu["default"], {
+          setEnableWaitingRoom: setEnableWaitingRoom
+        }),
         overlayClassName: 'attendee__footer-more-actions',
         overlayInnerStyle: {
           boxShadow: 'var(--fcr_web_light_dropup_m)',

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

@@ -9,14 +9,14 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _item = require("../item");
-var _context = require("../context");
+var _store = require("../store");
 var _react = require("react");
-var _store = require("../../setting/store");
+var _store2 = require("../../setting/store");
 var _jsxRuntime = require("react/jsx-runtime");
 var Settings = exports.Settings = function Settings(_ref) {
   var id = _ref.id,
     order = _ref.order;
-  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     openDeviceSettingDialog = _useContext.openDeviceSettingDialog;
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_controlbar_button_more_setting');
@@ -30,7 +30,7 @@ var Settings = exports.Settings = function Settings(_ref) {
       title: title,
       onClick: function onClick() {
         openDeviceSettingDialog({
-          activeTab: _store.DeviceSettingTab.GENERAL
+          activeTab: _store2.DeviceSettingTab.GENERAL
         });
       },
       iconColors: {

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

@@ -9,13 +9,13 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _mobxReact = require("mobx-react");
-var _device = require("./device");
 var _react = require("react");
-var _context = require("./context");
+var _store = require("./store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _microphone = require("../components/device-control/components/microphone");
 var _jsxRuntime = require("react/jsx-runtime");
 var SmallerActionbar = exports.SmallerActionbar = (0, _mobxReact.observer)(function () {
-  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     microphoneEnabled = _useContext.microphoneEnabled,
     enableMicrophone = _useContext.enableMicrophone,
     toggleFold = _useContext.toggleFold;
@@ -43,7 +43,7 @@ var SmallerActionbar = exports.SmallerActionbar = (0, _mobxReact.observer)(funct
         onClick: function onClick() {
           return enableMicrophone(!microphoneEnabled);
         },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_device.AudioRecordinDeviceIcon, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_microphone.AudioRecordinDeviceIcon, {
           micEnabled: microphoneEnabled
         })
       })

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

@@ -39,12 +39,6 @@ require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.object.values.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.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.for-each.js");
-require("core-js/modules/esnext.async-iterator.map.js");
-require("core-js/modules/esnext.async-iterator.reduce.js");
-require("core-js/modules/esnext.async-iterator.some.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");

package/lib/modules/action-bar/switch-output-language-room/index.js

@@ -11,6 +11,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.join.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.some.js");
@@ -60,6 +61,7 @@ var _radio = require("agora-ui-foundation/lib/components/radio");
 var _guideTooltip = require("./guide-tooltip");
 var _useLanguageConfig = require("../../interpreter/interpreter-list/interpreter-item/components/pick-language/useLanguageConfig");
 var _loadingWrapper = require("../../interpreter/loading-wrapper");
+var _logger = require("agora-foundation/lib/logger");
 var _jsxRuntime = require("react/jsx-runtime");
 var OutputByMainRoom = (0, _mobxReact.observer)(function (_ref) {
   var changeOutputRoomTool = _ref.changeOutputRoomTool;
@@ -77,8 +79,7 @@ var OutputByMainRoom = (0, _mobxReact.observer)(function (_ref) {
     onClick: function onClick() {
       var open = !mainRoomState;
       changeOutputByMainRoom({
-        event: open ? _store.EventType.START : _store.EventType.STOP,
-        action: 'changeOutputByMainRoom'
+        event: open ? _store.EventType.START : _store.EventType.STOP
       });
       setMainRoomState(open);
     }
@@ -206,6 +207,11 @@ var useChangeOutputRoomTool = function useChangeOutputRoomTool() {
         value: ele
       };
     });
+    (0, _logger.getLogger)().info("interpreterLog- interpreterUsers ".concat(interpreterUsers === null || interpreterUsers === void 0 ? void 0 : interpreterUsers.map(function (ele) {
+      return "".concat(ele.sourceLanguage, "-").concat(ele.targetLanguage);
+    }).join(',')), "interpreterLog- languageBtnList ".concat(languageBtnList === null || languageBtnList === void 0 ? void 0 : languageBtnList.map(function (ele) {
+      return "".concat(ele.value);
+    }).join(',')));
     return [closeAlllanguageBtn].concat((0, _toConsumableArray2["default"])(languageBtnList));
   }, [interpreterUsers]);
   (0, _react.useEffect)(function () {

package/lib/modules/audio-stream/index.js

@@ -15,9 +15,6 @@ require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.map.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
-require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");

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

@@ -25,6 +25,7 @@
 
 .fcr-message-bar > span:first-child {
   margin-right: 4px;
+  font-size: 12px;
 }
 
 .fcr-message-bar > .fcr-select-wrapper {

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

@@ -1,11 +1,11 @@
 import { CSSProperties } from 'react';
 import './index.css';
-import { FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrUserInfo } from 'fcr-core/lib/type';
 export interface MessageBarProps {
     styles?: CSSProperties;
     users?: FcrUserInfo[];
     onTargetChange?: (target: FcrUserInfo) => void;
-    selectedUserId?: string;
+    selectedUser?: FcrUserInfo;
     title?: React.ReactNode;
 }
-export declare const MessageBar: ({ styles, users, selectedUserId, onTargetChange, title, }: React.PropsWithChildren<MessageBarProps>) => import("react/jsx-runtime").JSX.Element;
+export declare const MessageBar: ({ styles, users, selectedUser, onTargetChange, title, }: React.PropsWithChildren<MessageBarProps>) => import("react/jsx-runtime").JSX.Element;

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

@@ -9,8 +9,10 @@ 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");
@@ -19,11 +21,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MessageBar = void 0;
-require("core-js/modules/es.array.find.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.find.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.find.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _type = require("agora-ui-foundation/lib/components/icon/type");
@@ -36,18 +33,17 @@ require("./index.css");
 var _chatSelect = require("../chat-select");
 var _store = require("../store");
 var _mobxReact = require("mobx-react");
-var _contex = require("../contex");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _type2 = require("fcr-core/lib/room-control/type");
 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 MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
-  var _users$find$userName, _users$find;
+  var _selectedUser$userId, _selectedUser$userNam;
   var styles = _ref.styles,
     _ref$users = _ref.users,
     users = _ref$users === void 0 ? [] : _ref$users,
-    _ref$selectedUserId = _ref.selectedUserId,
-    selectedUserId = _ref$selectedUserId === void 0 ? _store.USER_ALL : _ref$selectedUserId,
+    selectedUser = _ref.selectedUser,
     onTargetChange = _ref.onTargetChange,
     title = _ref.title;
   var t = (0, _i18n.useI18n)();
@@ -64,6 +60,7 @@ var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
   var onPopoverChanged = function onPopoverChanged(visible) {
     setPopoverOpened(visible);
   };
+  var selectedUserId = (_selectedUser$userId = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.userId) !== null && _selectedUser$userId !== void 0 ? _selectedUser$userId : _store.USER_ALL;
   var handleSelected = function handleSelected(user) {
     setPopoverOpened(false);
     onTargetChange && onTargetChange(user);
@@ -71,10 +68,14 @@ var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
   (0, _react.useEffect)(function () {
     setTips(selectedUserId === _store.USER_ALL ? t('fmt_chat_labels_sendto') : t('fmt_chats_label_privatechat'));
   }, [selectedUserId]);
-  var _useContext = (0, _react.useContext)(_contex.StoreContext),
-    chatLevel = _useContext.chatLevel,
-    privateTargetUser = _useContext.privateTargetUser,
-    localIsManager = _useContext.localIsManager;
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
+    chatRoomStores = _useContext.chatRoomStores,
+    activeTabIndex = _useContext.activeTabIndex,
+    roomType = _useContext.roomType;
+  var _ref2 = chatRoomStores[activeTabIndex],
+    chatLevel = _ref2.chatLevel,
+    privateTargetUser = _ref2.privateTargetUser,
+    localIsManager = _ref2.localIsManager;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: cls,
     style: _objectSpread({}, styles),
@@ -99,32 +100,41 @@ var MessageBar = exports.MessageBar = (0, _mobxReact.observer)(function (_ref) {
         selectedUid: selectedUserId,
         onSelect: handleSelected
       }),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_textBubble.TextBubble, {
-        styles: {
-          padding: '4px 1px 4px 4px',
-          borderRadius: 6,
-          backgroundColor: 'var(--fcr_web_ui_scene_fill2)'
-        },
-        txt: /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconText.IconText, {
-          classnames: {
-            'fcr-break-one-line fcr-word-break': true,
-            'fcr-msg-bar-break-max-width': true
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        onClick: function onClick() {
+          if ((users === null || users === void 0 ? void 0 : users.length) <= 1) {
+            return;
           }
-          // TODO: 当选中的 uid 为 None 时，需要提示选择管理员
-          ,
-          txt: privateTargetUser.userId === _store.USER_NONE && !localIsManager ? t('fmt_chat_tips_selecthost') : (_users$find$userName = (_users$find = users.find(function (user) {
-            return user.userId === selectedUserId;
-          })) === null || _users$find === void 0 ? void 0 : _users$find.userName) !== null && _users$find$userName !== void 0 ? _users$find$userName : _store.USER_ALL,
-          icon: _type.FcrIconType.FCR_DROPDOWN,
-          colors: {
-            iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
-          },
-          iconTransform: popoverOpened,
-          enable: true,
-          onClick: function onClick() {
-            setPopoverOpened(!popoverOpened);
+          setPopoverOpened(!popoverOpened);
+        },
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_textBubble.TextBubble, {
+          styles: {
+            padding: '4px 1px 4px 4px',
+            borderRadius: 6,
+            backgroundColor: 'var(--fcr_web_ui_scene_fill2)'
           },
-          iconReverse: true
+          txt: /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconText.IconText, {
+            classnames: {
+              'fcr-break-one-line fcr-word-break': true,
+              'fcr-msg-bar-break-max-width': true
+            }
+            // TODO: 当选中的 uid 为 None 时，需要提示选择管理员
+            ,
+            txt: privateTargetUser.userId === _store.USER_NONE && !localIsManager ? t('fmt_chat_tips_selecthost') : (_selectedUser$userNam = selectedUser === null || selectedUser === void 0 ? void 0 : selectedUser.userName) !== null && _selectedUser$userNam !== void 0 ? _selectedUser$userNam : _store.USER_ALL,
+            icon: _type.FcrIconType.FCR_DROPDOWN,
+            colors: {
+              iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)',
+              fontSize: '12px'
+            },
+            fontSize: "medium",
+            iconTransform: popoverOpened,
+            enable: true,
+            isHideIcon: roomType === _type2.FcrRoomType.Mainroom ? (users === null || users === void 0 ? void 0 : users.length) <= 1 : false,
+            onClick: function onClick() {
+              setPopoverOpened(!popoverOpened);
+            },
+            iconReverse: true
+          })
         })
       })
     })]

package/lib/modules/chat/chat-room-store.js

@@ -41,10 +41,6 @@ require("core-js/modules/es.object.entries.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.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.for-each.js");
-require("core-js/modules/esnext.async-iterator.some.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");

package/lib/modules/chat/chat-select/index.css

@@ -1,9 +1,15 @@
 .leave-container {
   position: relative;
-  padding: 20px;
+  padding: 8px 20px 20px;
   max-height: 368px;
 }
 
+.fcr-dialog-body .leave-container {
+  position: relative;
+  max-height: 368px;
+  padding: 0px;
+}
+
 .leave-confirm {
   width: 100%;
   height: 36px;
@@ -58,16 +64,17 @@
   align-items: center;
   cursor: pointer;
   width: 215px !important;
-
+  border-radius: var(--fcr_cornerradius_l);
+}
+.candidate-container-selected:hover,
+.candidate-container:hover {
   background: var(--fcr_web_ui_scene_hover);
-  border-radius: var(--fcr_cornerradius_s);
 }
 
 .candidate-avatar {
   width: 26px;
   height: 26px;
   border-radius: var(--fcr_cornerradius_s);
-
   background: var(--for_head5);
   display: flex;
   justify-content: center;
@@ -80,6 +87,9 @@
   font-weight: 700;
   line-height: 14px;
 }
+.candidate-avatar .fcr-avatar {
+  border-radius: var(--fcr_cornerradius_m);
+}
 
 .candidate-avatar-all {
   background: var(--for_head1);
@@ -152,6 +162,13 @@
   flex-direction: column;
 }
 
+.fcr-no-data img {
+  margin-top: 20px;
+  width: 50%;
+  object-fit: contain;
+  margin-bottom: 20px;
+}
+
 .fcr-no-data span {
   font-weight: 400;
   font-size: 13px;

package/lib/modules/chat/chat-select/index.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 ChatSelectProps {
     type: 'assign-host' | 'private-chat';
     title?: React.ReactNode;

package/lib/modules/chat/chat-select/index.js

@@ -28,7 +28,7 @@ var _mobxReact = require("mobx-react");
 var _react = require("react");
 require("./index.css");
 var _reactVirtualized = require("react-virtualized");
-var _type2 = require("agora-edu-core/lib/type");
+var _type2 = require("fcr-core/lib/type");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _store = require("../store");
 var _textBubble = require("agora-ui-foundation/lib/components/text-bubble");
@@ -142,11 +142,11 @@ var ChatSelect = exports.ChatSelect = (0, _mobxReact.observer)(function (_ref) {
             style: {
               color: (0, _helper.getNameColor)(datum.userName)
             },
-            children: highlightMatches(datum.userName, filterKey).map(function (value) {
+            children: highlightMatches(datum.userName, filterKey).map(function (value, i) {
               return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
                 className: value !== null && value !== void 0 && value.isHighlight ? 'candidate-highlight' : '',
                 children: value.data
-              });
+              }, "".concat(i));
             })
           }), datum.userId !== _store.USER_ALL && (datum.userRole === _type2.FcrUserRole.COHOST || datum.userRole === _type2.FcrUserRole.HOST) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_textBubble.TextBubble, {
             txt: t(datum.userRole === _type2.FcrUserRole.HOST ? 'fmt_role_host' : 'fmt_role_cohost'),

package/lib/modules/chat/chat.d.ts

@@ -1,11 +1,10 @@
-export declare const Chat: ({ updateReadIndex, sendMsg, userId: localUserId, isHost, singling, handleClickUploadImage, }: {
+export declare const Chat: ({ updateReadIndex, sendMsg, userId: localUserId, singling, handleClickUploadImage, }: {
     updateReadIndex: (data?: {
         index: number;
         msgId: string;
     }) => void;
     sendMsg: (msg: string) => void;
     userId: string;
-    isHost: boolean;
     singling?: boolean;
     handleClickUploadImage: () => void;
 }) => import("react/jsx-runtime").JSX.Element;