fcr-ui-scene 3.4.0 → 3.4.2

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

@@ -0,0 +1,98 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ShareStateBar = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _button = require("agora-ui-foundation/lib/components/button");
+var _divider = _interopRequireDefault(require("agora-ui-foundation/lib/components/divider"));
+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");
+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);
+  var rndRef = (0, _react.useRef)(null);
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    showPreview = _useState2[0],
+    setShowPreview = _useState2[1];
+  var t = (0, _i18n.useI18n)();
+  (0, _react.useEffect)(function () {
+    var _shareScreenBarRef$cu, _rndRef$current;
+    var _document$body = document.body,
+      offsetWidth = _document$body.offsetWidth,
+      offsetTop = _document$body.offsetTop;
+    var barWidth = ((_shareScreenBarRef$cu = shareScreenBarRef.current) === null || _shareScreenBarRef$cu === void 0 ? void 0 : _shareScreenBarRef$cu.offsetWidth) || 300;
+    (_rndRef$current = rndRef.current) === null || _rndRef$current === void 0 || _rndRef$current.updatePosition({
+      x: offsetWidth / 2 - barWidth / 2,
+      y: offsetTop
+    });
+  }, [rndRef]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRnd.Rnd, {
+    bounds: "window",
+    ref: rndRef,
+    enableResizing: false,
+    dragHandleClassName: "share-state-nav__drag-icon",
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "share-state-bar",
+      ref: shareScreenBarRef,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "share-state-bar__control",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_shareStateNav.DragIcon, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_divider["default"], {
+          type: "vertical"
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "share-state-bar__state",
+          onClick: function onClick() {
+            return setShowPreview(!showPreview);
+          },
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+            type: _type.FcrIconType.FCR_VIDEO_SHARESCREEN,
+            size: 22,
+            colors: {
+              iconPrimary: 'var(--fcr_ui_scene_ramp_green6)'
+            }
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            className: "share-state-bar__text",
+            children: t('fmt_modules_labels_sharing')
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+            size: 12,
+            type: _type.FcrIconType.FCR_V2_CHEVRON_DOWN2,
+            style: {
+              transform: showPreview ? 'rotate(180deg)' : 'rotate(0deg)'
+            },
+            colors: {
+              iconPrimary: 'var(--fcr_ui_scene_icontext3)'
+            }
+          })]
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
+          type: "primary",
+          styleType: "danger",
+          size: "XXS",
+          shape: "rounded",
+          onClick: props.onStopShare,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("p", {
+            className: "share-state-bar__stop-share fcr-flex fcr-items-center fcr-justify-center",
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+              type: _type.FcrIconType.FCR_RECORDING_STOP,
+              size: 20,
+              colors: {
+                iconPrimary: 'var(--fcr_ui_scene_white10)'
+              }
+            }), t('fmt_screenshare_controlbar_button_stop')]
+          })
+        })]
+      }), showPreview && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "share-state-bar__share_screen_preview",
+        ref: ref
+      })]
+    })
+  });
+});

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

@@ -1,24 +1,21 @@
-import { FcrDesktopMediaControl, FcrBaseRoomControl } from 'fcr-core';
 import { UIModule } from '../../base';
 import './index.css';
-import { FcrDeviceStore } from '../../common/device-store';
-import { FcrSecurityStore } from '../../common/security-store';
-import { FcrUIEventStore } from '../../common/event-store';
-import { FcrDeviceStreamStore } from '../../common/device-stream-store';
-import { FcrUISceneConfig } from '../../type';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
+import { FcrUIMainRoomControlProvider } from '../../providers/room-provider';
+import { FcrUIDeviceProvider } from '../../providers/device-provider';
+import { FcrUIMessageProvider } from '../../providers/message-provider';
+import { FcrUIDialogProvider } from '../../providers/dialog-provider';
 export declare class ShareScreenUIModule extends UIModule {
-    private _store;
-    constructor(args: {
-        roomControl: FcrBaseRoomControl;
-        mediaControl: FcrDesktopMediaControl;
-        deviceStore: FcrDeviceStore;
-        securityStore: FcrSecurityStore;
-        uiEventStore: FcrUIEventStore;
-        deviceStreamStore: FcrDeviceStreamStore;
-        config: FcrUISceneConfig;
-    });
+    private _store?;
+    mainRoomControlProvider?: FcrUIMainRoomControlProvider;
+    deviceProvider?: FcrUIDeviceProvider;
+    eventProvider?: FcrUIEventProvider;
+    privilegeProvider?: FcrUIPrivilegeProvider;
+    dialogProvider?: FcrUIDialogProvider;
+    messageProvider?: FcrUIMessageProvider;
+    onNodeWillActive(): void;
+    onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
     getSelectionComponent(): import("react/jsx-runtime").JSX.Element;
-    onUnload(): void;
-    onProcessEvent(event: RendererCustomEvent): void;
 }

