fcr-ui-scene 3.4.1 → 3.4.2

package/lib/modules/Interpreter/type.d.ts

@@ -1,41 +1,24 @@
-import { FcrInterpreterRoomControl, FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
-import { OptionsType } from '../action-bar/trigger-input-language-room';
-import { LanguageRoomOptionValue } from '../action-bar/trigger-output-language-room/constant';
+import { FcrInterpreterRoomControl, FcrInterpreterUserInfo, FcrLanguage } from 'fcr-core/lib/room-control/interpreter-control/types';
+import { FcrMainRoomControl } from 'fcr-core/lib/room-control/type';
+import { FcrUIEventProvider } from '../../providers/event-provider';
+import { FcrUIInterpreterProvider } from '../../providers/interpreter-provider';
+import { FcrUISharedInterpreterDataSource } from '../../shared-data-source/interpreter';
 export declare enum UpdateType {
     JOIN = "join",
     LEFT = "left"
 }
-export declare const CLOSE_ALL = "CLOSE_ALL";
-export interface InitInterpreterItemModelType {
+export interface InterpreterUserInfoItem extends Partial<FcrInterpreterUserInfo> {
     randomKey: string;
-    userId: string;
-    sourceLanguage: FcrLanguage | null;
-    targetLanguage: FcrLanguage | null;
-    userName: string;
 }
-export declare const initInterpreterItemModel: InitInterpreterItemModelType;
 export interface LanguageRoomType {
     control: FcrInterpreterRoomControl;
-    status: string;
+    status: UpdateType;
     roomId: string;
     language: FcrLanguage;
 }
-export interface ChangeOutputLanguageParams {
-    language: LanguageRoomOptionValue;
-    orgLanguage: LanguageRoomOptionValue;
-    callback?: Function;
-    isChangeOutputByMainRoom?: boolean;
-}
-export interface UpdateInterpreterParams {
-    callback: Function;
-    leftRoomList: OptionsType[];
-    joinRoomList: OptionsType[];
-    language: FcrLanguage;
-}
-export interface ResetInterpreterParams {
-    languageRoomList: OptionsType[];
-}
-export interface SetInputLanguageRoomParams {
-    language: FcrLanguage;
-    callback: any;
+export interface InterpreterStoreProps {
+    mainRoomControl: FcrMainRoomControl;
+    eventProvider: FcrUIEventProvider;
+    interpreterProvider: FcrUIInterpreterProvider;
+    sharedInterpreterDataSource: FcrUISharedInterpreterDataSource;
 }

package/lib/modules/Interpreter/type.js

@@ -4,17 +4,9 @@ require("core-js/modules/es.object.define-property.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.initInterpreterItemModel = exports.UpdateType = exports.CLOSE_ALL = void 0;
+exports.UpdateType = void 0;
 var UpdateType = exports.UpdateType = /*#__PURE__*/function (UpdateType) {
   UpdateType["JOIN"] = "join";
   UpdateType["LEFT"] = "left";
   return UpdateType;
-}({});
-var CLOSE_ALL = exports.CLOSE_ALL = 'CLOSE_ALL';
-var initInterpreterItemModel = exports.initInterpreterItemModel = {
-  sourceLanguage: null,
-  targetLanguage: null,
-  userId: '',
-  randomKey: '',
-  userName: ''
-};
+}({});

package/lib/modules/Interpreter/utils.d.ts

@@ -1,12 +1,8 @@
-export declare const mergeArrays: <T>(arr1: Array<T>, arr2: Array<T>, key: keyof T) => any[];
+export declare const mergeArrays: <T>(arr1: Array<T>, arr2: Array<T>, key: keyof T) => T[];
 export declare const retryTask: (task: Function, _retryTask: {
     timerId: NodeJS.Timeout | null;
     isAllowRetry: boolean;
 }, delay?: number) => Promise<any>;
 export declare const getInterpreterItem: () => {
     randomKey: string;
-    userId: string;
-    sourceLanguage: import("fcr-core/lib/room-control/interpreter-control/types").FcrLanguage | null;
-    targetLanguage: import("fcr-core/lib/room-control/interpreter-control/types").FcrLanguage | null;
-    userName: string;
 };

package/lib/modules/Interpreter/utils.js

@@ -1,98 +1,39 @@
 "use strict";
 
-require("core-js/modules/es.symbol.js");
-require("core-js/modules/es.symbol.description.js");
-require("core-js/modules/es.symbol.iterator.js");
-require("core-js/modules/es.error.cause.js");
-require("core-js/modules/es.error.to-string.js");
-require("core-js/modules/es.array.filter.js");
-require("core-js/modules/es.array.for-each.js");
-require("core-js/modules/es.array.is-array.js");
-require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.array.slice.js");
-require("core-js/modules/es.date.to-string.js");
-require("core-js/modules/es.function.name.js");
-require("core-js/modules/es.object.define-properties.js");
 require("core-js/modules/es.object.define-property.js");
-require("core-js/modules/es.object.get-own-property-descriptor.js");
-require("core-js/modules/es.object.get-own-property-descriptors.js");
-require("core-js/modules/es.object.keys.js");
-require("core-js/modules/es.regexp.exec.js");
-require("core-js/modules/es.regexp.test.js");
-require("core-js/modules/es.regexp.to-string.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
-require("core-js/modules/esnext.async-iterator.for-each.js");
-require("core-js/modules/esnext.iterator.constructor.js");
-require("core-js/modules/esnext.iterator.filter.js");
-require("core-js/modules/esnext.iterator.for-each.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.retryTask = exports.mergeArrays = exports.getInterpreterItem = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-require("core-js/modules/es.array.from.js");
-require("core-js/modules/es.array.iterator.js");
-require("core-js/modules/es.map.js");
+require("core-js/modules/es.array.find-index.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.array.reduce.js");
+require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/es.promise.js");
-require("core-js/modules/es.string.iterator.js");
-require("core-js/modules/esnext.map.delete-all.js");
-require("core-js/modules/esnext.map.emplace.js");
-require("core-js/modules/esnext.map.every.js");
-require("core-js/modules/esnext.map.filter.js");
-require("core-js/modules/esnext.map.find.js");
-require("core-js/modules/esnext.map.find-key.js");
-require("core-js/modules/esnext.map.includes.js");
-require("core-js/modules/esnext.map.key-of.js");
-require("core-js/modules/esnext.map.map-keys.js");
-require("core-js/modules/esnext.map.map-values.js");
-require("core-js/modules/esnext.map.merge.js");
-require("core-js/modules/esnext.map.reduce.js");
-require("core-js/modules/esnext.map.some.js");
-require("core-js/modules/esnext.map.update.js");
-require("core-js/modules/web.dom-collections.iterator.js");
+require("core-js/modules/esnext.async-iterator.reduce.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.reduce.js");
 require("core-js/modules/web.timers.js");
-var _type = require("./type");
+var _logger = require("agora-foundation/lib/logger");
 var _uuid = require("uuid");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+var logger = (0, _logger.getLogger)();
 var mergeArrays = exports.mergeArrays = function mergeArrays(arr1, arr2, key) {
-  var map = new Map();
-  var _iterator = _createForOfIteratorHelper(arr1),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var obj = _step.value;
-      map.set(obj[key], obj);
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  var _iterator2 = _createForOfIteratorHelper(arr2),
-    _step2;
-  try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var _obj = _step2.value;
-      if (!map.has(_obj[key])) {
-        map.set(_obj[key], _obj);
-      }
+  var merged = arr2.reduce(function (acc, current) {
+    var existingIndex = acc.findIndex(function (item) {
+      return item[key] === current[key];
+    });
+    if (existingIndex !== -1) {
+      acc[existingIndex] = current;
+    } else {
+      acc.push(current);
     }
-  } catch (err) {
-    _iterator2.e(err);
-  } finally {
-    _iterator2.f();
-  }
-  var result = Array.from(map.values());
-  return result;
+    return acc;
+  }, arr1.slice());
+  return merged;
 };
 var _retryTask2 = exports.retryTask = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(task, _retryTask) {
@@ -110,19 +51,20 @@ var _retryTask2 = exports.retryTask = /*#__PURE__*/function () {
         case 7:
           _context.prev = 7;
           _context.t0 = _context["catch"](1);
+          logger.info("interpreterretryTask, error: ".concat(_context.t0));
           _retryTask.isAllowRetry = true;
-          _context.next = 12;
+          _context.next = 13;
           return new Promise(function (resolve) {
             _retryTask.timerId = setTimeout(resolve, delay);
           });
-        case 12:
+        case 13:
           if (!_retryTask.isAllowRetry) {
-            _context.next = 15;
+            _context.next = 16;
             break;
           }
-          _context.next = 15;
+          _context.next = 16;
           return _retryTask2(task, _retryTask, delay);
-        case 15:
+        case 16:
         case "end":
           return _context.stop();
       }
@@ -133,7 +75,7 @@ var _retryTask2 = exports.retryTask = /*#__PURE__*/function () {
   };
 }();
 var getInterpreterItem = exports.getInterpreterItem = function getInterpreterItem() {
-  return _objectSpread(_objectSpread({}, _type.initInterpreterItemModel), {}, {
+  return {
     randomKey: (0, _uuid.v4)()
-  });
+  };
 };

package/lib/modules/Interpreter/view.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.InterpreterView = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _env = require("agora-foundation/lib/utilities/env");
 var _mobxReact = require("mobx-react");
 var _store = require("./store");
 var _interpreterList = _interopRequireDefault(require("./interpreter-list"));
@@ -43,11 +44,11 @@ var InterpreterView = exports.InterpreterView = (0, _mobxReact.observer)(functio
     currentDialogId = _useContext.currentDialogId,
     hasEnableInterpreterPermission = _useContext.hasEnableInterpreterPermission,
     interpreterUsersEditState = _useContext.interpreterUsersEditState,
-    interpreterState = _useContext.interpreterState;
+    interpreterOff = _useContext.interpreterOff;
   var _useScroll = useScroll(),
     refDom = _useScroll.refDom,
     isScroll = _useScroll.isScroll;
-  var isEditState = interpreterUsersEditState || !interpreterState;
+  var isEditState = interpreterUsersEditState || !interpreterOff;
   (0, _react.useEffect)(function () {
     queryInterpreterUsers();
   }, []);
@@ -56,7 +57,22 @@ var InterpreterView = exports.InterpreterView = (0, _mobxReact.observer)(functio
       closeInterpreterDialog();
     }
   }, [hasEnableInterpreterPermission, currentDialogId]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+  var style = {
+    width: 684,
+    height: 438
+  };
+  if ((0, _env.isElectron)()) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_interpreterList["default"], {
+        isShowAddBtn: !isScroll && isEditState,
+        refDom: refDom
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_footer["default"], {
+        isShowAddBtn: isScroll && isEditState
+      })]
+    });
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    style: style,
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_interpreterList["default"], {
       isShowAddBtn: !isScroll && isEditState,
       refDom: refDom

package/lib/modules/action-bar/action-bar-collapes-items.d.ts

@@ -1,6 +1,5 @@
 import { PropsWithChildren } from 'react';
 import './index.css';
-import { AppItemProps } from './components/apps/app-item';
 interface Item {
     name: string;
     width: number;
@@ -14,7 +13,5 @@ type ActionBarCollapseContext = {
 };
 export declare const actionBarCollapseContext: import("react").Context<ActionBarCollapseContext>;
 export declare const midActionOrderMap: import("react/jsx-runtime").JSX.Element[];
-export declare const ActionBarCollapseItems: ({ children, appItemOptions }: PropsWithChildren<{
-    appItemOptions: AppItemProps[];
-}>) => import("react/jsx-runtime").JSX.Element;
+export declare const ActionBarCollapseItems: ({ children }: PropsWithChildren<{}>) => import("react/jsx-runtime").JSX.Element;
 export {};

package/lib/modules/action-bar/action-bar-collapes-items.js

@@ -33,24 +33,17 @@ var _debounce = _interopRequireDefault(require("lodash/debounce"));
 var _mobx = require("mobx");
 var _mobxReact = require("mobx-react");
 var _react = require("react");
-var _chat = require("./components/chat");
-var _store = require("./store");
-var _more = require("./components/more");
-var _participants = require("./components/participants");
-var _record = require("./components/record");
-var _screenShare = require("./components/screen-share");
-var _security = require("./components/security");
-var _settings = require("./components/settings");
-var _apps = require("./components/apps");
+var _chat = require("./chat");
+var _context = require("./context");
+var _more = require("./more");
+var _participants = require("./participants");
+var _record = require("./record");
+var _liveStreaming = require("./live-streaming");
+var _screenShare = require("./screen-share");
+var _security = require("./security");
+var _settings = require("./settings");
 require("./index.css");
-var _triggerOutputLanguageRoom = require("./trigger-output-language-room");
 var _jsxRuntime = require("react/jsx-runtime");
-// import { LiveStreaming } from './components/live-streaming';
-var MidActionOrderMapKey = /*#__PURE__*/function (MidActionOrderMapKey) {
-  MidActionOrderMapKey["SwitchOutputLanguageRoomKey"] = "SwitchOutputLanguageRoom";
-  MidActionOrderMapKey["Apps"] = "Apps";
-  return MidActionOrderMapKey;
-}(MidActionOrderMapKey || {});
 var actionBarCollapseContext = exports.actionBarCollapseContext = /*#__PURE__*/(0, _react.createContext)({
   setItem: function setItem() {},
   visibleList: [],
@@ -76,24 +69,19 @@ var midActionOrderMap = exports.midActionOrderMap = [/*#__PURE__*/(0, _jsxRuntim
 // <Board id="Whiteboard" key="Whiteboard" order={6} />,
 // <BreakoutRoom id="BreakoutRoom" key="BreakoutRoom" order={7} />,
 // <Respond id="Respond" key="Respond" order={8} />,
-// <LiveStreaming id="LiveStreaming" key="LiveStreaming" order={9} />,
 (0, _jsxRuntime.jsx)(_settings.Settings, {
   id: "Settings",
+  order: 9
+}, "Settings"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_liveStreaming.LiveStreaming, {
+  id: "LiveStreaming",
   order: 10
-}, "Settings"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_triggerOutputLanguageRoom.TriggerOutputLanguageRoom, {
-  id: MidActionOrderMapKey.SwitchOutputLanguageRoomKey,
-  order: 11
-}, MidActionOrderMapKey.SwitchOutputLanguageRoomKey), /*#__PURE__*/(0, _jsxRuntime.jsx)(_apps.Apps, {
-  id: MidActionOrderMapKey.Apps,
-  order: 12
-}, MidActionOrderMapKey.Apps), /*#__PURE__*/(0, _jsxRuntime.jsx)(_more.More, {
+}, "LiveStreaming"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_more.More, {
   id: "More",
-  order: 13
+  order: 11
 }, "More")];
 var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.observer)(function (_ref) {
-  var children = _ref.children,
-    appItemOptions = _ref.appItemOptions;
-  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+  var children = _ref.children;
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     hasStartScreenSharePermission = _useContext.hasStartScreenSharePermission,
     hasStartLiveStreamingPermission = _useContext.hasStartLiveStreamingPermission,
     toggleLayoutBarLock = _useContext.toggleLayoutBarLock,
@@ -102,8 +90,7 @@ var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.obs
     hasEnableStartAudioPermission = _useContext.hasEnableStartAudioPermission,
     hasEnableChangeNamePermission = _useContext.hasEnableChangeNamePermission,
     hasEnableStartVideoPermission = _useContext.hasEnableStartVideoPermission,
-    hasLockRoomPermission = _useContext.hasLockRoomPermission,
-    interpreterState = _useContext.interpreterState;
+    hasLockRoomPermission = _useContext.hasLockRoomPermission;
   var _useState = (0, _react.useState)(function () {
       return _mobx.observable.map();
     }),
@@ -132,18 +119,14 @@ var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.obs
         //   return hasStartScreenSharePermission;
         case 'Security':
           return hasSecurityPermissions;
-        // case 'LiveStreaming':
-        //   return hasStartLiveStreamingPermission;
-        case MidActionOrderMapKey.SwitchOutputLanguageRoomKey:
-          return interpreterState;
-        case MidActionOrderMapKey.Apps:
-          return appItemOptions.length > 0;
+        case 'LiveStreaming':
+          return hasStartLiveStreamingPermission;
         default:
           return true;
       }
     };
     return Array.from(items.values()).filter(filter);
-  }, [hasStartScreenSharePermission, hasStartLiveStreamingPermission, hasSecurityPermissions, itemKeys, interpreterState, appItemOptions]);
+  }, [hasStartScreenSharePermission, hasStartLiveStreamingPermission, hasSecurityPermissions, itemKeys]);
   // if container width is not enough, collapse the items by order
   // if container width is enough, show all items
   // detect container width change by resize observer
@@ -190,7 +173,7 @@ var ActionBarCollapseItems = exports.ActionBarCollapseItems = (0, _mobxReact.obs
         resizeObserver.disconnect();
       };
     }
