Skip to content

No ref/new prop to jump to question #251

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

Closed
wants to merge 21 commits into from
Closed

No ref/new prop to jump to question #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
dd5ccc0
reset quiz context on props change
v-i-s-h-n-u-ps Nov 7, 2024
1db8d1f
fix bug on re render
v-i-s-h-n-u-ps Nov 7, 2024
1ee8c11
modify session storage to store multiple quiz data
v-i-s-h-n-u-ps Nov 7, 2024
a123045
revert unwanted changes
v-i-s-h-n-u-ps Nov 7, 2024
1475a7f
remove unused imports
v-i-s-h-n-u-ps Nov 7, 2024
414255e
update tests
v-i-s-h-n-u-ps Nov 7, 2024
16b25cc
fix test
v-i-s-h-n-u-ps Nov 7, 2024
c390b16
added more getters
v-i-s-h-n-u-ps Dec 9, 2024
ccdd2b5
merged main remote branch
v-i-s-h-n-u-ps Dec 9, 2024
e4e734b
merged master from upstream
v-i-s-h-n-u-ps Jun 3, 2025
e198dd6
merged
v-i-s-h-n-u-ps Sep 23, 2025
4bf09ab
update text
v-i-s-h-n-u-ps Sep 23, 2025
cf31952
removed unwanted changes
v-i-s-h-n-u-ps Sep 23, 2025
bdfb096
added a jump to question event
v-i-s-h-n-u-ps Sep 24, 2025
320e8b8
fix issue with jump logic
v-i-s-h-n-u-ps Sep 28, 2025
547d1d4
added tests for new hooks
v-i-s-h-n-u-ps Oct 1, 2025
e835cc7
added documentation
v-i-s-h-n-u-ps Oct 1, 2025
e62ca24
corrected jump logic, addressed comments
v-i-s-h-n-u-ps Oct 2, 2025
a9419aa
added tests
v-i-s-h-n-u-ps Oct 2, 2025
a2fe67b
customise click event on single select question
v-i-s-h-n-u-ps Oct 2, 2025
2c2ce04
merged upstream main
v-i-s-h-n-u-ps Oct 8, 2025
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
11 changes: 2 additions & 9 deletions .../usePropsGetters/useJumpToQuestionButtonProps/useJumpToQuestionButtonProps.server.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { renderHookServerSide } from '../../../__tests__/utils.server';
import useJumpToQuestionButtonProps from '../../../../src/hooks/usePropsGetters/useJumpToQuestionButtonProps';
import { QuizAPIReducerState } from '../../../../src/components/CioQuiz/quizApiReducer';
import { QuizLocalReducerState } from '../../../../src/components/CioQuiz/quizLocalReducer';
import useJumpToQuestionButtonProps from '../../../../src/hooks/usePropsGetters/useJumpToQuestionButtonProps';