package/lib/modules/share-screen/index.dev.d.ts

@@ -1 +0,0 @@
-export {};

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

@@ -1,91 +1,91 @@
-"use strict";
+// import ReactDOM from 'react-dom';
+// import { hot } from 'react-hot-loader/root';
+// import { ShareScreenUIModule } from '.';
+// import { FcrStreamLatencyLevel, FcrUISceneConfig, FcrUserRole } from '../../type';
+// import { useUnmount } from '../../utilities/hooks';
+// import { FcrDeviceStreamStore } from '../../common/device-stream-store';
+// import { FcrSecurityStore } from '../../common/security-store';
+// import { FcrUIEventStore } from '../../common/event-control';
+// import { DialogUIModule } from '../dialog';
+// import { FcrDeviceStore } from '../../common/device-store';
+// import { FcrRoomStore } from '../../common/room-control';
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-require("core-js/modules/es.array.join.js");
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _reactDom = _interopRequireDefault(require("react-dom"));
-var _root = require("react-hot-loader/root");
-var _ = require(".");
-var _type = require("../../type");
-var _hooks = require("../../utilities/hooks");
-var _deviceStreamStore = require("../../common/device-stream-store");
-var _securityStore = require("../../common/security-store");
-var _eventStore = require("../../common/event-store");
-var _dialog = require("../dialog");
-var _deviceStore = require("../../common/device-store");
-var _roomStore = require("../../common/room-store");
-var _remoteRenderer = require("../../common/remote-renderer");
-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, token, roomControl, userName, deviceStore, uiEventStore, securityStore, dialogModule, uiModule, App;
-  return _regenerator["default"].wrap(function _callee$(_context) {
-    while (1) switch (_context.prev = _context.next) {
-      case 0:
-        engine = window.__DEV_ENGINE__;
-        roomId = window.__DEV_ROOM_ID__;
-        token = window.__DEV_USER_TOKEN__;
-        _context.next = 5;
-        return engine.login();
-      case 5:
-        roomControl = engine.createMainRoomControl(roomId);
-        userName = 'test-user';
-        deviceStore = new _deviceStore.FcrDeviceStore(engine.getDesktopMediaControl(), new _eventStore.FcrUIEventStore());
-        _context.next = 10;
-        return roomControl.join({
-          userRole: _type.FcrUserRole.HOST,
-          userName: userName,
-          roomToken: token,
-          streamLatency: _type.FcrStreamLatencyLevel.ULTRA_LOW,
-          createStreamConfigs: []
-        });
-      case 10:
-        uiEventStore = new _eventStore.FcrUIEventStore();
-        securityStore = new _securityStore.FcrSecurityStore(roomControl.getPrivilegeControl(), roomControl.getUserControl(), roomControl.getStreamControl(), roomControl.getRoomSessionControl(), uiEventStore);
-        dialogModule = new _dialog.DialogUIModule({
-          uiEventStore: uiEventStore,
-          userInfo: roomControl.getUserControl().getLocalUser(),
-          securityStore: securityStore,
-          userControl: roomControl.getUserControl(),
-          chatRoomControl: roomControl.getChatRoomControl(),
-          deviceStore: deviceStore,
-          streamControl: roomControl.getStreamControl(),
-          remoteVideoRenderManager: new _remoteRenderer.FcrRemoteVideoRenderManager(roomControl.getStreamControl())
-        });
-        uiModule = new _.ShareScreenUIModule({
-          roomControl: roomControl,
-          mediaControl: engine.getDesktopMediaControl(),
-          deviceStore: deviceStore,
-          deviceStreamStore: new _deviceStreamStore.FcrDeviceStreamStore({
-            mediaControl: engine.getDesktopMediaControl(),
-            roomControl: roomControl,
-            securityStore: securityStore,
-            deviceStore: deviceStore,
-            uiEventStore: uiEventStore,
-            roomStore: new _roomStore.FcrRoomStore(uiEventStore, deviceStore, {}, engine)
-          }),
-          securityStore: securityStore,
-          uiEventStore: uiEventStore,
-          config: {}
-        });
-        App = (0, _root.hot)(function () {
-          (0, _hooks.useUnmount)(function () {
-            uiModule.onUnload();
-            roomControl.leave();
-            engine.logout();
-          });
-          return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-            children: [uiModule.getComponent(), dialogModule.getComponent()]
-          });
-        });
-        _reactDom["default"].render(/*#__PURE__*/(0, _jsxRuntime.jsx)(App, {}), document.querySelector('#root'));
-      case 16:
-      case "end":
-        return _context.stop();
-    }
-  }, _callee);
-})));
+// const App = hot(() => null);
+
+// ReactDOM.render(<App />, document.querySelector('#root')!);
+
+// window.__DEV_ENGINE_IS_READY__.then(async () => {
+//   const engine = window.__DEV_ENGINE__;
+//   const roomId = window.__DEV_ROOM_ID__;
+//   const token = window.__DEV_USER_TOKEN__;
+//   await engine.login();
+
+//   const roomControl = engine.createMainRoomControl(roomId);
+
+//   const userName = 'test-user';
+
+//   const deviceStore = new FcrDeviceStore(engine.getDesktopMediaControl(), new FcrUIEventStore());
+
+//   await roomControl.join({
+//     userRole: FcrUserRole.HOST,
+//     userName,
+//     roomToken: token,
+//     streamLatency: FcrStreamLatencyLevel.ULTRA_LOW,
+//     createStreamConfigs: [],
+//   });
+
+//   const uiEventStore = new FcrUIEventStore();
+//   const securityStore = new FcrSecurityStore(
+//     roomControl.getPrivilegeControl(),
+//     roomControl.getUserControl(),
+//     roomControl.getStreamControl(),
+//     uiEventStore,
+//   );
+//   const config = {
+//     mediaControl: engine.getDesktopMediaControl(),
+//     roomControl,
+//     securityStore,
+//     deviceStore,
+//     uiEventStore,
+//     roomStore: new FcrRoomStore(uiEventStore, deviceStore, {} as FcrUISceneConfig, engine),
+//     streamControl: roomControl.getStreamControl(),
+//     userControl: roomControl.getUserControl(),
+//     privilegeControl: roomControl.getPrivilegeControl(),
+//     interpreterControl: roomControl.getInterpreterControl(),
+//     chatRoomControl: roomControl.getChatRoomControl(),
+//     engine: null as any,
+//     remoteVideoRenderManager: null as any,
+//     config: null as any,
+//     parameters: null as any,
+//     deviceStreamStore: null as any,
+//   };
+//   const dialogModule = new DialogUIModule(config);
+
+//   const uiModule = new ShareScreenUIModule({
+//     roomControl,
+//     mediaControl: engine.getDesktopMediaControl(),
+//     deviceStore,
+//     deviceStreamStore: new FcrDeviceStreamStore(config),
+//     securityStore,
+//     uiEventStore,
+//     config: {} as FcrUISceneConfig,
+//   });
+
+//   const App = hot(() => {
+//     useUnmount(() => {
+//       uiModule.onUnload();
+//       roomControl.leave();
+//       engine.logout();
+//     });
+
+//     return (
+//       <>
+//         {uiModule.getComponent()}
+//         {dialogModule.getComponent()}
+//       </>
+//     );
+//   });
+
+//   ReactDOM.render(<App />, document.querySelector('#root')!);
+// });
+"use strict";

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