-  }, [itemKeys, filteredItems, interpreterState]);
+  }, [itemKeys, filteredItems]);
   var collapseList = filteredItems.filter(function (item) {
     return !visibleList.includes(item.name);
   }).map(function (item) {

package/lib/modules/action-bar/chat/index.js

@@ -15,10 +15,10 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _avatar = require("agora-ui-foundation/lib/components/avatar");
-var _store = require("../store");
+var _context = require("../context");
 var _fcr_chat_reddot = _interopRequireDefault(require("../../../../public/assets/fcr_chat_reddot.svg"));
 var _mobxReact = require("mobx-react");
-var _type2 = require("fcr-core/lib/room-control/chatroom-control/type");
+var _type2 = require("agora-edu-core/lib/room-control/chatroom-control/type");
 var _jsxRuntime = require("react/jsx-runtime");
 var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
@@ -26,12 +26,12 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
   var transI18n = (0, _i18n.useI18n)();
   var title = transI18n('fmt_screenshare_controlbar_button_more_chat');
   var tooltip = transI18n('fmt_screenshare_controlbar_button_more_chat');
-  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_context.ActionBarContext),
     toggleChat = _useContext.toggleChat,
+    newMessageCount = _useContext.newMessageCount,
     latestMessage = _useContext.latestMessage,
     newMessageTooltipVisible = _useContext.newMessageTooltipVisible,
-    hideNewMessageTooltip = _useContext.hideNewMessageTooltip,
-    allNewMessage = _useContext.allNewMessage;
+    hideNewMessageTooltip = _useContext.hideNewMessageTooltip;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     tooltipVisible = _useState2[0],
@@ -50,11 +50,11 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
   }, [newMessageTooltipVisible]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-action-bar-chat-wrapper",
