fcr-ui-scene 3.3.0 → 3.4.0

package/lib/modules/share-screen/index.js

@@ -16,18 +16,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ShareScreenUIModule = void 0;
-require("core-js/modules/es.function.bind.js");
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _base = require("../../base");
-var _constant = require("../../utilities/constant");
 require("./index.css");
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
 var _selection = require("./selection");
+var _constant = require("../../utilities/constant");
 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; }
@@ -39,34 +38,10 @@ var ShareScreenUIModule = exports.ShareScreenUIModule = /*#__PURE__*/function (_
     (0, _classCallCheck2["default"])(this, ShareScreenUIModule);
     _this = _callSuper(this, ShareScreenUIModule);
     _this._store = new _store["default"](args);
-    _this.getShareState = _this.getShareState.bind(_this);
-    _this.startShareScreen = _this.startShareScreen.bind(_this);
-    _this.stopShareScreen = _this.stopShareScreen.bind(_this);
-    _this.replaceScreen = _this.replaceScreen.bind(_this);
     return _this;
   }
   (0, _inherits2["default"])(ShareScreenUIModule, _UIModule);
   return (0, _createClass2["default"])(ShareScreenUIModule, [{
-    key: "getShareState",
-    value: function getShareState() {
-      this._store.screenSharingState;
-    }
-  }, {
-    key: "startShareScreen",
-    value: function startShareScreen() {
-      this._store.handleShareScreenResource();
-    }
-  }, {
-    key: "stopShareScreen",
-    value: function stopShareScreen() {
-      this._store.handleStopShare();
-    }
-  }, {
-    key: "replaceScreen",
-    value: function replaceScreen() {
-      this._store.handleShareScreenResource();
-    }
-  }, {
     key: "getComponent",
     value: function getComponent() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
@@ -90,83 +65,11 @@ var ShareScreenUIModule = exports.ShareScreenUIModule = /*#__PURE__*/function (_
   }, {
     key: "onProcessEvent",
     value: function onProcessEvent(event) {
-      var _ref = event,
-        action = _ref.action,
-        payload = _ref.payload;
+      var action = event.action;
       switch (action) {
-        case _constant.RendererEventAction.FRAGMENT_LOADED:
-          if (payload === 'control-bar') {
-            this._store.setShareControlBarActive(true);
-          }
-          break;
-        case _constant.RendererEventAction.FRAGMENT_CLOSED:
-          if (payload === 'control-bar') {
-            this._store.setShareControlBarActive(false);
-            this._store.handleStopShare();
-            window.runtime.browserWindow.setFullScreen(false);
-            window.runtime.browserWindow.show();
-          }
-          break;
-        case _constant.RendererEventAction.START_NEW_SHARE_SCREEN:
-          this._store.handleReplaceScreen(payload.id, payload.type, payload.withAudio);
-          break;
-        case _constant.RendererEventAction.CLOSE_SHARE_SCREEN_SELECTION:
-          this._store.closeShareScreenSelection();
-          break;
-        case _constant.RendererEventAction.OPEN_CONTROL_BAR:
-          this._store.openControlBar();
-          break;
-        case _constant.RendererEventAction.SET_CONTROL_BAR_WINDOW_ID:
-          this._store.setControlBarWindowId(payload.controlBarWindowId);
-          break;
-        case _constant.RendererEventAction.CLOSE_CONTROL_BAR:
-          this._store.closeControlBar();
-          break;
-        case _constant.RendererEventAction.STOP_SHARE_SCREEN:
         case _constant.RendererEventAction.POWER_MONITOR_LOCK_SCREEN:
         case _constant.RendererEventAction.POWER_MONITOR_SUSPEND:
           this._store.handleStopShare();
-          this._store.closeDialog(_constant.DialogKey.PARTICIPANT);
-          break;
-        case _constant.RendererEventAction.CHOOSE_NEW_CONTENT_TO_SHARE:
-          this._store.handleShareScreenResource();
-          break;
-        case _constant.RendererEventAction.SET_SHARE_WITH_AUDIO:
-          this._store.setShareWithAudio(payload.withAudio);
-          break;
-
-        // Room control actions
-        case _constant.RendererEventAction.SET_MICROPHONE_DEVICE:
-          this._store.setCurrentMicrophoneId(payload.deviceId);
-          break;
-        case _constant.RendererEventAction.SET_CAMERA_DEVICE:
-          this._store.setCurrentCameraId(payload.deviceId);
-          break;
-        case _constant.RendererEventAction.SET_SPEAKER_DEVICE:
-          this._store.setCurrentSpeakerId(payload.deviceId);
-          break;
-        case _constant.RendererEventAction.MUTE_LOCAL_AUDIO:
-          this._store.muteLocalAudio(true, payload === null || payload === void 0 ? void 0 : payload.confirmAudioShareWhileMicOff);
-          break;
-        case _constant.RendererEventAction.UNMUTE_LOCAL_AUDIO:
-          this._store.muteLocalAudio(false);
-          break;
-        case _constant.RendererEventAction.MUTE_LOCAL_VIDEO:
-          this._store.muteLocalVideo(true);
-          break;
-        case _constant.RendererEventAction.UNMUTE_LOCAL_VIDEO:
-          this._store.muteLocalVideo(false);
-          break;
-
-        // more actions
-        case _constant.RendererEventAction.OPEN_SETTING:
-          this._store.openDialog(_constant.DialogKey.DEVICE_SETTINGS);
-          break;
-        case _constant.RendererEventAction.OPEN_LIVE_STEAMING_DIALOG:
-          this._store.openLiveStreamingDialog();
-          break;
-        default:
-          break;
       }
     }
   }]);

package/lib/modules/share-screen/selection/index.js

@@ -53,6 +53,8 @@ require("core-js/modules/esnext.typed-array.filter-reject.js");
 require("core-js/modules/esnext.typed-array.group-by.js");
 require("core-js/modules/esnext.typed-array.to-spliced.js");
 require("core-js/modules/esnext.typed-array.unique-by.js");
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _card = require("agora-ui-foundation/lib/components/card");
 var _type = require("agora-rte-sdk/lib/core/rtc/type");
@@ -70,8 +72,7 @@ var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 require("./index.css");
 var _store = require("../store");
-var _popover = require("agora-ui-foundation/lib/components/popover");
-var _openMicTips = _interopRequireDefault(require("../../../fragments/share-screen-selection/open-mic-tips"));
+var _icon = require("agora-ui-foundation/lib/components/icon");
 var _jsxRuntime = require("react/jsx-runtime");
 var ShareSelectionWindowType = /*#__PURE__*/function (ShareSelectionWindowType) {
   ShareSelectionWindowType["BASIC"] = "basic";
@@ -89,38 +90,56 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
     boardOwnerUser = _useContext.boardOwnerUser,
     localUser = _useContext.localUser,
     localUserRole = _useContext.localUserRole,
-    title = _useContext.title,
-    localMicrophoneMute = _useContext.localMicrophoneMute,
     handleChooseScreen = _useContext.handleChooseScreen,
     handleStartShare = _useContext.handleStartShare,
     setShareWithAudioState = _useContext.setShareWithAudioState,
     setShareAudioProcessingChannel = _useContext.setShareAudioProcessingChannel,
     closeShareScreenSelection = _useContext.closeShareScreenSelection,
     handlerBoardShareStop = _useContext.handlerBoardShareStop,
-    sendLocalAudioStateEvent = _useContext.sendLocalAudioStateEvent;
+    hasLoopbackDevice = _useContext.hasLoopbackDevice,
+    openRelaunchTipsDialog = _useContext.openRelaunchTipsDialog;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    showOpenMicTips = _useState4[0],
-    setShowOpenMicTips = _useState4[1];
+  var t = (0, _i18n.useI18n)();
   (0, _react.useEffect)(function () {
     setLoading(false);
     return function () {
       setLoading(false);
     };
   }, []);
-  var toggleShareWithAudio = function toggleShareWithAudio(target) {
-    setShareWithAudioState(target);
-    setShowOpenMicTips(target && localMicrophoneMute);
-  };
-  var openMicAndCloseTips = function openMicAndCloseTips() {
-    setShareWithAudioState(true);
-    setShowOpenMicTips(false);
-    sendLocalAudioStateEvent();
-  };
+  var toggleShareWithAudio = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(target) {
+      var hideTips;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (target) {
+              _context.next = 3;
+              break;
+            }
+            setShareWithAudioState(target);
+            return _context.abrupt("return");
+          case 3:
+            _context.next = 5;
+            return hasLoopbackDevice();
+          case 5:
+            hideTips = _context.sent;
+            if (!hideTips) {
+              openRelaunchTipsDialog();
+            }
+            setShareWithAudioState(target);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function toggleShareWithAudio(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var handleOkClick = (0, _react.useCallback)((0, _debounce["default"])(function () {
     if (currentSelection) {
       setLoading(true);
@@ -157,11 +176,11 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "share-selection-window__share-windows share-selection-window__share-card",
         children: screenCaptureSources.map(function (screen) {
-          var type = _type.AgoraRtcScreenCaptureType.DISPLAY;
+          var type = _type.AgoraRtcScreenCaptureType.SCREEN;
           var isWhiteboard = screen.id.split('-')[0] === 'whiteboard';
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_card.FcrCard, {
             disabled: isWhiteboard && !!(boardOwnerUser !== null && boardOwnerUser !== void 0 && boardOwnerUser.userId),
-            title: isWhiteboard ? title : screen.title,
+            title: isWhiteboard ? t('fmt_share_options_whiteboard') : screen.title,
             active: currentSelectionType === type && screen.id === currentSelection || screen.id === currentSelection,
             onCardClick: function onCardClick() {
               handleChooseScreen(screen.id, type);
@@ -187,7 +206,13 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
                 onClick: handlerBoardShareStop,
                 children: transI18n('fmt_screenshare_button_stopshare')
               })
-            }) : screen.image
+            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+              type: screen.image,
+              size: 48,
+              colors: {
+                iconPrimary: '#4262FF'
+              }
+            })
           }, "screen-".concat(screen.id));
         })
       }), !!applicationCaptureSources.length && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -225,25 +250,11 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
       className: "share-selection-window__footer",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "share-selection-window__footer-action",
