fcr-ui-scene 3.8.1-beta → 3.8.2

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

@@ -12,7 +12,10 @@ export default class InviteStore implements FcrUIManagedObject {
     private _sharedMeetingTimeDataSource;
     private _mainRoomControl;
     private _messageProvider;
+    private _widgetProvider;
     private _roomConnectorControl;
+    private _dialogProvider;
+    private _dialogProviderObserver;
     accessor roomInfo: FcrRoomInfo;
     accessor roomSchedule: FcrRoomSchedule;
     accessor meetingId: string;
@@ -38,6 +41,7 @@ export default class InviteStore implements FcrUIManagedObject {
     get meetingTimeStatus(): import("../../shared-data/meeting-time").MeetingStatus;
     get meetingTime(): string;
     get roomId(): string;
+    get widgetConfigByContacts(): import("../../type").FcrUIWebWidgetConfig | undefined;
     constructor({ objectManager }: InviteStoreArgs);
     closeInviteDialog(): void;
     release(): void;

package/lib/modules/invite/store.js

@@ -38,12 +38,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.StoreContext = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.array.map.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.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.map.js");
 require("core-js/modules/esnext.weak-map.delete-all.js");
 require("core-js/modules/esnext.weak-map.emplace.js");
@@ -58,10 +60,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _mobx = require("mobx");
 var _type = require("fcr-core/lib/room-control/room-connector-control/type");
 var _react = require("react");
+var _type2 = require("../../type");
 var _enums = require("./enums");
 var _objectManager = require("../../object-manager");
 var _logger = require("../../utilities/logger");
 var _meetingDetail = require("../../utilities/meeting-detail");
+var _constant = require("../../utilities/constant");
 var _InviteStore;
 var _initProto, _init_InviteStatus, _init_isPstnCalling, _init_isVoipCalling, _init_ipInfo, _init_phoneInfo, _init_calledPstnInfo, _init_calledVoipInfo, _stopSessionDecs, _startSessionByPhoneDecs, _startSessionByVoipDecs, _showToastDecs, _getRoomConnectorIpInfoDecs, _getRoomConnectorPhoneInfoDecs, _handleErrorDecs, _updateInviteStatusDecs, _resetpstnStatusDecs, _resetVoipStatusDecs, _handlePhoneConnectorSessionStateUpdatedDecs, _handleIPConnectorSessionStateUpdatedDecs, _ref;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -88,7 +92,8 @@ var _K = /*#__PURE__*/new WeakMap();
 _ref = (_stopSessionDecs = [_mobx.action, _mobx.action.bound], _startSessionByPhoneDecs = [_mobx.action, _mobx.action.bound], _startSessionByVoipDecs = [_mobx.action, _mobx.action.bound], _showToastDecs = [_mobx.action, _mobx.action.bound], _getRoomConnectorIpInfoDecs = [_mobx.action, _mobx.action.bound], _getRoomConnectorPhoneInfoDecs = [_mobx.action, _mobx.action.bound], _handleErrorDecs = [_mobx.action, _mobx.action.bound], _updateInviteStatusDecs = [_mobx.action, _mobx.action.bound], _resetpstnStatusDecs = [_mobx.action, _mobx.action.bound], _resetVoipStatusDecs = [_mobx.action, _mobx.action.bound], _handlePhoneConnectorSessionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], _handleIPConnectorSessionStateUpdatedDecs = [_mobx.action, _mobx.action.bound], "logger");
 var InviteStore = exports["default"] = /*#__PURE__*/function () {
   function InviteStore(_ref2) {
-    var _ref3;
+    var _this = this,
+      _ref3;
     var objectManager = _ref2.objectManager;
     (0, _classCallCheck2["default"])(this, InviteStore);
     (0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
@@ -100,6 +105,28 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       onPhoneConnectorSessionStateUpdated: this._handlePhoneConnectorSessionStateUpdated,
       onIPConnectorSessionStateUpdated: this._handleIPConnectorSessionStateUpdated
     });
+    (0, _defineProperty2["default"])(this, "_dialogProviderObserver", {
+      onDialogClose: function onDialogClose(dialogKey) {
+        if (dialogKey === _constant.FcrUIDialogKey.INVITE) {
+          var widgetConfigByContacts = _this.widgetConfigByContacts;
+          if (widgetConfigByContacts) {
+            _this._widgetProvider.closeWidget(widgetConfigByContacts.id);
+          } else {
+            _this.logger.info('widgetConfigByContacts closed');
+          }
+        }
+      },
+      onDialogOpen: function onDialogOpen(dialogKey) {
+        if (dialogKey === _constant.FcrUIDialogKey.INVITE) {
+          var widgetConfigByContacts = _this.widgetConfigByContacts;
+          if (widgetConfigByContacts) {
+            _this._widgetProvider.openWidget(widgetConfigByContacts.id);
+          } else {
+            _this.logger.info('widgetConfigByContacts not found');
+          }
+        }
+      }
+    });
     _classPrivateFieldInitSpec(this, _A, void 0);
     _classPrivateFieldInitSpec(this, _B, void 0);
     _classPrivateFieldInitSpec(this, _C, '');
@@ -126,6 +153,8 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
     this._roomConnectorControl = this._mainRoomControl.getRoomConnectorControl();
     this._sharedMemberDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEMBER_DATA_SOURCE);
     this._sharedMeetingTimeDataSource = objectManager.getObject(_objectManager.FcrUIObjectKeys.S_SHARED_MEETING_TIME_DATA_SOURCE);
+    this._widgetProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_WIDGET_PROVIDER);
+    this._dialogProvider = objectManager.getObject(_objectManager.FcrUIObjectKeys.P_DIALOG_PROVIDER);
     this._roomConnectorControl.addObserver(this._roomConnectorObserver);
     this._getRoomConnectorPhoneInfo();
     this._getRoomConnectorIpInfo();
