fcr-ui-scene 3.4.0 → 3.4.2

package/lib/modules/layout/index.js

@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LayoutUIModule = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
@@ -27,34 +28,54 @@ var _toast = _interopRequireDefault(require("../dialog/components/toast"));
 var _store = _interopRequireWildcard(require("./store"));
 var _view = require("./view");
 var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["globalToast", "confirm"];
 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 LayoutUIModule = exports.LayoutUIModule = /*#__PURE__*/function (_UIModule) {
-  function LayoutUIModule(args) {
-    var _this;
+  function LayoutUIModule() {
     (0, _classCallCheck2["default"])(this, LayoutUIModule);
-    _this = _callSuper(this, LayoutUIModule);
-    _this._store = new _store["default"](args);
-    return _this;
+    return _callSuper(this, LayoutUIModule, arguments);
   }
   (0, _inherits2["default"])(LayoutUIModule, _UIModule);
   return (0, _createClass2["default"])(LayoutUIModule, [{
+    key: "onNodeWillActive",
+    value: function onNodeWillActive() {
+      this._store = new _store["default"]({
+        eventProvider: this.eventProvider,
+        deviceProvider: this.deviceProvider,
+        privilegeProvider: this.privilegeProvider,
+        roomControl: this.mainRoomControlProvider.mainRoomControl,
+        sharedConfigDataSource: this.sharedConfigDataSource,
+        sharedSpeakerSpotlightDataSource: this.sharedSpeakerSpotlightDataSource,
+        sharedLayoutDataSource: this.sharedLayoutDataSource,
+        sharedInterpreterDataSource: this.sharedInterpreterDataSource,
+        sharedSettingDataSource: this.sharedSettingDataSource,
+        chatProvider: this.chatProvider,
+        sharedVideoWindowDataSource: this.sharedVideoWindowDataSource
+      });
+    }
+  }, {
+    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() {
       var slots = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var globaleToastComponent = slots.globalToast;
-      var confirmComponent = slots.confirm;
-      delete slots.globalToast;
-      delete slots.confirm;
-      this._store.updateSlots(slots);
+      var globalToast = slots.globalToast,
+        confirm = slots.confirm,
+        restSlots = (0, _objectWithoutProperties2["default"])(slots, _excluded);
+      this._store.updateSlots(restSlots);
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_store.StoreContext.Provider, {
         value: this._store,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_toast["default"], {
-          children: globaleToastComponent
+          children: globalToast
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.ConfirmDialog, {
-          children: confirmComponent
+          children: confirm
         })]
       });
     }
@@ -63,10 +84,5 @@ var LayoutUIModule = exports.LayoutUIModule = /*#__PURE__*/function (_UIModule)
     value: function getDevComponent() {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_view.View, {});
     }
-  }, {
-    key: "onUnload",
-    value: function onUnload() {
-      this._store.release();
-    }
   }]);
 }(_base.UIModule);

package/lib/modules/layout/member-window/index.css

@@ -72,48 +72,6 @@
   inset: 0;
   font-size: 0;
 }