-        children: currentSelection.split('-')[0] !== 'whiteboard' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
-          showArrow: true,
-          visible: showOpenMicTips,
-          overlayInnerStyle: {
-            width: '270px'
-          },
-          placement: "top",
-          content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_openMicTips["default"], {
-            onCancel: function onCancel() {
-              return toggleShareWithAudio(false);
-            },
-            onOK: openMicAndCloseTips
-          }),
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareAudio.ShareAudio, {
-            shareWithAudio: shareWithAudio,
-            toggleShareWithAudio: toggleShareWithAudio,
-            currentAudioChannel: currentShareAudioProcessingChannel,
-            onSwitchAudioChannel: setShareAudioProcessingChannel
-          })
+        children: currentSelection.split('-')[0] !== 'whiteboard' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareAudio.ShareAudio, {
+          shareWithAudio: shareWithAudio,
+          toggleShareWithAudio: toggleShareWithAudio,
+          currentAudioChannel: currentShareAudioProcessingChannel,
+          onSwitchAudioChannel: setShareAudioProcessingChannel
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
         disabled: currentSelection.split('-')[0] === 'whiteboard' && !!(boardOwnerUser !== null && boardOwnerUser !== void 0 && boardOwnerUser.userId) || loading,

package/lib/modules/share-screen/share-state-bar/index.js

@@ -13,9 +13,9 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _react = require("react");
 var _reactRnd = require("react-rnd");
-var _shareStateNav = require("../../../fragments/control-bar/share-state-nav");
 require("./index.css");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _shareStateNav = require("../../control-bar/components/share-state-nav");
 var _jsxRuntime = require("react/jsx-runtime");
 var ShareStateBar = exports.ShareStateBar = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var shareScreenBarRef = (0, _react.useRef)(null);

package/lib/modules/share-screen/store.d.ts

@@ -1,5 +1,5 @@
-import { FcrBaseRoomControl, FcrDesktopMediaControl, FcrMediaSourceState } from 'agora-edu-core';
-import { FcrUserInfo, FcrUserRole } from 'agora-edu-core/lib/type';
+import { FcrBaseRoomControl, FcrDesktopMediaControl, FcrMediaSourceState } from 'fcr-core';
+import { FcrUserInfo, FcrUserRole } from 'fcr-core/lib/type';
 import { AgoraRtcDisplayInfo, AgoraRtcScreenCaptureType, AgoraRtcWindowInfo } from 'agora-rte-sdk/lib/core/rtc/type';
 import { AudioProcessingChannel } from 'agora-ui-foundation/lib/components/room-screen-share-state-bar/share-audio';
 import { FcrUIEventStore } from '../../common/event-store';
@@ -7,9 +7,10 @@ import { FcrSecurityStore } from '../../common/security-store';
 import { DialogKey } from '../../utilities/constant';
 import { FcrDeviceStreamStore } from '../../common/device-stream-store';
 import { FcrDeviceStore } from '../../common/device-store';
+import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
 import { FcrUISceneConfig } from '../../type';
 type ScreenCaptureSourceType = Omit<AgoraRtcDisplayInfo, 'image'> & {
-    image: React.ReactNode | Uint8Array;
+    image: FcrIconType | Uint8Array;
 };
 export default class ShareScreenStore {
     protected logger: import("agora-foundation/lib/logger").Logger;
@@ -19,18 +20,13 @@ export default class ShareScreenStore {
     private _streamControl;
     private _securityStore;
     private _uiEventStore;
-    private _deviceStore;
-    private _deviceStreamStore;
     private _userControl;
     private _controlBarWindowId;
     private _currentShareStreamId;
-    private _connectType;
     private _removeScreenStreamFailed;
     private _isReplaceScreen;
     private _previewDom;
     private _observer;
-    private _deviceStoreObserver;
-    private _roomObserver;
     private _uiEventObserver;
     private _streamObserver;
     private accessor _shareSelectionDialogId;
@@ -40,13 +36,10 @@ export default class ShareScreenStore {
     private accessor _shareLocked;
     private accessor _screenTrack;
     private accessor _shareAudioTrack;
-    private accessor _localUser;
     accessor screenSharingState: FcrMediaSourceState;
     accessor applicationCaptureSources: AgoraRtcWindowInfo[];
     accessor screenCaptureSources: ScreenCaptureSourceType[];
     accessor hasScreenCapturePermission: boolean;
-    accessor showConfirm: boolean;
-    accessor shareControlBarActive: boolean;
     accessor withAudio: boolean;
     accessor currentShareAudioProcessingChannel: AudioProcessingChannel;
     accessor currentShareId: string;
@@ -58,13 +51,7 @@ export default class ShareScreenStore {
     accessor boardOwnerUser: FcrUserInfo | undefined;
     accessor localUser: FcrUserInfo | null;
     accessor localUserRole: FcrUserRole;
-    accessor title: string;
-    accessor localMicrophoneMute: boolean;
-    private _config;
-    get localVideoState(): boolean | undefined;
-    get localAudioState(): boolean | undefined;
-    get localAudioVolume(): boolean | undefined;
-    constructor({ roomControl, mediaControl, securityStore, uiEventStore, deviceStore, deviceStreamStore, config, }: {
+    constructor({ roomControl, mediaControl, securityStore, uiEventStore, }: {
         roomControl: FcrBaseRoomControl;
         mediaControl: FcrDesktopMediaControl;
         securityStore: FcrSecurityStore;
@@ -75,68 +62,47 @@ export default class ShareScreenStore {
     });
     handleChooseScreen: (id: string, type?: AgoraRtcScreenCaptureType) => void;
     setShareWithAudioState(withAudio: boolean): void;
+    hasLoopbackDevice(): Promise<boolean>;
     setShareAudioProcessingChannel(currentShareAudioProcessingChannel: any): void;
     handlerBoardShareStop(): void;
-    sendLocalAudioStateEvent(): void;
     release(): void;
-    handleCheckScreenCapturePermission(): void;
-    handleToSetting(): void;
-    muteLocalAudio(mute: boolean, confirmAudioShareWhileMicOff?: boolean): Promise<void>;
-    muteLocalVideo(mute: boolean): Promise<void>;
     handleShareStartWithAudio(): void;
     handleShareStopWithAudio(): void;
     startPreview(dom: HTMLElement): void;
-    setShareControlBarActive(active: boolean): void;
-    setCurrentCameraId(deviceId: string): void;
-    setCurrentSpeakerId(deviceId: string): void;
-    setCurrentMicrophoneId(deviceId: string): void;
-    setAllowChangeSelfName(allow: boolean): void;
-    setAllowChat(allow: boolean): void;
-    setAllowJoinWithMuteAudio(allow: boolean): void;
-    setAllowShareScreen(allow: boolean): void;
-    setAllowUnmuteSelfVideo(allow: boolean): void;
-    setAllowUnmuteSelfAudio(allow: boolean): void;
-    setLockRoomEnabled(lock: boolean): void;
     openDialog(item: DialogKey): void;
     closeDialog(item: DialogKey): void;
-    openLiveStreamingDialog(): void;
+    openShareScreenSelection(): Promise<void>;
     closeShareScreenSelection(): void;
-    openControlBar(): void;
     setControlBarWindowId(id: number): void;
     openVideoWindowDialog(): void;
     closeControlBar(): void;
     closeVideoWindowDialog(): void;
-    setShareWithAudio(withAudio: boolean, confirmAudioShareWhileMicOff?: boolean): void;
+    openRelaunchTipsDialog(): void;
+    setShareWithAudio(withAudio: boolean): Promise<void>;
     private _setWithAudioState;
-    handleShareScreenResource(): Promise<void>;
+    prepareShareScreen(): Promise<void>;
     handleStartShare(id?: string, type?: AgoraRtcScreenCaptureType, withAudio?: boolean, audioProcessingChannel?: AudioProcessingChannel): Promise<void>;
     handleReplaceScreen(id?: string, type?: AgoraRtcScreenCaptureType, withAudio?: boolean, audioProcessingChannel?: AudioProcessingChannel): void;
     handleStopShare(): void;
     private _createScreenStream;
     private _handleWebScreenCaptureStateUpdated;
     private _handleScreenCaptureStateUpdated;
-    private _updateCameraList;
-    private _updateMicrophoneList;
-    private _updateSpeakerList;
-    private _handleLiveStreamingStateUpdated;
     private _setShareLock;
     private _closeCapture;
     private _removeScreenStream;
     private _syncShareStreamState;
-    private _refreshLocalUser;
-    private _onStreamRemoved;
+    private _isStoppedFor;
+    private _handleStreamUpdate;
     private _addEventListeners;
     private _removeEventListeners;
-    private _addReactions;
     private _onUiEvent;
-    private _removeReactions;
     private _showToast;
     private _validateWindow;
     private _validateDisplay;
     private _validateShareStart;
     private _hasScreenSharePermission;
     private _getExcludeWindows;
-    private _initToolbar;
+    private _initControlbar;
 }
 export declare const StoreContext: import("react").Context<ShareScreenStore>;
 export {};