{accessStatus &&
<>
-
+
{accessStatus.parkStatusText}{(!hideComma && advisories.length > 0) && ", "}
{advisories.length > 0 &&
diff --git a/src/gatsby/src/components/park/parkActivity.js b/src/gatsby/src/components/park/parkActivity.js
index e3743a3b3..ef6fab3bc 100644
--- a/src/gatsby/src/components/park/parkActivity.js
+++ b/src/gatsby/src/components/park/parkActivity.js
@@ -5,7 +5,7 @@ import Col from "react-bootstrap/Col"
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
import { faChevronUp, faChevronDown } from "@fortawesome/free-solid-svg-icons"
-import HtmlContent from "./htmlContent"
+import HtmlContent from "../htmlContent"
import StaticIcon from "./staticIcon"
import CustomToggle from "./customToggle"
import DiscoverParksLogo from "../../images/discover-parks-instagram-dark-green-icon-with-text.png"
@@ -145,18 +145,13 @@ export default function ParkActivity({ data, slug, hasDiscoverParksLink }) {
{activityData.length > 1 && (
{
- if (e.key === "Enter" || e.key === " ") {
- e.preventDefault()
- toggleExpandAll()
- }
- }}
+ aria-label={allExpanded ? "Collapse all things to do" : "Expand all things to do"}
className="btn btn-link expand-link expand-icon"
>
{allExpanded ?
- <>Collapse all
)}
diff --git a/src/gatsby/src/components/park/parkDates.js b/src/gatsby/src/components/park/parkDates.js
index 5a41372a1..d46a4ba72 100644
--- a/src/gatsby/src/components/park/parkDates.js
+++ b/src/gatsby/src/components/park/parkDates.js
@@ -6,7 +6,7 @@ import Col from "react-bootstrap/Col"
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
import { faChevronUp, faChevronDown } from "@fortawesome/free-solid-svg-icons"
-import HtmlContent from "./htmlContent"
+import HtmlContent from "../htmlContent"
import SubArea from "./subArea"
import CustomToggle from "./customToggle"
import { trackSnowplowEvent } from "../../utils/snowplowHelper"
@@ -146,6 +146,11 @@ export default function ParkDates({ data, parkOperation }) {
const [hash, setHash] = useState("")
const [openAccordions, setOpenAccordions] = useState({})
+ const expandLabel = (campingType) => {
+ return allExpanded ?
+ `Collapse all ${campingType.toLowerCase()}` : `Expand all ${campingType.toLowerCase()}`
+ }
+
const toggleAccordion = (index, subAreaName) => {
setOpenAccordions((prev) => ({
...prev,
@@ -232,18 +237,12 @@ export default function ParkDates({ data, parkOperation }) {
{subAreas.length > 1 && (
{
- if (e.key === "Enter" || e.key === " ") {
- e.preventDefault()
- toggleExpandAll()
- }
- }}
+ aria-label={expandLabel(data.campingType.pluralName)}
className="btn btn-link expand-link expand-icon"
>
+ {expandLabel(data.campingType.pluralName)}{" "}
{allExpanded ?
- <>Collapse all
)}
diff --git a/src/gatsby/src/components/park/parkFacility.js b/src/gatsby/src/components/park/parkFacility.js
index e11421996..5729963d6 100644
--- a/src/gatsby/src/components/park/parkFacility.js
+++ b/src/gatsby/src/components/park/parkFacility.js
@@ -5,7 +5,7 @@ import Col from "react-bootstrap/Col"
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
import { faChevronUp, faChevronDown } from "@fortawesome/free-solid-svg-icons"
-import HtmlContent from "./htmlContent"
+import HtmlContent from "../htmlContent"
import StaticIcon from "./staticIcon"
import { isNullOrWhiteSpace } from "../../utils/helpers"
import { trackSnowplowEvent } from "../../utils/snowplowHelper"
@@ -159,18 +159,13 @@ export default function ParkFacility({ data, groupPicnicReservationUrl }) {
{facilityData.length > 1 && (
{
- if (e.key === "Enter" || e.key === " ") {
- e.preventDefault()
- toggleExpandAll()
- }
- }}
+ aria-label={allExpanded ? "Collapse all facilities" : "Expand all facilities"}
className="btn btn-link expand-link expand-icon"
>
{allExpanded ?
- <>Collapse all
)}
diff --git a/src/gatsby/src/components/park/parkHeader.js b/src/gatsby/src/components/park/parkHeader.js
index 8b72bd881..35f4ee639 100644
--- a/src/gatsby/src/components/park/parkHeader.js
+++ b/src/gatsby/src/components/park/parkHeader.js
@@ -1,5 +1,5 @@
import React, { useState } from "react"
-import HtmlContent from "./htmlContent"
+import HtmlContent from "../htmlContent"
import ParkAccessStatus from "./parkAccessStatus"
import CampfireBan from "../campfireBan"
import FontAwesome from "../fontAwesome"
@@ -203,7 +203,7 @@ export default function ParkHeader({
}
ParkHeader.propTypes = {
- orcs: PropTypes.number.isRequired,
+ orcs: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
slug: PropTypes.string.isRequired,
parkName: PropTypes.oneOfType([
PropTypes.object.isRequired,
diff --git a/src/gatsby/src/components/park/parkOverview.js b/src/gatsby/src/components/park/parkOverview.js
index 9768c632d..1b6979181 100644
--- a/src/gatsby/src/components/park/parkOverview.js
+++ b/src/gatsby/src/components/park/parkOverview.js
@@ -1,7 +1,7 @@
import React, { useState, useEffect, useRef } from "react"
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
import { faChevronUp, faChevronDown } from "@fortawesome/free-solid-svg-icons"
-import HtmlContent from "./htmlContent"
+import HtmlContent from "../htmlContent"
import * as cheerio from 'cheerio';
export default function ParkOverview({ data: parkOverview, type }) {
@@ -51,15 +51,10 @@ export default function ParkOverview({ data: parkOverview, type }) {
{hasExpandCondition &&
{
setExpanded(!expanded)
}}
- onKeyDown={(e) => {
- if (e.key === "Enter" || e.key === " ") {
- e.preventDefault()
- setExpanded(!expanded)
- }
- }}
>
{expanded ?
<>Show less
+ setPhotoIndex(photoIndex)}
+ >
+
)
}
diff --git a/src/gatsby/src/components/park/parkPhotoGallery.js b/src/gatsby/src/components/park/parkPhotoGallery.js
index ef0a24e7c..a5be90d77 100644
--- a/src/gatsby/src/components/park/parkPhotoGallery.js
+++ b/src/gatsby/src/components/park/parkPhotoGallery.js
@@ -15,15 +15,12 @@ import "yet-another-react-lightbox/plugins/thumbnails.css"
import ParkPhoto from "./parkPhoto"
-const ShowPhotos = ({ text, setShowPhotos, setOpen }) => {
+const ShowPhotos = ({ text, setPhotoIndex }) => {
return (
{
- setShowPhotos(true)
- setOpen(true)
- }}
+ onClick={() => setPhotoIndex(0)}
>
setOpen(false)}
+ index={photoIndex}
+ open={photoIndex >= 0}
+ close={() => setPhotoIndex(-1)}
slides={photoSlides}
carousel={{ finite: "false" }}
captions={{ descriptionTextAlign: "center", descriptionMaxLines: 5 }}
@@ -73,33 +70,22 @@ export default function ParkPhotoGallery({ photos }) {
{parkPhotos.length > 0 && (
{
- if (!showPhoto) {
- setShowPhoto(true)
- }
- }}
- onKeyDown={(e) => {
- if (!showPhoto && (e.key === "Enter" || e.key === " ")) {
- setShowPhoto(true)
- }
- }}
>
{parkPhotos.length === 1 && (
-
setOpen(true)} className="g-0">
+
@@ -108,10 +94,12 @@ export default function ParkPhotoGallery({ photos }) {
{(parkPhotos.length === 2 ||
parkPhotos.length === 3 ||
parkPhotos.length === 4) && (
- setOpen(true)} className="g-0">
+
)}
{parkPhotos.length > 4 && (
- setOpen(true)} className="g-0">
+
{
- if (!showPhoto) {
- setShowPhoto(true)
- }
- }}
- onKeyDown={(e) => {
- if (!showPhoto && (e.key === "Enter" || e.key === " ")) {
- setShowPhoto(true)
- }
- }}
>
-
setOpen(true)} className="g-0">
+
diff --git a/src/gatsby/src/components/park/reconciliation.js b/src/gatsby/src/components/park/reconciliation.js
index c830d8541..c75e02570 100644
--- a/src/gatsby/src/components/park/reconciliation.js
+++ b/src/gatsby/src/components/park/reconciliation.js
@@ -1,12 +1,14 @@
import React from "react"
-import HtmlContent from "./htmlContent"
+import HtmlContent from "../htmlContent"
export default function Reconciliation({ data }) {
return (
{/* id="park-reconciliation-container" should be removed once it's removed from the contents */}
-
Reconciliation with Indigenous Peoples
+
+ Reconciliation with Indigenous Peoples
+
{data}
)
diff --git a/src/gatsby/src/components/park/safetyInfo.js b/src/gatsby/src/components/park/safetyInfo.js
index 64c43b885..759cbcf29 100644
--- a/src/gatsby/src/components/park/safetyInfo.js
+++ b/src/gatsby/src/components/park/safetyInfo.js
@@ -1,5 +1,5 @@
import React from "react"
-import HtmlContent from "./htmlContent"
+import HtmlContent from "../htmlContent"
export default function SafetyInfo({ safetyInfo }) {
return (
diff --git a/src/gatsby/src/components/park/specialNote.js b/src/gatsby/src/components/park/specialNote.js
index f3abaf3bc..e5e55b0ca 100644
--- a/src/gatsby/src/components/park/specialNote.js
+++ b/src/gatsby/src/components/park/specialNote.js
@@ -1,5 +1,5 @@
import React from "react"
-import HtmlContent from "./htmlContent"
+import HtmlContent from "../htmlContent"
export default function SpecialNote({ specialNotes }) {
return (
diff --git a/src/gatsby/src/components/park/subArea.js b/src/gatsby/src/components/park/subArea.js
index b4a16bd8d..9bf2b7845 100644
--- a/src/gatsby/src/components/park/subArea.js
+++ b/src/gatsby/src/components/park/subArea.js
@@ -4,7 +4,7 @@ import Col from "react-bootstrap/Col"
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
import { faCalendar } from "@fortawesome/free-regular-svg-icons"
-import HTMLArea from "../HTMLArea"
+import HtmlContent from "../htmlContent"
import FontAwesome from "../fontAwesome"
import { countsList } from "../../utils/constants"
@@ -78,9 +78,9 @@ export default function SubArea({ data, showHeading }) {
{note.display && (
{note.display}
)}
-
+
{data[note.noteVar].data[note.noteVar]}
-
+