-.fcr-member-window-body-render-video-loading {
-  border-radius: 10px;
-  position: absolute;
-  z-index: 999;
-  display: flex;
-  top: 10px;
-  right: 13px;
-  max-width: 447px;
-  height: fit-content;
-  transition: all 0.2s;
-  padding: 6px 8px;
-  gap: 14px;
-  background: #748bff;
-  align-items: center;
-  justify-content: center;
-}
-.fcr-member-window-body-render-video-loading span {
-  color: #fff;
-  font-size: 14px;
-  line-height: 18px;
-  font-weight: 600;
-  text-shadow: 0px 1px 2px rgba(0, 0, 0, 0.4);
-  white-space: pre-wrap;
-}
-.fcr-member-window-body-render-video-loading .render-video-loading-icon {
-  animation: loading-rotate 1s linear infinite;
-}
-
-@keyframes loading-rotate {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-.fcr-member-window-body.fcr-member-window-body-video-remote {
-  visibility: hidden;
-}
-.fcr-member-window-body.fcr-member-window-body-video-remote-render {
-  visibility: visible;
-}
 .fcr-member-window-excitation {
   position: absolute;
   inset: 0;
@@ -152,12 +110,12 @@
   justify-content: center;
   background-color: var(--fcr_ui_scene_ramp_green6);
   border-radius: var(--fcr_cornerradius_xxs);
-  /* padding: 0 1px; */
+  padding: 0 1px;
   height: 18px;
   margin-right: 2px;
 }
 .fcr-member-window-members-sharebtn-show {
-  margin-left: 0px;
+  margin-left: 6px;
   display: flex;
 }
 /* fcr-member-window-action start */
@@ -182,31 +140,20 @@
 .fcr-user-window-actions-bottom {
   position: absolute;
   inset: auto auto 4px 4px;
-  z-index: 1;
-  max-width: calc(100% - 8px);
-  height: 18px;
-  transition: opacity 0.2s;
-  opacity: 1;
-}
-
-.fcr-user-window-actions-bottom-layout {
   color: var(--fcr_ui_scene_icontext1);
-  font-weight: var(--fcr_font_weight_m);
-  font-size: 12px;
-  backdrop-filter: blur(25px);
-  display: inline-flex;
-  align-items: center;
-  overflow: hidden;
-}
-.fcr-user-window-actions-bottom-layout-info {
   border-radius: var(--fcr_cornerradius_xxs);
   background-color: var(--fcr_ui_scene_view_toast);
+  backdrop-filter: blur(25px);
+  font-weight: var(--fcr_font_weight_m);
+  font-size: 10px;
   display: inline-flex;
   align-items: center;
+  max-width: calc(100% - 8px);
+  height: 18px;
   overflow: hidden;
-}
-.fcr-user-window-actions-bottom-interpreter-tag {
-  margin-left: 8px;
+  z-index: 1;
+  opacity: 0;
+  transition: opacity 0.2s;
 }
 .fcr-member-board .fcr-user-window-actions-bottom-show,
 .fcr-member-window .fcr-user-window-actions-bottom-show {
@@ -239,7 +186,6 @@
   color: var(--fcr_ui_scene_white10);
   background: linear-gradient(90deg, #4262ff, #7c79ff);
   padding: 0 8px;
-  margin-right: 10px;
 }
 
 .fcr-user-window-actions-tag-host:has(svg) {
@@ -305,22 +251,9 @@
   overflow: hidden;
   text-overflow: ellipsis;
 }
-
 .fcr-user-window-actions-name-isme {
   font-weight: normal;
 }
-
-.fcr-user-window-actions-bottom .fcr-user-window-actions-name-rename {
-  width: 20px;
-  height: 20px;
-  cursor: pointer;
-  display: none;
-}
-
-.fcr-user-window-actions-bottom:hover .fcr-user-window-actions-name-rename {
-  display: block;
-}
-
 /* .fcr-member-window-gallery .fcr-user-window-actions-name {
   padding: 0 4px;
 } */
@@ -386,21 +319,3 @@
   display: flex;
   flex-flow: column-reverse nowrap;
 }
-
-.fcr-user-window-actions-tag_large {
-  margin-bottom: 10px;
-}
-.fcr-user-window-actions-bottom .fcr-device-settings-video__video-flip-container {
-  position: static;
-  margin-left: 2px;
-}
-.fcr-user-window-actions-bottom .fcr-device-settings-video__video-flip-container:hover {
-  background: var(--fcr_ui_scene_white10);
-}
-.fcr-user-window-actions-bottom
-  .fcr-device-settings-video__video-flip-container
-  .fcr-clickable-icon-small {
-  width: 24px;
-  height: 24px;
-  border-radius: var(--fcr_cornerradius_xs);
-}

package/lib/modules/layout/member-window/index.d.ts

@@ -1,9 +1,8 @@
-import { FcrUserRole } from 'fcr-core/lib/type';
+import { FcrUserRole } from 'agora-edu-core/lib/type';
 import { FcrUIVideoWindowData } from '../type';
 import './index.css';
 import { AgoraRtcRenderMode, AgoraRtcVideoStreamType } from 'agora-rte-sdk/lib/core/rtc/type';
 import { FcrVideoWindowPreviewType } from '../../video-window/type';
-import { FcrInterpreterUserInfo } from 'fcr-core/lib/room-control/interpreter-control/types';
 export interface MemberWindowCustomProps {
     showAvatar: boolean;
     onDoubleClick: () => void;
@@ -20,7 +19,7 @@ export interface MemberWindowProps extends MemberWindowCustomProps {
     windowData: FcrUIVideoWindowData;
 }
 export declare const MemberWindow: ({ showAvatar, windowData, onDoubleClick, slot, width, height, canShowSpeakerSpotlight, onRemovePin, memberWindowPreviewType, videoRenderMode, videoStreamType, }: MemberWindowProps) => import("react/jsx-runtime").JSX.Element;
-export declare const MemberWindowActions: ({ windowData, iconSize, windowSize, openPrivateChat, localUserRole, sendParticipantEvent, muteAudio, hasPinnedStream, allowedOperations, setVideoOrientation, showActionBottomLabel, isShowActionAudio, actionAudioTag, onVisibleChanged, videoWindowCurrentWidth, videoWindowCurrentHeight, videoWindowPreviewType, showRotation, interpreterUsers, interpreterState, handleRename, renderListLength, }: {
+export declare const MemberWindowActions: ({ windowData, iconSize, windowSize, openPrivateChat, localUserRole, sendParticipantEvent, muteAudio, hasPinnedStream, allowedOperations, setVideoOrientation, showActionBottomLabel, isShowActionAudio, actionAudioTag, onVisibleChanged, videoWindowCurrentWidth, videoWindowCurrentHeight, videoWindowPreviewType, showRotation, }: {
     windowData: FcrUIVideoWindowData;
     iconSize: number;
     windowSize: "large" | "normal";
@@ -39,10 +38,6 @@ export declare const MemberWindowActions: ({ windowData, iconSize, windowSize, o
     videoWindowCurrentHeight?: number;
     videoWindowPreviewType?: FcrVideoWindowPreviewType;
     showRotation: boolean;
-    interpreterUsers: FcrInterpreterUserInfo[];
-    interpreterState: boolean;
-    handleRename: (userId: string) => void;
-    renderListLength?: number;
 }) => import("react/jsx-runtime").JSX.Element;
 interface MemberBoardProps {
     slot: React.ReactNode;
@@ -61,14 +56,12 @@ export declare const FcrUIVideoPlayer: (props: {
     hasVideoStream: boolean;
     videoStreamType: AgoraRtcVideoStreamType;
     renderMode: AgoraRtcRenderMode;
-    hasScreenSharing: boolean;
 }) => import("react/jsx-runtime").JSX.Element;
 export declare const FcrUILocalVideoPlayer: () => import("react/jsx-runtime").JSX.Element;
-export declare const FcrUIRemoteVideoPlayer: ({ streamId, hasVideoStream, videoStreamType, renderMode, hasScreenSharing, }: {
+export declare const FcrUIRemoteVideoPlayer: ({ streamId, hasVideoStream, videoStreamType, renderMode, }: {
     streamId: string;
     hasVideoStream: boolean;
     videoStreamType: AgoraRtcVideoStreamType;
     renderMode: AgoraRtcRenderMode;
-    hasScreenSharing: boolean;
 }) => import("react/jsx-runtime").JSX.Element;
 export {};