@stream-io/video-react-sdk 0.0.1-alpha.16 → 0.0.1-alpha.18
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/CHANGELOG.md +23 -0
- package/dist/src/components/Permissions/PermissionRequests.js +2 -8
- package/dist/src/components/Permissions/PermissionRequests.js.map +1 -1
- package/dist/src/core/components/CallLayout/PaginatedGridLayout.d.ts +1 -1
- package/dist/src/core/components/CallLayout/PaginatedGridLayout.js +8 -5
- package/dist/src/core/components/CallLayout/PaginatedGridLayout.js.map +1 -1
- package/dist/src/core/components/CallLayout/SpeakerLayout.d.ts +1 -1
- package/dist/src/core/components/CallLayout/SpeakerLayout.js +7 -3
- package/dist/src/core/components/CallLayout/SpeakerLayout.js.map +1 -1
- package/package.json +3 -3
- package/src/components/Permissions/PermissionRequests.tsx +2 -8
- package/src/core/components/CallLayout/PaginatedGridLayout.tsx +20 -5
- package/src/core/components/CallLayout/SpeakerLayout.tsx +7 -4
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,29 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [0.0.1-alpha.18](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-sdk-0.0.1-alpha.17...@stream-io/video-react-sdk-0.0.1-alpha.18) (2023-05-09)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* edge cases in default layouts ([#471](https://github.com/GetStream/stream-video-js/issues/471)) ([c79a733](https://github.com/GetStream/stream-video-js/commit/c79a7330a1e0a84ce8eb3b0d9f7d9eea1b1f5d3a))
|
|
11
|
+
* **permissions:** add shortcut APIs ([#475](https://github.com/GetStream/stream-video-js/issues/475)) ([466614c](https://github.com/GetStream/stream-video-js/commit/466614ccf7f15cb16fffc97d5aa05318d2adf7e7))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
## [0.0.1-alpha.18](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-sdk-0.0.1-alpha.17...@stream-io/video-react-sdk-0.0.1-alpha.18) (2023-05-08)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Bug Fixes
|
|
19
|
+
|
|
20
|
+
* edge cases in default layouts ([#471](https://github.com/GetStream/stream-video-js/issues/471)) ([c79a733](https://github.com/GetStream/stream-video-js/commit/c79a7330a1e0a84ce8eb3b0d9f7d9eea1b1f5d3a))
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
## [0.0.1-alpha.17](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-sdk-0.0.1-alpha.16...@stream-io/video-react-sdk-0.0.1-alpha.17) (2023-05-08)
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
5
28
|
## [0.0.1-alpha.16](https://github.com/GetStream/stream-video-js/compare/@stream-io/video-react-sdk-0.0.1-alpha.15...@stream-io/video-react-sdk-0.0.1-alpha.16) (2023-05-08)
|
|
6
29
|
|
|
7
30
|
|
|
@@ -53,16 +53,10 @@ export const PermissionRequests = () => {
|
|
|
53
53
|
return () => __awaiter(void 0, void 0, void 0, function* () {
|
|
54
54
|
const { user, permissions } = request;
|
|
55
55
|
if (allow) {
|
|
56
|
-
yield (call === null || call === void 0 ? void 0 : call.
|
|
57
|
-
user_id: user.id,
|
|
58
|
-
grant_permissions: permissions,
|
|
59
|
-
}));
|
|
56
|
+
yield (call === null || call === void 0 ? void 0 : call.grantPermissions(user.id, permissions));
|
|
60
57
|
}
|
|
61
58
|
else {
|
|
62
|
-
yield (call === null || call === void 0 ? void 0 : call.
|
|
63
|
-
user_id: user.id,
|
|
64
|
-
revoke_permissions: permissions,
|
|
65
|
-
}));
|
|
59
|
+
yield (call === null || call === void 0 ? void 0 : call.revokePermissions(user.id, permissions));
|
|
66
60
|
}
|
|
67
61
|
setPermissionRequests((requests) => requests.filter((r) => r !== request));
|
|
68
62
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PermissionRequests.js","sourceRoot":"","sources":["../../../../src/components/Permissions/PermissionRequests.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAGL,UAAU,EACV,QAAQ,EAER,SAAS,EACT,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EACL,aAAa,GAGd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,MAAM,UAAU,GAAG,CAAC,CAAe,EAAE,CAAe,EAAE,EAAE;IACtD,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI;QAAE,OAAO,CAAC,CAAC,CAAC;IACnD,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI;QAAE,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE;QAAE,OAAO,CAAC,CAAC,CAAC;IAC3B,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE;QAAE,OAAO,CAAC,CAAC;IAC1B,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAE1D,EAAE,CAAC,CAAC;IAEN,MAAM,wBAAwB,GAAG,iBAAiB,CAChD,aAAa,CAAC,uBAAuB,CACtC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,IAAI,IAAI,CAAC,wBAAwB;YAAE,OAAO;QAC/C,OAAO,IAAI,CAAC,EAAE,CAAC,yBAAyB,EAAE,CAAC,KAAK,EAAE,EAAE;YAClD,IAAI,KAAK,CAAC,IAAI,KAAK,yBAAyB;gBAAE,OAAO;YACrD,qBAAqB,CAAC,CAAC,QAAQ,EAAE,EAAE,CACjC,CAAC,GAAG,QAAQ,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAChE,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAErC,MAAM,sBAAsB,GAAG,CAC7B,OAA+B,EAC/B,KAAc,EACd,EAAE;QACF,OAAO,GAAS,EAAE;YAChB,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;YACtC,IAAI,KAAK,EAAE;gBACT,MAAM,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,
|
|
1
|
+
{"version":3,"file":"PermissionRequests.js","sourceRoot":"","sources":["../../../../src/components/Permissions/PermissionRequests.tsx"],"names":[],"mappings":"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"}
|
|
@@ -18,4 +18,4 @@ export type PaginatedGridLayoutProps = {
|
|
|
18
18
|
*/
|
|
19
19
|
pageArrowsVisible?: boolean;
|
|
20
20
|
};
|
|
21
|
-
export declare const PaginatedGridLayout: ({ groupSize, excludeLocalParticipant, indicatorsVisible, pageArrowsVisible, }: PaginatedGridLayoutProps) => JSX.Element;
|
|
21
|
+
export declare const PaginatedGridLayout: ({ groupSize, excludeLocalParticipant, indicatorsVisible, pageArrowsVisible, }: PaginatedGridLayoutProps) => JSX.Element | null;
|
|
@@ -6,8 +6,7 @@ import { ParticipantBox } from '../ParticipantBox';
|
|
|
6
6
|
import { Audio } from '../Audio';
|
|
7
7
|
import { IconButton } from '../../../components';
|
|
8
8
|
const GROUP_SIZE = 16;
|
|
9
|
-
const PaginatedGridLayoutGroup = ({ group, indicatorsVisible = true, }) => {
|
|
10
|
-
const call = useCall();
|
|
9
|
+
const PaginatedGridLayoutGroup = ({ call, group, indicatorsVisible = true, }) => {
|
|
11
10
|
return (_jsx("div", Object.assign({ className: clsx('str-video__paginated-grid-layout--group', {
|
|
12
11
|
'str-video__paginated-grid-layout--one': group.length === 1,
|
|
13
12
|
'str-video__paginated-grid-layout--two-four': group.length >= 2 && group.length <= 4,
|
|
@@ -16,6 +15,7 @@ const PaginatedGridLayoutGroup = ({ group, indicatorsVisible = true, }) => {
|
|
|
16
15
|
};
|
|
17
16
|
export const PaginatedGridLayout = ({ groupSize = GROUP_SIZE, excludeLocalParticipant = false, indicatorsVisible = true, pageArrowsVisible = true, }) => {
|
|
18
17
|
const [page, setPage] = useState(0);
|
|
18
|
+
const call = useCall();
|
|
19
19
|
const localParticipant = useLocalParticipant();
|
|
20
20
|
const participants = useParticipants();
|
|
21
21
|
// used to render audio elements
|
|
@@ -25,11 +25,14 @@ export const PaginatedGridLayout = ({ groupSize = GROUP_SIZE, excludeLocalPartic
|
|
|
25
25
|
const pageCount = participantGroups.length;
|
|
26
26
|
// update page when page count is reduced and selected page no longer exists
|
|
27
27
|
useEffect(() => {
|
|
28
|
-
if (page > pageCount - 1)
|
|
29
|
-
setPage(pageCount - 1);
|
|
28
|
+
if (page > pageCount - 1) {
|
|
29
|
+
setPage(Math.max(0, pageCount - 1));
|
|
30
|
+
}
|
|
30
31
|
}, [page, pageCount]);
|
|
31
32
|
const selectedGroup = participantGroups[page];
|
|
32
|
-
|
|
33
|
+
if (!call)
|
|
34
|
+
return null;
|
|
35
|
+
return (_jsxs(_Fragment, { children: [remoteParticipants.map((participant) => (_jsx(Audio, { muted: false, audioStream: participant.audioStream, sinkId: localParticipant === null || localParticipant === void 0 ? void 0 : localParticipant.audioOutputDeviceId }, participant.sessionId))), _jsx("div", Object.assign({ className: "str-video__paginated-grid-layout--wrapper" }, { children: _jsxs("div", Object.assign({ className: "str-video__paginated-grid-layout" }, { children: [pageArrowsVisible && pageCount > 1 && (_jsx(IconButton, { icon: "caret-left", disabled: page === 0, onClick: () => setPage((currentPage) => Math.max(0, currentPage - 1)) })), selectedGroup && (_jsx(PaginatedGridLayoutGroup, { call: call, group: participantGroups[page], indicatorsVisible: indicatorsVisible })), pageArrowsVisible && pageCount > 1 && (_jsx(IconButton, { disabled: page === pageCount - 1, icon: "caret-right", onClick: () => setPage((currentPage) => Math.min(pageCount - 1, currentPage + 1)) }))] })) }))] }));
|
|
33
36
|
};
|
|
34
37
|
// TODO: move to utilities
|
|
35
38
|
const chunk = (array, size = GROUP_SIZE) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PaginatedGridLayout.js","sourceRoot":"","sources":["../../../../../src/core/components/CallLayout/PaginatedGridLayout.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,eAAe,EACf,qBAAqB,GACtB,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"PaginatedGridLayout.js","sourceRoot":"","sources":["../../../../../src/core/components/CallLayout/PaginatedGridLayout.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
-
export declare const SpeakerLayout: () => JSX.Element;
|
|
2
|
+
export declare const SpeakerLayout: () => JSX.Element | null;
|
|
@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
|
|
|
3
3
|
import { CallTypes, combineComparators, defaultSortPreset, screenSharing, SfuModels, speakerLayoutSortPreset, } from '@stream-io/video-client';
|
|
4
4
|
import { useCall, useLocalParticipant, useParticipants, } from '@stream-io/video-react-bindings';
|
|
5
5
|
import { ParticipantBox } from '../ParticipantBox';
|
|
6
|
-
import { IconButton } from '../../../components
|
|
6
|
+
import { IconButton } from '../../../components';
|
|
7
7
|
import { useHorizontalScrollPosition } from '../../../components/StreamCall/hooks';
|
|
8
8
|
export const SpeakerLayout = () => {
|
|
9
9
|
const call = useCall();
|
|
@@ -19,12 +19,14 @@ export const SpeakerLayout = () => {
|
|
|
19
19
|
scrollWrapper === null || scrollWrapper === void 0 ? void 0 : scrollWrapper.scrollBy({ left: 150, behavior: 'smooth' });
|
|
20
20
|
};
|
|
21
21
|
useEffect(() => {
|
|
22
|
-
if (!scrollWrapper)
|
|
22
|
+
if (!scrollWrapper || !call)
|
|
23
23
|
return;
|
|
24
24
|
const cleanup = call.viewportTracker.setViewport(scrollWrapper);
|
|
25
25
|
return () => cleanup();
|
|
26
|
-
}, [scrollWrapper, call
|
|
26
|
+
}, [scrollWrapper, call]);
|
|
27
27
|
useEffect(() => {
|
|
28
|
+
if (!call)
|
|
29
|
+
return;
|
|
28
30
|
// always show the remote participant in the spotlight
|
|
29
31
|
if (isOneOnOneCall) {
|
|
30
32
|
call.setSortParticipantsBy(combineComparators(screenSharing, loggedIn));
|
|
@@ -38,6 +40,8 @@ export const SpeakerLayout = () => {
|
|
|
38
40
|
call.setSortParticipantsBy(callConfig.options.sortParticipantsBy || defaultSortPreset);
|
|
39
41
|
};
|
|
40
42
|
}, [call, isOneOnOneCall]);
|
|
43
|
+
if (!call)
|
|
44
|
+
return null;
|
|
41
45
|
const isSpeakerScreenSharing = hasScreenShare(participantInSpotlight);
|
|
42
46
|
return (_jsx("div", Object.assign({ className: "str-video__speaker-layout--wrapper" }, { children: _jsxs("div", Object.assign({ className: "str-video__speaker-layout" }, { children: [_jsx("div", Object.assign({ className: "str-video__speaker-layout--spotlight" }, { children: participantInSpotlight && (_jsx(ParticipantBox, { participant: participantInSpotlight, call: call, muteAudio: isSpeakerScreenSharing, videoKind: isSpeakerScreenSharing ? 'screen' : 'video', sinkId: localParticipant === null || localParticipant === void 0 ? void 0 : localParticipant.audioOutputDeviceId })) })), otherParticipants.length > 0 && (_jsxs("div", Object.assign({ className: "str-video__speaker-layout--participants-bar-buttons-wrapper" }, { children: [scrollPosition && scrollPosition !== 'start' && (_jsx(IconButton, { onClick: scrollStartClickHandler, icon: "caret-left", className: "str-video__speaker-layout--participants-bar-button-left" })), _jsx("div", Object.assign({ className: "str-video__speaker-layout--participants-bar-wrapper", ref: setScrollWrapper }, { children: _jsxs("div", Object.assign({ className: "str-video__speaker-layout--participants-bar" }, { children: [isSpeakerScreenSharing && (_jsx("div", Object.assign({ className: "str-video__speaker-layout--participant-tile" }, { children: _jsx(ParticipantBox, { participant: participantInSpotlight, call: call, sinkId: localParticipant === null || localParticipant === void 0 ? void 0 : localParticipant.audioOutputDeviceId, toggleMenuPosition: "top" }) }), participantInSpotlight.sessionId)), otherParticipants.map((participant) => (_jsx("div", Object.assign({ className: "str-video__speaker-layout--participant-tile" }, { children: _jsx(ParticipantBox, { participant: participant, call: call, sinkId: localParticipant === null || localParticipant === void 0 ? void 0 : localParticipant.audioOutputDeviceId, toggleMenuPosition: "top" }) }), participant.sessionId)))] })) })), scrollPosition && scrollPosition !== 'end' && (_jsx(IconButton, { onClick: scrollEndClickHandler, icon: "caret-right", className: "str-video__speaker-layout--participants-bar-button-right" }))] })))] })) })));
|
|
43
47
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpeakerLayout.js","sourceRoot":"","sources":["../../../../../src/core/components/CallLayout/SpeakerLayout.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,EACL,SAAS,EACT,kBAAkB,EAElB,iBAAiB,EACjB,aAAa,EACb,SAAS,EACT,uBAAuB,GAExB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,eAAe,GAChB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"SpeakerLayout.js","sourceRoot":"","sources":["../../../../../src/core/components/CallLayout/SpeakerLayout.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
"@nivo/core": "^0.80.0",
|
|
27
27
|
"@nivo/line": "^0.80.0",
|
|
28
28
|
"@stream-io/i18n": "^0.0.1-alpha.10",
|
|
29
|
-
"@stream-io/video-client": "^0.0.1-alpha.
|
|
30
|
-
"@stream-io/video-react-bindings": "^0.0.1-alpha.
|
|
29
|
+
"@stream-io/video-client": "^0.0.1-alpha.127",
|
|
30
|
+
"@stream-io/video-react-bindings": "^0.0.1-alpha.16",
|
|
31
31
|
"clsx": "^1.2.1",
|
|
32
32
|
"rxjs": "~7.5.7"
|
|
33
33
|
},
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"typedoc": "^0.23.24",
|
|
46
46
|
"typescript": "^4.9.5"
|
|
47
47
|
},
|
|
48
|
-
"version": "0.0.1-alpha.
|
|
48
|
+
"version": "0.0.1-alpha.18"
|
|
49
49
|
}
|
|
@@ -53,15 +53,9 @@ export const PermissionRequests = () => {
|
|
|
53
53
|
return async () => {
|
|
54
54
|
const { user, permissions } = request;
|
|
55
55
|
if (allow) {
|
|
56
|
-
await call?.
|
|
57
|
-
user_id: user.id,
|
|
58
|
-
grant_permissions: permissions,
|
|
59
|
-
});
|
|
56
|
+
await call?.grantPermissions(user.id, permissions);
|
|
60
57
|
} else {
|
|
61
|
-
await call?.
|
|
62
|
-
user_id: user.id,
|
|
63
|
-
revoke_permissions: permissions,
|
|
64
|
-
});
|
|
58
|
+
await call?.revokePermissions(user.id, permissions);
|
|
65
59
|
}
|
|
66
60
|
setPermissionRequests((requests) =>
|
|
67
61
|
requests.filter((r) => r !== request),
|
|
@@ -6,6 +6,7 @@ import {
|
|
|
6
6
|
useRemoteParticipants,
|
|
7
7
|
} from '@stream-io/video-react-bindings';
|
|
8
8
|
import {
|
|
9
|
+
Call,
|
|
9
10
|
StreamVideoLocalParticipant,
|
|
10
11
|
StreamVideoParticipant,
|
|
11
12
|
} from '@stream-io/video-client';
|
|
@@ -18,6 +19,11 @@ import { IconButton } from '../../../components';
|
|
|
18
19
|
const GROUP_SIZE = 16;
|
|
19
20
|
|
|
20
21
|
type PaginatedGridLayoutGroupProps = {
|
|
22
|
+
/**
|
|
23
|
+
* The call object.
|
|
24
|
+
*/
|
|
25
|
+
call: Call;
|
|
26
|
+
|
|
21
27
|
/**
|
|
22
28
|
* The group of participants to render.
|
|
23
29
|
*/
|
|
@@ -30,10 +36,10 @@ type PaginatedGridLayoutGroupProps = {
|
|
|
30
36
|
indicatorsVisible?: boolean;
|
|
31
37
|
};
|
|
32
38
|
const PaginatedGridLayoutGroup = ({
|
|
39
|
+
call,
|
|
33
40
|
group,
|
|
34
41
|
indicatorsVisible = true,
|
|
35
42
|
}: PaginatedGridLayoutGroupProps) => {
|
|
36
|
-
const call = useCall();
|
|
37
43
|
return (
|
|
38
44
|
<div
|
|
39
45
|
className={clsx('str-video__paginated-grid-layout--group', {
|
|
@@ -48,7 +54,7 @@ const PaginatedGridLayoutGroup = ({
|
|
|
48
54
|
<ParticipantBox
|
|
49
55
|
key={participant.sessionId}
|
|
50
56
|
participant={participant}
|
|
51
|
-
call={call
|
|
57
|
+
call={call}
|
|
52
58
|
indicatorsVisible={indicatorsVisible}
|
|
53
59
|
muteAudio
|
|
54
60
|
/>
|
|
@@ -88,6 +94,7 @@ export const PaginatedGridLayout = ({
|
|
|
88
94
|
}: PaginatedGridLayoutProps) => {
|
|
89
95
|
const [page, setPage] = useState(0);
|
|
90
96
|
|
|
97
|
+
const call = useCall();
|
|
91
98
|
const localParticipant = useLocalParticipant();
|
|
92
99
|
const participants = useParticipants();
|
|
93
100
|
// used to render audio elements
|
|
@@ -107,11 +114,14 @@ export const PaginatedGridLayout = ({
|
|
|
107
114
|
|
|
108
115
|
// update page when page count is reduced and selected page no longer exists
|
|
109
116
|
useEffect(() => {
|
|
110
|
-
if (page > pageCount - 1)
|
|
117
|
+
if (page > pageCount - 1) {
|
|
118
|
+
setPage(Math.max(0, pageCount - 1));
|
|
119
|
+
}
|
|
111
120
|
}, [page, pageCount]);
|
|
112
121
|
|
|
113
122
|
const selectedGroup = participantGroups[page];
|
|
114
123
|
|
|
124
|
+
if (!call) return null;
|
|
115
125
|
return (
|
|
116
126
|
<>
|
|
117
127
|
{remoteParticipants.map((participant) => (
|
|
@@ -128,11 +138,14 @@ export const PaginatedGridLayout = ({
|
|
|
128
138
|
<IconButton
|
|
129
139
|
icon="caret-left"
|
|
130
140
|
disabled={page === 0}
|
|
131
|
-
onClick={() =>
|
|
141
|
+
onClick={() =>
|
|
142
|
+
setPage((currentPage) => Math.max(0, currentPage - 1))
|
|
143
|
+
}
|
|
132
144
|
/>
|
|
133
145
|
)}
|
|
134
146
|
{selectedGroup && (
|
|
135
147
|
<PaginatedGridLayoutGroup
|
|
148
|
+
call={call}
|
|
136
149
|
group={participantGroups[page]}
|
|
137
150
|
indicatorsVisible={indicatorsVisible}
|
|
138
151
|
/>
|
|
@@ -142,7 +155,9 @@ export const PaginatedGridLayout = ({
|
|
|
142
155
|
disabled={page === pageCount - 1}
|
|
143
156
|
icon="caret-right"
|
|
144
157
|
onClick={() =>
|
|
145
|
-
setPage((
|
|
158
|
+
setPage((currentPage) =>
|
|
159
|
+
Math.min(pageCount - 1, currentPage + 1),
|
|
160
|
+
)
|
|
146
161
|
}
|
|
147
162
|
/>
|
|
148
163
|
)}
|
|
@@ -17,11 +17,11 @@ import {
|
|
|
17
17
|
} from '@stream-io/video-react-bindings';
|
|
18
18
|
|
|
19
19
|
import { ParticipantBox } from '../ParticipantBox';
|
|
20
|
-
import { IconButton } from '../../../components
|
|
20
|
+
import { IconButton } from '../../../components';
|
|
21
21
|
import { useHorizontalScrollPosition } from '../../../components/StreamCall/hooks';
|
|
22
22
|
|
|
23
23
|
export const SpeakerLayout = () => {
|
|
24
|
-
const call = useCall()
|
|
24
|
+
const call = useCall();
|
|
25
25
|
const [participantInSpotlight, ...otherParticipants] = useParticipants();
|
|
26
26
|
const [scrollWrapper, setScrollWrapper] = useState<HTMLDivElement | null>(
|
|
27
27
|
null,
|
|
@@ -40,14 +40,15 @@ export const SpeakerLayout = () => {
|
|
|
40
40
|
};
|
|
41
41
|
|
|
42
42
|
useEffect(() => {
|
|
43
|
-
if (!scrollWrapper) return;
|
|
43
|
+
if (!scrollWrapper || !call) return;
|
|
44
44
|
|
|
45
45
|
const cleanup = call.viewportTracker.setViewport(scrollWrapper);
|
|
46
46
|
|
|
47
47
|
return () => cleanup();
|
|
48
|
-
}, [scrollWrapper, call
|
|
48
|
+
}, [scrollWrapper, call]);
|
|
49
49
|
|
|
50
50
|
useEffect(() => {
|
|
51
|
+
if (!call) return;
|
|
51
52
|
// always show the remote participant in the spotlight
|
|
52
53
|
if (isOneOnOneCall) {
|
|
53
54
|
call.setSortParticipantsBy(combineComparators(screenSharing, loggedIn));
|
|
@@ -64,6 +65,8 @@ export const SpeakerLayout = () => {
|
|
|
64
65
|
};
|
|
65
66
|
}, [call, isOneOnOneCall]);
|
|
66
67
|
|
|
68
|
+
if (!call) return null;
|
|
69
|
+
|
|
67
70
|
const isSpeakerScreenSharing = hasScreenShare(participantInSpotlight);
|
|
68
71
|
return (
|
|
69
72
|
<div className="str-video__speaker-layout--wrapper">
|