diff --git a/package-lock.json b/package-lock.json index b086bb48..693125cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7524,7 +7524,7 @@ }, "node_modules/data-model-navigator": { "version": "1.1.22", - "resolved": "git+ssh://git@github.com/CBIIT/Data-Model-Navigator.git#dc420048dd14abdd386b423e6d5e4ae95bc4fd84", + "resolved": "git+ssh://git@github.com/CBIIT/Data-Model-Navigator.git#ea5a199071066c26f248f630e4225698bcd9619d", "license": "ISC", "dependencies": { "@material-ui/core": "^4.12.4", diff --git a/src/App.tsx b/src/App.tsx index fae84fff..75095f18 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -6,13 +6,6 @@ import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import routeConfig from "./router"; import StyledNotistackAlerts from './components/StyledNotistackAlerts'; -declare module '@mui/material/styles' { - interface PaletteOptions { - Rejected: PaletteOptions['primary']; - Approved: PaletteOptions['primary'] & PaletteOptions['secondary']; - } -} - const theme = createTheme({ typography: { fontFamily: "'Nunito', sans-serif", @@ -26,17 +19,6 @@ const theme = createTheme({ xl: 1440, } }, - palette: { - Rejected: { - main: "#E25C22", - contrastText: "#FFDBCB", - }, - Approved: { - main: "#0B7F99", - contrastText: "#CDEAF0", - light: "#10EBA9", - } - }, }); const router = createBrowserRouter(routeConfig); diff --git a/src/components/Carousel/index.tsx b/src/components/Carousel/index.tsx index d7ba788b..e25fe46b 100644 --- a/src/components/Carousel/index.tsx +++ b/src/components/Carousel/index.tsx @@ -51,6 +51,11 @@ const StyledWrapper = styled('div')({ }, }); +const removeAriaHidden = () => { + const elements = document.querySelectorAll(".react-multi-carousel-item"); + elements.forEach((e) => e.removeAttribute("aria-hidden")); +}; + /** * Provides a general carousel component for displaying multiple items * at the same time. @@ -68,6 +73,7 @@ const ContentCarousel: FC = ({ children, ...props }: Props) => ( centerMode arrows focusOnSelect + afterChange={removeAriaHidden} {...props} > {children} diff --git a/src/components/DataSubmissions/DataSubmissionSummary.tsx b/src/components/DataSubmissions/DataSubmissionSummary.tsx index d728f500..27bfb5e2 100644 --- a/src/components/DataSubmissions/DataSubmissionSummary.tsx +++ b/src/components/DataSubmissions/DataSubmissionSummary.tsx @@ -22,7 +22,7 @@ const StyledSummaryWrapper = styled("div")(() => ({ })); const StyledSubmissionTitle = styled(Typography)(() => ({ - color: "#1D91AB", + color: "#187A90", fontFamily: "'Nunito Sans', 'Rubik', sans-serif", fontSize: "13px", fontStyle: "normal", diff --git a/src/components/DataSubmissions/GenericTable.tsx b/src/components/DataSubmissions/GenericTable.tsx index 5636394b..3508f8ed 100644 --- a/src/components/DataSubmissions/GenericTable.tsx +++ b/src/components/DataSubmissions/GenericTable.tsx @@ -38,7 +38,7 @@ const StyledTableContainer = styled(TableContainer)({ }); const StyledTableHead = styled(TableHead)({ - background: "#5C8FA7", + background: "#4D7C8F", }); const StyledTableRow = styled(TableRow)({ @@ -302,7 +302,7 @@ const GenericTable = ({ variant="h6" align="center" fontSize={18} - color="#AAA" + color="#757575" > {noContentText || "No existing data was found"} diff --git a/src/components/DataSubmissions/RadioInput.tsx b/src/components/DataSubmissions/RadioInput.tsx index 80b8dcaa..fbb46a9e 100644 --- a/src/components/DataSubmissions/RadioInput.tsx +++ b/src/components/DataSubmissions/RadioInput.tsx @@ -56,7 +56,7 @@ const StyledFormLabel = styled("label")(() => ({ const StyledAsterisk = styled("span")(() => ({ marginRight: "2px", - color: "#D54309", + color: "#C93F08", })); const StyledFormControlLabel = styled(FormControlLabel)(() => ({ diff --git a/src/components/DataSubmissions/ValidationStatistics.tsx b/src/components/DataSubmissions/ValidationStatistics.tsx index 9da53b8e..b6088b9a 100644 --- a/src/components/DataSubmissions/ValidationStatistics.tsx +++ b/src/components/DataSubmissions/ValidationStatistics.tsx @@ -82,7 +82,7 @@ const StyledPrimaryTitle = styled(Typography)({ fontSize: "13px", fontWeight: 600, textTransform: "uppercase", - color: "#1D91AB", + color: "#187A90", }); const StyledSecondaryStack = styled(Stack)({ @@ -96,7 +96,7 @@ const StyledSecondaryTitle = styled(Typography)({ fontSize: "13px", fontWeight: 600, textTransform: "uppercase", - color: "#1D91AB", + color: "#187A90", }); const defaultFilters: LegendFilter[] = [ diff --git a/src/components/NodeChart/index.test.tsx b/src/components/NodeChart/index.test.tsx new file mode 100644 index 00000000..ada9e60b --- /dev/null +++ b/src/components/NodeChart/index.test.tsx @@ -0,0 +1,18 @@ +import 'jest-axe/extend-expect'; + +import { axe } from 'jest-axe'; +import { render } from '@testing-library/react'; +import NodeChart from './index'; + +it('should not have any accessibility violations', async () => { + const data = [ + { label: 'Test1', value: 50, color: '#000000' }, + { label: 'Test2', value: 25, color: '#ffffff' }, + { label: 'Test3', value: 25, color: '#3b3b3b' }, + ]; + const { container } = render(); + + const results = await axe(container); + + expect(results).toHaveNoViolations(); +}); diff --git a/src/components/NodeChart/index.tsx b/src/components/NodeChart/index.tsx index eccb34f6..c3d06284 100644 --- a/src/components/NodeChart/index.tsx +++ b/src/components/NodeChart/index.tsx @@ -72,6 +72,7 @@ const NodeChart: FC = ({ label, centerCount, data }: Props) => { innerRadius={40} fill="#f2f2f2" isAnimationActive={false} + aria-label={`${label} chart background`} > {(dataset.length === 0 && hoveredSlice === null) &&