-    children: [allNewMessage > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    children: [newMessageCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "fcr-action-bar-chat-unread-count",
-      children: allNewMessage > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+      children: newMessageCount > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
         src: _fcr_chat_reddot["default"]
-      }) : allNewMessage
+      }) : newMessageCount
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
       overlayClassName: "fcr-chatroom-tooltip",
       overlayInnerStyle: {

package/lib/modules/action-bar/components/apps/app-item/index.css

@@ -3,8 +3,7 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  margin-top: 22px;
-  width: 82px;
+  padding: 22px 16px 0;
 }
 .fcr-action-apps-item-icon {
   width: 58px;

package/lib/modules/action-bar/components/apps/app-item/index.d.ts

@@ -1,12 +1,3 @@
-import { ToolTipProps } from 'agora-ui-foundation/lib/components/tooltip';
-import { MouseEventHandler } from 'react';
-import { FcrIconProps } from 'agora-ui-foundation/lib/components/icon';
 import './index.css';
-export interface AppItemProps {
-    name: string;
-    onClick: MouseEventHandler<HTMLDivElement>;
-    fcrToolTipProps?: ToolTipProps;
-    fcrIconProps: FcrIconProps;
-    permission: boolean;
-}
+import { AppItemProps } from '../../../types';
 export declare const Appitem: (props: AppItemProps) => import("react/jsx-runtime").JSX.Element;

package/lib/modules/action-bar/components/apps/appitems.d.ts

@@ -1,5 +1,3 @@
 import './index.css';
-export interface AppItemsPorps {
-    closeActionBarItemWithPopover?: (visible: boolean) => void;
-}
+import { AppItemsPorps } from '../../types';
 export declare const AppItems: (props: AppItemsPorps) => import("react/jsx-runtime").JSX.Element;

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

@@ -1,8 +1,8 @@
 .action-bar-apps-container {
   display: flex;
-  padding: 2px 22px 24px;
+  padding: 2px 6px 24px;
   width: 372px;
   flex-wrap: wrap;
   justify-content: left;
-  min-height: 132px;
+  width: 100%;
 }

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

@@ -9,11 +9,11 @@ exports.Apps = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
-var _item = require("../item");
 var _react = require("react");
 var _store = require("../../store");
 var _mobxReact = require("mobx-react");
 var _appitems = require("./appitems");
+var _item = require("../item");
 var _jsxRuntime = require("react/jsx-runtime");
 var Apps = exports.Apps = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
@@ -33,11 +33,10 @@ var Apps = exports.Apps = (0, _mobxReact.observer)(function (_ref) {
         content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_appitems.AppItems, {
           closeActionBarItemWithPopover: setVisible
         }),
-        overlayClassName: 'attendee__footer-more-actions',
         overlayInnerStyle: {
           boxShadow: 'var(--fcr_web_light_dropup_m)',
           border: 'none',
-          width: 'auto',
+          width: '374px',
           height: 'auto'
         },
         onVisibleChange: function onVisibleChange(visible) {

package/lib/modules/action-bar/components/collapse/index.d.ts

@@ -0,0 +1,8 @@
+import { PropsWithChildren } from 'react';
+import '../../index.css';
+import { ActionBarCollapseContext, AppItemProps } from '../../types';
+export declare const actionBarCollapseContext: import("react").Context<ActionBarCollapseContext>;
+export declare const midActionOrderMap: import("react/jsx-runtime").JSX.Element[];
+export declare const ActionBarCollapseItems: ({ children, appItemOptions }: PropsWithChildren<{
+    appItemOptions: AppItemProps[];
+}>) => import("react/jsx-runtime").JSX.Element;