fcr-ui-scene 3.6.2 → 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.
Files changed (197) hide show
  1. package/lib/creator.d.ts +1 -0
  2. package/lib/creator.js +38 -26
  3. package/lib/electron/app.js +5 -4
  4. package/lib/electron/bootstrap-dev.js +3 -0
  5. package/lib/electron/injections.d.ts +3 -2
  6. package/lib/electron/injections.js +5 -6
  7. package/lib/electron/main.js +15 -11
  8. package/lib/electron/window.js +0 -3
  9. package/lib/fragments/annotation/index.d.ts +1 -0
  10. package/lib/fragments/annotation/index.js +55 -40
  11. package/lib/fragments/annotation/store.d.ts +7 -2
  12. package/lib/fragments/annotation/store.js +170 -90
  13. package/lib/fragments/annotation/view.d.ts +1 -0
  14. package/lib/fragments/annotation/view.js +10 -2
  15. package/lib/modules/action-bar/index.css +4 -0
  16. package/lib/modules/action-bar/store.d.ts +1 -7
  17. package/lib/modules/action-bar/store.js +35 -82
  18. package/lib/modules/annotation/board-cursor.css +76 -0
  19. package/lib/modules/annotation/components/control-bar/index.js +42 -2
  20. package/lib/modules/annotation/components/toolbar/components/graphic-tool/graphic-panel/index.js +3 -1
  21. package/lib/modules/annotation/components/toolbar/components/graphic-tool/graphic-panel/libs.d.ts +1 -0
  22. package/lib/modules/annotation/components/toolbar/components/graphic-tool/graphic-panel/libs.js +11 -5
  23. package/lib/modules/annotation/components/toolbar/components/item/item.d.ts +1 -0
  24. package/lib/modules/annotation/components/toolbar/components/item/item.js +3 -2
  25. package/lib/modules/annotation/index.d.ts +2 -0
  26. package/lib/modules/annotation/index.js +2 -1
  27. package/lib/modules/annotation/store.d.ts +11 -3
  28. package/lib/modules/annotation/store.js +209 -184
  29. package/lib/modules/annotation/style.css +3 -3
  30. package/lib/modules/annotation/view.d.ts +1 -0
  31. package/lib/modules/annotation/view.js +26 -9
  32. package/lib/modules/components/member-window/components/member-actions/components/audio-control.d.ts +0 -1
  33. package/lib/modules/components/member-window/components/member-actions/components/audio-control.js +10 -4
  34. package/lib/modules/components/member-window/components/member-actions/components/icon-buttons/index.d.ts +2 -2
  35. package/lib/modules/components/member-window/components/member-actions/components/icon-buttons/index.js +4 -4
  36. package/lib/modules/components/member-window/components/member-actions/components/icon-status.d.ts +0 -2
  37. package/lib/modules/components/member-window/components/member-actions/components/icon-status.js +3 -4
  38. package/lib/modules/components/member-window/components/member-actions/components/more-actions.d.ts +0 -3
  39. package/lib/modules/components/member-window/components/member-actions/components/more-actions.js +6 -32
  40. package/lib/modules/components/member-window/components/member-actions/components/share-status.js +11 -3
  41. package/lib/modules/components/member-window/components/member-actions/components/user-info.d.ts +0 -1
  42. package/lib/modules/components/member-window/components/member-actions/components/user-info.js +7 -10
  43. package/lib/modules/components/member-window/components/member-actions/components/user-tag.d.ts +0 -1
  44. package/lib/modules/components/member-window/components/member-actions/components/user-tag.js +0 -2
  45. package/lib/modules/components/member-window/components/member-actions/index.js +1 -32
  46. package/lib/modules/components/member-window/components/member-actions/store.d.ts +38 -1
  47. package/lib/modules/components/member-window/components/member-actions/store.js +130 -23
  48. package/lib/modules/components/member-window/index.css +37 -0
  49. package/lib/modules/control-bar/index.d.ts +0 -4
  50. package/lib/modules/control-bar/index.js +0 -32
  51. package/lib/modules/control-bar/store.d.ts +4 -6
  52. package/lib/modules/control-bar/store.js +63 -103
  53. package/lib/modules/control-bar/view.js +45 -3
  54. package/lib/modules/dialog/components/control-bar/index.d.ts +0 -2
  55. package/lib/modules/dialog/components/control-bar/index.js +1 -3
  56. package/lib/modules/dialog/hooks/useElectron.js +3 -2
  57. package/lib/modules/dialog/index.d.ts +0 -3
  58. package/lib/modules/dialog/index.js +1 -25
  59. package/lib/modules/dialog/store.d.ts +6 -8
  60. package/lib/modules/dialog/store.js +21 -55
  61. package/lib/modules/layout/components/CommonVideoRenderer.js +5 -2
  62. package/lib/modules/layout/type.d.ts +7 -0
  63. package/lib/modules/participant/store.js +59 -28
  64. package/lib/modules/setting/index.d.ts +2 -0
  65. package/lib/modules/setting/index.js +3 -3
  66. package/lib/modules/setting/store.d.ts +8 -10
  67. package/lib/modules/setting/store.js +22 -20
  68. package/lib/modules/share-screen/store.d.ts +3 -0
  69. package/lib/modules/share-screen/store.js +63 -54
  70. package/lib/modules/state-bar/index.css +8 -6
  71. package/lib/modules/state-bar/index.d.ts +2 -0
  72. package/lib/modules/state-bar/index.js +2 -1
  73. package/lib/modules/state-bar/layout-config.d.ts +1 -0
  74. package/lib/modules/state-bar/layout-config.js +15 -5
  75. package/lib/modules/state-bar/store.d.ts +5 -1
  76. package/lib/modules/state-bar/store.js +8 -1
  77. package/lib/modules/state-bar/view.js +9 -5
  78. package/lib/modules/whiteboard/components/control-bar/store.js +2 -0
  79. package/lib/modules/whiteboard/components/toolbar/store.d.ts +7 -3
  80. package/lib/modules/whiteboard/components/toolbar/store.js +61 -35
  81. package/lib/modules/whiteboard/index.js +3 -2
  82. package/lib/modules/whiteboard/style.css +0 -4
  83. package/lib/modules/whiteboard/view.js +8 -2
  84. package/lib/providers/annotation-provider.d.ts +63 -12
  85. package/lib/providers/annotation-provider.js +51 -41
  86. package/lib/providers/device-provider.d.ts +3 -3
  87. package/lib/providers/device-provider.js +8 -6
  88. package/lib/providers/event-provider.d.ts +3 -3
  89. package/lib/providers/screen-share-provider.js +53 -60
  90. package/lib/providers/sharing-provider.d.ts +5 -1
  91. package/lib/providers/sharing-provider.js +16 -1
  92. package/lib/providers/user-setting-storage-provider.d.ts +20 -0
  93. package/lib/providers/user-setting-storage-provider.js +74 -0
  94. package/lib/scenes/main-scene.js +2 -3
  95. package/lib/scenes/waiting-scene.js +1 -1
  96. package/lib/shared-data-source/config.d.ts +1 -5
  97. package/lib/shared-data-source/config.js +11 -81
  98. package/lib/shared-data-source/screen-share-data.d.ts +4 -0
  99. package/lib/shared-data-source/screen-share-data.js +1 -0
  100. package/lib/shared-data-source/setting.d.ts +13 -13
  101. package/lib/shared-data-source/setting.js +10 -6
  102. package/lib/shared-data-source/video-window.d.ts +2 -1
  103. package/lib/shared-data-source/video-window.js +56 -36
  104. package/lib/translations/enUS.d.ts +8 -0
  105. package/lib/translations/enUS.js +9 -1
  106. package/lib/translations/zhCN.d.ts +8 -0
  107. package/lib/translations/zhCN.js +11 -3
  108. package/lib/type.d.ts +2 -1
  109. package/lib/ui-scene.js +11 -6
  110. package/lib/utilities/constant.d.ts +2 -1
  111. package/lib/utilities/constant.js +1 -0
  112. package/lib/utilities/setting-config-storage.d.ts +5 -6
  113. package/lib/utilities/setting-config-storage.js +33 -39
  114. package/lib/utilities/tools.d.ts +1 -0
  115. package/lib/utilities/tools.js +3 -2
  116. package/package.json +8 -6
  117. package/dist/132.js +0 -2
  118. package/dist/132.js.LICENSE.txt +0 -311
  119. package/dist/317.js +0 -2
  120. package/dist/317.js.LICENSE.txt +0 -20
  121. package/dist/651.js +0 -2
  122. package/dist/651.js.LICENSE.txt +0 -1
  123. package/dist/689343b64b60bfb7ffff.png +0 -0
  124. package/dist/73.js +0 -1
  125. package/dist/885f9369ea05a8ac0e56.png +0 -0
  126. package/dist/90f383876a6e93e7c7ca.png +0 -0
  127. package/dist/9b37584780995fc5df8c.gif +0 -0
  128. package/dist/annotation.e5cbd3a70b6d42361872.css +0 -1274
  129. package/dist/annotation.html +0 -1
  130. package/dist/annotation.js +0 -2
  131. package/dist/annotation.js.LICENSE.txt +0 -252
  132. package/dist/assets/browser/images/default1.jpg +0 -0
  133. package/dist/assets/browser/images/default2.jpg +0 -0
  134. package/dist/assets/browser/images/default3.jpg +0 -0
  135. package/dist/assets/browser/images/default4.jpg +0 -0
  136. package/dist/assets/browser/images/default5.jpg +0 -0
  137. package/dist/assets/browser/images/default6.jpg +0 -0
  138. package/dist/assets/browser/images/default7.jpg +0 -0
  139. package/dist/assets/browser/sound_effects/pretest.mp3 +0 -0
  140. package/dist/assets/browser/sound_effects/recording_started.mp3 +0 -0
  141. package/dist/assets/browser/sound_effects/remote_user_joined.mp3 +0 -0
  142. package/dist/assets/browser/sound_effects/speaker_test.mp3 +0 -0
  143. package/dist/assets/browser/videos/default8.mp4 +0 -0
  144. package/dist/assets/browser/videos/default9.mp4 +0 -0
  145. package/dist/assets/cursors/fcr_whiteboard_input.ico +0 -0
  146. package/dist/assets/cursors/fcr_whiteboard_pen.ico +0 -0
  147. package/dist/assets/cursors/fcr_whiteboard_shape_-straightline.ico +0 -0
  148. package/dist/assets/cursors/fcr_whiteboard_shape_arrow.ico +0 -0
  149. package/dist/assets/cursors/fcr_whiteboard_shape_circle.ico +0 -0
  150. package/dist/assets/cursors/fcr_whiteboard_shape_rectangle.ico +0 -0
  151. package/dist/assets/cursors/fcr_whiteboard_shape_triangle.ico +0 -0
  152. package/dist/assets/electron/images/default1.jpg +0 -0
  153. package/dist/assets/electron/images/default2.jpg +0 -0
  154. package/dist/assets/electron/sound_effects/pretest.mp3 +0 -0
  155. package/dist/assets/electron/videos/default8.mp4 +0 -0
  156. package/dist/assets/fcr_chat_reddot.svg +0 -5
  157. package/dist/assets/fcr_defaultpage.png +0 -0
  158. package/dist/assets/fcr_grid_big.svg +0 -3
  159. package/dist/assets/fcr_leave2.svg +0 -58
  160. package/dist/assets/fcr_listontop_big.svg +0 -3
  161. package/dist/assets/full-screen-error-boundary-img.png +0 -0
  162. package/dist/assets/leave-meeting.png +0 -0
  163. package/dist/assets/loading.gif +0 -0
  164. package/dist/assets/login_confirm.png +0 -0
  165. package/dist/assets/pretest.mp3 +0 -0
  166. package/dist/assets/state-bar-logo.png +0 -0
  167. package/dist/assets/step-gradient.svg +0 -10
  168. package/dist/b74b002687a3a3346bec.png +0 -0
  169. package/dist/b94869094481702f949b.png +0 -0
  170. package/dist/ebeace75fd46b90d890e.png +0 -0
  171. package/dist/electron/app.js +0 -194
  172. package/dist/electron/bootstrap-dev.js +0 -46
  173. package/dist/electron/bootstrap-sdk.js +0 -211
  174. package/dist/electron/default-options.js +0 -25
  175. package/dist/electron/env.js +0 -13
  176. package/dist/electron/index.js +0 -20
  177. package/dist/electron/injections.js +0 -903
  178. package/dist/electron/ipc/ipc.js +0 -141
  179. package/dist/electron/ipc/type.js +0 -19
  180. package/dist/electron/logger.js +0 -65
  181. package/dist/electron/main.js +0 -94
  182. package/dist/electron/plugins/devtool-shortcut.js +0 -33
  183. package/dist/electron/plugins/meeting-state.js +0 -39
  184. package/dist/electron/plugins/screenshot.js +0 -54
  185. package/dist/electron/preload.js +0 -108
  186. package/dist/electron/tools.js +0 -66
  187. package/dist/electron/window.js +0 -123
  188. package/dist/extensions/agora-extension-virtual-background/agora-wasm.wasm +0 -0
  189. package/dist/extensions/ai-denoiser/denoiser-wasm-simd.wasm +0 -0
  190. package/dist/extensions/ai-denoiser/denoiser-wasm.js +0 -1
  191. package/dist/extensions/ai-denoiser/denoiser-wasm.wasm +0 -0
  192. package/dist/fad688b9135b15d6c405.png +0 -0
  193. package/dist/index.html +0 -224
  194. package/dist/main.393a2a91ab7fc05ffce6.css +0 -15403
  195. package/dist/main.js +0 -2
  196. package/dist/main.js.LICENSE.txt +0 -272
  197. package/dist/worker-entry.worker.js.LICENSE.txt +0 -13
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
 
