fcr-ui-scene 3.2.0 → 3.3.1

package/lib/modules/waiting-room-layout/store.js

@@ -0,0 +1,189 @@
+"use strict";
+
+require("core-js/modules/es.symbol.js");
+require("core-js/modules/es.symbol.description.js");
+require("core-js/modules/es.symbol.to-primitive.js");
+require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.error.to-string.js");
+require("core-js/modules/es.array.is-array.js");
+require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.date.to-primitive.js");
+require("core-js/modules/es.function.bind.js");
+require("core-js/modules/es.function.name.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.number.constructor.js");
+require("core-js/modules/es.object.create.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/esnext.function.metadata.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/esnext.symbol.metadata.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.iterator.js");
+require("core-js/modules/es.weak-map.js");
+require("core-js/modules/esnext.weak-map.delete-all.js");
+require("core-js/modules/esnext.weak-map.emplace.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _mobx = require("mobx");
+var _LayoutStore;
+var _initProto, _participantDecs, _init_participant, _chatDecs, _init_chat, _stateBarDecs, _init_stateBar, _actionBarDecs, _init_actionBar, _layersDecs, _init_layers, _whiteboardDecs, _init_whiteboard, _startPlayLocalVideoDecs, _stopPlayLocalVideoDecs, _setCameraEnabledDecs, _updateSlotsDecs, _ref;
+function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
+function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
+function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
+function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
+function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
+function _applyDecs(e, t, r, n, o, a) { function i(e, t, r) { return function (n, o) { return r && r(n), e[t].call(n, o); }; } function c(e, t) { for (var r = 0; r < e.length; r++) e[r].call(t); return t; } function s(e, t, r, n) { if ("function" != typeof e && (n || void 0 !== e)) throw new TypeError(t + " must " + (r || "be") + " a function" + (n ? "" : " or undefined")); return e; } function applyDec(e, t, r, n, o, a, c, u, l, f, p, d, h) { function m(e) { if (!h(e)) throw new TypeError("Attempted to access private element on non-instance"); } var y, v = t[0], g = t[3], b = !u; if (!b) { r || Array.isArray(v) || (v = [v]); var w = {}, S = [], A = 3 === o ? "get" : 4 === o || d ? "set" : "value"; f ? (p || d ? w = { get: _setFunctionName(function () { return g(this); }, n, "get"), set: function set(e) { t[4](this, e); } } : w[A] = g, p || _setFunctionName(w[A], n, 2 === o ? "" : A)) : p || (w = Object.getOwnPropertyDescriptor(e, n)); } for (var P = e, j = v.length - 1; j >= 0; j -= r ? 2 : 1) { var D = v[j], E = r ? v[j - 1] : void 0, I = {}, O = { kind: ["field", "accessor", "method", "getter", "setter", "class"][o], name: n, metadata: a, addInitializer: function (e, t) { if (e.v) throw Error("attempted to call addInitializer after decoration was finished"); s(t, "An initializer", "be", !0), c.push(t); }.bind(null, I) }; try { if (b) (y = s(D.call(E, P, O), "class decorators", "return")) && (P = y);else { var k, F; O["static"] = l, O["private"] = f, f ? 2 === o ? k = function k(e) { return m(e), w.value; } : (o < 4 && (k = i(w, "get", m)), 3 !== o && (F = i(w, "set", m))) : (k = function k(e) { return e[n]; }, (o < 2 || 4 === o) && (F = function F(e, t) { e[n] = t; })); var N = O.access = { has: f ? h.bind() : function (e) { return n in e; } }; if (k && (N.get = k), F && (N.set = F), P = D.call(E, d ? { get: w.get, set: w.set } : w[A], O), d) { if ("object" == _typeof(P) && P) (y = s(P.get, "accessor.get")) && (w.get = y), (y = s(P.set, "accessor.set")) && (w.set = y), (y = s(P.init, "accessor.init")) && S.push(y);else if (void 0 !== P) throw new TypeError("accessor decorators must return an object with get, set, or init properties or void 0"); } else s(P, (p ? "field" : "method") + " decorators", "return") && (p ? S.push(P) : w[A] = P); } } finally { I.v = !0; } } return (p || d) && u.push(function (e, t) { for (var r = S.length - 1; r >= 0; r--) t = S[r].call(e, t); return t; }), p || b || (f ? d ? u.push(i(w, "get"), i(w, "set")) : u.push(2 === o ? w[A] : i.call.bind(w[A])) : Object.defineProperty(e, n, w)), P; } function u(e, t) { return Object.defineProperty(e, Symbol.metadata || Symbol["for"]("Symbol.metadata"), { configurable: !0, enumerable: !0, value: t }); } if (arguments.length >= 6) var l = a[Symbol.metadata || Symbol["for"]("Symbol.metadata")]; var f = Object.create(null == l ? null : l), p = function (e, t, r, n) { var o, a, i = [], s = function s(t) { return _checkInRHS(t) === e; }, u = new Map(); function l(e) { e && i.push(c.bind(null, e)); } for (var f = 0; f < t.length; f++) { var p = t[f]; if (Array.isArray(p)) { var d = p[1], h = p[2], m = p.length > 3, y = 16 & d, v = !!(8 & d), g = 0 == (d &= 7), b = h + "/" + v; if (!g && !m) { var w = u.get(b); if (!0 === w || 3 === w && 4 !== d || 4 === w && 3 !== d) throw Error("Attempted to decorate a public method/accessor that has the same name as a previously decorated public method/accessor. This is not currently supported by the decorators plugin. Property name was: " + h); u.set(b, !(d > 2) || d); } applyDec(v ? e : e.prototype, p, y, m ? "#" + h : _toPropertyKey(h), d, n, v ? a = a || [] : o = o || [], i, v, m, g, 1 === d, v && m ? s : r); } } return l(o), l(a), i; }(e, t, o, f); return r.length || u(e, f), { e: p, get c() { var t = []; return r.length && [u(applyDec(e, [r], n, e.name, 5, f, t), f), c.bind(null, t, e)]; } }; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
+function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? _typeof(e) : "null")); return e; }
+var _A = /*#__PURE__*/new WeakMap();
+var _B = /*#__PURE__*/new WeakMap();
+var _C = /*#__PURE__*/new WeakMap();
+var _D = /*#__PURE__*/new WeakMap();
+var _E = /*#__PURE__*/new WeakMap();
+var _F = /*#__PURE__*/new WeakMap();
+_ref = (_participantDecs = [_mobx.observable, _mobx.observable.ref], _chatDecs = [_mobx.observable, _mobx.observable.ref], _stateBarDecs = [_mobx.observable, _mobx.observable.ref], _actionBarDecs = [_mobx.observable, _mobx.observable.ref], _layersDecs = [_mobx.observable, _mobx.observable.ref], _whiteboardDecs = [_mobx.observable, _mobx.observable.ref], _startPlayLocalVideoDecs = [_mobx.action, _mobx.action.bound], _stopPlayLocalVideoDecs = [_mobx.action, _mobx.action.bound], _setCameraEnabledDecs = [_mobx.action, _mobx.action.bound], _updateSlotsDecs = [_mobx.action, _mobx.action.bound], "_deviceStore");
+var LayoutStore = exports["default"] = /*#__PURE__*/function () {
+  function LayoutStore(params) {
+    (0, _classCallCheck2["default"])(this, LayoutStore);
+    (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
+    // Slots
+    _classPrivateFieldInitSpec(this, _A, _init_participant(this, null));
+    _classPrivateFieldInitSpec(this, _B, _init_chat(this, null));
+    _classPrivateFieldInitSpec(this, _C, _init_stateBar(this, null));
+    _classPrivateFieldInitSpec(this, _D, _init_actionBar(this, null));
+    _classPrivateFieldInitSpec(this, _E, _init_layers(this, null));
+    _classPrivateFieldInitSpec(this, _F, _init_whiteboard(this, null));
+    this._deviceStore = params.deviceStore;
+    this._userControl = params.userControl;
+  }
+  return (0, _createClass2["default"])(LayoutStore, [{
+    key: "participant",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "chat",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "stateBar",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "actionBar",
+    get: function get() {
+      return _classPrivateFieldGet(_D, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_D, this, v);
+    }
+  }, {
+    key: "layers",
+    get: function get() {
+      return _classPrivateFieldGet(_E, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_E, this, v);
+    }
+  }, {
+    key: "whiteboard",
+    get: function get() {
+      return _classPrivateFieldGet(_F, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_F, this, v);
+    }
+  }, {
+    key: "localUser",
+    get: function get() {
+      return this._userControl.getLocalUser();
+    }
+  }, {
+    key: "cameraId",
+    get: function get() {
+      return this._deviceStore.cameraId;
+    }
+  }, {
+    key: "cameraEnabled",
+    get: function get() {
+      return this._deviceStore.cameraEnabled;
+    }
+  }, {
+    key: "startPlayLocalVideo",
+    value: function startPlayLocalVideo(view, isMirror) {
+      return this._deviceStore.startPlayLocalVideo(view, isMirror);
+    }
+  }, {
+    key: "stopPlayLocalVideo",
+    value: function stopPlayLocalVideo(view) {
+      return this._deviceStore.stopPlayLocalVideo(view);
+    }
+  }, {
+    key: "setCameraEnabled",
+    value: function setCameraEnabled(enable) {
+      this._deviceStore.handleRealCameraEnabledChanged(enable);
+      this._deviceStore.cameraEnabled = enable;
+    }
+  }, {
+    key: "updateSlots",
+    value: function updateSlots(slots) {
+      for (var key in slots) {
+        var slot = slots[key];
+        if (key in this && slot !== undefined) {
+          this[key] = slot;
+        }
+      }
+    }
+  }, {
+    key: "release",
+    value: function release() {
+      // this._chatRoomControl.removeObserver(this._chatRoomObserver);
+    }
+  }]);
+}();
+_LayoutStore = LayoutStore;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LayoutStore, [[_participantDecs, 17, "participant"], [_chatDecs, 17, "chat"], [_stateBarDecs, 17, "stateBar"], [_actionBarDecs, 17, "actionBar"], [_layersDecs, 17, "layers"], [_whiteboardDecs, 17, "whiteboard"], [_startPlayLocalVideoDecs, 18, "startPlayLocalVideo"], [_stopPlayLocalVideoDecs, 18, "stopPlayLocalVideo"], [_setCameraEnabledDecs, 18, "setCameraEnabled"], [_updateSlotsDecs, 18, "updateSlots"]], []).e, 7);
+_init_participant = _applyDecs$e[0];
+_init_chat = _applyDecs$e[1];
+_init_stateBar = _applyDecs$e[2];
+_init_actionBar = _applyDecs$e[3];
+_init_layers = _applyDecs$e[4];
+_init_whiteboard = _applyDecs$e[5];
+_initProto = _applyDecs$e[6];