describe('Testing Hook (server): useJumpToQuestionButtonProps', () => {
it('initializes without errors and returns a function that provides button props', () => {
Expand All @@ -13,14 +12,8 @@ describe('Testing Hook (server): useJumpToQuestionButtonProps', () => {
},
} as unknown as QuizAPIReducerState;

const quizLocalStateMock = {
prevAnswerInputs: {
1: { type: 'open', value: '' },
},
} as unknown as QuizLocalReducerState;

const { result } = renderHookServerSide(
() => useJumpToQuestionButtonProps(jumpToQuestionMock, quizApiStateMock, quizLocalStateMock),
() => useJumpToQuestionButtonProps(jumpToQuestionMock, quizApiStateMock),
{
initialProps: {},
}
Expand Down
48 changes: 3 additions & 45 deletions spec/hooks/usePropsGetters/useJumpToQuestionButtonProps/useJumpToQuestionButtonProps.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { renderHook, act } from '@testing-library/react';
import useJumpToQuestionButtonProps from '../../../../src/hooks/usePropsGetters/useJumpToQuestionButtonProps';
import { QuizAPIReducerState } from '../../../../src/components/CioQuiz/quizApiReducer';
import { QuizLocalReducerState } from '../../../../src/components/CioQuiz/quizLocalReducer';

describe('Testing Hook (client): useJumpToQuestionButtonProps', () => {
const mockEvent = { preventDefault: jest.fn() } as unknown as React.MouseEvent<HTMLElement>;
Expand All @@ -15,40 +14,13 @@ describe('Testing Hook (client): useJumpToQuestionButtonProps', () => {
},
} as unknown as QuizAPIReducerState;

const quizLocalStateMock = {
prevAnswerInputs: {
1: { type: 'open', value: '' },
},
} as unknown as QuizLocalReducerState;

const { result } = renderHook(() =>
useJumpToQuestionButtonProps(jumpToQuestionMock, quizApiState, quizLocalStateMock)
useJumpToQuestionButtonProps(jumpToQuestionMock, quizApiState)
);

expect(result.current(2).className).toContain('disabled');
});

it('returns button props with disabled class if an invalid question ID is provided', () => {
const quizApiState = {
quizCurrentQuestion: {
next_question: { id: '2' },
isCoverQuestion: false,
},
} as unknown as QuizAPIReducerState;

const quizLocalStateMock = {
prevAnswerInputs: {
1: { type: 'open', value: '' },
},
} as unknown as QuizLocalReducerState;

const { result } = renderHook(() =>
useJumpToQuestionButtonProps(jumpToQuestionMock, quizApiState, quizLocalStateMock)
);

expect(result.current(-1).className).toContain('disabled');
});

it('returns button props without disabled class if an answer is provided', () => {
const quizApiState = {
quizCurrentQuestion: {
Expand All @@ -57,15 +29,8 @@ describe('Testing Hook (client): useJumpToQuestionButtonProps', () => {
},
} as unknown as QuizAPIReducerState;

const quizLocalStateMock = {
prevAnswerInputs: {
1: { type: 'open', value: '' },
2: { type: 'open', value: '' },
},
} as unknown as QuizLocalReducerState;

const { result } = renderHook(() =>
useJumpToQuestionButtonProps(jumpToQuestionMock, quizApiState, quizLocalStateMock)
useJumpToQuestionButtonProps(jumpToQuestionMock, quizApiState)
);

expect(result.current(1).className).not.toContain('disabled');
Expand All @@ -79,15 +44,8 @@ describe('Testing Hook (client): useJumpToQuestionButtonProps', () => {
},
} as unknown as QuizAPIReducerState;

const quizLocalStateMock = {
prevAnswerInputs: {
1: { type: 'open', value: '' },
2: { type: 'open', value: '' },
},
} as unknown as QuizLocalReducerState;

const { result } = renderHook(() =>
useJumpToQuestionButtonProps(jumpToQuestionMock, quizApiState, quizLocalStateMock)
useJumpToQuestionButtonProps(jumpToQuestionMock, quizApiState)
);

expect(typeof result.current(1).onClick).toBe('function');
Expand Down
3 changes: 1 addition & 2 deletions src/hooks/usePropsGetters/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ const usePropsGetters = ({

const getJumpToQuestionButtonProps: GetJumpToQuestionButtonProps = useJumpToQuestionButtonProps(
jumpToQuestion,
quizApiState,
quizLocalState
quizApiState
);

const getPreviousQuestionButtonProps: GetPreviousQuestionButtonProps =
Expand Down
21 changes: 4 additions & 17 deletions src/hooks/usePropsGetters/useJumpToQuestionButtonProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,16 @@
import { useCallback } from 'react';
import { QuizAPIReducerState } from '../../components/CioQuiz/quizApiReducer';
import { GetJumpToQuestionButtonProps, QuizEventsReturn } from '../../types';
import { QuizLocalReducerState } from '../../components/CioQuiz/quizLocalReducer';

export default function useJumpToQuestionButtonProps(
jumpToQuestion: QuizEventsReturn.JumpToQuestion,
quizApiState: QuizAPIReducerState,
quizLocalState: QuizLocalReducerState
quizApiState: QuizAPIReducerState
): GetJumpToQuestionButtonProps {
const getJumpToQuestionButtonProps: GetJumpToQuestionButtonProps = useCallback(
(id: number) => {
let buttonDisabled;

const currentQuestionId = quizApiState.quizCurrentQuestion?.next_question?.id;

const answerIds = Object.keys(quizLocalState.prevAnswerInputs);
const isInvalidQuestionId = answerIds && !answerIds.includes(String(id));
const isCurrentOrFutureQuestionId = currentQuestionId && id >= currentQuestionId;

if (isInvalidQuestionId || isCurrentOrFutureQuestionId) {
let buttonDisabled;
if (currentQuestionId && id >= currentQuestionId) {
buttonDisabled = true;
}

Expand All @@ -27,18 +19,13 @@ export default function useJumpToQuestionButtonProps(
tabIndex: buttonDisabled ? -1 : 0,
'aria-disabled': buttonDisabled ? 'true' : 'false',
'aria-describedby': buttonDisabled ? 'jump-to-button-help' : '',
disabled: !!buttonDisabled,
type: 'button',
onClick: () => {
jumpToQuestion(id);
},
};
},
[
quizLocalState.prevAnswerInputs,
quizApiState.quizCurrentQuestion?.next_question?.id,
jumpToQuestion,
]
[quizApiState.quizCurrentQuestion, jumpToQuestion]
);

return getJumpToQuestionButtonProps;
Expand Down
Loading