3
3
  require("core-js/modules/es.object.define-property.js");
4
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
5
  Object.defineProperty(exports, "__esModule", {
5
6
  value: true
6
7
  });
@@ -11,6 +12,9 @@ var _store = require("./store");
11
12
  var _store2 = require("../whiteboard/components/toolbar/store");
12
13
  var _toolbar = require("../whiteboard/components/toolbar");
13
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");
14
18
  var _jsxRuntime = require("react/jsx-runtime");
15
19
  var Annotation = exports.Annotation = (0, _mobxReact.observer)(function () {
16
20
  var _useContext = (0, _react.useContext)(_store.AnnotationStoreContext),
@@ -18,15 +22,28 @@ var Annotation = exports.Annotation = (0, _mobxReact.observer)(function () {
18
22
  handleBoardContainerDomLoad = _useContext.handleBoardContainerDomLoad,
19
23
  isShowToolbar = _useContext.isShowToolbar,
20
24
  getToolbarStore = _useContext.getToolbarStore,
21
- resetToolbarStore = _useContext.resetToolbarStore;
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());
22
29
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
23
- className: "annotation-container netless-whiteboard-wrapper",
24
- ref: handleBoardContainerDomLoad,
25
- children: resetToolbarStore ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_store2.ToolbarContext.Provider, {
26
- value: getToolbarStore(),
27
- children: isShowToolbar ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_toolbar.Toolbar, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
28
- className: "annotation-action-prevent"
29
- })
30
- }) : null
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
+ })
31
48
  });