@@ -25,23 +25,38 @@ var _base = require("../../base");
 require("./index.css");
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
-var _selection = require("./selection");
-var _constant = require("../../utilities/constant");
+var _selection = require("./components/selection");
 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; }
 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; })(); }
 var ShareScreenUIModule = exports.ShareScreenUIModule = /*#__PURE__*/function (_UIModule) {
-  function ShareScreenUIModule(args) {
-    var _this;
+  function ShareScreenUIModule() {
     (0, _classCallCheck2["default"])(this, ShareScreenUIModule);
-    _this = _callSuper(this, ShareScreenUIModule);
-    _this._store = new _store["default"](args);
-    return _this;
+    return _callSuper(this, ShareScreenUIModule, arguments);
   }
   (0, _inherits2["default"])(ShareScreenUIModule, _UIModule);
   return (0, _createClass2["default"])(ShareScreenUIModule, [{
+    key: "onNodeWillActive",
+    value: function onNodeWillActive() {
+      var _this$mainRoomControl;
+      this._store = new _store["default"]({
+        roomControl: (_this$mainRoomControl = this.mainRoomControlProvider) === null || _this$mainRoomControl === void 0 ? void 0 : _this$mainRoomControl.mainRoomControl,
+        deviceProvider: this.deviceProvider,
+        eventProvider: this.eventProvider,
+        privilegeProvider: this.privilegeProvider,
+        dialogProvider: this.dialogProvider,
+        messageProvider: this.messageProvider
+      });
+    }
+  }, {
+    key: "onNodeWillInactive",
+    value: function onNodeWillInactive() {
+      var _this$_store;
+      (_this$_store = this._store) === null || _this$_store === void 0 || _this$_store.release();
+    }
+  }, {
     key: "getComponent",
     value: function getComponent() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store.StoreContext.Provider, {
@@ -57,20 +72,5 @@ var ShareScreenUIModule = exports.ShareScreenUIModule = /*#__PURE__*/function (_
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_selection.ShareSelection, {})
       });
     }
-  }, {
-    key: "onUnload",
-    value: function onUnload() {
-      this._store.release();
-    }
-  }, {
-    key: "onProcessEvent",
-    value: function onProcessEvent(event) {
-      var action = event.action;
-      switch (action) {
-        case _constant.RendererEventAction.POWER_MONITOR_LOCK_SCREEN:
-        case _constant.RendererEventAction.POWER_MONITOR_SUSPEND:
-          this._store.handleStopShare();
-      }
-    }
   }]);
 }(_base.UIModule);

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

