fcr-ui-scene 3.9.0-alpha → 3.9.1-alpha

package/lib-es/modules/layout/store.base.js

@@ -33,7 +33,7 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _LayoutStoreBase;
-var _initProto, _participantDecs, _init_participant, _chatDecs, _init_chat, _chatActionDecs, _init_chatAction, _stateBarDecs, _init_stateBar, _actionBarDecs, _init_actionBar, _layersDecs, _init_layers, _whiteboardDecs, _init_whiteboard, _annotationDecs, _init_annotation, _screenShareControlDecs, _init_screenShareControl, _subtitlesDecs, _init_subtitles, _subtitlesHistoryDecs, _init_subtitlesHistory, _subtitlesHistorySettingsDecs, _init_subtitlesHistorySettings, _init_collapsed, _init_aside, _init_barHovering, _init_barLocked, _init_barHidden, _init_asideWidth, _init_chatRoomState, _init_whiteboardActive, _init_ownerUser, _addPinMessageDecs, _cancelPinMessageDecs, _setWhiteboardActiveDecs, _setAsideWidthDecs, _updateSlotsDecs, _toggleLayoutDecs, _toggleCollapsedDecs, _toggleAsideDecs, _asideWidthChangedDecs, _toggleLayoutBarLockDecs, _toggleLayoutBarHiddenDecs, _resetLockTimerDecs, _setHoveringHandlerDecs, _setHoveringLeaveHandlerDecs, _setScreenShareSpeakerViewSizeDecs, _handleLiveLayoutChangeDecs, _onUserInfoUpdatedDecs, _handleLayoutUpdatedDecs, _init__handleLayoutUpdated, _handleMainListLengthChangedDecs, _handleMainListChangedDecs, _setBarHoveringDecs, _handleConnectionUpdatedDecs, _findVideoWindowByUserIdDecs, _onRemoteUsersLeftDecs, _ref;
+var _initProto, _participantDecs, _init_participant, _chatDecs, _init_chat, _chatActionDecs, _init_chatAction, _stateBarDecs, _init_stateBar, _actionBarDecs, _init_actionBar, _layersDecs, _init_layers, _whiteboardDecs, _init_whiteboard, _annotationDecs, _init_annotation, _screenShareControlDecs, _init_screenShareControl, _subtitlesDecs, _init_subtitles, _subtitlesHistoryDecs, _init_subtitlesHistory, _subtitlesHistorySettingsDecs, _init_subtitlesHistorySettings, _init_collapsed, _init_aside, _init_barHovering, _init_barLocked, _init_barHidden, _init_asideWidth, _init_whiteboardActive, _init_ownerUser, _addPinMessageDecs, _cancelPinMessageDecs, _setWhiteboardActiveDecs, _setAsideWidthDecs, _updateSlotsDecs, _toggleLayoutDecs, _toggleCollapsedDecs, _toggleAsideDecs, _asideWidthChangedDecs, _toggleLayoutBarLockDecs, _toggleLayoutBarHiddenDecs, _resetLockTimerDecs, _setHoveringHandlerDecs, _setHoveringLeaveHandlerDecs, _setScreenShareSpeakerViewSizeDecs, _handleLiveLayoutChangeDecs, _onUserInfoUpdatedDecs, _handleLayoutUpdatedDecs, _init__handleLayoutUpdated, _handleMainListLengthChangedDecs, _handleMainListChangedDecs, _setBarHoveringDecs, _handleConnectionUpdatedDecs, _findVideoWindowByUserIdDecs, _onRemoteUsersLeftDecs, _ref;
 import "core-js/modules/es.array.every.js";
 import "core-js/modules/es.array.filter.js";
 import "core-js/modules/es.array.find.js";
@@ -107,7 +107,6 @@ var _Q = /*#__PURE__*/new WeakMap();
 var _R = /*#__PURE__*/new WeakMap();
 var _S = /*#__PURE__*/new WeakMap();
 var _T = /*#__PURE__*/new WeakMap();
