Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: correct voting count during disconnection #3396

Closed
wants to merge 15 commits into from
Closed

fix: correct voting count during disconnection #3396

Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
580d445
Release - 0.12.16 (#3116)
KaustubhKumar05 Jul 22, 2024
f185635
Release - 0.12.17
raviteja83 Aug 14, 2024
66b20cd
Release - 0.12.18
raviteja83 Aug 16, 2024
a015a71
Update README.md (#3222)
KaustubhKumar05 Sep 4, 2024
b1bdfdb
Release - 0.12.19
raviteja83 Sep 9, 2024
c094ee2
feat: apply policy settings to tracks added via addTrack
raviteja83 Sep 18, 2024
da50781
Release - 0.12.20
raviteja83 Sep 18, 2024
e2911e4
Merge branch 'dev'
raviteja83 Sep 30, 2024
956f7b9
Release - 0.12.22
raviteja83 Oct 14, 2024
b82ff1d
Release - 0.12.23
raviteja83 Oct 15, 2024
5fa06e7
Release - 0.12.24 (#3370)
KaustubhKumar05 Nov 11, 2024
e053c9f
Release - 0.12.25 (#3387)
KaustubhKumar05 Nov 28, 2024
d56ae09
fix: disable voting for ice disconncetion
hdz-666 Dec 3, 2024
3d09fe3
fix: add localstate handling for vote for polls and quiz on disconnect
hdz-666 Dec 9, 2024
9e07b4e
Merge branch 'dev' into feat/ISS-30705-voting-while-disconnection
ygit Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions packages/roomkit-react/src/Prebuilt/components/Polls/Voting/QuestionCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
// @ts-check
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { match } from 'ts-pattern';
import { selectLocalPeer, selectLocalPeerRoleName, useHMSActions, useHMSStore } from '@100mslive/react-sdk';
import {
HMSRoomState,
selectLocalPeer,
selectLocalPeerRoleName,
selectRoomState,
useHMSActions,
useHMSStore,
} from '@100mslive/react-sdk';
import { CheckCircleIcon, ChevronDownIcon, CrossCircleIcon } from '@100mslive/react-icons';
import { Box, Button, Flex, Text } from '../../../../';
import { checkCorrectAnswer } from '../../../common/utils';
Expand All @@ -27,7 +34,7 @@ export const QuestionCard = ({
}) => {
const actions = useHMSActions();
const localPeer = useHMSStore(selectLocalPeer);

const roomState = useHMSStore(selectRoomState);
const isLocalPeerCreator = localPeer?.id === startedBy;
const localPeerRoleName = useHMSStore(selectLocalPeerRoleName);
const roleCanViewResponse =
Expand Down Expand Up @@ -183,13 +190,19 @@ export const QuestionCard = ({
) : null}
</Box>
{isLive && (
<QuestionActions isValidVote={isValidVote} onVote={handleVote} response={localPeerChoice} isQuiz={isQuiz} />
<QuestionActions
disableVote={roomState !== HMSRoomState.Connected}
isValidVote={isValidVote}
onVote={handleVote}
response={localPeerChoice}
isQuiz={isQuiz}
/>
)}
</Box>
);
};

const QuestionActions = ({ isValidVote, response, isQuiz, onVote }) => {
const QuestionActions = ({ isValidVote, response, isQuiz, onVote, disableVote }) => {
return (
<Flex align="center" justify="end" css={{ gap: '$4', w: '100%' }}>
{response ? (
Expand All @@ -199,7 +212,7 @@ const QuestionActions = ({ isValidVote, response, isQuiz, onVote }) => {
{!isQuiz && !response.skipped ? 'Voted' : null}
</Text>
) : (
<Button css={{ p: '$xs $10', fontWeight: '$semiBold' }} disabled={!isValidVote} onClick={onVote}>
<Button css={{ p: '$xs $10', fontWeight: '$semiBold' }} disabled={!isValidVote || disableVote} onClick={onVote}>
{isQuiz ? 'Answer' : 'Vote'}
</Button>
)}
Expand Down
Loading