@@ -18,8 +18,6 @@
   min-height: 550px;
   overflow: hidden;
   -webkit-app-region: no-drag;
-  background-color: #fff;
-  border-radius: var(--fcr_cornerradius_l);
 }
 
 .share-selection-window__share-content {

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

@@ -53,8 +53,6 @@ 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");
@@ -72,7 +70,8 @@ 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 _icon = require("agora-ui-foundation/lib/components/icon");
+var _popover = require("agora-ui-foundation/lib/components/popover");
+var _openMicTips = _interopRequireDefault(require("../../../fragments/share-screen-selection/open-mic-tips"));
 var _jsxRuntime = require("react/jsx-runtime");
 var ShareSelectionWindowType = /*#__PURE__*/function (ShareSelectionWindowType) {
   ShareSelectionWindowType["BASIC"] = "basic";
@@ -90,56 +89,38 @@ 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,
-    hasLoopbackDevice = _useContext.hasLoopbackDevice,
-    openRelaunchTipsDialog = _useContext.openRelaunchTipsDialog;
+    sendLocalAudioStateEvent = _useContext.sendLocalAudioStateEvent;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var t = (0, _i18n.useI18n)();
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    showOpenMicTips = _useState4[0],
+    setShowOpenMicTips = _useState4[1];
   (0, _react.useEffect)(function () {
     setLoading(false);
     return function () {
       setLoading(false);
     };
   }, []);
-  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 toggleShareWithAudio = function toggleShareWithAudio(target) {
+    setShareWithAudioState(target);
+    setShowOpenMicTips(target && localMicrophoneMute);
+  };
+  var openMicAndCloseTips = function openMicAndCloseTips() {
+    setShareWithAudioState(true);
+    setShowOpenMicTips(false);
+    sendLocalAudioStateEvent();
+  };
   var handleOkClick = (0, _react.useCallback)((0, _debounce["default"])(function () {
     if (currentSelection) {
       setLoading(true);
@@ -176,11 +157,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.SCREEN;
+          var type = _type.AgoraRtcScreenCaptureType.DISPLAY;
           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 ? t('fmt_share_options_whiteboard') : screen.title,
+            title: isWhiteboard ? title : screen.title,
             active: currentSelectionType === type && screen.id === currentSelection || screen.id === currentSelection,
             onCardClick: function onCardClick() {
               handleChooseScreen(screen.id, type);
@@ -206,13 +187,7 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
                 onClick: handlerBoardShareStop,
                 children: transI18n('fmt_screenshare_button_stopshare')
               })
-            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
-              type: screen.image,
-              size: 48,
-              colors: {
-                iconPrimary: '#4262FF'
-              }
-            })
+            }) : screen.image
           }, "screen-".concat(screen.id));
         })
       }), !!applicationCaptureSources.length && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -250,11 +225,25 @@ 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)(_shareAudio.ShareAudio, {
-          shareWithAudio: shareWithAudio,
-          toggleShareWithAudio: toggleShareWithAudio,
-          currentAudioChannel: currentShareAudioProcessingChannel,
-          onSwitchAudioChannel: setShareAudioProcessingChannel
+        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
+          })
         })
       }), /*#__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);