appease linter

fixup
Update src/room/LobbyView.tsx
2026-08-23 20:59:21 +00:00 · 2025-10-06 19:47:59 +01:00 · 2025-10-06 19:41:27 +01:00 · 2025-10-06 19:04:43 +01:00 · 2025-10-06 17:42:06 +01:00 · 2025-10-06 16:35:16 +01:00
3 changed files with 18 additions and 6 deletions
--- a/src/room/GroupCallView.tsx
+++ b/src/room/GroupCallView.tsx
@@ -436,7 +436,7 @@ export const GroupCallView: FC<Props> = ({
        client={client}
        matrixInfo={matrixInfo}
        muteStates={muteStates}
-        onEnter={() => void enterRTCSessionOrError(rtcSession)}
+        onEnter={async () => enterRTCSessionOrError(rtcSession)}
        confineToRoom={confineToRoom}
        hideHeader={header === HeaderStyle.None}
        participantCount={participantCount}
--- a/src/room/LobbyView.tsx
+++ b/src/room/LobbyView.tsx
@@ -57,7 +57,7 @@ interface Props {
  client: MatrixClient;
  matrixInfo: MatrixInfo;
  muteStates: MuteStates;
-  onEnter: () => void;
+  onEnter: () => Promise<void>;
  enterLabel?: JSX.Element | string;
  confineToRoom: boolean;
  hideHeader: boolean;
@@ -193,6 +193,14 @@ export const LobbyView: FC<Props> = ({

  useTrackProcessorSync(videoTrack);

+  const [waitingToEnter, setWaitingToEnter] = useState(false);
+  const onEnterCall = useCallback(() => {
+    setWaitingToEnter(true);
+    void onEnter().finally(() => setWaitingToEnter(false));
+  }, [onEnter]);
+
+  const waiting = waitingForInvite || waitingToEnter;
+
  // TODO: Unify this component with InCallView, so we can get slick joining
  // animations and don't have to feel bad about reusing its CSS
  return (
@@ -222,11 +230,12 @@ export const LobbyView: FC<Props> = ({
          >
            <Button
              className={classNames(styles.join, {
-                [styles.wait]: waitingForInvite,
+                [styles.wait]: waiting,
              })}
-              size={waitingForInvite ? "sm" : "lg"}
+              size={waiting ? "sm" : "lg"}
+              disabled={waiting}
              onClick={() => {
-                if (!waitingForInvite) onEnter();
+                if (!waiting) onEnterCall();
              }}
              data-testid="lobby_joinCall"
            >
--- a/src/room/RoomPage.tsx
+++ b/src/room/RoomPage.tsx
@@ -151,7 +151,10 @@ export const RoomPage: FC = () => {
                  : E2eeType.NONE,
              },
            }}
-            onEnter={(): void => knock?.()}
+            onEnter={async (): Promise<void> => {
+              knock?.();
+              return Promise.resolve();
+            }}
            enterLabel={label}
            waitingForInvite={groupCallState.kind === "waitForInvite"}
            confineToRoom={confineToRoom}
Author	SHA1	Message	Date
Half-Shot	53727bac58	appease linter	2025-10-06 19:47:59 +01:00
Half-Shot	016c4dcac9	fixup	2025-10-06 19:41:27 +01:00
Will Hunt	44a2809f79	Update src/room/LobbyView.tsx Co-authored-by: Robin <robin@robin.town>	2025-10-06 19:04:43 +01:00
Half-Shot	a33fda5637	fix	2025-10-06 17:42:06 +01:00
Half-Shot	eca716b74d	cleanup	2025-10-06 16:35:16 +01:00
Half-Shot	8691473329	Disable call button while the call is connecting.	2025-10-06 16:02:44 +01:00
Will Hunt	d24da1859e	Add media hints for notification events. (#3493 ) * Add media hints for notification events. * Prevent showing calling view when disconnected from Livekit. (#3491) * Refactor disconnection handling * Use "unknown" * Update signature * Add tests * Expose livekitConnectionState directly * fix whoopsie * Update dependency livekit-client to v2.15.7 (#3496) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Fix the interactivity of buttons while reconnecting or in earpiece mode (#3486) * Fix the interactivity of buttons while reconnecting or in earpiece mode When we're in one of these modes, we need to ensure that everything above the overlay (the header and footer buttons) is interactive, while everything obscured by the overlay (the media tiles) is non-interactive and removed from the accessibility tree. It's not a very easy task to trap focus outside an element, so the best solution I could come up with is to set tabindex="-1" manually on all interactive elements belonging to the media tiles. * Write a Playwright test for reconnecting * fix lints Signed-off-by: Timo K <toger5@hotmail.de> * fix test Signed-off-by: Timo K <toger5@hotmail.de> * enable http2 for matrx-rtc host to allow the jwt service to talk to the SFU * remove rate limit for delayed events * more time to connect to livekit SFU * Due to a Firefox issue we set the start anchor for the tab test to the Mute microphone button * adapt to most recent Element Web version * Use the "End call" button as proofe for a started call * Currrenty disabled due to recent Element Web - not indicating the number of participants - bypassing Lobby * linting * disable 'can only interact with header and footer while reconnecting' for firefox --------- Signed-off-by: Timo K <toger5@hotmail.de> Co-authored-by: Timo <16718859+toger5@users.noreply.github.com> Co-authored-by: Timo K <toger5@hotmail.de> Co-authored-by: fkwp <github-fkwp@w4ve.de> * Log when a track is unpublished or runs into an error (#3495) * default mute states (unmuted!) in widget mode (embedded + intent) (#3494) * default mute states (unmuted!) in widget mode (embedded + intent) Signed-off-by: Timo K <toger5@hotmail.de> * review Signed-off-by: Timo K <toger5@hotmail.de> * introduce a cache for the url params. Signed-off-by: Timo K <toger5@hotmail.de> * Add an option to skip the cache. Signed-off-by: Timo K <toger5@hotmail.de> --------- Signed-off-by: Timo K <toger5@hotmail.de> * Apply new hint code * missed a bit * fix intent * Automatically update intent on mute change * update packages * lint * Fix tests * fix merge fails --------- Signed-off-by: Timo K <toger5@hotmail.de> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Robin <robin@robin.town> Co-authored-by: Timo <16718859+toger5@users.noreply.github.com> Co-authored-by: Timo K <toger5@hotmail.de> Co-authored-by: fkwp <github-fkwp@w4ve.de>	2025-09-25 13:02:43 +01:00