fcr-ui-scene 3.3.1 → 3.4.1

package/lib/modules/chat/chat.js

@@ -14,7 +14,6 @@ require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.array.unshift.js");
 require("core-js/modules/es.map.js");
@@ -51,7 +50,6 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _mobxReact = require("mobx-react");
 var _store = require("./store");
 var _messageList = require("./message-list");
-var _contex = require("./contex");
 var _chatWrapper = require("agora-ui-foundation/lib/components/chat-wrapper");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _react = require("react");
@@ -60,8 +58,8 @@ var _type = require("../../type");
 var _util = require("./util");
 var _copyText = require("../../utilities/copyText");
 var _chatManager = require("agora-ui-foundation/lib/components/chat-manager");
-var _type2 = require("agora-edu-core/lib/room-control/chatroom-control/type");
-var _agoraEduCore = require("agora-edu-core");
+var _type2 = require("fcr-core/lib/room-control/chatroom-control/type");
+var _fcrCore = require("fcr-core");
 var _tabs = require("agora-ui-foundation/lib/components/tabs");
 var _constant = require("../../utilities/constant");
 var _fcr_chat_reddot = _interopRequireDefault(require("../../../public/assets/fcr_chat_reddot.svg"));
@@ -74,21 +72,22 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     singling = _ref.singling,
     handleClickUploadImage = _ref.handleClickUploadImage;
   var t = (0, _i18n.useI18n)();
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
+    chatRoomStores = _useContext.chatRoomStores,
+    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
+    activeTabIndex = _useContext.activeTabIndex,
+    handlerActiveTab = _useContext.handlerActiveTab;
   var defaultProps = {
     errorMsg: t('fmt_chat_tips_exceedlimit'),
     forbiddenTxt: t('fmt_chat_button_muteall'),
     styles: {
-      display: 'flex'
+      display: 'flex',
+      height: chatRoomStores[_constant.RoomType.WAITING_ROOM] && chatRoomStores[_constant.RoomType.WAITING_ROOM].userCount > 0 ? 'calc(100% - 28px)' : '100%'
     }
   };
   var styles = defaultProps.styles,
     forbiddenTxt = defaultProps.forbiddenTxt,
     errorMsg = defaultProps.errorMsg;
-  var _useContext = (0, _react.useContext)(_contex.StoreContext),
-    chatRoomStores = _useContext.chatRoomStores,
-    hasWaitingRoomPermission = _useContext.hasWaitingRoomPermission,
-    activeTabIndex = _useContext.activeTabIndex,
-    handlerActiveTab = _useContext.handlerActiveTab;
   var _ref2 = chatRoomStores[activeTabIndex],
     setTargetUser = _ref2.setTargetUser,
     privateTargetUser = _ref2.privateTargetUser,
@@ -107,7 +106,8 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     hasChatPermission = _ref2.hasChatPermission,
     hasChatSendPrivatePermission = _ref2.hasChatSendPrivatePermission,
     filterChatMember = _ref2.filterChatMember,
-    hasSendMessagePermission = _ref2.hasSendMessagePermission;
+    hasSendMessagePermission = _ref2.hasSendMessagePermission,
+    hasSendAllPermission = _ref2.hasSendAllPermission;
   var handleTargetChange = function handleTargetChange(user) {
     setTargetUser(user);
   };
@@ -123,32 +123,21 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
     selectCnt = _useState6[0],
     setSelectCnt = _useState6[1];
