fcr-ui-scene 3.4.4 → 3.5.0

package/lib/fragments/share-screen-selection/view.js

@@ -70,8 +70,6 @@ var _platform = require("../../utilities/platform");
 var _type2 = require("../../type");
 var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var _popover = require("agora-ui-foundation/lib/components/popover");
-var _openMicTips = _interopRequireDefault(require("./open-mic-tips"));
 var _jsxRuntime = require("react/jsx-runtime");
 var ShareSelectionWindowType = /*#__PURE__*/function (ShareSelectionWindowType) {
   ShareSelectionWindowType["BASIC"] = "basic";
@@ -226,25 +224,27 @@ var ShareSelection = exports.ShareSelection = (0, _mobxReact.observer)(function
       className: "share-selection-window__footer",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "share-selection-window__footer-action",
-        children: currentSelection.split('-')[0] !== 'whiteboard' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
-          showArrow: true,
-          visible: showOpenMicTips,
-          overlayInnerStyle: {
-            width: '270px'
-          },
-          content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_openMicTips["default"], {
-            onCancel: function onCancel() {
-              return toggleShareWithAudio(false);
-            },
-            onOK: openMicAndCloseTips
-          }),
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_shareAudio.ShareAudio, {
-            shareWithAudio: shareWithAudio,
-            toggleShareWithAudio: toggleShareWithAudio,
-            currentAudioChannel: currentShareAudioProcessingChannel,
-            onSwitchAudioChannel: setShareAudioProcessingChannel
-          })
+        children: currentSelection.split('-')[0] !== 'whiteboard' &&
+        /*#__PURE__*/
+        // <FcrPopover
+        //   showArrow
+        //   visible={showOpenMicTips}
+        //   overlayInnerStyle={{
+        //     width: '270px',
+        //   }}
+        //   content={
+        //     <OpenMicTips
+        //       onCancel={() => toggleShareWithAudio(false)}
+        //       onOK={openMicAndCloseTips}
+        //     />
+        //   }>
+        (0, _jsxRuntime.jsx)(_shareAudio.ShareAudio, {
+          shareWithAudio: shareWithAudio,
+          toggleShareWithAudio: toggleShareWithAudio,
+          currentAudioChannel: currentShareAudioProcessingChannel,
+          onSwitchAudioChannel: setShareAudioProcessingChannel
         })
