fcr-ui-scene 3.4.4 → 3.5.0

package/lib/modules/video-window/topControl/index.js

@@ -17,8 +17,6 @@ exports["default"] = void 0;
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.map.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.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");

package/lib/modules/video-window/type.d.ts

@@ -1,14 +1,35 @@
+import { FcrStreamControl } from 'fcr-core';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUIConnectType } from '../../type';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
+import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
+import { FcrUIDeviceStreamProvider } from '../../providers/device-stream-provider';
+import { FcrUISharedSpeakerSpotlightDataSource } from '../../shared-data-source/speaker-spotlight';
+import { FcrUISharedPinDataSource } from '../../shared-data-source/pin-data';
+import { FcrUISharedLayoutDataSource } from '../../shared-data-source/layout-data';
+import { FcrUIVideoWindowDataSource } from '../../shared-data-source/video-window';
+import { FcrUISharedInterpreterDataSource } from '../../shared-data-source/interpreter';
+import { FcrUISharedSettingDataSource } from '../../shared-data-source/setting';
+import { FcrUIChatProvider } from '../../providers/chat-provider';
+import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
 export declare enum FcrVideoWindowPreviewType {
-    MIX = "mix",
+    MINI = "mini",
     SMALL = "small",
-    MIDDLE = "middle"
+    LIST = "list"
 }
 export declare enum FcrVideoWindowPreviewTip {
-    MIX = "\u9690\u85CF\u89C6\u9891\u7F29\u7565\u56FE",
+    MINI = "\u9690\u85CF\u89C6\u9891\u7F29\u7565\u56FE",
     SMALL = "\u6F14\u8BB2\u8005\u89C6\u56FE",
-    MIDDLE = "\u663E\u793A\u6210\u5458\u5217\u8868"
+    LIST = "\u663E\u793A\u6210\u5458\u5217\u8868"
 }
 export type ConnectionTabType = 'computer' | 'phone';
+export interface DeviceStateProps {
+    connectType: FcrUIConnectType;
+    openConnection: (type: ConnectionTabType) => void;
+    microphoneVolumeLevel: number;
+    enableMicrophone: (enable: boolean) => void;
+    microphoneEnabled: boolean;
+}
 export declare const DefaultVideoWindowWidth = 246;
 export declare const DefaultVideoWindowHeight = 90;
 export declare const DefaultVideoWindowSmallTypeHeight = 233;
@@ -16,3 +37,18 @@ export declare const VideoWindowRadio: number;
 export declare const VideoWindowZoomMaxWidth = 644;
 export declare const VideoWindowZoomMaxHeight = 666;
 export declare const VideoWindowItemHeight = 144;
+export interface VideoWindowStoreParams {
+    uiEventStore: FcrUIEventProvider;
+    streamControl: FcrStreamControl;
+    securityStore: FcrUIPrivilegeProvider;
+    deviceStore: FcrUIDeviceProvider;
+    deviceStreamStore: FcrUIDeviceStreamProvider;
+    sharedSpeakerSpotlightDataSource: FcrUISharedSpeakerSpotlightDataSource;
+    sharedPinDataSource: FcrUISharedPinDataSource;
+    sharedLayoutDataSource: FcrUISharedLayoutDataSource;
+    sharedInterpreterDataSource: FcrUISharedInterpreterDataSource;
+    sharedSettingDataSource: FcrUISharedSettingDataSource;
+    chatProvider: FcrUIChatProvider;
+    sharedVideoWindowDataSource: FcrUIVideoWindowDataSource;
+    sharedMemberDataSource: FcrUIMemberSharedDataSource;
+}