-var _U = /*#__PURE__*/new WeakMap();
 _ref = (_participantDecs = [observable, observable.ref], _chatDecs = [observable, observable.ref], _chatActionDecs = [observable, observable.ref], _stateBarDecs = [observable, observable.ref], _actionBarDecs = [observable, observable.ref], _layersDecs = [observable, observable.ref], _whiteboardDecs = [observable, observable.ref], _annotationDecs = [observable, observable.ref], _screenShareControlDecs = [observable, observable.ref], _subtitlesDecs = [observable, observable.ref], _subtitlesHistoryDecs = [observable, observable.ref], _subtitlesHistorySettingsDecs = [observable, observable.ref], _addPinMessageDecs = [action, action.bound], _cancelPinMessageDecs = [action, action.bound], _setWhiteboardActiveDecs = [action, action.bound], _setAsideWidthDecs = [action, action.bound], _updateSlotsDecs = [action, action.bound], _toggleLayoutDecs = [action, action.bound], _toggleCollapsedDecs = [action, action.bound], _toggleAsideDecs = [action, action.bound], _asideWidthChangedDecs = [action, action.bound], _toggleLayoutBarLockDecs = [action, action.bound], _toggleLayoutBarHiddenDecs = [action, action.bound], _resetLockTimerDecs = [action, action.bound], _setHoveringHandlerDecs = [action, action.bound], _setHoveringLeaveHandlerDecs = [action, action.bound], _setScreenShareSpeakerViewSizeDecs = [debounced(400), bound], _handleLiveLayoutChangeDecs = [action, action.bound], _onUserInfoUpdatedDecs = [action, action.bound], _handleLayoutUpdatedDecs = [action, action.bound], _handleMainListLengthChangedDecs = [action, action.bound], _handleMainListChangedDecs = [action, action.bound], _setBarHoveringDecs = [action, action.bound], _handleConnectionUpdatedDecs = [action, action.bound], _findVideoWindowByUserIdDecs = [action, action.bound], _onRemoteUsersLeftDecs = [action, action.bound], "logger");
 export var LayoutStoreBase = /*#__PURE__*/function () {
   function LayoutStoreBase(_ref2) {
@@ -141,9 +140,8 @@ export var LayoutStoreBase = /*#__PURE__*/function () {
     _classPrivateFieldInitSpec(this, _P, _init_barLocked(this, true));
     _classPrivateFieldInitSpec(this, _Q, _init_barHidden(this, false));
     _classPrivateFieldInitSpec(this, _R, _init_asideWidth(this, MinAsideWidth));
-    _classPrivateFieldInitSpec(this, _S, _init_chatRoomState(this, FcrChatRoomConnectionState.Disconnected));
-    _classPrivateFieldInitSpec(this, _T, _init_whiteboardActive(this, false));
-    _classPrivateFieldInitSpec(this, _U, _init_ownerUser(this, undefined));
+    _classPrivateFieldInitSpec(this, _S, _init_whiteboardActive(this, false));
+    _classPrivateFieldInitSpec(this, _T, _init_ownerUser(this, undefined));
     _defineProperty(this, "getAllowedOperations", computedFn(function (targetRole, isSelf) {
       return _this._privilegeProvider.getAllowedOperations(targetRole, isSelf);
     }));
@@ -169,6 +167,7 @@ export var LayoutStoreBase = /*#__PURE__*/function () {
     this._privilegeProvider = objectManager.getObject(FcrUIObjectKeys.P_PRIVILEGE_PROVIDER);
     this._sharedSettingDataSource = objectManager.getObject(FcrUIObjectKeys.S_SHARED_SETTING_DATA_SOURCE);
     this._sharedInterpreterDataSource = objectManager.getObject(FcrUIObjectKeys.S_SHARED_INTERPRETER_DATA_SOURCE);
+    this._sharedChatDataSource = objectManager.getObject(FcrUIObjectKeys.S_SHARED_CHAT_DATA_SOURCE);
     this._chatProvider = objectManager.getObject(FcrUIObjectKeys.P_CHAT_PROVIDER);
     this._sharedUserAudioVolumeDataSource = objectManager.getObject(FcrUIObjectKeys.S_SHARED_USER_AUDIO_VOLUME_DATA_SOURCE);
     this._videoWindowDataSource = objectManager.getObject(FcrUIObjectKeys.S_SHARED_VIDEO_WINDOW_DATA_SOURCE);
@@ -176,7 +175,7 @@ export var LayoutStoreBase = /*#__PURE__*/function () {
     this._pinDataSource = objectManager.getObject(FcrUIObjectKeys.S_SHARED_PIN_DATA_SOURCE);
     this._sharedScreenShareDataSource = objectManager.getObject(FcrUIObjectKeys.S_SHARED_SCREEN_SHARE_DATA_SOURCE);
     this._annotationProvider = objectManager.getObject(FcrUIObjectKeys.P_ANNOTATION_PROVIDER);
-    this.chatRoomState = this._chatRoomControl.getConnectionState();
+    this._sharedChatDataSource.setConnectionState(FcrUIRoomType.MAIN_ROOM, this._chatRoomControl.getConnectionState());
   }
   return _createClass(LayoutStoreBase, [{
     key: "participant",
@@ -325,26 +324,24 @@ export var LayoutStoreBase = /*#__PURE__*/function () {
   }, {
     key: "chatRoomState",
     get: function get() {
-      return _classPrivateFieldGet(_S, this);
-    },
-    set: function set(v) {
-      _classPrivateFieldSet(_S, this, v);
+      var _this$_sharedChatData, _this$_sharedChatData2;
+      return (_this$_sharedChatData = (_this$_sharedChatData2 = this._sharedChatDataSource) === null || _this$_sharedChatData2 === void 0 ? void 0 : _this$_sharedChatData2.currentConnectionState) !== null && _this$_sharedChatData !== void 0 ? _this$_sharedChatData : FcrChatRoomConnectionState.Disconnected;
     }
   }, {
     key: "whiteboardActive",
     get: function get() {
-      return _classPrivateFieldGet(_T, this);
+      return _classPrivateFieldGet(_S, this);
     },
     set: function set(v) {
-      _classPrivateFieldSet(_T, this, v);
+      _classPrivateFieldSet(_S, this, v);
     }
   }, {
     key: "ownerUser",
     get: function get() {
-      return _classPrivateFieldGet(_U, this);
+      return _classPrivateFieldGet(_T, this);
     },
     set: function set(v) {
-      _classPrivateFieldSet(_U, this, v);
+      _classPrivateFieldSet(_T, this, v);
     }
   }, {
     key: "streamControl",
@@ -1212,9 +1209,10 @@ export var LayoutStoreBase = /*#__PURE__*/function () {
     }
   }, {
     key: "_handleConnectionUpdated",
-    value: function _handleConnectionUpdated(_, state) {
-      this.logger.info('layout store handleConnectionUpdated', state);
-      this.chatRoomState = state;
+    value: function _handleConnectionUpdated(_, state, roomType) {
+      this.logger.info('layout store handleConnectionUpdated', state, roomType);
+      // 连接状态已由共享数据源统一管理，这里不需要再更新
+      // 共享数据源会在收到回调时自动更新状态
     }
   }, {
     key: "_findVideoWindowByUserId",
@@ -1312,7 +1310,7 @@ export var LayoutStoreBase = /*#__PURE__*/function () {
   }]);
 }();
 _LayoutStoreBase = LayoutStoreBase;
-var _applyDecs$e = _slicedToArray(_applyDecs(_LayoutStoreBase, [[_participantDecs, 17, "participant"], [_chatDecs, 17, "chat"], [_chatActionDecs, 17, "chatAction"], [_stateBarDecs, 17, "stateBar"], [_actionBarDecs, 17, "actionBar"], [_layersDecs, 17, "layers"], [_whiteboardDecs, 17, "whiteboard"], [_annotationDecs, 17, "annotation"], [_screenShareControlDecs, 17, "screenShareControl"], [_subtitlesDecs, 17, "subtitles"], [_subtitlesHistoryDecs, 17, "subtitlesHistory"], [_subtitlesHistorySettingsDecs, 17, "subtitlesHistorySettings"], [observable, 1, "collapsed"], [observable, 1, "aside"], [observable, 1, "barHovering"], [observable, 1, "barLocked"], [observable, 1, "barHidden"], [observable, 1, "asideWidth"], [observable, 1, "chatRoomState"], [observable, 1, "whiteboardActive"], [observable, 1, "ownerUser"], [computed, 3, "isWaterMarkEnabled"], [computed, 3, "isMulti"], [computed, 3, "layout"], [computed, 3, "manualLayout"], [computed, 3, "scalcValue"], [computed, 3, "sourceList"], [computed, 3, "layoutMainList"], [computed, 3, "mainList"], [computed, 3, "spotlightStreamId"], [computed, 3, "foldList"], [computed, 3, "galleryList"], [computed, 3, "isMainWindowInScreenSharing"], [computed, 3, "isCurrentUserInBoardSharing"], [computed, 3, "asideLayout"], [computed, 3, "carouselList"], [computed, 3, "hasPinnedStream"], [computed, 3, "isRobot"], [computed, 3, "findSpotlightUser"], [computed, 3, "isWhoISpeakingActive"], [computed, 3, "microphoneEnabled"], [computed, 3, "cameraEnabled"], [computed, 3, "galleryMaxSize"], [computed, 3, "asideContent"], [computed, 3, "participantsRenderAt"], [computed, 3, "chatRenderAt"], [computed, 3, "subtitlesHistoryRenderAt"], [bound, 2, "getWaterMarkContent"], [bound, 2, "hasMutePermission"], [bound, 2, "hasUnmutePermission"], [bound, 2, "hasRequestStartAudioPermission"], [bound, 2, "toggleMainStream"], [_addPinMessageDecs, 18, "addPinMessage"], [_cancelPinMessageDecs, 18, "cancelPinMessage"], [bound, 2, "addPin"], [bound, 2, "removePin"], [bound, 2, "setVideoOrientation"], [bound, 2, "setAllowChat"], [bound, 2, "handleSetPinState"], [_setWhiteboardActiveDecs, 18, "setWhiteboardActive"], [_setAsideWidthDecs, 18, "setAsideWidth"], [_updateSlotsDecs, 18, "updateSlots"], [bound, 2, "closeParticipantFromAside"], [bound, 2, "moveParticipantFromAsideToDialog"], [bound, 2, "closeChatFromAside"], [bound, 2, "closeAsideChat"], [bound, 2, "moveChatFromAsideToDialog"], [bound, 2, "openPrivateChat"], [bound, 2, "openRenameDialog"], [bound, 2, "closeSubtitlesHistoryFromAside"], [bound, 2, "moveSubtitlesHistoryFromAsideToDialog"], [_toggleLayoutDecs, 18, "toggleLayout"], [_toggleCollapsedDecs, 18, "toggleCollapsed"], [_toggleAsideDecs, 18, "toggleAside"], [_asideWidthChangedDecs, 18, "asideWidthChanged"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_toggleLayoutBarHiddenDecs, 18, "toggleLayoutBarHidden"], [_resetLockTimerDecs, 18, "resetLockTimer"], [_setHoveringHandlerDecs, 18, "setHoveringHandler"], [_setHoveringLeaveHandlerDecs, 18, "setHoveringLeaveHandler"], [_setScreenShareSpeakerViewSizeDecs, 2, "setScreenShareSpeakerViewSize"], [_handleLiveLayoutChangeDecs, 18, "handleLiveLayoutChange"], [_onUserInfoUpdatedDecs, 18, "onUserInfoUpdated"], [bound, 2, "stopLocalPreview"], [bound, 2, "startLocalPreview"], [bound, 2, "setAllowChatWithPayload"], [bound, 2, "setScaleValue"], [bound, 2, "muteAudio"], [bound, 2, "setControlbarEnabled"], [bound, 2, "sendParticipantEvent"], [bound, 2, "onEvent"], [bound, 2, "_addListeners"], [computed, 3, "_hasVideoStreamUser"], [_handleMainListLengthChangedDecs, 18, "_handleMainListLengthChanged"], [_handleMainListChangedDecs, 18, "_handleMainListChanged"], [action, 2, "_switchToSpeaker"], [action, 2, "_switchToGallery"], [_setBarHoveringDecs, 18, "_setBarHovering"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_findVideoWindowByUserIdDecs, 18, "_findVideoWindowByUserId"], [_onRemoteUsersLeftDecs, 18, "_onRemoteUsersLeft"], [bound, 2, "_handleLiveStreamingStateUpdated"], [bound, 2, "_handleStreamAdded"], [bound, 2, "_onStreamsAdded"], [bound, 2, "_onStreamsUpdated"], [bound, 2, "_onStreamsRemoved"], [_handleLayoutUpdatedDecs, 16, "_handleLayoutUpdated"]], []).e, 23);
+var _applyDecs$e = _slicedToArray(_applyDecs(_LayoutStoreBase, [[_participantDecs, 17, "participant"], [_chatDecs, 17, "chat"], [_chatActionDecs, 17, "chatAction"], [_stateBarDecs, 17, "stateBar"], [_actionBarDecs, 17, "actionBar"], [_layersDecs, 17, "layers"], [_whiteboardDecs, 17, "whiteboard"], [_annotationDecs, 17, "annotation"], [_screenShareControlDecs, 17, "screenShareControl"], [_subtitlesDecs, 17, "subtitles"], [_subtitlesHistoryDecs, 17, "subtitlesHistory"], [_subtitlesHistorySettingsDecs, 17, "subtitlesHistorySettings"], [observable, 1, "collapsed"], [observable, 1, "aside"], [observable, 1, "barHovering"], [observable, 1, "barLocked"], [observable, 1, "barHidden"], [observable, 1, "asideWidth"], [computed, 3, "chatRoomState"], [observable, 1, "whiteboardActive"], [observable, 1, "ownerUser"], [computed, 3, "isWaterMarkEnabled"], [computed, 3, "isMulti"], [computed, 3, "layout"], [computed, 3, "manualLayout"], [computed, 3, "scalcValue"], [computed, 3, "sourceList"], [computed, 3, "layoutMainList"], [computed, 3, "mainList"], [computed, 3, "spotlightStreamId"], [computed, 3, "foldList"], [computed, 3, "galleryList"], [computed, 3, "isMainWindowInScreenSharing"], [computed, 3, "isCurrentUserInBoardSharing"], [computed, 3, "asideLayout"], [computed, 3, "carouselList"], [computed, 3, "hasPinnedStream"], [computed, 3, "isRobot"], [computed, 3, "findSpotlightUser"], [computed, 3, "isWhoISpeakingActive"], [computed, 3, "microphoneEnabled"], [computed, 3, "cameraEnabled"], [computed, 3, "galleryMaxSize"], [computed, 3, "asideContent"], [computed, 3, "participantsRenderAt"], [computed, 3, "chatRenderAt"], [computed, 3, "subtitlesHistoryRenderAt"], [bound, 2, "getWaterMarkContent"], [bound, 2, "hasMutePermission"], [bound, 2, "hasUnmutePermission"], [bound, 2, "hasRequestStartAudioPermission"], [bound, 2, "toggleMainStream"], [_addPinMessageDecs, 18, "addPinMessage"], [_cancelPinMessageDecs, 18, "cancelPinMessage"], [bound, 2, "addPin"], [bound, 2, "removePin"], [bound, 2, "setVideoOrientation"], [bound, 2, "setAllowChat"], [bound, 2, "handleSetPinState"], [_setWhiteboardActiveDecs, 18, "setWhiteboardActive"], [_setAsideWidthDecs, 18, "setAsideWidth"], [_updateSlotsDecs, 18, "updateSlots"], [bound, 2, "closeParticipantFromAside"], [bound, 2, "moveParticipantFromAsideToDialog"], [bound, 2, "closeChatFromAside"], [bound, 2, "closeAsideChat"], [bound, 2, "moveChatFromAsideToDialog"], [bound, 2, "openPrivateChat"], [bound, 2, "openRenameDialog"], [bound, 2, "closeSubtitlesHistoryFromAside"], [bound, 2, "moveSubtitlesHistoryFromAsideToDialog"], [_toggleLayoutDecs, 18, "toggleLayout"], [_toggleCollapsedDecs, 18, "toggleCollapsed"], [_toggleAsideDecs, 18, "toggleAside"], [_asideWidthChangedDecs, 18, "asideWidthChanged"], [_toggleLayoutBarLockDecs, 18, "toggleLayoutBarLock"], [_toggleLayoutBarHiddenDecs, 18, "toggleLayoutBarHidden"], [_resetLockTimerDecs, 18, "resetLockTimer"], [_setHoveringHandlerDecs, 18, "setHoveringHandler"], [_setHoveringLeaveHandlerDecs, 18, "setHoveringLeaveHandler"], [_setScreenShareSpeakerViewSizeDecs, 2, "setScreenShareSpeakerViewSize"], [_handleLiveLayoutChangeDecs, 18, "handleLiveLayoutChange"], [_onUserInfoUpdatedDecs, 18, "onUserInfoUpdated"], [bound, 2, "stopLocalPreview"], [bound, 2, "startLocalPreview"], [bound, 2, "setAllowChatWithPayload"], [bound, 2, "setScaleValue"], [bound, 2, "muteAudio"], [bound, 2, "setControlbarEnabled"], [bound, 2, "sendParticipantEvent"], [bound, 2, "onEvent"], [bound, 2, "_addListeners"], [computed, 3, "_hasVideoStreamUser"], [_handleMainListLengthChangedDecs, 18, "_handleMainListLengthChanged"], [_handleMainListChangedDecs, 18, "_handleMainListChanged"], [action, 2, "_switchToSpeaker"], [action, 2, "_switchToGallery"], [_setBarHoveringDecs, 18, "_setBarHovering"], [_handleConnectionUpdatedDecs, 18, "_handleConnectionUpdated"], [_findVideoWindowByUserIdDecs, 18, "_findVideoWindowByUserId"], [_onRemoteUsersLeftDecs, 18, "_onRemoteUsersLeft"], [bound, 2, "_handleLiveStreamingStateUpdated"], [bound, 2, "_handleStreamAdded"], [bound, 2, "_onStreamsAdded"], [bound, 2, "_onStreamsUpdated"], [bound, 2, "_onStreamsRemoved"], [_handleLayoutUpdatedDecs, 16, "_handleLayoutUpdated"]], []).e, 22);
 _init_participant = _applyDecs$e[0];
 _init_chat = _applyDecs$e[1];
 _init_chatAction = _applyDecs$e[2];
@@ -1331,9 +1329,8 @@ _init_barHovering = _applyDecs$e[14];
 _init_barLocked = _applyDecs$e[15];
 _init_barHidden = _applyDecs$e[16];
 _init_asideWidth = _applyDecs$e[17];
-_init_chatRoomState = _applyDecs$e[18];
-_init_whiteboardActive = _applyDecs$e[19];
-_init_ownerUser = _applyDecs$e[20];
-_init__handleLayoutUpdated = _applyDecs$e[21];
-_initProto = _applyDecs$e[22];
+_init_whiteboardActive = _applyDecs$e[18];
+_init_ownerUser = _applyDecs$e[19];
+_init__handleLayoutUpdated = _applyDecs$e[20];
+_initProto = _applyDecs$e[21];
 export var StoreContext = /*#__PURE__*/createContext(null);

package/lib-es/modules/participant/components/confirm-input/index.css

@@ -14,6 +14,72 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  gap: 15px;
+  gap: 20px;
   overflow: hidden;
 }
+
+.participants-container-rename-input-wrapper {
+  width: 100%;
+  position: relative;
+}
+
+.participants-container-rename-input-wrapper .fcr-textarea {
+  width: 272px;
+  height: 84px;
+  border-radius: var(--fcr_cornerradius_l);
+  border-width: 1px;
+  padding-top: 12px;
+  padding-right: 12px;
+  padding-bottom: 26px; /* 8px (Figma padding-bottom) + 18px (字符计数区域) = 26px */
+  padding-left: 12px;
+  box-sizing: border-box;
+}
+
+.participants-container-rename-input-wrapper .fcr-textarea textarea {
+  width: 248px; /* 272 - 12*2 = 248px */
+  height: 40px;
+  font-family:
+    'Inter',
+    ui-sans-serif,
+    system-ui,
+    -apple-system,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    'Helvetica Neue',
+    Arial,
+    sans-serif;
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0;
+  color: var(--fcr_ui_scene_icontext1);
+  padding: 0; /* 容器的 padding 已经处理了间距 */
+  box-sizing: border-box;
+  vertical-align: bottom;
+}
+
+.participants-container-rename-input-wrapper .fcr-textarea .fcr-textarea-wc {
+  height: 16px;
+  font-family:
+    'Inter',
+    ui-sans-serif,
+    system-ui,
+    -apple-system,
+    BlinkMacSystemFont,
+    'Segoe UI',
+    Roboto,
+    'Helvetica Neue',
+    Arial,
+    sans-serif;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  letter-spacing: 0;
+  text-align: right;
+  color: var(--fcr_ui_scene_icontext2);
+  position: absolute;
+  bottom: 8px; /* 根据 Figma padding-bottom: 8px 调整 */
+  left: 12px; /* 与容器的 padding-left 对齐 */
+  right: 12px; /* 与容器的 padding-right 对齐，宽度自动计算为 248px (272 - 12*2) */
+}

package/lib-es/modules/participant/components/confirm-input/index.js

@@ -4,6 +4,7 @@ import "core-js/modules/es.regexp.test.js";
 import "core-js/modules/es.string.replace.js";
 import "core-js/modules/es.string.trim.js";
 import { FcrInput } from 'agora-ui-foundation/lib/components/input';
+import { FcrTextArea } from 'agora-ui-foundation/lib/components/textarea';
 import { useI18n } from 'agora-ui-foundation/lib/i18n';
 import { useContext, useEffect, useState } from 'react';
 import { StoreContext } from '../../store.base';
@@ -24,12 +25,14 @@ var FcrConfirmRenameForm = function FcrConfirmRenameForm(props) {
     name = _useState2[0],
     setName = _useState2[1];
   var t = useI18n();
+  var MAX_BYTE_LENGTH = 48;
+  var MAX_LENGTH = 24;
   useEffect(function () {
     setName(value);
   }, [value]);
   function handleNameChange(name) {
     var length = name.replace(/[^\x00-\xff]/g, '**').length;
-    if (length > 36) {
+    if (length > MAX_BYTE_LENGTH) {
       return;
     }
     type === 'number' ? (/^\d+$/.test(name) || name === '') && setName(name.trim()) : setName(name.trim());
@@ -37,17 +40,17 @@ var FcrConfirmRenameForm = function FcrConfirmRenameForm(props) {
   }
   return /*#__PURE__*/_jsxs("div", {
     className: "participants-container-rename",
-    children: [/*#__PURE__*/_jsx(FcrInput, {
-      autoFocus: true,
-      style: {
-        width: '100%'
-      },
-      value: name,
-      onChange: handleNameChange,
-      size: "large",
-      allowClear: true,
-      shape: "rounded",
-      placeholder: placeholder || t('fmt_additional_popup_label_enter_nickname')
+    children: [/*#__PURE__*/_jsx("div", {
+      className: "participants-container-rename-input-wrapper",
+      children: /*#__PURE__*/_jsx(FcrTextArea, {
+        value: name,
+        onChange: handleNameChange,
+        placeholder: placeholder || t('fmt_additional_popup_label_enter_nickname'),
+        maxCount: MAX_LENGTH,
+        showCount: true,
+        autoSize: false,
+        resizable: false
+      })
     }), /*#__PURE__*/_jsxs("div", {
       className: 'participants-container-rename-footer fcr-confirm-content-footer fcr-confirm-content-footer__center',
       children: [/*#__PURE__*/_jsx(FcrButton, {
@@ -91,7 +94,7 @@ export var FcrConfirmInput = function FcrConfirmInput(props) {
       size: "large",
       allowClear: true,
       shape: "rounded",
-      maxLength: 18,
+      maxLength: 24,
       placeholder: placeholder || t('fmt_additional_popup_label_enter_nickname')
     })
   });

package/lib-es/modules/participant/components/participants/components/render-user/components/attendee/index.css

@@ -85,3 +85,7 @@
 .operate-waiting-room-dialog-btns .fcr-button-danger {
   width: 48%;
 }
+
+.attendee {
+  min-height: 62px;
+}

package/lib-es/modules/participant/store.base.js

@@ -624,7 +624,7 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
   }, {
     key: "hasInvite",
     get: function get() {
-      return this._abilityProvider.isRoomDetailSupported() && this._abilityProvider.isCallOutAbilitySupported();
+      return this._abilityProvider.isRoomDetailSupported();
     }
   }, {
     key: "checkedStateMap",
@@ -1132,9 +1132,10 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
       var _streams$find;
       var user = this.mainRoomUserMap.get(userId);
       var isPSTN = (user === null || user === void 0 ? void 0 : user.userInfo.connectorType) === FcrRoomConnectorType.PSTN;
+      var isVOLTE = (user === null || user === void 0 ? void 0 : user.userInfo.connectorType) === FcrRoomConnectorType.VOLTE;
       var streams = user === null || user === void 0 ? void 0 : user.streams;
       var streamId = streams === null || streams === void 0 || (_streams$find = streams.find(function (stream) {
-        return stream.videoSourceType === FcrVideoSourceType.CAMERA || isPSTN && stream.videoSourceType === FcrVideoSourceType.NONE;
+        return stream.videoSourceType === FcrVideoSourceType.CAMERA || isPSTN && stream.videoSourceType === FcrVideoSourceType.NONE || isVOLTE && stream.videoSourceType === FcrVideoSourceType.NONE;
       })) === null || _streams$find === void 0 ? void 0 : _streams$find.streamId;
       return streamId;
     }
@@ -1206,6 +1207,8 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
           return this._getNormalUserDeviceInfo(userStreams, isSelf);
         case FcrRoomConnectorType.PSTN:
           return this._getPstnUserDeviceInfo(userStreams);
+        case FcrRoomConnectorType.VOLTE:
+          return this._getVolteUserDeviceInfo(userStreams);
         case FcrRoomConnectorType.SIP:
         case FcrRoomConnectorType.H323:
           return this._getSipOrH323UserDeviceInfo(userStreams);
@@ -1225,14 +1228,16 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
     value: function _getNormalUserDeviceInfo(userStreams, isSelf) {
       var defaultStream = this._findStreamByVideoSourceType(userStreams, FcrVideoSourceType.CAMERA);
       var pstnStream = this._findStreamByConnectorType(userStreams, FcrRoomConnectorType.PSTN);
+      var volteStream = this._findStreamByConnectorType(userStreams, FcrRoomConnectorType.VOLTE);
       var hasVideo = isSelf ? this._deviceStore.cameraEnabled : this._hasVideoPublishedAndStarted(defaultStream);
-      if (pstnStream) {
-        // 有PSTN流，使用电话麦克风
+      var phoneStream = volteStream || pstnStream;
+      if (phoneStream) {
+        // 有PSTN或VOLTE流，使用电话麦克风
         return {
           audioDeviceType: USER_FORMAT_CONFIG.DEVICE_TYPES.AUDIO.PHONE_MIC,
           videoDeviceType: USER_FORMAT_CONFIG.DEVICE_TYPES.VIDEO.COMPUTER_CAM,
           userType: USER_FORMAT_CONFIG.USER_TYPES.NORMAL,
-          hasAudio: pstnStream.audioSourceState === FcrMediaSourceState.OPEN,
+          hasAudio: phoneStream.audioSourceState === FcrMediaSourceState.OPEN,
           hasVideo: hasVideo
         };
       } else {
@@ -1264,6 +1269,18 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
         hasVideo: false
       };
     }
+  }, {
+    key: "_getVolteUserDeviceInfo",
+    value: function _getVolteUserDeviceInfo(userStreams) {
+      var volteStream = this._findStreamByConnectorType(userStreams, FcrRoomConnectorType.VOLTE);
+      return {
+        audioDeviceType: USER_FORMAT_CONFIG.DEVICE_TYPES.AUDIO.PHONE_MIC,
+        videoDeviceType: USER_FORMAT_CONFIG.DEVICE_TYPES.VIDEO.COMPUTER_CAM,
+        userType: USER_FORMAT_CONFIG.USER_TYPES.MEETING_SYSTEM,
+        hasAudio: this._hasAudioPublishedAndStarted(volteStream),
+        hasVideo: this._hasVideoPublishedAndStarted(volteStream)
+      };
+    }
 
     /**
      * 获取SIP/H323会议系统用户的设备信息
@@ -1727,8 +1744,18 @@ export var ParticipantStoreBase = /*#__PURE__*/function () {
   }, {
     key: "_unmuteUserVideo",
     value: function _unmuteUserVideo(userId) {
-      var isSelf = userId === this.localUser.userId;
-      if (isSelf) {
+      var _this$_getUserTargetA3 = this._getUserTargetAudioStreams(userId),
+        hardwareDeviceStream = _this$_getUserTargetA3.hardwareDeviceStream,
+        isLocalUser = _this$_getUserTargetA3.isLocalUser;
+
+      // 如果是硬件设备流，直接更新流的发布权限来取消静音
+      if (hardwareDeviceStream) {
+        this._updateStreamPrivilege(hardwareDeviceStream.streamId, FcrStreamPrivilegeOperation.NOOPERATION, FcrStreamPrivilegeOperation.HAS_PRIVILEGE);
+        return;
+      }
+
+      // 如果是本地用户，直接启用本地麦克风（上面硬件已经处理了，所以从这里往后都不是硬件设备了）
+      if (isLocalUser) {
         this._deviceStreamStore.enableCameraWithPreCheck(true);
         return;
       }

package/lib-es/modules/pc-audio-connect/main-scene/store.js

@@ -161,6 +161,11 @@ var ConnectionGatewayStoreMainScene = /*#__PURE__*/function () {
     get: function get() {
       return this._phoneAudioConnectorProvider.hasOwnPstnStream;
     }
+  }, {
+    key: "hasOwnVolteStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasOwnVolteStream;
+    }
   }, {
     key: "outgoingCall",
     get: function get() {
@@ -171,6 +176,11 @@ var ConnectionGatewayStoreMainScene = /*#__PURE__*/function () {
     get: function get() {
       return this._phoneAudioConnectorProvider.hasPstnStream;
     }
+  }, {
+    key: "hasVolteStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasVolteStream;
+    }
   }, {
     key: "connectInfo",
     get: function get() {
@@ -208,7 +218,7 @@ var ConnectionGatewayStoreMainScene = /*#__PURE__*/function () {
           return false;
         }
         this._needShowConfirmDialog = false;
-        if (this.hasOwnPstnStream) {
+        if (this.hasOwnPstnStream || this.hasOwnVolteStream) {
           return false;
         }
         var dialogId = this._dialogProvider.openConfirmDialog({
@@ -303,7 +313,7 @@ var ConnectionGatewayStoreMainScene = /*#__PURE__*/function () {
   }]);
 }();
 _ConnectionGatewayStoreMainScene = ConnectionGatewayStoreMainScene;
-var _applyDecs$e = _slicedToArray(_applyDecs(_ConnectionGatewayStoreMainScene, [[observable, 1, "phoneCallState"], [observable, 1, "phoneCallReason"], [observable, 1, "connectSession"], [observable, 1, "calling"], [computed, 3, "connectType"], [computed, 3, "hasNeedMergedStream"], [computed, 3, "hasOwnPstnStream"], [computed, 3, "outgoingCall"], [computed, 3, "hasPstnStream"], [computed, 3, "connectInfo"], [bound, 2, "openAudioSettings"], [bound, 2, "_handleInterceptorCloseDialog"], [bound, 2, "joinAudioByComputer"], [bound, 2, "stopAudioByComputer"], [bound, 2, "openInviteDialog"]], []).e, 5);
+var _applyDecs$e = _slicedToArray(_applyDecs(_ConnectionGatewayStoreMainScene, [[observable, 1, "phoneCallState"], [observable, 1, "phoneCallReason"], [observable, 1, "connectSession"], [observable, 1, "calling"], [computed, 3, "connectType"], [computed, 3, "hasNeedMergedStream"], [computed, 3, "hasOwnPstnStream"], [computed, 3, "hasOwnVolteStream"], [computed, 3, "outgoingCall"], [computed, 3, "hasPstnStream"], [computed, 3, "hasVolteStream"], [computed, 3, "connectInfo"], [bound, 2, "openAudioSettings"], [bound, 2, "_handleInterceptorCloseDialog"], [bound, 2, "joinAudioByComputer"], [bound, 2, "stopAudioByComputer"], [bound, 2, "openInviteDialog"]], []).e, 5);
 _init_phoneCallState = _applyDecs$e[0];
 _init_phoneCallReason = _applyDecs$e[1];
 _init_connectSession = _applyDecs$e[2];

package/lib-es/modules/pc-audio-connect/view.js

@@ -18,6 +18,8 @@ var View = observer(function () {
     hasOwnPstnStream = _useContext.hasOwnPstnStream,
     outgoingCall = _useContext.outgoingCall,
     hasPstnStream = _useContext.hasPstnStream,
+    hasVolteStream = _useContext.hasVolteStream,
+    hasOwnVolteStream = _useContext.hasOwnVolteStream,
     connectInfo = _useContext.connectInfo;
   var transI18n = useI18n();
   return /*#__PURE__*/_jsxs("div", {
@@ -28,7 +30,7 @@ var View = observer(function () {
       className: "var(--fcrcornerradiusround) fcr_ui_scene_ramp_brand6",
       onClick: joinAudioByComputer,
       children: transI18n('fmt_pstn_label_accessmethodPC')
-    }), hasPstnStream && !outgoingCall && !hasOwnPstnStream && hasNeedMergedStream && /*#__PURE__*/_jsx("div", {
+    }), (hasPstnStream || hasVolteStream) && !outgoingCall && !hasOwnPstnStream && !hasOwnVolteStream && hasNeedMergedStream && /*#__PURE__*/_jsx("div", {
       className: "connector-phone-alert",
       children: transI18n('fmt_pstn_label_alreadyin', {
         reason1: connectInfo === null || connectInfo === void 0 ? void 0 : connectInfo.phoneUserId
@@ -40,7 +42,7 @@ var View = observer(function () {
       className: "var(--fcrcornerradiusround)",
       onClick: stopAudioByComputer,
       children: transI18n('fmt_pstn_button_PCaudiostop')
-    }), connectType === FcrUIConnectType.PHONE && hasOwnPstnStream && /*#__PURE__*/_jsx(FcrToolTip, {
+    }), connectType === FcrUIConnectType.PHONE && (hasOwnPstnStream || hasOwnVolteStream) && /*#__PURE__*/_jsx(FcrToolTip, {
       content: transI18n('fmt_pstn_tips_alreadyphone'),
       children: /*#__PURE__*/_jsx(FcrButton, {
         size: "XS",

package/lib-es/modules/phone-audio-connect/store.js

@@ -75,6 +75,7 @@ import { FcrUIDialogKey, FcrUIHighlightElement } from '../../utilities/constant'
 import { ConnectorRegion } from './enums';
 import { FcrUIObjectKeys } from '../../object-manager';
 import { DeviceSettingTab } from '../setting/type';
+import { FcrPhoneConnectorSessionType } from 'fcr-core/lib/room-control/room-connector-control/type';
 var _A = /*#__PURE__*/new WeakMap();
 var _B = /*#__PURE__*/new WeakMap();
 var _C = /*#__PURE__*/new WeakMap();
@@ -182,6 +183,16 @@ var ConnectionGatewayStore = /*#__PURE__*/function () {
     get: function get() {
       return this._phoneAudioConnectorProvider.hasOwnPstnStream;
     }
+  }, {
+    key: "hasVolteStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasVolteStream;
+    }
+  }, {
+    key: "hasOwnVolteStream",
+    get: function get() {
+      return this._phoneAudioConnectorProvider.hasOwnVolteStream;
+    }
   }, {
     key: "hasNeedMergedStream",
     get: function get() {
@@ -200,7 +211,7 @@ var ConnectionGatewayStore = /*#__PURE__*/function () {
   }, {
     key: "startCall",
     value: function startCall() {
-      this._phoneAudioConnectorProvider.startCall(this.currentCallInfo.phone);
+      this._phoneAudioConnectorProvider.startCall(this.currentCallInfo.phone, FcrPhoneConnectorSessionType.PSTN);
     }
   }, {
     key: "stopCall",

package/lib-es/modules/phone-audio-connect/view.js

@@ -39,7 +39,9 @@ var View = observer(function () {
     outgoingCall = _useContext.outgoingCall,
     isHangup = _useContext.isHangup,
     hasPstnStream = _useContext.hasPstnStream,
+    hasVolteStream = _useContext.hasVolteStream,
     hasOwnPstnStream = _useContext.hasOwnPstnStream,
+    hasOwnVolteStream = _useContext.hasOwnVolteStream,
     hasNeedMergedStream = _useContext.hasNeedMergedStream;
   var transI18n = useI18n();
   var _useState = useState(''),
@@ -88,7 +90,7 @@ var View = observer(function () {
   }, [phoneCallState, phoneCallReason]);
   return /*#__PURE__*/_jsxs("div", {
     className: "connector-phone",
-    children: [(isStaticState && !isAcceptingState && !hasOwnPstnStream || hasPstnStream && !hasOwnPstnStream) && /*#__PURE__*/_jsxs("div", {
+    children: [(isStaticState && !isAcceptingState && !hasOwnPstnStream && !hasOwnVolteStream || hasPstnStream && !hasOwnPstnStream || hasVolteStream && !hasOwnVolteStream) && /*#__PURE__*/_jsxs("div", {
       className: "connector-phone_inner",
       children: [/*#__PURE__*/_jsxs("div", {
         className: "connector-phone_selector",
@@ -127,7 +129,7 @@ var View = observer(function () {
         checked: rememberMe,
         onChange: setRememberMe
       })]
-    }), (isPhoneAudioConnected || isAcceptingState) && hasOwnPstnStream && /*#__PURE__*/_jsx(ConnectionUsing, {}), isStaticState && !hasOwnPstnStream && /*#__PURE__*/_jsx("div", {
+    }), (isPhoneAudioConnected || isAcceptingState) && (hasOwnPstnStream || hasOwnVolteStream) && /*#__PURE__*/_jsx(ConnectionUsing, {}), isStaticState && !hasOwnPstnStream && !hasOwnVolteStream && /*#__PURE__*/_jsx("div", {
       className: "connector-phone_inner",
       children: /*#__PURE__*/_jsx(FcrButton, {
         size: "XS",
@@ -154,14 +156,14 @@ var View = observer(function () {
         onClick: stopCall,
         children: transI18n('fmt_pstn_button_hangupphone')
       })
-    }), (outgoingCall || isStaticState) && (!hasOwnPstnStream || isAcceptingState) && /*#__PURE__*/_jsx(FcrDivider, {
+    }), (outgoingCall || isStaticState) && (!hasOwnPstnStream && !hasOwnVolteStream || isAcceptingState) && /*#__PURE__*/_jsx(FcrDivider, {
       style: {
         margin: '10px 0 12px'
       },
       type: "horizontal",
       size: "0.4px",
       children: transI18n('fmt_pstn_label_dialinphone')
-    }), hasPstnStream && !outgoingCall && !hasOwnPstnStream && hasNeedMergedStream && /*#__PURE__*/_jsx("div", {
+    }), (hasPstnStream || hasVolteStream) && !outgoingCall && !hasOwnPstnStream && !hasOwnVolteStream && hasNeedMergedStream && /*#__PURE__*/_jsx("div", {
       className: "connector-phone-alert",
       children: transI18n('fmt_pstn_label_alreadyin', {
         reason1: connectInfo === null || connectInfo === void 0 ? void 0 : connectInfo.phoneUserId

package/lib-es/modules/secondary-window/index.js

@@ -93,7 +93,7 @@ export var FcrUISecondaryWindowModule = /*#__PURE__*/function (_UIModule) {
     }
   }]);
 }(UIModule);
-export var FcrUIMainWindowRendererImpl = /*#__PURE__*/function (_ref) {
+export var FcrUIMainWindowRendererImpl = /*#__PURE__*/function (_AgoraObservable) {
   function FcrUIMainWindowRendererImpl() {
     var _this2;
     _classCallCheck(this, FcrUIMainWindowRendererImpl);
@@ -106,7 +106,7 @@ export var FcrUIMainWindowRendererImpl = /*#__PURE__*/function (_ref) {
     _this2.addObserver(generateLogObserver(_this2.logger, ['onConnectionStateUpdated', 'onViewportSizeUpdated', 'onBackgroundColorUpdated', 'onDraftSaved', 'onPermissionUpdated', 'onRedoStateUpdated', 'onUndoStateUpdated', 'onWhiteboardStrokeColorChanged', 'onWhiteboardStrokeWidthChanged', 'onWhiteboardToolSelected']));
     return _this2;
   }
-  _inherits(FcrUIMainWindowRendererImpl, _ref);
+  _inherits(FcrUIMainWindowRendererImpl, _AgoraObservable);
   return _createClass(FcrUIMainWindowRendererImpl, [{
     key: "ownerUser",
     get: function get() {

package/lib-es/modules/secondary-window/store.js

@@ -317,9 +317,24 @@ export var SecondaryWindowStore = /*#__PURE__*/function () {
     get: function get() {
       return this._annotationProvider.isAnnotationOpened;
     }
+  }, {
+    key: "isWaterMarkEnabled",
+    get: function get() {
+      return this._privilegeProvider.isWaterMarkEnabled();
+    }
+  }, {
+    key: "isMulti",
+    get: function get() {
+      return this._privilegeProvider.isMultiWaterMarkEnabled();
+    }
   }, {
     key: "getContent",
     value: function getContent() {}
+  }, {
+    key: "getWaterMarkContent",
+    value: function getWaterMarkContent() {
+      return this._privilegeProvider.getWaterMarkContent();
+    }
   }, {
     key: "handleIframeLoad",
     value: function handleIframeLoad(iframe) {
@@ -525,7 +540,7 @@ export var SecondaryWindowStore = /*#__PURE__*/function () {
   }]);
 }();
 _SecondaryWindowStore = SecondaryWindowStore;
-var _applyDecs$e = _slicedToArray(_applyDecs(_SecondaryWindowStore, [[observable, 1, "_screenShareScalcValue"], [observable, 1, "isSharingWhiteboard"], [observable, 1, "interceptedClose"], [computed, 3, "videoWindowData"], [computed, 3, "isAspectRatioPreserved"], [computed, 3, "scalValue"], [computed, 3, "canWriteBoard"], [bound, 2, "handleIframeLoad"], [bound, 2, "zoomIn"], [bound, 2, "zoomOut"], [bound, 2, "fullContainer"], [bound, 2, "setInterceptedClose"], [bound, 2, "setScaleValue"], [bound, 2, "setOriginScalc"], [bound, 2, "setSpeakerViewSize"], [bound, 2, "setWhiteboardTool"], [bound, 2, "saveWhiteboardDraft"], [bound, 2, "setProgress"], [bound, 2, "setTheme"], [bound, 2, "setControlEnable"], [bound, 2, "setShowLoading"], [bound, 2, "setCommonColors"], [bound, 2, "log"]], []).e, 4);
+var _applyDecs$e = _slicedToArray(_applyDecs(_SecondaryWindowStore, [[observable, 1, "_screenShareScalcValue"], [observable, 1, "isSharingWhiteboard"], [observable, 1, "interceptedClose"], [computed, 3, "videoWindowData"], [computed, 3, "isAspectRatioPreserved"], [computed, 3, "scalValue"], [computed, 3, "canWriteBoard"], [computed, 3, "isWaterMarkEnabled"], [computed, 3, "isMulti"], [bound, 2, "getWaterMarkContent"], [bound, 2, "handleIframeLoad"], [bound, 2, "zoomIn"], [bound, 2, "zoomOut"], [bound, 2, "fullContainer"], [bound, 2, "setInterceptedClose"], [bound, 2, "setScaleValue"], [bound, 2, "setOriginScalc"], [bound, 2, "setSpeakerViewSize"], [bound, 2, "setWhiteboardTool"], [bound, 2, "saveWhiteboardDraft"], [bound, 2, "setProgress"], [bound, 2, "setTheme"], [bound, 2, "setControlEnable"], [bound, 2, "setShowLoading"], [bound, 2, "setCommonColors"], [bound, 2, "log"]], []).e, 4);
 _init__screenShareScalcValue = _applyDecs$e[0];
 _init_isSharingWhiteboard = _applyDecs$e[1];
 _init_interceptedClose = _applyDecs$e[2];