+        // </FcrPopover>
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.FcrButton, {
         disabled: currentSelection.split('-')[0] === 'whiteboard' && !!(boardOwnerUser !== null && boardOwnerUser !== void 0 && boardOwnerUser.userId) || loading,
         type: "primary",

package/lib/fragments/toolbar/components/eraser-picker.js

@@ -14,7 +14,7 @@ var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _store = require("../store");
-var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _jsxRuntime = require("react/jsx-runtime");
 var EraserPickerItem = exports.EraserPickerItem = (0, _mobxReact.observer)(function (_ref) {
   var offset = _ref.offset;

package/lib/fragments/toolbar/components/pen-picker.js

@@ -18,7 +18,7 @@ var _store = require("../store");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _icon = require("agora-ui-foundation/lib/components/icon");
-var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _jsxRuntime = require("react/jsx-runtime");
 var penIconMap = (0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _enums.FcrBoardShape.Curve, _type.FcrIconType.FCR_WHITEBOARD_PED3), _enums.FcrBoardShape.Straight, _type.FcrIconType.FCR_WHITEBOARD_PED2);
 var PenPickerItem = exports.PenPickerItem = (0, _mobxReact.observer)(function (_ref) {

package/lib/fragments/toolbar/components/shape-picker.js

@@ -20,7 +20,7 @@ var _store = require("../store");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _icon = require("agora-ui-foundation/lib/components/icon");
-var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _jsxRuntime = require("react/jsx-runtime");
 var shapeIconMap = (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _enums.FcrBoardShape.Arrow, _type.FcrIconType.FCR_WHITEBOARD_SHAP_ARROW), _enums.FcrBoardShape.Ellipse, _type.FcrIconType.FCR_WHITEBOARD_SHAP_CIRCLE), _enums.FcrBoardShape.Pentagram, _type.FcrIconType.FCR_WHITEBOARD_SHAP_STAR), _enums.FcrBoardShape.Rectangle, _type.FcrIconType.FCR_WHITEBOARD_SHAP_SQUARE), _enums.FcrBoardShape.Rhombus, _type.FcrIconType.FCR_WHITEBOARD_SHAP_REHUMBUS), _enums.FcrBoardShape.Triangle, _type.FcrIconType.FCR_WHITEBOARD_SHAP_TRIANGLE);
 var ShapePickerItem = exports.ShapePickerItem = (0, _mobxReact.observer)(function (_ref) {

package/lib/fragments/toolbar/components/wrapper.js

@@ -11,9 +11,9 @@ require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _store = require("../store");
-var _transferPositionIcon = require("../../control-bar/transfer-position-icon");
 var _reactRnd = require("react-rnd");
 var _mobxReact = require("mobx-react");
+var _transferPositionIcon = require("./transfer-position-icon");
 var _jsxRuntime = require("react/jsx-runtime");
 var DraggleWrapper = exports.DraggleWrapper = (0, _mobxReact.observer)(function (props) {
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),

package/lib/fragments/toolbar/hooks.js

@@ -33,7 +33,7 @@ var _store = require("./store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _screenCapturePicker = require("./components/screen-capture-picker");
-var _enums = require("agora-edu-core/lib/room-control/whiteboard-control/enums");
+var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
 var _jsxRuntime = require("react/jsx-runtime");
 var useVisibleTools = exports.useVisibleTools = function useVisibleTools(diraction) {
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),

package/lib/fragments/toolbar/store.d.ts

@@ -1,5 +1,5 @@
 import { FcrBoardShape, WhiteboardThemeType } from '../../modules/whiteboard/type';
-import { FcrBoardToolType } from 'agora-edu-core/lib/room-control/whiteboard-control/enums';
+import { FcrBoardToolType } from 'fcr-core/lib/room-control/whiteboard-control/enums';
 export declare class ToolbarStore {
     accessor observables: {
         currentTool: FcrBoardToolType | undefined;

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

@@ -1,6 +1,6 @@
 import { PropsWithChildren } from 'react';
 import './index.css';
-import { AppItemProps } from './components/apps/app-item';
+import { AppItemProps } from './apps/app-item';
 interface Item {
     name: string;
     width: number;

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

@@ -33,19 +33,19 @@ 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 _chat = require("./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 _more = require("./more");
+var _participants = require("./participants");
+var _record = require("./record");
+var _screenShare = require("./screen-share");
+var _security = require("./security");
+var _settings = require("./settings");
+var _switchOutputLanguageRoom = require("./switch-output-language-room");
+var _apps = require("./apps");
 require("./index.css");
-var _triggerOutputLanguageRoom = require("./trigger-output-language-room");
 var _jsxRuntime = require("react/jsx-runtime");
-// import { LiveStreaming } from './components/live-streaming';
+// import { LiveStreaming } from './live-streaming';
 var MidActionOrderMapKey = /*#__PURE__*/function (MidActionOrderMapKey) {
   MidActionOrderMapKey["SwitchOutputLanguageRoomKey"] = "SwitchOutputLanguageRoom";
   MidActionOrderMapKey["Apps"] = "Apps";
@@ -80,7 +80,7 @@ var midActionOrderMap = exports.midActionOrderMap = [/*#__PURE__*/(0, _jsxRuntim
 (0, _jsxRuntime.jsx)(_settings.Settings, {
   id: "Settings",
   order: 10
-}, "Settings"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_triggerOutputLanguageRoom.TriggerOutputLanguageRoom, {
+}, "Settings"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_switchOutputLanguageRoom.SwitchOutputLanguageRoom, {
   id: MidActionOrderMapKey.SwitchOutputLanguageRoomKey,
   order: 11
 }, MidActionOrderMapKey.SwitchOutputLanguageRoomKey), /*#__PURE__*/(0, _jsxRuntime.jsx)(_apps.Apps, {

package/lib/modules/action-bar/apps/useInterpreter.js

@@ -8,7 +8,6 @@ exports["default"] = void 0;
 var _react = require("react");
 var _store = require("../store");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
-var _i18n = require("agora-ui-foundation/lib/i18n");
 var useInterpreter = function useInterpreter(closeActionBarItemWithPopover) {
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     hasEnableInterpreterPermission = _useContext.hasEnableInterpreterPermission,
@@ -18,13 +17,12 @@ var useInterpreter = function useInterpreter(closeActionBarItemWithPopover) {
     openInterpreterDialog();
     closeActionBarItemWithPopover && closeActionBarItemWithPopover(false);
   };
-  var transI18n = (0, _i18n.useI18n)();
   return (0, _react.useMemo)(function () {
     return {
-      name: transI18n('fmt_interpretation_setting_controller_option_simultaneous_interpretation'),
+      name: '同声传译',
       onClick: onClick,
       fcrToolTipProps: {
-        content: interpreterState ? transI18n('fmt_interpretation_setting_controller_toast_turn_off_simultaneous_interpretation') : transI18n('fmt_interpretation_setting_controller_toast_turn_on_simultaneous_interpretation')
+        content: interpreterState ? '关闭同声传译' : '开启同声传译'
       },
       fcrIconProps: {
         type: interpreterState ? _type.FcrIconType.FCR_SIMULTANEOUSINTERPRETATION_ON : _type.FcrIconType.FCR_SIMULTANEOUSINTERPRETATION_OFF,

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 _context = require("../context");
+var _store = require("../store");
 var _fcr_chat_reddot = _interopRequireDefault(require("../../../../public/assets/fcr_chat_reddot.svg"));
 var _mobxReact = require("mobx-react");
-var _type2 = require("agora-edu-core/lib/room-control/chatroom-control/type");
+var _type2 = require("fcr-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)(_context.ActionBarContext),
+  var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     toggleChat = _useContext.toggleChat,
-    newMessageCount = _useContext.newMessageCount,
     latestMessage = _useContext.latestMessage,
     newMessageTooltipVisible = _useContext.newMessageTooltipVisible,
-    hideNewMessageTooltip = _useContext.hideNewMessageTooltip;
+    hideNewMessageTooltip = _useContext.hideNewMessageTooltip,
+    allNewMessage = _useContext.allNewMessage;
   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: [newMessageCount > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    children: [allNewMessage > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "fcr-action-bar-chat-unread-count",
-      children: newMessageCount > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+      children: allNewMessage > 99 ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
         src: _fcr_chat_reddot["default"]
-      }) : newMessageCount
+      }) : allNewMessage
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
       overlayClassName: "fcr-chatroom-tooltip",
       overlayInnerStyle: {

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

@@ -3,9 +3,10 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  padding: 22px 16px 0;
+  padding-top: 22px;
 }
 .fcr-action-apps-item-icon {
+  margin: 0px 16px 8px;
   width: 58px;
   height: 58px;
   border-radius: var(--fcr_cornerradius_m);
@@ -13,7 +14,6 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  margin-bottom: 8px;
 }
 .fcr-action-apps-item-text {
   font-size: 12px;
@@ -21,7 +21,7 @@
   line-height: 18px;
   text-align: center;
   color: var(--fcr_ui_scene_icontext1);
-  height: 18px;
+  width: 90px;
 }
 .fcr-action-apps-item-wrapper:hover .fcr-action-apps-item-text {
   color: var(--fcr_web_ui_scene_mainicon2,);

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

@@ -10,8 +10,6 @@ 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.object.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");
@@ -30,32 +28,43 @@ require("./index.css");
 var _jsxRuntime = require("react/jsx-runtime");
 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; }
+var size = 32;
 var Appitem = exports.Appitem = function Appitem(props) {
   var name = props.name,
     onClick = props.onClick,
     fcrToolTipProps = props.fcrToolTipProps,
-    fcrIconProps = props.fcrIconProps;
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, _objectSpread(_objectSpread({
-    mouseEnterDelay: 0
-  }, fcrToolTipProps ? fcrToolTipProps : {
-    visible: false
-  }), {}, {
-    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      className: (0, _classnames["default"])('fcr-action-apps-item-wrapper'),
-      onClick: onClick,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "fcr-action-apps-item-icon",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, _objectSpread(_objectSpread({
-          size: 32
-        }, fcrIconProps), {}, {
-          colors: {
-            iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
-          }
-        }))
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "fcr-action-apps-item-text",
-        children: name
-      })]
-    })
-  }));
+    fcrIconProps = props.fcrIconProps,
+    imgSrc = props.imgSrc;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: (0, _classnames["default"])('fcr-action-apps-item-wrapper'),
+    onClick: onClick,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, _objectSpread(_objectSpread({
+      mouseEnterDelay: 0
+    }, fcrToolTipProps ? fcrToolTipProps : {
+      visible: false
+    }), {}, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "fcr-action-apps-item-icon",
+          children: imgSrc ? /*#__PURE__*/(0, _jsxRuntime.jsx)("img", {
+            style: {
+              width: size,
+              height: size
+            },
+            src: imgSrc,
+            alt: name
+          }) : fcrIconProps && /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, _objectSpread(_objectSpread({
+            size: size
+          }, fcrIconProps), {}, {
+            colors: {
+              iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
+            }
+          }))
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "fcr-action-apps-item-text",
+          children: name
+        })]
+      })
+    }))
+  });
 };

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

