@nnc-digital/nnc-design-system 1.0.0-alpha9 → 1.0.0-beta10

package/build/index.js

@@ -3887,7 +3887,7 @@ var Autocomplete = function (_a) {
         })));
 };
 
-const Container$18 = styled__default.default.div`
+const Container$19 = styled__default.default.div`
   display: block;
 `;
 
@@ -3972,7 +3972,7 @@ var BackToTop = function (_a) {
     React.useEffect(function () {
         window.addEventListener('scroll', toggleVisible);
     });
-    return (React__default.default.createElement(Container$18, { "data-testid": "BackToTop" }, isActive && (React__default.default.createElement(BackToTopButton, { onClick: scrollToTop, "$visible": visible, "data-testid": "BackToTopButton", type: "button", "aria-label": "Go to the top of the page" },
+    return (React__default.default.createElement(Container$19, { "data-testid": "BackToTop" }, isActive && (React__default.default.createElement(BackToTopButton, { onClick: scrollToTop, "$visible": visible, "data-testid": "BackToTopButton", type: "button", "aria-label": "Go to the top of the page" },
         React__default.default.createElement(ChevronIcon, { colourFill: themeContext.theme_vars.colours.white, direction: "up" })))));
 };
 
@@ -4076,9 +4076,9 @@ var Button$4 = function (_a) {
     return (React__default.default.createElement(StyledButton$1, __assign$2({ className: ["button--".concat(size), mode].join(' ') }, href, { title: title ? title : text, "$colourOverride": colourOverride && colourOverride }, props), text ? text : children));
 };
 
-var Container$17 = styled__default.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  display: flex;\n  flex-direction: column;\n  align-items: flex-start;\n"], ["\n  display: flex;\n  flex-direction: column;\n  align-items: flex-start;\n"])));
-var Label$5 = styled__default.default.label(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  display: block;\n  margin-bottom: 15px;\n"], ["\n  display: block;\n  margin-bottom: 15px;\n"])));
-var VisuallyHiddenLabel = styled__default.default(Label$5)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  margin: -1px;\n  padding: 0;\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  clip-path: inset(50%);\n  border: 0;\n  white-space: nowrap;\n"], ["\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  margin: -1px;\n  padding: 0;\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  clip-path: inset(50%);\n  border: 0;\n  white-space: nowrap;\n"])));
+var Container$18 = styled__default.default.div(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n  display: flex;\n  flex-direction: column;\n  align-items: flex-start;\n"], ["\n  display: flex;\n  flex-direction: column;\n  align-items: flex-start;\n"])));
+var Label$6 = styled__default.default.label(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n  display: block;\n  margin-bottom: 15px;\n"], ["\n  display: block;\n  margin-bottom: 15px;\n"])));
+var VisuallyHiddenLabel = styled__default.default(Label$6)(templateObject_3 || (templateObject_3 = __makeTemplateObject(["\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  margin: -1px;\n  padding: 0;\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  clip-path: inset(50%);\n  border: 0;\n  white-space: nowrap;\n"], ["\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  margin: -1px;\n  padding: 0;\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  clip-path: inset(50%);\n  border: 0;\n  white-space: nowrap;\n"])));
 var BinCollectionButtonStyles = styled__default.default.div(templateObject_4 || (templateObject_4 = __makeTemplateObject(["\n    button {\n      margin: 10px 10px 12px 10px;\n    }\n"], ["\n    button {\n      margin: 10px 10px 12px 10px;\n    }\n"])));
 var FormContainer$1 = styled__default.default.div(templateObject_5 || (templateObject_5 = __makeTemplateObject(["\n  width: 100%;\n  display: flex;\n  flex-direction: column;\n  align-items: flex-start;\n  ", "\n"], ["\n  width: 100%;\n  display: flex;\n  flex-direction: column;\n  align-items: flex-start;\n  ", "\n"])), function (props) {
     return props.$isLoading && "\n          opacity: 0.5; \n          pointer-events: none;\n      ";
@@ -4091,7 +4091,7 @@ styled__default.default.div(templateObject_10 || (templateObject_10 = __makeTemp
 styled__default.default.input(templateObject_11 || (templateObject_11 = __makeTemplateObject([""], [""])));
 var templateObject_1, templateObject_2, templateObject_3, templateObject_4, templateObject_5, templateObject_6, templateObject_7, templateObject_8, templateObject_9, templateObject_10, templateObject_11;
 
-const Container$16 = styled__default.default.div`
+const Container$17 = styled__default.default.div`
   display: flex;
   -webkit-flex-direction: row;
   -moz-flex-direction: row;
@@ -4128,7 +4128,7 @@ const ErrorSummary = styled__default.default.div`
  */
 var FormWithLine = function (_a) {
     var _b = _a.lineColour, lineColour = _b === void 0 ? '#C6C6C6' : _b, _c = _a.hideLine, hideLine = _c === void 0 ? false : _c, formRole = _a.formRole, formMethod = _a.formMethod, formURL = _a.formURL, _d = _a.isError, isError = _d === void 0 ? false : _d, errorSummary = _a.errorSummary, onSubmit = _a.onSubmit, children = _a.children;
-    return (React__default.default.createElement(Container$16, null,
+    return (React__default.default.createElement(Container$17, null,
         React__default.default.createElement(Line$1, { "$lineColour": lineColour, "$hideLine": hideLine, "$isError": isError }),
         React__default.default.createElement(Form, { onSubmit: onSubmit, "$hideLine": hideLine, role: formRole, method: formMethod, url: formURL, "data-testid": "FormWithLine" },
             errorSummary && React__default.default.createElement(ErrorSummary, null, errorSummary),
@@ -4206,7 +4206,7 @@ var FormButton = function (_a) {
     return (React__default.default.createElement(StyledButton, __assign$2({ type: type, className: ["button--".concat(size), mode].join(' ') }, props), text));
 };
 
-const Container$15 = styled__default.default.div`
+const Container$16 = styled__default.default.div`
   ${(props) => props.theme.fontStyles};
 `;
 
@@ -4216,7 +4216,7 @@ const hideLabel$1 = (props) => {
   }
 };
 
-const Label$4 = styled__default.default.label`
+const Label$5 = styled__default.default.label`
   display: block;
   margin-bottom: 5px;
   ${hideLabel$1}
@@ -4251,8 +4251,8 @@ const Option = styled__default.default.option`
 
 var DropDownSelect = function (_a) {
     var id = _a.id, label = _a.label, options = _a.options, onChange = _a.onChange, selected = _a.selected, _b = _a.hideLabel, hideLabel = _b === void 0 ? false : _b;
-    return (React__default.default.createElement(Container$15, null,
-        React__default.default.createElement(Label$4, { htmlFor: id, "$hideLabel": hideLabel }, label),
+    return (React__default.default.createElement(Container$16, null,
+        React__default.default.createElement(Label$5, { htmlFor: id, "$hideLabel": hideLabel }, label),
         React__default.default.createElement(Select, { id: id, name: id, onChange: onChange && onChange, defaultValue: selected && selected }, options.map(function (option, i) { return (React__default.default.createElement(Option, { key: i, value: option.value }, option.title)); }))));
 };
 
@@ -4535,7 +4535,7 @@ var BinCollection = function (_a) {
     React.useEffect(function () {
         seenTitles.current.clear();
     }, [calendarEvents]);
-    return (React__default.default.createElement(Container$17, { "data-testid": "BinCollection" },
+    return (React__default.default.createElement(Container$18, { "data-testid": "BinCollection" },
         React__default.default.createElement(FormWithLine, { onSubmit: handleSubmit, isError: isError, lineColour: themeContext.theme_vars.colours.$grey_dark, hideLine: true },
             React__default.default.createElement(FormContainer$1, { "$isLoading": isLoading },
                 React__default.default.createElement(Heading, { level: 2, text: "Bin collection checker" }),
@@ -6642,7 +6642,7 @@ var HeadingWithIcon = function (_a) {
         React__default.default.createElement(Heading, { text: text, level: level })));
 };
 
-const Container$14 = styled__default.default.div`
+const Container$15 = styled__default.default.div`
   display: flex;
   width: 100%;
   min-height: 400px;
@@ -6666,7 +6666,7 @@ var Map$1 = function (_a) {
             setMap(new window.google.maps.Map(ref.current, { center: center, zoom: zoom }));
         }
     }, [ref, map]);
-    return (React__default.default.createElement(Container$14, { "data-testid": "Map" },
+    return (React__default.default.createElement(Container$15, { "data-testid": "Map" },
         React__default.default.createElement("div", { ref: ref }),
         React__default.default.Children.map(children, function (child) {
             if (React__default.default.isValidElement(child)) {
@@ -6690,10 +6690,14 @@ var MapMarker = function (options) {
         anchor: new google.maps.Point(40, 60),
         labelOrigin: new google.maps.Point(21, 25),
     };
-    var mergedOptions = __assign$2(__assign$2({}, options), { anchorPoint: new google.maps.Point(-5, -40), icon: icon, label: {
-            text: typeof options.label === 'string' ? options.label : options.label.text,
-            color: 'white',
-        }, position: options.position, title: options.title });
+    var mergedOptions = __assign$2(__assign$2({}, options), { anchorPoint: new google.maps.Point(-5, -40), icon: icon, position: options.position, title: options.title, label: options.label ?
+            (typeof options.label === 'string' ?
+                { text: options.label, color: '#FFFFFF' } : __assign$2(__assign$2({}, options.label), { color: '#FFFFFF' })) : undefined });
+    for (var key in options) {
+        if (key !== 'label' && Object.prototype.hasOwnProperty.call(options, key)) {
+            mergedOptions[key] = options[key];
+        }
+    }
     React__default.default.useEffect(function () {
         if (!marker) {
             setMarker(new google.maps.Marker());
@@ -6723,7 +6727,7 @@ var MapMarker = function (options) {
     return null;
 };
 
-const Container$13 = styled__default.default.div`
+const Container$14 = styled__default.default.div`
   ${(props) => props.theme.fontStyles};
   display: block;
   border-top: 1px solid ${(props) => props.theme.theme_vars.colours.grey};
@@ -7504,7 +7508,7 @@ var Pagination = function (_a) {
         }
     };
     if (numbers.length > 1) {
-        return (React__default.default.createElement(Container$13, { "data-testid": "Pagination", role: "navigation", "aria-label": "Pagination" },
+        return (React__default.default.createElement(Container$14, { "data-testid": "Pagination", role: "navigation", "aria-label": "Pagination" },
             currentPage > 1 && (React__default.default.createElement(Previous, { onClick: function () { return buttonClick(currentPage - 1); }, title: "Go back a page" }, "Previous")),
             React__default.default.createElement(NumbersContainer, null, numbers.map(function (v, i) { return (React__default.default.createElement(NumberContainer, { key: i },
                 v === '...' && React__default.default.createElement(Ellipsis, null, "..."),
@@ -7516,7 +7520,7 @@ var Pagination = function (_a) {
     return null;
 };
 
-const Container$12 = styled__default.default.div`
+const Container$13 = styled__default.default.div`
   ${(props) => props.theme.fontStyles};
   margin-bottom: 30px;
 `;
@@ -7687,7 +7691,7 @@ var CheckboxListFilter = function (_a) {
         handleParams('news', [{ key: NewsArticleFilterFields.articleType.queryParamKey, value: articleTypes }], ['page']);
     };
     var backupLabel = Math.random().toString(36).substring(7);
-    return (React__default.default.createElement(Container$12, { "data-testid": "CheckboxListFilter" },
+    return (React__default.default.createElement(Container$13, { "data-testid": "CheckboxListFilter" },
         React__default.default.createElement(Fieldset$2, { "aria-describedby": hintId },
             React__default.default.createElement(Legend$2, { "$labelHidden": labelHidden, "data-testid": "CheckboxListFilterLegend" }, label),
             React__default.default.createElement(Hint, { id: hintId, "$hintHidden": hintHidden, "data-testid": "CheckboxListFilterHint" }, hint),
@@ -7819,7 +7823,7 @@ const PromotedLink$1 = styled__default.default.a`
   ${oneColStyles}
 `;
 
-const Container$11 = styled__default.default.div`
+const Container$12 = styled__default.default.div`
   box-sizing: border-box;
   display: flex;
   flex-wrap: wrap;
@@ -7842,7 +7846,7 @@ const Container$11 = styled__default.default.div`
 
 var Row$1 = function (_a) {
     var _b = _a.hasBorder, hasBorder = _b === void 0 ? false : _b, _c = _a.isList, isList = _c === void 0 ? false : _c, _d = _a.hasWrap, hasWrap = _d === void 0 ? true : _d, children = _a.children;
-    return (React__default.default.createElement(Container$11, { "data-testid": "Row", "$hasBorder": hasBorder, "$hasWrap": hasWrap, as: isList ? 'ul' : 'div' }, children));
+    return (React__default.default.createElement(Container$12, { "data-testid": "Row", "$hasBorder": hasBorder, "$hasWrap": hasWrap, as: isList ? 'ul' : 'div' }, children));
 };
 
 const calculateWidth = (size) => {
@@ -7892,7 +7896,7 @@ const widths = (props) => {
   `;
 };
 
-const Container$10 = styled__default.default.div`
+const Container$11 = styled__default.default.div`
   box-sizing: border-box;
   display: block;
   padding: ${(props) => (props.$hasPadding ? props.theme.theme_vars.spacingSizes.small : `0`)};
@@ -7903,14 +7907,14 @@ const Container$10 = styled__default.default.div`
 
 var Column = function (_a) {
     var _b = _a.small, small = _b === void 0 ? 'full' : _b, _c = _a.medium, medium = _c === void 0 ? 'one-half' : _c, _d = _a.large, large = _d === void 0 ? 'one-third' : _d, _e = _a.hasPadding, hasPadding = _e === void 0 ? true : _e, _f = _a.hasBorder, hasBorder = _f === void 0 ? false : _f, _g = _a.isList, isList = _g === void 0 ? false : _g, classes = _a.classes, children = _a.children;
-    return (React__default.default.createElement(Container$10, { "data-testid": "Column", "$small": small, "$medium": medium, "$large": large, "$hasPadding": hasPadding, "$hasBorder": hasBorder, as: isList ? 'li' : 'div', className: classes }, children));
+    return (React__default.default.createElement(Container$11, { "data-testid": "Column", "$small": small, "$medium": medium, "$large": large, "$hasPadding": hasPadding, "$hasBorder": hasBorder, as: isList ? 'li' : 'div', className: classes }, children));
 };
 
 var PromotedLinks = function (_a) {
     var promotedLinksArray = _a.promotedLinksArray, oneCol = _a.oneCol;
     if (promotedLinksArray.length > 0) {
         return (React__default.default.createElement(PromotedLinks$1, { "data-testid": "PromotedLinks", "$oneCol": oneCol },
-            React__default.default.createElement(Row$1, { isList: true, hasWrap: false }, promotedLinksArray.map(function (link, i) { return (React__default.default.createElement(Column, { isList: true, small: "full", medium: "one-half", large: "auto", key: i },
+            React__default.default.createElement(Row$1, { isList: true, hasWrap: true }, promotedLinksArray.map(function (link, i) { return (React__default.default.createElement(Column, { isList: true, small: "full", medium: "one-half", large: "one-third", key: i },
                 React__default.default.createElement(PromotedLink$1, { "$oneCol": oneCol, href: link.url, title: link.title },
                     React__default.default.createElement("span", null, link.title)))); }))));
     }
@@ -7919,7 +7923,7 @@ var PromotedLinks = function (_a) {
     }
 };
 
-const Container$$ = styled__default.default.div`
+const Container$10 = styled__default.default.div`
   display: block;
 `;
 
@@ -7955,7 +7959,7 @@ const Cookies = styled__default.default.button`
   }
 `;
 
-const Container$_ = styled__default.default.div`
+const Container$$ = styled__default.default.div`
   ${(props) => props.theme.fontStyles}
   background-color: ${(props) => props.theme.theme_vars.colours.grey_light};
   padding: ${(props) => props.theme.theme_vars.spacingSizes.medium} 0;
@@ -7963,6 +7967,8 @@ const Container$_ = styled__default.default.div`
   width: 100%;
   display: block;
   box-sizing: border-box;
+  position: sticky;
+  z-index: 1;
 `;
 
 const CookieHide = styled__default.default.button`
@@ -8156,7 +8162,7 @@ var CookieBanner = function (_a) {
     // on page load - look for a cookie
     React.useEffect(function () {
         checkCookie();
-    });
+    }, []);
     var _d = React.useState(false), showCookieBanner = _d[0], setShowCookieBanner = _d[1];
     var _e = React.useState(false), showCookiesRejectedBanner = _e[0], setShowCookiesRejectedBanner = _e[1];
     var _f = React.useState(false), showCookiesAcceptedBanner = _f[0], setShowCookiesAcceptedBanner = _f[1];
@@ -8227,18 +8233,18 @@ var CookieBanner = function (_a) {
         hideCookiesAcceptedConfirmationBanner();
     };
     return (React__default.default.createElement(React__default.default.Fragment, null,
-        showCookieBanner && (React__default.default.createElement(Container$_, { "data-testid": "CookieBanner" },
+        showCookieBanner && (React__default.default.createElement(Container$$, { "data-testid": "CookieBanner" },
             React__default.default.createElement(CookieMessage, null,
                 React__default.default.createElement(CookieHeading, null, title),
                 React__default.default.createElement(CookieParagraph, null, paragraph),
                 React__default.default.createElement(ButtonsContainer, null,
                     React__default.default.createElement(FormButton, { primary: true, text: acceptButtonText, isDisabled: true, onClick: acceptCookies, size: "large" }),
                     React__default.default.createElement(FormButton, { primary: true, text: rejectButtonText, isDisabled: true, onClick: rejectCookies, size: "large" }))))),
-        showCookiesRejectedBanner && (React__default.default.createElement(Container$_, { "data-testid": "CookieBannerRejected", id: "CookieBannerRejected" },
+        showCookiesRejectedBanner && (React__default.default.createElement(Container$$, { "data-testid": "CookieBannerRejected", id: "CookieBannerRejected" },
             React__default.default.createElement(CookieMessage, { isInline: true },
                 React__default.default.createElement(CookieParagraph, null, rejectConfirmationText),
                 React__default.default.createElement(CookieHide, { onClick: hideCookiesConfirmationBanner, "aria-controls": "CookieBannerRejected", "aria-hidden": "false" }, "Hide")))),
-        showCookiesAcceptedBanner && (React__default.default.createElement(Container$_, { "data-testid": "CookieBannerAccepted", id: "CookieBannerAccepted" },
+        showCookiesAcceptedBanner && (React__default.default.createElement(Container$$, { "data-testid": "CookieBannerAccepted", id: "CookieBannerAccepted" },
             React__default.default.createElement(CookieMessage, { isInline: true },
                 React__default.default.createElement(CookieParagraph, null, acceptConfirmationText),
                 React__default.default.createElement(CookieHide, { onClick: hideCookiesConfirmationBanner, "aria-controls": "CookieBannerAccepted", "aria-hidden": "false" }, "Hide"))))));
@@ -8260,7 +8266,7 @@ var StaticMap = function (_a) {
         return "&markers=size:".concat(size, "%7Ccolor:").concat(colour).concat(label, "%7C").concat(mapMarker.lat, ",").concat(mapMarker.lng);
     })
         .join('');
-    return (React__default.default.createElement(Container$$, { "data-testid": "StaticMap" },
+    return (React__default.default.createElement(Container$10, { "data-testid": "StaticMap" },
         React__default.default.createElement(Message, null,
             React__default.default.createElement("span", null,
                 "To interact with the map, you need to ",
@@ -8281,7 +8287,7 @@ var TextInput = function (_a) {
 
 // Accordion
 
-const Container$Z = styled__default.default.div`
+const Container$_ = styled__default.default.div`
   ${(props) => props.theme.fontStyles}
   margin-bottom: 20px;
   border-bottom: 1px solid ${(props) => props.theme.theme_vars.colours.grey};
@@ -8558,7 +8564,7 @@ var Accordion$1 = function (_a) {
         setAccordionStates(newStatus);
     };
     var accordionId = "accordion".concat(React.useId());
-    return (React__default.default.createElement(Container$Z, { "data-testid": "Accordion", id: accordionId },
+    return (React__default.default.createElement(Container$_, { "data-testid": "Accordion", id: accordionId },
         showControls && sections.length > 1 && (React__default.default.createElement(AccordionControls$1, null,
             React__default.default.createElement(OpenAllButton, { onClick: toggleAll, type: "button", "aria-expanded": !openAll },
                 openAll ? 'Open all' : 'Close all',
@@ -8609,7 +8615,7 @@ var BlockQuote = function (_a) {
         citation && React__default.default.createElement(Citation, null, citation)));
 };
 
-const Container$Y = styled__default.default.div`
+const Container$Z = styled__default.default.div`
     margin-bottom: 30px;
     display: block;
 
@@ -8624,11 +8630,11 @@ const Container$Y = styled__default.default.div`
  */
 var CallToAction = function (_a) {
     var primary = _a.primary; _a.size; var text = _a.text, url = _a.url, isExternal = _a.isExternal, isDisabled = _a.isDisabled; __rest(_a, ["primary", "size", "text", "url", "isExternal", "isDisabled"]);
-    return (React__default.default.createElement(Container$Y, null,
+    return (React__default.default.createElement(Container$Z, null,
         React__default.default.createElement(Button$4, { primary: primary, size: "large", text: text, url: url, isExternal: isExternal, isDisabled: isDisabled })));
 };
 
-const Container$X = styled__default.default.div`
+const Container$Y = styled__default.default.div`
   display: block;
   ${(props) => props.theme.fontStyles}
 `;
@@ -8804,7 +8810,7 @@ var CouncilTaxAlphabeticalDirectory = function (_a) {
         });
         return letterData;
     });
-    return (React__default.default.createElement(Container$X, { "data-testid": "AlphabeticalDirectory", ref: directoryRef },
+    return (React__default.default.createElement(Container$Y, { "data-testid": "AlphabeticalDirectory", ref: directoryRef },
         React__default.default.createElement(React__default.default.Fragment, null,
             parishes.length === 0 && (React__default.default.createElement(ErrorText, null, "There was an issue fetching the parish data. Please try again later.")),
             parish === null ? (React__default.default.createElement(React__default.default.Fragment, null, sortedData.map(function (letter, i) { return (React__default.default.createElement(Row, { key: i },
@@ -8830,9 +8836,9 @@ var CouncilTaxAlphabeticalDirectory = function (_a) {
                             React__default.default.createElement("td", null, Number(parish.values[band]).toLocaleString('en-GB', { style: 'currency', currency: 'GBP' })))); })))))))));
 };
 
-const Container$W = styled__default.default.div``;
+const Container$X = styled__default.default.div``;
 
-const Container$V = styled__default.default.div`
+const Container$W = styled__default.default.div`
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
@@ -19487,7 +19493,7 @@ function markDirtyUp(node) {
   }
 }
 
-let Container$U = class Container extends Node$1 {
+let Container$V = class Container extends Node$1 {
   append(...children) {
     for (let child of children) {
       let nodes = this.normalize(child, this.last);
@@ -19860,27 +19866,27 @@ let Container$U = class Container extends Node$1 {
   }
 };
 
-Container$U.registerParse = dependant => {
+Container$V.registerParse = dependant => {
   parse$4 = dependant;
 };
 
-Container$U.registerRule = dependant => {
+Container$V.registerRule = dependant => {
   Rule$4 = dependant;
 };
 
-Container$U.registerAtRule = dependant => {
+Container$V.registerAtRule = dependant => {
   AtRule$4 = dependant;
 };
 
-Container$U.registerRoot = dependant => {
+Container$V.registerRoot = dependant => {
   Root$6 = dependant;
 };
 
-var container = Container$U;
-Container$U.default = Container$U;
+var container = Container$V;
+Container$V.default = Container$V;
 
 /* c8 ignore start */
-Container$U.rebuild = node => {
+Container$V.rebuild = node => {
   if (node.type === 'atrule') {
     Object.setPrototypeOf(node, AtRule$4.prototype);
   } else if (node.type === 'rule') {
@@ -19897,16 +19903,16 @@ Container$U.rebuild = node => {
 
   if (node.nodes) {
     node.nodes.forEach(child => {
-      Container$U.rebuild(child);
+      Container$V.rebuild(child);
     });
   }
 };
 
-let Container$T = container;
+let Container$U = container;
 
 let LazyResult$4, Processor$3;
 
-let Document$3 = class Document extends Container$T {
+let Document$3 = class Document extends Container$U {
   constructor(defaults) {
     // type needs to be passed to super, otherwise child roots won't be normalized correctly
     super({ type: 'document', ...defaults });
@@ -20024,9 +20030,9 @@ let Result$4 = class Result {
 var result = Result$4;
 Result$4.default = Result$4;
 
-let Container$S = container;
+let Container$T = container;
 
-let AtRule$3 = class AtRule extends Container$S {
+let AtRule$3 = class AtRule extends Container$T {
   constructor(defaults) {
     super(defaults);
     this.type = 'atrule';
@@ -20046,13 +20052,13 @@ let AtRule$3 = class AtRule extends Container$S {
 var atRule = AtRule$3;
 AtRule$3.default = AtRule$3;
 
-Container$S.registerAtRule(AtRule$3);
+Container$T.registerAtRule(AtRule$3);
 
-let Container$R = container;
+let Container$S = container;
 
 let LazyResult$3, Processor$2;
 
-let Root$5 = class Root extends Container$R {
+let Root$5 = class Root extends Container$S {
   constructor(defaults) {
     super(defaults);
     this.type = 'root';
@@ -20106,7 +20112,7 @@ Root$5.registerProcessor = dependant => {
 var root = Root$5;
 Root$5.default = Root$5;
 
-Container$R.registerRoot(Root$5);
+Container$S.registerRoot(Root$5);
 
 let list$2 = {
   comma(string) {
@@ -20165,10 +20171,10 @@ let list$2 = {
 var list_1 = list$2;
 list$2.default = list$2;
 
-let Container$Q = container;
+let Container$R = container;
 let list$1 = list_1;
 
-let Rule$3 = class Rule extends Container$Q {
+let Rule$3 = class Rule extends Container$R {
   constructor(defaults) {
     super(defaults);
     this.type = 'rule';
@@ -20189,7 +20195,7 @@ let Rule$3 = class Rule extends Container$Q {
 var rule = Rule$3;
 Rule$3.default = Rule$3;
 
-Container$Q.registerRule(Rule$3);
+Container$R.registerRule(Rule$3);
 
 let Declaration$2 = declaration;
 let tokenizer = tokenize;
@@ -20799,7 +20805,7 @@ let Parser$1 = class Parser {
 
 var parser = Parser$1;
 
-let Container$P = container;
+let Container$Q = container;
 let Parser = parser;
 let Input$3 = input;
 
@@ -20838,12 +20844,12 @@ function parse$3(css, opts) {
 var parse_1 = parse$3;
 parse$3.default = parse$3;
 
-Container$P.registerParse(parse$3);
+Container$Q.registerParse(parse$3);
 
 let { isClean, my } = symbols;
 let MapGenerator$1 = mapGenerator;
 let stringify$2 = stringify_1;
-let Container$O = container;
+let Container$P = container;
 let Document$2 = document$1;
 let warnOnce$1 = warnOnce$2;
 let Result$3 = result;
@@ -20978,7 +20984,7 @@ let LazyResult$2 = class LazyResult {
 
       if (root && !root[my]) {
         /* c8 ignore next 2 */
-        Container$O.rebuild(root);
+        Container$P.rebuild(root);
       }
     }
 
@@ -21648,7 +21654,7 @@ fromJSON$1.default = fromJSON$1;
 let CssSyntaxError = cssSyntaxError;
 let Declaration = declaration;
 let LazyResult = lazyResult;
-let Container$N = container;
+let Container$O = container;
 let Processor = processor;
 let stringify = stringify_1;
 let fromJSON = fromJSON_1;
@@ -21728,7 +21734,7 @@ postcss.document = defaults => new Document(defaults);
 
 postcss.CssSyntaxError = CssSyntaxError;
 postcss.Declaration = Declaration;
-postcss.Container = Container$N;
+postcss.Container = Container$O;
 postcss.Processor = Processor;
 postcss.Document = Document;
 postcss.Comment = Comment;
@@ -22597,7 +22603,7 @@ var sanitizeHtml$1 = sanitizeHtml_1;
 var Card = function (_a) {
     var header = _a.header, content = _a.content, footerLink = _a.footerLink, imageLarge = _a.imageLarge, imageSmall = _a.imageSmall, imageAltText = _a.imageAltText;
     var showContent = content || header;
-    return (React__default.default.createElement(Container$V, { "data-testid": "Card" },
+    return (React__default.default.createElement(Container$W, { "data-testid": "Card" },
         imageLarge && imageSmall && (React__default.default.createElement(React__default.default.Fragment, null, footerLink ? (React__default.default.createElement(ImageLink$1, { href: footerLink.url },
             React__default.default.createElement(Image$4, { src: imageLarge, alt: imageAltText, srcSet: "".concat(imageSmall, " 400w, ").concat(imageLarge, " 800w"), sizes: "(max-width: 550px) 400px, 800px", loading: "lazy" }))) : (React__default.default.createElement(Image$4, { src: imageLarge, alt: imageAltText, srcSet: "".concat(imageSmall, " 400w, ").concat(imageLarge, " 800w"), sizes: "(max-width: 550px) 400px, 800px", loading: "lazy" })))),
         showContent && (React__default.default.createElement(Content$6, null,
@@ -22613,12 +22619,12 @@ var Card = function (_a) {
  */
 var Cards = function (_a) {
     var cards = _a.cards;
-    return (React__default.default.createElement(Container$W, { "data-testid": "Cards" },
+    return (React__default.default.createElement(Container$X, { "data-testid": "Cards" },
         React__default.default.createElement(Row$1, null, cards.map(function (card, index) { return (React__default.default.createElement(Column, { small: "full", medium: "one-half", large: "one-third", key: index },
             React__default.default.createElement(Card, __assign$2({}, card)))); }))));
 };
 
-const Container$M = styled__default.default.div`
+const Container$N = styled__default.default.div`
   margin: 25px 0;
 `;
 
@@ -22736,7 +22742,7 @@ var FileDownload = function (_a) {
 
 var DownloadableFiles = function (_a) {
     var files = _a.files;
-    return (React__default.default.createElement(Container$M, { "data-testid": "DownloadableFiles" }, files.length > 0 ?
+    return (React__default.default.createElement(Container$N, { "data-testid": "DownloadableFiles" }, files.length > 0 ?
         files.map(function (file) { return React__default.default.createElement(FileDownload, __assign$2({ key: file.title }, file)); })
         :
             React__default.default.createElement("i", null, "No file to show")));
@@ -22837,7 +22843,7 @@ const AccessibleMapLink = styled__default.default(MapLink$1)`
   ${(props) => props.theme.visuallyHidden};
 `;
 
-const Container$L = styled__default.default.div`
+const Container$M = styled__default.default.div`
   border: solid 4px;
   border-radius: ${(props) => props.theme.theme_vars.border_radius};
   border-color: ${(props) =>
@@ -22891,7 +22897,7 @@ const InnerContainer$2 = styled__default.default.div`
  */
 var AlertBannerService = function (_a) {
     var title = _a.title, _b = _a.hasTopSpacing, hasTopSpacing = _b === void 0 ? false : _b, _c = _a.alertType, alertType = _c === void 0 ? 'alert' : _c, children = _a.children;
-    return (React__default.default.createElement(Container$L, { "$alertType": alertType, "data-testid": "AlertBannerService", hasTopSpacing: hasTopSpacing },
+    return (React__default.default.createElement(Container$M, { "$alertType": alertType, "data-testid": "AlertBannerService", "$hasTopSpacing": hasTopSpacing },
         React__default.default.createElement(InnerContainer$2, { "data-testid": "AlertBannerServiceInner" },
             (title === null || title === void 0 ? void 0 : title.trim()) && React__default.default.createElement(Heading, { text: title }),
             children)));
@@ -22944,7 +22950,7 @@ var GoogleMap = function (_a) {
             React__default.default.createElement(MapLink$1, { href: link_url }, link_title ? link_title : 'Google Maps link')))));
 };
 
-const Container$K = styled__default.default.figure`
+const Container$L = styled__default.default.figure`
   display: block;
   background: ${(props) =>
     props.theme.cardinal_name === 'north'
@@ -23611,7 +23617,7 @@ var LazyImage = /*@__PURE__*/getDefaultExportFromCjs(lib$1);
  */
 var Image$2 = function (_a) {
     var imageSmall = _a.imageSmall, imageLarge = _a.imageLarge, imageAltText = _a.imageAltText, _b = _a.ratio, ratio = _b === void 0 ? '4by3' : _b, caption = _a.caption, wrapText = _a.wrapText;
-    return (React__default.default.createElement(Container$K, { "data-testid": "Image", "$wrapText": wrapText },
+    return (React__default.default.createElement(Container$L, { "data-testid": "Image", "$wrapText": wrapText },
         React__default.default.createElement(ImageContainer$4, { "data-testid": "ImageContainer", "$ratio": ratio },
             React__default.default.createElement(LazyImage, { placeholder: imageSmall, src: imageLarge, visibilitySensorProps: {
                     partialVisibility: true,
@@ -23619,7 +23625,7 @@ var Image$2 = function (_a) {
         (caption === null || caption === void 0 ? void 0 : caption.trim()) && React__default.default.createElement(Caption, null, caption)));
 };
 
-const Container$J = styled__default.default.div`
+const Container$K = styled__default.default.div`
   display: block;
 `;
 
@@ -23640,7 +23646,7 @@ const Content$5 = styled__default.default.div`
  */
 var ImageAndText = function (_a) {
     var heading = _a.heading, textContent = _a.textContent, image = _a.image;
-    return (React__default.default.createElement(Container$J, { "data-testid": "ImageAndText" },
+    return (React__default.default.createElement(Container$K, { "data-testid": "ImageAndText" },
         React__default.default.createElement(Row$1, null,
             heading && (React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
                 React__default.default.createElement(HeadingContainer, null,
@@ -23653,44 +23659,296 @@ var ImageAndText = function (_a) {
                 React__default.default.createElement(Content$5, { dangerouslySetInnerHTML: { __html: sanitizeHtml$1(textContent) } }))))));
 };
 
-const Container$I = styled__default.default.div`
+var CaseAppointmentType;
+(function (CaseAppointmentType) {
+    CaseAppointmentType["Formal"] = "formal";
+    CaseAppointmentType["Hearing"] = "inquest hearing";
+    CaseAppointmentType["Opening"] = "opening";
+    CaseAppointmentType["PreInquest"] = "pre-inquest review";
+    CaseAppointmentType["Writing"] = "writing";
+})(CaseAppointmentType || (CaseAppointmentType = {}));
+
+const Container$J = styled__default.default.div`
   display: block;
+  box-sizing: border-box;
+`;
+
+const GroupContainer = styled__default.default.div`
+  display: flex;
+  flex-direction: column;
+  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.large};
+`;
+
+const InquestContainer = styled__default.default.div`
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  justify-content: flex-start;
+  flex-wrap: wrap;
+`;
+
+styled__default.default.div`
+  flex-grow: 1;
+  flex-shrink: 0;
+
+  strong {
+    display: block;
+    &::first-letter {
+      text-transform: capitalize;
+    }
+  }
+`;
+
+const InquestDetails = styled__default.default.div`
+  flex-grow: 1;
+  h3 {
+    display: block;
+    &::first-letter {
+      text-transform: capitalize;
+    }
+  }
+`;
+
+const SummaryContainer = styled__default.default.div`
+  border: ${(props) => (props.$hasHeading ? `1px solid ${props.theme.theme_vars.colours.grey}` : `none`)};
+  margin: ${(props) => (props.$hasMargin ? props.theme.theme_vars.spacingSizes.medium : 0)} 0;
+`;
+
+const SummaryHeading = styled__default.default.div`
+  background-color: ${(props) => props.theme.theme_vars.colours.grey_light};
+  width: 100%;
+  padding: ${(props) => props.theme.theme_vars.spacingSizes.small};
+  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.medium};
+
+  h3 {
+    margin: 0;
+  }
+`;
+
+const SummaryList$1 = styled__default.default.dl`
+  display: table;
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: collapse;
+`;
+
+const SummaryRow = styled__default.default.div`
+  border-bottom: ${(props) => props.$hasBorders ? `1px solid ${props.theme.theme_vars.colours.grey}` : 'none'};
+  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
+
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
+    display: table-row;
+  }
+
+  @media print {
+    display: table-row;
+    border-bottom: none;
+  }
+`;
+
+const SummaryTerm = styled__default.default.dt`
+  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
+  font-weight: bold;
+
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
+    display: table-cell;
+    padding: ${(props) => props.theme.theme_vars.spacingSizes.small};
+    width: 30%;
+    vertical-align: middle;
+  }
+
+  @media print {
+    display: table-cell;
+    width: 30%;
+  }
 `;
 
+const SummaryDetail = styled__default.default.dd`
+  overflow-wrap: break-word;
+  width: 100%;
+  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
+
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
+    display: table-cell;
+    width: 70%;
+    padding: ${(props) => props.theme.theme_vars.spacingSizes.small};
+  }
+
+  @media print {
+    display: table-cell;
+    width: 70%;
+  }
+`;
+
+var SummaryList = function (_a) {
+    var terms = _a.terms, _b = _a.hasMargin, hasMargin = _b === void 0 ? true : _b, _c = _a.hasBorders, hasBorders = _c === void 0 ? true : _c, heading = _a.heading;
+    return (React__default.default.createElement(SummaryContainer, { "$hasHeading": heading, "$hasMargin": hasMargin },
+        heading && (React__default.default.createElement(SummaryHeading, null,
+            React__default.default.createElement(Heading, { level: 3, text: heading }))),
+        React__default.default.createElement(SummaryList$1, { "data-testid": "SummaryList" }, terms.map(function (summaryRow, summaryIndex) { return (React__default.default.createElement(SummaryRow, { key: summaryIndex, "$hasBorders": hasBorders },
+            React__default.default.createElement(SummaryTerm, null, summaryRow.term),
+            React__default.default.createElement(SummaryDetail, { dangerouslySetInnerHTML: { __html: sanitizeHtml$1(summaryRow.detail) } }))); }))));
+};
+
+/**
+ * Format a date string to a readable date format
+ * @param {string} dateString - The date string to format
+ * @returns {string} Formatted date
+ */
+const formatDate = (dateString) => {
+  const date = new Date(dateString);
+  return date
+    .toLocaleDateString('en-GB', {
+      weekday: 'long',
+      day: 'numeric',
+      month: 'long',
+      year: 'numeric',
+    })
+    .replace(',', '');
+};
+
+/**
+ * Format a date string to a time format
+ * @param {string} dateString - The date string to format
+ * @returns {string} Formatted time
+ */
+const formatTime = (dateString) => {
+  const date = new Date(dateString);
+  const hours = date.getHours();
+  const minutes = date.getMinutes();
+
+  // Convert to 12-hour format
+  const hour12 = hours === 0 ? 12 : hours > 12 ? hours - 12 : hours;
+  const ampm = hours < 12 ? 'am' : 'pm';
+
+  // Only show minutes if not zero
+  if (minutes === 0) {
+    return `${hour12}${ampm}`;
+  } else {
+    return `${hour12}:${minutes.toString().padStart(2, '0')}${ampm}`;
+  }
+};
+
+/**
+ * Format a date string to a date and time format
+ * @param {string} dateString - The date string to format
+ * @returns {string} Formatted date and time
+ */
+const formatDateTime = (dateString) => {
+  const date = new Date(dateString);
+  return date.toLocaleDateString('en-GB', {
+    day: 'numeric',
+    month: 'long',
+    year: 'numeric',
+    hour: '2-digit',
+    minute: '2-digit',
+  });
+};
+
 /**
  * A table displaying a schedule of inquests
  */
 var InquestSchedule = function (_a) {
     var caseAppointments = _a.caseAppointments, title = _a.title, _b = _a.error, error = _b === void 0 ? false : _b;
-    return (React__default.default.createElement(Container$I, { "data-testid": "InquestSchedule" },
-        React__default.default.createElement("div", { className: "table-container" },
-            React__default.default.createElement("table", null,
-                React__default.default.createElement("caption", null, title),
-                React__default.default.createElement("thead", null,
-                    React__default.default.createElement("tr", null,
-                        React__default.default.createElement("th", { scope: "col" }, "Name"),
-                        React__default.default.createElement("th", { scope: "col" }, "Age"),
-                        React__default.default.createElement("th", { scope: "col" }, "Place of death"),
-                        React__default.default.createElement("th", { scope: "col" }, "Date of death"),
-                        React__default.default.createElement("th", { scope: "col" }, "Name of coroner"),
-                        React__default.default.createElement("th", { scope: "col" }, "Location"),
-                        React__default.default.createElement("th", { scope: "col" }, "Date and time"))),
-                React__default.default.createElement("tbody", null,
-                    caseAppointments.map(function (item, index) { return (React__default.default.createElement("tr", { key: index },
-                        React__default.default.createElement("td", null, item.fullName),
-                        React__default.default.createElement("td", null, item.age),
-                        React__default.default.createElement("td", null, item.placeOfDeath),
-                        React__default.default.createElement("td", null, new Date(item.dateTimeOfDeath).toLocaleString('en-GB')),
-                        React__default.default.createElement("td", null, item.coroner),
-                        React__default.default.createElement("td", null, item.courtroomFullAddress),
-                        React__default.default.createElement("td", null, new Date(item.startDateTime).toLocaleString('en-GB')))); }),
-                    caseAppointments.length === 0 && (React__default.default.createElement("tr", null,
-                        React__default.default.createElement("td", { colSpan: 7 },
-                            React__default.default.createElement("p", null, "We can't find any results at the moment."),
-                            error ? (React__default.default.createElement("p", null, " The information is currently unavailable.")) : (React__default.default.createElement("p", null, "There are no inquests scheduled for next month."))))))))));
+    var hearings = caseAppointments.filter(function (appointment) {
+        return appointment.appointmentType.toLowerCase().includes(CaseAppointmentType.Hearing);
+    });
+    var preInquest = caseAppointments.filter(function (appointment) {
+        return appointment.appointmentType.toLowerCase().includes(CaseAppointmentType.PreInquest);
+    });
+    var openings = caseAppointments.filter(function (appointment) {
+        return appointment.appointmentType.toLowerCase().includes(CaseAppointmentType.Opening);
+    });
+    var writings = caseAppointments.filter(function (appointment) {
+        return appointment.appointmentType.toLowerCase().includes(CaseAppointmentType.Writing);
+    });
+    var formal = caseAppointments.filter(function (appointment) {
+        return appointment.appointmentType.toLowerCase().includes(CaseAppointmentType.Formal);
+    });
+    var groupHearingsByDay = function (appointments) {
+        return appointments.reduce(function (acc, inquest) {
+            var inquestDate = new Date(inquest.startDateTime);
+            var inquestISODay = inquestDate.toISOString().substring(0, 10);
+            if (!acc[inquestISODay]) {
+                acc[inquestISODay] = [];
+            }
+            acc[inquestISODay].push(inquest);
+            return acc;
+        }, {});
+    };
+    var hearingDayGrouped = groupHearingsByDay(hearings);
+    var preInquestDayGrouped = groupHearingsByDay(preInquest);
+    var openingDayGrouped = groupHearingsByDay(openings);
+    var writingDayGrouped = groupHearingsByDay(writings);
+    var formalDayGrouped = groupHearingsByDay(formal);
+    var transformToSections = function (groupedData) {
+        return Object.keys(groupedData).map(function (day) {
+            return {
+                title: formatDate(day),
+                content: (React__default.default.createElement(Row$1, null, groupedData[day]
+                    .sort(function (a, b) {
+                    return new Date(a.startDateTime).getTime() - new Date(b.startDateTime).getTime();
+                })
+                    .map(function (inquest, key) {
+                    var terms = [
+                        {
+                            term: 'Name',
+                            detail: inquest.fullName,
+                        },
+                        {
+                            term: 'Died',
+                            detail: formatDate(inquest.dateTimeOfDeath) +
+                                ' at ' +
+                                inquest.placeOfDeath +
+                                '. Aged ' +
+                                inquest.age +
+                                ' years.',
+                        },
+                        {
+                            term: 'Court location',
+                            detail: inquest.courtroomFullAddress + '.',
+                        },
+                        {
+                            term: 'Coroner',
+                            detail: inquest.coroner + '.',
+                        },
+                    ];
+                    if (inquest.endDateTime) {
+                        terms.push({
+                            term: 'End date',
+                            detail: formatDateTime(inquest.endDateTime) + '.',
+                        });
+                    }
+                    return (React__default.default.createElement(Column, { small: "full", medium: "full", large: "full", key: key },
+                        React__default.default.createElement(InquestContainer, null,
+                            React__default.default.createElement(InquestDetails, null,
+                                React__default.default.createElement(SummaryList, { terms: terms, hasBorders: false, heading: formatTime(inquest.startDateTime) })))));
+                }))),
+            };
+        });
+    };
+    return (React__default.default.createElement(Container$J, { "data-testid": "InquestSchedule" },
+        Object.keys(hearingDayGrouped).length > 0 && (React__default.default.createElement(GroupContainer, null,
+            React__default.default.createElement(Heading, { level: 2, text: title }),
+            React__default.default.createElement(Accordion$1, { sections: transformToSections(hearingDayGrouped) }))),
+        Object.keys(openingDayGrouped).length > 0 && (React__default.default.createElement(GroupContainer, null,
+            React__default.default.createElement(Heading, { level: 2, text: "Inquest Openings" }),
+            React__default.default.createElement(Accordion$1, { sections: transformToSections(openingDayGrouped) }))),
+        Object.keys(preInquestDayGrouped).length > 0 && (React__default.default.createElement(GroupContainer, null,
+            React__default.default.createElement(Heading, { level: 2, text: "Pre-inquest Review Hearings" }),
+            React__default.default.createElement(Accordion$1, { sections: transformToSections(preInquestDayGrouped) }))),
+        Object.keys(writingDayGrouped).length > 0 && (React__default.default.createElement(GroupContainer, null,
+            React__default.default.createElement(Heading, { level: 2, text: "Inquests in Writing" }),
+            React__default.default.createElement(Accordion$1, { sections: transformToSections(writingDayGrouped) }))),
+        Object.keys(formalDayGrouped).length > 0 && (React__default.default.createElement(GroupContainer, null,
+            React__default.default.createElement(Heading, { level: 2, text: "Formal Suspension Hearings" }),
+            React__default.default.createElement(Accordion$1, { sections: transformToSections(formalDayGrouped) }))),
+        caseAppointments.length === 0 && (React__default.default.createElement("div", null,
+            React__default.default.createElement("p", null, "We can't find any results at the moment."),
+            error ? (React__default.default.createElement("p", null, " The information is currently unavailable.")) : (React__default.default.createElement("p", null, "There are no inquests scheduled for next month."))))));
 };
 
-const Container$H = styled__default.default.div`
+const Container$I = styled__default.default.div`
   ${(props) => props.theme.fontStyles};
   overflow: hidden;
   margin: 40px auto 5px auto;
@@ -23770,7 +24028,7 @@ const CTA = styled__default.default.a`
  */
 var PromoBanner = function (_a) {
     var title = _a.title, image1440x810 = _a.image1440x810, image144x81 = _a.image144x81, ctaText = _a.ctaText, ctaUrl = _a.ctaUrl, children = _a.children;
-    return (React__default.default.createElement(Container$H, null,
+    return (React__default.default.createElement(Container$I, null,
         React__default.default.createElement(LazyImage, { src: image1440x810, placeholder: image144x81, visibilitySensorProps: {
                 partialVisibility: true,
             } }, function (src) { return React__default.default.createElement(ImageLink, { "$img": src, href: ctaUrl, title: ctaText }); }),
@@ -23982,63 +24240,248 @@ var Promotions = function (_a) {
         numberOfPromos > 1 && React__default.default.createElement(PromoBlock, { promos: promos.slice(1, numberOfPromos) })));
 };
 
-const Container$G = styled__default.default.div`
-  padding: 0;
-  margin: ${(props) => props.theme.theme_vars.spacingSizes.medium} 0;
-  ${(props) => props.theme.fontStyles}
-
-  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
-    background: url('${(props) => props.$image}') no-repeat center center;
-    background-size: cover;
-    padding-top: ${(props) => (props.$image ? '8rem' : 0)};
-    padding-bottom: ${(props) => (props.$image ? '8rem' : 0)};
-    padding-left: ${(props) => (props.$image ? props.theme.theme_vars.spacingSizes.x_large : 0)};
-    padding-right: ${(props) => (props.$image ? props.theme.theme_vars.spacingSizes.x_large : 0)};
-  }
-
-  h2 {
-    text-align: center;
-  }
+const Container$H = styled__default.default.div`
+  display: block;
 `;
 
-const LinkContainer = styled__default.default.div`
-  height: 100%;
-  display: flex;
-  align-items: flex-end;
+const Label$4 = styled__default.default.label`
+  margin-bottom: 5px;
+  font-weight: bold;
+`;
 
-  a {
-    width: 100%;
-    height: 2.28rem;
-    padding: 12px !important;
-    @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
-      height: 2.6rem;
-    }
-  }
+const RoadworkList = styled__default.default.ul`
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  max-width: 100% !important;
 `;
 
-const Inner = styled__default.default.div`
+const Roadwork = styled__default.default.li`
+  display: block;
+  width: 100%;
+  margin-left: 0;
+  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.medium} !important;
+  padding: ${(props) => `${props.theme.theme_vars.spacingSizes.small} ${props.theme.theme_vars.spacingSizes.medium}`};
+  left: 0;
+  box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
+  border-radius: ${(props) => props.theme.theme_vars.border_radius};
   background-color: ${(props) =>
     props.theme.cardinal_name === 'west'
-      ? props.theme.theme_vars.colours.grey_light
+      ? props.theme.theme_vars.colours.grey_light + '7a'
       : props.theme.theme_vars.colours.white};
-  padding: ${(props) => props.theme.theme_vars.spacingSizes.small};
-  box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
-  border-radius: ${(props) => props.theme.theme_vars.border_radius};
 
-  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
-    padding: ${(props) => props.theme.theme_vars.spacingSizes.large};
-    max-width: ${(props) => props.theme.theme_vars.breakpoints.m};
-    margin: 0 auto;
+  h3 {
+    margin-top: ${(props) => props.theme.theme_vars.spacingSizes.medium} !important;
   }
 `;
 
-const Container$F = styled__default.default.div`
-  display: block;
+const IconContainer$2 = styled__default.default.div`
+  display: flex;
+  flex-wrap: nowrap;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
 
-  input[type='text'] {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    flex-grow: 1;
+  &:last-of-type {
+    margin-bottom: 0;
+  }
+
+  & span svg {
+    vertical-align: middle;
+  }
+`;
+
+const IconText = styled__default.default.div`
+  padding-left: ${(props) => props.theme.theme_vars.spacingSizes.small};
+`;
+
+const NoMatches = styled__default.default.p`
+  padding: ${(props) => props.theme.theme_vars.spacingSizes.small} 0;
+`;
+
+const RoadworkLink = styled__default.default.a`
+  color: ${(props) => props.theme.theme_vars.colours.action};
+  text-decoration: underline;
+
+  &:hover {
+    text-decoration: none;
+  }
+
+  &:focus {
+    outline: 3px solid ${(props) => props.theme.theme_vars.colours.focus};
+    outline-offset: 0;
+    background-color: ${(props) => props.theme.theme_vars.colours.focus};
+    color: ${(props) => props.theme.theme_vars.colours.black};
+    text-decoration: none;
+  }
+
+  &:visited {
+    color: ${(props) => props.theme.theme_vars.colours.action_dark};
+  }
+
+  h3 {
+    color: inherit;
+  }
+`;
+
+/**
+ * Primary UI component for user interaction
+ * If value is set then treat as controlled component
+ */
+var Input = function (_a) {
+    var _b = _a.type, type = _b === void 0 ? 'text' : _b, _c = _a.placeholder, placeholder = _c === void 0 ? '' : _c, _d = _a.isErrored, isErrored = _d === void 0 ? false : _d, errorText = _a.errorText, name = _a.name, maxLength = _a.maxLength, defaultValue = _a.defaultValue, onChange = _a.onChange, id = _a.id, value = _a.value, autocomplete = _a.autocomplete, _e = _a.isFullWidth, isFullWidth = _e === void 0 ? false : _e;
+    return (React__default.default.createElement(React__default.default.Fragment, null,
+        errorText && React__default.default.createElement(ErrorText$1, null, errorText),
+        typeof value !== 'undefined' ? (React__default.default.createElement(StyledInput, { onChange: onChange, type: type, placeholder: placeholder, name: name, "$isErrored": isErrored, maxLength: maxLength, value: value, id: id, autoComplete: autocomplete, "$isFullWidth": isFullWidth })) : (React__default.default.createElement(StyledInput, { onChange: onChange, type: type, placeholder: placeholder, name: name, "$isErrored": isErrored, maxLength: maxLength, defaultValue: defaultValue, id: id, autoComplete: autocomplete, "$isFullWidth": isFullWidth }))));
+};
+
+/**
+ * A filterable list of roadworks
+ */
+var RoadworksList = function (_a) {
+    var roadworks = _a.roadworks, title = _a.title;
+    var _b = React.useState(roadworks), filteredRoadworks = _b[0], setFilteredRoadworks = _b[1];
+    // Helper function to remove trailing dot if it's the last character
+    var removeTrailingDot = function (text) {
+        return (text === null || text === void 0 ? void 0 : text.endsWith('.')) ? text.slice(0, -1) : text;
+    };
+    var handleSearch = function (e) {
+        var searchTerm = e.target.value.toLowerCase();
+        if (searchTerm != '') {
+            var updatedRoadworks = roadworks.filter(function (roadwork) {
+                return (roadwork.description.toLowerCase().includes(searchTerm) ||
+                    roadwork.detailedLocation.toLocaleLowerCase().includes(searchTerm) ||
+                    roadwork.trafficManagement.toLowerCase().includes(searchTerm));
+            });
+            setFilteredRoadworks(updatedRoadworks);
+        }
+        else {
+            setFilteredRoadworks(roadworks);
+        }
+    };
+    // Format the time to match Gov UK style guide
+    // https://www.gov.uk/guidance/style-guide/a-to-z#times
+    var formatTime = function (dayJsInstance) {
+        if (dayJsInstance.format('HH:mm') === '00:00') {
+            return 'midnight';
+        }
+        if (dayJsInstance.format('HH:mm') === '12:00') {
+            return 'midday';
+        }
+        if (dayJsInstance.format('mm') === '00') {
+            return dayJsInstance.format('ha');
+        }
+        else {
+            return dayJsInstance.format('h:mma');
+        }
+    };
+    // Format the time to match the Gov UK style guide
+    // https://www.gov.uk/guidance/style-guide/a-to-z#dates
+    var formatDate = function (startTime, endTime) {
+        if (!endTime) {
+            return dayjs(startTime).format('dddd D MMMM YYYY') + ' at ' + formatTime(dayjs(startTime));
+        }
+        else {
+            var endDate = dayjs(endTime);
+            var startDate = dayjs(startTime);
+            if (startDate.format('YYYY-MM-DD') === endDate.format('YYYY-MM-DD')) {
+                if (startDate.format('HH:mm') === '00:00' && endDate.format('HH:mm') === '23:59') {
+                    return "".concat(startDate.format('dddd D MMMM YYYY'), " - all day");
+                }
+                return "".concat(startDate.format('dddd D MMMM YYYY'), " at ").concat(formatTime(startDate), " to ").concat(formatTime(endDate));
+            }
+            else {
+                return "".concat(startDate.format('dddd D MMMM YYYY'), " at ").concat(formatTime(startDate), " to ").concat(endDate.format('dddd D MMMM YYYY'), " at ").concat(formatTime(endDate));
+            }
+        }
+    };
+    return (React__default.default.createElement(Container$H, { "data-testid": "RoadworksList" },
+        React__default.default.createElement(Heading, { level: 2, text: title }),
+        React__default.default.createElement(Label$4, { htmlFor: "roadworksSearch" }, "Search roadworks"),
+        React__default.default.createElement(Input, { id: "roadworksSearch", name: "roadworksSearch", type: "text", placeholder: "Enter a search term", maxLength: 255, onChange: handleSearch, isFullWidth: true }),
+        React__default.default.createElement(RoadworkList, null, filteredRoadworks.map(function (roadwork, index) {
+            var startDate = new Date(roadwork.startTime);
+            var endDate = new Date(roadwork.endTime);
+            return (React__default.default.createElement(Roadwork, { key: index },
+                React__default.default.createElement(IconContainer$2, null,
+                    React__default.default.createElement(DynamicIcon, { icon: "mappin" }),
+                    React__default.default.createElement(IconText, null, roadwork.urlLinkAddress ? (React__default.default.createElement(RoadworkLink, { href: roadwork.urlLinkAddress, target: "_blank", rel: "noopener noreferrer" },
+                        React__default.default.createElement(Heading, { text: removeTrailingDot(roadwork.detailedLocation), level: 3 }))) : (React__default.default.createElement(Heading, { text: removeTrailingDot(roadwork.detailedLocation), level: 3 })))),
+                React__default.default.createElement(IconContainer$2, null,
+                    React__default.default.createElement(DynamicIcon, { icon: "events" }),
+                    React__default.default.createElement(IconText, null,
+                        React__default.default.createElement("span", null, formatDate(startDate, endDate)))),
+                React__default.default.createElement(IconContainer$2, null,
+                    React__default.default.createElement(DynamicIcon, { icon: "roadworks" }),
+                    React__default.default.createElement(IconText, null,
+                        React__default.default.createElement("span", null, removeTrailingDot(roadwork.description)))),
+                React__default.default.createElement(IconContainer$2, null,
+                    React__default.default.createElement(DynamicIcon, { icon: "bollard" }),
+                    React__default.default.createElement(IconText, null,
+                        React__default.default.createElement("span", null, removeTrailingDot(roadwork.trafficManagement))))));
+        })),
+        roadworks.length > 0 && filteredRoadworks.length === 0 && (React__default.default.createElement(NoMatches, null, "We couldn't find any results for your search term. Please try a different search.")),
+        roadworks.length == 0 && (React__default.default.createElement(NoMatches, null, "Sorry, we're not able to find any results at the moment. Please try again later."))));
+};
+
+const Container$G = styled__default.default.div`
+  padding: 0;
+  margin: ${(props) => props.theme.theme_vars.spacingSizes.medium} 0;
+  ${(props) => props.theme.fontStyles}
+
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
+    background: url('${(props) => props.$image}') no-repeat center center;
+    background-size: cover;
+    padding-top: ${(props) => (props.$image ? '8rem' : 0)};
+    padding-bottom: ${(props) => (props.$image ? '8rem' : 0)};
+    padding-left: ${(props) => (props.$image ? props.theme.theme_vars.spacingSizes.x_large : 0)};
+    padding-right: ${(props) => (props.$image ? props.theme.theme_vars.spacingSizes.x_large : 0)};
+  }
+
+  h2 {
+    text-align: center;
+  }
+`;
+
+const LinkContainer = styled__default.default.div`
+  height: 100%;
+  display: flex;
+  align-items: flex-end;
+
+  a {
+    width: 100%;
+    height: 2.28rem;
+    padding: 12px !important;
+    @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
+      height: 2.6rem;
+    }
+  }
+`;
+
+const Inner = styled__default.default.div`
+  background-color: ${(props) =>
+    props.theme.cardinal_name === 'west'
+      ? props.theme.theme_vars.colours.grey_light
+      : props.theme.theme_vars.colours.white};
+  padding: ${(props) => props.theme.theme_vars.spacingSizes.small};
+  box-shadow: 1px 1px 5px 1px rgba(0, 0, 0, 0.2);
+  border-radius: ${(props) => props.theme.theme_vars.border_radius};
+
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
+    padding: ${(props) => props.theme.theme_vars.spacingSizes.large};
+    max-width: ${(props) => props.theme.theme_vars.breakpoints.m};
+    margin: 0 auto;
+  }
+`;
+
+const Container$F = styled__default.default.div`
+  display: block;
+
+  input[type='text'] {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    flex-grow: 1;
     margin-bottom: 0;
   }
 `;
@@ -24100,17 +24543,6 @@ const SubmitButton = styled__default.default.input`
   }
 `;
 
-/**
- * Primary UI component for user interaction
- * If value is set then treat as controlled component
- */
-var Input = function (_a) {
-    var _b = _a.type, type = _b === void 0 ? 'text' : _b, _c = _a.placeholder, placeholder = _c === void 0 ? '' : _c, _d = _a.isErrored, isErrored = _d === void 0 ? false : _d, errorText = _a.errorText, name = _a.name, maxLength = _a.maxLength, defaultValue = _a.defaultValue, onChange = _a.onChange, id = _a.id, value = _a.value, autocomplete = _a.autocomplete, _e = _a.isFullWidth, isFullWidth = _e === void 0 ? false : _e;
-    return (React__default.default.createElement(React__default.default.Fragment, null,
-        errorText && React__default.default.createElement(ErrorText$1, null, errorText),
-        typeof value !== 'undefined' ? (React__default.default.createElement(StyledInput, { onChange: onChange, type: type, placeholder: placeholder, name: name, "$isErrored": isErrored, maxLength: maxLength, value: value, id: id, autoComplete: autocomplete, "$isFullWidth": isFullWidth })) : (React__default.default.createElement(StyledInput, { onChange: onChange, type: type, placeholder: placeholder, name: name, "$isErrored": isErrored, maxLength: maxLength, defaultValue: defaultValue, id: id, autoComplete: autocomplete, "$isFullWidth": isFullWidth }))));
-};
-
 var CustomSearch = function (_a) {
     var method = _a.method, path = _a.path, label = _a.label, _b = _a.hasHiddenLabel, hasHiddenLabel = _b === void 0 ? true : _b, fieldName = _a.fieldName, placeholder = _a.placeholder, searchText = _a.searchText, id = _a.id;
     if (!id) {
@@ -24149,7 +24581,7 @@ var VideoProvider;
     VideoProvider["Vimeo"] = "Vimeo";
 })(VideoProvider || (VideoProvider = {}));
 
-const VideoContainer = styled__default.default.figure`
+const VideoContainer$1 = styled__default.default.figure`
   display: block;
   padding-top: 56.25%;
   position: relative;
@@ -24209,7 +24641,7 @@ var Video = function (_a) {
     React.useEffect(function () {
         setNotServer(true);
     }, []);
-    return (React__default.default.createElement(React__default.default.Fragment, null, cookiesAccepted && notServer ? (React__default.default.createElement(VideoContainer, { "data-testid": "Video" },
+    return (React__default.default.createElement(React__default.default.Fragment, null, cookiesAccepted && notServer ? (React__default.default.createElement(VideoContainer$1, { "data-testid": "Video" },
         React__default.default.createElement("iframe", { src: embedLink, title: description, allow: "accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; fullscreen;", "data-testid": "VideoIframe" }))) : (React__default.default.createElement(VideoLink, { href: watchLink, title: description, "data-testid": "VideoLink" }, description))));
 };
 
@@ -25078,6 +25510,17 @@ const FooterLink = styled__default.default.a`
     -webkit-box-shadow: 0px -2px 0px 0px ${(props) => props.theme.theme_vars.colours.white} inset;
     -moz-box-shadow: 0px -2px 0px 0px ${(props) => props.theme.theme_vars.colours.white} inset;
   }
+  &:focus:not(:focus-visible) {
+    box-shadow: none;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+  }
+  &:focus-visible {
+    ${(props) => props.theme.linkStylesFocus}
+    box-shadow: 0px -2px 0px 0px ${(props) => props.theme.theme_vars.colours.white} inset;
+    -webkit-box-shadow: 0px -2px 0px 0px ${(props) => props.theme.theme_vars.colours.white} inset;
+    -moz-box-shadow: 0px -2px 0px 0px ${(props) => props.theme.theme_vars.colours.white} inset;
+  }
   &:active {
     ${(props) => props.theme.linkStylesActive}
     box-shadow: 0px -1px 0px 0px ${(props) => props.theme.theme_vars.colours.white} inset;
@@ -25240,6 +25683,8 @@ const headerThemeStyles = (props) => {
 const Container$w = styled__default.default.header`
   font-family: ${(props) => props.theme.theme_vars.fontstack};
   padding: 3px 0;
+  position: sticky;
+  z-index: 1;
   ${headerThemeStyles}
 `;
 
@@ -25302,13 +25747,11 @@ const HomeLink = styled__default.default.a`
     }
   }
   &:focus {
-    outline: 2px transparent solid;
-    box-shadow: ${(props) => props.theme.theme_vars.colours.focus} 0 0 0 2px,
-      ${(props) =>
-          props.theme.cardinal_name === 'north'
-            ? props.theme.theme_vars.colours.black
-            : props.theme.theme_vars.colours.focus}
-        0 0 0 4px;
+    outline: none;
+    background: ${(props) => props.theme.theme_vars.colours.focus};
+    box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
+    -webkit-box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
+    -moz-box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
     transition: box-shadow 0.3s ease 0s;
   }
 `;
@@ -25461,6 +25904,9 @@ const Button$3 = styled__default.default.button`
   &:focus {
     outline: none;
     background: ${(props) => props.theme.theme_vars.colours.focus};
+    box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
+    -webkit-box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
+    -moz-box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
     svg {
       path {
         fill: ${(props) => props.theme.theme_vars.colours.black};
@@ -25632,9 +26078,19 @@ var Header = function (_a) {
  * Optimised for an image in 16:5 ratio on all but small width screens
  */
 const Container$u = styled__default.default.div`
-  background-image: ${(props) =>
-      !props.$backgroundBox ? `linear-gradient(to bottom left, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.75)),` : ``}
-    url('${(props) => props.$image}');
+  background-image: ${(props) => {
+    const gradient = !props.$backgroundBox ? `linear-gradient(to bottom left, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.75))` : '';
+    const imageUrl = props.$image && props.$image.trim() ? `url('${props.$image}')` : '';
+    if (gradient && imageUrl) {
+      return `${gradient}, ${imageUrl}`;
+    } else if (gradient) {
+      return gradient;
+    } else if (imageUrl) {
+      return imageUrl;
+    } else {
+      return 'none';
+    }
+  }};
 
   padding-bottom: 10px;
   background-position: center;
@@ -25665,6 +26121,7 @@ const InnerContainer = styled__default.default.div`
   margin-right: auto;
   margin-left: auto;
   flex-grow: 1;
+  z-index: 1;
 
   @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.l}) {
     max-width: ${(props) => props.theme.theme_vars.breakpoints.l};
@@ -25752,12 +26209,14 @@ const CallToActionLink = styled__default.default.a`
   display: inline-block;
   outline: none;
 
-  &:hover,
-  &:focus {
+  &:hover {
     text-decoration-style: dotted;
     text-shadow: 2px 2px 4px rgba(150, 150, 150, 0.5), -2px 2px 4px rgba(150, 150, 150, 0.5),
       2px -2px 4px rgba(150, 150, 150, 0.5), -2px -2px 4px rgba(150, 150, 150, 0.5);
   }
+  &:focus {
+    ${(props) => props.theme.linkStylesFocus};
+  }
   &:active {
     transform: translate(3px);
   }
@@ -25786,16 +26245,103 @@ const Search = styled__default.default.div`
   margin: ${(props) => props.theme.theme_vars.spacingSizes.medium} 0;
 `;
 
+const VideoContainer = styled__default.default.div`
+  position: absolute;
+  width: 100%;
+  @media screen and (max-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
+    height: 580px;
+  }
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) and (max-width: ${(props) => props.theme.theme_vars.breakpoints.l}) {
+    height: 410px;
+  }
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.l}) {
+    height: 560px;
+  }
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.xl}) {
+    height: 636px;
+  }
+`;
+
+const VideoBackground = styled__default.default.video`
+  position: absolute;
+  width: 100%;
+  height: 575px;
+  object-fit: cover;
+  @media screen and (max-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
+    height: 590px;
+  }
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) and (max-width: ${(props) => props.theme.theme_vars.breakpoints.l}) {
+    height: 420px;
+  }
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.l}) {
+    height: 568px;
+  }
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.xl}) {
+    height: 645px;
+  }
+`;
+
+const PlayPauseButton = styled__default.default.button`
+  position: absolute;
+  display: none;
+  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.l}) {
+    bottom: 20px;
+    right: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1;
+    background: rgba(0, 0, 0, 0.5);
+    border: 1px solid white;
+    color: white;
+    font-size: 32px;
+    border-radius: 50%;
+    width: 50px;
+    height: 50px;
+    cursor: pointer;
+    &:hover {
+      background: rgba(0, 0, 0, 0.7);
+    }
+    &:focus {
+      outline: none;
+      background: ${(props) => props.theme.theme_vars.colours.focus};
+      color: ${(props) => props.theme.theme_vars.colours.black};
+      box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
+      -webkit-box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
+      -moz-box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
+    }
+  }
+`;
+
 /**
  * Hero image banner with optional text and call to action with varying presentation of text area.
  * For optional use at the top of a service landing page, if set in the CMS.
  */
 var HeroImage = function (_a) {
-    var headline = _a.headline, content = _a.content, callToActionText = _a.callToActionText, callToActionURL = _a.callToActionURL, _b = _a.callToActionIsPrimary, callToActionIsPrimary = _b === void 0 ? true : _b, _c = _a.backgroundBox, backgroundBox = _c === void 0 ? true : _c, imageLarge = _a.imageLarge, imageSmall = _a.imageSmall, imageAltText = _a.imageAltText, breadcrumb = _a.breadcrumb, customSearch = _a.customSearch;
+    var headline = _a.headline, content = _a.content, callToActionText = _a.callToActionText, callToActionURL = _a.callToActionURL, _b = _a.callToActionIsPrimary, callToActionIsPrimary = _b === void 0 ? true : _b, _c = _a.backgroundBox, backgroundBox = _c === void 0 ? true : _c, imageLarge = _a.imageLarge, imageSmall = _a.imageSmall, imageAltText = _a.imageAltText, heroVideoUrl = _a.heroVideoUrl, breadcrumb = _a.breadcrumb, customSearch = _a.customSearch;
+    var _d = React.useState(true), isPlaying = _d[0], setIsPlaying = _d[1];
+    var videoRef = React.useRef(null);
+    var togglePlay = function () {
+        if (videoRef.current) {
+            if (isPlaying) {
+                videoRef.current.pause();
+            }
+            else {
+                videoRef.current.play();
+            }
+            setIsPlaying(!isPlaying);
+        }
+    };
     return (React__default.default.createElement(React__default.default.Fragment, null,
         React__default.default.createElement(LazyImage, { src: imageLarge, placeholder: imageSmall, visibilitySensorProps: {
                 partialVisibility: true,
             } }, function (src) { return (React__default.default.createElement(Container$u, { "$image": src, "$backgroundBox": backgroundBox, "data-testid": "HeroImage" },
+            heroVideoUrl && (React__default.default.createElement(React__default.default.Fragment, null,
+                React__default.default.createElement(VideoContainer, null,
+                    React__default.default.createElement(VideoBackground, { ref: videoRef, autoPlay: true, loop: true, muted: true },
+                        React__default.default.createElement("source", { src: heroVideoUrl, type: "video/mp4" }),
+                        "Your browser doesn't support this video."),
+                    React__default.default.createElement(PlayPauseButton, { onClick: togglePlay }, isPlaying ? '⏸' : '▶')))),
             React__default.default.createElement(InnerContainer, null,
                 React__default.default.createElement(Overlay, { "$backgroundBox": backgroundBox, "data-testid": "HeroImageOverlay" },
                     breadcrumb && (React__default.default.createElement(BreadcrumbLink, { href: breadcrumb.url, "$backgroundBox": backgroundBox }, breadcrumb.title)),
@@ -27003,7 +27549,10 @@ const Container$l = styled__default.default.main`
   }
 
   td > a:only-child {
-    padding: 5px 10px;
+    padding: 12px 20px;
+    display: inline-block;
+    min-height: 44px;
+    min-width: 44px;
   }
 
   td > a:not(:only-child) {
@@ -27865,9 +28414,9 @@ const focusListItem = styled.css`
   color: ${(props) => props.theme.theme_vars.colours.black};
   background-color: ${(props) => props.theme.theme_vars.colours.focus};
   outline: none;
-  box-shadow: 0px -2px 0px 0px ${(props) => props.theme.theme_vars.colours.black} inset;
-  -webkit-box-shadow: 0px -2px 0px 0px ${(props) => props.theme.theme_vars.colours.black} inset;
-  -moz-box-shadow: 0px -2px 0px 0px ${(props) => props.theme.theme_vars.colours.black} inset;
+  box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
+  -webkit-box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
+  -moz-box-shadow: 0 0 0 2px ${(props) => props.theme.theme_vars.colours.focus}, 0 0 0 4px ${(props) => props.theme.theme_vars.colours.black};
 `;
 
 const ListItem = styled__default.default.li`
@@ -27889,10 +28438,12 @@ const ListItem = styled__default.default.li`
       background-color: ${(props) => props.theme.theme_vars.colours.action_light};
       color: ${(props) => props.theme.theme_vars.colours.black};
       border-bottom-color: transparent;
-
       &:focus {
         ${focusListItem}
       }
+      &:focus-visible {
+        ${focusListItem}
+      }
     }
   }
 `;
@@ -27908,10 +28459,12 @@ const ListItemLink = styled__default.default.a`
     transition: background-color 0.3s ease 0s;
     background-color: ${(props) => props.theme.theme_vars.colours.action_light}80;
   }
-
   &:focus {
     ${focusListItem}
   }
+  &:focus-visible {
+    ${focusListItem}
+  }
   &:active {
     transform: translateY(1px);
     box-shadow: 0px -1px 0px 0px ${(props) => props.theme.theme_vars.colours.black} inset;
@@ -29661,9 +30214,9 @@ const generate_theme = (theme_vars) => {
       background: ${theme_vars.colours.focus};
       outline: none;
       text-decoration: none !important;
-      box-shadow: 0 0 0 1px ${theme_vars.colours.focus}, 0 0 0 3px ${theme_vars.colours.black};
-      -webkit-box-shadow: 0 0 0 1px ${theme_vars.colours.focus}, 0 0 0 3px ${theme_vars.colours.black};
-      -moz-box-shadow: 0 0 0 1px ${theme_vars.colours.focus}, 0 0 0 3px ${theme_vars.colours.black};
+      box-shadow: 0 0 0 2px ${theme_vars.colours.focus}, 0 0 0 4px ${theme_vars.colours.black};
+      -webkit-box-shadow: 0 0 0 2px ${theme_vars.colours.focus}, 0 0 0 4px ${theme_vars.colours.black};
+      -moz-box-shadow: 0 0 0 2px ${theme_vars.colours.focus}, 0 0 0 4px ${theme_vars.colours.black};
     `,
     linkStylesActive: styled.css`
       color: ${theme_vars.colours.black};
@@ -30081,7 +30634,7 @@ var PhoneIcon = function (_a) {
 };
 
 var ServiceContact = function (_a) {
-    var website = _a.website, email = _a.email, contacts = _a.contacts;
+    var website = _a.website, email = _a.email, contacts = _a.contacts, websiteTitle = _a.websiteTitle;
     var themeContext = React.useContext(styled.ThemeContext);
     return (React__default.default.createElement(Container$6, { "data-testid": "ServiceContact" },
         React__default.default.createElement(Row$1, { hasWrap: false },
@@ -30089,7 +30642,7 @@ var ServiceContact = function (_a) {
                 React__default.default.createElement(IconContainer$1, null,
                     React__default.default.createElement(WebsiteIcon, { colourFill: themeContext.theme_vars.colours.black })),
                 React__default.default.createElement(Content$1, null,
-                    React__default.default.createElement(WebLink$1, { href: website }, website)))),
+                    React__default.default.createElement(WebLink$1, { href: website }, websiteTitle ? "".concat(websiteTitle) : website)))),
             email && (React__default.default.createElement(Column, { small: "full", medium: "full", large: "auto", classes: "striped-contacts" },
                 React__default.default.createElement(IconContainer$1, null,
                     React__default.default.createElement(EmailIcon, { colourFill: themeContext.theme_vars.colours.black })),
@@ -30103,69 +30656,6 @@ var ServiceContact = function (_a) {
                     contact.phones.map(function (phone, phoneIndex) { return (React__default.default.createElement(ContactLink, { href: "tel:".concat(phone.number), key: phoneIndex }, phone.number)); }))); })))))));
 };
 
-const SummaryList$1 = styled__default.default.dl`
-  display: table;
-  width: 100%;
-  table-layout: fixed;
-  border-collapse: collapse;
-  margin: ${(props) => (props.$hasMargin ? props.theme.theme_vars.spacingSizes.medium : 0)} 0;
-`;
-
-const SummaryRow = styled__default.default.div`
-  border-bottom: 1px solid ${(props) => props.theme.theme_vars.colours.grey};
-  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
-
-  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
-    display: table-row;
-  }
-
-  @media print {
-    display: table-row;
-    border-bottom: none;
-  }
-`;
-
-const SummaryTerm = styled__default.default.dt`
-  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
-  font-weight: bold;
-
-  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
-    display: table-cell;
-    padding: ${(props) => props.theme.theme_vars.spacingSizes.small};
-    width: 30%;
-    vertical-align: middle;
-  }
-
-  @media print {
-    display: table-cell;
-    width: 30%;
-  }
-`;
-
-const SummaryDetail = styled__default.default.dd`
-  overflow-wrap: break-word;
-  width: 100%;
-  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
-
-  @media screen and (min-width: ${(props) => props.theme.theme_vars.breakpoints.m}) {
-    display: table-cell;
-    width: 70%;
-    padding: ${(props) => props.theme.theme_vars.spacingSizes.small};
-  }
-
-  @media print {
-    display: table-cell;
-    width: 70%;
-  }
-`;
-
-var SummaryList = function (_a) {
-    var terms = _a.terms, _b = _a.hasMargin, hasMargin = _b === void 0 ? true : _b;
-    return (React__default.default.createElement(SummaryList$1, { "data-testid": "SummaryList", "$hasMargin": hasMargin }, terms.map(function (summaryRow, summaryIndex) { return (React__default.default.createElement(SummaryRow, { key: summaryIndex },
-        React__default.default.createElement(SummaryTerm, null, summaryRow.term),
-        React__default.default.createElement(SummaryDetail, { dangerouslySetInnerHTML: { __html: sanitizeHtml$1(summaryRow.detail) } }))); })));
-};
-
 /**
  * Group an array of items by the key
  */
@@ -30279,10 +30769,15 @@ var transformDescriptionDetails = function (accreditations, fees, service_areas,
 };
 var transformSnippet = function (description, extractLength) {
     if (extractLength === void 0) { extractLength = 190; }
-    return (sanitizeHtml$1(description, {
+    var sanitized = sanitizeHtml$1(description, {
         allowedTags: [],
         allowedAttributes: {},
-    }).substr(0, extractLength) + String.fromCharCode(8230));
+    }).trim();
+    if (!sanitized) {
+        return '';
+    }
+    var snippet = sanitized.substr(0, extractLength);
+    return sanitized.length > extractLength ? snippet + String.fromCharCode(8230) : snippet;
 };
 var transformTaxonomies = function (service_taxonomys, taxonomiesToShow) {
     if (taxonomiesToShow === void 0) { taxonomiesToShow = []; }
@@ -30315,11 +30810,14 @@ var transformTaxonomies = function (service_taxonomys, taxonomiesToShow) {
 var transformAge = function (age, ageInMonths) {
     if (ageInMonths === void 0) { ageInMonths = false; }
     if (age === 0) {
-        return age;
+        return age.toString();
     }
     if (ageInMonths) {
         if (age > 36) {
-            return Math.ceil(age / 12) + ' years';
+            if (age % 12 === 0) {
+                return Math.ceil(age / 12) + ' years';
+            }
+            return Math.floor(age / 12) + ' years and ' + (age % 12) + (age % 12 === 1 ? ' month' : ' months');
         }
         return "".concat(age, " months");
     }
@@ -30332,7 +30830,7 @@ const Container$5 = styled__default.default.div`
 
 var DirectoryMap = function (_a) {
     var _b, _c;
-    var allowCookies = _a.allowCookies, mapProps = _a.mapProps;
+    var _d = _a.allowCookies, allowCookies = _d === void 0 ? true : _d, mapProps = _a.mapProps;
     var cookiesAccepted = wereCookiesAccepted(allowCookies);
     var apiKey = (_b = process.env.NEXT_PUBLIC_GOOGLE_MAPS_API_KEY) !== null && _b !== void 0 ? _b : '';
     var latLong = mapProps.centre.split(',');
@@ -30436,11 +30934,11 @@ var HeartIcon = function (_a) {
 };
 
 var DirectoryAddToShortList = function (_a) {
-    var id = _a.id, name = _a.name, snippet = _a.snippet, email = _a.email, website = _a.website, phone = _a.phone;
+    var id = _a.id, name = _a.name, snippet = _a.snippet, email = _a.email, website = _a.website, phone = _a.phone, addresses = _a.addresses, fees = _a.fees;
     var _b = useDirectoryShortListContext(), toggleFavourites = _b.toggleFavourites, isFavourite = _b.isFavourite;
     var themeContext = React.useContext(styled.ThemeContext);
     var favourite = isFavourite(id);
-    return (React__default.default.createElement(AddToShortlist, { onClick: function (e) { return toggleFavourites(id, name, snippet, email, website, phone); }, "data-testid": "DirectoryAddToShortList", "$favourite": favourite },
+    return (React__default.default.createElement(AddToShortlist, { onClick: function (e) { return toggleFavourites(id, name, snippet, email, website, phone, addresses, fees); }, "data-testid": "DirectoryAddToShortList", "$favourite": favourite },
         favourite ? (React__default.default.createElement(IconDownload$1, { colourFill: themeContext.theme_vars.colours.negative })) : (React__default.default.createElement(HeartIcon, { colourFill: themeContext.theme_vars.colours.action })),
         favourite ? React__default.default.createElement(React__default.default.Fragment, null, "Remove from shortlist") : React__default.default.createElement(React__default.default.Fragment, null, "Add to shortlist")));
 };
@@ -30509,7 +31007,7 @@ var getIcon = function (profile) {
 
 var DirectoryService = function (_a) {
     var _b, _c, _d, _e;
-    var id = _a.id, name = _a.name, accreditations = _a.accreditations, _f = _a.ageInMonths, ageInMonths = _f === void 0 ? false : _f, description = _a.description, descriptionElement = _a.descriptionElement, eligibilitys = _a.eligibilitys, email = _a.email, fees = _a.fees, languages = _a.languages, organization = _a.organization, regular_schedules = _a.regular_schedules, contacts = _a.contacts, service_areas = _a.service_areas, service_at_locations = _a.service_at_locations, service_social_profiles = _a.service_social_profiles, service_taxonomys = _a.service_taxonomys, taxonomiesToShow = _a.taxonomiesToShow, url = _a.url, uploads = _a.uploads, shortListPath = _a.shortListPath;
+    var id = _a.id, name = _a.name, accreditations = _a.accreditations, _f = _a.ageInMonths, ageInMonths = _f === void 0 ? false : _f, description = _a.description, descriptionElement = _a.descriptionElement, eligibilitys = _a.eligibilitys, email = _a.email, fees = _a.fees, languages = _a.languages, organization = _a.organization, regular_schedules = _a.regular_schedules, contacts = _a.contacts, service_areas = _a.service_areas, service_at_locations = _a.service_at_locations, service_social_profiles = _a.service_social_profiles, service_taxonomys = _a.service_taxonomys, taxonomiesToShow = _a.taxonomiesToShow, url = _a.url, websiteUrlTitle = _a.websiteUrlTitle, uploads = _a.uploads, shortListPath = _a.shortListPath;
     var labelLetters = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L'];
     var _g = React.useState(false), notServer = _g[0], setNotServer = _g[1];
     var themeContext = React.useContext(styled.ThemeContext);
@@ -30533,7 +31031,9 @@ var DirectoryService = function (_a) {
                             " Shortlist (",
                             favourites.length,
                             ")")),
-                        React__default.default.createElement(DirectoryAddToShortList, { id: id, name: name, snippet: transformSnippet(description, 350), email: email, website: url, phone: (_c = (_b = contacts === null || contacts === void 0 ? void 0 : contacts[0]) === null || _b === void 0 ? void 0 : _b.phones) === null || _c === void 0 ? void 0 : _c.flatMap(function (phone) { return phone.number; }).join(', ') })))))),
+                        React__default.default.createElement(DirectoryAddToShortList, { id: id, name: name, snippet: transformSnippet(description, 350), email: email, website: url, phone: (_c = (_b = contacts === null || contacts === void 0 ? void 0 : contacts[0]) === null || _b === void 0 ? void 0 : _b.phones) === null || _c === void 0 ? void 0 : _c.flatMap(function (phone) { return phone.number; }).join(', '), addresses: service_at_locations.flatMap(function (location) {
+                                return location.physical_addresses;
+                            }), fees: fees })))))),
             service_at_locations.filter(function (location) {
                 return location.is_visitable != false;
             }).length > 0 && (React__default.default.createElement(Column, { small: "full", medium: "full", large: "full", classes: "striped-column" },
@@ -30548,7 +31048,7 @@ var DirectoryService = function (_a) {
                                         .filter(function (item) { return item !== '' && item !== address.id; })
                                         .join(' <br />'),
                                 } }),
-                            React__default.default.createElement(Button$4, { url: "https://google.com/maps/dir//".concat(location.latitude, ",").concat(location.longitude), text: "Get directions" }))); }),
+                            location.latitude && location.longitude && (React__default.default.createElement(Button$4, { url: "https://google.com/maps/dir//".concat(location.latitude, ",").concat(location.longitude), text: "Get directions" })))); }),
                         (location === null || location === void 0 ? void 0 : location.accessibility_for_disabilities.length) > 0 && (React__default.default.createElement(React__default.default.Fragment, null,
                             React__default.default.createElement(Heading, { level: 3, text: "Other facilities on site" }),
                             React__default.default.createElement("ul", null, location.accessibility_for_disabilities.map(function (accessibility) { return (React__default.default.createElement("li", { key: accessibility.id }, accessibility.accessibility)); })))))); })),
@@ -30580,7 +31080,7 @@ var DirectoryService = function (_a) {
                         React__default.default.createElement(MapLink, { href: "https://www.google.com/maps/search/?api=1&query=".concat(service_at_locations[0].latitude, "%2C").concat(service_at_locations[0].longitude) }, "View in Google Maps"))))))),
             (email || url || (contacts === null || contacts === void 0 ? void 0 : contacts.length) > 0) && (React__default.default.createElement(Column, { small: "full", medium: "full", large: "full", classes: "striped-column" },
                 React__default.default.createElement(Heading, { level: 2, text: "How to contact this service" }),
-                React__default.default.createElement(ServiceContact, { email: email, website: url, contacts: contacts }))),
+                React__default.default.createElement(ServiceContact, { email: email, website: url, websiteTitle: websiteUrlTitle, contacts: contacts }))),
             React__default.default.createElement(Column, { small: "full", medium: "full", large: "full", classes: "striped-column" },
                 React__default.default.createElement(Heading, { level: 2, text: "Description" }),
                 React__default.default.createElement("div", null,
@@ -30593,7 +31093,7 @@ var DirectoryService = function (_a) {
                     React__default.default.createElement("table", null,
                         React__default.default.createElement("thead", null,
                             React__default.default.createElement("tr", null,
-                                React__default.default.createElement("th", { scope: "col" }, "Weekday"),
+                                React__default.default.createElement("th", { scope: "col" }, "Opening days"),
                                 React__default.default.createElement("th", { scope: "col" }, "Opens"),
                                 React__default.default.createElement("th", { scope: "col" }, "Closes"))),
                         React__default.default.createElement("tbody", null, regular_schedules === null || regular_schedules === void 0 ? void 0 : regular_schedules.map(function (schedule, scheduleIndex) { return (React__default.default.createElement("tr", { key: scheduleIndex },
@@ -30659,7 +31159,7 @@ styled__default.default.div`
   color: ${(props) => props.theme.theme_vars.colours.grey_dark};
 `;
 
-const ButtonContainer$1 = styled__default.default.div`
+const ButtonContainer$2 = styled__default.default.div`
   display: flex;
   align-items: end;
   padding-bottom: 0;
@@ -30667,23 +31167,49 @@ const ButtonContainer$1 = styled__default.default.div`
 `;
 
 const Button$1 = styled__default.default.button`
-  border: 1px solid ${(props) => props.theme.theme_vars.colours.white};
-  background: ${(props) => props.theme.theme_vars.colours.action};
-  color: ${(props) => props.theme.theme_vars.colours.white};
-  padding: ${(props) => props.theme.theme_vars.spacingSizes.small};
-  cursor: pointer;
-  border-radius: ${(props) => props.theme.theme_vars.border_radius};
-  min-height: 42px;
-  margin-right: ${(props) => props.theme.theme_vars.spacingSizes.medium};
+    border: ${(props) => (props.$isWarning ? `3px` : `1px`)} solid
+    ${(props) => (props.$isWarning ? props.theme.theme_vars.colours.negative : props.theme.theme_vars.colours.white)};
+    background: ${(props) =>
+            props.$isWarning ? props.theme.theme_vars.colours.white : props.theme.theme_vars.colours.action};
+    color: ${(props) =>
+            props.$isWarning ? props.theme.theme_vars.colours.negative : props.theme.theme_vars.colours.white};
+    padding: ${(props) => props.theme.theme_vars.spacingSizes.small};
+    cursor: pointer;
+    border-radius: ${(props) => props.theme.theme_vars.border_radius};
+    min-height: 42px;
+    margin-right: ${(props) => props.theme.theme_vars.spacingSizes.medium};
+    font-weight: bold;
 
-  &:hover {
-    background: ${(props) => props.theme.theme_vars.colours.action_dark};
-  }
+    &:hover {
+        background: ${(props) =>
+                props.$isWarning ? props.theme.theme_vars.colours.action_light : props.theme.theme_vars.colours.action_dark};
+        color: ${(props) =>
+                props.$isWarning ? props.theme.theme_vars.colours.action_dark : props.theme.theme_vars.colours.white};
+        text-decoration: underline;
+        text-decoration-style: dotted;
+    }
 
-  &:focus {
-    outline: none;
-    background: ${(props) => props.theme.theme_vars.colours.focus};
-  }
+    &:focus {
+        ${(props) => props.theme.linkStylesFocus}
+    }
+
+    &:active {
+        ${(props) => props.theme.linkStylesActive}
+    }
+
+    ${(props) => {
+      if (props.size === 'large') {
+        return `
+          font-size: 16px;
+          padding: 14px 24px;
+        `;
+      }
+    }}
+
+    ${(props) =>
+      props.$isWarning && props.size === 'large' && `
+        padding: 12px 24px;
+      `}
 `;
 
 const ButtonText$1 = styled__default.default.span`
@@ -30763,28 +31289,29 @@ const Legend$1 = styled__default.default.legend`
 `;
 
 const LegendButton = styled__default.default.button`
-  position: relative;
-  background: none;
-  border: none;
-  color: ${(props) => props.theme.theme_vars.colours.action};
-  width: 100%;
-  white-space: normal;
-  cursor: pointer;
-  text-align: left;
-  padding-right: 30px;
-  padding-top: ${(props) => props.theme.theme_vars.spacingSizes.small};
-  padding-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
-  ${(props) => props.theme.theme_vars.h4}
-  ${(props) => props.theme.linkStyles}
-  &:hover {
-    ${(props) => props.theme.linkStylesHover}
-  }
-  &:focus {
-    ${(props) => props.theme.linkStylesFocus}
-  }
-  &:active {
-    ${(props) => props.theme.linkStylesActive}
-  }
+    position: relative;
+    background: none;
+    border: none;
+    color: ${(props) => props.theme.theme_vars.colours.action};
+    width: 100%;
+    white-space: normal;
+    cursor: pointer;
+    text-align: left;
+    padding-right: 30px;
+    padding-top: ${(props) => props.theme.theme_vars.spacingSizes.small};
+    padding-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
+    ${(props) => props.theme.theme_vars.h4}
+    ${(props) => props.theme.linkStyles}
+    &:hover {
+        ${(props) => props.theme.linkStylesHover}
+    }
+    &:focus {
+        ${(props) => props.theme.linkStylesFocus}
+    }
+    &:active {
+        ${(props) => props.theme.linkStylesActive}
+    }
+    margin: 0;
 `;
 
 const AccordionIcon = styled__default.default.span`
@@ -30893,6 +31420,14 @@ const MapToggle = styled__default.default.button`
   &:active {
     ${(props) => props.theme.linkStylesActive}
   }
+  ${(props) => {
+    if (props.size === 'large') {
+      return `
+        font-size: 16px;
+        padding: 14px 24px;
+      `;
+    }
+  }}
 `;
 
 const Favourites = styled__default.default.a`
@@ -31098,24 +31633,24 @@ var RadioCheckboxInput = function (_a) {
 };
 
 var DirectoryServiceList = function (_a) {
-    var directoryPath = _a.directoryPath, shortListPath = _a.shortListPath, services = _a.services, _b = _a.search, search = _b === void 0 ? '' : _b, setSearch = _a.setSearch, _c = _a.postcode, postcode = _c === void 0 ? '' : _c, setPostcode = _a.setPostcode, _d = _a.totalResults, totalResults = _d === void 0 ? 0 : _d, _e = _a.pageNumber, pageNumber = _e === void 0 ? 1 : _e, setPageNumber = _a.setPageNumber, _f = _a.perPage, perPage = _f === void 0 ? 5 : _f, _g = _a.extractLength, extractLength = _g === void 0 ? 300 : _g, _h = _a.categories, categories = _h === void 0 ? [] : _h, setCategories = _a.setCategories, _j = _a.minimumAge, minimumAge = _j === void 0 ? undefined : _j, setMinimumAge = _a.setMinimumAge, _k = _a.maximumAge, maximumAge = _k === void 0 ? undefined : _k, setMaximumAge = _a.setMaximumAge, _l = _a.mapCenter, mapCenter = _l === void 0 ? '52.23555414368587,-0.8957390701320571' : _l, _m = _a.mapZoom, mapZoom = _m === void 0 ? 9 : _m, _o = _a.isLoading, isLoading = _o === void 0 ? false : _o, _p = _a.ageInMonths, ageInMonths = _p === void 0 ? false : _p, _q = _a.hasDocuments, hasDocuments = _q === void 0 ? false : _q;
-    var _r = useLocalStorage("".concat(directoryPath.replace(/\//g, ''), "-accordion"), []), accordions = _r[0], setAccordions = _r[1];
-    var _s = useLocalStorage("".concat(directoryPath.replace(/\//g, ''), "-accordion-all"), true), openAll = _s[0], setOpenAll = _s[1];
-    var _t = useLocalStorage("".concat(directoryPath.replace(/\//g, ''), "-show-map"), false), showMap = _t[0], setShowMap = _t[1];
-    var _u = React.useState(false), showFilters = _u[0], setShowFilters = _u[1];
-    var _v = useDirectoryShortListContext(), _w = _v.favourites, favourites = _w.favourites; _w.setFavourites; _v.toggleFavourites; _v.isFavourite;
-    var _x = React.useState(false), notServer = _x[0], setNotServer = _x[1];
-    var _y = React.useState(search), searchTerm = _y[0], setSearchTerm = _y[1];
-    var _z = React.useState(postcode), postcodeSearch = _z[0], setPostcodeSearch = _z[1];
+    var directoryPath = _a.directoryPath, shortListPath = _a.shortListPath, services = _a.services, _b = _a.search, search = _b === void 0 ? '' : _b, setSearch = _a.setSearch, _c = _a.proximity, proximity = _c === void 0 ? 2 : _c, _d = _a.showPostcodeSearch, showPostcodeSearch = _d === void 0 ? true : _d, _e = _a.postcode, postcode = _e === void 0 ? '' : _e, setPostcode = _a.setPostcode, _f = _a.totalResults, totalResults = _f === void 0 ? 0 : _f, _g = _a.pageNumber, pageNumber = _g === void 0 ? 1 : _g, setPageNumber = _a.setPageNumber, _h = _a.perPage, perPage = _h === void 0 ? 5 : _h, _j = _a.extractLength, extractLength = _j === void 0 ? 300 : _j, _k = _a.categories, categories = _k === void 0 ? [] : _k, setCategories = _a.setCategories, _l = _a.minimumAge, minimumAge = _l === void 0 ? undefined : _l, setMinimumAge = _a.setMinimumAge, _m = _a.maximumAge, maximumAge = _m === void 0 ? undefined : _m, setMaximumAge = _a.setMaximumAge, _o = _a.mapCenter, mapCenter = _o === void 0 ? '52.40410666556486,-0.7237065995821512' : _o, _p = _a.mapZoom, mapZoom = _p === void 0 ? 9 : _p, _q = _a.isLoading, isLoading = _q === void 0 ? false : _q, _r = _a.ageInMonths, ageInMonths = _r === void 0 ? false : _r, _s = _a.hasDocuments, hasDocuments = _s === void 0 ? false : _s, _t = _a.isError, isError = _t === void 0 ? false : _t;
+    var _u = useLocalStorage("".concat(directoryPath.replace(/\//g, ''), "-accordion"), []), accordions = _u[0], setAccordions = _u[1];
+    var _v = useLocalStorage("".concat(directoryPath.replace(/\//g, ''), "-accordion-all"), true), openAll = _v[0], setOpenAll = _v[1];
+    var _w = useLocalStorage("".concat(directoryPath.replace(/\//g, ''), "-show-map"), false), showMap = _w[0], setShowMap = _w[1];
+    var _x = React.useState(false), showFilters = _x[0], setShowFilters = _x[1];
+    var _y = useDirectoryShortListContext(), _z = _y.favourites, favourites = _z.favourites; _z.setFavourites; _y.toggleFavourites; _y.isFavourite;
+    var _0 = React.useState(false), notServer = _0[0], setNotServer = _0[1];
+    var _1 = React.useState(search), searchTerm = _1[0], setSearchTerm = _1[1];
+    var _2 = React.useState(postcode), postcodeSearch = _2[0], setPostcodeSearch = _2[1];
     var themeContext = React.useContext(styled.ThemeContext);
-    var _0 = React.useState(false), filtersActive = _0[0], setFiltersActive = _0[1];
+    var _3 = React.useState(false), filtersActive = _3[0], setFiltersActive = _3[1];
     React.useEffect(function () {
         setNotServer(true);
         setFiltersActive(hasActiveFilters());
     }, []);
     React.useEffect(function () {
         setFiltersActive(hasActiveFilters());
-    }, [minimumAge, maximumAge, categories]);
+    }, [minimumAge, maximumAge, categories, search, postcode]);
     if (accordions.length === 0) {
         var tempAccordions_1 = [];
         categories === null || categories === void 0 ? void 0 : categories.forEach(function () {
@@ -31193,7 +31728,7 @@ var DirectoryServiceList = function (_a) {
                 lat: parseFloat((_a = service.service_at_locations[0]) === null || _a === void 0 ? void 0 : _a.latitude),
                 lng: parseFloat((_b = service.service_at_locations[0]) === null || _b === void 0 ? void 0 : _b.longitude),
                 label: labelLetters[index],
-                title: "<a href=\"".concat(directoryPath, "/").concat(service.id, "\">").concat(service.name, "</a>"),
+                title: "<a href=".concat(service.id, ">").concat(service.name, "</a>"),
             };
         }),
     };
@@ -31210,7 +31745,9 @@ var DirectoryServiceList = function (_a) {
         }
     };
     var hasActiveFilters = function () {
-        return (maximumAge !== '' ||
+        return (search !== '' ||
+            postcode !== '' ||
+            maximumAge !== '' ||
             minimumAge !== '' ||
             categories.some(function (category) {
                 return category.options.some(function (option) {
@@ -31226,21 +31763,23 @@ var DirectoryServiceList = function (_a) {
                         React__default.default.createElement(Row$1, null,
                             React__default.default.createElement(Column, { small: "full", medium: "one-half", large: "one-third" },
                                 React__default.default.createElement(Label$1, { htmlFor: "directorySearch" }, "What are you looking for?"),
-                                React__default.default.createElement(HintText, { text: "Enter a search word or phrase" }),
+                                React__default.default.createElement(HintText, { text: "Enter the name of a specific organisation" }),
                                 React__default.default.createElement(Input, { name: "directorySearch", type: "text", defaultValue: searchTerm, id: "directorySearch", onChange: function (e) {
                                         setSearchTerm(e.target.value);
                                     } })),
-                            React__default.default.createElement(Column, { small: "full", medium: "one-half", large: "one-third" },
+                            showPostcodeSearch && (React__default.default.createElement(Column, { small: "full", medium: "one-half", large: "one-third" },
                                 React__default.default.createElement(Label$1, { htmlFor: "postcode" }, "Postcode (optional)"),
-                                React__default.default.createElement(HintText, { text: "Enter a postcode" }),
-                                React__default.default.createElement(Input, { name: "postcode", type: "text", defaultValue: postcodeSearch, id: "postcode", onChange: function (e) { return setPostcodeSearch(e.target.value); }, autocomplete: "postal-code" })),
+                                React__default.default.createElement(HintText, { text: "Enter a postcode to see results within ".concat(proximity, " miles") }),
+                                React__default.default.createElement(Input, { name: "postcode", type: "text", defaultValue: postcodeSearch, id: "postcode", onChange: function (e) { return setPostcodeSearch(e.target.value); }, autocomplete: "postal-code" }))),
                             React__default.default.createElement(Column, { small: "full", medium: "one-half", large: "one-third" },
-                                React__default.default.createElement(ButtonContainer$1, null,
-                                    React__default.default.createElement(Button$1, { onClick: submitSearch, type: "submit" },
+                                React__default.default.createElement(ButtonContainer$2, null,
+                                    React__default.default.createElement(Button$1, { size: "large", onClick: submitSearch, type: "submit" },
                                         React__default.default.createElement(ButtonText$1, null, "Search"),
-                                        React__default.default.createElement(IconDownload, { colourFill: "#fff" })))),
+                                        React__default.default.createElement(IconDownload, { colourFill: "#fff" })),
+                                    filtersActive && (React__default.default.createElement(Button$1, { size: "large", onClick: clearSearch, type: "button", "$isWarning": true },
+                                        React__default.default.createElement(ButtonText$1, null, "Clear search"))))),
                             hasDocuments && (React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
-                                React__default.default.createElement(Button$4, { url: "".concat(directoryPath, "/documents?search=").concat(searchTerm), text: "View documents and resources", primary: false }))))))),
+                                React__default.default.createElement(Button$4, { url: "".concat(directoryPath, "/documents?search=").concat(searchTerm), text: "View documents and resources", primary: false, size: "large" }))))))),
             React__default.default.createElement(Column, { small: "full", medium: "one-third", large: "one-third" },
                 React__default.default.createElement(FilterToggle, { type: "button", onClick: function (e) { return setShowFilters(!showFilters); } }, showFilters ? "Hide Filters" : "Show Filters"),
                 React__default.default.createElement(FilterContainer, { "$showFilters": showFilters },
@@ -31276,14 +31815,16 @@ var DirectoryServiceList = function (_a) {
                                     React__default.default.createElement(Legend$1, null,
                                         React__default.default.createElement(LegendButton, { onClick: function (e) { return toggleAccordion(categoryIndex + 1); }, type: "button" },
                                             category.label,
-                                            React__default.default.createElement(AccordionIcon, { isOpen: accordions[categoryIndex + 1] }))),
+                                            React__default.default.createElement(AccordionIcon, { "$isOpen": accordions[categoryIndex + 1] }))),
                                     React__default.default.createElement(Accordion, { "$isOpen": accordions[categoryIndex + 1] },
                                         React__default.default.createElement(ClearFilter$1, null,
                                             React__default.default.createElement(TextLink$1, { onClick: function (e) { return clearCategory(categoryIndex); } }, "Clear filter")),
                                         category.options.map(function (taxonomy) { return (React__default.default.createElement(Category$2, { key: taxonomy.id },
                                             React__default.default.createElement(RadioCheckboxInput, { name: taxonomy.vocabulary, value: taxonomy.id, label: taxonomy.name, singleSelection: category.singleSelection, checked: taxonomy.checked, onChange: function (e) { return optionChecked(e, categoryIndex, category.singleSelection); } }))); }))))); })))))),
             React__default.default.createElement(Column, { small: "full", medium: "two-thirds", large: "two-thirds" },
-                React__default.default.createElement(Row$1, null, isLoading ? (React__default.default.createElement(LoadingContainer$1, null,
+                React__default.default.createElement(Row$1, null, isError ? (React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
+                    React__default.default.createElement(AlertBannerService, null,
+                        React__default.default.createElement("p", null, "Sorry, there was a problem fetching results. Please try again later.")))) : isLoading ? (React__default.default.createElement(LoadingContainer$1, null,
                     React__default.default.createElement(LoadingSpinner, null),
                     React__default.default.createElement("p", null, "Loading"))) : (React__default.default.createElement(React__default.default.Fragment, null,
                     React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
@@ -31295,7 +31836,7 @@ var DirectoryServiceList = function (_a) {
                             " out of ",
                             totalResults.toLocaleString())) : (React__default.default.createElement(ResultInfo$1, null, "No results found")),
                         React__default.default.createElement(FavouritesContainer, null,
-                            (services === null || services === void 0 ? void 0 : services.length) > 0 && (React__default.default.createElement(MapToggle, { type: "button", onClick: function (e) { return setShowMap(!showMap); } }, showMap ? "Hide Map" : "Show Map")),
+                            (services === null || services === void 0 ? void 0 : services.length) > 0 && (React__default.default.createElement(MapToggle, { type: "button", size: "large", onClick: function (e) { return setShowMap(!showMap); } }, showMap ? "Hide Map" : "Show Map")),
                             React__default.default.createElement(Favourites, { href: shortListPath },
                                 React__default.default.createElement(HeartIcon, { colourFill: themeContext.theme_vars.colours.action }),
                                 " Shortlist (",
@@ -31305,14 +31846,14 @@ var DirectoryServiceList = function (_a) {
                         React__default.default.createElement(Pagination, { currentPage: pageNumber, totalResults: totalResults, resultsPerPage: perPage, postTo: directoryPath, buttonClickOverride: setPageNumber })),
                     React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" }, notServer && React__default.default.createElement(React__default.default.Fragment, null, (services === null || services === void 0 ? void 0 : services.length) > 0 && showMap && React__default.default.createElement(DirectoryMap, { mapProps: mapProps }))),
                     services.map(function (service, index) {
-                        var _a, _b, _c, _d, _e, _f;
+                        var _a, _b, _c, _d, _e, _f, _g;
                         var snippet = transformSnippet(service.description, extractLength);
                         return (React__default.default.createElement(Column, { small: "full", medium: "full", large: "full", key: service.id },
                             React__default.default.createElement(ServiceContainer, { "$resultNumber": index },
                                 React__default.default.createElement(Row$1, null,
                                     React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
                                         React__default.default.createElement(ServiceHeader, null,
-                                            React__default.default.createElement(ServiceLink$1, { href: "".concat(directoryPath, "/").concat(service.id) }, service.name),
+                                            React__default.default.createElement(ServiceLink$1, { href: "".concat(service.id) }, service.name),
                                             showMap && (React__default.default.createElement(MarkerContainer, null,
                                                 React__default.default.createElement("span", null, labelLetters[index]),
                                                 React__default.default.createElement(PinIcon, { colourFill: themeContext.theme_vars.colours.action_dark }))))),
@@ -31328,7 +31869,9 @@ var DirectoryServiceList = function (_a) {
                                         ' ',
                                         transformAge(eligibility.maximum_age, ageInMonths))); })))),
                                     React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
-                                        React__default.default.createElement(DirectoryAddToShortList, { id: service.id, name: service.name, snippet: snippet, email: service.email, website: service.url, phone: (_f = (_e = (_d = service.contacts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.phones) === null || _f === void 0 ? void 0 : _f.flatMap(function (phone) { return phone.number; }).join(', ') }))))));
+                                        React__default.default.createElement(DirectoryAddToShortList, { id: service.id, name: service.name, snippet: snippet, email: service.email, website: service.url, phone: (_f = (_e = (_d = service.contacts) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.phones) === null || _f === void 0 ? void 0 : _f.flatMap(function (phone) { return phone.number; }).join(', '), addresses: (_g = service.service_at_locations) === null || _g === void 0 ? void 0 : _g.flatMap(function (location) {
+                                                return location.physical_addresses;
+                                            }), fees: service.fees }))))));
                     }),
                     React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
                         React__default.default.createElement(Pagination, { currentPage: pageNumber, totalResults: totalResults, resultsPerPage: perPage, postTo: directoryPath, buttonClickOverride: setPageNumber })))))))));
@@ -31336,71 +31879,96 @@ var DirectoryServiceList = function (_a) {
 
 const Container$1 = styled__default.default.div`
   display: block;
+
+    @media print {  
+        font-size: ${(props) => props.theme.theme_vars.fontSizes.extra_small} !important;
+        [data-testid='Column'] {
+            padding: ${(props) => props.theme.theme_vars.spacingSizes.extra_small} !important;
+        }
+
+        .favourite-outer:nth-of-type(2n + 1) {
+            page-break-after: always;
+        }
+
+        .favourite-outer:last-of-type {
+            page-break-after: avoid !important;
+        }
+    }
 `;
 
 const ServiceLink = styled__default.default.a`
-  display: block;
-  margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
-  ${(props) => props.theme.theme_vars.h4}
-  ${(props) => props.theme.linkStyles}
-  &:hover {
-    ${(props) => props.theme.linkStylesHover}
-  }
-  &:focus {
-    ${(props) => props.theme.linkStylesFocus}
-  }
-  &:active {
-    ${(props) => props.theme.linkStylesActive}
-  }
+    display: block;
+    margin-bottom: ${(props) => props.theme.theme_vars.spacingSizes.small};
+    ${(props) => props.theme.theme_vars.h4}
+    ${(props) => props.theme.linkStyles}
+    &:hover {
+        ${(props) => props.theme.linkStylesHover}
+    }
+    &:focus {
+        ${(props) => props.theme.linkStylesFocus}
+    }
+    &:active {
+        ${(props) => props.theme.linkStylesActive}
+    }
 
-  @media print {
-    color: ${(props) => props.theme.theme_vars.colours.black} !important;
-    text-decoration: none !important;
-  }
+    @media print {
+        color: ${(props) => props.theme.theme_vars.colours.black} !important;
+        text-decoration: none !important;
+        font-size: ${(props) => props.theme.theme_vars.fontSizes.small};
+        margin-bottom: 0;
+    }
 `;
 
 const PrintLink = styled__default.default.div`
-  p {
-    display: none;
-  }
-
-  @media print {
     p {
-      display: block;
+        display: none;
     }
+
+    @media print {
+        p {
+            display: none;
+            margin-bottom: 0 !important;
+        }
+    }
+`;
+
+const SnippetContainer = styled__default.default.div`
+  @media print {
+    display: flex;
+    flex-wrap: nowrap;
   }
 `;
 
 const QRCodeContainer = styled__default.default.div`
-  max-width: 80px;
-  margin: ${(props) => props.theme.theme_vars.spacingSizes.medium} 0;
-  display: none;
-  float: right;
+    max-width: 80px;
+    display: none;
 
-  @media print {
-    display: block;
-  }
+    @media print {
+        display: block;
+        margin-left: ${(props) => props.theme.theme_vars.spacingSizes.small};
+    }
 `;
 
 const FavouriteContainer = styled__default.default.div`
-  background: ${(props) =>
-    props.theme.cardinal_name === 'north'
-      ? props.theme.theme_vars.colours.white
-      : props.theme.theme_vars.colours.grey_light};
-  box-shadow: 0px 4px 15px rgba(0, 0, 0, 0.08);
-  transition: box-shadow 0.3s ease;
-  border-bottom: 5px solid ${(props) => props.theme.theme_vars.colours.action};
-  border-radius: ${(props) => props.theme.theme_vars.border_radius};
-  padding: ${(props) => props.theme.theme_vars.spacingSizes.medium};
+    background: ${(props) =>
+            props.theme.cardinal_name === 'north'
+                    ? props.theme.theme_vars.colours.white
+                    : props.theme.theme_vars.colours.grey_light};
+    box-shadow: 0px 4px 15px rgba(0, 0, 0, 0.08);
+    transition: box-shadow 0.3s ease;
+    border-bottom: 5px solid ${(props) => props.theme.theme_vars.colours.action};
+    border-radius: ${(props) => props.theme.theme_vars.border_radius};
+    padding: ${(props) => props.theme.theme_vars.spacingSizes.medium};
 
-  @media print {
-    box-shadow: none;
-    border: 1px solid ${(props) => props.theme.theme_vars.colours.grey};
-    background: none;
-  }
+    @media print {
+        box-shadow: none;
+        border: 1px solid ${(props) => props.theme.theme_vars.colours.grey};
+        background: none;
+        padding: 0 ${(props) => props.theme.theme_vars.spacingSizes.small};
+    }
 `;
 
-const PrintContainer = styled__default.default.div`
+const ButtonContainer$1 = styled__default.default.div`
   display: flex;
   justify-content: flex-end;
 
@@ -31409,7 +31977,7 @@ const PrintContainer = styled__default.default.div`
   }
 `;
 
-const PrintButton = styled__default.default.button`
+const ActionButton = styled__default.default.button`
   border: 2px solid ${(props) => props.theme.theme_vars.colours.action};
   border-radius: ${(props) => props.theme.theme_vars.border_radius};
   background: ${(props) => props.theme.theme_vars.colours.action};
@@ -31421,6 +31989,7 @@ const PrintButton = styled__default.default.button`
   flex-direction: row;
   justify-content: flex-start;
   align-items: center;
+  margin-left: ${(props) => props.theme.theme_vars.spacingSizes.medium};
   &:hover {
     ${(props) => props.theme.linkStylesHover}
     color: ${(props) => props.theme.theme_vars.colours.white};
@@ -31443,6 +32012,53 @@ const AddContainer = styled__default.default.div`
   }
 `;
 
+const SubTitle = styled__default.default.p`
+  font-weight: bold;
+  margin-top: ${(props) => props.theme.theme_vars.spacingSizes.medium};
+`;
+
+const ClearShortlistButton = styled__default.default.button`
+  border: 1px solid ${(props) => props.theme.theme_vars.colours.negative};
+  background: ${(props) => props.theme.theme_vars.colours.white};
+  color: ${(props) => props.theme.theme_vars.colours.negative};
+  padding: ${(props) => props.theme.theme_vars.spacingSizes.small};
+  cursor: pointer;
+  border-radius: ${(props) => props.theme.theme_vars.border_radius};
+  min-height: 42px;
+  font-weight: bold;
+
+  &:hover {
+    background: ${(props) => props.theme.theme_vars.colours.action_light};
+    color: ${(props) => props.theme.theme_vars.colours.action_dark};
+    text-decoration: underline;
+    text-decoration-style: dotted;
+  }
+
+  &:focus {
+    ${(props) => props.theme.linkStylesFocus}
+  }
+
+  &:active {
+    ${(props) => props.theme.linkStylesActive}
+  }
+`;
+
+const AddressContainer = styled__default.default.div`
+  display: block;
+
+  @media print {
+    display: none;
+  }
+`;
+
+const PrintAddress = styled__default.default.div`
+  display: none;
+
+  @media print {
+    display: block;
+  }
+`;
+
 var lib = {};
 
 var mode$1 = {
@@ -32802,32 +33418,82 @@ QRCode.defaultProps = defaultProps;
 var _default = lib.default = QRCode;
 
 var DirectoryShortList = function (_a) {
-    var directoryPath = _a.directoryPath;
-    var favourites = useDirectoryShortListContext().favourites.favourites;
-    var _b = React.useState(false), notServer = _b[0], setNotServer = _b[1];
+    _a.directoryPath;
+    var _b = useDirectoryShortListContext(), favourites = _b.favourites.favourites, clearShortlist = _b.clearShortlist;
+    var _c = React.useState(false), notServer = _c[0], setNotServer = _c[1];
     React.useEffect(function () {
         setNotServer(true);
     }, []);
+    var confirmClear = function () {
+        if (window.confirm('Are you sure you want to clear your shortlist?')) {
+            clearShortlist();
+        }
+    };
+    var formatAddress = function (address) {
+        return Object.values(address)
+            .filter(function (item) { return item !== '' && item !== address.id && item !== address.country; })
+            .join(', ');
+    };
+    var copyToClipboard = function () { return __awaiter(void 0, void 0, void 0, function () {
+        var data;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    data = favourites.map(function (favourite) {
+                        var _a, _b, _c, _d;
+                        var address = favourite.addresses.length > 0 ? formatAddress(favourite.addresses[0]) : '';
+                        return "\nName: ".concat(favourite.name, "\nLink: ").concat(favourite.id, "\nAddress: ").concat(address, "\nEmail: ").concat((_a = favourite.email) !== null && _a !== void 0 ? _a : '', "\nWebsite: ").concat((_b = favourite.website) !== null && _b !== void 0 ? _b : '', "\nTelephone: ").concat((_c = favourite.phone) !== null && _c !== void 0 ? _c : '', "\nAbout: ").concat((_d = favourite.snippet.replace(/(\r\n|\n|\r)/gm, '').replace(/\s+/g, ' ')) !== null && _d !== void 0 ? _d : '', "\n\n      ");
+                    });
+                    _b.label = 1;
+                case 1:
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, navigator.clipboard.writeText(data.join('')).then(function () {
+                            window.alert('Copied to clipboard');
+                        })];
+                case 2:
+                    _b.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    _b.sent();
+                    window.alert('Unable to copy');
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
+            }
+        });
+    }); };
     return (React__default.default.createElement(Container$1, { "data-testid": "DirectoryShortList" }, notServer && (React__default.default.createElement(Row$1, null, favourites.length > 0 ? (React__default.default.createElement(React__default.default.Fragment, null,
         React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
-            React__default.default.createElement(PrintContainer, null,
-                React__default.default.createElement(PrintButton, { onClick: function () { return window.print(); } }, "Print Shortlist"))),
-        favourites.map(function (favourite) { return (React__default.default.createElement(Column, { key: favourite.id, small: "full", medium: "full", large: "full" },
-            React__default.default.createElement(FavouriteContainer, null,
-                React__default.default.createElement(Row$1, null,
-                    React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
-                        React__default.default.createElement(QRCodeContainer, null,
-                            React__default.default.createElement(_default, { value: "".concat(directoryPath, "/").concat(favourite.id), size: 256, style: { height: 'auto', maxWidth: '100%', width: '100%' }, viewBox: "0 0 256 256" })),
-                        React__default.default.createElement(ServiceLink, { href: "".concat(directoryPath, "/").concat(favourite.id) }, favourite.name),
-                        React__default.default.createElement(PrintLink, null,
-                            React__default.default.createElement("p", null, "".concat(directoryPath, "/").concat(favourite.id)))),
-                    React__default.default.createElement(Column, { small: "full", medium: "full", large: "one-half" },
-                        React__default.default.createElement("div", null, favourite.snippet)),
-                    React__default.default.createElement(Column, { small: "full", medium: "full", large: "one-half" },
-                        React__default.default.createElement(SummaryList, { terms: transformService(favourite.email, favourite.website, favourite.phone), hasMargin: false })),
-                    React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
-                        React__default.default.createElement(AddContainer, null,
-                            React__default.default.createElement(DirectoryAddToShortList, { id: favourite.id, name: favourite.name, snippet: favourite.snippet, email: favourite.email, website: favourite.website, phone: favourite.phone }))))))); }))) : (React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
+            React__default.default.createElement(ButtonContainer$1, null,
+                React__default.default.createElement(ClearShortlistButton, { onClick: confirmClear }, "Clear Shortlist"),
+                React__default.default.createElement(ActionButton, { onClick: copyToClipboard }, "Copy To Clipboard"),
+                React__default.default.createElement(ActionButton, { onClick: function () { return window.print(); } }, "Print Shortlist"))),
+        favourites.map(function (favourite) {
+            var _a, _b;
+            return (React__default.default.createElement(Column, { key: favourite.id, small: "full", medium: "full", large: "full", classes: "favourite-outer" },
+                React__default.default.createElement(FavouriteContainer, null,
+                    React__default.default.createElement(Row$1, null,
+                        React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
+                            React__default.default.createElement(ServiceLink, { href: "".concat(favourite.id) }, favourite.name),
+                            React__default.default.createElement(PrintLink, null,
+                                React__default.default.createElement("p", null, "".concat(favourite.id)))),
+                        React__default.default.createElement(Column, { small: "full", medium: "full", large: "one-half" },
+                            React__default.default.createElement(SnippetContainer, null,
+                                React__default.default.createElement("div", null, favourite.snippet),
+                                React__default.default.createElement(QRCodeContainer, null,
+                                    React__default.default.createElement(_default, { value: "".concat(favourite.id), size: 256, style: { height: 'auto', maxWidth: '100%', width: '100%' }, viewBox: "0 0 256 256" }))),
+                            ((_a = favourite.addresses) === null || _a === void 0 ? void 0 : _a.length) > 0 && (React__default.default.createElement(React__default.default.Fragment, null,
+                                React__default.default.createElement(AddressContainer, null,
+                                    React__default.default.createElement(SubTitle, null, "Address"),
+                                    ((_b = favourite.addresses) === null || _b === void 0 ? void 0 : _b.length) === 1 ? (React__default.default.createElement("p", null, formatAddress(favourite.addresses[0]))) : (React__default.default.createElement("ul", null, favourite.addresses.map(function (address) { return (React__default.default.createElement("li", { key: address.id }, formatAddress(address))); })))),
+                                React__default.default.createElement(PrintAddress, null,
+                                    React__default.default.createElement(SummaryList, { terms: [{ term: 'Address', detail: formatAddress(favourite.addresses[0]) }], hasMargin: false }))))),
+                        React__default.default.createElement(Column, { small: "full", medium: "full", large: "one-half" },
+                            React__default.default.createElement(SummaryList, { terms: transformService(favourite.email, favourite.website, favourite.phone), hasMargin: false }),
+                            favourite.fees && (React__default.default.createElement(SummaryList, { terms: [{ term: 'Cost', detail: favourite.fees }], hasMargin: false }))),
+                        React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
+                            React__default.default.createElement(AddContainer, null,
+                                React__default.default.createElement(DirectoryAddToShortList, { id: favourite.id, name: favourite.name, snippet: favourite.snippet, email: favourite.email, website: favourite.website, phone: favourite.phone, addresses: favourite.addresses })))))));
+        }))) : (React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
         React__default.default.createElement(FavouriteContainer, null,
             React__default.default.createElement("p", null, "No items in the shortlist"))))))));
 };
@@ -32962,8 +33628,8 @@ const LoadingContainer = styled__default.default.div`
 `;
 
 var DirectoryDocumentList = function (_a) {
-    var directoryPath = _a.directoryPath, documents = _a.documents, _b = _a.search, search = _b === void 0 ? '' : _b, setSearch = _a.setSearch, _c = _a.totalResults, totalResults = _c === void 0 ? 0 : _c, _d = _a.pageNumber, pageNumber = _d === void 0 ? 1 : _d, setPageNumber = _a.setPageNumber, _e = _a.perPage, perPage = _e === void 0 ? 10 : _e, categories = _a.categories, setCategories = _a.setCategories, _f = _a.isLoading, isLoading = _f === void 0 ? false : _f;
-    var _g = React.useState(search), searchTerm = _g[0], setSearchTerm = _g[1];
+    var directoryPath = _a.directoryPath, documents = _a.documents, _b = _a.search, search = _b === void 0 ? '' : _b, setSearch = _a.setSearch, _c = _a.totalResults, totalResults = _c === void 0 ? 0 : _c, _d = _a.pageNumber, pageNumber = _d === void 0 ? 1 : _d, setPageNumber = _a.setPageNumber, _e = _a.perPage, perPage = _e === void 0 ? 10 : _e, categories = _a.categories, setCategories = _a.setCategories, _f = _a.isLoading, isLoading = _f === void 0 ? false : _f, _g = _a.isError, isError = _g === void 0 ? false : _g;
+    var _h = React.useState(search), searchTerm = _h[0], setSearchTerm = _h[1];
     var submitSearch = function (e) {
         e.preventDefault();
         setSearch(searchTerm);
@@ -33002,7 +33668,7 @@ var DirectoryDocumentList = function (_a) {
                         React__default.default.createElement(Row$1, null,
                             React__default.default.createElement(Column, { small: "full", medium: "one-half", large: "one-third" },
                                 React__default.default.createElement(Label, { htmlFor: "directorySearch" }, "What are you looking for?"),
-                                React__default.default.createElement(HintText, { text: "Enter a search word or phrase" }),
+                                React__default.default.createElement(HintText, { text: "Enter the name of a specific organisation" }),
                                 React__default.default.createElement(Input, { name: "directorySearch", type: "text", defaultValue: searchTerm, id: "directorySearch", onChange: function (e) {
                                         setSearchTerm(e.target.value);
                                     } })),
@@ -33026,7 +33692,9 @@ var DirectoryDocumentList = function (_a) {
                                 React__default.default.createElement(RadioCheckboxInput, { name: taxonomy.vocabulary, value: taxonomy.id, label: taxonomy.name, singleSelection: category.singleSelection, checked: taxonomy.checked, onChange: function (e) { return optionChecked(e, categoryIndex, category.singleSelection); } }))); })))); }))),
             React__default.default.createElement(Column, { small: "full", medium: "two-thirds", large: "two-thirds" },
                 React__default.default.createElement(Row$1, null,
-                    isLoading ? (React__default.default.createElement(LoadingContainer, null,
+                    isError ? (React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" },
+                        React__default.default.createElement(AlertBannerService, null,
+                            React__default.default.createElement("p", null, "Sorry, there was a problem fetching results. Please try again later.")))) : isLoading ? (React__default.default.createElement(LoadingContainer, null,
                         React__default.default.createElement(LoadingSpinner, null),
                         React__default.default.createElement("p", null, "Loading"))) : (React__default.default.createElement(React__default.default.Fragment, null,
                         React__default.default.createElement(Column, { small: "full", medium: "full", large: "full" }, (documents === null || documents === void 0 ? void 0 : documents.length) > 0 ? (React__default.default.createElement(ResultInfo, null,
@@ -33106,6 +33774,7 @@ exports.PromoBanner = PromoBanner;
 exports.PromoBlock = PromoBlock;
 exports.PromotedLinks = PromotedLinks;
 exports.Promotions = Promotions;
+exports.RoadworksList = RoadworksList;
 exports.SearchBox = SearchBox;
 exports.SearchResultsList = SearchResultsList;
 exports.Searchbar = Searchbar;