@@ -133,6 +162,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
     this.roomSchedule = this._mainRoomControl.getRoomSchedule();
     this.meetingId = (_ref3 = this._mainRoomControl.getRoomPropertiesByKeyPath('meetingId')) !== null && _ref3 !== void 0 ? _ref3 : this.roomId;
     this.localUserName = this._mainRoomControl.getUserControl().getLocalUser().userName;
+    this._dialogProvider.addObserver(this._dialogProviderObserver);
   }
   return (0, _createClass2["default"])(InviteStore, [{
     key: "roomInfo",
@@ -275,6 +305,14 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
     get: function get() {
       return this.roomInfo.roomId;
     }
+  }, {
+    key: "widgetConfigByContacts",
+    get: function get() {
+      var contacts = this._widgetProvider.supportedWidgetConfigs.find(function (widgetConfig) {
+        return widgetConfig.id === _type2.CONTACTS_WIDGET_ID;
+      });
+      return contacts;
+    }
   }, {
     key: "closeInviteDialog",
     value: function closeInviteDialog() {
@@ -289,6 +327,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
     key: "release",
     value: function release() {
       this._roomConnectorControl.removeObserver(this._roomConnectorObserver);
+      this._dialogProvider.removeObserver(this._dialogProviderObserver);
     }
   }, {
     key: "stopSession",
@@ -460,13 +499,13 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "handleError",
     value: function handleError(info, error, sessionType) {
-      var _this = this;
+      var _this2 = this;
       this.updateInviteStatus(info, _enums.InviteStatus.ERROR);
       setTimeout(function () {
         if (sessionType === 'pstn') {
-          _this.isPstnCalling = false;
+          _this2.isPstnCalling = false;
         } else if (sessionType === 'voip') {
-          _this.isVoipCalling = false;
+          _this2.isVoipCalling = false;
         }
       }, 1500);
     }
@@ -490,7 +529,7 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_handlePhoneConnectorSessionStateUpdated",
     value: function _handlePhoneConnectorSessionStateUpdated(session, state, reason) {
-      var _this2 = this;
+      var _this3 = this;
       if (session.phoneNumber !== this.calledPstnInfo.phoneNumber) {
         return;
       }
@@ -505,14 +544,14 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       }
       if (state === _type.FcrRoomConnectorSessionState.END) {
         setTimeout(function () {
-          _this2._resetpstnStatus();
+          _this3._resetpstnStatus();
         }, 1.5 * 1000);
       }
     }
   }, {
     key: "_handleIPConnectorSessionStateUpdated",
     value: function _handleIPConnectorSessionStateUpdated(session, state, reason) {
-      var _this3 = this;
+      var _this4 = this;
       if (session.address !== this.calledVoipInfo.address) {
         return;
       }
@@ -527,14 +566,14 @@ var InviteStore = exports["default"] = /*#__PURE__*/function () {
       }
       if (state === _type.FcrRoomConnectorSessionState.END) {
         setTimeout(function () {
-          _this3._resetVoipStatus();
+          _this4._resetVoipStatus();
         }, 1.5 * 1000);
       }
     }
   }]);
 }();
 _InviteStore = InviteStore;
