fcr-ui-scene 3.7.6 → 3.7.7

package/lib/modules/components/leave-meeting/store.js

@@ -0,0 +1,270 @@
+"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.LeaveMeetingStoreContext = exports.LeaveMeetingStore = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+require("core-js/modules/es.array.filter.js");
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.array.some.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.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.filter.js");
+require("core-js/modules/esnext.iterator.some.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 _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+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 _type = require("fcr-core/lib/type");
+var _mobx = require("mobx");
+var _react = require("react");
+var _constant = require("../../../utilities/constant");
+var _LeaveMeetingStore;
+var _initProto, _init_keepConnect, _init_canAssign, _init_loading, _showEndConfirmDialogDecs, _isHostSupportedByPlatformDecs, _assignHostDecs, _leaveDecs, _keepPhoneAudioConnectionDecs, _setCanAssignDecs, _setKeepConnectDecs, _endDecs, _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();
+_ref = (_showEndConfirmDialogDecs = [_mobx.action, _mobx.action.bound], _isHostSupportedByPlatformDecs = [_mobx.action, _mobx.action.bound], _assignHostDecs = [_mobx.action, _mobx.action.bound], _leaveDecs = [_mobx.action, _mobx.action.bound], _keepPhoneAudioConnectionDecs = [_mobx.action, _mobx.action.bound], _setCanAssignDecs = [_mobx.action, _mobx.action.bound], _setKeepConnectDecs = [_mobx.action, _mobx.action.bound], _endDecs = [_mobx.action, _mobx.action.bound], "_userControl");
+var LeaveMeetingStore = exports.LeaveMeetingStore = /*#__PURE__*/function () {
+  function LeaveMeetingStore(_privilegeProvider, _roomProvider, _roomControl, _sharedMemberDataSource, _abilityProvider, _dialogProvder) {
+    (0, _classCallCheck2["default"])(this, LeaveMeetingStore);
+    (0, _defineProperty2["default"])(this, _ref, void _initProto(this));
+    _classPrivateFieldInitSpec(this, _A, _init_keepConnect(this, false));
+    _classPrivateFieldInitSpec(this, _B, _init_canAssign(this, false));
+    _classPrivateFieldInitSpec(this, _C, _init_loading(this, false));
+    this._privilegeProvider = _privilegeProvider;
+    this._roomProvider = _roomProvider;
+    this._roomControl = _roomControl;
+    this._sharedMemberDataSource = _sharedMemberDataSource;
+    this._abilityProvider = _abilityProvider;
+    this._dialogProvder = _dialogProvder;
+    this._userControl = this._roomControl.getUserControl();
+    this._streamControl = this._roomControl.getStreamControl();
+  }
+  return (0, _createClass2["default"])(LeaveMeetingStore, [{
+    key: "keepConnect",
+    get: function get() {
+      return _classPrivateFieldGet(_A, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_A, this, v);
+    }
+  }, {
+    key: "canAssign",
+    get: function get() {
+      return _classPrivateFieldGet(_B, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_B, this, v);
+    }
+  }, {
+    key: "loading",
+    get: function get() {
+      return _classPrivateFieldGet(_C, this);
+    },
+    set: function set(v) {
+      _classPrivateFieldSet(_C, this, v);
+    }
+  }, {
+    key: "isLocked",
+    get: function get() {
+      return this._privilegeProvider.isLockRoomEnabled();
+    }
+  }, {
+    key: "localUserId",
+    get: function get() {
+      return this._sharedMemberDataSource.localUser.userId;
+    }
+  }, {
+    key: "localUserRole",
+    get: function get() {
+      return this._sharedMemberDataSource.localUserRole;
+    }
+  }, {
+    key: "hasAssignHostBeforeLeavingPermission",
+    get: function get() {
+      return this._privilegeProvider.hasAssignHostBeforeLeavingPermission(this.localUserRole);
+    }
+  }, {
+    key: "hasEndRoomPermission",
+    get: function get() {
+      return this._privilegeProvider.hasEndRoomPermission();
+    }
+  }, {
+    key: "hostAvailibleRemoteUsers",
+    get: function get() {
+      var _this = this;
+      return this._sharedMemberDataSource.remoteMembersUserInfosList.filter(function (user) {
+        return user.platform && _this.isHostSupportedByPlatform(user.platform);
+      });
+    }
+  }, {
+    key: "isPstnUser",
+    get: function get() {
+      return this._sharedMemberDataSource.hasOwnPstnStream;
+    }
+  }, {
+    key: "isAssignHostAvailable",
+    get: function get() {
+      var _this2 = this;
+      return this.hasAssignHostBeforeLeavingPermission && this.hostAvailibleRemoteUsers.some(function (item) {
+        return _this2.isHostSupportedByPlatform(item.platform);
+      });
+    }
+  }, {
+    key: "showEndConfirmDialog",
+    value: function showEndConfirmDialog() {
+      this._dialogProvder.openDialog(_constant.FcrUIDialogKey.LEAVE_MEETING);
+    }
+  }, {
+    key: "isHostSupportedByPlatform",
+    value: function isHostSupportedByPlatform(platform) {
+      return this._abilityProvider.isHostSupportedByPlatform(platform);
+    }
+  }, {
+    key: "assignHost",
+    value: function assignHost(user) {
+      this._userControl.updateRemoteUserRole(user.userId, _type.FcrUserRole.HOST);
+      this.leave();
+    }
+  }, {
+    key: "leave",
+    value: function () {
+      var _leave = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+        var _t;
+        return _regenerator["default"].wrap(function (_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              this.loading = true;
+              _t = this.keepConnect && this.isPstnUser;
+              if (!_t) {
+                _context.next = 1;
+                break;
+              }
+              _context.next = 1;
+              return this.keepPhoneAudioConnection();
+            case 1:
+              this.loading = false;
+              this._roomProvider.exitRoom();
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function leave() {
+        return _leave.apply(this, arguments);
+      }
+      return leave;
+    }()
+  }, {
+    key: "keepPhoneAudioConnection",
+    value: function () {
+      var _keepPhoneAudioConnection = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+        return _regenerator["default"].wrap(function (_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              return _context2.abrupt("return", this._streamControl.splitAudioStream(this.localUserId));
+            case 1:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function keepPhoneAudioConnection() {
+        return _keepPhoneAudioConnection.apply(this, arguments);
+      }
+      return keepPhoneAudioConnection;
+    }()
+  }, {
+    key: "setCanAssign",
+    value: function setCanAssign(value) {
+      this.canAssign = value;
+    }
+  }, {
+    key: "setKeepConnect",
+    value: function setKeepConnect(value) {
+      this.keepConnect = value;
+    }
+  }, {
+    key: "end",
+    value: function () {
+      var _end = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+        return _regenerator["default"].wrap(function (_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              this._roomControl.close();
+              this._roomProvider.exitRoom();
+            case 1:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, this);
+      }));
+      function end() {
+        return _end.apply(this, arguments);
+      }
+      return end;
+    }()
+  }, {
+    key: "release",
+    value: function release() {}
+  }]);
+}();
+_LeaveMeetingStore = LeaveMeetingStore;
+var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_LeaveMeetingStore, [[_mobx.observable, 1, "keepConnect"], [_mobx.observable, 1, "canAssign"], [_mobx.observable, 1, "loading"], [_mobx.computed, 3, "hostAvailibleRemoteUsers"], [_mobx.computed, 3, "isPstnUser"], [_mobx.computed, 3, "isAssignHostAvailable"], [_showEndConfirmDialogDecs, 18, "showEndConfirmDialog"], [_isHostSupportedByPlatformDecs, 18, "isHostSupportedByPlatform"], [_assignHostDecs, 18, "assignHost"], [_leaveDecs, 18, "leave"], [_keepPhoneAudioConnectionDecs, 18, "keepPhoneAudioConnection"], [_setCanAssignDecs, 18, "setCanAssign"], [_setKeepConnectDecs, 18, "setKeepConnect"], [_endDecs, 18, "end"]], []).e, 4);
+_init_keepConnect = _applyDecs$e[0];
+_init_canAssign = _applyDecs$e[1];
+_init_loading = _applyDecs$e[2];
+_initProto = _applyDecs$e[3];
+var LeaveMeetingStoreContext = exports.LeaveMeetingStoreContext = /*#__PURE__*/(0, _react.createContext)(null);

package/lib/modules/components/toolbar/components/capture-tool/index.d.ts

@@ -1,6 +1,5 @@
 import { ToolTipProps } from 'agora-ui-foundation/lib/components/tooltip';
 export declare const AnnotationCaptureTool: (props: {
-    popoverVisible?: boolean;
     placement: ToolTipProps["placement"];
     size?: number;
     hideTitle?: boolean;

package/lib/modules/components/toolbar/components/capture-tool/index.js

@@ -17,7 +17,6 @@ var AnnotationCaptureTool = exports.AnnotationCaptureTool = function AnnotationC
   var t = (0, _i18n.useI18n)();
   var size = props.size,
     hideTitle = props.hideTitle,
-    popoverVisible = props.popoverVisible,
     placement = props.placement,
     direction = props.direction,
     setPopoverVisible = props.setPopoverVisible,
@@ -43,7 +42,7 @@ var AnnotationCaptureTool = exports.AnnotationCaptureTool = function AnnotationC
     iconType: _type.FcrIconType.FCR_WHITEBOARD_SLICE,
     title: t('fmt_screenshare_whiteboard_button_cutting'),
     lineColor: "transparent",
-    visible: visible && popoverVisible,
+    visible: visible,
     onVisibleChange: handleVisibleChange,
     showArrow: true,
     content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_panel.AnnotationToolPanel, {

package/lib/modules/components/toolbar/components/vertical-frame/index.js

@@ -126,7 +126,7 @@ function VerticalBar(props) {
       api.start(_position);
     }
   }, []);
-  var handleRefMount = function handleRefMount(dom) {
+  var handleRefMount = (0, _react2.useCallback)(function (dom) {
     if (dom) {
       var top = dom.getBoundingClientRect().top;
       if (topTemp !== top) {
@@ -135,7 +135,7 @@ function VerticalBar(props) {
         toolbarDom.current = dom;
       }
     }
-  };
+  }, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       onClick: function onClick() {

package/lib/modules/components/toolbar/hooks/use-resize-visible.js

@@ -6,62 +6,63 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useResizeVisible = void 0;
-require("core-js/modules/web.timers.js");
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _item = require("../components/item");
-var _constants = require("../../../action-bar/constants");
+var _lodash = require("lodash");
 var useResizeVisible = exports.useResizeVisible = function useResizeVisible() {
-  var toolbar = (0, _react.useRef)();
-  var _useState = (0, _react.useState)(0),
+  var _useState = (0, _react.useState)(-1),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    threshold = _useState2[0],
-    setThreshold = _useState2[1];
-  var _useState3 = (0, _react.useState)(-1),
-    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    coverCount = _useState4[0],
-    setCoverCount = _useState4[1];
-  var _useState5 = (0, _react.useState)(0),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    itemHeight = _useState6[0],
-    setItemHeight = _useState6[1];
-  var actionbar = document.querySelector(".".concat(_constants.actionBarClassName));
-  var actionBarHeight = (actionbar === null || actionbar === void 0 ? void 0 : actionbar.getBoundingClientRect().height) || 0;
+    coverCount = _useState2[0],
+    setCoverCount = _useState2[1];
   var bottomHeight = 20;
-  var timer = (0, _react.useRef)(null);
+  var toolbarRef = (0, _react.useRef)();
+  var containerRef = (0, _react.useRef)(null);
+  var thresholdRef = (0, _react.useRef)(0);
+  var itemHeightRef = (0, _react.useRef)(0);
   var handleResize = (0, _react.useCallback)(function () {
-    var _document$documentEle = document.documentElement.getBoundingClientRect(),
-      height = _document$documentEle.height;
-    var coverSize = threshold - height;
-    var coverCount = Math.floor(coverSize / itemHeight);
-    setCoverCount(coverCount);
-  }, [threshold]);
+    var container = containerRef.current;
+    var _ref = (container === null || container === void 0 ? void 0 : container.getBoundingClientRect()) || document.documentElement.getBoundingClientRect(),
+      height = _ref.height;
+    var threshold = thresholdRef.current;
+    var itemHeight = itemHeightRef.current;
+    var coverSize = 0;
+    var coverCountTemp = -1;
+    coverSize = threshold - height;
+    coverCountTemp = Math.round(coverSize / itemHeight);
+    setCoverCount(coverCountTemp);
+  }, []);
+  (0, _react.useEffect)(function () {
+    handleResize();
+  }, []);
+  var handleResizeDebounce = (0, _react.useCallback)((0, _lodash.debounce)(handleResize, 200), []);
   (0, _react.useEffect)(function () {
-    window.addEventListener('resize', handleResize);
-    window.addEventListener('animationend', handleResize);
-    if (timer.current) {
-      window.clearTimeout(timer.current);
+    var container = containerRef.current;
+    if (container) {
+      container.addEventListener('transitionend', handleResizeDebounce);
     }
-    timer.current = window.setTimeout(handleResize);
     return function () {
-      window.removeEventListener('resize', handleResize);
-      window.removeEventListener('animationend', handleResize);
-      if (timer.current) {
-        window.clearTimeout(timer.current);
+      if (container) {
+        container.removeEventListener('transitionend', handleResizeDebounce);
       }
     };
-  }, [threshold]);
+  }, []);
+  var reCalcThreshold = (0, _react.useCallback)(function () {
+    var toolbar = toolbarRef.current;
+    if (toolbar) {
+      var _toolbar$getBoundingC = toolbar.getBoundingClientRect(),
+        height = _toolbar$getBoundingC.height;
+      var items = toolbar.querySelectorAll(".".concat(_item.toolBarItemClassName));
+      itemHeightRef.current = items[0].getBoundingClientRect().height;
+      var threshold = height + bottomHeight;
+      thresholdRef.current = threshold;
+    }
+  }, []);
   var setToolbarDom = (0, _react.useCallback)(function (dom) {
     if (dom) {
-      var _items$;
-      toolbar.current = dom;
-      var _dom$getBoundingClien = dom.getBoundingClientRect(),
-        top = _dom$getBoundingClien.top,
-        height = _dom$getBoundingClien.height;
-      var items = dom.querySelectorAll(".".concat(_item.toolBarItemClassName));
-      setItemHeight((_items$ = items[0]) === null || _items$ === void 0 ? void 0 : _items$.getBoundingClientRect().height);
-      var _threshold = height + top + actionBarHeight + bottomHeight;
-      setThreshold(_threshold);
+      toolbarRef.current = dom;
+      containerRef.current = document.querySelector('.fcr-whiteboard-controlbar-body-content');
+      reCalcThreshold();
     }
   }, []);
   return {

package/lib/modules/components/toolbar/index.js

@@ -60,18 +60,14 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
     onCaptureScreen = props.onCaptureScreen,
     setProgress = props.setProgress;
   var t = (0, _i18n.useI18n)();
-  var _useState = (0, _react.useState)(false),
+  var _useState = (0, _react.useState)('right'),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    popoverVisible = _useState2[0],
-    setPopoverVisible = _useState2[1];
-  var _useState3 = (0, _react.useState)('right'),
+    placement = _useState2[0],
+    setPlacement = _useState2[1];
+  var _useState3 = (0, _react.useState)(-1),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
-    placement = _useState4[0],
-    setPlacement = _useState4[1];
-  var _useState5 = (0, _react.useState)(-1),
-    _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    coverCount = _useState6[0],
-    setCoverCount = _useState6[1];
+    coverCount = _useState4[0],
+    setCoverCount = _useState4[1];
   var effects = [coverCount, currentTool, currentColor, currentShape, currentStrokeWidth, commonColors, undoSteps, redoSteps, placement];
   var needHiddenTools = (0, _react.useMemo)(function () {
     return [/*#__PURE__*/(0, _jsxRuntime.jsx)(_graphicTool.AnnotationGraphicTool, {
@@ -88,9 +84,6 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
       direction: direction
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
       size: size,
-      onVisibleChange: function onVisibleChange() {
-        return setPopoverVisible(false);
-      },
       active: currentTool === _enums.FcrBoardToolType.TEXT,
       onClick: function onClick() {
         return setTool(_enums.FcrBoardToolType.TEXT);
@@ -101,9 +94,6 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
       placement: placement
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
       size: size,
-      onVisibleChange: function onVisibleChange() {
-        return setPopoverVisible(false);
-      },
       active: currentTool === _enums.FcrBoardToolType.HAND,
       onClick: function onClick() {
         return setTool(_enums.FcrBoardToolType.HAND);
@@ -122,9 +112,6 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
       direction: direction
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
       size: size,
-      onVisibleChange: function onVisibleChange() {
-        return setPopoverVisible(false);
-      },
       active: currentTool === _enums.FcrBoardToolType.ERASER,
       onClick: function onClick() {
         return setTool(_enums.FcrBoardToolType.ERASER);
@@ -134,8 +121,6 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
       hideTitle: true,
       placement: placement
     }), (0, _env.isElectron)() && onCaptureScreen && commonColors && /*#__PURE__*/(0, _jsxRuntime.jsx)(_captureTool.AnnotationCaptureTool, {
-      popoverVisible: popoverVisible,
-      setPopoverVisible: setPopoverVisible,
       size: size,
       direction: direction,
       hideTitle: true,
@@ -143,9 +128,6 @@ var WhiteboardToolbar = exports.WhiteboardToolbar = function WhiteboardToolbar(p
       onClick: onCaptureScreen
     }), !commonColors && /*#__PURE__*/(0, _jsxRuntime.jsx)(_item.AnnotationToolItem, {
       size: size,
-      onVisibleChange: function onVisibleChange() {
-        return setPopoverVisible(false);
-      },
       onClick: clean,
       iconType: _type.FcrIconType.FCR_DELETE5,
       title: t('fmt_screenshare_whiteboard_button_empty'),

package/lib/modules/control-bar/components/annotation-button/index.d.ts

@@ -0,0 +1 @@
+export declare const AnnotationButton: () => import("react/jsx-runtime").JSX.Element;

package/lib/modules/control-bar/components/annotation-button/index.js

@@ -0,0 +1,72 @@
+"use strict";
+
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.AnnotationButton = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _tooltipsButton = require("agora-ui-foundation/lib/components/tooltips-button");
+var _i18n = require("agora-ui-foundation/lib/i18n");
+var _type = require("agora-ui-foundation/lib/components/icon/type");
+var _annotationMenu = _interopRequireDefault(require("../../../components/annotation-menu"));
+var _react = require("react");
+var _mobxReact = require("mobx-react");
+var _store = require("../../store");
+var _view = require("../../view");
+var _jsxRuntime = require("react/jsx-runtime");
+var AnnotationButton = exports.AnnotationButton = (0, _mobxReact.observer)(function () {
+  var transI18n = (0, _i18n.useI18n)();
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
+  var _useContext = (0, _react.useContext)(_view.ControlbarContext),
+    browserWindow = _useContext.browserWindow;
+  var _useContext2 = (0, _react.useContext)(_store.StoreContext),
+    toggleAnnotation = _useContext2.toggleAnnotation,
+    hasAnnotationAllowWritePermission = _useContext2.hasAnnotationAllowWritePermission,
+    allowAnnotationWriteState = _useContext2.allowAnnotationWriteState,
+    setAllAnnotationWrite = _useContext2.setAllAnnotationWrite,
+    isSharingScreen = _useContext2.isSharingScreen,
+    log = _useContext2.log;
+  var handleBlur = function handleBlur() {
+    setVisible(false);
+  };
+  (0, _react.useEffect)(function () {
+    browserWindow === null || browserWindow === void 0 || browserWindow.on('blur', handleBlur);
+    return function () {
+      browserWindow === null || browserWindow === void 0 || browserWindow.off('blur', handleBlur);
+    };
+  }, [browserWindow]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltipsButton.FrcTooltipButton, {
+    active: visible,
+    tooltip: {
+      content: transI18n('fmt_screenshare_controlbar_button_annotations'),
+      icon: {
+        type: _type.FcrIconType.FCR_RENAME,
+        size: 32,
+        colors: {
+          iconPrimary: 'var(--fcr_web_ui_scene_mainicon1)'
+        }
+      }
+    },
+    onTooltipButtonClick: isSharingScreen ? toggleAnnotation : function () {
+      return log('share screen is starting, please wait a moment to operate');
+    },
+    withPopover: true,
+    popover: {
+      content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_annotationMenu["default"], {
+        allowAnnotationWriteState: allowAnnotationWriteState,
+        hasAnnotationAllowWritePermission: hasAnnotationAllowWritePermission,
+        setAllowAnnotationWrite: setAllAnnotationWrite,
+        showClear: true
+      }),
+      onVisibleChange: function onVisibleChange(visible) {
+        setVisible(visible);
+      },
+      visible: visible
+    }
+  });
+});

package/lib/modules/control-bar/components/cloud-recording-buttons.d.ts

@@ -1 +1,4 @@
+import { PropsWithChildren } from 'react';
+import { StopCloudRecordingProps } from '../../action-bar/type';
 export declare const CloudRecordingButtons: () => import("react/jsx-runtime").JSX.Element;
+export declare const StopCloudRecording: ({ stopCloudRecording, children }: PropsWithChildren<StopCloudRecordingProps>) => import("react/jsx-runtime").JSX.Element;