@100mslive/react-native-room-kit 1.1.1 → 1.1.2

package/src/redux/actions/index.ts

@@ -52,6 +52,8 @@ import type {
   AddPollQuestionResponseAction,
   SetPollQuestionResponseAction,
   RemovePollQuestionResponseAction,
+  SetQuestionPointWeightageAction,
+  SetQuestionCorrectOptionAction,
 } from '../actionTypes';
 import { MeetingState } from '../../types';
 import type { ChatState, Notification, PinnedMessage } from '../../types';
@@ -529,6 +531,15 @@ export const setPollQuestionTitle = (
   title,
 });
 
+export const setPollQuestionPointWeightage = (
+  questionIndex: SetQuestionPointWeightageAction['questionIndex'],
+  pointWeightage: SetQuestionPointWeightageAction['pointWeightage']
+): SetQuestionPointWeightageAction => ({
+  type: PollsStateActionTypes.SET_POINT_WEIGHTAGE,
+  questionIndex,
+  pointWeightage,
+});
+
 export const addPollQuestionOption = (
   questionIndex: AddQuestionOptionAction['questionIndex']
 ): AddQuestionOptionAction => ({
@@ -556,6 +567,17 @@ export const editPollQuestionOption = (
   option,
 });
 
+export const setPollQuestionCorrectOption = (
+  questionIndex: SetQuestionCorrectOptionAction['questionIndex'],
+  optionIndex: SetQuestionCorrectOptionAction['optionIndex'],
+  correctOption: SetQuestionCorrectOptionAction['correctOption']
+): SetQuestionCorrectOptionAction => ({
+  type: PollsStateActionTypes.SET_QUESTION_CORRECT_OPTION,
+  questionIndex,
+  optionIndex,
+  correctOption,
+});
+
 export const setPollQuestionSkippable = (
   questionIndex: SetQuestionSkippable['questionIndex'],
   skippable: boolean

package/src/redux/reducers/polls.ts

@@ -1,4 +1,4 @@
-import { HMSPollQuestionType } from '@100mslive/react-native-hms';
+import { HMSPollQuestionType, HMSPollType } from '@100mslive/react-native-hms';
 import type { HMSPoll } from '@100mslive/react-native-hms';
 
 import {
@@ -12,14 +12,18 @@ import type {
   PollsActionType,
 } from '../actionTypes';
 
-function getDefaultQuestionObj() {
+function getDefaultQuestionObj(): PollQuestionUI {
   return {
     title: '',
     responseEditable: false,
     saved: false,
     skippable: false,
+    pointWeightage: '10',
     type: HMSPollQuestionType.singleChoice,
-    options: ['', ''],
+    options: [
+      [false, ''],
+      [false, ''],
+    ],
   };
 }
 
@@ -40,6 +44,7 @@ type IntialStateType = {
 const INITIAL_STATE: IntialStateType = {
   pollName: '',
   pollConfig: {
+    type: HMSPollType.poll,
     voteCountHidden: false,
     resultsAnonymous: false,
   },
@@ -76,6 +81,10 @@ const hmsStatesReducer = (
           ...state.pollConfig,
           ...action.pollConfig,
         },
+        questions:
+          'type' in action.pollConfig
+            ? state.questions.map((ques) => ({ ...ques, saved: false }))
+            : state.questions,
         selectedPollQuestionIndex: null,
       };
     case PollsStateActionTypes.SET_POLL_STAGE:
@@ -144,6 +153,18 @@ const hmsStatesReducer = (
             : question
         ),
       };
+    case PollsStateActionTypes.SET_POINT_WEIGHTAGE:
+      return {
+        ...state,
+        questions: state.questions.map((question, idx) =>
+          idx === action.questionIndex
+            ? {
+                ...question,
+                pointWeightage: action.pointWeightage,
+              }
+            : question
+        ),
+      };
     case PollsStateActionTypes.ADD_QUESTION_OPTION:
       return {
         ...state,
@@ -151,7 +172,7 @@ const hmsStatesReducer = (
           idx === action.questionIndex
             ? {
                 ...question,
-                options: [...(question.options || []), ''],
+                options: [...(question.options || []), [false, '']],
               }
             : question
         ),
@@ -180,12 +201,41 @@ const hmsStatesReducer = (
                 options:
                   question.options &&
                   question.options.map((option, idx) =>
-                    idx === action.optionIndex ? action.option : option
+                    idx === action.optionIndex
+                      ? [option[0], action.option]
+                      : option
                   ),
               }
             : question
         ),
       };
+    case PollsStateActionTypes.SET_QUESTION_CORRECT_OPTION:
+      return {
+        ...state,
+        questions: state.questions.map((question, idx) =>
+          idx === action.questionIndex
+            ? {
+                ...question,
+                options:
+                  question.options &&
+                  question.options.map((option, idx) => {
+                    if (
+                      action.correctOption === false ||
+                      question.type === HMSPollQuestionType.multipleChoice
+                    ) {
+                      return idx === action.optionIndex
+                        ? [action.correctOption, option[1]]
+                        : option;
+                    }
+                    return [
+                      idx === action.optionIndex ? true : false,
+                      option[1],
+                    ];
+                  }),
+              }
+            : question
+        ),
+      };
     case PollsStateActionTypes.SET_QUESTION_SKIPPABLE:
       return {
         ...state,

package/src/utils/functions.ts

@@ -12,9 +12,15 @@ import {
   HMSTrackSource,
   HMSVideoTrack,
   HMSRole,
-  HMSPollType,
+  HMSPollQuestionType,
+} from '@100mslive/react-native-hms';
+import type {
+  HMSPoll,
+  HMSPollQuestionAnswer,
+  HMSPollQuestionResponse,
+  HMSPollQuestion,
+  HMSPollQuestionOption,
 } from '@100mslive/react-native-hms';
-import type { HMSPoll } from '@100mslive/react-native-hms';
 
 import type { PeerTrackNode } from './types';
 
@@ -479,9 +485,87 @@ export const visiblePollsSelector = (
   isHLSViewer: boolean,
   hlsCuedPollIds: HMSPoll['pollId'][]
 ) => {
-  return polls.filter(
-    (poll) =>
-      poll.type !== HMSPollType.quiz &&
-      (isHLSViewer ? hlsCuedPollIds.includes(poll.pollId) : true) // Hiding quizzes from UI
+  return polls.filter((poll) =>
+    isHLSViewer ? hlsCuedPollIds.includes(poll.pollId) : true
   );
 };
+
+export function checkIsSelected(
+  pollQuestion: HMSPollQuestion,
+  option: HMSPollQuestionOption,
+  selectedOptions: number | number[] | null
+) {
+  return pollQuestion.myResponses.length > 0
+    ? pollQuestion.type === HMSPollQuestionType.singleChoice
+      ? !!pollQuestion.myResponses.find((r) => r.option === option.index)
+      : !!pollQuestion.myResponses.find((r) =>
+          r.options ? r.options.includes(option.index) : false
+        )
+    : Array.isArray(selectedOptions)
+      ? selectedOptions.includes(option.index)
+      : selectedOptions === option.index;
+}
+
+export function checkIsCorrectAnswer(
+  questionType: HMSPollQuestionType,
+  myResponses: HMSPollQuestionResponse[] | undefined,
+  answer: HMSPollQuestionAnswer | undefined
+) {
+  if (!myResponses || myResponses.length < 0 || !answer) {
+    return false;
+  }
+  const correctAnswer =
+    questionType === HMSPollQuestionType.multipleChoice
+      ? answer.options
+      : answer.option;
+
+  if (correctAnswer === undefined) {
+    return false;
+  }
+  if (Array.isArray(correctAnswer)) {
+    return myResponses.every(
+      (r) =>
+        r.options &&
+        r.options.length === correctAnswer.length &&
+        r.options.every((o) => correctAnswer.includes(o))
+    );
+  }
+  return myResponses.every((r) => r.option === correctAnswer);
+}
+
+export function checkIsCorrectOption(
+  questionType: HMSPollQuestionType,
+  option: HMSPollQuestionOption,
+  answer: HMSPollQuestionAnswer | undefined
+) {
+  if (!answer) {
+    return false;
+  }
+  const correctAnswer =
+    questionType === HMSPollQuestionType.multipleChoice
+      ? answer.options
+      : answer.option;
+
+  if (correctAnswer === undefined) {
+    return false;
+  }
+  if (Array.isArray(correctAnswer)) {
+    return correctAnswer.includes(option.index);
+  }
+  return option.index === correctAnswer;
+}
+
+export function getLabelFromPollQuestionType(
+  type: HMSPollQuestionType
+): string {
+  switch (type) {
+    case HMSPollQuestionType.singleChoice:
+      return 'Single Choice';
+    case HMSPollQuestionType.multipleChoice:
+      return 'Multiple Choice';
+    case HMSPollQuestionType.longAnswer:
+      return 'Long Answer';
+    case HMSPollQuestionType.shortAnswer:
+      return 'Short Answer';
+  }
+}