-  var _useState7 = (0, _react.useState)((0, _toConsumableArray2["default"])(privateTargetList)),
-    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-    targetList = _useState8[0],
-    setTargetList = _useState8[1];
-  (0, _react.useEffect)(function () {
+  var targetList = (0, _react.useMemo)(function () {
     var _users$;
     var users = (0, _toConsumableArray2["default"])(remoteUsers);
     if (((_users$ = users[0]) === null || _users$ === void 0 ? void 0 : _users$.userId) === _store.USER_ALL) {
-      if (chatLevel !== 'everyone' && chatLevel !== 'public' && !localIsManager) {
+      if (!hasSendAllPermission) {
         users.shift();
       }
-    } else if (chatLevel === 'everyone' || chatLevel == 'public' || localIsManager) {
+    } else if (hasSendAllPermission) {
       users.unshift({
         userId: _store.USER_ALL,
         userName: t('fmt_chat_option_all'),
         userRole: _type.FcrUserRole.ROBOT,
-        connectorType: _agoraEduCore.FcrRoomConnectorType.NONE
+        connectorType: _fcrCore.FcrRoomConnectorType.NONE
       });
     }
-    remoteUsers.forEach(function (user) {
-      if (!users.find(function (u) {
-        return u.userId === user.userId;
-      })) {
-        users.push(user);
-      }
-    });
     users = users.filter(function (user) {
       return remoteUsers.find(function (u) {
         return u.userId === user.userId;
@@ -160,9 +149,9 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
         return u.userId === user.userId;
       })) !== null && _remoteUsers$find !== void 0 ? _remoteUsers$find : user;
     });
-    users = filterChatMember((0, _toConsumableArray2["default"])(users));
-    setTargetList((0, _toConsumableArray2["default"])(users));
-  }, [chatLevel, remoteUsers]);
+    users = filterChatMember(users);
+    return users;
+  }, [chatLevel, remoteUsers, activeTabIndex, hasChatPermission, hasChatSendPrivatePermission]);
   var handleMultiCopyMsg = /*#__PURE__*/function () {
     var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var msgHandled, msgIndex;
@@ -335,7 +324,7 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
       },
       handleClickUploadImage: handleClickUploadImage,
       msgBarElement: /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatBar.MessageBar, {
-        selectedUserId: privateTargetUser.userId,
+        selectedUser: privateTargetUser,
         users: targetList,
         onTargetChange: handleTargetChange,
         title: chatSelectNoTitle ? undefined : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -382,7 +371,7 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
   });
 });
 var ChatAction = exports.ChatAction = (0, _mobxReact.observer)(function () {
-  var _useContext2 = (0, _react.useContext)(_contex.StoreContext),
+  var _useContext2 = (0, _react.useContext)(_store.StoreContext),
     chatRoomStores = _useContext2.chatRoomStores;
   var _ref5 = chatRoomStores[_constant.RoomType.MAIN_ROOM],
     isHostOrCoHost = _ref5.isHostOrCoHost,

package/lib/modules/chat/index.css

@@ -64,3 +64,13 @@
   right: -16px;
   left: auto;
 }
+
+.fcr-line-system-message {
+  margin: 0 20px;
+}
+
+.chat-tabs-container .fcr-tabs {
+  margin-right: 15px;
+  margin-left: 15px;
+  width: 100%;
+}

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

@@ -1,21 +1,13 @@
 import { UIModule } from '../../base';
 import './index.css';
-import { FcrUIEventStore } from '../../common/event-store';
-import { FcrSecurityStore } from '../../common/security-store';
 import { CHAT_WRAPPER_CLASS } from 'agora-ui-foundation/lib/components/chat-wrapper';
-import { FcrChatRoomFile, FcrChatRoomMessageType } from 'agora-edu-core/lib/room-control/chatroom-control/type';
-import { FcrMainRoomControl, FcrWaitingRoomControl } from 'agora-edu-core/lib/room-control/type';
+import { FcrChatRoomFile, FcrChatRoomMessageType } from 'fcr-core/lib/room-control/chatroom-control/type';
+import { StoreConfig } from '../../type';
 export { CHAT_WRAPPER_CLASS };
 export declare class ChatUIModule extends UIModule {
     private _store;
-    private _chatRoomControl;
-    private _uiEventStore;
     private _uid;
-    constructor({ roomControl, uiEventStore, securityStore, }: {
-        roomControl: FcrMainRoomControl | FcrWaitingRoomControl;
-        uiEventStore: FcrUIEventStore;
-        securityStore: FcrSecurityStore;
-    });
+    constructor(args: StoreConfig);
     getComponent(params?: {
         singling?: boolean;
     }): import("react/jsx-runtime").JSX.Element;

package/lib/modules/chat/index.dev.js

@@ -10,13 +10,15 @@ var _react = require("react");
 var _demoWrapper = require("./demo-wrapper");
 var _eventStore = require("../../common/event-store");
 var _securityStore = require("../../common/security-store");
+var _roomStore = require("../../common/room-store");
+var _deviceStore = require("../../common/device-store");
 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'));
 window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-  var engine, roomId, roomControl, uiEventStore, securityStore, uiModule, App;
+  var engine, roomId, roomControl, uiEventStore, deviceStore, securityStore, uiModule, App;
   return _regenerator["default"].wrap(function _callee$(_context) {
     while (1) switch (_context.prev = _context.next) {
       case 0:
@@ -25,7 +27,8 @@ window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default
         // await engine.login();
         roomControl = engine.createMainRoomControl(roomId);
         uiEventStore = new _eventStore.FcrUIEventStore();
-        securityStore = new _securityStore.FcrSecurityStore(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), roomControl.getRoomSessionControl(), uiEventStore); // TODO: dev 环境需要 join
+        deviceStore = new _deviceStore.FcrDeviceStore(engine.getDesktopMediaControl(), uiEventStore);
+        securityStore = new _securityStore.FcrSecurityStore(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), uiEventStore); // TODO: dev 环境需要 join
         // await roomControl.join({
         //   userRole: FcrUserRole.HOST,
         //   userName: 'zxq-test' + Math.random() * 1000,
@@ -33,9 +36,21 @@ window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default
         //   createStreamConfigs: [],
         // });
         uiModule = new _.ChatUIModule({
+          mediaControl: engine.getDesktopMediaControl(),
           roomControl: roomControl,
+          securityStore: securityStore,
+          deviceStore: deviceStore,
           uiEventStore: uiEventStore,
-          securityStore: securityStore
+          roomStore: new _roomStore.FcrRoomStore(uiEventStore, deviceStore, {}, engine),
+          streamControl: roomControl.getStreamControl(),
+          userControl: roomControl.getUserControl(),
+          privilegeControl: roomControl.getPrivilegeControl(),
+          chatRoomControl: roomControl.getChatRoomControl(),
+          engine: null,
+          remoteVideoRenderManager: null,
+          config: null,
+          parameters: null,
+          deviceStreamStore: null
         });
         App = (0, _root.hot)(function () {
           (0, _react.useEffect)(function () {
@@ -50,7 +65,7 @@ window.__DEV_ENGINE_IS_READY__.then(/*#__PURE__*/(0, _asyncToGenerator2["default
           });
         });
         _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.querySelector('#root'));
-      case 8:
+      case 9:
       case "end":
         return _context.stop();
     }

package/lib/modules/chat/index.js

@@ -16,6 +16,7 @@ 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.reflect.construct.js");
 require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.map.delete-all.js");
 require("core-js/modules/esnext.map.emplace.js");
@@ -32,6 +33,8 @@ require("core-js/modules/esnext.map.reduce.js");
 require("core-js/modules/esnext.map.some.js");
 require("core-js/modules/esnext.map.update.js");
 require("core-js/modules/esnext.symbol.metadata.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");
@@ -64,14 +67,16 @@ var _base = require("../../base");
 require("./index.css");
 var _chat = require("./chat");
 var _decorator = require("agora-foundation/lib/decorator");
-var _contex = require("./contex");
+var _store = _interopRequireWildcard(require("./store"));
 var _messageTextarea = require("agora-ui-foundation/lib/components/message-textarea");
 var _chatWrapper = require("agora-ui-foundation/lib/components/chat-wrapper");
-var _type = require("agora-edu-core/lib/room-control/chatroom-control/type");
-var _store = _interopRequireDefault(require("./store"));
+var _type = require("fcr-core/lib/room-control/chatroom-control/type");
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _jsxRuntime = require("react/jsx-runtime");
 var _ChatUIModule;
 var _initProto;
+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; })(); }
 function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
@@ -80,27 +85,16 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
 var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
-  function ChatUIModule(_ref) {
-    var _roomControl$getUserC;
+  function ChatUIModule(args) {
+    var _args$roomControl$get;
     var _this;
-    var roomControl = _ref.roomControl,
-      uiEventStore = _ref.uiEventStore,
-      securityStore = _ref.securityStore;
     (0, _classCallCheck2["default"])(this, ChatUIModule);
     _this = _callSuper(this, ChatUIModule);
     (0, _defineProperty2["default"])(_this, "_store", void _initProto(_this));
-    _this._chatRoomControl = roomControl.getChatRoomControl();
-    _this._uiEventStore = uiEventStore;
-    _this._store = new _store["default"]({
-      chatRoomControl: _this._chatRoomControl,
-      userControl: roomControl.getUserControl(),
-      uiEventStore: uiEventStore,
-      securityStore: securityStore,
-      roomControl: roomControl
-    });
+    _this._store = new _store["default"](args);
     _this.sendMessage = _this.sendMessage.bind(_this);
     _this.updateReadMsgIndex = _this.updateReadMsgIndex.bind(_this);
-    var userId = (_roomControl$getUserC = roomControl.getUserControl()) === null || _roomControl$getUserC === void 0 || (_roomControl$getUserC = _roomControl$getUserC.getLocalUser()) === null || _roomControl$getUserC === void 0 ? void 0 : _roomControl$getUserC.userId;
+    var userId = (_args$roomControl$get = args.roomControl.getUserControl()) === null || _args$roomControl$get === void 0 || (_args$roomControl$get = _args$roomControl$get.getLocalUser()) === null || _args$roomControl$get === void 0 ? void 0 : _args$roomControl$get.userId;
     _this._uid = userId !== null && userId !== void 0 ? userId : 'test' + Math.random().toString(36).substr(2);
     return _this;
   }
@@ -109,10 +103,10 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
     key: "getComponent",
     value: function getComponent(params) {
       var _this2 = this;
-      var _ref2 = params !== null && params !== void 0 ? params : {},
-        _ref2$singling = _ref2.singling,
-        singling = _ref2$singling === void 0 ? false : _ref2$singling;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_contex.StoreContext.Provider, {
+      var _ref = params !== null && params !== void 0 ? params : {},
+        _ref$singling = _ref.singling,
+        singling = _ref$singling === void 0 ? false : _ref$singling;
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: this._store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_chat.Chat, {
           updateReadIndex: this.updateReadMsgIndex,
@@ -134,7 +128,7 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
   }, {
     key: "getActionsComponent",
     value: function getActionsComponent() {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_contex.StoreContext.Provider, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
         value: this._store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_chat.ChatAction, {})
       });
@@ -143,7 +137,7 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
     key: "sendMessage",
     value: function () {
       var _sendMessage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(msg, type) {
-        var _this$_store$chatRoom, _this$_store$chatRoom2;
+        var _this$_store$chatRoom, _this$_store$chatRoom2, _reason;
         return _regenerator["default"].wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -159,7 +153,7 @@ var ChatUIModule = exports.ChatUIModule = /*#__PURE__*/function (_UIModule) {
               (_this$_store$chatRoom2 = this._store.chatRoomStores[this._store.activeTabIndex]) === null || _this$_store$chatRoom2 === void 0 || _this$_store$chatRoom2.handleToast({
                 id: 'send-msg',
                 toastProps: {
-                  content: _context.t0.reason,
+                  content: (_reason = _context.t0.reason) !== null && _reason !== void 0 ? _reason : (0, _i18n.transI18n)('fmt_chat_tips_Networkconnect'),
                   type: 'error',
                   size: 'small'
                 }

package/lib/modules/chat/message-list.js

@@ -61,7 +61,6 @@ var _textBubble = require("agora-ui-foundation/lib/components/text-bubble");
 var _latestButton = require("agora-ui-foundation/lib/components/latest-button");
 var _store = require("./store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _contex = require("./contex");
 var _mobxReact = require("mobx-react");
 var _throttle = _interopRequireDefault(require("lodash/throttle"));
 var _multiSelect = require("agora-ui-foundation/lib/components/multi-select");
@@ -95,7 +94,7 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
     selectCnt = _ref.selectCnt,
     copyTips = _ref.copyTips;
   var t = (0, _i18n.useI18n)();
-  var _useContext = (0, _react.useContext)(_contex.StoreContext),
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
     chatRoomStores = _useContext.chatRoomStores,
     activeTabIndex = _useContext.activeTabIndex;
   var _ref2 = chatRoomStores[activeTabIndex],
@@ -299,7 +298,9 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
               marginRight: 15,
               marginLeft: multiSelectActive ? 8 : 15,
               alignItems: 'flex-start'
-            }), index === 0 ? {
+            }), {}, {
+              pointerEvents: 'all'
+            }, index === 0 ? {
               paddingTop: 10
             } : {}),
             id: String(idx),
@@ -312,6 +313,7 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
                 marginBottom: 16
               }
             }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_textBubble.TextBubble, {
+              classnames: "fcr-line-system-message",
               txt: "".concat((0, _util.handleChatLevelChangedSystemMsg)(t, chatLevel, publisherRole, publisherNickName, publisherIsSelf)),
               marginBottom: 15
             }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
@@ -583,6 +585,10 @@ var MessageList = exports.MessageList = (0, _mobxReact.observer)(function (_ref)
     }) : null, messageList.length === 0 ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "fcr-no-data-chat",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+        style: {
+          width: 138,
+          height: 100
+        },
         src: _fcr_defaultpage["default"]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         children: t('fmt_chat_tips_nodata')

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

@@ -1,15 +1,16 @@
-import { FcrUserControl } from 'agora-edu-core';
+import { FcrUserControl } from 'fcr-core';
 import { RoleType } from 'agora-ui-foundation/lib/components/message-bubble';
-import { FcrUserRole, FcrUserInfo } from 'agora-edu-core/lib/type';
+import { FcrUserRole, FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrUIEventStore } from '../../common/event-store';
 import { FcrSecurityStore } from '../../common/security-store';
 import { CellMeasurerCache, List } from 'react-virtualized';
 import { RoomType } from '../../utilities/constant';
 import { AllowChatLevelType } from 'agora-ui-foundation/lib/components/chat-manager';
 import { ToastConfig } from 'agora-ui-foundation/lib/components/toast';
-import { FcrChatRoomConnectionState, FcrChatRoomControl, FcrChatRoomFile, FcrChatRoomMessageType, FcrChatRoomReceiveImageMessage, FcrChatRoomReceiveTextMessage } from 'agora-edu-core/lib/room-control/chatroom-control/type';
-import { FcrMainRoomControl, FcrWaitingRoomControl } from 'agora-edu-core/lib/room-control/type';
+import { FcrChatRoomConnectionState, FcrChatRoomControl, FcrChatRoomFile, FcrChatRoomMessageType, FcrChatRoomReceiveImageMessage, FcrChatRoomReceiveTextMessage } from 'fcr-core/lib/room-control/chatroom-control/type';
+import { FcrMainRoomControl, FcrRoomType, FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
 import { AgoraObservable } from 'agora-foundation/lib/utilities/observable';
+import { FcrRoomStore } from '../../common/room-store';
 type FcrChatRoomReceiveMessage = FcrChatRoomReceiveTextMessage | FcrChatRoomReceiveImageMessage;
 export interface MsgListType {
     id: string;
@@ -28,7 +29,6 @@ export interface MsgListType {
 export declare const USER_ALL = "All";
 export declare const USER_NONE = "NONE";
 export declare const allToUser: FcrUserInfo;
-export declare const noUser: FcrUserInfo;
 type FcrChatStoreObserver = {
     onReceiveMessage: (msgs: FcrChatRoomReceiveMessage[], type: RoomType) => void;
 };
@@ -45,12 +45,14 @@ export default class ChatStore {
     private _chatStoreObserver;
     accessor chatRoomStores: ChatRoomStoreMap;
     accessor activeTabIndex: RoomTypeKeys;
-    constructor({ chatRoomControl, userControl, uiEventStore, securityStore, roomControl, }: {
+    accessor roomType: FcrRoomType;
+    constructor({ chatRoomControl, userControl, uiEventStore, securityStore, roomControl, roomStore, }: {
         chatRoomControl: FcrChatRoomControl;
         userControl: FcrUserControl;
         uiEventStore: FcrUIEventStore;
         securityStore: FcrSecurityStore;
         roomControl: FcrWaitingRoomControl | FcrMainRoomControl;
+        roomStore: FcrRoomStore;
     });
     hasWaitingRoomPermission(): boolean;
     private _handleReceiveMessage;
@@ -82,6 +84,7 @@ export declare class ChatRoomStore {
     private _originalMessages;
     private _disposers;
     private _type;
+    private _noUser;
     private accessor _userInfo;
     accessor messageList: MsgListType[];
     accessor readMsgIndex: {
@@ -137,6 +140,7 @@ export declare class ChatRoomStore {
     get disallowedAllChat(): boolean | undefined;
     get hasChatPermission(): boolean;
     get hasChatSendPrivatePermission(): boolean;
+    get hasSendAllPermission(): boolean;
     get isHost(): boolean;
     get isCohost(): boolean;
     get localIsManager(): boolean;
@@ -172,7 +176,9 @@ export declare class ChatRoomStore {
     setAllowChat(allowChat: boolean): void;
     setAllowChatWithPayload(type: 'public' | 'private_to_manager'): void;
     private _handleConnectionUpdated;
+    private _initChatRoomConnectionState;
 }
 export declare function isManager(role: FcrUserRole): role is FcrUserRole.HOST | FcrUserRole.COHOST;
 export declare function sortUsers(users: FcrUserInfo[]): FcrUserInfo[];
+export declare const StoreContext: import("react").Context<ChatStore>;
 export {};