@@ -0,0 +1,3 @@
+import './index.css';
+import { AppListPorps } from '../../types';
+export declare const AppList: (props: AppListPorps) => import("react/jsx-runtime").JSX.Element;

package/lib/{electron/dev.js → modules/action-bar/components/apps/app-list.js}

@@ -9,43 +9,34 @@ 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.object.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.AppList = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-require("core-js/modules/es.array.join.js");
-var _electron = require("electron");
-var _main = require("@electron/remote/main");
-var _path = _interopRequireDefault(require("path"));
-var _logger = require("./logger");
-var _app = require("./app");
-var _defaultOptions = require("./default-options");
-var _env = require("./env");
-var _main2 = require("./main");
+require("core-js/modules/es.array.map.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.map.js");
+var _mobxReact = require("mobx-react");
+var _appItem = require("./app-item");
+var _useAppItemOptions = _interopRequireDefault(require("./useAppItemOptions"));
+require("./index.css");
+var _jsxRuntime = require("react/jsx-runtime");
 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; }
-(0, _main.initialize)();
-(0, _logger.initializeLogger)({
-  logFilePath: _path["default"].join(_electron.app.getPath('logs'), 'logs', 'app.log'),
-  console: _env.isDev
-});
-(0, _app.hookApp)(_electron.app);
-_electron.app.addListener('ready', function () {
-  var mainWindow = new _electron.BrowserWindow(_objectSpread(_objectSpread({}, _defaultOptions.defaultWindowOptions), {}, {
-    webPreferences: _objectSpread({}, _defaultOptions.defaultWebPreferences)
-  }));
-  (0, _main2.hookWindow)(mainWindow);
-  mainWindow.addListener('closed', function () {
-    _electron.app.exit(0);
-  });
-  mainWindow.webContents.openDevTools({
-    mode: 'detach'
+var AppList = exports.AppList = (0, _mobxReact.observer)(function (props) {
+  var onAppClick = props.onAppClick;
+  var options = (0, _useAppItemOptions["default"])(onAppClick);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    className: "action-bar-apps-container",
+    children: options.map(function (config) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_appItem.Appitem, _objectSpread({}, config), config.name);
+    })
   });
-  mainWindow.loadURL(_env.devPageUrl);
-  (0, _main.enable)(mainWindow.webContents);
 });

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

