fcr-ui-scene 3.8.2 → 3.9.0-alpha

package/lib/modules/action-bar/components/notification-bar/components/virtual-image/index.js

@@ -9,19 +9,23 @@ exports["default"] = VirtualImage;
 var _dome = _interopRequireDefault(require("../../assets/dome.png"));
 require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
-function VirtualImage(props) {
-  var _onClick = props.onClick,
-    hidden = props.hidden;
+function VirtualImage(_ref) {
+  var hidden = _ref.hidden,
+    setHidden = _ref.setHidden;
+  var handleClick = function handleClick() {
+    setHidden(false);
+  };
+  var closeClick = function closeClick() {
+    setHidden(true);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "interpreter-virtual-image-container ".concat(hidden ? 'interpreter-virtual-image-hidden' : ''),
     children: [!hidden && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "interpreter-virtual-image-close",
-      onClick: _onClick,
+      onClick: closeClick,
       children: "\xD7"
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("button", {
-      onClick: function onClick() {
-        return _onClick();
-      },
+      onClick: handleClick,
       className: "interpreter-virtual-image",
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
         className: "notification-icon",

package/lib/modules/action-bar/components/notification-bar/index.js

@@ -6,99 +6,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.NotificationBar = void 0;
-require("core-js/modules/es.array.filter.js");
-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.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.map.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 require("./index.css");
-var _interpreter = _interopRequireDefault(require("./components/interpreter"));
+var _interpreter = require("./components/interpreter");
 var _virtualImage = _interopRequireDefault(require("./components/virtual-image"));
 var _store = require("../../main-scene/store.base");
 var _mobxReact = require("mobx-react");
 var _jsxRuntime = require("react/jsx-runtime");
 var NotificationBar = exports.NotificationBar = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
-    openInterpreterDialog = _useContext.openInterpreterDialog,
-    users = _useContext.users,
-    interpreterUserList = _useContext.interpreterUserList,
-    hasOfflineUserExistence = _useContext.hasOfflineUserExistence,
     folded = _useContext.folded,
     isInterpreterEnabled = _useContext.isInterpreterEnabled,
     hasEnableInterpreterPermission = _useContext.hasEnableInterpreterPermission,
-    hasDisableInterpreterPermission = _useContext.hasDisableInterpreterPermission;
+    hasDisableInterpreterPermission = _useContext.hasDisableInterpreterPermission,
+    offlineInterpreterUserList = _useContext.offlineInterpreterUserList,
+    reEnterInterpreterUserList = _useContext.reEnterInterpreterUserList;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    showNotification = _useState2[0],
-    setShowNotification = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    hidden = _useState4[0],
-    setHidden = _useState4[1];
-  var shareScreenBarRef = (0, _react.useRef)(null);
-  var _useState5 = (0, _react.useState)([]),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    interpreterOffline = _useState6[0],
-    setInterpreterOffline = _useState6[1];
-  var _useState7 = (0, _react.useState)([]),
-    _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-    reEnterInterperter = _useState8[0],
-    setReEnterInterperter = _useState8[1];
-  (0, _react.useEffect)(function () {
-    var offline = (interpreterUserList === null || interpreterUserList === void 0 ? void 0 : interpreterUserList.filter(function (user) {
-      return !users.map(function (u) {
-        return u.userId;
-      }).includes(user.userId);
-    })) || [];
-    setInterpreterOffline(offline);
-    if (offline.length > 0) {
-      setShowNotification(true);
-    }
-  }, [users, interpreterUserList]);
-  (0, _react.useEffect)(function () {
-    var reEnter = (interpreterOffline === null || interpreterOffline === void 0 ? void 0 : interpreterOffline.filter(function (user) {
-      return users.map(function (u) {
-        return u.userId;
-      }).includes(user.userId);
-    })) || [];
-    setReEnterInterperter(reEnter);
-  }, [users]);
-  (0, _react.useEffect)(function () {
-    if (showNotification) {
-      setReEnterInterperter([]);
-    }
-  }, [showNotification]);
-  var show = showNotification && (reEnterInterperter.length > 0 || interpreterOffline.length > 0);
-  var isComponentVisible = hasEnableInterpreterPermission && hasDisableInterpreterPermission && isInterpreterEnabled;
+    hidden = _useState2[0],
+    setHidden = _useState2[1];
+  var hasInterpreterNotification = offlineInterpreterUserList.length > 0 || reEnterInterpreterUserList.length > 0;
+  var isComponentVisible = hasEnableInterpreterPermission && hasDisableInterpreterPermission && isInterpreterEnabled && hasInterpreterNotification;
   if (!isComponentVisible) {
     return null;
   }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    ref: shareScreenBarRef,
     className: (0, _classnames["default"])('notification-bar', {
       'notification-bar-hidden': folded
     }),
-    children: [show && /*#__PURE__*/(0, _jsxRuntime.jsx)(_interpreter["default"], {
-      offline: interpreterOffline,
-      reenter: reEnterInterperter,
-      onClose: function onClose() {
-        return setShowNotification(!showNotification);
-      },
-      onAssign: function onAssign() {
-        openInterpreterDialog();
-      }
-    }), (hasOfflineUserExistence || show) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_virtualImage["default"], {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_interpreter.InterpreterNotification, {
+      hidden: hidden
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_virtualImage["default"], {
       hidden: hidden,
-      onClick: function onClick() {
-        setShowNotification(!showNotification);
-        setHidden(showNotification);
-      }
+      setHidden: setHidden
     })]
   });
 });

package/lib/modules/action-bar/components/screen-share/submenu.js

@@ -44,6 +44,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function (_ref) {
     openWhiteboard = store.openWhiteboard,
     closeWhiteboard = store.closeWhiteboard,
     startScreenShare = store.startScreenShare,
+    isBoardAbilitySupported = store.isBoardAbilitySupported,
     closeShareScreen = store.closeShareScreen,
     checkedStateMap = store.checkedStateMap,
     setCheckedStateMap = store.setCheckedStateMap,
@@ -72,7 +73,7 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function (_ref) {
     boardMenuType = 'primary';
     isBoardMenuDisabled = true;
   }
-  var menusWebOnly = [{
+  var menusWebOnly = isBoardAbilitySupported ? [{
     title: t('fmt_actionbar_screenshare_option_selectcontent'),
     key: 'allow_attendee_title',
     type: 'title'
@@ -113,9 +114,27 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function (_ref) {
         console.error('isBoardMenuDisabled: true, should not be clickable');
       }
     }
+  }] : [{
+    title: t('fmt_actionbar_screenshare_option_selectcontent'),
+    key: 'allow_attendee_title',
+    type: 'title'
+  }, {
+    icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
+      type: _type.FcrIconType.FCR_SCREENSHARING,
+      size: 24,
+      colors: {
+        iconPrimary: 'var(--fcr_ui_scene_icontext1)'
+      }
+    }),
+    title: isSharingScreen ? t('fmt_screenshare_tips_newsharing') : t('fmt_screenshare_controlbar_security_list_participant_screenshare'),
+    key: 'allow_attendee_title',
+    onButtonClick: function onButtonClick() {
+      setMenuVisible(false);
+      startScreenShare();
+    }
   }];
   var menusElectronOnly = [];
-  var hostMenus = [{
+  var hostMenus = isBoardAbilitySupported ? [{
     title: t('fmt_screenshare_options_allow'),
     key: 'allow_attendee_title',
     type: 'title'
@@ -147,6 +166,24 @@ var SubMenu = exports.SubMenu = (0, _mobxReact.observer)(function (_ref) {
       setAllowAnnotation(!checkedStateMap.allowAnnotationWriteState);
     },
     classNames: 'fcr-checkbox-overlay-style'
+  }] : [{
+    title: t('fmt_screenshare_options_allow'),
+    key: 'allow_attendee_title',
+    type: 'title'
+  }, {
+    title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
+      checked: checkedStateMap.shareScreen,
+      label: t('fmt_screenshare_screen_and_board'),
+      styleType: "white"
+    }),
+    key: 'enable_sharescreen',
+    onButtonClick: function onButtonClick() {
+      setCheckedStateMap(_objectSpread(_objectSpread({}, checkedStateMap), {
+        shareScreen: !checkedStateMap.shareScreen
+      }));
+      setAllowScreenShare(!checkedStateMap.shareScreen);
+    },
+    classNames: 'fcr-checkbox-overlay-style'
   }];
   var boardControlMenus = [{
     title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {

package/lib/modules/action-bar/components/trigger-subscribe-language/guide-tooltip/index.css

@@ -1,5 +1,6 @@
 .fcr-guide-tooltip {
   max-width: none;
+  z-index: 100;
 }
 .fcr-guide-tooltip-close-btn {
   margin-left: 10px;

package/lib/modules/action-bar/components/trigger-subscribe-language/guide-tooltip/index.js

@@ -47,18 +47,21 @@ var GuideTooltip = exports.GuideTooltip = /*#__PURE__*/(0, _react.forwardRef)(fu
       }
     })]
   });
-  var guideContentRef = (0, _react.useRef)(guideContent);
+  // const guideContentRef = useRef<React.ReactNode>(guideContent);
+
   var onVisibleChange = function onVisibleChange(visible) {
     if (!firstRender.current) {
       setShow(visible);
     }
   };
-  (0, _react.useEffect)(function () {
-    firstRender.current = true;
-    if (guideContentRef.current !== guideContent) {
-      setShow(true);
-    }
-  }, [guideContent]);
+
+  // useEffect(() => {
+  //   firstRender.current = true;
+  //   if (guideContentRef.current !== guideContent) {
+  //     setShow(true);
+  //   }
+  // }, [guideContent]);
+
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
     overlayClassName: "fcr-guide-tooltip",
     mouseEnterDelay: 0,

package/lib/modules/action-bar/index.css

@@ -151,7 +151,7 @@ html {
   font-size: 12px;
   line-height: 12px;
   padding: 0 8px;
-  max-width: 100px;
+  max-width: 120px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

package/lib/modules/action-bar/main-scene/index.d.ts

@@ -15,5 +15,5 @@ export declare class ActionBarMainSceneUIModule extends UIModule {
     onNodeWillActive(): void;
     onNodeWillInactive(): void;
     getComponent(): import("react/jsx-runtime").JSX.Element;
-    getConfirmLeaveMeetingComponent(dialogId: string): import("react/jsx-runtime").JSX.Element;
+    getConfirmEndMeetingComponent(dialogId: string): import("react/jsx-runtime").JSX.Element;
 }

package/lib/modules/action-bar/main-scene/index.js

@@ -34,7 +34,7 @@ var _store5 = require("../../components/leave-meeting/store.base");
 var _store6 = _interopRequireDefault(require("../../components/leave-meeting/main-scene/store"));
 var _store7 = require("./store.base");
 var _view = require("./view");
-var _confirmLeaveMeeting = require("../components/confirm-leave-meeting");
+var _confirmEndMeeting = require("../components/confirm-end-meeting");
 var _store8 = _interopRequireWildcard(require("../../components/security-menu/store"));
 var _base = require("../../../base");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -125,13 +125,13 @@ var ActionBarMainSceneUIModule = exports.ActionBarMainSceneUIModule = /*#__PURE_
       });
     }
   }, {
-    key: "getConfirmLeaveMeetingComponent",
-    value: function getConfirmLeaveMeetingComponent(dialogId) {
+    key: "getConfirmEndMeetingComponent",
+    value: function getConfirmEndMeetingComponent(dialogId) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_store7.ActionBarContext.Provider, {
         value: this.store,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_store5.LeaveMeetingStoreContext.Provider, {
           value: this.leaveMeetingStore,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirmLeaveMeeting.ConfirmLeaveMeeting, {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirmEndMeeting.ConfirmEndMeeting, {
             dialogId: dialogId
           })
         })

package/lib/modules/action-bar/main-scene/store.base.d.ts

@@ -21,7 +21,7 @@ import { FcrUIInterpreterProvider } from '../../../providers/interpreter-provide
 import { FcrUserControl } from 'fcr-core';
 import { FcrWaitingRoomControl } from 'fcr-core/lib/room-control/type';
 import { FcrUIRoomType, FcrUIWebWidgetConfig } from '../../../type';
-import { FcrConnectionState, FcrLanguage, FcrLiveStreamingState, FcrRecordingState, FcrUserInfo, FcrUserKickedOutType, FcrUserRole } from 'fcr-core/lib/type';
+import { FcrConnectionState, FcrLanguage, FcrLiveStreamingState, FcrRecordingState, FcrUserInfo, FcrUserJoinedEvent, FcrUserKickedOutType, FcrUserLeftEvent, FcrUserRole } from 'fcr-core/lib/type';
 import { MoreMenuType } from '../enums';
 import { ActionBarStoreArgs } from '../type';
 import { FcrUIManagedObject } from '../../../object-manager';
@@ -49,7 +49,7 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     protected _waitingRoomControl?: FcrWaitingRoomControl;
     protected _userControl: FcrUserControl;
     protected _sharedChatDataSource: FcrUISharedChatDataSource;
-    protected _interpreterProvider?: FcrUIInterpreterProvider;
+    protected _interpreterProvider: FcrUIInterpreterProvider;
     protected _sharedDevicePrivilegeDataSource: FcrUISharedDevicePrivilegeDataSource;
     protected _sharedMemberDataSource: FcrUISharedMemberDataSource;
     protected _widgetProvider: FcrUIWidgetProvider;
@@ -62,7 +62,6 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     protected _facilityProvider: FcrUIFacilityProvider;
     protected _sharedSettingDataSource: FcrUISharedSettingDataSource;
     protected _sharedWidgetDataSource: FcrUISharedWidgetDataSource;
-    private _userObserver;
     private _roomObserver;
     private _mainRoomObserver;
     private _uiEventObserver;
@@ -70,8 +69,8 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     private _roomType;
     private _newMessageTooltipTimer;
     private _hideBarArrowTimer;
-    private _interpreterProviderObserver;
     private _applistObserver;
+    private _userControlObserver;
     accessor newMessageTooltipVisible: boolean;
     accessor totalWaitingRoomUser: number;
     accessor liveStreamingState: FcrLiveStreamingState;
@@ -82,10 +81,11 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     accessor showArrow: boolean;
     accessor phoneMicEnabled: boolean;
     accessor chatTabIndex: FcrUIRoomType;
-    accessor hasOfflineUserExistence: boolean;
     accessor connectionState: FcrConnectionState;
     accessor appActionbarPopoverVisible: boolean;
     accessor stateBarLeaveMeeting: boolean;
+    accessor reEnterInterpreterUserList: FcrUserJoinedEvent[];
+    accessor offlineInterpreterUserList: FcrUserLeftEvent[];
     get endMeetingPopoverOpened(): boolean;
     get checkedStateMap(): FcrSecurityCheckedStateType;
     setCheckedStateMap(val: FcrSecurityCheckedStateType): void;
@@ -137,6 +137,12 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     get isWaterMarkEnabled(): boolean;
     get isMulti(): boolean;
     get hasEnableInterpreterPermission(): boolean;
+    get isRecordingSupported(): boolean;
+    get isBoardAbilitySupported(): boolean;
+    get isVirtualBackgroundSupported(): boolean;
+    get isBeautyModeAbilitySupported(): boolean;
+    get isInterpreterSupported(): boolean;
+    get isLiveSupported(): boolean;
     get hasDisableInterpreterPermission(): boolean;
     get microphoneEnabled(): boolean;
     get allNewMessage(): number;
@@ -146,7 +152,6 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     get newMessageCount(): import("../type").ChatRoomStoreMap;
     set newMessageCount(value: import("../type").ChatRoomStoreMap);
     get latestMessage(): import("../../../providers/chat-provider").FcrChatRoomReceiveMessage | undefined;
-    get isRecordingSupported(): boolean;
     get hasSecurityPermissions(): boolean;
     get isMeSharingScreen(): boolean;
     get isBoardActive(): boolean;
@@ -211,10 +216,10 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     setEnableWaitingRoom(enable: boolean, isNeedShowDialog: boolean): Promise<void>;
     kickOutWaitingRoomAllMember(type: FcrUserKickedOutType): Promise<void>;
     moveToMainRoomAllMember(): Promise<void>;
+    clearReEnterInterpreterUserList(): void;
+    clearOfflineInterpreterUserList(): void;
     private _interceptShareScreen;
     private _interceptShareBoard;
-    private _handleRemoteUsersJoined;
-    private _handleRemoteUsersLeft;
     private _handleLiveStreamingStateUpdated;
     private _handleChatVisible;
     setAppActionbarPopoverVisible(visible: boolean): void;
@@ -230,9 +235,11 @@ export declare abstract class ActionBarMainSceneStoreBase implements FcrUIManage
     setEndMeetingPopoverOpened(value: boolean): void;
     subscribeLanguage(language: FcrUILanguage): Promise<void>;
     subscribeExtraOriginLanguage(enable: boolean): Promise<void>;
-    getOfflineUserExistenceState(): boolean;
     clickWidget(widgetConfig: FcrUIWebWidgetConfig): void;
     closeWidget(widgetId: string): void;
     private _handleApplistItemClick;
+    private _checkIsWidgetSupportedRole;
+    private _handleRemoteUsersJoined;
+    private _handleRemoteUsersLeft;
 }
 export declare const ActionBarContext: import("react").Context<ActionBarMainSceneStoreBase>;