Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 21 additions & 8 deletions formulus-formplayer/src/components/FormProgressBar.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,29 @@ import { describe, it, expect, vi, afterEach } from 'vitest';
import { render, screen, cleanup } from '@testing-library/react';
import { ThemeProvider, createTheme } from '@mui/material/styles';
import FormProgressBar from './FormProgressBar';
import { FormplayerLocaleContext } from '../i18n/FormplayerLocaleContext';
import type { OdeUiLocale } from '../i18n/localeUtils';

const theme = createTheme();

afterEach(() => cleanup());

const renderBar = (
props: Partial<React.ComponentProps<typeof FormProgressBar>> = {},
locale: OdeUiLocale = 'en',
) =>
render(
<ThemeProvider theme={theme}>
<FormProgressBar
currentPage={0}
totalScreens={3}
mode="screens"
onNavigatePrevious={vi.fn()}
onNavigateNext={vi.fn()}
{...props}
/>
<FormplayerLocaleContext.Provider value={locale}>
<FormProgressBar
currentPage={0}
totalScreens={3}
mode="screens"
onNavigatePrevious={vi.fn()}
onNavigateNext={vi.fn()}
{...props}
/>
</FormplayerLocaleContext.Provider>
</ThemeProvider>,
);

Expand Down Expand Up @@ -73,4 +78,12 @@ describe('FormProgressBar header navigation', () => {
expect(onNavigatePrevious).toHaveBeenCalledTimes(1);
expect(onNavigateNext).toHaveBeenCalledTimes(1);
});

it('uses Portuguese accessible labels when the ODE UI locale is pt', () => {
renderBar({}, 'pt');
expect(screen.getByLabelText('Ecrã anterior')).toBeInTheDocument();
expect(screen.getByLabelText('Ecrã seguinte')).toBeInTheDocument();
expect(screen.queryByLabelText('Previous screen')).toBeNull();
expect(screen.queryByLabelText('Next screen')).toBeNull();
});
});
6 changes: 4 additions & 2 deletions formulus-formplayer/src/components/FormProgressBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Box, IconButton, LinearProgress, Typography } from '@mui/material';
import ChevronLeft from '@mui/icons-material/ChevronLeft';
import ChevronRight from '@mui/icons-material/ChevronRight';
import { tokens } from '../theme/tokens-adapter';
import { useOdeT } from '../i18n/useOdeT';

type JsonSchema = {
type?: string | string[];
Expand Down Expand Up @@ -152,6 +153,7 @@ const FormProgressBar: React.FC<FormProgressBarProps> = ({
canNavigateNext = false,
navigationDisabled = false,
}) => {
const t = useOdeT();
const progress = useMemo(() => {
if (mode === 'screens' || mode === 'both') {
if (totalScreens === 0) return 0;
Expand Down Expand Up @@ -226,7 +228,7 @@ const FormProgressBar: React.FC<FormProgressBarProps> = ({
<IconButton
type="button"
size="small"
aria-label="Previous screen"
aria-label={t('nav.previousScreen', 'Previous screen')}
onClick={handlePrev}
disabled={prevDisabled}
edge="start"
Expand Down Expand Up @@ -272,7 +274,7 @@ const FormProgressBar: React.FC<FormProgressBarProps> = ({
<IconButton
type="button"
size="small"
aria-label="Next screen"
aria-label={t('nav.nextScreen', 'Next screen')}
onClick={handleNext}
disabled={nextDisabled}
edge="end"
Expand Down