package/lib/modules/video-window/type.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.VideoWindowZoomMaxWidth = exports.VideoWindowZoomMaxHeight = exports.VideoWindowRadio = exports.VideoWindowItemHeight = exports.FcrVideoWindowPreviewType = exports.FcrVideoWindowPreviewTip = exports.DefaultVideoWindowWidth = exports.DefaultVideoWindowSmallTypeHeight = exports.DefaultVideoWindowHeight = void 0;
 var FcrVideoWindowPreviewType = exports.FcrVideoWindowPreviewType = /*#__PURE__*/function (FcrVideoWindowPreviewType) {
-  FcrVideoWindowPreviewType["MIX"] = "mix";
+  FcrVideoWindowPreviewType["MINI"] = "mini";
   FcrVideoWindowPreviewType["SMALL"] = "small";
-  FcrVideoWindowPreviewType["MIDDLE"] = "middle";
+  FcrVideoWindowPreviewType["LIST"] = "list";
   return FcrVideoWindowPreviewType;
 }({});
 var FcrVideoWindowPreviewTip = exports.FcrVideoWindowPreviewTip = /*#__PURE__*/function (FcrVideoWindowPreviewTip) {
-  FcrVideoWindowPreviewTip["MIX"] = "\u9690\u85CF\u89C6\u9891\u7F29\u7565\u56FE";
+  FcrVideoWindowPreviewTip["MINI"] = "\u9690\u85CF\u89C6\u9891\u7F29\u7565\u56FE";
   FcrVideoWindowPreviewTip["SMALL"] = "\u6F14\u8BB2\u8005\u89C6\u56FE";
-  FcrVideoWindowPreviewTip["MIDDLE"] = "\u663E\u793A\u6210\u5458\u5217\u8868";
+  FcrVideoWindowPreviewTip["LIST"] = "\u663E\u793A\u6210\u5458\u5217\u8868";
   return FcrVideoWindowPreviewTip;
 }({});
 var DefaultVideoWindowWidth = exports.DefaultVideoWindowWidth = 246;

package/lib/modules/video-window/view.js

@@ -1,16 +1,7 @@
 "use strict";
 