@@ -9,10 +9,6 @@ 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.object.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");
@@ -24,7 +20,8 @@ exports.AppItems = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.function.name.js");
-require("core-js/modules/esnext.async-iterator.map.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.map.js");
 var _mobxReact = require("mobx-react");
 var _appItem = require("./app-item");

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

@@ -5,4 +5,5 @@
   flex-wrap: wrap;
   justify-content: left;
   width: 100%;
+  align-items: start;
 }

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

@@ -12,8 +12,8 @@ var _tooltip = require("agora-ui-foundation/lib/components/tooltip");
 var _react = require("react");
 var _store = require("../../store");
 var _mobxReact = require("mobx-react");
-var _appitems = require("./appitems");
 var _item = require("../item");
+var _appList = require("./app-list");
 var _jsxRuntime = require("react/jsx-runtime");
 var Apps = exports.Apps = (0, _mobxReact.observer)(function (_ref) {
   var id = _ref.id,
@@ -24,14 +24,17 @@ var Apps = exports.Apps = (0, _mobxReact.observer)(function (_ref) {
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
+  var onAppClick = function onAppClick() {
+    setVisible(false);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
     content: 'Apps',
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.ActionBarItemWithPopover, {
       popoverProps: {
         trigger: 'click',
         visible: visible,
-        content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_appitems.AppItems, {
-          closeActionBarItemWithPopover: setVisible
+        content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_appList.AppList, {
+          onAppClick: onAppClick
         }),
         overlayInnerStyle: {
           boxShadow: 'var(--fcr_web_light_dropup_m)',
@@ -47,7 +50,7 @@ var Apps = exports.Apps = (0, _mobxReact.observer)(function (_ref) {
       id: id,
       order: order,
       icon: _type.FcrIconType.FCR_MOREAPP,
-      title: 'Apps',
+      title: "Apps",
       iconColors: {
         iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
       }

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

@@ -1,9 +1,17 @@
-declare const useAppItemOptions: (closeActionBarItemWithPopover?: (visible: boolean) => void) => {
+declare const useAppItemOptions: (onAppClick?: () => void) => ({
     name: string;
     onClick: () => void;
     fcrIconProps: {
         type: import("agora-ui-foundation/lib/components/icon/type").FcrIconType;
     };
     permission: boolean;
-}[];
+} | {
+    name: string;
+    fcrToolTipProps: {
+        content: string;
+    };
+    onClick: () => void;
+    imgSrc: string;
+    permission: boolean;
+})[];
 export default useAppItemOptions;

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

@@ -6,24 +6,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.object.to-string.js");
-require("core-js/modules/esnext.async-iterator.filter.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.filter.js");
 var _react = require("react");
 var _useInterpreter = _interopRequireDefault(require("./useInterpreter"));
 var _useLiveStreaming = _interopRequireDefault(require("./useLiveStreaming"));
 var _useBeautyBackground = _interopRequireDefault(require("./useBeautyBackground"));
-var useAppItemOptions = function useAppItemOptions(closeActionBarItemWithPopover) {
-  var interpreter = (0, _useInterpreter["default"])(closeActionBarItemWithPopover);
-  var liveStreaming = (0, _useLiveStreaming["default"])(closeActionBarItemWithPopover);
-  var beautyBackground = (0, _useBeautyBackground["default"])(closeActionBarItemWithPopover);
+var _useWidgetList = _interopRequireDefault(require("./useWidgetList"));
+var useAppItemOptions = function useAppItemOptions(onAppClick) {
+  var interpreter = (0, _useInterpreter["default"])(onAppClick);
+  var liveStreaming = (0, _useLiveStreaming["default"])(onAppClick);
+  var beautyBackground = (0, _useBeautyBackground["default"])(onAppClick);
+  var widgetList = (0, _useWidgetList["default"])(onAppClick);
   var options = (0, _react.useMemo)(function () {
-    return [interpreter, liveStreaming, beautyBackground].filter(function (appItem) {
+    return [interpreter, liveStreaming, beautyBackground].concat((0, _toConsumableArray2["default"])(widgetList)).filter(function (appItem) {
       return appItem.permission;
     });
-  }, [[interpreter, liveStreaming, beautyBackground]]);
+  }, [[interpreter, liveStreaming, beautyBackground, widgetList]]);
   return options;
 };
 var _default = exports["default"] = useAppItemOptions;

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

@@ -1,5 +1,5 @@
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
-declare const useLiveStreaming: (closeActionBarItemWithPopover?: (visible: boolean) => void) => {
+declare const useLiveStreaming: (onAppClick?: () => void) => {
     name: string;
     onClick: () => void;
     fcrIconProps: {

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

@@ -10,7 +10,7 @@ var _store = require("../../store");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _store2 = require("../../../setting/store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var useLiveStreaming = function useLiveStreaming(closeActionBarItemWithPopover) {
+var useLiveStreaming = function useLiveStreaming(onAppClick) {
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     hasStartLiveStreamingPermission = _useContext.hasStartLiveStreamingPermission,
     openDeviceSettingDialog = _useContext.openDeviceSettingDialog;
@@ -20,7 +20,7 @@ var useLiveStreaming = function useLiveStreaming(closeActionBarItemWithPopover)
       activeTab: _store2.DeviceSettingTab.VIDEO,
       videoActiveTab: 'virtual-background'
     });
-    closeActionBarItemWithPopover && closeActionBarItemWithPopover(false);
+    onAppClick && onAppClick();
   };
   return (0, _react.useMemo)(function () {
     return {

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

@@ -1,5 +1,5 @@
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
-declare const useInterpreter: (closeActionBarItemWithPopover?: (visible: boolean) => void) => {
+declare const useInterpreter: (onAppClick?: () => void) => {
     name: string;
     onClick: () => void;
     fcrToolTipProps: {

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

@@ -9,14 +9,14 @@ var _react = require("react");
 var _store = require("../../store");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _i18n = require("agora-ui-foundation/lib/i18n");
-var useInterpreter = function useInterpreter(closeActionBarItemWithPopover) {
+var useInterpreter = function useInterpreter(onAppClick) {
   var _useContext = (0, _react.useContext)(_store.ActionBarContext),
     hasEnableInterpreterPermission = _useContext.hasEnableInterpreterPermission,
-    interpreterState = _useContext.interpreterState,
+    isInterpreterEnabled = _useContext.isInterpreterEnabled,
     openInterpreterDialog = _useContext.openInterpreterDialog;
   var onClick = function onClick() {
     openInterpreterDialog();
-    closeActionBarItemWithPopover && closeActionBarItemWithPopover(false);
+    onAppClick && onAppClick();
   };
   var transI18n = (0, _i18n.useI18n)();
   return (0, _react.useMemo)(function () {
@@ -24,14 +24,14 @@ var useInterpreter = function useInterpreter(closeActionBarItemWithPopover) {
       name: transI18n('fmt_interpretation_setting_controller_option_simultaneous_interpretation'),
       onClick: onClick,
       fcrToolTipProps: {
-        content: interpreterState ? transI18n('fmt_interpretation_setting_controller_toast_turn_off_simultaneous_interpretation') : transI18n('fmt_interpretation_setting_controller_toast_turn_on_simultaneous_interpretation')
+        content: isInterpreterEnabled ? transI18n('fmt_interpretation_setting_controller_toast_turn_off_simultaneous_interpretation') : transI18n('fmt_interpretation_setting_controller_toast_turn_on_simultaneous_interpretation')
       },
       fcrIconProps: {
-        type: interpreterState ? _type.FcrIconType.FCR_SIMULTANEOUSINTERPRETATION_ON : _type.FcrIconType.FCR_SIMULTANEOUSINTERPRETATION_OFF,
+        type: isInterpreterEnabled ? _type.FcrIconType.FCR_SIMULTANEOUSINTERPRETATION_ON : _type.FcrIconType.FCR_SIMULTANEOUSINTERPRETATION_OFF,
         iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
       },
       permission: hasEnableInterpreterPermission
     };
-  }, [hasEnableInterpreterPermission, interpreterState]);
+  }, [hasEnableInterpreterPermission, isInterpreterEnabled]);
 };
 var _default = exports["default"] = useInterpreter;

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

@@ -1,5 +1,5 @@
 import { FcrIconType } from 'agora-ui-foundation/lib/components/icon/type';
-declare const useLiveStreaming: (closeActionBarItemWithPopover?: (visible: boolean) => void) => {
+declare const useLiveStreaming: (onAppClick?: () => void) => {
     name: string;
     onClick: () => void;
     fcrToolTipProps: {