package/lib/modules/waiting-room-layout/type.js

@@ -0,0 +1 @@
+"use strict";

package/lib/modules/waiting-room-layout/view.d.ts

@@ -0,0 +1,3 @@
+import './index.css';
+declare const View: () => import("react/jsx-runtime").JSX.Element;
+export default View;

package/lib/modules/waiting-room-layout/view.js

@@ -0,0 +1,67 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _react = require("react");
+var _context = require("./context");
+var _localVideoPlayer = require("agora-ui-foundation/lib/components/local-video-player");
+require("./index.css");
+var _mobxReact = require("mobx-react");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _jsxRuntime = require("react/jsx-runtime");
+var View = (0, _mobxReact.observer)(function () {
+  var t = (0, _i18n.useI18n)();
+  var _useContext = (0, _react.useContext)(_context.StoreContext),
+    stateBar = _useContext.stateBar,
+    actionBar = _useContext.actionBar,
+    chat = _useContext.chat,
+    cameraDeviceId = _useContext.cameraId,
+    startPlayLocalVideo = _useContext.startPlayLocalVideo,
+    stopPlayLocalVideo = _useContext.stopPlayLocalVideo,
+    cameraEnabled = _useContext.cameraEnabled,
+    localUser = _useContext.localUser;
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    className: "waiting-room-layout",
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "waiting-room-module",
+      children: stateBar
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "waiting-room-title",
+      children: t('fmt_waitingroom_attendie_overview_label_waitingroom')
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "waiting-room-desc",
+      children: t('fmt_waitingroom_attendie_overview_label_wait_moment')
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: "waiting-room-content",
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+        className: "waiting-room-video-content",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_localVideoPlayer.LocalVideoPlayer, {
+          isLocalMirrorEnabled: false,
+          userName: localUser.userName,
+          showSlider: false,
+          cameraDeviceId: cameraDeviceId,
+          showCameraPreview: cameraEnabled,
+          showTopTips: false,
+          startLocalVideo: startPlayLocalVideo,
+          stopLocalVideo: stopPlayLocalVideo
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          className: "waiting-room-attendee-name",
+          children: [localUser.userName, /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+            className: "attendee__me-badge",
+            children: ["(", t('fmt_participant_label_Me'), ")"]
+          })]
+        })]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: "waiting-room-chat-content",
+        children: chat
+      })]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      className: "waiting-room-module waiting-room-bottom",
+      children: actionBar
+    })]
+  });
+});
+var _default = exports["default"] = View;

