agora-appbuilder-core 4.1.28 → 4.1.29-beta.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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "agora-appbuilder-core",
3
- "version": "4.1.28",
3
+ "version": "4.1.29-beta.1",
4
4
  "description": "React Native template for RTE app builder",
5
5
  "main": "index.js",
6
6
  "files": [
@@ -77,8 +77,8 @@ const DefaultConfig = {
77
77
  CHAT_ORG_NAME: "",
78
78
  CHAT_APP_NAME: "",
79
79
  CHAT_URL: "",
80
- CLI_VERSION: "3.1.28",
81
- CORE_VERSION: "4.1.28",
80
+ CLI_VERSION: "3.1.29-beta.1",
81
+ CORE_VERSION: "4.1.29-beta.1",
82
82
  DISABLE_LANDSCAPE_MODE: false,
83
83
  STT_AUTO_START: false,
84
84
  CLOUD_RECORDING_AUTO_START: false,
@@ -113,7 +113,9 @@ const PinnedVideo = ({renderData}) => {
113
113
  }
114
114
  };
115
115
 
116
- const isWhiteboard = customContent && customContent[maximizedUid];
116
+ const whiteboardUid = getWhiteboardUid();
117
+ const isWhiteboard =
118
+ Boolean(whiteboardUid) && String(maximizedUid) === String(whiteboardUid);
117
119
  const isRemoteScreenshare =
118
120
  maximizedUid != screenUid &&
119
121
  defaultContent &&
@@ -81,6 +81,7 @@ import {canViewInLarge, isUidMaximized} from '../pinnedLayoutState';
81
81
 
82
82
  interface UserActionMenuOptionsOptionsProps {
83
83
  user: ContentInterface;
84
+ isMax?: boolean;
84
85
  actionMenuVisible: boolean;
85
86
  setActionMenuVisible: (actionMenuVisible: boolean) => void;
86
87
  btnRef: any;
@@ -106,6 +107,7 @@ export default function UserActionMenuOptionsOptions(
106
107
  const {setSidePanel} = useSidePanel();
107
108
  const {
108
109
  user,
110
+ isMax = false,
109
111
  actionMenuVisible,
110
112
  setActionMenuVisible,
111
113
  spotlightUid,
@@ -215,13 +217,15 @@ export default function UserActionMenuOptionsOptions(
215
217
  const fallbackMaximizedUid = isPinnedLayout
216
218
  ? activeUids?.[0]
217
219
  : undefined;
218
- const allowViewInLarge = canViewInLarge(
219
- user.uid,
220
- pinnedUid,
221
- secondaryPinnedUid,
222
- fallbackMaximizedUid,
223
- isPinnedLayout,
224
- );
220
+ const allowViewInLarge =
221
+ !isMax &&
222
+ canViewInLarge(
223
+ user.uid,
224
+ pinnedUid,
225
+ secondaryPinnedUid,
226
+ fallbackMaximizedUid,
227
+ isPinnedLayout,
228
+ );
225
229
  if (allowViewInLarge) {
226
230
  const viewInLargeKey = ActionMenuKeys.VIEW_IN_LARGE;
227
231
  const viewInLargeConfig = userActionMenuItems?.[viewInLargeKey] ?? {};
@@ -291,11 +295,9 @@ export default function UserActionMenuOptionsOptions(
291
295
  const pinToTopKey = ActionMenuKeys.PIN_TO_TOP;
292
296
  const pinToTopConfig = userActionMenuItems?.[pinToTopKey] ?? {};
293
297
  const isPinnedToTop = user.uid === secondaryPinnedUid;
294
- const isMaximized = isUidMaximized(
295
- user.uid,
296
- pinnedUid,
297
- activeUids?.[0],
298
- );
298
+ const isMaximized =
299
+ isMax ||
300
+ isUidMaximized(user.uid, pinnedUid, activeUids?.[0]);
299
301
  const isOnlyOneActive = activeUids?.length === 1;
300
302
 
301
303
  if (!pinToTopConfig.hide && !isMaximized) {
@@ -772,6 +774,7 @@ export default function UserActionMenuOptionsOptions(
772
774
  raiseHandList,
773
775
  hostUids,
774
776
  user,
777
+ isMax,
775
778
  disableChatUids,
776
779
  secondaryPinnedUid,
777
780
  currentLayout,
@@ -23,7 +23,7 @@ const RenderComponent = ({uid, isMax = false}: RenderComponentProps) => {
23
23
  const CustomComponent = customContent[uid]?.component;
24
24
  const CustomComponentProps = customContent[uid]?.props;
25
25
  //@ts-ignore
26
- return <CustomComponent {...CustomComponentProps} />;
26
+ return <CustomComponent {...CustomComponentProps} isMax={isMax} />;
27
27
  } else if (defaultContent[uid]) {
28
28
  return <RenderComp user={defaultContent[uid]} isMax={isMax} />;
29
29
  } else {
@@ -204,6 +204,7 @@ const VideoRenderer: React.FC<VideoRendererProps> = ({
204
204
  return (
205
205
  <>
206
206
  <UserActionMenuOptionsOptions
207
+ isMax={isMax}
207
208
  actionMenuVisible={actionMenuVisible}
208
209
  setActionMenuVisible={flag => {
209
210
  //once user clicks action menu item -> hide the action menu and set parent isHovered false