-var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_InviteStore, [[_mobx.observable, 1, "InviteStatus"], [_mobx.observable, 1, "isPstnCalling"], [_mobx.observable, 1, "isVoipCalling"], [_mobx.observable, 1, "ipInfo"], [_mobx.observable, 1, "phoneInfo"], [_mobx.observable, 1, "calledPstnInfo"], [_mobx.observable, 1, "calledVoipInfo"], [_stopSessionDecs, 18, "stopSession"], [_startSessionByPhoneDecs, 18, "startSessionByPhone"], [_startSessionByVoipDecs, 18, "startSessionByVoip"], [_showToastDecs, 18, "showToast"], [_getRoomConnectorIpInfoDecs, 18, "_getRoomConnectorIpInfo"], [_getRoomConnectorPhoneInfoDecs, 18, "_getRoomConnectorPhoneInfo"], [_handleErrorDecs, 18, "handleError"], [_updateInviteStatusDecs, 18, "updateInviteStatus"], [_resetpstnStatusDecs, 18, "_resetpstnStatus"], [_resetVoipStatusDecs, 18, "_resetVoipStatus"], [_handlePhoneConnectorSessionStateUpdatedDecs, 18, "_handlePhoneConnectorSessionStateUpdated"], [_handleIPConnectorSessionStateUpdatedDecs, 18, "_handleIPConnectorSessionStateUpdated"]], []).e, 8);
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_InviteStore, [[_mobx.observable, 1, "InviteStatus"], [_mobx.observable, 1, "isPstnCalling"], [_mobx.observable, 1, "isVoipCalling"], [_mobx.observable, 1, "ipInfo"], [_mobx.observable, 1, "phoneInfo"], [_mobx.observable, 1, "calledPstnInfo"], [_mobx.observable, 1, "calledVoipInfo"], [_mobx.computed, 3, "widgetConfigByContacts"], [_stopSessionDecs, 18, "stopSession"], [_startSessionByPhoneDecs, 18, "startSessionByPhone"], [_startSessionByVoipDecs, 18, "startSessionByVoip"], [_showToastDecs, 18, "showToast"], [_getRoomConnectorIpInfoDecs, 18, "_getRoomConnectorIpInfo"], [_getRoomConnectorPhoneInfoDecs, 18, "_getRoomConnectorPhoneInfo"], [_handleErrorDecs, 18, "handleError"], [_updateInviteStatusDecs, 18, "updateInviteStatus"], [_resetpstnStatusDecs, 18, "_resetpstnStatus"], [_resetVoipStatusDecs, 18, "_resetVoipStatus"], [_handlePhoneConnectorSessionStateUpdatedDecs, 18, "_handlePhoneConnectorSessionStateUpdated"], [_handleIPConnectorSessionStateUpdatedDecs, 18, "_handleIPConnectorSessionStateUpdated"]], []).e, 8);
 _init_InviteStatus = _applyDecs$e[0];
 _init_isPstnCalling = _applyDecs$e[1];
 _init_isVoipCalling = _applyDecs$e[2];

