fcr-ui-scene 3.6.3 → 3.6.4-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/base.js +0 -3
- package/lib/creator.js +25 -26
- package/lib/electron/app.js +31 -13
- package/lib/electron/bootstrap-dev.js +2 -3
- package/lib/electron/bootstrap-sdk.js +4 -10
- package/lib/electron/exit-codes.d.ts +14 -0
- package/lib/electron/exit-codes.js +22 -0
- package/lib/electron/injections.js +117 -118
- package/lib/electron/ipc/ipc.js +0 -1
- package/lib/electron/main.js +44 -3
- package/lib/electron/tools.js +0 -4
- package/lib/electron/window.js +1 -4
- package/lib/fragments/annotation/index.js +1 -2
- package/lib/fragments/annotation/store.js +47 -48
- package/lib/modules/action-bar/components/apps/app-item/index.js +0 -2
- package/lib/modules/action-bar/components/apps/app-list.js +2 -5
- package/lib/modules/action-bar/components/apps/useAppItemOptions.js +0 -3
- package/lib/modules/action-bar/components/apps/useWidgetList.js +2 -1
- package/lib/modules/action-bar/components/collapse/index.js +0 -4
- package/lib/modules/action-bar/components/item/index.js +0 -2
- package/lib/modules/action-bar/components/leave/index.js +0 -2
- package/lib/modules/action-bar/components/more/poppover-content.js +0 -4
- package/lib/modules/action-bar/components/notification-bar/components/interpreter/index.js +2 -1
- package/lib/modules/action-bar/components/notification-bar/index.js +0 -2
- package/lib/modules/action-bar/components/screen-share/index.js +0 -1
- package/lib/modules/action-bar/components/screen-share/submenu.js +0 -3
- package/lib/modules/action-bar/components/trigger-output-language/index.js +11 -14
- package/lib/modules/action-bar/components/trigger-subscribe-language/index.js +8 -11
- package/lib/modules/action-bar/index.js +1 -2
- package/lib/modules/action-bar/store.js +32 -36
- package/lib/modules/annotation/components/control-bar/index.js +3 -2
- package/lib/modules/annotation/components/toolbar/components/color-tool/color-panel/index.js +2 -1
- package/lib/modules/annotation/components/toolbar/components/graphic-tool/graphic-panel/index.js +2 -1
- package/lib/modules/annotation/components/toolbar/components/graphic-tool/index.js +0 -2
- package/lib/modules/annotation/components/toolbar/components/pen-tool/pen-panel/index.js +1 -0
- package/lib/modules/annotation/components/toolbar/store.js +0 -1
- package/lib/modules/annotation/index.d.ts +2 -0
- package/lib/modules/annotation/index.js +2 -1
- package/lib/modules/annotation/store.d.ts +5 -3
- package/lib/modules/annotation/store.js +35 -43
- package/lib/modules/audio-stream/index.js +0 -4
- package/lib/modules/chat/chat-room-store.js +6 -10
- package/lib/modules/chat/components/chat-bar/index.js +0 -2
- package/lib/modules/chat/components/chat-select/index.js +0 -1
- package/lib/modules/chat/components/chat-select/select-item/index.js +2 -5
- package/lib/modules/chat/components/message-list/index.js +1 -3
- package/lib/modules/chat/components/message-list/message-item/index.js +11 -13
- package/lib/modules/chat/index.js +13 -14
- package/lib/modules/chat/store.js +0 -1
- package/lib/modules/chat/view.js +11 -15
- package/lib/modules/components/annotation-menu/index.js +0 -3
- package/lib/modules/components/device-control/components/audio-menu/index.js +2 -1
- package/lib/modules/components/device-control/components/video-menu/index.js +2 -1
- package/lib/modules/components/device-control/store.js +0 -1
- package/lib/modules/components/leave-meeting/components/assign-host.js +4 -5
- package/lib/modules/components/leave-meeting/store.js +11 -12
- package/lib/modules/components/member-window/components/member-actions/components/layout/index.js +1 -2
- package/lib/modules/components/member-window/components/member-actions/components/more-actions.js +1 -2
- package/lib/modules/components/member-window/components/member-actions/components/user-info.js +1 -3
- package/lib/modules/components/member-window/components/member-actions/index.js +0 -1
- package/lib/modules/components/member-window/components/member-actions/provider.js +1 -2
- package/lib/modules/components/member-window/components/member-actions/store.js +20 -20
- package/lib/modules/components/member-window/components/video-player/components/local-video-player.d.ts +3 -0
- package/lib/modules/components/member-window/components/video-player/components/local-video-player.js +16 -3
- package/lib/modules/components/member-window/components/video-player/index.d.ts +2 -0
- package/lib/modules/components/member-window/components/video-player/index.js +3 -3
- package/lib/modules/components/member-window/index.js +1 -0
- package/lib/modules/components/security-menu/index.js +1 -4
- package/lib/modules/components/tab-frame/index.js +0 -4
- package/lib/modules/connection-gateway/components/phone/components/callinfo/index.js +2 -1
- package/lib/modules/connection-gateway/components/phone/index.js +5 -4
- package/lib/modules/connection-gateway/index.js +1 -2
- package/lib/modules/connection-gateway/store.js +23 -26
- package/lib/modules/control-bar/components/more-actions/index.js +0 -3
- package/lib/modules/control-bar/index.js +1 -2
- package/lib/modules/control-bar/store.d.ts +1 -0
- package/lib/modules/control-bar/store.js +8 -2
- package/lib/modules/control-bar/view.js +9 -11
- package/lib/modules/device-pretest/settings/beauty.js +1 -2
- package/lib/modules/device-pretest/settings/virtual-background-setting.js +2 -1
- package/lib/modules/device-pretest/store.js +2 -4
- package/lib/modules/dialog/components/control-bar/index.js +3 -3
- package/lib/modules/dialog/components/dialog-container/component/body.js +0 -2
- package/lib/modules/dialog/components/dialog-container/index.js +1 -2
- package/lib/modules/dialog/components/host-area-container/index.js +0 -3
- package/lib/modules/dialog/components/pre-setting-container/component/body.js +0 -2
- package/lib/modules/dialog/components/pre-setting-container/index.js +1 -2
- package/lib/modules/dialog/components/system-preference/index.js +2 -5
- package/lib/modules/dialog/components/video-window/index.js +0 -2
- package/lib/modules/dialog/hooks/use-popover-watcher.js +0 -1
- package/lib/modules/dialog/hooks/useElectron.js +0 -2
- package/lib/modules/dialog/index.js +1 -3
- package/lib/modules/dialog/store.js +1 -5
- package/lib/modules/dialog/view.js +2 -1
- package/lib/modules/event-confirm/components/window/index.js +0 -2
- package/lib/modules/event-confirm/index.js +1 -2
- package/lib/modules/event-confirm/store.js +4 -7
- package/lib/modules/event-confirm/view.js +2 -1
- package/lib/modules/event-sound/index.js +1 -2
- package/lib/modules/event-sound/sound-effect-player.js +2 -2
- package/lib/modules/event-toast/index.js +1 -2
- package/lib/modules/event-toast/store.js +0 -2
- package/lib/modules/event-toast/view.js +2 -1
- package/lib/modules/interpreter/index.js +1 -2
- package/lib/modules/interpreter/interpreter-list/index.js +3 -4
- package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-language/index.js +2 -5
- package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-language/useLanguageConfig/index.js +0 -2
- package/lib/modules/interpreter/interpreter-list/interpreter-item/components/pick-user/index.js +0 -4
- package/lib/modules/interpreter/store.js +5 -10
- package/lib/modules/interpreter/utils.js +15 -14
- package/lib/modules/invite/components/pstn-invite.js +22 -23
- package/lib/modules/invite/components/voip-invite.js +7 -7
- package/lib/modules/invite/enums.js +1 -0
- package/lib/modules/invite/index.js +1 -2
- package/lib/modules/invite/store.js +46 -45
- package/lib/modules/layout/components/CommonVideoRenderer.js +2 -1
- package/lib/modules/layout/components/Gallery.js +5 -3
- package/lib/modules/layout/components/index.js +0 -1
- package/lib/modules/layout/index.js +1 -2
- package/lib/modules/layout/store.d.ts +3 -0
- package/lib/modules/layout/store.js +38 -14
- package/lib/modules/layout/type.js +9 -0
- package/lib/modules/live-streaming/index.dev.js +6 -6
- package/lib/modules/live-streaming/index.js +1 -2
- package/lib/modules/live-streaming/store.js +19 -19
- package/lib/modules/notification/index.js +1 -2
- package/lib/modules/notification/interpreter-status/index.js +2 -1
- package/lib/modules/notification/view.js +1 -2
- package/lib/modules/offscreen-pulling/index.js +0 -1
- package/lib/modules/participant/components/participants/components/footer/components/drop-menu/index.js +1 -4
- package/lib/modules/participant/components/participants/components/participants/components/attendee/index.js +0 -2
- package/lib/modules/participant/components/participants/components/participants/components/participants-more/index.js +0 -2
- package/lib/modules/participant/components/participants/components/participants/components/user-row/index.js +1 -4
- package/lib/modules/participant/components/participants/components/participants/index.js +0 -2
- package/lib/modules/participant/components/participants/components/render-user/components/attendee/components/interpreter-tag/index.js +0 -1
- package/lib/modules/participant/components/participants/components/render-user/components/attendee/index.js +0 -2
- package/lib/modules/participant/index.js +1 -4
- package/lib/modules/participant/member-list-data-source.js +0 -3
- package/lib/modules/participant/store.js +81 -86
- package/lib/modules/pc-audio-connect/index.js +1 -2
- package/lib/modules/pc-audio-connect/store.js +9 -10
- package/lib/modules/phone-audio-connect/components/callinfo/index.js +2 -1
- package/lib/modules/phone-audio-connect/index.js +1 -2
- package/lib/modules/phone-audio-connect/store.js +0 -3
- package/lib/modules/phone-audio-connect/view.js +5 -4
- package/lib/modules/setting/audio-settings/audio-settings.js +1 -4
- package/lib/modules/setting/general-settings/general-settings.js +1 -2
- package/lib/modules/setting/index.js +1 -2
- package/lib/modules/setting/minutes-settings/minutes-settings.js +1 -2
- package/lib/modules/setting/state/index.js +0 -4
- package/lib/modules/setting/storage-settings/storage-settings.js +4 -4
- package/lib/modules/setting/store.js +11 -15
- package/lib/modules/setting/translate-settings/translate-settings.js +1 -1
- package/lib/modules/setting/video-settings/video-settings.js +1 -2
- package/lib/modules/setting/view.js +1 -2
- package/lib/modules/share-screen/components/selection/index.js +16 -9
- package/lib/modules/share-screen/index.d.ts +2 -0
- package/lib/modules/share-screen/index.js +3 -3
- package/lib/modules/share-screen/store.d.ts +9 -2
- package/lib/modules/share-screen/store.js +97 -93
- package/lib/modules/state-bar/index.js +1 -2
- package/lib/modules/state-bar/layout-config.js +2 -1
- package/lib/modules/state-bar/live-streaming-state.js +0 -3
- package/lib/modules/state-bar/store.js +0 -1
- package/lib/modules/video-window/components/members/index.js +2 -1
- package/lib/modules/video-window/components/topControl/index.js +0 -3
- package/lib/modules/video-window/index.js +1 -2
- package/lib/modules/video-window/store.js +0 -4
- package/lib/modules/waiting-room-layout/index.js +1 -2
- package/lib/modules/whiteboard/components/control-bar/store.js +0 -1
- package/lib/modules/whiteboard/components/switch-theme/index.js +0 -2
- package/lib/modules/whiteboard/components/switch-theme/item.js +2 -1
- package/lib/modules/whiteboard/components/toolbar/components/color-picker/components/panel.js +2 -1
- package/lib/modules/whiteboard/components/toolbar/components/color-picker/index.js +2 -1
- package/lib/modules/whiteboard/components/toolbar/components/expansion/index.js +1 -4
- package/lib/modules/whiteboard/components/toolbar/components/extra-tool-picker.js +2 -3
- package/lib/modules/whiteboard/components/toolbar/components/move-handle.js +0 -2
- package/lib/modules/whiteboard/components/toolbar/components/pen-picker.js +1 -2
- package/lib/modules/whiteboard/components/toolbar/components/shape-picker.js +1 -3
- package/lib/modules/whiteboard/components/toolbar/hooks/index.js +2 -4
- package/lib/modules/whiteboard/components/toolbar/index.js +1 -1
- package/lib/modules/whiteboard/components/toolbar/store.js +12 -11
- package/lib/modules/whiteboard/index.js +2 -6
- package/lib/modules/whiteboard/style.css +12 -0
- package/lib/modules/whiteboard/view.js +2 -0
- package/lib/modules/widget/index.js +1 -2
- package/lib/modules/widget/web-widget.js +1 -1
- package/lib/plugins/browser-runtime-plugin.js +1 -1
- package/lib/plugins/module-dev-plugin.js +13 -13
- package/lib/providers/ability-provider.d.ts +12 -1
- package/lib/providers/ability-provider.js +8 -1
- package/lib/providers/annotation-provider.js +7 -11
- package/lib/providers/device-privilege-provider.js +81 -83
- package/lib/providers/device-provider.js +193 -198
- package/lib/providers/device-stream-provider.js +24 -27
- package/lib/providers/event-provider.js +0 -2
- package/lib/providers/interpreter-provider.js +195 -197
- package/lib/providers/message-provider.js +0 -2
- package/lib/providers/phone-audio-provider.js +17 -19
- package/lib/providers/privilege-provider.js +53 -58
- package/lib/providers/renderer-provider.d.ts +3 -1
- package/lib/providers/renderer-provider.js +18 -4
- package/lib/providers/room-provider.js +31 -33
- package/lib/providers/screen-share-provider.d.ts +1 -0
- package/lib/providers/screen-share-provider.js +66 -65
- package/lib/providers/sharing-provider.js +2 -1
- package/lib/providers/user-setting-storage-provider.js +0 -2
- package/lib/providers/widget-provider.js +0 -1
- package/lib/scenes/main-scene.js +11 -13
- package/lib/scenes/waiting-scene.js +3 -3
- package/lib/shared-data-source/chat-data.js +0 -2
- package/lib/shared-data-source/interpreter.js +0 -2
- package/lib/shared-data-source/layout-data.js +1 -4
- package/lib/shared-data-source/member-data.js +0 -4
- package/lib/shared-data-source/pin-data.js +0 -1
- package/lib/shared-data-source/screen-share-data.d.ts +2 -2
- package/lib/shared-data-source/screen-share-data.js +1 -2
- package/lib/shared-data-source/security-data.js +0 -1
- package/lib/shared-data-source/setting.js +0 -2
- package/lib/shared-data-source/video-window.js +26 -30
- package/lib/shared-data-source/waiting-room.js +0 -2
- package/lib/type.js +14 -0
- package/lib/ui-scene.js +7 -8
- package/lib/utilities/constant.js +7 -0
- package/lib/utilities/copyText.js +12 -12
- package/lib/utilities/hooks.js +1 -2
- package/lib/utilities/logger.js +0 -1
- package/lib/utilities/parameters.js +2 -2
- package/lib/utilities/privilege.js +0 -3
- package/lib/utilities/renderer-event.js +0 -2
- package/lib/utilities/setting-config-storage.d.ts +2 -0
- package/lib/utilities/setting-config-storage.js +24 -4
- package/lib/utilities/tools.js +6 -10
- package/lib/waiting-room-control-manager.js +26 -28
- package/package.json +5 -5
|
@@ -35,10 +35,6 @@ require("core-js/modules/es.object.values.js");
|
|
|
35
35
|
require("core-js/modules/es.string.includes.js");
|
|
36
36
|
require("core-js/modules/es.string.iterator.js");
|
|
37
37
|
require("core-js/modules/es.weak-map.js");
|
|
38
|
-
require("core-js/modules/esnext.async-iterator.find.js");
|
|
39
|
-
require("core-js/modules/esnext.async-iterator.for-each.js");
|
|
40
|
-
require("core-js/modules/esnext.async-iterator.reduce.js");
|
|
41
|
-
require("core-js/modules/esnext.async-iterator.some.js");
|
|
42
38
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
43
39
|
require("core-js/modules/esnext.iterator.find.js");
|
|
44
40
|
require("core-js/modules/esnext.iterator.for-each.js");
|
|
@@ -1061,15 +1057,15 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1061
1057
|
var _setEnableWaitingRoom = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(enable, isNeedShowDialog) {
|
|
1062
1058
|
var _this4 = this;
|
|
1063
1059
|
var dialogId;
|
|
1064
|
-
return _regenerator["default"].wrap(function
|
|
1060
|
+
return _regenerator["default"].wrap(function (_context) {
|
|
1065
1061
|
while (1) switch (_context.prev = _context.next) {
|
|
1066
1062
|
case 0:
|
|
1067
1063
|
if (enable) {
|
|
1068
|
-
_context.next =
|
|
1064
|
+
_context.next = 4;
|
|
1069
1065
|
break;
|
|
1070
1066
|
}
|
|
1071
1067
|
if (!(this._sharedWaitingRoomDataSource.totalWaitingRoomUser && isNeedShowDialog)) {
|
|
1072
|
-
_context.next =
|
|
1068
|
+
_context.next = 1;
|
|
1073
1069
|
break;
|
|
1074
1070
|
}
|
|
1075
1071
|
dialogId = this._dialogProvider.openConfirmDialog({
|
|
@@ -1095,28 +1091,28 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1095
1091
|
},
|
|
1096
1092
|
alignCenter: true
|
|
1097
1093
|
});
|
|
1098
|
-
_context.next =
|
|
1094
|
+
_context.next = 3;
|
|
1099
1095
|
break;
|
|
1100
|
-
case
|
|
1101
|
-
_context.next =
|
|
1096
|
+
case 1:
|
|
1097
|
+
_context.next = 2;
|
|
1102
1098
|
return this._roomControl.enableWaitingRoom(enable);
|
|
1103
|
-
case
|
|
1099
|
+
case 2:
|
|
1104
1100
|
this._messageProvider.showToast({
|
|
1105
1101
|
type: 'normal',
|
|
1106
1102
|
message: (0, _i18n.transI18n)('fmt_waitingroom_mobile_setting_tips_disable')
|
|
1107
1103
|
});
|
|
1108
|
-
case
|
|
1109
|
-
_context.next =
|
|
1104
|
+
case 3:
|
|
1105
|
+
_context.next = 6;
|
|
1110
1106
|
break;
|
|
1111
|
-
case
|
|
1112
|
-
_context.next =
|
|
1107
|
+
case 4:
|
|
1108
|
+
_context.next = 5;
|
|
1113
1109
|
return this._roomControl.enableWaitingRoom(enable);
|
|
1114
|
-
case
|
|
1110
|
+
case 5:
|
|
1115
1111
|
this._messageProvider.showToast({
|
|
1116
1112
|
type: 'normal',
|
|
1117
1113
|
message: (0, _i18n.transI18n)('fmt_waitingroom_setting_tips_enable')
|
|
1118
1114
|
});
|
|
1119
|
-
case
|
|
1115
|
+
case 6:
|
|
1120
1116
|
case "end":
|
|
1121
1117
|
return _context.stop();
|
|
1122
1118
|
}
|
|
@@ -1132,12 +1128,12 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1132
1128
|
value: function () {
|
|
1133
1129
|
var _kickOutWaitingRoomAllMember = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(type) {
|
|
1134
1130
|
var _this$_userControl;
|
|
1135
|
-
return _regenerator["default"].wrap(function
|
|
1131
|
+
return _regenerator["default"].wrap(function (_context2) {
|
|
1136
1132
|
while (1) switch (_context2.prev = _context2.next) {
|
|
1137
1133
|
case 0:
|
|
1138
|
-
_context2.next =
|
|
1134
|
+
_context2.next = 1;
|
|
1139
1135
|
return (_this$_userControl = this._userControl) === null || _this$_userControl === void 0 ? void 0 : _this$_userControl.kickOutByUserRoles([_type.FcrUserRole.PARTICIPANT], type);
|
|
1140
|
-
case
|
|
1136
|
+
case 1:
|
|
1141
1137
|
case "end":
|
|
1142
1138
|
return _context2.stop();
|
|
1143
1139
|
}
|
|
@@ -1153,12 +1149,12 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1153
1149
|
value: function () {
|
|
1154
1150
|
var _moveToMainRoomAllMember = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3() {
|
|
1155
1151
|
var _this$_waitingRoomCon;
|
|
1156
|
-
return _regenerator["default"].wrap(function
|
|
1152
|
+
return _regenerator["default"].wrap(function (_context3) {
|
|
1157
1153
|
while (1) switch (_context3.prev = _context3.next) {
|
|
1158
1154
|
case 0:
|
|
1159
|
-
_context3.next =
|
|
1155
|
+
_context3.next = 1;
|
|
1160
1156
|
return (_this$_waitingRoomCon = this._waitingRoomControl) === null || _this$_waitingRoomCon === void 0 ? void 0 : _this$_waitingRoomCon.moveToMainRoomByUserRoles([_type.FcrUserRole.PARTICIPANT]);
|
|
1161
|
-
case
|
|
1157
|
+
case 1:
|
|
1162
1158
|
case "end":
|
|
1163
1159
|
return _context3.stop();
|
|
1164
1160
|
}
|
|
@@ -1380,19 +1376,19 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1380
1376
|
key: "_operateWaitingRoom",
|
|
1381
1377
|
value: function () {
|
|
1382
1378
|
var _operateWaitingRoom2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(isOperate) {
|
|
1383
|
-
return _regenerator["default"].wrap(function
|
|
1379
|
+
return _regenerator["default"].wrap(function (_context4) {
|
|
1384
1380
|
while (1) switch (_context4.prev = _context4.next) {
|
|
1385
1381
|
case 0:
|
|
1386
1382
|
if (!isOperate) {
|
|
1387
|
-
_context4.next =
|
|
1383
|
+
_context4.next = 1;
|
|
1388
1384
|
break;
|
|
1389
1385
|
}
|
|
1390
|
-
_context4.next =
|
|
1386
|
+
_context4.next = 1;
|
|
1391
1387
|
return this.moveToMainRoomAllMember();
|
|
1392
|
-
case
|
|
1393
|
-
_context4.next =
|
|
1388
|
+
case 1:
|
|
1389
|
+
_context4.next = 2;
|
|
1394
1390
|
return this.setEnableWaitingRoom(false, false);
|
|
1395
|
-
case
|
|
1391
|
+
case 2:
|
|
1396
1392
|
case "end":
|
|
1397
1393
|
return _context4.stop();
|
|
1398
1394
|
}
|
|
@@ -1414,10 +1410,10 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1414
1410
|
var _setOutputLanguage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(language) {
|
|
1415
1411
|
var _this$_interpreterPro2,
|
|
1416
1412
|
_this7 = this;
|
|
1417
|
-
return _regenerator["default"].wrap(function
|
|
1413
|
+
return _regenerator["default"].wrap(function (_context5) {
|
|
1418
1414
|
while (1) switch (_context5.prev = _context5.next) {
|
|
1419
1415
|
case 0:
|
|
1420
|
-
_context5.next =
|
|
1416
|
+
_context5.next = 1;
|
|
1421
1417
|
return (_this$_interpreterPro2 = this._interpreterProvider) === null || _this$_interpreterPro2 === void 0 ? void 0 : _this$_interpreterPro2.setOutputLanguage(language, function () {
|
|
1422
1418
|
if (!_this7._deviceProvider.microphoneEnabled) {
|
|
1423
1419
|
_this7._messageProvider.showToast({
|
|
@@ -1426,7 +1422,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1426
1422
|
});
|
|
1427
1423
|
}
|
|
1428
1424
|
});
|
|
1429
|
-
case
|
|
1425
|
+
case 1:
|
|
1430
1426
|
case "end":
|
|
1431
1427
|
return _context5.stop();
|
|
1432
1428
|
}
|
|
@@ -1442,12 +1438,12 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1442
1438
|
value: function () {
|
|
1443
1439
|
var _subscribeLanguage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee6(language) {
|
|
1444
1440
|
var _this$_interpreterPro3;
|
|
1445
|
-
return _regenerator["default"].wrap(function
|
|
1441
|
+
return _regenerator["default"].wrap(function (_context6) {
|
|
1446
1442
|
while (1) switch (_context6.prev = _context6.next) {
|
|
1447
1443
|
case 0:
|
|
1448
|
-
_context6.next =
|
|
1444
|
+
_context6.next = 1;
|
|
1449
1445
|
return (_this$_interpreterPro3 = this._interpreterProvider) === null || _this$_interpreterPro3 === void 0 ? void 0 : _this$_interpreterPro3.subscribeLanguage(language);
|
|
1450
|
-
case
|
|
1446
|
+
case 1:
|
|
1451
1447
|
case "end":
|
|
1452
1448
|
return _context6.stop();
|
|
1453
1449
|
}
|
|
@@ -1463,7 +1459,7 @@ var ActionBarStore = exports["default"] = /*#__PURE__*/function () {
|
|
|
1463
1459
|
value: function () {
|
|
1464
1460
|
var _subscribeExtraOriginLanguage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee7(enable) {
|
|
1465
1461
|
var _this$_interpreterPro4;
|
|
1466
|
-
return _regenerator["default"].wrap(function
|
|
1462
|
+
return _regenerator["default"].wrap(function (_context7) {
|
|
1467
1463
|
while (1) switch (_context7.prev = _context7.next) {
|
|
1468
1464
|
case 0:
|
|
1469
1465
|
(_this$_interpreterPro4 = this._interpreterProvider) === null || _this$_interpreterPro4 === void 0 || _this$_interpreterPro4.subscribeExtraOriginLanguage(enable);
|
|
@@ -28,7 +28,8 @@ var FcrAnnotationControlBar = (0, _mobxReact.observer)(function () {
|
|
|
28
28
|
allowAnnotationWriteState = _useContext.allowAnnotationWriteState,
|
|
29
29
|
setToolsShow = _useContext.setToolsShow,
|
|
30
30
|
isShowToolbar = _useContext.isShowToolbar,
|
|
31
|
-
annotationHasStart = _useContext.annotationHasStart
|
|
31
|
+
annotationHasStart = _useContext.annotationHasStart,
|
|
32
|
+
isAnnotationSupported = _useContext.isAnnotationSupported;
|
|
32
33
|
var transI18n = (0, _i18n.useI18n)();
|
|
33
34
|
var isMinimum = false;
|
|
34
35
|
var isMaxmum = false;
|
|
@@ -112,7 +113,7 @@ var FcrAnnotationControlBar = (0, _mobxReact.observer)(function () {
|
|
|
112
113
|
})]
|
|
113
114
|
}), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
114
115
|
className: "whiteboard-controlbar-right",
|
|
115
|
-
children: annotationHasStart && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
|
|
116
|
+
children: isAnnotationSupported() && annotationHasStart && /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.FcrToolTip, {
|
|
116
117
|
content: allowAnnotationWriteState ? transI18n('fmt_screenshare_toast_host_enabled_annotations') : transI18n('fmt_screenshare_toast_host_disabled_annotations'),
|
|
117
118
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
118
119
|
className: (0, _classnames["default"])('whiteboard-controlbar-item', 'annotation-control-bar-without-exit', {
|
package/lib/modules/annotation/components/toolbar/components/color-tool/color-panel/index.js
CHANGED
|
@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.AnnotationColorPanel = void 0;
|
|
8
8
|
require("core-js/modules/es.array.map.js");
|
|
9
|
-
require("core-js/modules/
|
|
9
|
+
require("core-js/modules/es.object.to-string.js");
|
|
10
|
+
require("core-js/modules/esnext.iterator.constructor.js");
|
|
10
11
|
require("core-js/modules/esnext.iterator.map.js");
|
|
11
12
|
var _type = require("agora-ui-foundation/lib/components/icon/type");
|
|
12
13
|
var _item = require("../../item/item");
|
package/lib/modules/annotation/components/toolbar/components/graphic-tool/graphic-panel/index.js
CHANGED
|
@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.AnnotationGraphicPanel = void 0;
|
|
8
8
|
require("core-js/modules/es.array.map.js");
|
|
9
|
-
require("core-js/modules/
|
|
9
|
+
require("core-js/modules/es.object.to-string.js");
|
|
10
|
+
require("core-js/modules/esnext.iterator.constructor.js");
|
|
10
11
|
require("core-js/modules/esnext.iterator.map.js");
|
|
11
12
|
var _item = require("../../item/item");
|
|
12
13
|
var _panel = require("../../panel");
|
|
@@ -9,8 +9,6 @@ exports.AnnotationGraphicTool = void 0;
|
|
|
9
9
|
require("core-js/modules/es.array.find.js");
|
|
10
10
|
require("core-js/modules/es.array.some.js");
|
|
11
11
|
require("core-js/modules/es.object.to-string.js");
|
|
12
|
-
require("core-js/modules/esnext.async-iterator.find.js");
|
|
13
|
-
require("core-js/modules/esnext.async-iterator.some.js");
|
|
14
12
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
15
13
|
require("core-js/modules/esnext.iterator.find.js");
|
|
16
14
|
require("core-js/modules/esnext.iterator.some.js");
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
});
|
|
7
7
|
exports.AnnotationPenPanel = void 0;
|
|
8
8
|
require("core-js/modules/es.array.map.js");
|
|
9
|
+
require("core-js/modules/es.object.to-string.js");
|
|
9
10
|
var _type = require("agora-ui-foundation/lib/components/icon/type");
|
|
10
11
|
var _item = require("../../item/item");
|
|
11
12
|
var _panel = require("../../panel");
|
|
@@ -42,7 +42,6 @@ require("core-js/modules/es.array.push.js");
|
|
|
42
42
|
require("core-js/modules/es.object.to-string.js");
|
|
43
43
|
require("core-js/modules/es.string.iterator.js");
|
|
44
44
|
require("core-js/modules/es.weak-map.js");
|
|
45
|
-
require("core-js/modules/esnext.async-iterator.for-each.js");
|
|
46
45
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
47
46
|
require("core-js/modules/esnext.iterator.for-each.js");
|
|
48
47
|
require("core-js/modules/esnext.weak-map.delete-all.js");
|
|
@@ -12,6 +12,7 @@ import { FcrUIAction } from '../../utilities/constant';
|
|
|
12
12
|
import { FcrUIMessageProvider } from '../../providers/message-provider';
|
|
13
13
|
import { FcrUILocalStorageProvider } from '../../providers/local-storage-provider';
|
|
14
14
|
import { FcrUIEventProvider } from '../../providers/event-provider';
|
|
15
|
+
import { FcrUIAbilityProvider } from '../../providers/ability-provider';
|
|
15
16
|
export declare class AnnotationUIModule extends UIModule {
|
|
16
17
|
private _toolbarStore?;
|
|
17
18
|
private _store?;
|
|
@@ -27,6 +28,7 @@ export declare class AnnotationUIModule extends UIModule {
|
|
|
27
28
|
messageProvider: FcrUIMessageProvider;
|
|
28
29
|
localStorageProvider: FcrUILocalStorageProvider;
|
|
29
30
|
eventProvider: FcrUIEventProvider;
|
|
31
|
+
abilityProvider?: FcrUIAbilityProvider;
|
|
30
32
|
onNodeWillActive(): void;
|
|
31
33
|
onNodeReceivedEvent(event: FcrUINodeEvent): void;
|
|
32
34
|
onNodeWillInactive(): void;
|
|
@@ -98,7 +98,8 @@ var AnnotationUIModule = exports.AnnotationUIModule = /*#__PURE__*/function (_UI
|
|
|
98
98
|
privilegeProvider: this.privilegeProvider,
|
|
99
99
|
messageProvider: this.messageProvider,
|
|
100
100
|
localStorageProvider: this.localStorageProvider,
|
|
101
|
-
eventProvider: this.eventProvider
|
|
101
|
+
eventProvider: this.eventProvider,
|
|
102
|
+
abilityProvider: this.abilityProvider
|
|
102
103
|
});
|
|
103
104
|
}
|
|
104
105
|
}, {
|
|
@@ -4,7 +4,6 @@ import { FcrUIAnnotationProvider } from '../../providers/annotation-provider';
|
|
|
4
4
|
import { FcrUISharingProvider } from '../../providers/sharing-provider';
|
|
5
5
|
import { FcrBaseRoomControl } from 'fcr-core';
|
|
6
6
|
import { FcrUIMemberSharedDataSource } from '../../shared-data-source/member-data';
|
|
7
|
-
import { FcrBoardMainWindow } from 'fcr-core/lib/room-control/whiteboard-control/types';
|
|
8
7
|
import { ToolbarStore } from '../whiteboard/components/toolbar/store';
|
|
9
8
|
import { FcrUISecuritySharedDataSource } from '../../shared-data-source/security-data';
|
|
10
9
|
import { FcrUIScreenShareSharedDataSource } from '../../shared-data-source/screen-share-data';
|
|
@@ -12,6 +11,7 @@ import { FcrUIPrivilegeProvider } from '../../providers/privilege-provider';
|
|
|
12
11
|
import { FcrUIMessageProvider } from '../../providers/message-provider';
|
|
13
12
|
import { FcrUILocalStorageProvider } from '../../providers/local-storage-provider';
|
|
14
13
|
import { FcrUIEventProvider } from '../../providers/event-provider';
|
|
14
|
+
import { FcrUIAbilityProvider } from '../../providers/ability-provider';
|
|
15
15
|
export declare class AnnotationStore {
|
|
16
16
|
protected logger: import("agora-foundation/lib/logger").Logger;
|
|
17
17
|
private _disposers;
|
|
@@ -27,9 +27,9 @@ export declare class AnnotationStore {
|
|
|
27
27
|
private _messageProvider;
|
|
28
28
|
private _resizeWatcherTimer;
|
|
29
29
|
private _eventProvider;
|
|
30
|
+
private _abilityProvider;
|
|
30
31
|
private _currentShareInfo;
|
|
31
32
|
private _dialogObserver;
|
|
32
|
-
accessor annotationMainWindow: FcrBoardMainWindow | undefined;
|
|
33
33
|
accessor resetToolbarStore: boolean;
|
|
34
34
|
accessor isShowToolbar: boolean;
|
|
35
35
|
private _boardDom?;
|
|
@@ -55,7 +55,7 @@ export declare class AnnotationStore {
|
|
|
55
55
|
get allowAnnotationWriteState(): boolean;
|
|
56
56
|
get isReplaceScreen(): boolean;
|
|
57
57
|
get isSeizeStream(): boolean;
|
|
58
|
-
constructor({ dialogProvider, deviceProvider, annotationProvider, sharingProvider, memberDataSource, roomControl, sharedSecuritySharedDataSource, sharedScreenSharedDataSource, privilegeProvider, messageProvider, localStorageProvider, eventProvider, }: {
|
|
58
|
+
constructor({ dialogProvider, deviceProvider, annotationProvider, sharingProvider, memberDataSource, roomControl, sharedSecuritySharedDataSource, sharedScreenSharedDataSource, privilegeProvider, messageProvider, localStorageProvider, eventProvider, abilityProvider, }: {
|
|
59
59
|
dialogProvider: FcrUIDialogProvider;
|
|
60
60
|
deviceProvider: FcrUIDeviceProvider;
|
|
61
61
|
annotationProvider: FcrUIAnnotationProvider;
|
|
@@ -68,7 +68,9 @@ export declare class AnnotationStore {
|
|
|
68
68
|
messageProvider: FcrUIMessageProvider;
|
|
69
69
|
localStorageProvider: FcrUILocalStorageProvider;
|
|
70
70
|
eventProvider: FcrUIEventProvider;
|
|
71
|
+
abilityProvider: FcrUIAbilityProvider;
|
|
71
72
|
});
|
|
73
|
+
isAnnotationSupported(): boolean;
|
|
72
74
|
getToolbarStore(): ToolbarStore | undefined;
|
|
73
75
|
get currentTool(): import("fcr-core/lib/room-control/whiteboard-control/enums").FcrBoardToolType | undefined;
|
|
74
76
|
setToolsShow(): void;
|
|
@@ -57,11 +57,8 @@ require("core-js/modules/es.regexp.exec.js");
|
|
|
57
57
|
require("core-js/modules/es.regexp.sticky.js");
|
|
58
58
|
require("core-js/modules/es.regexp.test.js");
|
|
59
59
|
require("core-js/modules/es.regexp.to-string.js");
|
|
60
|
-
require("core-js/modules/es.string.includes.js");
|
|
61
60
|
require("core-js/modules/es.string.iterator.js");
|
|
62
61
|
require("core-js/modules/es.weak-map.js");
|
|
63
|
-
require("core-js/modules/esnext.async-iterator.find.js");
|
|
64
|
-
require("core-js/modules/esnext.async-iterator.for-each.js");
|
|
65
62
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
66
63
|
require("core-js/modules/esnext.iterator.find.js");
|
|
67
64
|
require("core-js/modules/esnext.iterator.for-each.js");
|
|
@@ -91,7 +88,7 @@ var _isNumber = _interopRequireDefault(require("lodash/isNumber"));
|
|
|
91
88
|
var _env = require("agora-foundation/lib/utilities/env");
|
|
92
89
|
var _type3 = require("../whiteboard/type");
|
|
93
90
|
var _AnnotationStore;
|
|
94
|
-
var _initProto,
|
|
91
|
+
var _initProto, _init_resetToolbarStore, _init_isShowToolbar, _setToolsShowDecs, _zoomInDecs, _zoomOutDecs, _fullContainerDecs, _setOriginScalcDecs, _drawReceiverBoardDecs, _handleBoardDomLoadDecs, _handleBoardContainerDomLoadDecs, _annotationEndedDecs, _mountDecs, _unmountDecs, _ref;
|
|
95
92
|
function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
|
|
96
93
|
function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
|
|
97
94
|
function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
|
|
@@ -107,7 +104,6 @@ function _setFunctionName(e, t, n) { "symbol" == _typeof(t) && (t = (t = t.descr
|
|
|
107
104
|
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; }
|
|
108
105
|
var _A = /*#__PURE__*/new WeakMap();
|
|
109
106
|
var _B = /*#__PURE__*/new WeakMap();
|
|
110
|
-
var _C = /*#__PURE__*/new WeakMap();
|
|
111
107
|
_ref = (_setToolsShowDecs = [_mobx.action, _mobx.action.bound], _zoomInDecs = [_mobx.action, _mobx.action.bound], _zoomOutDecs = [_mobx.action, _mobx.action.bound], _fullContainerDecs = [_mobx.action, _mobx.action.bound], _setOriginScalcDecs = [_mobx.action, _mobx.action.bound], _drawReceiverBoardDecs = [_mobx.action, _mobx.action.bound], _handleBoardDomLoadDecs = [_mobx.action, _mobx.action.bound], _handleBoardContainerDomLoadDecs = [_mobx.action, _mobx.action.bound], _annotationEndedDecs = [_mobx.action, _mobx.action.bound], _mountDecs = [_mobx.action, _mobx.action.bound], _unmountDecs = [_mobx.action, _mobx.action.bound], "logger");
|
|
112
108
|
var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
113
109
|
function AnnotationStore(_ref2) {
|
|
@@ -123,7 +119,8 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
123
119
|
privilegeProvider = _ref2.privilegeProvider,
|
|
124
120
|
messageProvider = _ref2.messageProvider,
|
|
125
121
|
localStorageProvider = _ref2.localStorageProvider,
|
|
126
|
-
eventProvider = _ref2.eventProvider
|
|
122
|
+
eventProvider = _ref2.eventProvider,
|
|
123
|
+
abilityProvider = _ref2.abilityProvider;
|
|
127
124
|
(0, _classCallCheck2["default"])(this, AnnotationStore);
|
|
128
125
|
(0, _defineProperty2["default"])(this, _ref, (_initProto(this), (0, _logger.createLogger)({
|
|
129
126
|
prefix: 'AnnotationStore'
|
|
@@ -151,9 +148,8 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
151
148
|
}
|
|
152
149
|
}
|
|
153
150
|
});
|
|
154
|
-
_classPrivateFieldInitSpec(this, _A,
|
|
155
|
-
_classPrivateFieldInitSpec(this, _B,
|
|
156
|
-
_classPrivateFieldInitSpec(this, _C, _init_isShowToolbar(this, false));
|
|
151
|
+
_classPrivateFieldInitSpec(this, _A, _init_resetToolbarStore(this, false));
|
|
152
|
+
_classPrivateFieldInitSpec(this, _B, _init_isShowToolbar(this, false));
|
|
157
153
|
(0, _defineProperty2["default"])(this, "_toolbarStore", undefined);
|
|
158
154
|
(0, _defineProperty2["default"])(this, "_boardOriginWidth", 0);
|
|
159
155
|
(0, _defineProperty2["default"])(this, "_mounted", false);
|
|
@@ -191,6 +187,7 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
191
187
|
this._privilegeProvider = privilegeProvider;
|
|
192
188
|
this._messageProvider = messageProvider;
|
|
193
189
|
this._eventProvider = eventProvider;
|
|
190
|
+
this._abilityProvider = abilityProvider;
|
|
194
191
|
this._disposers.push((0, _mobx.reaction)(function () {
|
|
195
192
|
return _this.annotating;
|
|
196
193
|
}, function (annotating) {
|
|
@@ -247,14 +244,14 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
247
244
|
return _this.isReplaceScreen;
|
|
248
245
|
}, /*#__PURE__*/function () {
|
|
249
246
|
var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(isReplaceScreen) {
|
|
250
|
-
return _regenerator["default"].wrap(function
|
|
247
|
+
return _regenerator["default"].wrap(function (_context) {
|
|
251
248
|
while (1) switch (_context.prev = _context.next) {
|
|
252
249
|
case 0:
|
|
253
250
|
if (!(isReplaceScreen && (0, _env.isElectron)())) {
|
|
254
|
-
_context.next =
|
|
251
|
+
_context.next = 2;
|
|
255
252
|
break;
|
|
256
253
|
}
|
|
257
|
-
_context.next =
|
|
254
|
+
_context.next = 1;
|
|
258
255
|
return new Promise(function (resolve) {
|
|
259
256
|
// 延迟两秒,等待标注内容清理,清理方法在 sdk 中虽然看起来是同步的,但是实际上会有无法清理的情况出现
|
|
260
257
|
(0, _rendererEvent.sendEvent)({
|
|
@@ -265,14 +262,14 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
265
262
|
return resolve(true);
|
|
266
263
|
}, 2000);
|
|
267
264
|
});
|
|
268
|
-
case
|
|
265
|
+
case 1:
|
|
269
266
|
_this.logger.info("[Annotation]: isReplaceScreen changed to ".concat(isReplaceScreen, ", currentShareInfo is ").concat(JSON.stringify(_this._currentShareInfo)));
|
|
270
267
|
_this._removeWindowResizeListenner();
|
|
271
268
|
_this._annotationProvider.hideAnnotationWindow();
|
|
272
269
|
_this._annotationProvider.setBoundsToAnnotationWindow();
|
|
273
270
|
setTimeout(_this.screenSharingStarted);
|
|
274
271
|
_this._sharedScreenSharedDataSource.setIsReplaceScreen(false);
|
|
275
|
-
case
|
|
272
|
+
case 2:
|
|
276
273
|
case "end":
|
|
277
274
|
return _context.stop();
|
|
278
275
|
}
|
|
@@ -285,15 +282,13 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
285
282
|
return _this._annotationProvider.annotationState;
|
|
286
283
|
}, function (state) {
|
|
287
284
|
_this.logger.info('annotation transaction state: ', state);
|
|
288
|
-
if (
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
_this._annotationEnded();
|
|
296
|
-
}
|
|
285
|
+
if (state === _annotationProvider.FcrAnnotationState.START) {
|
|
286
|
+
_this.logger.info('annotation transaction start');
|
|
287
|
+
_this._annotationControl = _this._annotationProvider.annotationControl;
|
|
288
|
+
_this._toolbarStore = new _store.ToolbarStore(_this._annotationControl, _this._roomControl, _this._annotationProvider, eventProvider);
|
|
289
|
+
_this.resetToolbarStore = true;
|
|
290
|
+
} else {
|
|
291
|
+
_this._annotationEnded();
|
|
297
292
|
}
|
|
298
293
|
}), (0, _mobx.reaction)(function () {
|
|
299
294
|
return _this._sharedScreenSharedDataSource.screenSharingState;
|
|
@@ -326,7 +321,7 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
326
321
|
}));
|
|
327
322
|
}
|
|
328
323
|
return (0, _createClass2["default"])(AnnotationStore, [{
|
|
329
|
-
key: "
|
|
324
|
+
key: "resetToolbarStore",
|
|
330
325
|
get: function get() {
|
|
331
326
|
return _classPrivateFieldGet(_A, this);
|
|
332
327
|
},
|
|
@@ -334,21 +329,13 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
334
329
|
_classPrivateFieldSet(_A, this, v);
|
|
335
330
|
}
|
|
336
331
|
}, {
|
|
337
|
-
key: "
|
|
332
|
+
key: "isShowToolbar",
|
|
338
333
|
get: function get() {
|
|
339
334
|
return _classPrivateFieldGet(_B, this);
|
|
340
335
|
},
|
|
341
336
|
set: function set(v) {
|
|
342
337
|
_classPrivateFieldSet(_B, this, v);
|
|
343
338
|
}
|
|
344
|
-
}, {
|
|
345
|
-
key: "isShowToolbar",
|
|
346
|
-
get: function get() {
|
|
347
|
-
return _classPrivateFieldGet(_C, this);
|
|
348
|
-
},
|
|
349
|
-
set: function set(v) {
|
|
350
|
-
_classPrivateFieldSet(_C, this, v);
|
|
351
|
-
}
|
|
352
339
|
}, {
|
|
353
340
|
key: "hasAnnotationWritePermission",
|
|
354
341
|
get: function get() {
|
|
@@ -430,6 +417,11 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
430
417
|
get: function get() {
|
|
431
418
|
return this._sharedScreenSharedDataSource.isSeizeStream;
|
|
432
419
|
}
|
|
420
|
+
}, {
|
|
421
|
+
key: "isAnnotationSupported",
|
|
422
|
+
value: function isAnnotationSupported() {
|
|
423
|
+
return this._abilityProvider.isAnnotationSupported();
|
|
424
|
+
}
|
|
433
425
|
}, {
|
|
434
426
|
key: "getToolbarStore",
|
|
435
427
|
value: function getToolbarStore() {
|
|
@@ -491,13 +483,13 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
491
483
|
this._boardOriginWidth = newWidth;
|
|
492
484
|
this._boardDom.style.width = "".concat(newWidth, "px");
|
|
493
485
|
this._boardDom.style.height = "".concat(height, "px");
|
|
486
|
+
this.logger.info("[Annotation] [drawReceiverBoard] ratio: ".concat(ratio, ", width: ").concat(newWidth, " , height: ").concat(height));
|
|
494
487
|
}
|
|
495
488
|
}
|
|
496
489
|
}, {
|
|
497
490
|
key: "handleBoardDomLoad",
|
|
498
491
|
value: function handleBoardDomLoad(ref) {
|
|
499
492
|
this._boardDom = ref;
|
|
500
|
-
this.logger.info('handleBoardDomLoad: ', this._boardDom);
|
|
501
493
|
if (this._boardDom) {
|
|
502
494
|
var _this$_boardDom$getBo = this._boardDom.getBoundingClientRect(),
|
|
503
495
|
height = _this$_boardDom$getBo.height;
|
|
@@ -542,15 +534,16 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
542
534
|
}, {
|
|
543
535
|
key: "_annotationEnded",
|
|
544
536
|
value: function _annotationEnded() {
|
|
545
|
-
var _this$_toolbarStore3;
|
|
537
|
+
var _this$_annotationProv, _this$_toolbarStore3;
|
|
546
538
|
this.logger.info('[Annotation]: annotation transaction end');
|
|
547
|
-
(_this$_toolbarStore3 = this._toolbarStore) === null || _this$_toolbarStore3 === void 0 || _this$_toolbarStore3.resetToolbarVars();
|
|
548
|
-
this.resetToolbarStore = false;
|
|
549
|
-
this._boardContainerObserver.disconnect();
|
|
550
539
|
this._messageProvider.showToast({
|
|
551
540
|
message: (0, _i18n.transI18n)('fmt_screenshare_toast_annotation_controls_screen_sharing_disabled'),
|
|
552
541
|
type: 'info'
|
|
553
542
|
});
|
|
543
|
+
(_this$_annotationProv = this._annotationProvider.boardMainWindow) === null || _this$_annotationProv === void 0 || _this$_annotationProv.clean();
|
|
544
|
+
(_this$_toolbarStore3 = this._toolbarStore) === null || _this$_toolbarStore3 === void 0 || _this$_toolbarStore3.resetToolbarVars();
|
|
545
|
+
this.resetToolbarStore = false;
|
|
546
|
+
this._boardContainerObserver.disconnect();
|
|
554
547
|
this.isShowToolbar = false;
|
|
555
548
|
this._toolbarStore = undefined;
|
|
556
549
|
this._unmount();
|
|
@@ -665,9 +658,8 @@ var AnnotationStore = exports.AnnotationStore = /*#__PURE__*/function () {
|
|
|
665
658
|
}]);
|
|
666
659
|
}();
|
|
667
660
|
_AnnotationStore = AnnotationStore;
|
|
668
|
-
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_AnnotationStore, [[_mobx.observable, 1, "
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
_initProto = _applyDecs$e[3];
|
|
661
|
+
var _applyDecs$e = (0, _slicedToArray2["default"])(_applyDecs(_AnnotationStore, [[_mobx.observable, 1, "resetToolbarStore"], [_mobx.observable, 1, "isShowToolbar"], [_mobx.computed, 3, "scalcValue"], [_mobx.computed, 3, "annotating"], [_decorator.bound, 2, "isAnnotationSupported"], [_decorator.bound, 2, "getToolbarStore"], [_setToolsShowDecs, 18, "setToolsShow"], [_zoomInDecs, 18, "zoomIn"], [_zoomOutDecs, 18, "zoomOut"], [_fullContainerDecs, 18, "fullContainer"], [_setOriginScalcDecs, 18, "setOriginScalc"], [_drawReceiverBoardDecs, 18, "drawReceiverBoard"], [_handleBoardDomLoadDecs, 18, "handleBoardDomLoad"], [_handleBoardContainerDomLoadDecs, 18, "handleBoardContainerDomLoad"], [_decorator.bound, 2, "screenSharingStarted"], [_decorator.bound, 2, "release"], [_annotationEndedDecs, 18, "_annotationEnded"], [_mountDecs, 18, "_mount"], [_unmountDecs, 18, "_unmount"], [_decorator.bound, 2, "_close"], [_decorator.bound, 2, "_updateAnnotationBounds"], [_decorator.bound, 2, "_updateBoundsByActiveWindow"], [_decorator.bound, 2, "_addWindowResizeListenner"], [_decorator.bound, 2, "_removeWindowResizeListenner"]], []).e, 3);
|
|
662
|
+
_init_resetToolbarStore = _applyDecs$e[0];
|
|
663
|
+
_init_isShowToolbar = _applyDecs$e[1];
|
|
664
|
+
_initProto = _applyDecs$e[2];
|
|
673
665
|
var AnnotationStoreContext = exports.AnnotationStoreContext = /*#__PURE__*/(0, _react.createContext)({});
|
|
@@ -15,11 +15,7 @@ require("core-js/modules/es.array.iterator.js");
|
|
|
15
15
|
require("core-js/modules/es.array.map.js");
|
|
16
16
|
require("core-js/modules/es.map.js");
|
|
17
17
|
require("core-js/modules/es.object.to-string.js");
|
|
18
|
-
require("core-js/modules/es.string.includes.js");
|
|
19
18
|
require("core-js/modules/es.string.iterator.js");
|
|
20
|
-
require("core-js/modules/esnext.async-iterator.find.js");
|
|
21
|
-
require("core-js/modules/esnext.async-iterator.for-each.js");
|
|
22
|
-
require("core-js/modules/esnext.async-iterator.map.js");
|
|
23
19
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
24
20
|
require("core-js/modules/esnext.iterator.find.js");
|
|
25
21
|
require("core-js/modules/esnext.iterator.for-each.js");
|
|
@@ -41,10 +41,6 @@ require("core-js/modules/es.object.entries.js");
|
|
|
41
41
|
require("core-js/modules/es.object.to-string.js");
|
|
42
42
|
require("core-js/modules/es.string.iterator.js");
|
|
43
43
|
require("core-js/modules/es.weak-map.js");
|
|
44
|
-
require("core-js/modules/esnext.async-iterator.filter.js");
|
|
45
|
-
require("core-js/modules/esnext.async-iterator.find.js");
|
|
46
|
-
require("core-js/modules/esnext.async-iterator.for-each.js");
|
|
47
|
-
require("core-js/modules/esnext.async-iterator.some.js");
|
|
48
44
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
49
45
|
require("core-js/modules/esnext.iterator.filter.js");
|
|
50
46
|
require("core-js/modules/esnext.iterator.find.js");
|
|
@@ -375,15 +371,15 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
|
|
|
375
371
|
var _sendMessage = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(msg, type) {
|
|
376
372
|
var _this$_chatRoomContro;
|
|
377
373
|
var target, isPrivate, message, resp;
|
|
378
|
-
return _regenerator["default"].wrap(function
|
|
374
|
+
return _regenerator["default"].wrap(function (_context) {
|
|
379
375
|
while (1) switch (_context.prev = _context.next) {
|
|
380
376
|
case 0:
|
|
381
377
|
if (!(type === _type.FcrChatRoomMessageType.Image)) {
|
|
382
|
-
_context.next =
|
|
378
|
+
_context.next = 1;
|
|
383
379
|
break;
|
|
384
380
|
}
|
|
385
381
|
return _context.abrupt("return");
|
|
386
|
-
case
|
|
382
|
+
case 1:
|
|
387
383
|
target = this.privateTargetUser;
|
|
388
384
|
isPrivate = target.userId !== _types.USER_ALL;
|
|
389
385
|
message = _objectSpread(_objectSpread({}, type === _type.FcrChatRoomMessageType.Text ? {
|
|
@@ -396,16 +392,16 @@ var ChatRoomStore = exports.ChatRoomStore = /*#__PURE__*/function () {
|
|
|
396
392
|
}, isPrivate ? {
|
|
397
393
|
to: [target.userId]
|
|
398
394
|
} : {});
|
|
399
|
-
_context.next =
|
|
395
|
+
_context.next = 2;
|
|
400
396
|
return (_this$_chatRoomContro = this._chatRoomControl) === null || _this$_chatRoomContro === void 0 ? void 0 : _this$_chatRoomContro.sendMessage(message);
|
|
401
|
-
case
|
|
397
|
+
case 2:
|
|
402
398
|
resp = _context.sent;
|
|
403
399
|
this._handleTextMessageReceived(resp, isPrivate ? target.userName : undefined);
|
|
404
400
|
this.updateReadMsgIndex({
|
|
405
401
|
index: this.messageList.length - 1,
|
|
406
402
|
msgId: resp.id
|
|
407
403
|
});
|
|
408
|
-
case
|
|
404
|
+
case 3:
|
|
409
405
|
case "end":
|
|
410
406
|
return _context.stop();
|
|
411
407
|
}
|
|
@@ -8,7 +8,6 @@ require("core-js/modules/es.object.define-property.js");
|
|
|
8
8
|
require("core-js/modules/es.object.get-own-property-descriptor.js");
|
|
9
9
|
require("core-js/modules/es.object.get-own-property-descriptors.js");
|
|
10
10
|
require("core-js/modules/es.object.keys.js");
|
|
11
|
-
require("core-js/modules/esnext.async-iterator.for-each.js");
|
|
12
11
|
require("core-js/modules/esnext.iterator.for-each.js");
|
|
13
12
|
require("core-js/modules/web.dom-collections.for-each.js");
|
|
14
13
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
@@ -18,7 +17,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
18
17
|
exports.MessageBar = void 0;
|
|
19
18
|
require("core-js/modules/es.array.filter.js");
|
|
20
19
|
require("core-js/modules/es.object.to-string.js");
|
|
21
|
-
require("core-js/modules/esnext.async-iterator.filter.js");
|
|
22
20
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
23
21
|
require("core-js/modules/esnext.iterator.filter.js");
|
|
24
22
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
@@ -10,7 +10,6 @@ require("core-js/modules/es.array.filter.js");
|
|
|
10
10
|
require("core-js/modules/es.array.includes.js");
|
|
11
11
|
require("core-js/modules/es.object.to-string.js");
|
|
12
12
|
require("core-js/modules/es.string.includes.js");
|
|
13
|
-
require("core-js/modules/esnext.async-iterator.filter.js");
|
|
14
13
|
require("core-js/modules/esnext.iterator.constructor.js");
|
|
15
14
|
require("core-js/modules/esnext.iterator.filter.js");
|
|
16
15
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|