32
49
  });
@@ -1,6 +1,5 @@
1
1
  import React from 'react';
2
2
  export interface AudioControlProps {
3
- isMeeting: boolean;
4
3
  iconSize: number;
5
4
  }
6
5
  export declare const AudioControl: React.FC<AudioControlProps>;
@@ -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 isMeeting = _ref.isMeeting,
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 (!store.hasMicrophoneAudioStream) {
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 (store.isPhone) {
35
+ if (isPhone) {
30
36
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButtons.PhoneCallIconButton, {
31
37
  iconSize: iconSize
32
38
  });
@@ -23,11 +23,11 @@ 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
- hasScreenSharing: boolean;
26
+ isShow: boolean;
27
27
  windowSize: string;
28
28
  }) => import("react/jsx-runtime").JSX.Element;
29
29
  export declare const ShareSoundIconButton: (props: {
30
- hasScreenSharing: boolean;
30
+ isShow: boolean;
31
31
  windowSize: string;
32
32
  hasLoopbackAudioStream: boolean;
33
33
  largeSize?: number;
@@ -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 hasScreenSharing = props.hasScreenSharing,
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': hasScreenSharing,
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, {
@@ -127,7 +127,7 @@ var ShareScreenIconButton = exports.ShareScreenIconButton = function ShareScreen
127
127
  };
128
128
  var ShareSoundIconButton = exports.ShareSoundIconButton = function ShareSoundIconButton(props) {
129
129
  var _ref;
130
- var hasScreenSharing = props.hasScreenSharing,
130
+ var isShow = props.isShow,
131
131
  windowSize = props.windowSize,
132
132
  hasLoopbackAudioStream = props.hasLoopbackAudioStream,
133
133
  largeSize = props.largeSize,
@@ -135,7 +135,7 @@ var ShareSoundIconButton = exports.ShareSoundIconButton = function ShareSoundIco
135
135
  var useSize = (_ref = windowSize === 'large' ? largeSize : normalSize) !== null && _ref !== void 0 ? _ref : windowSize === 'large' ? 24 : 18;
136
136
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
137
137
  className: (0, _classnames["default"])('fcr-member-window-members-shareSound', {
138
- 'fcr-member-window-members-sharebtn-show': hasScreenSharing && hasLoopbackAudioStream,
138
+ 'fcr-member-window-members-sharebtn-show': isShow && hasLoopbackAudioStream,
139
139
  'fcr-member-window-members-sharebtn-large': windowSize === 'large'
140
140
  }),
141
141
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_icon.FcrIcon, {
@@ -1,9 +1,7 @@
1
1
  import React from 'react';
2
- import { FcrRoomConnectorType } from 'fcr-core';
3
2
  interface IconStatusProps {
4
3
  windowSize: 'large' | 'normal';
5
4
  iconSize: number;
6
- meetingConnectorTypes: Set<FcrRoomConnectorType>;
7
5
  id: string | undefined;
8
6
  volume: number;
9
7
  }
@@ -19,7 +19,6 @@ var _jsxRuntime = require("react/jsx-runtime");
19
19
  var IconStatus = exports.IconStatus = (0, _mobxReact.observer)(function (_ref) {
20
20
  var windowSize = _ref.windowSize,
21
21
  iconSize = _ref.iconSize,
22
- meetingConnectorTypes = _ref.meetingConnectorTypes,
23
22
  id = _ref.id,
24
23
  volume = _ref.volume;
25
24
  var t = (0, _i18n.useI18n)();
@@ -29,14 +28,14 @@ var IconStatus = exports.IconStatus = (0, _mobxReact.observer)(function (_ref) {
29
28
  videoStreamId = store.videoStreamId,
30
29
  hasMicrophoneAudioStream = store.hasMicrophoneAudioStream,
31
30
  isManager = store.isManager,
31
+ isMeeting = store.isMeeting,
32
32
  phoneMicEnabled = store.phoneMicEnabled,
33
- isScreenSharing = store.isScreenSharing;
33
+ isSharingWindow = store.isSharingWindow;
34
34
  var isNormal = connectorType === _fcrCore.FcrRoomConnectorType.NONE;
35
35
  var isPhone = store.isPhone;
36
- var isMeeting = meetingConnectorTypes.has(connectorType);
37
36
  var isPurePhone = audioStreamId === videoStreamId;
38
37
  var renderNormalStatus = function renderNormalStatus() {
39
- if (isScreenSharing && windowSize === 'large') {
38
+ if (isSharingWindow) {
40
39
  return;
41
40
  }
42
41
  if (!hasMicrophoneAudioStream && !isMeeting) {
@@ -1,11 +1,8 @@
1
1
  import React from 'react';
2
- import { FcrRoomConnectorType } from 'fcr-core';
3
- export declare const meetingConnectorTypes: Set<FcrRoomConnectorType>;
4
2
  export interface ActionsTopProps {
5
3
  isShowActionAudio: boolean;
6
4
  actionAudioTag: string;
7
5
  hasPinnedStream: boolean;
8
- meetingConnectorTypes: Set<FcrRoomConnectorType>;
9
6
  allowedOperations: string[];
10
7
  }
11
8
  export declare const MoreActions: React.FC<ActionsTopProps>;
@@ -1,44 +1,20 @@
1
1
  "use strict";
2
2
 
3
+ require("core-js/modules/es.array.iterator.js");
3
4
  require("core-js/modules/es.object.define-property.js");
4
5
  require("core-js/modules/es.object.get-own-property-descriptor.js");
6
+ require("core-js/modules/es.object.to-string.js");
7
+ require("core-js/modules/es.string.iterator.js");
5
8
  require("core-js/modules/es.weak-map.js");
6
9
  require("core-js/modules/esnext.weak-map.delete-all.js");
7
10
  require("core-js/modules/esnext.weak-map.emplace.js");
11
+ require("core-js/modules/web.dom-collections.iterator.js");
8
12
  var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
9
13
  var _typeof = require("@babel/runtime/helpers/typeof");
10
14
  Object.defineProperty(exports, "__esModule", {
11
15
  value: true
12
16
  });
13
- exports.meetingConnectorTypes = exports.MoreActions = void 0;
14
- require("core-js/modules/es.array.iterator.js");
15
- require("core-js/modules/es.object.to-string.js");
16
- require("core-js/modules/es.set.js");
17
- require("core-js/modules/es.string.iterator.js");
18
- require("core-js/modules/esnext.set.add-all.js");
19
- require("core-js/modules/esnext.set.delete-all.js");
20
- require("core-js/modules/esnext.set.difference.v2.js");
21
- require("core-js/modules/esnext.set.difference.js");
22
- require("core-js/modules/esnext.set.every.js");
23
- require("core-js/modules/esnext.set.filter.js");
24
- require("core-js/modules/esnext.set.find.js");
25
- require("core-js/modules/esnext.set.intersection.v2.js");
26
- require("core-js/modules/esnext.set.intersection.js");
27
- require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
28
- require("core-js/modules/esnext.set.is-disjoint-from.js");
29
- require("core-js/modules/esnext.set.is-subset-of.v2.js");
30
- require("core-js/modules/esnext.set.is-subset-of.js");
31
- require("core-js/modules/esnext.set.is-superset-of.v2.js");
32
- require("core-js/modules/esnext.set.is-superset-of.js");
33
- require("core-js/modules/esnext.set.join.js");
34
- require("core-js/modules/esnext.set.map.js");
35
- require("core-js/modules/esnext.set.reduce.js");
36
- require("core-js/modules/esnext.set.some.js");
37
- require("core-js/modules/esnext.set.symmetric-difference.v2.js");
38
- require("core-js/modules/esnext.set.symmetric-difference.js");
39
- require("core-js/modules/esnext.set.union.v2.js");
40
- require("core-js/modules/esnext.set.union.js");
41
- require("core-js/modules/web.dom-collections.iterator.js");
17
+ exports.MoreActions = void 0;
42
18
  var _react = _interopRequireWildcard(require("react"));
43
19
  var _classnames = _interopRequireDefault(require("classnames"));
44
20
  var _i18n = require("agora-ui-foundation/lib/i18n");
@@ -54,16 +30,15 @@ var _mobxReact = require("mobx-react");
54
30
  var _jsxRuntime = require("react/jsx-runtime");
55
31
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
56
32
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
57
- var meetingConnectorTypes = exports.meetingConnectorTypes = new Set([_fcrCore.FcrRoomConnectorType.SIP, _fcrCore.FcrRoomConnectorType.H323]);
58
33
  var EMPTY_HIDE_ACTIONS = [];
59
34
  var MoreActions = exports.MoreActions = (0, _mobxReact.observer)(function (_ref) {
60
35
  var isShowActionAudio = _ref.isShowActionAudio,
61
36
  actionAudioTag = _ref.actionAudioTag,
62
37
  hasPinnedStream = _ref.hasPinnedStream,
63
- meetingConnectorTypes = _ref.meetingConnectorTypes,
64
38
  allowedOperations = _ref.allowedOperations;
65
39
  var t = (0, _i18n.useI18n)();
66
40
  var store = (0, _provider.useMemberWindowActionsStore)();
41
+ var isMeeting = store.isMeeting;
67
42
  var _ref2 = store.windowData || {},
68
43
  userId = _ref2.userId,
69
44
  userName = _ref2.userName,
@@ -76,7 +51,6 @@ var MoreActions = exports.MoreActions = (0, _mobxReact.observer)(function (_ref)
76
51
  videoStreamConnectorType = _ref2.videoStreamConnectorType;
77
52
  var connectorType = audioStreamConnectorType !== _fcrCore.FcrRoomConnectorType.NONE ? audioStreamConnectorType : videoStreamConnectorType;
78
53
  var isPhone = connectorType === _fcrCore.FcrRoomConnectorType.PSTN;
79
- var isMeeting = meetingConnectorTypes.has(connectorType);
80
54
  var userType = audioStreamConnectorType === _fcrCore.FcrRoomConnectorType.PSTN && !hasVideoStream ? 'phone' : isMeeting ? 'meeting-system' : 'normal';
81
55
  var isHost = ownerRoleType === _type2.FcrUserRole.HOST;
82
56
  var audioDeviceType = isPhone ? 'phone-mic' : 'computer-mic';
@@ -10,20 +10,28 @@ var _react = _interopRequireDefault(require("react"));
10
10
  var _provider = require("../provider");
11
11
  var _i18n = require("agora-ui-foundation/lib/i18n");
12
12
  var _type = require("../../../../../../type");
13
+ var _fcrCore = require("fcr-core");
13
14
  var _jsxRuntime = require("react/jsx-runtime");
14
15
  var ShareStatus = exports.ShareStatus = function ShareStatus() {
15
16
  var store = (0, _provider.useMemberWindowActionsStore)();
16
17
  var t = (0, _i18n.useI18n)();
17
18
  var windowData = store.windowData,
18
- hasScreenSharing = store.hasScreenSharing;
19
+ hasSharing = store.hasSharing;
19
20
  if (windowData.type === _type.FcrUIWindowType.BOARD) {
20
21
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
21
- children: t('fmt_screenshare_whiteboard_tips_someonesharing', {
22
+ children: t('fmt_share_label_shareboard', {
22
23
  reason1: ''
23
24
  })
24
25
  });
25
26
  }
26
- if (hasScreenSharing && windowData.type === _type.FcrUIWindowType.VIDEO) {
27
+ if (windowData.videoSourceType === _fcrCore.FcrVideoSourceType.SCREEN) {
28
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
29
+ children: t('fmt_whiteboard_tips_share_nick', {
30
+ reason1: ''
31
+ })
32
+ });
33
+ }
34
+ if (hasSharing && windowData.type === _type.FcrUIWindowType.VIDEO) {
27
35
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
28
36
  children: windowData.hasBoardSharing ? t('fmt_screenshare_whiteboard_tips_someonesharing', {
29
37
  reason1: ''
@@ -9,7 +9,6 @@ export interface UserInfoProps {
9
9
  interpreterUserList: any[] | null;
10
10
  isInterpreterEnabled: boolean;
11
11
  setVideoOrientation: () => void;
12
- meetingConnectorTypes: Set<any>;
13
12
  id: string | undefined;
14
13
  volume: number;
15
14
  }
@@ -46,7 +46,6 @@ var UserInfo = exports.UserInfo = (0, _mobxReact.observer)(function (_ref) {
46
46
  interpreterUserList = _ref.interpreterUserList,
47
47
  isInterpreterEnabled = _ref.isInterpreterEnabled,
48
48
  _setVideoOrientation = _ref.setVideoOrientation,
49
- meetingConnectorTypes = _ref.meetingConnectorTypes,
50
49
  id = _ref.id,
51
50
  volume = _ref.volume;
52
51
  var t = (0, _i18n.useI18n)();
@@ -55,7 +54,8 @@ var UserInfo = exports.UserInfo = (0, _mobxReact.observer)(function (_ref) {
55
54
  ownerRoleType = store.ownerRoleType,
56
55
  isMySelf = store.isMySelf,
57
56
  connectorType = store.connectorType,
58
- hasScreenSharing = store.hasScreenSharing,
57
+ isScreenSharingWindow = store.isScreenSharingWindow,
58
+ isSharingPeopleVideoWindow = store.isSharingPeopleVideoWindow,
59
59
  isManager = store.isManager,
60
60
  userName = store.userName,
61
61
  handleRename = store.handleRename,
@@ -69,7 +69,6 @@ var UserInfo = exports.UserInfo = (0, _mobxReact.observer)(function (_ref) {
69
69
  var insideShow = ![_fcrCore.FcrUserRole.COHOST, _fcrCore.FcrUserRole.HOST].includes(ownerRoleType);
70
70
  var isShowInterpreterTag = interpreter && isInterpreterEnabled;
71
71
  var isMeTag = isMySelf ? t('fmt_attendies_labels_setting_mine') : '';
72
- var isMeeting = meetingConnectorTypes.has(connectorType);
73
72
  var interpreterTagDom = /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
74
73
  children: t('fmt_ai_transcriptions_setting_label_translator')
75
74
  });
@@ -80,26 +79,24 @@ var UserInfo = exports.UserInfo = (0, _mobxReact.observer)(function (_ref) {
80
79
  children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
81
80
  className: (0, _classnames["default"])('fcr-user-window-actions-bottom-layout'),
82
81
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButtons.ShareScreenIconButton, {
83
- hasScreenSharing: hasScreenSharing,
82
+ isShow: isSharingPeopleVideoWindow,
84
83
  windowSize: windowSize
85
- }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButtons.ShareSoundIconButton, {
86
- hasScreenSharing: hasScreenSharing,
87
- windowSize: windowSize,
88
- hasLoopbackAudioStream: hasLoopbackAudioStream
89
84
  }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
90
85
  className: "fcr-user-window-actions-bottom-layout-info",
91
86
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_userTag.UserTag, {
92
87
  iconSize: iconSize,
93
88
  windowSize: windowSize,
94
89
  isShowInterpreterTag: isShowInterpreterTag,
95
- meetingConnectorTypes: meetingConnectorTypes,
96
90
  id: id,
97
91
  volume: volume,
98
92
  insideShow: insideShow,
99
93
  interpreterTagDom: interpreterTagDom
100
94
  }), windowSize !== 'large' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_audioControl.AudioControl, {
101
- isMeeting: isMeeting,
102
95
  iconSize: iconSize
96
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_iconButtons.ShareSoundIconButton, {
97
+ isShow: isScreenSharingWindow,
98
+ windowSize: windowSize,
99
+ hasLoopbackAudioStream: hasLoopbackAudioStream
103
100
  }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
104
101
  className: (0, _classnames["default"])('fcr-user-window-actions-name', {
105
102
  'ml-5': isManager || isShowInterpreterTag
@@ -3,7 +3,6 @@ export interface UserTagProps {
3
3
  windowSize: 'large' | 'normal';
4
4
  iconSize: number;
5
5
  isShowInterpreterTag: boolean;
6
- meetingConnectorTypes: Set<any>;
7
6
  id: string | undefined;
8
7
  volume: number;
9
8
  insideShow: boolean;
@@ -17,7 +17,6 @@ var UserTag = exports.UserTag = function UserTag(_ref) {
17
17
  var iconSize = _ref.iconSize,
18
18
  windowSize = _ref.windowSize,
19
19
  isShowInterpreterTag = _ref.isShowInterpreterTag,
20
- meetingConnectorTypes = _ref.meetingConnectorTypes,
21
20
  id = _ref.id,
22
21
  volume = _ref.volume,
23
22
  insideShow = _ref.insideShow,
@@ -33,7 +32,6 @@ var UserTag = exports.UserTag = function UserTag(_ref) {
33
32
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_iconStatus.IconStatus, {
34
33
  windowSize: windowSize,
35
34
  iconSize: iconSize,
36
- meetingConnectorTypes: meetingConnectorTypes,
37
35
  id: id,
38
36
  volume: volume
39
37
  }), ownerRoleType === _fcrCore.FcrUserRole.HOST && /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
@@ -6,45 +6,16 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.MemberWindowActions = void 0;
8
8
  require("core-js/modules/es.array.find.js");
9
- require("core-js/modules/es.array.iterator.js");
10
9
  require("core-js/modules/es.object.to-string.js");
11
- require("core-js/modules/es.set.js");
12
- require("core-js/modules/es.string.iterator.js");
13
10
  require("core-js/modules/esnext.async-iterator.find.js");
14
11
  require("core-js/modules/esnext.iterator.constructor.js");
15
12
  require("core-js/modules/esnext.iterator.find.js");
16
- require("core-js/modules/esnext.set.add-all.js");
17
- require("core-js/modules/esnext.set.delete-all.js");
18
- require("core-js/modules/esnext.set.difference.v2.js");
19
- require("core-js/modules/esnext.set.difference.js");
20
- require("core-js/modules/esnext.set.every.js");
21
- require("core-js/modules/esnext.set.filter.js");
22
- require("core-js/modules/esnext.set.find.js");
23
- require("core-js/modules/esnext.set.intersection.v2.js");
24
- require("core-js/modules/esnext.set.intersection.js");
25
- require("core-js/modules/esnext.set.is-disjoint-from.v2.js");
26
- require("core-js/modules/esnext.set.is-disjoint-from.js");
27
- require("core-js/modules/esnext.set.is-subset-of.v2.js");
28
- require("core-js/modules/esnext.set.is-subset-of.js");
29
- require("core-js/modules/esnext.set.is-superset-of.v2.js");
30
- require("core-js/modules/esnext.set.is-superset-of.js");
31
- require("core-js/modules/esnext.set.join.js");
32
- require("core-js/modules/esnext.set.map.js");
33
- require("core-js/modules/esnext.set.reduce.js");
34
- require("core-js/modules/esnext.set.some.js");
35
- require("core-js/modules/esnext.set.symmetric-difference.v2.js");
36
- require("core-js/modules/esnext.set.symmetric-difference.js");
37
- require("core-js/modules/esnext.set.union.v2.js");
38
- require("core-js/modules/esnext.set.union.js");
39
- require("core-js/modules/web.dom-collections.iterator.js");
40
- var _fcrCore = require("fcr-core");
41
13
  var _provider = require("./provider");
42
14
  var _index = require("./components/layout/index");
43
15
  var _moreActions = require("./components/more-actions");
44
16
  var _userInfo = require("./components/user-info");
45
17
  var _iconButtons = require("./components/icon-buttons");
46
18
  var _jsxRuntime = require("react/jsx-runtime");
47
- var meetingConnectorTypes = new Set([_fcrCore.FcrRoomConnectorType.SIP, _fcrCore.FcrRoomConnectorType.H323]);
48
19
  var MemberWindowActions = exports.MemberWindowActions = function MemberWindowActions(_ref) {
49
20
  var windowData = _ref.windowData,
50
21
  iconSize = _ref.iconSize,
@@ -97,7 +68,6 @@ var MemberWindowActions = exports.MemberWindowActions = function MemberWindowAct
97
68
  isShowActionAudio: isShowActionAudio,
98
69
  actionAudioTag: actionAudioTag,
99
70
  hasPinnedStream: hasPinnedStream,
100
- meetingConnectorTypes: meetingConnectorTypes,
101
71
  allowedOperations: allowedOperations
102
72
  }),
103
73
  bottomSlot: /*#__PURE__*/(0, _jsxRuntime.jsx)(_userInfo.UserInfo, {
@@ -111,8 +81,7 @@ var MemberWindowActions = exports.MemberWindowActions = function MemberWindowAct
111
81
  isInterpreterEnabled: isInterpreterEnabled,
112
82
  id: id,
113
83
  volume: volume,
114
- setVideoOrientation: setVideoOrientation,
115
- meetingConnectorTypes: meetingConnectorTypes
84
+ setVideoOrientation: setVideoOrientation
116
85
  })
117
86
  });
118
87
  }
@@ -18,10 +18,27 @@ export declare class MemberWindowActionsStore {
18
18
  get userId(): string;
19
19
  get userName(): string;
20
20
  get isMySelf(): boolean;
21
+ get isMeeting(): boolean;
21
22
  get ownerRoleType(): FcrUserRole;
22
23
  get isManager(): boolean;
23
24
  get hasVideoStream(): boolean;
25
+ /**
26
+ * 是否有屏幕共享。
27
+ * 屏幕共享的 windowData、屏幕共享人的 windowData 上的 hasScreenSharing 属性都为 ture,
28
+ * 所以不能通过此属性判断是屏幕共享窗口,还是屏幕共享人的视频窗口。
29
+ * 如果需要判断是否是屏幕共享窗口,请使用 isScreenSharingWindow 属性。
30
+ * 如果需要判断是否是屏幕共享人的视频窗口,请使用 isScreenSharingPeopleVideoWindow 属性。
31
+ */
24
32
  get hasScreenSharing(): boolean;
33
+ /**
34
+ * 是否有白板共享。
35
+ * 参考 hasScreenSharing 的注释。
36
+ */
37
+ get hasBoardSharing(): boolean;
38
+ /**
39
+ * 是否有共享(屏幕、白板)。
40
+ */
41
+ get hasSharing(): boolean;
25
42
  get isPin(): boolean;
26
43
  get hasMicrophoneAudioStream(): boolean;
27
44
  get audioStreamConnectorType(): FcrRoomConnectorType;
@@ -35,7 +52,27 @@ export declare class MemberWindowActionsStore {
35
52
  get isInterpreter(): boolean;
36
53
  get isPurePhone(): boolean;
37
54
  get isScreenSharing(): boolean;
38
- get isWhiteboardSharing(): boolean;
55
+ /**
56
+ * 是否是屏幕共享人的视频窗口。
57
+ * 如果有屏幕共享,并且视频源类型是 CAMERA,则认为是屏幕共享人的视频窗口。
58
+ */
59
+ get isScreenSharingPeopleVideoWindow(): boolean;
60
+ /**
61
+ * 是否是白板共享人的视频窗口。
62
+ * 如果有白板共享,并且 windowType 是 VIDEO, 则认为是白板共享人的视频窗口。
63
+ */
64
+ get isBoardSharingPeopleVideoWindow(): boolean;
65
+ /**
66
+ * 是否是共享(屏幕、白板)人的视频窗口。
67
+ */
68
+ get isSharingPeopleVideoWindow(): boolean;
69
+ get isWhiteboardSharingWindow(): boolean;
70
+ get isScreenSharingWindow(): boolean;
71
+ /**
72
+ * 是否是共享窗口(屏幕、白板)。
73
+ * 如果是白板共享窗口,或者是屏幕共享窗口,则认为是共享窗口。
74
+ */
75
+ get isSharingWindow(): boolean;
39
76
  get hasLoopbackAudioStream(): boolean;
40
77
  setOnlyShowVideoStream(value: boolean): void;
41
78
  setIsShowDropMenu(value: boolean): void;