package/lib/modules/invite/view.d.ts

@@ -1 +1,4 @@
-export declare const View: () => import("react/jsx-runtime").JSX.Element;
+import { ReactNode } from 'react';
+export declare const View: (props: {
+    contactsChildren: ReactNode;
+}) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/invite/view.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.View = void 0;
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.function.name.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");
 var _react = require("react");
@@ -14,26 +16,39 @@ var _voipInvite = require("./components/voip-invite");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _tabFrame = _interopRequireDefault(require("../components/tab-frame"));
 var _enums = require("./enums");
+var _store = require("./store");
 var _jsxRuntime = require("react/jsx-runtime");
-var View = exports.View = (0, _mobxReact.observer)(function () {
+var View = exports.View = (0, _mobxReact.observer)(function (props) {
+  var contactsChildren = props.contactsChildren;
+  var _useContext = (0, _react.useContext)(_store.StoreContext),
+    widgetConfigByContacts = _useContext.widgetConfigByContacts;
+  var widgetConfigByContactsId = widgetConfigByContacts === null || widgetConfigByContacts === void 0 ? void 0 : widgetConfigByContacts.id;
   var _useState = (0, _react.useState)(_enums.InviteType.PSTN),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     currentInviteType = _useState2[0],
     setCurrentInviteType = _useState2[1];
   var transI18n = (0, _i18n.useI18n)();
+  var tabs = [{
+    label: "".concat(transI18n('fmt_pstn_label_phonecall')),
+    key: _enums.InviteType.PSTN,
+    content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_pstnInvite.PSTNInvite, {})
+  }, {
+    label: "".concat(transI18n('fmt_sip_options_H323')),
+    key: _enums.InviteType.VOIP,
+    content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_voipInvite.VoipInvite, {})
+  }];
+  if (widgetConfigByContacts) {
+    tabs.push({
+      label: widgetConfigByContacts.name,
+      key: widgetConfigByContactsId,
+      content: contactsChildren
+    });
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tabFrame["default"], {
     activeKey: currentInviteType,
     onChange: function onChange(key) {
       return setCurrentInviteType(key);
     },
-    tabs: [{
-      label: "".concat(transI18n('fmt_pstn_label_phonecall')),
-      key: _enums.InviteType.PSTN,
-      content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_pstnInvite.PSTNInvite, {})
-    }, {
-      label: "".concat(transI18n('fmt_sip_options_H323')),
-      key: _enums.InviteType.VOIP,
-      content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_voipInvite.VoipInvite, {})
-    }]
+    tabs: tabs
   });
 });

package/lib/modules/layout/components/CommonVideoRenderer.js

@@ -213,14 +213,14 @@ var CommonVideoRenderer = exports.CommonVideoRenderer = (0, _mobxReact.observer)
       var isBoard = type === _type.FcrUIWindowType.BOARD;
       var isScreenSharing = videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN;
 
-      /**
-       * 在共享时，主窗口会有一个额外的控制条，需要将视频内容减去这个高度（28px），所以增加一个class用来覆盖高度样式
+      /**
+       * 在共享时，主窗口会有一个额外的控制条，需要将视频内容减去这个高度（28px），所以增加一个class用来覆盖高度样式
        */
       var clsWithShareControlBar = (0, _classnames["default"])({
         'fcr-member-window-with-share-controlbar': isMainWindowInScreenSharing
       });
-      /**
-       * 在只有一个用户时，无法开启网格布局，所以可以通过 data.length 和 layoutType 判断是否是主窗口。
+      /**
+       * 在只有一个用户时，无法开启网格布局，所以可以通过 data.length 和 layoutType 判断是否是主窗口。
        */
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: commonProps.className,