* make tiles based on rtc member * display missing lk participant + fix tile multiplier * add show_non_member_participants config option * per member tiles * merge fixes * linter * linter and tests * tests * adapt tests (wip) * Remove unused keys * Fix optionality of nonMemberItemCount * video is optional * Mock RTC members * Lint * Merge fixes * Fix user id * Add explicit types for public fields * isRTCParticipantAvailable => isLiveKitParticipantAvailable * isLiveKitParticipantAvailable * Readonly * More keys removal * Make local field based on view model class not observable * Wording * Fix RTC members in tes * Tests again * Lint * Disable showing non-member tiles by default * Duplicate screen sharing tiles like we used to * Lint * Revert function reordering * Remove throttleTime from bad merge * Cleanup * Tidy config of show non-member settings * tidy up handling of local rtc member in tests * tidy up test init * Fix mocks * Cleanup * Apply local override where participant not yet known * Handle no visible media id * Assertions for one-on-one view * Remove isLiveKitParticipantAvailable and show via encryption status * Handle no local media (yet) * Remove unused effect for setting * Tidy settings * Avoid case of one-to-one layout with missing local or remote * Iterate * Remove option to show non-member tiles to simplify code review * Remove unused code * Remove more remnants of show-non-member-tiles * iterate * back * Fix unit test * Refactor * Expose TestScheduler as global * Fix incorrect type assertion * Simplify speaking observer * Fix * Whitespace * Make it clear that we are mocking MatrixRTC memberships * Test case for only showing tiles for MatrixRTC session members * Simplify diff * Simplify diff These changes are in https://github.com/element-hq/element-call/pull/2809 * . * Whitespaces * Use asObservable when exposing subject * Show "waiting for media..." when no participant * Additional test case * Don't show "waiting for media..." in case of local participant * Make the loading state more subtle - instead of a label we show a animated gradient * Use correct key for matrix rtc foci in code comment. (#2838) * Update src/tile/SpotlightTile.tsx Co-authored-by: Timo <16718859+toger5@users.noreply.github.com> * Update src/state/CallViewModel.ts Co-authored-by: Timo <16718859+toger5@users.noreply.github.com> * Make the purpose of BaseMediaViewModel.local explicit * Use named object instead of unnamed array for spotlightAndPip * Refactor spotlightAndPip into spotlight and pip * Use if statement instead of ternary for readability in spotlight and pip logic * Review feedback * Fix tests for CallEventAudioRenderer * Lint * Revert "Make the loading state more subtle" This reverts commit 765f7b4f319b86839fcb4fde28d1e0604e542577. * Update src/state/CallViewModel.ts Co-authored-by: Timo <16718859+toger5@users.noreply.github.com> * Fix spelling * Remove a non-null assertion that failed at runtime --------- Co-authored-by: Hugh Nimmo-Smith <hughns@element.io> Co-authored-by: Hugh Nimmo-Smith <hughns@users.noreply.github.com>
100 lines
2.9 KiB
TypeScript
100 lines
2.9 KiB
TypeScript
/*
|
|
Copyright 2024 New Vector Ltd.
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
Please see LICENSE in the repository root for full details.
|
|
*/
|
|
|
|
import { expect, test, vi } from "vitest";
|
|
|
|
import {
|
|
mockRtcMembership,
|
|
withLocalMedia,
|
|
withRemoteMedia,
|
|
withTestScheduler,
|
|
} from "../utils/test";
|
|
|
|
const rtcMembership = mockRtcMembership("@alice:example.org", "AAAA");
|
|
|
|
test("control a participant's volume", async () => {
|
|
const setVolumeSpy = vi.fn();
|
|
await withRemoteMedia(rtcMembership, {}, { setVolume: setVolumeSpy }, (vm) =>
|
|
withTestScheduler(({ expectObservable, schedule }) => {
|
|
schedule("-ab---c---d|", {
|
|
a() {
|
|
// Try muting by toggling
|
|
vm.toggleLocallyMuted();
|
|
expect(setVolumeSpy).toHaveBeenLastCalledWith(0);
|
|
},
|
|
b() {
|
|
// Try unmuting by dragging the slider back up
|
|
vm.setLocalVolume(0.6);
|
|
vm.setLocalVolume(0.8);
|
|
vm.commitLocalVolume();
|
|
expect(setVolumeSpy).toHaveBeenCalledWith(0.6);
|
|
expect(setVolumeSpy).toHaveBeenLastCalledWith(0.8);
|
|
},
|
|
c() {
|
|
// Try muting by dragging the slider back down
|
|
vm.setLocalVolume(0.2);
|
|
vm.setLocalVolume(0);
|
|
vm.commitLocalVolume();
|
|
expect(setVolumeSpy).toHaveBeenCalledWith(0.2);
|
|
expect(setVolumeSpy).toHaveBeenLastCalledWith(0);
|
|
},
|
|
d() {
|
|
// Try unmuting by toggling
|
|
vm.toggleLocallyMuted();
|
|
// The volume should return to the last non-zero committed volume
|
|
expect(setVolumeSpy).toHaveBeenLastCalledWith(0.8);
|
|
},
|
|
});
|
|
expectObservable(vm.localVolume).toBe("ab(cd)(ef)g", {
|
|
a: 1,
|
|
b: 0,
|
|
c: 0.6,
|
|
d: 0.8,
|
|
e: 0.2,
|
|
f: 0,
|
|
g: 0.8,
|
|
});
|
|
}),
|
|
);
|
|
});
|
|
|
|
test("toggle fit/contain for a participant's video", async () => {
|
|
await withRemoteMedia(rtcMembership, {}, {}, (vm) =>
|
|
withTestScheduler(({ expectObservable, schedule }) => {
|
|
schedule("-ab|", {
|
|
a: () => vm.toggleFitContain(),
|
|
b: () => vm.toggleFitContain(),
|
|
});
|
|
expectObservable(vm.cropVideo).toBe("abc", {
|
|
a: true,
|
|
b: false,
|
|
c: true,
|
|
});
|
|
}),
|
|
);
|
|
});
|
|
|
|
test("local media remembers whether it should always be shown", async () => {
|
|
await withLocalMedia(rtcMembership, {}, (vm) =>
|
|
withTestScheduler(({ expectObservable, schedule }) => {
|
|
schedule("-a|", { a: () => vm.setAlwaysShow(false) });
|
|
expectObservable(vm.alwaysShow).toBe("ab", { a: true, b: false });
|
|
}),
|
|
);
|
|
// Next local media should start out *not* always shown
|
|
await withLocalMedia(
|
|
rtcMembership,
|
|
|
|
{},
|
|
(vm) =>
|
|
withTestScheduler(({ expectObservable, schedule }) => {
|
|
schedule("-a|", { a: () => vm.setAlwaysShow(true) });
|
|
expectObservable(vm.alwaysShow).toBe("ab", { a: false, b: true });
|
|
}),
|
|
);
|
|
});
|