fcr-ui-scene 3.6.1 → 3.6.3
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/creator.d.ts +6 -0
- package/lib/creator.js +125 -24
- package/lib/electron/app.js +5 -4
- package/lib/electron/bootstrap-dev.js +3 -0
- package/lib/electron/bootstrap-sdk.js +4 -0
- package/lib/electron/injections.d.ts +5 -0
- package/lib/electron/injections.js +36 -8
- package/lib/electron/ipc/ipc.d.ts +1 -0
- package/lib/electron/ipc/ipc.js +4 -0
- package/lib/electron/main.js +16 -8
- package/lib/electron/plugins/screenshot.js +4 -2
- package/lib/electron/preload.js +7 -2
- package/lib/electron/window.js +4 -6
- package/lib/fragments/annotation/index.d.ts +11 -0
- package/lib/fragments/annotation/index.js +121 -0
- package/lib/fragments/annotation/libs.d.ts +55 -0
- package/lib/fragments/annotation/libs.js +93 -0
- package/lib/fragments/annotation/store.d.ts +30 -0
- package/lib/fragments/annotation/store.js +565 -0
- package/lib/fragments/annotation/view.d.ts +3 -0
- package/lib/fragments/annotation/view.js +31 -0
- package/lib/fragments/base.d.ts +10 -0
- package/lib/fragments/base.js +44 -0
- package/lib/modules/action-bar/components/screen-share/submenu.js +7 -6
- package/lib/modules/action-bar/index.css +11 -0
- package/lib/modules/action-bar/index.d.ts +2 -0
- package/lib/modules/action-bar/index.js +1 -0
- package/lib/modules/action-bar/store.d.ts +7 -9
- package/lib/modules/action-bar/store.js +49 -90
- package/lib/modules/annotation/board-cursor.css +76 -0
- package/lib/modules/annotation/components/control-bar/index.css +48 -0
- package/lib/modules/annotation/components/control-bar/index.d.ts +3 -0
- package/lib/modules/annotation/components/control-bar/index.js +141 -0
- package/lib/modules/annotation/components/toolbar/components/color-tool/color-panel/index.d.ts +3 -0
- package/lib/modules/annotation/components/toolbar/components/color-tool/color-panel/index.js +46 -0
- package/lib/modules/annotation/components/toolbar/components/color-tool/index.d.ts +1 -0
- package/lib/modules/annotation/components/toolbar/components/color-tool/index.js +52 -0
- package/lib/modules/annotation/components/toolbar/components/graphic-tool/graphic-panel/index.d.ts +3 -0
- package/lib/modules/annotation/components/toolbar/components/graphic-tool/graphic-panel/index.js +61 -0
- package/lib/modules/annotation/components/toolbar/components/graphic-tool/graphic-panel/libs.d.ts +12 -0
- package/lib/modules/annotation/components/toolbar/components/graphic-tool/graphic-panel/libs.js +65 -0
- package/lib/modules/annotation/components/toolbar/components/graphic-tool/index.d.ts +1 -0
- package/lib/modules/annotation/components/toolbar/components/graphic-tool/index.js +68 -0
- package/lib/modules/annotation/components/toolbar/components/item/item.d.ts +18 -0
- package/lib/modules/annotation/components/toolbar/components/item/item.js +116 -0
- package/lib/modules/annotation/components/toolbar/components/item/style.css +43 -0
- package/lib/modules/annotation/components/toolbar/components/panel/index.d.ts +5 -0
- package/lib/modules/annotation/components/toolbar/components/panel/index.js +22 -0
- package/lib/modules/annotation/components/toolbar/components/panel/style.css +24 -0
- package/lib/modules/annotation/components/toolbar/components/pen-tool/index.d.ts +1 -0
- package/lib/modules/annotation/components/toolbar/components/pen-tool/index.js +58 -0
- package/lib/modules/annotation/components/toolbar/components/pen-tool/pen-panel/index.d.ts +3 -0
- package/lib/modules/annotation/components/toolbar/components/pen-tool/pen-panel/index.js +34 -0
- package/lib/modules/annotation/components/toolbar/components/tips/index.d.ts +2 -0
- package/lib/modules/annotation/components/toolbar/components/tips/index.js +25 -0
- package/lib/modules/annotation/components/toolbar/components/tips/style.css +19 -0
- package/lib/modules/annotation/components/toolbar/index.d.ts +0 -0
- package/lib/modules/annotation/components/toolbar/index.js +1 -0
- package/lib/modules/annotation/components/toolbar/store.d.ts +40 -0
- package/lib/modules/annotation/components/toolbar/store.js +279 -0
- package/lib/modules/annotation/components/toolbar/style.css +55 -0
- package/lib/modules/annotation/components/toolbar/view.d.ts +2 -0
- package/lib/modules/annotation/components/toolbar/view.js +120 -0
- package/lib/modules/annotation/index.d.ts +38 -0
- package/lib/modules/annotation/index.js +169 -0
- package/lib/modules/annotation/store.d.ts +93 -0
- package/lib/modules/annotation/store.js +673 -0
- package/lib/modules/annotation/style.css +26 -0
- package/lib/modules/annotation/view.d.ts +3 -0
- package/lib/modules/annotation/view.js +49 -0
- package/lib/modules/chat/view.js +112 -100
- package/lib/modules/components/annotation-menu/index.d.ts +7 -0
- package/lib/modules/components/annotation-menu/index.js +119 -0
- package/lib/modules/components/leave-meeting/components/assign-host.js +26 -23
- package/lib/modules/components/member-window/components/member-actions/components/audio-control.d.ts +0 -1
- package/lib/modules/components/member-window/components/member-actions/components/audio-control.js +10 -4
- package/lib/modules/components/member-window/components/member-actions/components/icon-buttons/index.d.ts +4 -2
- package/lib/modules/components/member-window/components/member-actions/components/icon-buttons/index.js +10 -6
- package/lib/modules/components/member-window/components/member-actions/components/icon-status.d.ts +0 -2
- package/lib/modules/components/member-window/components/member-actions/components/icon-status.js +3 -4
- package/lib/modules/components/member-window/components/member-actions/components/more-actions.d.ts +0 -3
- package/lib/modules/components/member-window/components/member-actions/components/more-actions.js +6 -32
- package/lib/modules/components/member-window/components/member-actions/components/share-status.js +11 -3
- package/lib/modules/components/member-window/components/member-actions/components/user-info.d.ts +0 -1
- package/lib/modules/components/member-window/components/member-actions/components/user-info.js +7 -10
- package/lib/modules/components/member-window/components/member-actions/components/user-tag.d.ts +0 -1
- package/lib/modules/components/member-window/components/member-actions/components/user-tag.js +0 -2
- package/lib/modules/components/member-window/components/member-actions/index.js +1 -32
- package/lib/modules/components/member-window/components/member-actions/store.d.ts +38 -1
- package/lib/modules/components/member-window/components/member-actions/store.js +130 -23
- package/lib/modules/components/member-window/components/video-player/components/remote-video-player.d.ts +2 -1
- package/lib/modules/components/member-window/components/video-player/components/remote-video-player.js +6 -1
- package/lib/modules/components/member-window/components/video-player/index.d.ts +1 -0
- package/lib/modules/components/member-window/index.css +37 -0
- package/lib/modules/components/member-window/index.d.ts +1 -1
- package/lib/modules/components/member-window/index.js +8 -5
- package/lib/modules/components/member-window/types.d.ts +2 -0
- package/lib/modules/components/security-menu/index.js +7 -6
- package/lib/modules/control-bar/components/annotation-button/index.d.ts +1 -0
- package/lib/modules/control-bar/components/annotation-button/index.js +59 -0
- package/lib/modules/control-bar/index.d.ts +6 -6
- package/lib/modules/control-bar/index.js +5 -34
- package/lib/modules/control-bar/store.d.ts +27 -13
- package/lib/modules/control-bar/store.js +121 -126
- package/lib/modules/control-bar/view.js +50 -4
- package/lib/modules/dialog/components/annotation-tool/index.d.ts +4 -0
- package/lib/modules/dialog/components/annotation-tool/index.js +53 -0
- package/lib/modules/dialog/components/chat/index.js +1 -1
- package/lib/modules/dialog/components/control-bar/index.d.ts +0 -2
- package/lib/modules/dialog/components/control-bar/index.js +1 -3
- package/lib/modules/dialog/components/host-area-container/index.d.ts +12 -0
- package/lib/modules/dialog/components/host-area-container/index.js +214 -0
- package/lib/modules/dialog/components/participant/index.js +1 -1
- package/lib/modules/dialog/components/system-preference/index.js +1 -1
- package/lib/modules/dialog/components/video-window/index.js +1 -0
- package/lib/modules/dialog/hooks/use-popover-watcher.d.ts +14 -0
- package/lib/modules/dialog/hooks/use-popover-watcher.js +112 -0
- package/lib/modules/dialog/hooks/useElectron.d.ts +1 -0
- package/lib/modules/dialog/hooks/useElectron.js +13 -3
- package/lib/modules/dialog/index.d.ts +2 -3
- package/lib/modules/dialog/index.js +3 -26
- package/lib/modules/dialog/store.d.ts +14 -9
- package/lib/modules/dialog/store.js +56 -50
- package/lib/modules/event-confirm/components/window/index.d.ts +7 -0
- package/lib/modules/event-confirm/components/window/index.js +188 -0
- package/lib/modules/event-confirm/index.d.ts +4 -4
- package/lib/modules/event-confirm/index.js +6 -4
- package/lib/modules/event-confirm/store.d.ts +4 -5
- package/lib/modules/event-confirm/store.js +35 -26
- package/lib/modules/event-confirm/view.js +23 -171
- package/lib/modules/event-sound/index.js +1 -1
- package/lib/modules/layout/components/CommonVideoRenderer.js +33 -16
- package/lib/modules/layout/index.d.ts +4 -0
- package/lib/modules/layout/index.js +2 -0
- package/lib/modules/layout/store.d.ts +14 -2
- package/lib/modules/layout/store.js +77 -45
- package/lib/modules/layout/type.d.ts +7 -0
- package/lib/modules/participant/index.d.ts +2 -0
- package/lib/modules/participant/index.js +2 -1
- package/lib/modules/participant/store.d.ts +5 -2
- package/lib/modules/participant/store.js +73 -25
- package/lib/modules/setting/audio-settings/audio-settings.js +3 -14
- package/lib/modules/setting/index.d.ts +2 -0
- package/lib/modules/setting/index.js +3 -3
- package/lib/modules/setting/store.d.ts +8 -10
- package/lib/modules/setting/store.js +22 -20
- package/lib/modules/share-screen/components/selection/index.js +18 -42
- package/lib/modules/share-screen/index.d.ts +6 -2
- package/lib/modules/share-screen/index.js +4 -2
- package/lib/modules/share-screen/store.d.ts +41 -46
- package/lib/modules/share-screen/store.js +297 -718
- package/lib/modules/share-screen/view.js +2 -2
- package/lib/modules/state-bar/assets/fcr_grid_big.svg +1 -1
- package/lib/modules/state-bar/assets/fcr_listontop_big.svg +1 -1
- package/lib/modules/state-bar/index.css +8 -6
- package/lib/modules/state-bar/index.d.ts +4 -0
- package/lib/modules/state-bar/index.js +3 -1
- package/lib/modules/state-bar/layout-config.d.ts +1 -0
- package/lib/modules/state-bar/layout-config.js +15 -5
- package/lib/modules/state-bar/store.d.ts +9 -1
- package/lib/modules/state-bar/store.js +17 -2
- package/lib/modules/state-bar/view.js +9 -4
- package/lib/modules/video-window/components/members/index.js +2 -1
- package/lib/modules/waiting-room-layout/store.js +1 -1
- package/lib/modules/whiteboard/components/control-bar/store.d.ts +5 -1
- package/lib/modules/whiteboard/components/control-bar/store.js +10 -1
- package/lib/modules/whiteboard/components/toolbar/components/color-picker/components/picker.js +16 -5
- package/lib/modules/whiteboard/components/toolbar/components/eraser-picker.js +67 -12
- package/lib/modules/whiteboard/components/toolbar/components/expansion/index.js +22 -2
- package/lib/modules/whiteboard/components/toolbar/components/history.js +46 -14
- package/lib/modules/whiteboard/components/toolbar/components/item/index.js +3 -2
- package/lib/modules/whiteboard/components/toolbar/components/move-handle.js +1 -1
- package/lib/modules/whiteboard/components/toolbar/components/pen-picker.js +58 -16
- package/lib/modules/whiteboard/components/toolbar/components/screen-capture-picker.js +15 -4
- package/lib/modules/whiteboard/components/toolbar/components/shape-picker.js +45 -2
- package/lib/modules/whiteboard/components/toolbar/hooks/index.d.ts +14 -0
- package/lib/modules/whiteboard/components/toolbar/hooks/index.js +235 -7
- package/lib/modules/whiteboard/components/toolbar/index.d.ts +1 -1
- package/lib/modules/whiteboard/components/toolbar/index.js +1 -1
- package/lib/modules/whiteboard/components/toolbar/store.d.ts +13 -2
- package/lib/modules/whiteboard/components/toolbar/store.js +74 -24
- package/lib/modules/whiteboard/components/toolbar/{ style.css → style.css} +1 -0
- package/lib/modules/whiteboard/index.d.ts +2 -0
- package/lib/modules/whiteboard/index.js +22 -21
- package/lib/modules/whiteboard/style.css +0 -4
- package/lib/modules/whiteboard/view.js +8 -2
- package/lib/plugins/browser-runtime-plugin.js +10 -1
- package/lib/providers/annotation-provider.d.ts +128 -0
- package/lib/providers/annotation-provider.js +421 -0
- package/lib/providers/device-provider.d.ts +3 -3
- package/lib/providers/device-provider.js +8 -6
- package/lib/providers/event-provider.d.ts +3 -3
- package/lib/providers/interpreter-provider.d.ts +1 -0
- package/lib/providers/interpreter-provider.js +182 -154
- package/lib/providers/privilege-provider.d.ts +35 -6
- package/lib/providers/privilege-provider.js +105 -49
- package/lib/providers/renderer-provider.js +3 -7
- package/lib/providers/room-provider.d.ts +13 -1
- package/lib/providers/room-provider.js +21 -7
- package/lib/providers/screen-share-provider.d.ts +131 -34
- package/lib/providers/screen-share-provider.js +554 -173
- package/lib/providers/sharing-provider.d.ts +37 -0
- package/lib/{shared-data-source/screen-share-data-source.js → providers/sharing-provider.js} +102 -39
- package/lib/providers/user-setting-storage-provider.d.ts +20 -0
- package/lib/providers/user-setting-storage-provider.js +74 -0
- package/lib/runtime.d.ts +6 -1
- package/lib/scenes/main-scene.d.ts +7 -2
- package/lib/scenes/main-scene.js +55 -27
- package/lib/scenes/waiting-scene.d.ts +6 -0
- package/lib/scenes/waiting-scene.js +15 -5
- package/lib/shared-data-source/config.d.ts +1 -5
- package/lib/shared-data-source/config.js +11 -81
- package/lib/shared-data-source/member-data.d.ts +21 -5
- package/lib/shared-data-source/member-data.js +69 -17
- package/lib/shared-data-source/screen-share-data.d.ts +274 -0
- package/lib/shared-data-source/screen-share-data.js +390 -0
- package/lib/shared-data-source/security-data.d.ts +4 -1
- package/lib/shared-data-source/security-data.js +5 -2
- package/lib/shared-data-source/setting.d.ts +13 -13
- package/lib/shared-data-source/setting.js +16 -10
- package/lib/shared-data-source/video-window.d.ts +2 -1
- package/lib/shared-data-source/video-window.js +56 -36
- package/lib/translations/enUS.d.ts +8 -0
- package/lib/translations/enUS.js +9 -1
- package/lib/translations/zhCN.d.ts +8 -0
- package/lib/translations/zhCN.js +11 -3
- package/lib/type.d.ts +55 -1
- package/lib/ui-manager.d.ts +3 -2
- package/lib/ui-manager.js +6 -4
- package/lib/ui-scene.js +70 -50
- package/lib/utilities/constant.d.ts +10 -2
- package/lib/utilities/constant.js +8 -0
- package/lib/utilities/logger.d.ts +4 -0
- package/lib/utilities/logger.js +8 -1
- package/lib/utilities/renderer-event.d.ts +3 -0
- package/lib/utilities/renderer-event.js +14 -1
- package/lib/utilities/screen.js +2 -1
- package/lib/utilities/setting-config-storage.d.ts +5 -6
- package/lib/utilities/setting-config-storage.js +33 -39
- package/lib/utilities/tools.d.ts +19 -1
- package/lib/utilities/tools.js +51 -4
- package/package.json +9 -7
- package/public/assets/cursors/fcr_whiteboard_input.ico +0 -0
- package/public/assets/cursors/fcr_whiteboard_pen.ico +0 -0
- package/public/assets/cursors/fcr_whiteboard_shape_-straightline.ico +0 -0
- package/public/assets/cursors/fcr_whiteboard_shape_arrow.ico +0 -0
- package/public/assets/cursors/fcr_whiteboard_shape_circle.ico +0 -0
- package/public/assets/cursors/fcr_whiteboard_shape_rectangle.ico +0 -0
- package/public/assets/cursors/fcr_whiteboard_shape_triangle.ico +0 -0
- package/public/assets/fcr_chat_reddot.svg +3 -3
- package/public/assets/fcr_grid_big.svg +1 -1
- package/public/assets/fcr_leave2.svg +14 -14
- package/public/assets/fcr_listontop_big.svg +1 -1
- package/public/assets/step-gradient.svg +1 -1
- package/public/fragment.html +10 -0
- package/public/index.html +3 -1
- package/lib/shared-data-source/screen-share-data-source.d.ts +0 -37
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
.annotation-container {
|
|
2
|
+
position: absolute;
|
|
3
|
+
width: 100%;
|
|
4
|
+
height: 100%;
|
|
5
|
+
z-index: 1000;
|
|
6
|
+
top: 0;
|
|
7
|
+
left: 0;
|
|
8
|
+
right: 0;
|
|
9
|
+
bottom: 0;
|
|
10
|
+
display: flex;
|
|
11
|
+
justify-content: center;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
.annotation-main {
|
|
15
|
+
width: 100%;
|
|
16
|
+
height: 100%;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
.annotation-action-prevent {
|
|
20
|
+
width: 100%;
|
|
21
|
+
height: 100%;
|
|
22
|
+
position: absolute;
|
|
23
|
+
left: 0px;
|
|
24
|
+
top: 0px;
|
|
25
|
+
z-index: 100;
|
|
26
|
+
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
require("core-js/modules/es.object.define-property.js");
|
|
4
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
5
|
+
Object.defineProperty(exports, "__esModule", {
|
|
6
|
+
value: true
|
|
7
|
+
});
|
|
8
|
+
exports.Annotation = void 0;
|
|
9
|
+
var _mobxReact = require("mobx-react");
|
|
10
|
+
var _react = require("react");
|
|
11
|
+
var _store = require("./store");
|
|
12
|
+
var _store2 = require("../whiteboard/components/toolbar/store");
|
|
13
|
+
var _toolbar = require("../whiteboard/components/toolbar");
|
|
14
|
+
require("./style.css");
|
|
15
|
+
require("./board-cursor.css");
|
|
16
|
+
var _classnames = _interopRequireDefault(require("classnames"));
|
|
17
|
+
var _enums = require("fcr-core/lib/room-control/whiteboard-control/enums");
|
|
18
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
|
19
|
+
var Annotation = exports.Annotation = (0, _mobxReact.observer)(function () {
|
|
20
|
+
var _useContext = (0, _react.useContext)(_store.AnnotationStoreContext),
|
|
21
|
+
handleBoardDomLoad = _useContext.handleBoardDomLoad,
|
|
22
|
+
handleBoardContainerDomLoad = _useContext.handleBoardContainerDomLoad,
|
|
23
|
+
isShowToolbar = _useContext.isShowToolbar,
|
|
24
|
+
getToolbarStore = _useContext.getToolbarStore,
|
|
25
|
+
resetToolbarStore = _useContext.resetToolbarStore,
|
|
26
|
+
currentTool = _useContext.currentTool;
|
|
27
|
+
var cursorClassname = resetToolbarStore && isShowToolbar ? "board-widget-cursor-".concat([_enums.FcrBoardToolType[currentTool || _enums.FcrBoardToolType.NONE]]) : 'board-widget-cursor-normal';
|
|
28
|
+
var boardWidgetAppCls = (0, _classnames["default"])('netless-whiteboard-wrapper', cursorClassname.toLowerCase());
|
|
29
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
30
|
+
style: {
|
|
31
|
+
width: '100%',
|
|
32
|
+
position: 'absolute'
|
|
33
|
+
},
|
|
34
|
+
className: boardWidgetAppCls,
|
|
35
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
36
|
+
className: "annotation-container",
|
|
37
|
+
ref: handleBoardContainerDomLoad,
|
|
38
|
+
children: resetToolbarStore ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_store2.ToolbarContext.Provider, {
|
|
39
|
+
value: getToolbarStore(),
|
|
40
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
41
|
+
className: "annotation-main",
|
|
42
|
+
ref: handleBoardDomLoad
|
|
43
|
+
}), isShowToolbar ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_toolbar.Toolbar, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
44
|
+
className: "annotation-action-prevent"
|
|
45
|
+
})]
|
|
46
|
+
}) : null
|
|
47
|
+
})
|
|
48
|
+
});
|
|
49
|
+
});
|
package/lib/modules/chat/view.js
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
require("core-js/modules/es.symbol.js");
|
|
4
|
+
require("core-js/modules/es.array.push.js");
|
|
5
|
+
require("core-js/modules/es.object.define-properties.js");
|
|
3
6
|
require("core-js/modules/es.object.define-property.js");
|
|
7
|
+
require("core-js/modules/es.object.get-own-property-descriptor.js");
|
|
8
|
+
require("core-js/modules/es.object.get-own-property-descriptors.js");
|
|
9
|
+
require("core-js/modules/es.object.keys.js");
|
|
4
10
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
5
11
|
Object.defineProperty(exports, "__esModule", {
|
|
6
12
|
value: true
|
|
@@ -29,6 +35,7 @@ require("core-js/modules/esnext.iterator.for-each.js");
|
|
|
29
35
|
require("core-js/modules/esnext.iterator.map.js");
|
|
30
36
|
require("core-js/modules/web.dom-collections.for-each.js");
|
|
31
37
|
require("core-js/modules/web.dom-collections.iterator.js");
|
|
38
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
32
39
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
33
40
|
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
34
41
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
@@ -48,6 +55,8 @@ var _fcrCore = require("fcr-core");
|
|
|
48
55
|
var _types = require("./types");
|
|
49
56
|
var _chatTabs = _interopRequireDefault(require("./components/chat-tabs"));
|
|
50
57
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
58
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
59
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
51
60
|
var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
|
|
52
61
|
var _chatRoomStores$FcrUI;
|
|
53
62
|
var updateReadIndex = _ref.updateReadIndex,
|
|
@@ -66,7 +75,7 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
|
|
|
66
75
|
forbiddenTxt: t('fmt_chat_button_muteall'),
|
|
67
76
|
styles: {
|
|
68
77
|
display: 'flex',
|
|
69
|
-
height: (_chatRoomStores$FcrUI = chatRoomStores[_type.FcrUIRoomType.WAITING_ROOM]) !== null && _chatRoomStores$FcrUI !== void 0 && _chatRoomStores$FcrUI.userCount || 0 > 0 ? 'calc(100% -
|
|
78
|
+
height: (_chatRoomStores$FcrUI = chatRoomStores[_type.FcrUIRoomType.WAITING_ROOM]) !== null && _chatRoomStores$FcrUI !== void 0 && _chatRoomStores$FcrUI.userCount || 0 > 0 ? 'calc(100% - 34px)' : '100%'
|
|
70
79
|
}
|
|
71
80
|
};
|
|
72
81
|
var styles = defaultProps.styles,
|
|
@@ -187,115 +196,118 @@ var Chat = exports.Chat = (0, _mobxReact.observer)(function (_ref) {
|
|
|
187
196
|
});
|
|
188
197
|
};
|
|
189
198
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
|
|
190
|
-
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_chatTabs["default"], {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
toastProps: {
|
|
202
|
-
type: 'error',
|
|
203
|
-
content: t('fmt_chat_tips_Networkconnect'),
|
|
204
|
-
size: 'small'
|
|
205
|
-
}
|
|
206
|
-
});
|
|
207
|
-
return;
|
|
208
|
-
}
|
|
209
|
-
if (!localIsManager) {
|
|
210
|
-
if (privateTargetUser.userId === _types.USER_NONE) {
|
|
199
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_chatTabs["default"], {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
200
|
+
style: _objectSpread({}, styles),
|
|
201
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatWrapper.ChatWrapper, {
|
|
202
|
+
styles: styles,
|
|
203
|
+
errorMsg: errorMsg,
|
|
204
|
+
forbiddenTxt: forbiddenTxt,
|
|
205
|
+
singling: singling,
|
|
206
|
+
forbidden: !localIsManager && !hasChatSendPublicPermission && !hasChatSendPrivatePermission,
|
|
207
|
+
isHost: isHost,
|
|
208
|
+
handMsg: function handMsg(msg) {
|
|
209
|
+
if (chatRoomState !== _type3.FcrChatRoomConnectionState.Connected) {
|
|
211
210
|
handleToast({
|
|
212
|
-
id: 'send-msg-
|
|
211
|
+
id: 'send-msg-offline',
|
|
213
212
|
toastProps: {
|
|
214
|
-
type: '
|
|
215
|
-
content: t('
|
|
213
|
+
type: 'error',
|
|
214
|
+
content: t('fmt_chat_tips_Networkconnect'),
|
|
216
215
|
size: 'small'
|
|
217
216
|
}
|
|
218
217
|
});
|
|
219
218
|
return;
|
|
220
219
|
}
|
|
220
|
+
if (!localIsManager) {
|
|
221
|
+
if (privateTargetUser.userId === _types.USER_NONE) {
|
|
222
|
+
handleToast({
|
|
223
|
+
id: 'send-msg-to-none',
|
|
224
|
+
toastProps: {
|
|
225
|
+
type: 'normal',
|
|
226
|
+
content: t('fmt_chat_tips_selectchat'),
|
|
227
|
+
size: 'small'
|
|
228
|
+
}
|
|
229
|
+
});
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
221
232
|
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
233
|
+
// if (
|
|
234
|
+
// chatLevel === 'no_one' ||
|
|
235
|
+
// (chatLevel !== 'everyone' &&
|
|
236
|
+
// privateTargetUser.userId !== USER_ALL &&
|
|
237
|
+
// !isManager(privateTargetUser.userRole))
|
|
238
|
+
// ) {
|
|
239
|
+
// handleToast({
|
|
240
|
+
// id: 'send-msg-to-none',
|
|
241
|
+
// toastProps: {
|
|
242
|
+
// type: 'normal',
|
|
243
|
+
// content: t('fmt_chat_tips_permissionchange'),
|
|
244
|
+
// size: 'small',
|
|
245
|
+
// },
|
|
246
|
+
// });
|
|
247
|
+
// resetTargetUser();
|
|
248
|
+
// return;
|
|
249
|
+
// }
|
|
239
250
|
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
}
|
|
263
|
-
sendMsg(msg);
|
|
264
|
-
},
|
|
265
|
-
handleClickUploadImage: handleClickUploadImage,
|
|
266
|
-
msgBarElement: /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatBar.MessageBar, {
|
|
267
|
-
users: targetList
|
|
268
|
-
}),
|
|
269
|
-
targetUserIsOnline: targetUserIsOnline,
|
|
270
|
-
privateTarget: privateTargetUser.userId,
|
|
271
|
-
selectTargetNickname: privateTargetUser.userName,
|
|
272
|
-
multiSelectActive: multiSelectActive,
|
|
273
|
-
selectCnt: copyMap.size,
|
|
274
|
-
onSelectCancel: function onSelectCancel() {
|
|
275
|
-
resetMultiSelectStates();
|
|
276
|
-
},
|
|
277
|
-
onSelectConfirm: /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
278
|
-
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
279
|
-
while (1) switch (_context2.prev = _context2.next) {
|
|
280
|
-
case 0:
|
|
281
|
-
_context2.next = 2;
|
|
282
|
-
return handleMultiCopyMsg();
|
|
283
|
-
case 2:
|
|
284
|
-
resetMultiSelectStates();
|
|
285
|
-
copyTips();
|
|
286
|
-
case 4:
|
|
287
|
-
case "end":
|
|
288
|
-
return _context2.stop();
|
|
251
|
+
if (privateTargetUser.userId === _types.USER_ALL && !hasSendMessagePermission) {
|
|
252
|
+
handleToast({
|
|
253
|
+
id: 'send-msg-to-none',
|
|
254
|
+
toastProps: {
|
|
255
|
+
type: 'normal',
|
|
256
|
+
content: t('fmt_chat_tips_permissionchange'),
|
|
257
|
+
size: 'small'
|
|
258
|
+
}
|
|
259
|
+
});
|
|
260
|
+
return;
|
|
261
|
+
} else if (privateTargetUser.userId !== _types.USER_ALL && !hasChatSendPrivatePermission) {
|
|
262
|
+
handleToast({
|
|
263
|
+
id: 'send-msg-to-none',
|
|
264
|
+
toastProps: {
|
|
265
|
+
type: 'normal',
|
|
266
|
+
content: t('fmt_chat_tips_permissionchange'),
|
|
267
|
+
size: 'small'
|
|
268
|
+
}
|
|
269
|
+
});
|
|
270
|
+
resetTargetUser();
|
|
271
|
+
return;
|
|
272
|
+
}
|
|
289
273
|
}
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
274
|
+
sendMsg(msg);
|
|
275
|
+
},
|
|
276
|
+
handleClickUploadImage: handleClickUploadImage,
|
|
277
|
+
msgBarElement: /*#__PURE__*/(0, _jsxRuntime.jsx)(_chatBar.MessageBar, {
|
|
278
|
+
users: targetList
|
|
279
|
+
}),
|
|
280
|
+
targetUserIsOnline: targetUserIsOnline,
|
|
281
|
+
privateTarget: privateTargetUser.userId,
|
|
282
|
+
selectTargetNickname: privateTargetUser.userName,
|
|
283
|
+
multiSelectActive: multiSelectActive,
|
|
284
|
+
selectCnt: copyMap.size,
|
|
285
|
+
onSelectCancel: function onSelectCancel() {
|
|
286
|
+
resetMultiSelectStates();
|
|
287
|
+
},
|
|
288
|
+
onSelectConfirm: /*#__PURE__*/(0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
|
|
289
|
+
return _regenerator["default"].wrap(function _callee2$(_context2) {
|
|
290
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
291
|
+
case 0:
|
|
292
|
+
_context2.next = 2;
|
|
293
|
+
return handleMultiCopyMsg();
|
|
294
|
+
case 2:
|
|
295
|
+
resetMultiSelectStates();
|
|
296
|
+
copyTips();
|
|
297
|
+
case 4:
|
|
298
|
+
case "end":
|
|
299
|
+
return _context2.stop();
|
|
300
|
+
}
|
|
301
|
+
}, _callee2);
|
|
302
|
+
})),
|
|
303
|
+
defaultMsg: textMsg,
|
|
304
|
+
updateChatTextMsg: updateChatTextMsg,
|
|
305
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_messageList.MessageList, {
|
|
306
|
+
updateReadMsgIndex: updateReadIndex,
|
|
307
|
+
userId: localUserId,
|
|
308
|
+
setMultiSelectActive: setMultiSelectActive,
|
|
309
|
+
multiSelectActive: multiSelectActive
|
|
310
|
+
})
|
|
299
311
|
})
|
|
300
312
|
})]
|
|
301
313
|
});
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
declare const AnnotationMenu: ({ hasAnnotationAllowWritePermission, allowAnnotationWriteState, showClear, setAllowAnnotationWrite, }: {
|
|
2
|
+
hasAnnotationAllowWritePermission: boolean;
|
|
3
|
+
allowAnnotationWriteState: boolean;
|
|
4
|
+
showClear?: boolean;
|
|
5
|
+
setAllowAnnotationWrite: (allow: boolean) => void;
|
|
6
|
+
}) => import("react/jsx-runtime").JSX.Element;
|
|
7
|
+
export default AnnotationMenu;
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
require("core-js/modules/es.symbol.js");
|
|
4
|
+
require("core-js/modules/es.array.for-each.js");
|
|
5
|
+
require("core-js/modules/es.object.define-properties.js");
|
|
6
|
+
require("core-js/modules/es.object.define-property.js");
|
|
7
|
+
require("core-js/modules/es.object.get-own-property-descriptor.js");
|
|
8
|
+
require("core-js/modules/es.object.get-own-property-descriptors.js");
|
|
9
|
+
require("core-js/modules/es.object.keys.js");
|
|
10
|
+
require("core-js/modules/esnext.async-iterator.for-each.js");
|
|
11
|
+
require("core-js/modules/esnext.iterator.for-each.js");
|
|
12
|
+
require("core-js/modules/web.dom-collections.for-each.js");
|
|
13
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
14
|
+
Object.defineProperty(exports, "__esModule", {
|
|
15
|
+
value: true
|
|
16
|
+
});
|
|
17
|
+
exports["default"] = void 0;
|
|
18
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
19
|
+
require("core-js/modules/es.array.concat.js");
|
|
20
|
+
require("core-js/modules/es.array.filter.js");
|
|
21
|
+
require("core-js/modules/es.array.map.js");
|
|
22
|
+
require("core-js/modules/es.array.push.js");
|
|
23
|
+
require("core-js/modules/es.object.to-string.js");
|
|
24
|
+
require("core-js/modules/esnext.async-iterator.filter.js");
|
|
25
|
+
require("core-js/modules/esnext.async-iterator.map.js");
|
|
26
|
+
require("core-js/modules/esnext.iterator.constructor.js");
|
|
27
|
+
require("core-js/modules/esnext.iterator.filter.js");
|
|
28
|
+
require("core-js/modules/esnext.iterator.map.js");
|
|
29
|
+
var _checkbox = require("agora-ui-foundation/lib/components/checkbox");
|
|
30
|
+
var _dropMenu = require("agora-ui-foundation/lib/components/drop-menu");
|
|
31
|
+
var _icon = require("agora-ui-foundation/lib/components/icon");
|
|
32
|
+
var _type = require("agora-ui-foundation/lib/components/icon/type");
|
|
33
|
+
var _i18n = require("agora-ui-foundation/lib/i18n");
|
|
34
|
+
var _type2 = require("../../whiteboard/type");
|
|
35
|
+
var _rendererEvent = require("../../../utilities/renderer-event");
|
|
36
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
|
37
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
38
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
39
|
+
var AnnotationMenu = function AnnotationMenu(_ref) {
|
|
40
|
+
var hasAnnotationAllowWritePermission = _ref.hasAnnotationAllowWritePermission,
|
|
41
|
+
allowAnnotationWriteState = _ref.allowAnnotationWriteState,
|
|
42
|
+
showClear = _ref.showClear,
|
|
43
|
+
setAllowAnnotationWrite = _ref.setAllowAnnotationWrite;
|
|
44
|
+
var transI18n = (0, _i18n.useI18n)();
|
|
45
|
+
function onClearAllAnnotation() {
|
|
46
|
+
(0, _rendererEvent.sendEvent)({
|
|
47
|
+
action: _type2.ToolbarEvents.CLEAN,
|
|
48
|
+
payload: null
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
var hostMenu = hasAnnotationAllowWritePermission ? [{
|
|
52
|
+
title: transI18n('fmt_screenshare_controlbar_settings_label_annotation_settings'),
|
|
53
|
+
key: 'annotation_setting_title',
|
|
54
|
+
type: 'title'
|
|
55
|
+
}, {
|
|
56
|
+
title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.FcrCheckbox, {
|
|
57
|
+
checked: allowAnnotationWriteState,
|
|
58
|
+
label: transI18n('fmt_screenshare_controlbar_annotations_options_attendees_annotate'),
|
|
59
|
+
styleType: "white"
|
|
60
|
+
}),
|
|
61
|
+
key: 'allow_other_member_add_annotation',
|
|
62
|
+
type: 'primary',
|
|
63
|
+
onButtonClick: function onButtonClick() {
|
|
64
|
+
return setAllowAnnotationWrite(!allowAnnotationWriteState);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
// {
|
|
68
|
+
// title: (
|
|
69
|
+
// <FcrCheckbox
|
|
70
|
+
// checked={false}
|
|
71
|
+
// label={transI18n('fmt_screenshare_controlbar_annotations_options_show_name')}
|
|
72
|
+
// styleType="white"
|
|
73
|
+
// />
|
|
74
|
+
// ),
|
|
75
|
+
// key: 'allow_other_member_add_annotation',
|
|
76
|
+
// type: 'primary',
|
|
77
|
+
// },
|
|
78
|
+
] : [];
|
|
79
|
+
showClear && hasAnnotationAllowWritePermission && hostMenu.push({
|
|
80
|
+
type: 'line',
|
|
81
|
+
title: '',
|
|
82
|
+
key: 'annotation_operation_line'
|
|
83
|
+
});
|
|
84
|
+
var ownerMenu = showClear ? [{
|
|
85
|
+
title: transI18n('fmt_screenshare_controlbar_settings_label_annotation_controls'),
|
|
86
|
+
key: 'annotation_operation_title',
|
|
87
|
+
type: 'title'
|
|
88
|
+
}, {
|
|
89
|
+
icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
|
|
90
|
+
type: _type.FcrIconType.FCR_DELETE3,
|
|
91
|
+
size: 24,
|
|
92
|
+
colors: {
|
|
93
|
+
iconPrimary: 'var(--fcr_ui_scene_icontext1)'
|
|
94
|
+
}
|
|
95
|
+
}),
|
|
96
|
+
title: transI18n('fmt_screenshare_controlbar_options_clear_all'),
|
|
97
|
+
key: 'clear_all_annotation',
|
|
98
|
+
type: 'primary',
|
|
99
|
+
onButtonClick: onClearAllAnnotation
|
|
100
|
+
}] : [];
|
|
101
|
+
var allActions = [].concat(hostMenu, ownerMenu);
|
|
102
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_dropMenu.FcrDropMenu, {
|
|
103
|
+
className: "security-menu",
|
|
104
|
+
options: allActions.filter(function (action) {
|
|
105
|
+
return action.type !== 'disabled';
|
|
106
|
+
}).map(function (action) {
|
|
107
|
+
if (action.type === 'primary') {
|
|
108
|
+
return _objectSpread(_objectSpread({}, action), {}, {
|
|
109
|
+
title: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
110
|
+
className: "security-drop-menu-checkbox",
|
|
111
|
+
children: action.title
|
|
112
|
+
})
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
return _objectSpread({}, action);
|
|
116
|
+
})
|
|
117
|
+
});
|
|
118
|
+
};
|
|
119
|
+
var _default = exports["default"] = AnnotationMenu;
|
|
@@ -6,8 +6,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.AssignHost = void 0;
|
|
9
|
-
require("core-js/modules/es.array.index-of.js");
|
|
10
9
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
10
|
+
require("core-js/modules/es.array.find.js");
|
|
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.iterator.constructor.js");
|
|
14
|
+
require("core-js/modules/esnext.iterator.find.js");
|
|
11
15
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
12
16
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
13
17
|
var _mobxReact = require("mobx-react");
|
|
@@ -20,42 +24,42 @@ var _icon = require("agora-ui-foundation/lib/components/icon");
|
|
|
20
24
|
var _type = require("agora-ui-foundation/lib/components/icon/type");
|
|
21
25
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
22
26
|
var AssignHost = exports.AssignHost = (0, _mobxReact.observer)(function (props) {
|
|
23
|
-
var _remoteUsers$selected2;
|
|
24
27
|
var remoteUsers = props.remoteUsers,
|
|
25
28
|
assignHost = props.assignHost,
|
|
26
29
|
loading = props.loading;
|
|
27
|
-
var _useState = (0, _react.useState)(
|
|
30
|
+
var _useState = (0, _react.useState)(''),
|
|
28
31
|
_useState2 = (0, _slicedToArray2["default"])(_useState, 2),
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
var selectedUidRef = (0, _react.useRef)(remoteUsers[selected].userId);
|
|
32
|
+
selectedUserId = _useState2[0],
|
|
33
|
+
setSelectedUserId = _useState2[1];
|
|
32
34
|
var t = (0, _i18n.useI18n)();
|
|
33
35
|
(0, _react.useEffect)(function () {
|
|
34
|
-
var
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
36
|
+
var selectedUser = remoteUsers.find(function (v) {
|
|
37
|
+
return v.userId === selectedUserId;
|
|
38
|
+
});
|
|
39
|
+
var isSelectedUserLeft = !selectedUser;
|
|
40
|
+
var isSelectedUserLeftOrNotSelected = isSelectedUserLeft || !selectedUserId;
|
|
41
|
+
|
|
42
|
+
// 如果勾选的用户离开或者没有勾选用户,则勾选第一个用户
|
|
43
|
+
if (isSelectedUserLeftOrNotSelected && remoteUsers.length > 0) {
|
|
44
|
+
setSelectedUserId(remoteUsers[0].userId);
|
|
43
45
|
}
|
|
44
|
-
}, [remoteUsers,
|
|
46
|
+
}, [remoteUsers, selectedUserId]);
|
|
45
47
|
var handleLeave = /*#__PURE__*/function () {
|
|
46
48
|
var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
|
|
47
49
|
var user;
|
|
48
50
|
return _regenerator["default"].wrap(function _callee$(_context) {
|
|
49
51
|
while (1) switch (_context.prev = _context.next) {
|
|
50
52
|
case 0:
|
|
51
|
-
|
|
52
|
-
|
|
53
|
+
user = remoteUsers.find(function (v) {
|
|
54
|
+
return v.userId === selectedUserId;
|
|
55
|
+
});
|
|
56
|
+
if (!(remoteUsers.length === 0 || !user)) {
|
|
57
|
+
_context.next = 4;
|
|
53
58
|
break;
|
|
54
59
|
}
|
|
55
60
|
props.setPopoverOpened(false);
|
|
56
61
|
return _context.abrupt("return");
|
|
57
|
-
case
|
|
58
|
-
user = remoteUsers[selected];
|
|
62
|
+
case 4:
|
|
59
63
|
assignHost(user);
|
|
60
64
|
props.setPopoverOpened(false);
|
|
61
65
|
case 6:
|
|
@@ -98,10 +102,9 @@ var AssignHost = exports.AssignHost = (0, _mobxReact.observer)(function (props)
|
|
|
98
102
|
children: t('fmt_toolbar_button_assignleave')
|
|
99
103
|
}),
|
|
100
104
|
candidateUsers: remoteUsers,
|
|
101
|
-
selectedUid:
|
|
105
|
+
selectedUid: selectedUserId,
|
|
102
106
|
onSelect: function onSelect(user) {
|
|
103
|
-
|
|
104
|
-
setSelected(remoteUsers.indexOf(user));
|
|
107
|
+
setSelectedUserId(user.userId);
|
|
105
108
|
}
|
|
106
109
|
});
|
|
107
110
|
});
|
package/lib/modules/components/member-window/components/member-actions/components/audio-control.js
CHANGED
|
@@ -13,11 +13,17 @@ var _iconButtons = require("./icon-buttons");
|
|
|
13
13
|
var _mobxReact = require("mobx-react");
|
|
14
14
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
15
15
|
var AudioControl = exports.AudioControl = (0, _mobxReact.observer)(function (_ref) {
|
|
16
|
-
var
|
|
17
|
-
iconSize = _ref.iconSize;
|
|
16
|
+
var iconSize = _ref.iconSize;
|
|
18
17
|
var store = (0, _provider.useMemberWindowActionsStore)();
|
|
18
|
+
var hasMicrophoneAudioStream = store.hasMicrophoneAudioStream,
|
|
19
|
+
isPhone = store.isPhone,
|
|
20
|
+
isSharingWindow = store.isSharingWindow,
|
|
21
|
+
isMeeting = store.isMeeting;
|
|
19
22
|
var t = (0, _i18n.useI18n)();
|
|
20
|
-
if (
|
|
23
|
+
if (isSharingWindow) {
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
26
|
+
if (!hasMicrophoneAudioStream) {
|
|
21
27
|
return isMeeting ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButtons.SipDeviceIconButton, {
|
|
22
28
|
iconSize: iconSize,
|
|
23
29
|
backgroundColor: ""
|
|
@@ -26,7 +32,7 @@ var AudioControl = exports.AudioControl = (0, _mobxReact.observer)(function (_re
|
|
|
26
32
|
tooltip: t('fmt_device_label_audio_mute')
|
|
27
33
|
});
|
|
28
34
|
}
|
|
29
|
-
if (
|
|
35
|
+
if (isPhone) {
|
|
30
36
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButtons.PhoneCallIconButton, {
|
|
31
37
|
iconSize: iconSize
|
|
32
38
|
});
|
|
@@ -23,13 +23,15 @@ export declare const InterpreterTag: (props: PropsWithChildren<{
|
|
|
23
23
|
windowSize?: string;
|
|
24
24
|
}>) => import("react/jsx-runtime").JSX.Element | null;
|
|
25
25
|
export declare const ShareScreenIconButton: (props: {
|
|
26
|
-
|
|
26
|
+
isShow: boolean;
|
|
27
27
|
windowSize: string;
|
|
28
28
|
}) => import("react/jsx-runtime").JSX.Element;
|
|
29
29
|
export declare const ShareSoundIconButton: (props: {
|
|
30
|
-
|
|
30
|
+
isShow: boolean;
|
|
31
31
|
windowSize: string;
|
|
32
32
|
hasLoopbackAudioStream: boolean;
|
|
33
|
+
largeSize?: number;
|
|
34
|
+
normalSize?: number;
|
|
33
35
|
}) => import("react/jsx-runtime").JSX.Element;
|
|
34
36
|
export declare const ActionsTagIconButton: (props: PropsWithChildren<{
|
|
35
37
|
hostTag: boolean;
|
|
@@ -109,11 +109,11 @@ var InterpreterTag = exports.InterpreterTag = function InterpreterTag(props) {
|
|
|
109
109
|
});
|
|
110
110
|
};
|
|
111
111
|
var ShareScreenIconButton = exports.ShareScreenIconButton = function ShareScreenIconButton(props) {
|
|
112
|
-
var
|
|
112
|
+
var isShow = props.isShow,
|
|
113
113
|
windowSize = props.windowSize;
|
|
114
114
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
115
115
|
className: (0, _classnames["default"])('fcr-member-window-members-sharebtn', {
|
|
116
|
-
'fcr-member-window-members-sharebtn-show':
|
|
116
|
+
'fcr-member-window-members-sharebtn-show': isShow,
|
|
117
117
|
'fcr-member-window-members-sharebtn-large': windowSize === 'large'
|
|
118
118
|
}),
|
|
119
119
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
|
|
@@ -126,12 +126,16 @@ var ShareScreenIconButton = exports.ShareScreenIconButton = function ShareScreen
|
|
|
126
126
|
});
|
|
127
127
|
};
|
|
128
128
|
var ShareSoundIconButton = exports.ShareSoundIconButton = function ShareSoundIconButton(props) {
|
|
129
|
-
var
|
|
129
|
+
var _ref;
|
|
130
|
+
var isShow = props.isShow,
|
|
130
131
|
windowSize = props.windowSize,
|
|
131
|
-
hasLoopbackAudioStream = props.hasLoopbackAudioStream
|
|
132
|
+
hasLoopbackAudioStream = props.hasLoopbackAudioStream,
|
|
133
|
+
largeSize = props.largeSize,
|
|
134
|
+
normalSize = props.normalSize;
|
|
135
|
+
var useSize = (_ref = windowSize === 'large' ? largeSize : normalSize) !== null && _ref !== void 0 ? _ref : windowSize === 'large' ? 24 : 18;
|
|
132
136
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
133
137
|
className: (0, _classnames["default"])('fcr-member-window-members-shareSound', {
|
|
134
|
-
'fcr-member-window-members-sharebtn-show':
|
|
138
|
+
'fcr-member-window-members-sharebtn-show': isShow && hasLoopbackAudioStream,
|
|
135
139
|
'fcr-member-window-members-sharebtn-large': windowSize === 'large'
|
|
136
140
|
}),
|
|
137
141
|
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
|
|
@@ -139,7 +143,7 @@ var ShareSoundIconButton = exports.ShareSoundIconButton = function ShareSoundIco
|
|
|
139
143
|
colors: {
|
|
140
144
|
iconPrimary: 'var(--fcr_ui_scene_ramp_green6)'
|
|
141
145
|
},
|
|
142
|
-
size:
|
|
146
|
+
size: useSize
|
|
143
147
|
})
|
|
144
148
|
});
|
|
145
149
|
};
|