Compare commits

...

100 Commits

Author SHA1 Message Date
Hugh Nimmo-Smith
93710ff42a Remove unused code 2024-12-06 12:00:16 +00:00
Hugh Nimmo-Smith
5a1a1a7a4e Remove changes that should be in https://github.com/element-hq/element-call/pull/2771 2024-12-06 11:59:38 +00:00
Hugh Nimmo-Smith
d1c8ac1e0c Merge branch 'livekit' into toger5/loading_border 2024-12-06 11:57:41 +00:00
Timo
820ac7f28a Make the loading state more subtle
- instead of a label we show a animated gradient
2024-12-02 18:51:26 +00:00
Hugh Nimmo-Smith
d1e90939b1 Lint 2024-12-02 18:50:50 +00:00
Hugh Nimmo-Smith
40526cb7c1 Developer setting to show non-member tiles
This is based on top of https://github.com/element-hq/element-call/pull/2701
2024-12-02 18:49:11 +00:00
Hugh Nimmo-Smith
e4087b2b45 Lint 2024-12-02 18:33:14 +00:00
Hugh Nimmo-Smith
79ea8d9741 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-12-02 18:31:21 +00:00
Hugh Nimmo-Smith
70deaf0e57 Fix tests for CallEventAudioRenderer 2024-12-02 18:30:04 +00:00
Hugh Nimmo-Smith
a37e8fdb82 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-12-02 15:44:32 +00:00
Hugh Nimmo-Smith
370d8bd5d5 Review feedback 2024-12-02 14:45:20 +00:00
Hugh Nimmo-Smith
7fdcbb3292 Use if statement instead of ternary for readability in spotlight and pip logic 2024-12-02 14:35:33 +00:00
Hugh Nimmo-Smith
33f398ddcf Refactor spotlightAndPip into spotlight and pip 2024-12-02 14:10:31 +00:00
Hugh Nimmo-Smith
968de5eeeb Use named object instead of unnamed array for spotlightAndPip 2024-12-02 14:00:12 +00:00
Hugh Nimmo-Smith
3d0bfaefe8 Make the purpose of BaseMediaViewModel.local explicit 2024-12-02 13:53:40 +00:00
Hugh Nimmo-Smith
743638dfc4 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-12-02 13:33:04 +00:00
Hugh Nimmo-Smith
133dc26642 Update src/state/CallViewModel.ts
Co-authored-by: Timo <16718859+toger5@users.noreply.github.com>
2024-11-27 14:47:31 +00:00
Hugh Nimmo-Smith
cc1f0d5d19 Update src/tile/SpotlightTile.tsx
Co-authored-by: Timo <16718859+toger5@users.noreply.github.com>
2024-11-27 14:46:14 +00:00
Timo
52cb3938ef Use correct key for matrix rtc foci in code comment. (#2838) 2024-11-27 14:44:12 +00:00
Timo
765f7b4f31 Make the loading state more subtle
- instead of a label we show a animated gradient
2024-11-26 12:59:06 +01:00
Hugh Nimmo-Smith
8f9bee79ae Don't show "waiting for media..." in case of local participant 2024-11-25 21:30:54 +00:00
Hugh Nimmo-Smith
16666b8933 Additional test case 2024-11-25 21:23:18 +00:00
Hugh Nimmo-Smith
4f2591feae Show "waiting for media..." when no participant 2024-11-25 21:17:20 +00:00
Hugh Nimmo-Smith
b819a72c57 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-25 20:35:48 +00:00
Hugh Nimmo-Smith
e0651c59e0 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-23 14:58:55 +00:00
Hugh Nimmo-Smith
ee8038fefa Use asObservable when exposing subject 2024-11-21 11:32:03 +00:00
Hugh Nimmo-Smith
8f62cb675c Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-21 11:28:30 +00:00
Hugh Nimmo-Smith
bc90deb91b Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-20 17:36:49 +00:00
Hugh Nimmo-Smith
3f11f51ff0 Whitespaces 2024-11-20 12:34:20 +00:00
Hugh Nimmo-Smith
1c04d22a5b . 2024-11-20 12:29:40 +00:00
Hugh Nimmo-Smith
a63d44af0c Simplify diff
These changes are in https://github.com/element-hq/element-call/pull/2809
2024-11-20 12:28:10 +00:00
Hugh Nimmo-Smith
18e7ca567c Simplify diff 2024-11-20 12:14:41 +00:00
Hugh Nimmo-Smith
b7ecd396c5 Test case for only showing tiles for MatrixRTC session members 2024-11-20 11:16:13 +00:00
Hugh Nimmo-Smith
7677514bf5 Make it clear that we are mocking MatrixRTC memberships 2024-11-20 10:37:50 +00:00
Hugh Nimmo-Smith
138a6c7e73 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-20 10:35:49 +00:00
Hugh Nimmo-Smith
3cb5eccd2c Whitespace 2024-11-20 10:26:19 +00:00
Hugh Nimmo-Smith
edb53ae049 Fix 2024-11-20 10:24:38 +00:00
Hugh Nimmo-Smith
67a9d58aad Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-20 10:15:52 +00:00
Hugh Nimmo-Smith
256a65a119 Simplify speaking observer 2024-11-20 10:09:56 +00:00
Hugh Nimmo-Smith
8f59f087cc Fix incorrect type assertion 2024-11-20 10:09:27 +00:00
Hugh Nimmo-Smith
23579b2ab1 Expose TestScheduler as global 2024-11-18 18:02:37 +00:00
Hugh Nimmo-Smith
09de97637c Refactor 2024-11-18 17:50:59 +00:00
Hugh Nimmo-Smith
5cae84940e Fix unit test 2024-11-18 17:29:41 +00:00
Hugh Nimmo-Smith
f6a641b478 back 2024-11-14 13:51:49 +00:00
Hugh Nimmo-Smith
eafd8fd8b6 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-14 13:42:19 +00:00
Hugh Nimmo-Smith
fa3c9fde14 iterate 2024-11-14 13:34:49 +00:00
Hugh Nimmo-Smith
87c3793f69 Remove more remnants of show-non-member-tiles 2024-11-14 07:25:52 +00:00
Hugh Nimmo-Smith
b3e725fcac Remove unused code 2024-11-13 10:16:38 +00:00
Hugh Nimmo-Smith
44935eeb40 Remove option to show non-member tiles to simplify code review 2024-11-13 10:14:12 +00:00
Hugh Nimmo-Smith
83514212cd Iterate 2024-11-13 10:03:57 +00:00
Hugh Nimmo-Smith
dbbf774443 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-13 09:31:39 +00:00
Hugh Nimmo-Smith
02b96fa924 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-11 10:41:11 +00:00
Hugh Nimmo-Smith
886dc2c2fe Avoid case of one-to-one layout with missing local or remote 2024-11-08 06:50:58 +00:00
Hugh Nimmo-Smith
cf3893bf52 Tidy settings 2024-11-07 18:24:13 +00:00
Hugh Nimmo-Smith
190ac9be3d Remove unused effect for setting 2024-11-07 18:05:41 +00:00
Hugh Nimmo-Smith
c37c2e50bd Handle no local media (yet) 2024-11-07 17:53:44 +00:00
Hugh Nimmo-Smith
238797aed8 Remove isLiveKitParticipantAvailable and show via encryption status 2024-11-07 17:53:08 +00:00
Hugh Nimmo-Smith
5009f1fe1b Assertions for one-on-one view 2024-11-07 16:53:25 +00:00
Hugh Nimmo-Smith
be250e2f25 Handle no visible media id 2024-11-07 16:34:09 +00:00
Hugh Nimmo-Smith
0c4cddbb32 Apply local override where participant not yet known 2024-11-07 16:23:40 +00:00
Hugh Nimmo-Smith
bf41cfc005 Cleanup 2024-11-07 15:28:55 +00:00
Hugh Nimmo-Smith
5da642b71d Fix mocks 2024-11-07 15:24:58 +00:00
Hugh Nimmo-Smith
bb56f4205b tidy up test init 2024-11-07 14:24:20 +00:00
Hugh Nimmo-Smith
5e8a94778d tidy up handling of local rtc member in tests 2024-11-07 14:16:55 +00:00
Hugh Nimmo-Smith
6bda8953ab Tidy config of show non-member settings 2024-11-07 14:02:25 +00:00
Hugh Nimmo-Smith
95effe0852 Cleanup 2024-11-07 13:01:48 +00:00
Hugh Nimmo-Smith
0760796024 Remove throttleTime from bad merge 2024-11-07 12:12:10 +00:00
Hugh Nimmo-Smith
9bfd2e371c Revert function reordering 2024-11-07 12:02:32 +00:00
Hugh Nimmo-Smith
e515359344 Lint 2024-11-07 11:33:22 +00:00
Hugh Nimmo-Smith
dfd7273ac6 Duplicate screen sharing tiles like we used to 2024-11-07 11:30:08 +00:00
Hugh Nimmo-Smith
f9f8f378af Disable showing non-member tiles by default 2024-11-06 17:46:23 +00:00
Hugh Nimmo-Smith
59e49d5ff3 Lint 2024-11-06 17:31:06 +00:00
Hugh Nimmo-Smith
4f6b1b0e10 Tests again 2024-11-06 17:30:29 +00:00
Hugh Nimmo-Smith
efe9c9b8fe Fix RTC members in tes 2024-11-06 17:05:29 +00:00
Hugh Nimmo-Smith
462f0349d5 Wording 2024-11-06 16:35:22 +00:00
Hugh Nimmo-Smith
b1798e7f4b Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-06 16:33:57 +00:00
Hugh Nimmo-Smith
eec44702f7 Make local field based on view model class not observable 2024-11-06 16:33:53 +00:00
Hugh Nimmo-Smith
efee27ad25 More keys removal 2024-11-06 16:33:03 +00:00
Hugh Nimmo-Smith
d8d4e8942c Readonly 2024-11-06 16:07:02 +00:00
Hugh Nimmo-Smith
2c3d733714 isLiveKitParticipantAvailable 2024-11-06 15:57:39 +00:00
Hugh Nimmo-Smith
5213636d23 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-06 14:34:50 +00:00
Hugh Nimmo-Smith
a1083f3284 isRTCParticipantAvailable => isLiveKitParticipantAvailable 2024-11-06 14:29:09 +00:00
Hugh Nimmo-Smith
b0e0e0ed6b Add explicit types for public fields 2024-11-06 14:13:00 +00:00
Hugh Nimmo-Smith
bcbdb596a3 Fix user id 2024-11-06 14:12:32 +00:00
Hugh Nimmo-Smith
73107e4139 Merge fixes 2024-11-06 14:02:14 +00:00
Hugh Nimmo-Smith
c829f2f599 Lint 2024-11-06 14:02:09 +00:00
Hugh Nimmo-Smith
733b685e96 Merge branch 'livekit' into toger5/tiles_based_on_rtc_member 2024-11-06 13:42:45 +00:00
Hugh Nimmo-Smith
fecd789d02 Mock RTC members 2024-11-06 11:22:29 +00:00
Hugh Nimmo-Smith
0d1b54e071 video is optional 2024-11-06 11:15:28 +00:00
Hugh Nimmo-Smith
e7dbddb651 Fix optionality of nonMemberItemCount 2024-11-06 11:15:18 +00:00
Hugh Nimmo-Smith
bb0febf16c Remove unused keys 2024-11-05 18:32:03 +00:00
Timo
e64204d897 adapt tests (wip) 2024-11-05 17:15:50 +01:00
Timo
b5208ffeae tests 2024-11-05 12:55:48 +01:00
Timo
14919cae13 linter and tests 2024-11-04 16:36:13 +01:00
Timo
1ab4d50bab linter 2024-11-04 16:29:19 +01:00
Timo
2a5dc60066 merge fixes 2024-11-04 15:38:17 +01:00
Timo
e1e202d7c8 per member tiles 2024-11-04 12:33:15 +01:00
Timo
34e9e8aec3 add show_non_member_participants config option 2024-11-04 12:30:38 +01:00
Timo
3f233a6555 display missing lk participant + fix tile multiplier 2024-11-04 12:29:40 +01:00
Timo
5f8809ce03 make tiles based on rtc member 2024-11-04 12:29:12 +01:00
2 changed files with 36 additions and 1 deletions

View File

@@ -18,7 +18,9 @@ borders don't support gradients */
position: absolute;
z-index: -1; /* Put it below the outline */
opacity: 0; /* Hidden unless speaking */
transition: opacity ease 0.15s;
/* this only animates in one direction. In the other direction,
the background will disappear and the opacity has no effect.*/
transition: opacity ease 0.5s;
inset: calc(-1 * var(--cpd-border-width-4));
border-radius: var(--cpd-space-5x);
background-blend-mode: overlay, normal;
@@ -48,6 +50,11 @@ borders don't support gradients */
outline: var(--cpd-border-width-2) solid var(--cpd-color-bg-canvas-default) !important;
}
.tile.loading {
/* !important because loading border should take priority over hover */
outline: var(--cpd-border-width-2) solid var(--cpd-color-bg-canvas-default) !important;
}
.tile.handRaised::before {
background: linear-gradient(
119deg,
@@ -62,6 +69,31 @@ borders don't support gradients */
opacity: 1;
}
.tile.loading::before {
background: linear-gradient(
var(--angle),
var(--cpd-color-green-900) 0%,
var(--cpd-color-blue-200) 100%
);
opacity: 1;
animation: rotate-gradient linear 2s infinite;
}
@property --angle {
syntax: "<angle>";
inherits: false;
initial-value: 0deg;
}
@keyframes rotate-gradient {
from {
--angle: 0deg;
}
to {
--angle: 360deg;
}
}
@media (hover: hover) {
.tile:hover {
outline: var(--cpd-border-width-2) solid

View File

@@ -42,6 +42,7 @@ import {
useDisplayName,
LocalUserMediaViewModel,
RemoteUserMediaViewModel,
EncryptionStatus,
} from "../state/MediaViewModel";
import { Slider } from "../Slider";
import { MediaView } from "./MediaView";
@@ -145,6 +146,8 @@ const UserMediaTile = forwardRef<HTMLDivElement, UserMediaTileProps>(
className={classNames(className, styles.tile, {
[styles.speaking]: showSpeaking,
[styles.handRaised]: !showSpeaking && !!handRaised,
[styles.loading]:
encryptionStatus === EncryptionStatus.Connecting && !vm.local,
})}
nameTagLeadingIcon={
<AudioIcon