Skip to content

Interactive interface for browsing global, full-resolution satellite imagery

WV-2811: ESLint Cleanup: Accessibility Part 3 (#6455)

Jason Hurley2c74dc2c1b87
diff --git a/e2e/features/animation/animation-test.spec.js b/e2e/features/animation/animation-test.spec.js
index 1f2d778f6..ea43c1150 100644
--- a/e2e/features/animation/animation-test.spec.js
+++ b/e2e/features/animation/animation-test.spec.js
@@ -64,8 +64,8 @@ test('Disable playback when max frames exceeded', async () => {
const { playButton, yearStartInput } = selectors
await page.goto(animationGeostationary)
await closeModal(page)
- const animateYearDown = page.locator('.wv-date-range-selector > div > div > div:nth-child(3) > svg.downarrow').first()
- const animateYearUp = page.locator('.wv-date-range-selector > div > div > div > svg.uparrow').first()
+ const animateYearDown = page.locator('.wv-date-range-selector > div > div > button:nth-child(3) > svg.downarrow').first()
+ const animateYearUp = page.locator('.wv-date-range-selector > div > div > button > svg.uparrow').first()
await animateYearDown.click()
await expect(playButton).toHaveClass(/disabled/)
// Playback re-enabled when frames within the max
diff --git a/e2e/features/compare/compare-mobile-test.spec.js b/e2e/features/compare/compare-mobile-test.spec.js
index ebd8e92ad..103c2a98b 100644
--- a/e2e/features/compare/compare-mobile-test.spec.js
+++ b/e2e/features/compare/compare-mobile-test.spec.js
@@ -23,8 +23,8 @@ test.afterAll(async () => {
test('Mobile comparison A|B toggle buttons are visible and only A is selected by default', async () => {
await page.goto(swipeAndAIsActive)
await closeModal(page)
- const aMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(1)')
- const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')
+ const aMobileCompareButton = page.locator('.comparison-mobile-select-toggle > button:nth-child(1)')
+ const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > button:nth-child(2)')
await expect(aMobileCompareButton).toHaveClass(/compare-btn-selected/)
await expect(bMobileCompareButton).not.toHaveClass(/compare-btn-selected/)
})
@@ -32,7 +32,7 @@ test('Mobile comparison A|B toggle buttons are visible and only A is selected by
// toggle select B change compare mode date to B
test('Toggling to B compare side changes mobile date picker date', async () => {
const { mobileDatePickerSelectButton } = selectors
- const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')
+ const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > button:nth-child(2)')
// confirm initial A mobile date picker date
await expect(mobileDatePickerSelectButton).toHaveText('2018 AUG 17')
// click B compare toggle button and confirm B mobile date picker date
@@ -63,8 +63,8 @@ test('Expand mobile layer list and confirm comparison mode button is present and
// B compare button toggle is selected on B permalink load and A is not selected
test('B compare button toggle is only selected on B permalink load', async () => {
await page.goto(spyAndBIsActive)
- const aMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(1)')
- const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > div:nth-child(2)')
+ const aMobileCompareButton = page.locator('.comparison-mobile-select-toggle > button:nth-child(1)')
+ const bMobileCompareButton = page.locator('.comparison-mobile-select-toggle > button:nth-child(2)')
await expect(aMobileCompareButton).not.toHaveClass(/compare-btn-selected/)
await expect(bMobileCompareButton).toHaveClass(/compare-btn-selected/)
})
diff --git a/e2e/features/timeline/timeline-test.spec.js b/e2e/features/timeline/timeline-test.spec.js
index 0d463024c..f762342b4 100644
--- a/e2e/features/timeline/timeline-test.spec.js
+++ b/e2e/features/timeline/timeline-test.spec.js
@@ -51,7 +51,7 @@ test('Interval defaults to 1 DAY', async () => {
})
test('Change to month zoom level and axis changes', async () => {
- await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()
+ await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()
const axisGridDay = await page.locator('.axis-grid-text-day').first()
const axisGridMonth = await page.locator('.axis-grid-text-month').first()
const currentZoom = await page.locator('#current-zoom')
@@ -61,8 +61,8 @@ test('Change to month zoom level and axis changes', async () => {
})
test('Change to year zoom level and axis changes', async () => {
- await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()
- await page.locator('.zoom-level-change div.date-arrows.date-arrow-up').click()
+ await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()
+ await page.locator('.zoom-level-change button.date-arrows.date-arrow-up').click()
const axisGridDay = await page.locator('.axis-grid-text-day').first()
const axisGridYear = await page.locator('.axis-grid-text-year').first()
const currentZoom = await page.locator('#current-zoom')
diff --git a/e2e/test-utils/global-variables/selectors.js b/e2e/test-utils/global-variables/selectors.js
index e5e992874..4d08fdda4 100644
--- a/e2e/test-utils/global-variables/selectors.js
+++ b/e2e/test-utils/global-variables/selectors.js
@@ -112,12 +112,12 @@ module.exports = (page) => ({
dragger: page.locator('.timeline-dragger'),
draggerA: page.locator('.timeline-dragger.draggerA'),
draggerB: page.locator('.timeline-dragger.draggerB'),
- dayDown: page.locator('.input-wrapper-day > div.date-arrows.date-arrow-down'),
- dayUp: page.locator('.input-wrapper-day > div.date-arrows.date-arrow-up'),
- monthDown: page.locator('.input-wrapper-month > div.date-arrows.date-arrow-down'),
- monthUp: page.locator('.input-wrapper-month > div.date-arrows.date-arrow-up'),
- yearDown: page.locator('.input-wrapper-year > div.date-arrows.date-arrow-down'),
- yearUp: page.locator('.input-wrapper-year > div.date-arrows.date-arrow-up'),
+ dayDown: page.locator('.input-wrapper-day > button.date-arrows.date-arrow-down'),
+ dayUp: page.locator('.input-wrapper-day > button.date-arrows.date-arrow-up'),
+ monthDown: page.locator('.input-wrapper-month > button.date-arrows.date-arrow-down'),
+ monthUp: page.locator('.input-wrapper-month > button.date-arrows.date-arrow-up'),
+ yearDown: page.locator('.input-wrapper-year > button.date-arrows.date-arrow-down'),
+ yearUp: page.locator('.input-wrapper-year > button.date-arrows.date-arrow-up'),
datePickerWheel: page.locator('.datepicker-modal .datepicker-wheel'),
dateSelectorDayInput: page.locator('#date-selector-main .input-wrapper-day input'),
dateSelectorMonthInput: page.locator('#date-selector-main .input-wrapper-month input'),
diff --git a/package-lock.json b/package-lock.json
index d4ff7ce02..3e87be959 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -198,6 +198,7 @@
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz",
"integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@babel/code-frame": "^7.29.0",
"@babel/generator": "^7.29.0",
@@ -1999,6 +2000,7 @@
"integrity": "sha512-eohl3hKTiVyD1ilYdw9T0OiB4hnjef89e3dMYKz+mVKDzj+5IteTseASUsOB+EU9Tf6VNTCjDePcP6wkDGmLKQ==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"@keyv/serialize": "^1.1.1"
}
@@ -2110,6 +2112,7 @@
}
],
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=18"
},
@@ -2151,6 +2154,7 @@
}
],
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=18"
}
@@ -2578,6 +2582,7 @@
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-7.2.0.tgz",
"integrity": "sha512-6639htZMjEkwskf3J+e6/iar+4cTNM9qhoWuRfj9F3eJD6r7iCzV1SWnQr2Mdv0QT0suuqU8BoJCZUyCtP9R4Q==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@fortawesome/fontawesome-common-types": "7.2.0"
},
@@ -4184,6 +4189,7 @@
"node_modules/@popperjs/core": {
"version": "2.11.8",
"license": "MIT",
+ "peer": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/popperjs"
@@ -4552,6 +4558,7 @@
"node_modules/@types/react": {
"version": "19.1.7",
"license": "MIT",
+ "peer": true,
"dependencies": {
"csstype": "^3.0.2"
}
@@ -5289,6 +5296,7 @@
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
"integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
"license": "MIT",
+ "peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -5343,6 +5351,7 @@
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
"integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.3",
"fast-uri": "^3.0.1",
@@ -5730,6 +5739,7 @@
}
],
"license": "MIT",
+ "peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.9.0",
"caniuse-lite": "^1.0.30001759",
@@ -6190,6 +6200,7 @@
}
],
"license": "MIT",
+ "peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.8.25",
"caniuse-lite": "^1.0.30001754",
@@ -6841,6 +6852,7 @@
}
],
"license": "MIT",
+ "peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.9.0",
"caniuse-lite": "^1.0.30001759",
@@ -8150,6 +8162,7 @@
"integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
"deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.6.1",
@@ -8418,6 +8431,7 @@
"version": "2.32.0",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"@rtsao/scc": "^1.1.0",
"array-includes": "^3.1.9",
@@ -8530,6 +8544,7 @@
"version": "6.10.2",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"aria-query": "^5.3.2",
"array-includes": "^3.1.8",
@@ -8591,6 +8606,7 @@
"integrity": "sha512-/gC7/KAYmfNnPNOb3eu8vw+TdVnV0zhdQwexsw6FLXbhzroVj20vRn2qL8lDWDGnAQ2J8DhdfvXxX9EoxvERvw==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.5.0",
"enhanced-resolve": "^5.17.1",
@@ -8705,6 +8721,7 @@
"version": "7.2.1",
"dev": true,
"license": "ISC",
+ "peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.4.0"
},
@@ -8722,6 +8739,7 @@
"version": "7.37.5",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"array-includes": "^3.1.8",
"array.prototype.findlast": "^1.2.5",
@@ -8754,6 +8772,7 @@
"resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz",
"integrity": "sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@babel/core": "^7.24.4",
"@babel/parser": "^7.24.4",
@@ -11161,6 +11180,7 @@
"integrity": "sha512-F26gjC0yWN8uAA5m5Ss8ZQf5nDHWGlN/xWZIh8S5SRbsEKBovwZhxGd6LJlbZYxBgCYOtreSUyb8hpXyGC5O4A==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"@jest/core": "30.2.0",
"@jest/types": "30.2.0",
@@ -12140,6 +12160,7 @@
"integrity": "sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"cssstyle": "^4.2.1",
"data-urls": "^5.0.0",
@@ -12873,6 +12894,7 @@
"node_modules/moment": {
"version": "2.30.1",
"license": "MIT",
+ "peer": true,
"engines": {
"node": "*"
}
@@ -13034,6 +13056,7 @@
"node_modules/node-fetch": {
"version": "2.7.0",
"license": "MIT",
+ "peer": true,
"dependencies": {
"whatwg-url": "^5.0.0"
},
@@ -13467,6 +13490,7 @@
"resolved": "https://registry.npmjs.org/ol/-/ol-10.8.0.tgz",
"integrity": "sha512-kLk7jIlJvKyhVMAjORTXKjzlM6YIByZ1H/d0DBx3oq8nSPCG6/gbLr5RxukzPgwbhnAqh+xHNCmrvmFKhVMvoQ==",
"license": "BSD-2-Clause",
+ "peer": true,
"dependencies": {
"@types/rbush": "4.0.0",
"earcut": "^3.0.0",
@@ -14134,6 +14158,7 @@
}
],
"license": "MIT",
+ "peer": true,
"dependencies": {
"nanoid": "^3.3.11",
"picocolors": "^1.1.1",
@@ -14705,6 +14730,7 @@
"integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"cssesc": "^3.0.0",
"util-deprecate": "^1.0.2"
@@ -15065,6 +15091,7 @@
"node_modules/react": {
"version": "18.3.1",
"license": "MIT",
+ "peer": true,
"dependencies": {
"loose-envify": "^1.1.0"
},
@@ -15137,6 +15164,7 @@
"node_modules/react-dom": {
"version": "18.3.1",
"license": "MIT",
+ "peer": true,
"dependencies": {
"loose-envify": "^1.1.0",
"scheduler": "^0.23.2"
@@ -15219,7 +15247,8 @@
},
"node_modules/react-is": {
"version": "16.13.1",
- "license": "MIT"
+ "license": "MIT",
+ "peer": true
},
"node_modules/react-joyride": {
"version": "2.9.3",
@@ -15276,6 +15305,7 @@
"node_modules/react-redux": {
"version": "9.2.0",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@types/use-sync-external-store": "^0.0.6",
"use-sync-external-store": "^1.4.0"
@@ -15300,6 +15330,7 @@
"integrity": "sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==",
"dev": true,
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=0.10.0"
}
@@ -15378,6 +15409,7 @@
"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
"integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"loose-envify": "^1.1.0",
"object-assign": "^4.1.1"
@@ -15550,7 +15582,8 @@
},
"node_modules/redux": {
"version": "5.0.1",
- "license": "MIT"
+ "license": "MIT",
+ "peer": true
},
"node_modules/redux-location-state": {
"version": "2.8.2",
@@ -16041,6 +16074,7 @@
"integrity": "sha512-fDz1zJpd5GycprAbu4Q2PV/RprsRtKC/0z82z0JLgdytmcq0+ujJbJ/09bPGDxCLkKY3Np5cRAOcWiVkLXJURg==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"chokidar": "^4.0.0",
"immutable": "^5.0.2",
@@ -17082,6 +17116,7 @@
}
],
"license": "MIT",
+ "peer": true,
"dependencies": {
"@csstools/css-parser-algorithms": "^3.0.5",
"@csstools/css-syntax-patches-for-csstree": "^1.0.19",
@@ -17820,6 +17855,7 @@
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
"dev": true,
"license": "MIT",
+ "peer": true,
"engines": {
"node": ">=12"
},
@@ -18031,7 +18067,8 @@
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
"integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
"dev": true,
- "license": "0BSD"
+ "license": "0BSD",
+ "peer": true
},
"node_modules/tsyringe": {
"version": "4.10.0",
@@ -18080,6 +18117,7 @@
"version": "0.21.3",
"dev": true,
"license": "(MIT OR CC0-1.0)",
+ "peer": true,
"engines": {
"node": ">=10"
},
@@ -18598,6 +18636,7 @@
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.105.3.tgz",
"integrity": "sha512-LLBBA4oLmT7sZdHiYE/PeVuifOxYyE2uL/V+9VQP7YSYdJU7bSf7H8bZRRxW8kEPMkmVjnrXmoR3oejIdX0xbg==",
"license": "MIT",
+ "peer": true,
"dependencies": {
"@types/eslint-scope": "^3.7.7",
"@types/estree": "^1.0.8",
@@ -18776,6 +18815,7 @@
"integrity": "sha512-9Gyu2F7+bg4Vv+pjbovuYDhHX+mqdqITykfzdM9UyKqKHlsE5aAjRhR+oOEfXW5vBeu8tarzlJFIZva4ZjAdrQ==",
"dev": true,
"license": "MIT",
+ "peer": true,
"dependencies": {
"@types/bonjour": "^3.5.13",
"@types/connect-history-api-fallback": "^1.5.4",
@@ -19303,6 +19343,7 @@
}
],
"license": "MIT",
+ "peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.9.0",
"caniuse-lite": "^1.0.30001759",
@@ -19864,6 +19905,7 @@
"resolved": "https://registry.npmjs.org/zod/-/zod-4.1.13.tgz",
"integrity": "sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig==",
"license": "MIT",
+ "peer": true,
"funding": {
"url": "https://github.com/sponsors/colinhacks"
}
diff --git a/web/.eslintrc b/web/.eslintrc
index b22cde95b..b0b20f838 100644
--- a/web/.eslintrc
+++ b/web/.eslintrc
@@ -98,7 +98,6 @@
"jsx-a11y/label-has-associated-control": "off", // 5 errors across 4 files
"jsx-a11y/alt-text": "off", // 15 errors across 10 files
"jsx-a11y/mouse-events-have-key-events": "off", // 7 errors across 4 files
- "jsx-a11y/no-static-element-interactions": "off", // 71 errors across 39 files
"jsx-a11y/click-events-have-key-events": "off", // 70 errors across 39 files
// React rules overrides
"react/jsx-props-no-spreading": "error",
diff --git a/web/js/components/animation-widget/gif-button.js b/web/js/components/animation-widget/gif-button.js
index 11441c5aa..c7421d3b5 100644
--- a/web/js/components/animation-widget/gif-button.js
+++ b/web/js/components/animation-widget/gif-button.js
@@ -95,9 +95,10 @@ function GifButton(props) {
return (
<>
- <a
+ <button
id="create-gif-button"
aria-label={labelText}
+ type="button"
className={gifDisabled ? 'wv-icon-case no-drag disabled' : 'wv-icon-case no-drag'}
onClick={openGif}
>
@@ -114,7 +115,7 @@ function GifButton(props) {
>
{showWarning ? warningMessage : labelText}
</UncontrolledTooltip>
- </a>
+ </button>
{isGifActive && <GifContainer onClose={onCloseGif} />}
</>
);
diff --git a/web/js/components/animation-widget/loop-button.js b/web/js/components/animation-widget/loop-button.js
index 9b892f89b..b9bdcb636 100644
--- a/web/js/components/animation-widget/loop-button.js
+++ b/web/js/components/animation-widget/loop-button.js
@@ -12,9 +12,10 @@ function LoopButton({ looping, onLoop, isMobile }) {
const labelText = looping ? 'Disable animation loop' : 'Enable animation loop';
const buttonId = 'loop-button';
return (
- <a
+ <button
id={buttonId}
aria-label={labelText}
+ type="button"
className={
looping
? 'wv-loop-icon-case wv-icon-case no-drag active'
@@ -33,7 +34,7 @@ function LoopButton({ looping, onLoop, isMobile }) {
</UncontrolledTooltip>
)}
<FontAwesomeIcon icon="retweet" className="wv-animation-widget-icon" widthAuto />
- </a>
+ </button>
);
}
diff --git a/web/js/components/animation-widget/play-button.js b/web/js/components/animation-widget/play-button.js
index 019e6edb8..7c510bf39 100644
--- a/web/js/components/animation-widget/play-button.js
+++ b/web/js/components/animation-widget/play-button.js
@@ -19,9 +19,10 @@ function PlayButton({
const onClick = isDisabled ? () => {} : isPlaying;
return (
- <a
+ <button
id={buttonId}
aria-label={labelText}
+ type="button"
className={`wv-anim-play-case wv-icon-case no-drag ${isDisabled ? 'disabled' : ''}`}
onClick={onClick}
>
@@ -37,7 +38,7 @@ function PlayButton({
{playing
? <FontAwesomeIcon icon="pause" className="wv-animation-widget-icon" widthAuto />
: <FontAwesomeIcon icon="play" className="wv-animation-widget-icon" widthAuto />}
- </a>
+ </button>
);
}
diff --git a/web/js/components/charting/chart-component.js b/web/js/components/charting/chart-component.js
index 0351de1e4..8bd59cef3 100644
--- a/web/js/components/charting/chart-component.js
+++ b/web/js/components/charting/chart-component.js
@@ -555,14 +555,18 @@ function ChartComponent(props) {
</div>
)}
<div className="error-expand-button">
- <span className="error-expand-button-inner" onClick={() => toggleErrorCollapsed(!errorCollapsed)}>
+ <button
+ className="error-expand-button-inner"
+ type="button"
+ onClick={() => toggleErrorCollapsed(!errorCollapsed)}
+ >
{errorCollapsed ? 'more' : 'less'}
<FontAwesomeIcon
className="layer-group-collapse"
icon={!errorCollapsed ? 'caret-up' : 'caret-down'}
widthAuto
/>
- </span>
+ </button>
</div>
</div>
)}
diff --git a/web/js/components/charting/charting-info.js b/web/js/components/charting/charting-info.js
index 39864fb8d..79cbc21bc 100644
--- a/web/js/components/charting/charting-info.js
+++ b/web/js/components/charting/charting-info.js
@@ -10,12 +10,19 @@ function ChartingInfo(props) {
feedbackIsInitiated,
isMobile,
} = props;
+
+ const handleKeyDown = (e, feedbackIsInitiatedArg, isMobileArg) => {
+ if (e.key === 'Enter') {
+ return sendFeedback(feedbackIsInitiatedArg, isMobileArg);
+ }
+ return null;
+ };
return (
<div className="charting-info-container">
<div className="charting-info-text">
<p className="charting-info">
The charting feature is available for beta testing and evaluation.&nbsp;
- <span className="charting-feedback" onClick={() => sendFeedback(feedbackIsInitiated, isMobile)}>Please send comments and feedback to us.</span>
+ <span className="charting-feedback" role="link" tabIndex={0} onKeyDown={(e, feedbackIsInitiatedArg, isMobileArg) => handleKeyDown(e, feedbackIsInitiatedArg, isMobileArg)} onClick={() => sendFeedback(feedbackIsInitiated, isMobile)}>Please send comments and feedback to us.</span>
</p>
<p className="charting-info">The Charting Tool provides the option to create a line chart for a date range showing change over time, and statistics for a single date (median, mean, minimum, maximum, and standard deviation) for an area of interest.</p>
diff --git a/web/js/components/compare/mobile-toggle.js b/web/js/components/compare/mobile-toggle.js
index ae2e206c2..efb4be111 100644
--- a/web/js/components/compare/mobile-toggle.js
+++ b/web/js/components/compare/mobile-toggle.js
@@ -31,18 +31,20 @@ function MobileComparisonToggle (props) {
return (
<div className="comparison-mobile-select-toggle">
- <div
+ <button
className={`compare-toggle-selected-btn ${classA}`}
onClick={() => toggleCompareASelected(true)}
+ type="button"
>
A
- </div>
- <div
+ </button>
+ <button
className={`compare-toggle-selected-btn ${classB}`}
onClick={() => toggleCompareASelected(false)}
+ type="button"
>
B
- </div>
+ </button>
</div>
);
}
diff --git a/web/js/components/date-selector/date-input-column.js b/web/js/components/date-selector/date-input-column.js
index 58c262464..6b8b4c2be 100644
--- a/web/js/components/date-selector/date-input-column.js
+++ b/web/js/components/date-selector/date-input-column.js
@@ -326,6 +326,7 @@ class DateInputColumn extends Component {
onFocus={this.handleFocus}
onTouchStart={this.handleFocus}
disabled={isDisabled}
+ aria-label={`${inputId} input`}
/>
<Arrow
direction="down"
diff --git a/web/js/components/image-download/lat-long-inputs.js b/web/js/components/image-download/lat-long-inputs.js
index 421aee7a3..93d2726cf 100644
--- a/web/js/components/image-download/lat-long-inputs.js
+++ b/web/js/components/image-download/lat-long-inputs.js
@@ -100,7 +100,12 @@ function LatLongSelect(props) {
return (
<div className="wv-image-input-case">
- <div className="wv-image-input-title" onClick={() => { setShowCoordinates(!showCoordinates); }}>
+ <button
+ className="wv-image-input-title"
+ type="button"
+ aria-pressed={showCoordinates}
+ onClick={() => { setShowCoordinates(!showCoordinates); }}
+ >
<span>{coordText}</span>
<span
title="Hide coordinates"
@@ -108,7 +113,7 @@ function LatLongSelect(props) {
>
<FontAwesomeIcon icon="caret-right" size="lg" rotation={showCoordinates ? 90 : 0} widthAuto />
</span>
- </div>
+ </button>
{showCoordinates && (
<>
<div className="row">
diff --git a/web/js/components/layer/product-picker/browse/category-cell.js b/web/js/components/layer/product-picker/browse/category-cell.js
index 7dce4332d..314caf0a8 100644
--- a/web/js/components/layer/product-picker/browse/category-cell.js
+++ b/web/js/components/layer/product-picker/browse/category-cell.js
@@ -33,13 +33,14 @@ function CategoryCell(props) {
<div className="category-background-cover" style={categoryBgImage}>
<div className="category-background-cover">
<h3>
- <a
+ <button
className="layer-category-name"
alt={category.title}
+ type="button"
onClick={() => drawMeasurements(category)}
>
{category.title}
- </a>
+ </button>
</h3>
<ul>
{category.measurements
@@ -71,12 +72,13 @@ function CategoryCell(props) {
/* eslint react/no-array-index-key: 1 */
key={category.id + index}
>
- <a
+ <button
className="layer-category-name"
+ type="button"
onClick={() => drawMeasurements(category)}
>
...
- </a>
+ </button>
</li>
) : (
<li
@@ -86,12 +88,13 @@ function CategoryCell(props) {
`layer-category-item-${category.id}-${current.id}`
}
>
- <a
+ <button
className="layer-category-name"
+ type="button"
onClick={() => drawMeasurements(category, current.id, index)}
>
{current.title}
- </a>
+ </button>
{' '}
</li>
);
diff --git a/web/js/components/layer/product-picker/browse/category-layer-row.js b/web/js/components/layer/product-picker/browse/category-layer-row.js
index 2c704c76a..7183e2685 100644
--- a/web/js/components/layer/product-picker/browse/category-layer-row.js
+++ b/web/js/components/layer/product-picker/browse/category-layer-row.js
@@ -211,8 +211,9 @@ class CategoryLayerRow extends React.Component {
id={`accordion-${category.id}-${measurement.id}`}
key={`${category.id}-${measurement.id}`}
>
- <div
+ <button
onClick={() => selectMeasurement(id)}
+ type="button"
className="measurement-row-header"
>
<h3>{measurement.title}</h3>
@@ -220,7 +221,7 @@ class CategoryLayerRow extends React.Component {
{isSelected
? <FontAwesomeIcon icon="chevron-circle-down" className="arrow-icon" widthAuto />
: <FontAwesomeIcon icon="chevron-circle-right" className="arrow-icon" widthAuto />}
- </div>
+ </button>
{isSelected ? this.renderContent() : ''}
</div>
);
diff --git a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
index d1036d9b6..18c64d623 100644
--- a/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
+++ b/web/js/components/layer/product-picker/browse/measurement-metadata-detail.js
@@ -91,14 +91,15 @@ function MeasurementMetadataDetail (props) {
{renderMetadataForLayers()}
</div>
{doesMetaDataNeedExpander && (
- <div
+ <button
className="metadata-more"
+ type="button"
onClick={() => setMetadataExpansion(!isMetadataExpanded)}
>
<span className={isMetadataExpanded ? 'ellipsis up' : 'ellipsis'}>
{isMetadataExpanded ? '^' : '...'}
</span>
- </div>
+ </button>
)}
</div>
);
diff --git a/web/js/components/layer/product-picker/search/filter-chips.js b/web/js/components/layer/product-picker/search/filter-chips.js
index ce9d1b1d8..b26601c55 100644
--- a/web/js/components/layer/product-picker/search/filter-chips.js
+++ b/web/js/components/layer/product-picker/search/filter-chips.js
@@ -23,9 +23,10 @@ export default function FilterChips(props) {
{filterValues.map(({
field, displayValue, value,
}) => (
- <div
+ <button
key={field + value}
className="filter-chip"
+ type="button"
onClick={() => removeFilter(field, value)}
>
<span dangerouslySetInnerHTML={{ __html: displayValue }} />
@@ -34,7 +35,7 @@ export default function FilterChips(props) {
fixedWidth
widthAuto
/>
- </div>
+ </button>
))}
</div>
);
diff --git a/web/js/components/layer/product-picker/search/search-layer-row.js b/web/js/components/layer/product-picker/search/search-layer-row.js
index 4ceccdf3f..d6cb68d10 100644
--- a/web/js/components/layer/product-picker/search/search-layer-row.js
+++ b/web/js/components/layer/product-picker/search/search-layer-row.js
@@ -187,7 +187,7 @@ class SearchLayerRow extends React.Component {
)}
</div>
)}
- <div className={headerClassName} onClick={this.onRowClick}>
+ <button type="button" className={headerClassName} onClick={this.onRowClick}>
<RenderSplitLayerTitle layer={layer} />
{recentLayerMode && showDeleteIcon && (
<Button
@@ -199,7 +199,7 @@ class SearchLayerRow extends React.Component {
<FontAwesomeIcon icon="trash" widthAuto />
</Button>
)}
- </div>
+ </button>
</div>
);
}
diff --git a/web/js/components/location-search/coordinates-dialog.js b/web/js/components/location-search/coordinates-dialog.js
index 912e86a8e..f67c693d2 100644
--- a/web/js/components/location-search/coordinates-dialog.js
+++ b/web/js/components/location-search/coordinates-dialog.js
@@ -154,8 +154,9 @@ class CoordinatesDialog extends Component {
&& showTooltips;
return (
- <div
+ <button
id={buttonId}
+ type="button"
className={buttonId}
onClick={() => this.copyToClipboard(formattedCoordinates)}
onTouchEnd={() => this.copyToClipboard(formattedCoordinates)}
@@ -171,7 +172,7 @@ class CoordinatesDialog extends Component {
</UncontrolledTooltip>
)}
<FontAwesomeIcon icon="copy" fixedWidth widthAuto />
- </div>
+ </button>
);
};
diff --git a/web/js/components/location-search/location-search-input.js b/web/js/components/location-search/location-search-input.js
index 0896d5f30..d23219d6d 100644
--- a/web/js/components/location-search/location-search-input.js
+++ b/web/js/components/location-search/location-search-input.js
@@ -221,10 +221,12 @@ class SearchBox extends Component {
const mobileStyle = isMobile ? {
width: '100%', display: 'flex',
} : {
- display: 'flex', width: '85%',
+ display: 'flex', width: '85%', background: 'inherit', border: 'none',
};
return (
<div
+ role="searchbox"
+ tabIndex={0}
className="location-search-input-container"
onKeyDown={this.handleKeyPress}
style={mobileStyle}
diff --git a/web/js/components/map/__snapshots__/coordinates.test.js.snap b/web/js/components/map/__snapshots__/coordinates.test.js.snap
index e06c6088b..b23e1fc2d 100644
--- a/web/js/components/map/__snapshots__/coordinates.test.js.snap
+++ b/web/js/components/map/__snapshots__/coordinates.test.js.snap
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
-exports[`formats coordinate in latlon-dd format 1`] = `"<div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">0.0000°, 0.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div>"`;
+exports[`formats coordinate in latlon-dd format 1`] = `"<button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">0.0000°, 0.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button>"`;
-exports[`formats coordinate in latlon-dm format 1`] = `"<div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00.000'N, 0°00.000'E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div>"`;
+exports[`formats coordinate in latlon-dm format 1`] = `"<button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00.000'N, 0°00.000'E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button>"`;
-exports[`formats coordinate in latlon-dms format 1`] = `"<div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00'00"N, 0°00'00"E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div>"`;
+exports[`formats coordinate in latlon-dms format 1`] = `"<button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord"> 0°00'00"N, 0°00'00"E</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button>"`;
diff --git a/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap b/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap
index cffc1f201..575b7a2a8 100644
--- a/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap
+++ b/web/js/components/map/__snapshots__/ol-coordinates.test.js.snap
@@ -2,10 +2,10 @@
exports[`clears coordinates when mouse moves off the map 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"></div>"`;
-exports[`reprojects (0,0) to (-45, 90) for EPSG:3413 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">90.0000°, -45.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:3413</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;
+exports[`reprojects (0,0) to (-45, 90) for EPSG:3413 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">90.0000°, -45.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:3413</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;
-exports[`shows 20°00.000'N, 10°00.000'E when set to degrees and minutes format 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;
+exports[`shows 20°00.000'N, 10°00.000'E when set to degrees and minutes format 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;
-exports[`shows coordinates of (-160, 20) when moving the mouse over wrapped 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, -160.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;
+exports[`shows coordinates of (-160, 20) when moving the mouse over wrapped 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, -160.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;
-exports[`shows coordinates of (10, 20) when moving the mouse 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><div id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></div></div>"`;
+exports[`shows coordinates of (10, 20) when moving the mouse 1`] = `"<div id="ol-coords-case" class="wv-coords-container" style="width: 230px;"><button type="button" id="coords-panel" class="wv-coords-map wv-coords-map-btn"><span class="map-coord">20.0000°, 10.0000°</span><div class="map-coord-format"><span class="map-coord">EPSG:4326</span><div aria-label="Change coordinates format" class="coord-btn"><i class="coord-switch"></i></div></div></button></div>"`;
diff --git a/web/js/components/map/coordinates.js b/web/js/components/map/coordinates.js
index 2c9a37085..b33d98232 100644
--- a/web/js/components/map/coordinates.js
+++ b/web/js/components/map/coordinates.js
@@ -38,7 +38,8 @@ export default class Coordinates extends React.Component {
);
return (
- <div
+ <button
+ type="button"
id="coords-panel"
className="wv-coords-map wv-coords-map-btn"
onClick={this.changeFormat}
@@ -54,7 +55,7 @@ export default class Coordinates extends React.Component {
<i className="coord-switch" />
</div>
</div>
- </div>
+ </button>
);
}
}
diff --git a/web/js/components/map/zoom.js b/web/js/components/map/zoom.js
index 6f7bf3a0c..bd88a58a7 100644
--- a/web/js/components/map/zoom.js
+++ b/web/js/components/map/zoom.js
@@ -19,6 +19,7 @@ function Zoom({
<button
type="button"
disabled={zoomInDisabled}
+ aria-label="Zoom in view"
className="wv-map-zoom wv-map-zoom-in"
onClick={() => { mapUtilZoomAction(map, 1); }}
onMouseMove={(e) => e.stopPropagation()}
@@ -36,6 +37,7 @@ function Zoom({
<button
type="button"
disabled={zoomOutDisabled}
+ aria-label="Zoom out view"
className="wv-map-zoom wv-map-zoom-out"
onClick={() => { mapUtilZoomAction(map, -1); }}
onMouseMove={(e) => e.stopPropagation()}
diff --git a/web/js/components/measure-tool/measure-tooltip.js b/web/js/components/measure-tool/measure-tooltip.js
index 1e5783526..74ef8304d 100644
--- a/web/js/components/measure-tool/measure-tooltip.js
+++ b/web/js/components/measure-tool/measure-tooltip.js
@@ -132,9 +132,9 @@ export default function MeasureTooltip(props) {
<div className={`tooltip-measure tooltip-custom-black ${activeStaticClass}`}>
<span dangerouslySetInnerHTML={{ __html: tooltipValue }} />
{!active && (
- <span className="close-tooltip" onClick={onRemove} onTouchEnd={onRemove}>
+ <button type="button" className="close-tooltip" onClick={onRemove} onTouchEnd={onRemove}>
<FontAwesomeIcon icon="times" fixedWidth widthAuto />
- </span>
+ </button>
)}
</div>
);
diff --git a/web/js/components/sidebar/collapsed-button.js b/web/js/components/sidebar/collapsed-button.js
index 82908da14..21bc58399 100644
--- a/web/js/components/sidebar/collapsed-button.js
+++ b/web/js/components/sidebar/collapsed-button.js
@@ -18,7 +18,8 @@ class CollapsedButton extends PureComponent {
<div
className={classes}
>
- <a
+ <button
+ type="button"
id={buttonId}
aria-label={labelText}
onClick={onclick}
@@ -40,7 +41,7 @@ class CollapsedButton extends PureComponent {
</span>
)}
{!isMobile && <FontAwesomeIcon className="expand-icon" icon="caret-down" widthAuto />}
- </a>
+ </button>
</div>
);
}
diff --git a/web/js/components/sidebar/event.js b/web/js/components/sidebar/event.js
index aae5ca2b9..9d773fbee 100644
--- a/web/js/components/sidebar/event.js
+++ b/web/js/components/sidebar/event.js
@@ -120,6 +120,8 @@ function Event (props) {
{selectedDate === date ? (
<span
className="active"
+ role="textbox"
+ tabIndex={0}
onClick={(e) => e.stopPropagation()}
>
{formatDisplayDate(date)}
@@ -128,6 +130,8 @@ function Event (props) {
: (
<a
className="'date item-selected"
+ role="link"
+ tabIndex={0}
onClick={(e) => {
e.stopPropagation();
onEventSelect(date);
diff --git a/web/js/components/sidebar/nav/nav-case.js b/web/js/components/sidebar/nav/nav-case.js
index 025a2b520..08eda48f6 100644
--- a/web/js/components/sidebar/nav/nav-case.js
+++ b/web/js/components/sidebar/nav/nav-case.js
@@ -107,7 +107,8 @@ function NavCase (props) {
{!isEventsTabDisabledEmbed && renderEvents()}
{renderDataDownload()}
- <div
+ <button
+ type="button"
id="toggleIconHolder"
className="sidebar-collapse"
onClick={toggleSidebar}
@@ -123,7 +124,7 @@ function NavCase (props) {
<UncontrolledTooltip id="center-align-tooltip" placement="right" target="toggleIconHolder">
Hide sidebar
</UncontrolledTooltip>
- </div>
+ </button>
</Nav>
);
}
diff --git a/web/js/components/smart-handoffs/granule-count.js b/web/js/components/smart-handoffs/granule-count.js
index 3f11fc5b7..fc9ed0e52 100644
--- a/web/js/components/smart-handoffs/granule-count.js
+++ b/web/js/components/smart-handoffs/granule-count.js
@@ -121,9 +121,9 @@ export default function GranuleCount (props) {
{ granulesExist && (
<span className="granule-size fade-in">{`(${sizeText})`}</span>
)}
- <span className="help-link" onClick={showGranuleHelpModal}>
+ <button type="button" className="help-link" onClick={showGranuleHelpModal}>
<FontAwesomeIcon icon="question-circle" widthAuto />
- </span>
+ </button>
</>
);
};
diff --git a/web/js/components/smart-handoffs/smart-handoff-modal.js b/web/js/components/smart-handoffs/smart-handoff-modal.js
index 7f33b43e3..4175a514f 100644
--- a/web/js/components/smart-handoffs/smart-handoff-modal.js
+++ b/web/js/components/smart-handoffs/smart-handoff-modal.js
@@ -99,9 +99,9 @@ function SmartHandoffModal({
</div>
)}
- <div className="toggle-more-info" onClick={() => toggleInfo(!showMoreInfo)}>
+ <button type="button" className="toggle-more-info" onClick={() => toggleInfo(!showMoreInfo)}>
<h2><span>{showMoreInfo ? 'Hide Info' : 'Show More Info'}</span></h2>
- </div>
+ </button>
<div className="smart-handoff-layer-info">
diff --git a/web/js/components/timeline/custom-interval-selector/custom-interval-selector.js b/web/js/components/timeline/custom-interval-selector/custom-interval-selector.js
index b683444ce..6bb9797c4 100644
--- a/web/js/components/timeline/custom-interval-selector/custom-interval-selector.js
+++ b/web/js/components/timeline/custom-interval-selector/custom-interval-selector.js
@@ -60,10 +60,10 @@ function CustomIntervalSelector(props) {
};
return modalOpen && (
- <div
+ <button
onKeyDown={handleKeyPress}
className={`custom-interval-widget ${hasSubdailyLayers ? 'subdaily' : ''}`}
- tabIndex={0}
+ type="button"
ref={(widget) => { customIntervalWidget = widget; }}
>
<h3 className="custom-interval-widget-header">Custom Interval Selector</h3>
@@ -79,7 +79,7 @@ function CustomIntervalSelector(props) {
/>
</div>
<FontAwesomeIcon icon="times" className="wv-close" onClick={closeModal} widthAuto />
- </div>
+ </button>
);
}
diff --git a/web/js/components/timeline/custom-interval-selector/interval-select.js b/web/js/components/timeline/custom-interval-selector/interval-select.js
index bef1d2f52..e9cb59c52 100644
--- a/web/js/components/timeline/custom-interval-selector/interval-select.js
+++ b/web/js/components/timeline/custom-interval-selector/interval-select.js
@@ -49,29 +49,29 @@ function IntervalSelect(props) {
</DropdownToggle>
<DropdownMenu>
<DropdownItem>
- <span onClick={() => handleChangeZoomLevelMobile('year')}>
+ <span role="menuitem" tabIndex={-1} onClick={() => handleChangeZoomLevelMobile('year')}>
Year
</span>
</DropdownItem>
<DropdownItem>
- <span onClick={() => handleChangeZoomLevelMobile('month')}>
+ <span role="menuitem" tabIndex={-1} onClick={() => handleChangeZoomLevelMobile('month')}>
Month
</span>
</DropdownItem>
<DropdownItem>
- <span onClick={() => handleChangeZoomLevelMobile('day')}>
+ <span role="menuitem" tabIndex={-1} onClick={() => handleChangeZoomLevelMobile('day')}>
Day
</span>
</DropdownItem>
{hasSubdailyLayers ? (
<>
<DropdownItem>
- <span onClick={() => handleChangeZoomLevelMobile('hour')}>
+ <span role="menuitem" tabIndex={-1} onClick={() => handleChangeZoomLevelMobile('hour')}>
Hour
</span>
</DropdownItem>
<DropdownItem>
- <span onClick={() => handleChangeZoomLevelMobile('minute')}>
+ <span role="menuitem" tabIndex={-1} onClick={() => handleChangeZoomLevelMobile('minute')}>
Minute
</span>
</DropdownItem>
diff --git a/web/js/components/timeline/mobile-date-picker.js b/web/js/components/timeline/mobile-date-picker.js
index afa7d7d37..8e4fa2223 100644
--- a/web/js/components/timeline/mobile-date-picker.js
+++ b/web/js/components/timeline/mobile-date-picker.js
@@ -125,14 +125,15 @@ function MobileDatePicker(props) {
return (
time && (
<>
- <div
+ <button
+ type="button"
className="mobile-date-picker-select-btn"
onClick={handleClickDateButton}
>
<div className="mobile-date-picker-select-btn-text">
<span>{displayDate}</span>
</div>
- </div>
+ </button>
<DatePicker
dateConfig={hasSubdailyLayers ? subDailyDateConfig : defaultDateConfig}
showCaption
diff --git a/web/js/components/timeline/timeline-axis/timeline-axis.js b/web/js/components/timeline/timeline-axis/timeline-axis.js
index c0f161e5b..fd554bd47 100644
--- a/web/js/components/timeline/timeline-axis/timeline-axis.js
+++ b/web/js/components/timeline/timeline-axis/timeline-axis.js
@@ -1567,6 +1567,8 @@ class TimelineAxis extends Component {
return (
<div
+ role="toolbar"
+ tabIndex={0}
className="timeline-axis-container"
style={{ width: axisWidthStr }}
onMouseDown={this.handleMouseDown}
diff --git a/web/js/components/timeline/timeline-controls/animation-button.js b/web/js/components/timeline/timeline-controls/animation-button.js
index 40f20484f..e0968b47f 100644
--- a/web/js/components/timeline/timeline-controls/animation-button.js
+++ b/web/js/components/timeline/timeline-controls/animation-button.js
@@ -58,7 +58,8 @@ function AnimationButton(props) {
animationButtonClassName = `button-action-group mobile-animate-button animate-button-${buttonClass}`;
}
return (
- <div
+ <button
+ type="button"
onClick={clickAnimationButton}
className={animationButtonClassName}
aria-label={labelText}
@@ -76,7 +77,7 @@ function AnimationButton(props) {
)}
<FontAwesomeIcon icon="video" className="wv-animate" size="2x" widthAuto />
</div>
- </div>
+ </button>
);
}
diff --git a/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js b/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js
index 3d990941a..14687de56 100644
--- a/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js
+++ b/web/js/components/timeline/timeline-controls/axis-timescale-change-tooltip.js
@@ -63,6 +63,8 @@ class AxisTimeScaleChangeTooltip extends PureComponent {
</label>
<span
id="zoom-years"
+ role="menuitem"
+ tabIndex={-1}
className="zoom-btn zoom-years"
onClick={this.changeTimeScaleYear}
>
@@ -70,6 +72,8 @@ class AxisTimeScaleChangeTooltip extends PureComponent {
</span>
<span
id="zoom-months"
+ role="menuitem"
+ tabIndex={-1}
className="zoom-btn zoom-months"
onClick={this.changeTimeScaleMonth}
>
@@ -77,6 +81,8 @@ class AxisTimeScaleChangeTooltip extends PureComponent {
</span>
<span
id="zoom-days"
+ role="menuitem"
+ tabIndex={-1}
className="zoom-btn zoom-days"
onClick={this.changeTimeScaleDay}
>
@@ -86,6 +92,8 @@ class AxisTimeScaleChangeTooltip extends PureComponent {
<>
<span
id="zoom-hours"
+ role="menuitem"
+ tabIndex={-1}
className="zoom-btn zoom-hours"
onClick={this.changeTimeScaleHour}
>
@@ -93,6 +101,8 @@ class AxisTimeScaleChangeTooltip extends PureComponent {
</span>
<span
id="zoom-minutes"
+ role="menuitem"
+ tabIndex={-1}
className="zoom-btn zoom-minutes"
onClick={this.changeTimeScaleMinute}
>
diff --git a/web/js/components/timeline/timeline-controls/date-change-arrows.js b/web/js/components/timeline/timeline-controls/date-change-arrows.js
index 0de1241f6..45cfa4320 100644
--- a/web/js/components/timeline/timeline-controls/date-change-arrows.js
+++ b/web/js/components/timeline/timeline-controls/date-change-arrows.js
@@ -94,13 +94,15 @@ class DateChangeArrows extends PureComponent {
)}
{/* LEFT ARROW */}
- <div
+ <button
+ type="button"
className={`button-action-group${leftArrowDisabled ? ' button-disabled' : ''} ${isKioskModeActive && !isEmbedModeActive ? 'd-none' : ''}`}
id="left-arrow-group"
onMouseDown={leftArrowDown}
onMouseUp={leftArrowUp}
onMouseLeave={leftArrowUp}
aria-disabled={leftArrowDisabled}
+ aria-label="Decrement date"
>
<HoverTooltip
isMobile={isMobile}
@@ -109,16 +111,18 @@ class DateChangeArrows extends PureComponent {
target="left-arrow-group"
/>
<ArrowChevronLeft class="arrow" size="30px" />
- </div>
+ </button>
{/* RIGHT ARROW */}
- <div
+ <button
+ type="button"
className={`button-action-group${rightArrowDisabled ? ' button-disabled' : ''} ${isKioskModeActive && !isEmbedModeActive ? 'd-none' : ''}`}
id="right-arrow-group"
onMouseDown={rightArrowDown}
onMouseUp={rightArrowUp}
onMouseLeave={rightArrowUp}
aria-disabled={rightArrowDisabled}
+ aria-label="Increment date"
>
<HoverTooltip
isMobile={isMobile}
@@ -127,14 +131,17 @@ class DateChangeArrows extends PureComponent {
target="right-arrow-group"
/>
<ArrowChevronRight class="arrow" size="30px" />
- </div>
+ </button>
{/* NOW BUTTON */}
- <div
+ <button
+ type="button"
className={`button-action-group now-button-group${nowButtonDisabled ? ' button-disabled' : ''} ${isKioskModeActive ? 'd-none' : ''}`}
id="now-button-group"
onClick={handleSelectNowButton}
aria-disabled={nowButtonDisabled}
+ aria-label="Latest available date"
+
>
<HoverTooltip
isMobile={isMobile}
@@ -148,7 +155,7 @@ class DateChangeArrows extends PureComponent {
className="arrow"
/>
</svg>
- </div>
+ </button>
</div>
);
}
diff --git a/web/js/components/timeline/timeline-controls/timescale-interval-change.js b/web/js/components/timeline/timeline-controls/timescale-interval-change.js
index 6b4bd6fc4..770f1ae57 100644
--- a/web/js/components/timeline/timeline-controls/timescale-interval-change.js
+++ b/web/js/components/timeline/timeline-controls/timescale-interval-change.js
@@ -137,6 +137,8 @@ class TimeScaleIntervalChange extends PureComponent {
<div id="timeline-interval" className="timeline-interval">
<span
id="interval-years"
+ role="menuitem"
+ tabIndex={-1}
className="interval-btn interval-years"
onClick={() => this.handleClickInterval('year')}
>
@@ -144,6 +146,8 @@ class TimeScaleIntervalChange extends PureComponent {
</span>
<span
id="interval-months"
+ role="menuitem"
+ tabIndex={-1}
className="interval-btn interval-months"
onClick={() => this.handleClickInterval('month')}
>
@@ -151,6 +155,8 @@ class TimeScaleIntervalChange extends PureComponent {
</span>
<span
id="interval-days"
+ role="menuitem"
+ tabIndex={-1}
className="interval-btn interval-days"
onClick={() => this.handleClickInterval('day')}
>
@@ -160,6 +166,8 @@ class TimeScaleIntervalChange extends PureComponent {
<>
<span
id="interval-hours"
+ role="menuitem"
+ tabIndex={-1}
className="interval-btn interval-hours"
onClick={() => this.handleClickInterval('hour')}
>
@@ -167,6 +175,8 @@ class TimeScaleIntervalChange extends PureComponent {
</span>
<span
id="interval-minutes"
+ role="menuitem"
+ tabIndex={-1}
className="interval-btn interval-minutes"
onClick={() => this.handleClickInterval('minute')}
>
@@ -177,6 +187,8 @@ class TimeScaleIntervalChange extends PureComponent {
{hasTempoProduct ? (
<span
id="interval-auto"
+ role="menuitem"
+ tabIndex={-1}
className="interval-btn interval-auto"
onClick={() => this.handleClickInterval('auto')}
>
@@ -185,6 +197,8 @@ class TimeScaleIntervalChange extends PureComponent {
) : null}
<span
id="interval-custom"
+ role="menuitem"
+ tabIndex={-1}
className="interval-btn interval-custom custom-interval-text"
style={{ display: customIntervalText === 'Custom' ? 'none' : 'block' }}
onClick={() => this.handleClickInterval('custom')}
@@ -193,6 +207,8 @@ class TimeScaleIntervalChange extends PureComponent {
</span>
<span
id="interval-custom-static"
+ role="menuitem"
+ tabIndex={-1}
className="interval-btn interval-custom custom-interval-text"
onClick={() => this.handleClickInterval('custom', true)}
>
@@ -218,6 +234,8 @@ class TimeScaleIntervalChange extends PureComponent {
const spanInnerText = autoSelected ? 'AUTO' : `${1} ${TIME_SCALE_FROM_NUMBER[interval]}`;
return (
<div
+ role="menu"
+ tabIndex={0}
id="timeline-interval-btn-container"
className="interval-btn-container noselect no-drag"
onMouseEnter={() => this.setTooltipState(true)}
diff --git a/web/js/components/timeline/timeline-coverage/timeline-coverage.js b/web/js/components/timeline/timeline-coverage/timeline-coverage.js
index 02a35ff44..236c0ff0e 100644
--- a/web/js/components/timeline/timeline-coverage/timeline-coverage.js
+++ b/web/js/components/timeline/timeline-coverage/timeline-coverage.js
@@ -313,7 +313,8 @@ class TimelineLayerCoveragePanel extends Component {
const layerInfoBtnTitle = 'Timeline Layer Coverage Information';
return (
- <a
+ <button
+ type="button"
id={layerInfoBtnId}
aria-label={layerInfoBtnTitle}
className={layerInfoBtnId}
@@ -321,7 +322,7 @@ class TimelineLayerCoveragePanel extends Component {
onClick={() => onInfoClick()}
>
<FontAwesomeIcon icon="question-circle" className="layer-coverage-info-button-icon" widthAuto />
- </a>
+ </button>
);
};
@@ -406,7 +407,8 @@ class TimelineLayerCoveragePanel extends Component {
return (
<>
{/* Timeline Layer Coverage Panel open/close handle */}
- <div
+ <button
+ type="button"
id="timeline-layer-coverage-panel-handle"
aria-label={panelToggleLabelText}
onClick={this.togglePanelOpenClose}
@@ -416,7 +418,7 @@ class TimelineLayerCoveragePanel extends Component {
{panelToggleLabelText}
</UncontrolledTooltip>
<div className={`timeline-layer-coverage-panel-handle-chevron ${panelChevronClassName}`} />
- </div>
+ </button>
<div
className={`timeline-layer-coverage-container ${isPanelOpenClassName}`}
style={panelContainerStyle}
diff --git a/web/js/components/tour/widget-steps.js b/web/js/components/tour/widget-steps.js
index 00309ed2c..a1fe9589c 100644
--- a/web/js/components/tour/widget-steps.js
+++ b/web/js/components/tour/widget-steps.js
@@ -32,13 +32,14 @@ function Steps(props) {
return (
<div className="step-container">
- <a
+ <button
+ type="button"
className={isKioskModeActive ? 'd-none' : 'step-previous'}
aria-label="Previous"
onClick={decreaseStep}
>
<FontAwesomeIcon icon="arrow-circle-left" widthAuto />
- </a>
+ </button>
<div className="step-counter">
<p>
Step
@@ -48,7 +49,8 @@ function Steps(props) {
<span className="step-total">{totalSteps}</span>
</p>
</div>
- <a
+ <button
+ type="button"
className={isKioskModeActive ? 'd-none' : 'step-next'}
aria-label="Next"
onClick={incrementStep}
@@ -56,7 +58,7 @@ function Steps(props) {
{currentStep === totalSteps
? <FontAwesomeIcon icon="check-circle" widthAuto />
: <FontAwesomeIcon icon="arrow-circle-right" widthAuto />}
- </a>
+ </button>
</div>
);
}
diff --git a/web/js/components/util/alert.js b/web/js/components/util/alert.js
index 4e20304f4..df91db243 100644
--- a/web/js/components/util/alert.js
+++ b/web/js/components/util/alert.js
@@ -57,6 +57,7 @@ export default class AlertUtil extends React.Component {
isOpen={isOpen}
>
<div
+ role="alertdialog"
className="alert-content"
title={title}
onClick={onClick}
@@ -78,13 +79,14 @@ export default class AlertUtil extends React.Component {
</div>
</div>
{onDismiss && (
- <div
+ <button
+ type="button"
id={`${id}-close`}
className="close-alert"
onClick={() => this.closeAlert()}
>
<FontAwesomeIcon icon="times" className="exit" size="1x" widthAuto />
- </div>
+ </button>
)}
</Alert>
);
diff --git a/web/js/components/util/arrow.js b/web/js/components/util/arrow.js
index ede6bac07..f6edaf81d 100644
--- a/web/js/components/util/arrow.js
+++ b/web/js/components/util/arrow.js
@@ -12,13 +12,15 @@ function Arrow({
const arrowClassName = `${direction}arrow`;
return (
- <div
+ <button
+ type="button"
onClick={onClick}
+ aria-label={direction === 'up' ? `Increment ${type}` : `Decrement ${type}`}
className={isKioskModeActive ? 'd-none' : containerClassName}
data-interval={type}
>
<ArrowFilledUp className={arrowClassName} size={arrowSize} />
- </div>
+ </button>
);
}
diff --git a/web/js/components/util/switch.js b/web/js/components/util/switch.js
index 6affc7b1e..39bd9efda 100644
--- a/web/js/components/util/switch.js
+++ b/web/js/components/util/switch.js
@@ -62,6 +62,9 @@ function Switch(props) {
</div>
<div className="react-switch-label-case switch-col">
<span
+ role="switch"
+ aria-checked={isActive}
+ tabIndex={0}
className="switch-label-text"
onClick={toggleSwitch}
>
diff --git a/web/js/containers/animation-widget/mobile-animation-widget.js b/web/js/containers/animation-widget/mobile-animation-widget.js
index 5fe899e5a..3ef2bca04 100644
--- a/web/js/containers/animation-widget/mobile-animation-widget.js
+++ b/web/js/containers/animation-widget/mobile-animation-widget.js
@@ -87,13 +87,14 @@ function MobileAnimationWidget (props) {
return (
<div className="wv-animation-widget-wrapper-mobile" id={`mobile-animation-widget-${mobileID}`}>
<div className="mobile-animation-header" style={{ justifyContent: isEmbedModeActive ? 'flex-start' : 'flex-end' }}>
- <span
+ <button
+ type="button"
aria-label="Close"
onClick={toggleCollapse}
id="mobile-animation-close"
>
<FontAwesomeIcon icon="times" className="collapse-icon" style={collapseIconMobile} widthAuto />
- </span>
+ </button>
</div>
<div className="mobile-animation-warning-message-container">
<span id={playDisabled ? 'mobile-animation-warning-message' : ''}>Too many animation frames. Reduce time range or increase increment size.</span>
diff --git a/web/js/containers/embed.js b/web/js/containers/embed.js
index 746c23396..5325bfc29 100644
--- a/web/js/containers/embed.js
+++ b/web/js/containers/embed.js
@@ -56,7 +56,7 @@ function Embed ({ isEmbedModeActive, selectedDate, isMobile }) {
>
{showClickToInteractMessage && (
<>
- <div onClick={handleOverlayClick} className="embed-overlay-bg" />
+ <div role="region" onClick={handleOverlayClick} className="embed-overlay-bg" />
<div className="embed-overlay-btn">
<FontAwesomeIcon icon="hand-pointer" size="2x" fixedWidth widthAuto />
<p>Click anywhere to interact</p>
diff --git a/web/js/containers/share.js b/web/js/containers/share.js
index 3a49ce1f4..efd7119b7 100644
--- a/web/js/containers/share.js
+++ b/web/js/containers/share.js
@@ -155,6 +155,13 @@ class ShareLinkContainer extends Component {
if (feedbackEnabled) sendFeedback(feedbackIsInitiated, isMobile);
};
+ handleKeyDown = (e) => {
+ if (e.key === 'Enter') {
+ return this.openFeedback();
+ }
+ return null;
+ };
+
renderNavTabs = () => {
const { embedDisableNavLink, isMobile } = this.props;
const { activeTab } = this.state;
@@ -295,7 +302,7 @@ class ShareLinkContainer extends Component {
<p>
Please
{' '}
- <a onClick={this.openFeedback} id="feedback-url">contact us</a>
+ <a role="link" tabIndex={0} onKeyDown={this.handleKeyDown} onClick={this.openFeedback} id="feedback-url">contact us</a>
{' '}
to enable Worldview embedding on your website.
</p>
diff --git a/web/js/containers/sidebar/layer-row.js b/web/js/containers/sidebar/layer-row.js
index d1b437e4c..955d94240 100644
--- a/web/js/containers/sidebar/layer-row.js
+++ b/web/js/containers/sidebar/layer-row.js
@@ -363,7 +363,8 @@ function LayerRow (props) {
<>
{showDropdownBtn || isMobile ? renderDropdownMenu() : null}
{!isChartingActive && (
- <a
+ <button
+ type="button"
id={removeLayerBtnId}
aria-label={removeLayerBtnTitle}
className={isMobile ? 'hidden wv-layers-options' : 'button wv-layers-close'}
@@ -373,9 +374,10 @@ function LayerRow (props) {
{removeLayerBtnTitle}
</UncontrolledTooltip>
<FontAwesomeIcon icon="times" fixedWidth widthAuto />
- </a>
+ </button>
)}
- <a
+ <button
+ type="button"
id={layerOptionsBtnId}
aria-label={layerOptionsBtnTitle}
className={isMobile ? 'hidden wv-layers-options' : 'button wv-layers-options'}
@@ -386,8 +388,9 @@ function LayerRow (props) {
{layerOptionsBtnTitle}
</UncontrolledTooltip>
<FontAwesomeIcon icon="sliders-h" className="wv-layers-options-icon" widthAuto />
- </a>
- <a
+ </button>
+ <button
+ type="button"
id={layerInfoBtnId}
aria-label={layerInfoBtnTitle}
className={isMobile ? 'hidden wv-layers-info' : 'button wv-layers-info'}
@@ -398,7 +401,7 @@ function LayerRow (props) {
{layerInfoBtnTitle}
</UncontrolledTooltip>
<FontAwesomeIcon icon="fa-solid fa-info" className="wv-layers-info-icon" widthAuto />
- </a>
+ </button>
</>
);
@@ -411,7 +414,8 @@ function LayerRow (props) {
: 'Zoom in further to click features.';
const layerVectorBtnId = `layer-vector-hand-btn-${encodedLayerId}`;
return (
- <div
+ <button
+ type="button"
id={layerVectorBtnId}
aria-label={titleStr}
className={runningDataObj ? `${classNames} running` : classNames}
@@ -422,7 +426,7 @@ function LayerRow (props) {
{titleStr}
</UncontrolledTooltip>
<FontAwesomeIcon icon="hand-pointer" fixedWidth widthAuto />
- </div>
+ </button>
);
};
@@ -431,6 +435,7 @@ function LayerRow (props) {
const layerChartableBtnId = `layer-chartable-btn-${encodedLayerId}`;
return (
<div
+ role="note"
id={layerChartableBtnId}
aria-label={titleStr}
className="layer-chartable-icon"
@@ -491,19 +496,25 @@ function LayerRow (props) {
const visibilityIconClass = disabled ? 'ban' : visibilityIcon;
const collectionClass = collections?.type === 'NRT' ? 'collection-title badge rounded-pill bg-secondary' : 'collection-title badge rounded-pill text-dark bg-light';
+ const vectorLayerMinHeight = isVectorLayer ? '60px' : '40px';
const makeActiveForCharting = (layerArg) => {
if (layerArg !== activeChartingLayer) {
updateActiveChartingLayer(layerArg);
}
};
-
- const vectorLayerMinHeight = isVectorLayer ? '60px' : '40px';
+ const handleKeyDown = (e, layerId) => {
+ if (e.key === 'Enter') {
+ return makeActiveForCharting(layerId);
+ }
+ return null;
+ };
const renderLayerRow = () => (
<>
{(!isEmbedModeActive && !isChartingActive) && (
- <a
+ <button
+ type="button"
id={`hide${encodedLayerId}`}
className={getVisibilityToggleClass()}
aria-label={visibilityTitle}
@@ -519,16 +530,20 @@ function LayerRow (props) {
</UncontrolledTooltip>
)}
<FontAwesomeIcon icon={visibilityIconClass} className="layer-eye-icon" widthAuto />
- </a>
+ </button>
)}
{isChartingActive && (
!layer.shouldHide ? (
<>
<div />
<a
+ role="radio"
+ tabIndex={0}
+ aria-checked={layer.id === activeChartingLayer}
id={`activate-${encodedLayerId}`}
className={layer.id === activeChartingLayer ? 'layer-visible visibility active-chart' : 'layer-visible visibility'}
onClick={() => makeActiveForCharting(layer.id)}
+ onKeyDown={(e) => handleKeyDown(e, layer.id)}
>
<UncontrolledTooltip
id="center-align-tooltip"
diff --git a/web/js/containers/sidebar/smart-handoff.js b/web/js/containers/sidebar/smart-handoff.js
index cd393656c..53a4547f7 100644
--- a/web/js/containers/sidebar/smart-handoff.js
+++ b/web/js/containers/sidebar/smart-handoff.js
@@ -537,7 +537,7 @@ class SmartHandoff extends Component {
</h1>
<hr />
<h2>
- <a className="help-link" onClick={showNotAvailableModal}>
+ <a role="link" tabIndex={0} className="help-link" onClick={showNotAvailableModal}>
Why are my layers not available?
</a>
</h2>
@@ -592,9 +592,9 @@ class SmartHandoff extends Component {
application.
</div>
<h2>
- <a className="help-link" onClick={showNotAvailableModal}>
+ <button type="button" className="help-link" onClick={showNotAvailableModal}>
Why are some layers not available?
- </a>
+ </button>
</h2>
<hr />
{this.renderLayerChoices()}
diff --git a/web/js/containers/timeline/timeline.js b/web/js/containers/timeline/timeline.js
index 788b360f6..5c710ae26 100644
--- a/web/js/containers/timeline/timeline.js
+++ b/web/js/containers/timeline/timeline.js
@@ -1496,7 +1496,8 @@ class Timeline extends React.Component {
/>
{/* Open/Close Chevron */}
- <div
+ <button
+ type="button"
id="timeline-hide"
aria-label={isTimelineHidden ? 'Show timeline' : 'Hide timeline'}
onClick={this.toggleHideTimeline}
@@ -1507,7 +1508,7 @@ class Timeline extends React.Component {
<div
className={`wv-timeline-hide wv-timeline-hide-double-chevron-${chevronDirection}`}
/>
- </div>
+ </button>
</section>
)}
</ErrorBoundary>
diff --git a/web/scss/components/alert.scss b/web/scss/components/alert.scss
index adce34fcd..91fa378cf 100644
--- a/web/scss/components/alert.scss
+++ b/web/scss/components/alert.scss
@@ -75,6 +75,8 @@
.wv-alert .close-alert {
padding: 11px 2px;
text-align: center;
+ width: 36px;
+ margin: 0;
}
.wv-alert div:hover {
diff --git a/web/scss/components/dateselector.scss b/web/scss/components/dateselector.scss
index 26386def8..05addd40f 100644
--- a/web/scss/components/dateselector.scss
+++ b/web/scss/components/dateselector.scss
@@ -97,6 +97,9 @@
width: 40px;
vertical-align: middle;
position: relative;
+ background: none;
+ padding: none;
+ border: none;
}
.wv-date-selector-widget .button-action-group svg path {
@@ -113,6 +116,10 @@
.date-arrows {
display: block;
height: 10px;
+ background: none;
+ border: none;
+ padding: 0;
+ width: 100%;
}
.zoom-level-change-arrows .date-arrows {
diff --git a/web/scss/components/facets.scss b/web/scss/components/facets.scss
index 3ec486ef4..f2f62e4ee 100644
--- a/web/scss/components/facets.scss
+++ b/web/scss/components/facets.scss
@@ -23,6 +23,7 @@
span {
font-weight: 500;
+ background: inherit;
}
&:hover {
diff --git a/web/scss/components/image.scss b/web/scss/components/image.scss
index 3d4cb3b1c..008ce2cf6 100644
--- a/web/scss/components/image.scss
+++ b/web/scss/components/image.scss
@@ -120,6 +120,9 @@
padding: 5px 0;
font-weight: 600;
cursor: pointer;
+ background: none;
+ border: none;
+ color: inherit;
&:hover {
font-weight: 900;
diff --git a/web/scss/components/tooltip.scss b/web/scss/components/tooltip.scss
index 4a426dba8..5590cf2ca 100644
--- a/web/scss/components/tooltip.scss
+++ b/web/scss/components/tooltip.scss
@@ -158,6 +158,8 @@
bottom: 0;
height: 20px;
width: 23px;
+ background: inherit;
+ border: none;
}
}
@@ -176,9 +178,13 @@
.close-tooltip,
.minimize-tooltip {
- padding-left: 6px;
+ padding: 0 0 0 6px;
margin-left: 8px;
border-left: 1px solid #777;
+ border-right: none;
+ border-top: none;
+ border-bottom: none;
+ background: none;
&.close-coordinates-tooltip,
&.minimize-coordinates-tooltip {
diff --git a/web/scss/features/anim-widget.scss b/web/scss/features/anim-widget.scss
index 8b4c3075a..d83b137d4 100644
--- a/web/scss/features/anim-widget.scss
+++ b/web/scss/features/anim-widget.scss
@@ -162,6 +162,7 @@
}
& > a,
+ & > button,
& > div {
display: inline-block;
margin: 7px 0 0 10px;
@@ -179,6 +180,8 @@
background: variables.$wv-dark-blue;
position: relative;
border-radius: 5px;
+ border: none;
+ padding: 0;
&.disabled {
cursor: not-allowed;
@@ -260,7 +263,8 @@
}
}
-a .wv-animation-widget-icon {
+a .wv-animation-widget-icon,
+button .wv-animation-widget-icon {
font-size: 23px;
color: #fff;
position: absolute;
@@ -437,6 +441,11 @@ a .wv-animation-widget-icon {
justify-content: flex-end;
align-items: center;
+ & button {
+ border: none;
+ background: none;
+ }
+
& .wv-minimize {
font-size: 26px;
font-weight: 400;
diff --git a/web/scss/features/compare.scss b/web/scss/features/compare.scss
index ab272f8e7..7af533b96 100644
--- a/web/scss/features/compare.scss
+++ b/web/scss/features/compare.scss
@@ -208,6 +208,7 @@
padding: 13.5px;
color: #fff;
border: thin solid transparent;
+ background: none;
&:first-child {
border-bottom-left-radius: 5px;
diff --git a/web/scss/features/layer-categories.scss b/web/scss/features/layer-categories.scss
index d306d8ac1..798e131c5 100644
--- a/web/scss/features/layer-categories.scss
+++ b/web/scss/features/layer-categories.scss
@@ -150,6 +150,8 @@
color: #fff;
background: variables.$wv-transparent-black;
text-decoration: none;
+ border: none;
+ text-align: left;
}
& .layer-category-name:hover {
@@ -170,6 +172,9 @@
overflow: hidden;
box-sizing: border-box;
text-decoration: none;
+ border: none;
+ text-align: left;
+ background-color: inherit;
}
& .layer-category-name:hover {
@@ -182,7 +187,7 @@
& .measure-row-contents {
display: flex;
flex-wrap: wrap;
- margin: 5px -1px 0 0;
+ margin: 5px 0 0;
& .source-metadata {
padding: 5px;
@@ -223,6 +228,10 @@
position: relative;
cursor: pointer;
min-height: 44px;
+ background-color: inherit;
+ text-align: left;
+ width: 100%;
+ border: none;
& .arrow-icon {
color: #d54e21;
@@ -334,6 +343,11 @@
height: 22px;
background: #333;
border-top: 2px solid #d54e21;
+ border-left: none;
+ border-right: none;
+ border-bottom: none;
+ width: 100%;
+ padding: 0;
box-shadow: 0 -2px 16px rgb(0 0 0 / 35%);
}
diff --git a/web/scss/features/layer-coverage-panel.scss b/web/scss/features/layer-coverage-panel.scss
index 9535090e9..bddb42fdd 100644
--- a/web/scss/features/layer-coverage-panel.scss
+++ b/web/scss/features/layer-coverage-panel.scss
@@ -35,6 +35,9 @@
.layer-coverage-info-button {
margin-right: 25px;
margin-bottom: 2px;
+ background: none;
+ padding: 0;
+ border: none;
}
.layer-coverage-info-button-icon {
diff --git a/web/scss/features/layers.scss b/web/scss/features/layers.scss
index 8c4ac42fd..2d8c8a010 100644
--- a/web/scss/features/layers.scss
+++ b/web/scss/features/layers.scss
@@ -294,6 +294,10 @@
.layers-all-header {
padding: 0 0 0 25px;
+ width: 100%;
+ background: inherit;
+ text-align: left;
+ border: none;
&.notice {
padding: 0 70px 0 25px;
diff --git a/web/scss/features/location-search.scss b/web/scss/features/location-search.scss
index cb045acec..7522f9fec 100644
--- a/web/scss/features/location-search.scss
+++ b/web/scss/features/location-search.scss
@@ -189,6 +189,9 @@
.location-search-input-alert-icon {
right: 120px;
+ color: var(--bs-warning);
+ display: flex;
+ align-items: center;
}
.location-search-input-clear-container {
diff --git a/web/scss/features/map.scss b/web/scss/features/map.scss
index 3a56ef0ea..823bcff80 100644
--- a/web/scss/features/map.scss
+++ b/web/scss/features/map.scss
@@ -205,6 +205,7 @@
cursor: pointer;
height: 35px;
padding: 0 0 0 5px;
+ width: 100%;
}
.wv-coords-map:hover {
diff --git a/web/scss/features/share.scss b/web/scss/features/share.scss
index 9658ef460..e3975a494 100644
--- a/web/scss/features/share.scss
+++ b/web/scss/features/share.scss
@@ -74,6 +74,9 @@
cursor: pointer;
text-decoration: none;
color: #7bf;
+ border: none;
+ background: none;
+ padding: 0;
}
#feedback-url:hover, #api-doc-url:hover {
diff --git a/web/scss/features/sidebar-panel.scss b/web/scss/features/sidebar-panel.scss
index f461a9a26..7cbf2c11d 100644
--- a/web/scss/features/sidebar-panel.scss
+++ b/web/scss/features/sidebar-panel.scss
@@ -3,7 +3,7 @@
.sidebar-expand {
position: relative;
- > a {
+ > button {
float: left;
left: 10px;
position: absolute;
@@ -42,7 +42,7 @@
}
}
- &.mobile > a {
+ &.mobile > button {
height: 45px;
width: 56px;
background-image: none;
@@ -60,7 +60,6 @@
& span.layer-count {
color: #fff;
position: relative;
- top: 8px;
font-size: 18px;
font-weight: 600;
background: #333;
@@ -73,6 +72,7 @@
}
.sidebar-collapse {
+ background: none;
position: absolute;
right: 2px;
height: 30px;
@@ -269,6 +269,7 @@ li.item.productsitem.inmotion,
border-color: #fff;
}
+.productsitem button.visibility,
.productsitem a.visibility {
width: 30px;
background-color: #ccc;
@@ -276,7 +277,9 @@ li.item.productsitem.inmotion,
top: 0;
bottom: 0;
cursor: pointer;
+ border: none;
border-right: 1px solid #333;
+ padding: 0;
&.layer-enabled:hover {
background: #fff;
@@ -295,12 +298,15 @@ li.item.productsitem.inmotion,
}
}
- &.layer-hidden.disabled:hover {
+ &.layer-hidden {
background: #666;
- cursor: not-allowed;
- .svg-inline--fa {
- color: #c5c5c8;
+ &.disabled:hover {
+ cursor: not-allowed;
+
+ .svg-inline--fa {
+ color: #c5c5c8;
+ }
}
}
@@ -308,9 +314,6 @@ li.item.productsitem.inmotion,
text-align: center;
display: inline-block;
width: 100%;
- position: absolute;
- top: 50%;
- margin-top: -10px;
font-size: 18px;
}
}
@@ -342,7 +345,13 @@ li.item.productsitem.inmotion,
/* ***********************************
* Vector layer pointer icon *
*************************************/
-.productsitem .layer-pointer-icon svg.svg-inline--fa {
+.productsitem button.layer-pointer-icon {
+ padding: 0;
+ border: none;
+ background: none;
+}
+
+ .productsitem .layer-pointer-icon svg.svg-inline--fa {
color: #22a;
}
@@ -419,12 +428,15 @@ li.item.productsitem.inmotion,
* End -- Granule active footprint toggle *
************************************/
-.productsitem a.wv-layers-info,
-.productsitem a.wv-layers-options {
+.productsitem button.wv-layers-info,
+.productsitem button.wv-layers-options {
position: relative;
width: 20px;
height: 20px;
float: right;
+ border: none;
+ padding: 0;
+ background: inherit;
}
.productsitem.inmotion {
@@ -432,9 +444,9 @@ li.item.productsitem.inmotion,
list-style: none;
}
-.productsitem a.wv-layers-close:hover,
-.productsitem a.wv-layers-info:hover,
-.productsitem a.wv-layers-options:hover {
+.productsitem button.wv-layers-close:hover,
+.productsitem button.wv-layers-info:hover,
+.productsitem button.wv-layers-options:hover {
background: #fff;
}
@@ -445,7 +457,6 @@ li.item.productsitem.inmotion,
text-align: center;
border-radius: 50%;
padding: 1px;
- margin-top: 3px;
}
.layer-info svg.svg-inline--fa.wv-layers-options-icon {
@@ -546,15 +557,18 @@ li.item.productsitem.inmotion,
}
}
-.productsitem a.button.wv-layers-close {
+.productsitem button.wv-layers-close {
display: block;
float: right;
width: 20px;
height: 20px;
position: relative;
+ border: none;
+ padding: 0;
+ background: none;
}
-.productsitem a.button.wv-layers-close svg.svg-inline--fa {
+.productsitem button.button.wv-layers-close svg.svg-inline--fa {
width: 12px;
pointer-events: none;
position: absolute;
diff --git a/web/scss/features/sidebar.scss b/web/scss/features/sidebar.scss
index 9af5ba280..770d7b34d 100644
--- a/web/scss/features/sidebar.scss
+++ b/web/scss/features/sidebar.scss
@@ -729,6 +729,10 @@ div#group-overlays-checkbox-case {
padding: 5px;
display: flex;
justify-content: center;
+ background: none;
+ border: none;
+ color: inherit;
+ width:100%;
svg {
margin-left: 10px;
diff --git a/web/scss/features/smart-handoff.scss b/web/scss/features/smart-handoff.scss
index 8bc4fa168..929d2ca1c 100644
--- a/web/scss/features/smart-handoff.scss
+++ b/web/scss/features/smart-handoff.scss
@@ -134,9 +134,12 @@ label[for="chk-crop-toggle"] span {
}
.help-link,
-a.help-link {
+a.help-link,
+button.help-link {
color: #7bf;
text-decoration: none;
+ background: none;
+ border: none;
&:hover {
color: #7bf;
@@ -331,6 +334,9 @@ a.help-link {
color: #7bf;
font-size: 17px;
text-align: center;
+ background: none;
+ border: none;
+ width: 100%;
}
.toggle-more-info:hover {
diff --git a/web/scss/features/timeline.scss b/web/scss/features/timeline.scss
index fcb05360f..d43d524e3 100644
--- a/web/scss/features/timeline.scss
+++ b/web/scss/features/timeline.scss
@@ -228,6 +228,8 @@ button:focus {
width: 35px;
margin: auto;
text-align: center;
+ background: none;
+ border: none;
}
& .date-arrows svg {
@@ -324,6 +326,8 @@ button:focus {
top: 16px;
right: 4px;
background-color: transparent;
+ border: none;
+ padding: 0;
& svg {
top: 5px;
@@ -480,6 +484,8 @@ button:focus {
top: -54px;
left: 85px;
color: #fff;
+ border: none;
+ padding: 0;
border-bottom: thin solid #444;
}
@@ -648,6 +654,9 @@ button:focus {
#timeline-hide {
position: absolute;
+ background: none;
+ padding: 0;
+ border: none;
top: 0;
right: 0;
height: 64px;
@@ -697,6 +706,7 @@ button:focus {
position: absolute;
height: 19px;
width: 57px;
+ padding: 0;
top: -20px;
cursor: pointer;
border-top-right-radius: 5px;
@@ -811,6 +821,7 @@ button:focus {
border-radius: 5px;
white-space: nowrap;
cursor: pointer;
+ padding: 0;
& .mobile-date-picker-select-btn-text {
height: 44px;
diff --git a/web/scss/features/tour.scss b/web/scss/features/tour.scss
index 1b2e2b9d5..eb6699875 100644
--- a/web/scss/features/tour.scss
+++ b/web/scss/features/tour.scss
@@ -651,6 +651,9 @@
height: 40px;
width: 40px;
margin: auto;
+ padding: 0;
+ border: none;
+ background: none;
}
.step-counter {
@@ -672,6 +675,9 @@
height: 40px;
width: 40px;
margin: auto;
+ padding: 0;
+ border: none;
+ background: none;
}
.step-previous:not([href]):not([tabindex]):hover,