-require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.object.define-property.js");
-require("core-js/modules/es.object.get-own-property-descriptor.js");
-require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/es.weak-map.js");
-require("core-js/modules/esnext.weak-map.delete-all.js");
-require("core-js/modules/esnext.weak-map.emplace.js");
-require("core-js/modules/web.dom-collections.iterator.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -18,40 +9,37 @@ exports.View = void 0;
 require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _mobxReact = require("mobx-react");
-var _react = _interopRequireWildcard(require("react"));
-var _topControl = _interopRequireDefault(require("./topControl"));
-var _speaking = _interopRequireDefault(require("./speaking"));
-var _members = require("./members");
-var _classnames = _interopRequireDefault(require("classnames"));
+var _react = require("react");
+var _members = require("./components/members");
 var _store = require("./store");
+var _topControl = _interopRequireDefault(require("./components/topControl"));
+var _speaking = _interopRequireDefault(require("./components/speaking"));
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 var View = exports.View = (0, _mobxReact.observer)(function () {
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     isHover = _useState2[0],
     setIsHover = _useState2[1];
   var _useContext = (0, _react.useContext)(_store.StoreContext),
-    setSpeakHover = _useContext.setSpeakHover,
-    bounds = _useContext.bounds;
+    setWrapperHover = _useContext.setWrapperHover,
+    innerFrameBounds = _useContext.innerFrameBounds;
   (0, _react.useEffect)(function () {
     if (!isHover) {
       var timer = setTimeout(function () {
-        setSpeakHover(false);
+        setWrapperHover(false);
       }, 2500);
       return function () {
         return clearTimeout(timer);
       };
     } else {
-      setSpeakHover(true);
+      setWrapperHover(true);
     }
   }, [isHover]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     style: {
-      width: bounds.width || undefined,
-      height: bounds.height || undefined
+      width: innerFrameBounds.width || undefined,
+      height: innerFrameBounds.height || undefined
     },
     onMouseEnter: function onMouseEnter() {
       setIsHover(true);
@@ -59,7 +47,7 @@ var View = exports.View = (0, _mobxReact.observer)(function () {
     onMouseLeave: function onMouseLeave() {
       setIsHover(false);
     },
-    className: (0, _classnames["default"])('fcr-video-window-dialog-wrapper'),
+    className: "fcr-video-window-dialog-wrapper",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_topControl["default"], {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_speaking["default"], {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_members.Members, {})]
   });
 });

package/lib/modules/whiteboard/components/switch-theme/index.js

@@ -9,8 +9,6 @@ exports["default"] = void 0;
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.find.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.map.js");

package/lib/modules/whiteboard/components/switch-theme/item.js

@@ -8,7 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = WhiteboardSwitchThemeItem;
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _jsxRuntime = require("react/jsx-runtime");

package/lib/modules/whiteboard/components/toolbar/components/color-picker/components/panel.js

@@ -9,8 +9,9 @@ exports.ColorPickerPanel = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");

package/lib/modules/whiteboard/components/toolbar/components/color-picker/index.js

@@ -8,7 +8,8 @@ exports.ColorPickerItem = void 0;
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.array.slice.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _react = require("react");

package/lib/modules/whiteboard/components/toolbar/components/extra-tool-picker.js

@@ -18,7 +18,7 @@ require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.date.to-string.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.regexp.to-string.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _ = require("..");

package/lib/modules/whiteboard/components/toolbar/components/move-handle.js

@@ -10,8 +10,6 @@ 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");

package/lib/modules/whiteboard/components/toolbar/components/pen-picker.js

@@ -7,7 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PenPickerItem = void 0;
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");

package/lib/modules/whiteboard/components/toolbar/components/shape-picker.js

@@ -8,8 +8,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.ShapePickerItem = void 0;
 require("core-js/modules/es.array.includes.js");
 require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.string.includes.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");

package/lib/modules/whiteboard/components/toolbar/hooks/index.js

@@ -11,8 +11,6 @@ require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.array.reverse.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.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.iterator.map.js");

package/lib/modules/whiteboard/components/toolbar/index.js

@@ -12,9 +12,6 @@ require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.object.keys.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.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/esnext.weak-map.delete-all.js");
@@ -32,7 +29,7 @@ require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.date.to-string.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.regexp.to-string.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));

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

@@ -27,6 +27,7 @@ export declare class FcrWhiteboardUIModule extends UIModule {
     private _timer;
     private _isMyBoard;
     private _t;
+    protected logger: import("agora-foundation/lib/logger").Logger;
     protected _mounted: boolean;
     protected _initialized: boolean;
     protected _joined: boolean;

package/lib/modules/whiteboard/index.js

@@ -18,7 +18,6 @@ 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.reflect.construct.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.function.metadata.js");
 require("core-js/modules/esnext.iterator.filter.js");
 require("core-js/modules/esnext.map.delete-all.js");
@@ -57,9 +56,6 @@ require("core-js/modules/es.set.js");
 require("core-js/modules/es.string.includes.js");
 require("core-js/modules/es.string.iterator.js");
 require("core-js/modules/es.weak-map.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.find.js");
 require("core-js/modules/esnext.iterator.for-each.js");
@@ -121,6 +117,7 @@ var _libs = _interopRequireDefault(require("./components/switch-theme/libs"));
 var _types = require("fcr-core/lib/room-control/whiteboard-control/types");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type3 = require("agora-ui-foundation/lib/components/icon/type");
+var _logger = require("../../utilities/logger");
 var _jsxRuntime = require("react/jsx-runtime");
 var _FcrWhiteboardUIModule;
 var _initProto, _init__lonelyWindowState, _init__ownerUser, _init__isHost, _init__boardBackground, _init__localUser, _onPropertiesUpdateDecs, _mountDecs, _unmountDecs, _unloadDecs, _boardUIEventsDecs, _createToolbarUIContextDecs, _repositionToolbarDecs, _updateRedoDecs, _updateUndoDecs, _setConnectionStateDecs, _getSnapshotImageDecs, _openLonelyWindowDecs, _setJoinSuccessedDecs, _ref;
@@ -168,6 +165,9 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
     (0, _defineProperty2["default"])(_this, "_t", function (t) {
       return '';
     });
+    (0, _defineProperty2["default"])(_this, "logger", (0, _logger.createLogger)({
+      prefix: 'FcrWhiteboardUIModule'
+    }));
     (0, _defineProperty2["default"])(_this, "_mounted", false);
     (0, _defineProperty2["default"])(_this, "_initialized", false);
     (0, _defineProperty2["default"])(_this, "_joined", false);
@@ -431,7 +431,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
       var _this$_securityStore2, _this$_localUser;
       var _ref2 = params || {},
         operatorUser = _ref2.operatorUser;
-      if ((_this$_securityStore2 = this._securityStore) !== null && _this$_securityStore2 !== void 0 && _this$_securityStore2.hasStartScreenSharePermission() && (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) !== ((_this$_localUser = this._localUser) === null || _this$_localUser === void 0 ? void 0 : _this$_localUser.userId)) {
+      if ((_this$_securityStore2 = this._securityStore) !== null && _this$_securityStore2 !== void 0 && _this$_securityStore2.hasStartScreenSharePermission() && (operatorUser === null || operatorUser === void 0 ? void 0 : operatorUser.userId) !== ((_this$_localUser = this._localUser) === null || _this$_localUser === void 0 ? void 0 : _this$_localUser.userId) && this._isActive) {
         var _this$_uiEventStore2;
         (_this$_uiEventStore2 = this._uiEventStore) === null || _this$_uiEventStore2 === void 0 || _this$_uiEventStore2.showToast({
           message: this._isMyBoard ? (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_stoppedboard') : (0, _i18n.transI18n)('fmt_screenshare_whiteboard_tips_stopped'),
@@ -786,8 +786,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         if (containerDom && toolbarDom) {
           var containerClientRect = containerDom.getBoundingClientRect();
           var toolbarClientRect = toolbarDom.getBoundingClientRect();
-          /* scene page bar 42 px height */
-          var toolbarOffsetTop = 42; //(containerClientRect.height - toolbarDom.clientHeight - 42) / 2;
+          var toolbarOffsetTop = 4;
           var toolbarContext = this._toolbarContext;
           (0, _mobx.runInAction)(function () {
             if (toolbarContext.observables.toolbarDockPosition.placement === 'right') {
@@ -855,7 +854,7 @@ var FcrWhiteboardUIModule = exports.FcrWhiteboardUIModule = /*#__PURE__*/functio
         var toolbarContext = this._toolbarContext;
         (0, _mobx.runInAction)(function () {
           if (placement === 'right') {
-            var availableHeight = containerClientRect.height - _utils.verticalPadding - _utils.defaultToolsRetain + _utils.sceneNavHeight;
+            var availableHeight = containerClientRect.height - _utils.verticalPadding - _utils.defaultToolsRetain - _utils.sceneNavHeight;
             toolbarContext.observables.maxCountVisibleTools = Math.floor(availableHeight / _utils.heightPerTool);
             if (toolbarContext.observables.maxCountVisibleTools >= 9) {
               var visibleTools = toolbarContext.observables.maxCountVisibleTools;

package/lib/modules/widget/sdk.d.ts

@@ -1,5 +1,5 @@
 import type { FcrRoomInfo, FcrRoomSchedule, FcrRoomState, FcrUserInfo } from 'fcr-core/lib/type';
-import { FcrUIWidgetObserver, FcrUIWidgetSDK } from './type';
+import type { FcrUIWidgetObserver, FcrUIWidgetSDK } from './type';
 interface JsBridge {
     [funcName: string]: (params: Record<string, any>) => void;
 }

package/lib/modules/widget/sdk.js

@@ -5,7 +5,6 @@ require("core-js/modules/es.symbol.description.js");
 require("core-js/modules/es.symbol.to-primitive.js");
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.error.to-string.js");
-require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.push.js");
 require("core-js/modules/es.date.to-primitive.js");
 require("core-js/modules/es.function.bind.js");
@@ -22,11 +21,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.FcrUIWidgetSDKImpl = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.date.to-string.js");
 require("core-js/modules/es.map.js");
@@ -205,10 +206,12 @@ var FcrUIWidgetSDKImpl = exports.FcrUIWidgetSDKImpl = /*#__PURE__*/function () {
             this._requestPromises["delete"](callId);
           }
         } else if (action === 'callback') {
+          var _this$_observable;
           var _event$data2 = event.data,
             payload = _event$data2.payload,
             method = _event$data2.method;
-          this._observable.notifyObservers(method, payload);
+          var args = Array.isArray(payload) ? payload : [payload];
+          (_this$_observable = this._observable).notifyObservers.apply(_this$_observable, [method].concat((0, _toConsumableArray2["default"])(args)));
         }
       }
     }

package/lib/modules/widget/type.d.ts

@@ -10,6 +10,7 @@ export interface PopupSize {
     width: number;
     height: number;
 }
+export type FcrRegisteredWidgetConfigs = Map<ID, FcrUIWebWidgetConfig>;
 export interface FcrUIWidgetSDK {
     /**
      * 获取房间信息
@@ -52,27 +53,27 @@ export interface FcrUIWidgetObserver {
      * @param state 最新的房间状态
      * @returns
      */
-    onRoomStateUpdated(state: FcrRoomState): void;
+    onRoomStateUpdated(roomId: string, state: FcrRoomState): void;
     /**
      * 远端用户加入房间回调
      * @param events 事件数组
      */
-    onRemoteUsersJoined(events: FcrUserJoinedEvent[]): void;
+    onRemoteUsersJoined(roomId: string, events: FcrUserJoinedEvent[]): void;
     /**
      * 远端用户离开房间回调
      * @param events 事件数组
      */
-    onRemoteUsersLeft(events: FcrUserLeftEvent[]): void;
+    onRemoteUsersLeft(roomId: string, events: FcrUserLeftEvent[]): void;
     /**
      * Callback to receive the user updated event.
      * @param event
      */
-    onUserInfoUpdated(event: FcrUserUpdatedEvent): void;
+    onUserInfoUpdated(roomId: string, event: FcrUserUpdatedEvent): void;
     /**
      * 房间内所有用户总数更新回调
      * @param count 当前的用户数量
      */
-    onAllUserCountUpdated?(count: number): void;
+    onAllUserCountUpdated?(roomId: string, count: number): void;
 }
 export interface FcrUIBaseWidget {
     /**

package/lib/modules/widget/web-widget.js

@@ -76,21 +76,21 @@ var FcrUIWebWidgetImpl = exports.FcrUIWebWidgetImpl = /*#__PURE__*/function () {
     })));
     (0, _defineProperty2["default"])(this, "_userControlObserver", {
       onRemoteUsersJoined: function onRemoteUsersJoined(roomId, events) {
-        _this._handleCallback('onRemoteUsersJoined', events);
+        _this._handleCallback('onRemoteUsersJoined', [roomId, events]);
       },
       onRemoteUsersLeft: function onRemoteUsersLeft(roomId, events) {
-        _this._handleCallback('onRemoteUsersLeft', events);
+        _this._handleCallback('onRemoteUsersLeft', [roomId, events]);
       },
       onUserInfoUpdated: function onUserInfoUpdated(roomId, event) {
-        _this._handleCallback('onUserInfoUpdated', event);
+        _this._handleCallback('onUserInfoUpdated', [roomId, event]);
       },
       onAllUserCountUpdated: function onAllUserCountUpdated(roomId, count) {
-        _this._handleCallback('onAllUserCountUpdated', count);
+        _this._handleCallback('onAllUserCountUpdated', [roomId, count]);
       }
     });
     (0, _defineProperty2["default"])(this, "_roomControlObserver", {
       onRoomStateUpdated: function onRoomStateUpdated(roomId, state) {
-        _this._handleCallback('onRoomStateUpdated', state);
+        _this._handleCallback('onRoomStateUpdated', [roomId, state]);
       }
     });
     _classPrivateFieldInitSpec(this, _A, _init_webview(this, null));

package/lib/providers/ability-provider.js

@@ -11,11 +11,13 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _type = require("fcr-core/lib/room-control/ability-control/type");
 var _base = require("../base");
-var _logger = require("agora-foundation/lib/logger");
+var _logger = require("../utilities/logger");
 var FcrUIAbilityProviderImpl = exports.FcrUIAbilityProviderImpl = /*#__PURE__*/(0, _createClass2["default"])(function FcrUIAbilityProviderImpl(_abilityControl) {
   var _this = this;
   (0, _classCallCheck2["default"])(this, FcrUIAbilityProviderImpl);
-  (0, _defineProperty2["default"])(this, "logger", (0, _logger.getLogger)());
+  (0, _defineProperty2["default"])(this, "logger", (0, _logger.createLogger)({
+    prefix: 'FcrUIAbilityProviderImpl'
+  }));
   /**
    * 检查当前平台是否支持指定能力
    */

package/lib/providers/chat-provider.d.ts

@@ -1,11 +1,12 @@
-import { FcrChatRoomConnectionState, FcrChatRoomReceiveImageMessage, FcrChatRoomReceiveTextMessage } from 'fcr-core/lib/room-control/chatroom-control/type';
-import { FcrBaseRoomControl, FcrRoomType } from 'fcr-core/lib/room-control/type';
+import { FcrChatRoomConnectionState, FcrChatRoomReceivedImageMessage, FcrChatRoomReceivedTextMessage } from 'fcr-core/lib/room-control/chatroom-control/type';
+import { FcrBaseRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrUserInfo } from 'fcr-core/lib/type';
 import { FcrUIRoomProvider } from './room-provider';
-export type FcrChatRoomReceiveMessage = FcrChatRoomReceiveTextMessage | FcrChatRoomReceiveImageMessage;
+import { FcrUIRoomType } from '../type';
+export type FcrChatRoomReceiveMessage = FcrChatRoomReceivedImageMessage | FcrChatRoomReceivedTextMessage;
 export type FcrUILatestMessageInfo = {
     notifyMsgs: FcrChatRoomReceiveMessage[];
-    currentRoomType: FcrRoomType;
+    currentRoomType: FcrUIRoomType;
 };
 export interface FcrUIChatProviderObserver {
     /**
@@ -14,7 +15,7 @@ export interface FcrUIChatProviderObserver {
      * @param roomType
      * @returns
      */
-    onPrivateChatTargetUserUpdated?: (user: FcrUserInfo, roomType: FcrRoomType) => void;
+    onPrivateChatTargetUserUpdated?: (user: FcrUserInfo, roomType: FcrUIRoomType) => void;
     /**
      * 收到新的聊天消息
      * @param roomId
@@ -22,7 +23,7 @@ export interface FcrUIChatProviderObserver {
      * @param roomType
      * @returns
      */
-    onNewChatMessageReceived?: (roomId: string, newMessage: FcrChatRoomReceiveMessage, roomType: FcrRoomType) => void;
+    onNewChatMessageReceived?: (roomId: string, newMessage: FcrChatRoomReceiveMessage, roomType: FcrUIRoomType) => void;
     /**
      * 聊天室连接状态变更
      * @param roomId
@@ -30,7 +31,7 @@ export interface FcrUIChatProviderObserver {
      * @param roomType
      * @returns
      */
-    onChatRoomConnectionStateUpdated?: (roomId: string, state: FcrChatRoomConnectionState, roomType: FcrRoomType) => void;
+    onChatRoomConnectionStateUpdated?: (roomId: string, state: FcrChatRoomConnectionState, roomType: FcrUIRoomType) => void;
     /**
      * 未读消息更新
      * @param unReadMessageList
@@ -44,12 +45,17 @@ export interface FcrUIChatProvider {
      */
     get latestsMessageInfo(): FcrUILatestMessageInfo;
     set latestsMessageInfo(info: FcrUILatestMessageInfo);
+    /**
+     * 获取聊天室状态
+     * @returns 聊天室状态
+     */
+    get chatConnectionState(): FcrChatRoomConnectionState;
     /**
      * 设置私聊用户
      * @param user
      * @param roomType
      */
-    setPrivateChatTargetUser(user: FcrUserInfo, roomType: FcrRoomType): void;
+    setPrivateChatTargetUser(user: FcrUserInfo, roomType: FcrUIRoomType): void;
     addObserver(observer: FcrUIChatProviderObserver): void;
     removeObserver(observer: FcrUIChatProviderObserver): void;
 }
@@ -57,11 +63,12 @@ export declare class FcrUIChatProviderImpl implements FcrUIChatProvider {
     private _observable;
     private _latestsMessageInfo;
     private _chatRoomObserver;
+    accessor chatConnectionState: FcrChatRoomConnectionState;
     private _waitingChatRoomObserver;
     constructor(_currentRoomControl: FcrBaseRoomControl, _roomProvider: FcrUIRoomProvider);
     get latestsMessageInfo(): FcrUILatestMessageInfo;
     set latestsMessageInfo(info: FcrUILatestMessageInfo);
-    setPrivateChatTargetUser(user: FcrUserInfo, roomType: FcrRoomType): void;
+    setPrivateChatTargetUser(user: FcrUserInfo, roomType: FcrUIRoomType): void;
     private _handleTextMessageReceived;
     private _handleConnectionUpdated;
     private _handleWaitingRoomTextMessageReceived;