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

Jump to bottom

Feature/dev 7434a #1226

Merged
merged 3 commits into from
Apr 11, 2024
Merged

Feature/dev 7434a #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ac21cf
[DEV-7434a] Fix SkipTo component
Atash3000 Apr 11, 2024
772f624
Merge DEV into 7434
Atash3000 Apr 11, 2024
652db7b
[DEV-7434a] Add useID
Atash3000 Apr 11, 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
4 changes: 2 additions & 2 deletions packages/chart/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<!-- GENERIC CHART TYPES -->
<!-- <div class="react-container" data-config="/examples/private/rvr.json"></div> -->
<!-- <div class="react-container" data-config="/examples/feature/filters/url-filter.json"></div> -->
<div class="react-container" data-config="/examples/feature/bar/additional-column-tooltip.json"></div>
<!-- <div class="react-container" data-config="/examples/feature/bar/additional-column-tooltip.json"></div> -->
<!-- <div class="react-container" data-config="https://cdc.gov/poxvirus/mpox/modules/data-viz/mpx-trends_1.json"></div> -->
<!-- <div class="react-container" data-config="/examples/feature/area/area-chart-date-city-temperature.json"></div> -->
<!-- <div class="react-container" data-config="/examples/feature/area/area-chart-date-apple.json"></div> -->
Expand All @@ -69,7 +69,7 @@
<!-- <div class="react-container" data-config="/examples/feature/boxplot/boxplot.json"></div> -->
<!-- <div class="react-container" data-config="/examples/feature/combo/planet-combo-example-config.json"></div> -->
<!-- <div class="react-container" data-config="/examples/feature/combo/right-issues.json"></div> -->
<div class="react-container" data-config="/examples/region-issue.json"></div>
<!-- <div class="react-container" data-config="/examples/region-issue.json"></div> -->

<!-- BAR -->
<!-- <div class="react-container" data-config="/examples/feature/bar/planet-example-config.json"></div> -->
Expand Down
3 changes: 1 addition & 2 deletions packages/chart/src/CdcChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1054,10 +1054,9 @@ export default function CdcChart({ configUrl, config: configObj, isEditor = fals
{!missingRequiredSections() && !config.newViz && (
<div className='cdc-chart-inner-container' aria-label={handleChartAriaLabels(config)} tabIndex={0}>
<Title showTitle={config.showTitle} isDashboard={isDashboard} title={title} superTitle={config.superTitle} classes={['chart-title', `${config.theme}`, 'cove-component__header']} style={undefined} />
<SkipTo skipId={handleChartTabbing} skipMessage='Skip Over Chart Container' />

{/* Filters */}
{config.filters && !externalFilters && config.visualizationType !== 'Spark Line' && <Filters config={config} setConfig={setConfig} setFilteredData={setFilteredData} filteredData={filteredData} excludedData={excludedData} filterData={filterData} dimensions={dimensions} />}
<SkipTo skipId={handleChartTabbing} skipMessage='Skip Over Chart Container' />
{/* Visualization */}
{config?.introText && config.visualizationType !== 'Spark Line' && <section className='introText'>{parse(config.introText)}</section>}
<div
Expand Down
33 changes: 31 additions & 2 deletions packages/core/components/elements/SkipTo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { useId } from 'react'

type SkipToProps = {
// id to skip to
skipId: string
Expand All @@ -8,10 +9,38 @@ type SkipToProps = {

const SkipTo: React.FC<SkipToProps> = ({ skipId, skipMessage }) => {
const accessibleId = useId()
const handleOnClick = () => {
// Navigate to the specific part of the page
const targetElement = document.getElementById(skipId)
if (targetElement) {
targetElement.scrollIntoView()
targetElement.setAttribute('tabIndex', '-1')
targetElement.focus()
// Setup to remove tabIndex on blur to maintain document flow
const blurListener = () => {
targetElement.removeAttribute('tabIndex')
targetElement.removeEventListener('blur', blurListener)
}
targetElement.addEventListener('blur', blurListener)
}
}
return (
<a id={`skip-nav--${accessibleId}`} className='cdcdataviz-sr-only-focusable' href={`#${skipId}`}>
<div
tabIndex={0}
id={`skip-nav--${accessibleId}`}
className='cdcdataviz-sr-only-focusable'
onClick={handleOnClick}
onKeyDown={e => {
if (e.key === 'Enter' || e.key === ' ') {
handleOnClick()
}
}}
role='link'
aria-label={skipMessage}
>
{skipMessage}
</a>
</div>
)
}

export default SkipTo
11 changes: 7 additions & 4 deletions packages/core/styles/_global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ strong {
border: 0 !important;
display: flex;
}

.cdcdataviz-sr-only-focusable:focus {
width: fit-content;
margin-bottom: 0.5em;
margin-left: 1em;
}
.inline-icon {
width: 1em !important;
height: auto !important;
Expand Down Expand Up @@ -80,9 +84,9 @@ strong {
}
&.danger {
background-color: $red;
padding: 0em 0.6em 0.0em;
padding: 0em 0.6em 0em;
height: 1.6em;
font-size: 0.8 em;
font-size: 0.8 em;
color: #fff;
&:hover {
background-color: darken($red, 5%);
Expand Down Expand Up @@ -193,4 +197,3 @@ section.footnotes {
.margin-left-href {
margin-left: 15px;
}