package/lib/modules/whiteboard/app.js

@@ -32,12 +32,6 @@ var Whiteboard = exports.Whiteboard = (0, _mobxReact.observer)(function () {
     handleClose = _useContext2.handleClose,
     handleOpen = _useContext2.handleOpen;
   var loading = connectionState === _agoraEduCore.FcrConnectionState.CONNECTING || connectionState === _agoraEduCore.FcrConnectionState.RECONNECTING;
-  (0, _react.useEffect)(function () {
-    handleOpen();
-    return function () {
-      handleClose();
-    };
-  }, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "board-widget-app",

package/lib/modules/whiteboard/components/control-bar/index.css

@@ -25,6 +25,9 @@
   column-gap: 12px;
   height: 20px;
 }
+.whiteboard-controlbar-center .whiteboard-controlbar-item:hover svg path {
+  fill: var(--fcr_web_ui_scene_mainicon2);
+}
 .whiteboard-controlbar-center .divider-vertical {
   height: 50%;
 }

package/lib/modules/whiteboard/components/multi-window/index.js

@@ -17,10 +17,14 @@ var _jsxRuntime = require("react/jsx-runtime");
 var MultiWindowWidgetDialog = exports.MultiWindowWidgetDialog = (0, _mobxReact.observer)(function (_ref) {
   var children = _ref.children;
   var _useContext = (0, _react.useContext)(_context.BoardUIContext),
-    connectionState = _useContext.observables.connectionState;
+    connectionState = _useContext.observables.connectionState,
+    setWhiteboardVisible = _useContext.setWhiteboardVisible;
   var _useContext2 = (0, _react.useContext)(_boardContext["default"]),
     showToolbar = _useContext2.showToolbar;
   var showControlbar = connectionState === _agoraEduCore.FcrConnectionState.CONNECTED;
+  var handleCancel = function handleCancel() {
+    setWhiteboardVisible(false);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     className: "fcr-widget-dialog-zindex-wrapper fcr-widget-dialog",
     children: [showControlbar && showToolbar && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -28,6 +32,7 @@ var MultiWindowWidgetDialog = exports.MultiWindowWidgetDialog = (0, _mobxReact.o
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_controlBar.WhiteboardControlbar, {})
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "fcr-widget-dialog-content",
+      onClick: handleCancel,
       children: children
     })]
   });

package/lib/modules/whiteboard/components/progress/electron.js

@@ -21,7 +21,8 @@ var ProgressElectronDialog = (0, _mobxReact.observer)(function (_ref) {
       fullscreen: false,
       maximizable: false,
       width: 290,
-      height: 60
+      height: 60,
+      transparent: true
     });
     return function () {
       (0, _reactDom.unmountComponentAtNode)(node);

package/lib/modules/whiteboard/components/switch-theme/index.css

@@ -30,6 +30,10 @@
   background: var(--fcr_web_ui_scene_fill4_popup);
   color: var(--fcr_ui_scene_icontext1);
 }
+.whiteboard-switch-theme_item-active {
+  background-color: var(--fcr_ui_scene_ramp_brand6);
+}
+
 .whiteboard-switch-theme_item-close {
   width: 30px;
   height: 30px;

package/lib/modules/whiteboard/components/switch-theme/index.d.ts

@@ -1,2 +1,3 @@
 import './index.css';
-export default function WhiteboardSwitchTheme(): import("react/jsx-runtime").JSX.Element;
+declare const WhiteboardSwitchTheme: () => import("react/jsx-runtime").JSX.Element;
+export default WhiteboardSwitchTheme;

package/lib/modules/whiteboard/components/switch-theme/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = WhiteboardSwitchTheme;
+exports["default"] = void 0;
 require("core-js/modules/es.array.find.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/es.object.to-string.js");
@@ -14,7 +14,6 @@ require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.find.js");
 require("core-js/modules/esnext.iterator.map.js");
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _icon = require("agora-ui-foundation/lib/components/icon");
 var _type = require("agora-ui-foundation/lib/components/icon/type");
 var _popover = require("agora-ui-foundation/lib/components/popover");
@@ -24,15 +23,21 @@ var _libs = _interopRequireDefault(require("./libs"));
 var _react = require("react");
 var _store = require("../toolbar/store");
 var _i18n = require("agora-ui-foundation/lib/i18n");
+var _context = require("../../context");
+var _mobxReact = require("mobx-react");
 var _jsxRuntime = require("react/jsx-runtime");
-function WhiteboardSwitchTheme() {
+var WhiteboardSwitchTheme = (0, _mobxReact.observer)(function () {
   var _useContext = (0, _react.useContext)(_store.ToolbarContext),
-    setTheme = _useContext.setTheme;
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    visible = _useState2[0],
-    setVisible = _useState2[1];
+    setTheme = _useContext.setTheme,
+    currentThemeType = _useContext.observables.currentThemeType;
+  // const [visible, setVisible] = useState(false);
+  var _useContext2 = (0, _react.useContext)(_context.BoardUIContext),
+    whiteboardVisible = _useContext2.observables.whiteboardVisible,
+    setWhiteboardVisible = _useContext2.setWhiteboardVisible;
   var t = (0, _i18n.useI18n)();
+  var handleCancel = function handleCancel() {
+    setWhiteboardVisible(false);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_popover.FcrPopover, {
     trigger: "click",
     overlayClassName: "whiteboard-switch-theme-popover",
@@ -40,7 +45,7 @@ function WhiteboardSwitchTheme() {
       width: '100%'
     },
     overlayOffset: 2,
-    visible: visible,
+    visible: whiteboardVisible,
     content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       className: "whiteboard-switch-theme",
       children: [(0, _libs["default"])(t).map(function (theme, idx) {
@@ -48,19 +53,18 @@ function WhiteboardSwitchTheme() {
           colors: theme.showColors,
           title: theme.title,
           theme: theme.theme,
+          isActive: currentThemeType.theme === theme.theme,
           onClick: function onClick(theme) {
             var result = (0, _libs["default"])(t).find(function (item) {
               return item.theme === theme.theme;
             });
             setTheme(result);
-            setVisible(false);
+            setWhiteboardVisible(false);
           }
         }, theme.theme);
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         className: "whiteboard-switch-theme_item-close",
-        onClick: function onClick() {
-          return setVisible(false);
-        },
+        onClick: handleCancel,
         children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
           size: 20,
           type: _type.FcrIconType.FCR_CLOSE,
@@ -77,8 +81,9 @@ function WhiteboardSwitchTheme() {
         iconPrimary: 'var(--fcr_ui_scene_icontext1)'
       },
       onClick: function onClick() {
-        return setVisible(!visible);
+        return setWhiteboardVisible(!whiteboardVisible);
       }
     })
   });
-}
+});
+var _default = exports["default"] = WhiteboardSwitchTheme;

package/lib/modules/whiteboard/components/switch-theme/item.d.ts

@@ -2,6 +2,7 @@ export type SwitchThemeItemProps = {
     colors: string[][];
     title: string;
     theme: string;
+    isActive?: boolean;
 };
 export default function WhiteboardSwitchThemeItem(props: SwitchThemeItemProps & {
     onClick: (theme: SwitchThemeItemProps) => void;

package/lib/modules/whiteboard/components/switch-theme/item.js

@@ -1,6 +1,7 @@
 "use strict";
 
 require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,13 +10,19 @@ require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.map.js");
 require("core-js/modules/esnext.async-iterator.map.js");
 require("core-js/modules/esnext.iterator.map.js");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _jsxRuntime = require("react/jsx-runtime");
 function WhiteboardSwitchThemeItem(props) {
   var title = props.title,
     colors = props.colors,
-    theme = props.theme;
+    theme = props.theme,
+    _props$isActive = props.isActive,
+    isActive = _props$isActive === void 0 ? false : _props$isActive;
+  var cls = (0, _classnames["default"])('whiteboard-switch-theme_item', {
+    'whiteboard-switch-theme_item-active': isActive
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: "whiteboard-switch-theme_item",
+    className: cls,
     onClick: function onClick() {
       return props.onClick({
         colors: colors,

package/lib/modules/whiteboard/components/toolbar/components/shape-picker.js

@@ -73,19 +73,23 @@ var ShapePickerPanel = (0, _mobxReact.observer)(function () {
     type: _type.FcrBoardShape.Ellipse,
     icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_CIRCLE,
     tip: t('fmt_whiteboard_tips_circle')
-  }, {
-    type: _type.FcrBoardShape.Pentagram,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_STAR,
-    tip: t('fmt_whiteboard_label_pentagon')
-  }, {
+  },
+  // {
+  //   type: FcrBoardShape.Pentagram,
+  //   icon: FcrIconType.FCR_WHITEBOARD_SHAP_STAR,
+  //   tip: t('fmt_whiteboard_label_pentagon'),
+  // },
+  {
     type: _type.FcrBoardShape.Triangle,
     icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_TRIANGLE,
     tip: t('fmt_whiteboard_tips_triangle')
-  }, {
-    type: _type.FcrBoardShape.Rhombus,
-    icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_REHUMBUS,
-    tip: t('fmt_whiteboard_label_prismatic')
-  }, {
+  },
+  // {
+  //   type: FcrBoardShape.Rhombus,
+  //   icon: FcrIconType.FCR_WHITEBOARD_SHAP_REHUMBUS,
+  //   tip: t('fmt_whiteboard_label_prismatic'),
+  // },
+  {
     type: _type.FcrBoardShape.Straight,
     icon: _type2.FcrIconType.FCR_WHITEBOARD_SHAP_LINE,
     tip: t('fmt_whiteboard_tips_straight')

package/lib/modules/whiteboard/components/toolbar/store.d.ts

@@ -6,6 +6,7 @@ export declare class ToolbarStore {
         currentShape: FcrBoardShape | undefined;
         currentColor: string;
         currentStrokeWidth: number;
+        currentThemeType: WhiteboardThemeType;
         toolbarPosition: {
             x: number;
             y: number;

package/lib/modules/whiteboard/components/toolbar/store.js

@@ -51,6 +51,8 @@ var _mobx = require("mobx");
 var _type = require("../../type");
 var _react = require("react");
 var _rendererEvent = require("../../../../utilities/renderer-event");
+var _libs = _interopRequireDefault(require("../switch-theme/libs"));
+var _i18n = require("agora-ui-foundation/lib/i18n");
 var _ToolbarStore;
 var _initProto, _init_observables;
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
@@ -72,6 +74,7 @@ var ToolbarStore = exports.ToolbarStore = /*#__PURE__*/function () {
       currentShape: undefined,
       currentColor: '',
       currentStrokeWidth: 0,
+      currentThemeType: (0, _libs["default"])(_i18n.transI18n)[0],
       toolbarPosition: {
         x: 0,
         y: 0

package/lib/modules/whiteboard/context.d.ts

@@ -32,6 +32,7 @@ declare const boardUIContextDefault: {
         };
         progress: number;
         writeEnabled: boolean;
+        whiteboardVisible: boolean;
     };
     handleBoardDomLoad: (ref: HTMLDivElement | null) => void;
     handleCollectorDomLoad: (ref: HTMLDivElement | null) => void;
@@ -39,6 +40,7 @@ declare const boardUIContextDefault: {
     handleOpen: () => void;
     setPrivilege: (canOperate: boolean) => void;
     setWriteEnable: (enable: boolean) => void;
+    setWhiteboardVisible: (visible: boolean) => void;
 };
 export declare const BoardUIContext: React.Context<{
     observables: {
@@ -54,6 +56,7 @@ export declare const BoardUIContext: React.Context<{
         };
         progress: number;
         writeEnabled: boolean;
+        whiteboardVisible: boolean;
     };
     handleBoardDomLoad: (ref: HTMLDivElement | null) => void;
     handleCollectorDomLoad: (ref: HTMLDivElement | null) => void;
@@ -61,6 +64,7 @@ export declare const BoardUIContext: React.Context<{
     handleOpen: () => void;
     setPrivilege: (canOperate: boolean) => void;
     setWriteEnable: (enable: boolean) => void;
+    setWhiteboardVisible: (visible: boolean) => void;
 }>;
 export type BoardUIContextValue = typeof boardUIContextDefault;
 export {};

package/lib/modules/whiteboard/context.js

@@ -22,13 +22,15 @@ var boardUIContextDefault = {
       top: 0
     },
     progress: 0,
-    writeEnabled: false
+    writeEnabled: false,
+    whiteboardVisible: false
   },
   handleBoardDomLoad: function handleBoardDomLoad(ref) {},
   handleCollectorDomLoad: function handleCollectorDomLoad(ref) {},
   handleClose: function handleClose() {},
   handleOpen: function handleOpen() {},
   setPrivilege: function setPrivilege(canOperate) {},
-  setWriteEnable: function setWriteEnable(enable) {}
+  setWriteEnable: function setWriteEnable(enable) {},
+  setWhiteboardVisible: function setWhiteboardVisible(visible) {}
 };
 var BoardUIContext = exports.BoardUIContext = /*#__PURE__*/(0, _react.createContext)(boardUIContextDefault);