Merge branch 'main' of github.com:nationalarchives/tna-frontend into …

…feature/hero-captions

.storybook/main.js

@@ -64,6 +64,6 @@ module.exports = {
     return config;
   },
   docs: {
-    autodocs: false,
+    autodocs: true,
   },
 };

.stylelintrc

@@ -17,6 +17,15 @@
         "selector-class-pattern": null,
         "plugin/selector-bem-pattern": {
             "preset": "bem"
-        }
+        },
+        "color-function-notation": [
+            "modern",
+            {
+                "ignore": [
+                    "with-var-inside"
+                ]
+            }
+        ],
+        "scss/operator-no-newline-after": null
     }
 }

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `<small>` elements are now styled
 - Some basic print styles added for tabs, breadcrumbs and cookie banners
 - Grids can be centre aligned with `tna-container--centred`
+- Skip links will focus on the targeted element with JavaScript once the skip link is clicked
 
 ### Changed
 
@@ -34,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `xl` and `l` headings are Supria Sans and `m` and `s` are Open Sans
 - Card heading size defaults to `s`
 - Markup and styles altered for hero component
+- Updated app icons and favicon
 
 ### Deprecated
 ### Removed

src/nationalarchives/all.mjs

@@ -4,6 +4,7 @@ import { Gallery } from "./components/gallery/gallery.mjs";
 import { Header } from "./components/header/header.mjs";
 import { Picture } from "./components/picture/picture.mjs";
 import { SensitiveImage } from "./components/sensitive-image/sensitive-image.mjs";
+import { SkipLink } from "./components/skip-link/skip-link.mjs";
 import { Tabs } from "./components/tabs/tabs.mjs";
 import Cookies from "./lib/cookies.mjs";
 
@@ -81,6 +82,11 @@ const initAll = (options) => {
     new SensitiveImage($sensitiveImage).init();
   });
 
+  const $skipLinks = $scope.querySelectorAll('[data-module="tna-skip-link"]');
+  $skipLinks.forEach(($skipLink) => {
+    new SkipLink($skipLink).init();
+  });
+
   const $tabs = $scope.querySelectorAll('[data-module="tna-tabs"]');
   $tabs.forEach(($tabModule) => {
     new Tabs($tabModule).init();
@@ -96,5 +102,6 @@ export {
   Header,
   Picture,
   SensitiveImage,
+  SkipLink,
   Tabs,
 };

src/nationalarchives/components/skip-link/fixtures.json

@@ -4,7 +4,7 @@
     {
       "name": "minimal",
       "options": {},
-      "html": "<a href=\"#main-content\" class=\"tna-skip-link \">Skip to main content</a>",
+      "html": "<a href=\"#main-content\" class=\"tna-skip-link \" data-module=\"tna-skip-link\">Skip to main content</a>",
       "hidden": false
     }
   ]

src/nationalarchives/components/skip-link/skip-link.mjs

@@ -0,0 +1,40 @@
+export class SkipLink {
+  linkedElementListener = false;
+
+  constructor($module) {
+    this.$module = $module;
+    this.linkedElementId = $module.getAttribute("href").split("#").pop();
+    this.$linkedElement =
+      $module &&
+      this.linkedElementId &&
+      document.getElementById(this.linkedElementId);
+  }
+
+  init() {
+    if (!this.$module || !this.$linkedElement) {
+      return;
+    }
+    this.$module.addEventListener("click", () => this.focusLinkedElement());
+  }
+
+  focusLinkedElement() {
+    if (!this.$linkedElement.getAttribute("tabindex")) {
+      this.$linkedElement.setAttribute("tabindex", "-1");
+      this.$linkedElement.classList.add("tna-!--no-focus-style");
+
+      if (!this.linkedElementListener) {
+        this.$linkedElement.addEventListener("blur", () =>
+          this.removeFocusProperties(),
+        );
+        this.linkedElementListener = true;
+      }
+    }
+
+    this.$linkedElement.focus();
+  }
+
+  removeFocusProperties() {
+    this.$linkedElement.removeAttribute("tabindex");
+    this.$linkedElement.classList.remove("tna-!--no-focus-style");
+  }
+}

src/nationalarchives/components/skip-link/skip-link.scss

@@ -5,11 +5,12 @@
   width: 1px !important;
   height: 1px !important;
   margin: 0 !important;
-  padding: 1rem !important;
+  padding: 0 !important;
 
   display: block !important;
 
   position: absolute !important;
+  left: -100vw;
 
   overflow: hidden !important;
 
@@ -25,11 +26,20 @@
     @include colour.colour-font("button-text", $important: true);
   }
 
+  &:focus {
+    @include colour.colour-background("button-background", $important: true);
+
+    @include colour.colour-border("focus-outline", 0.3125rem, $important: true);
+
+    outline: none !important;
+  }
+
   &:active,
   &:focus {
     width: auto !important;
     height: auto !important;
     margin: inherit !important;
+    padding: 1rem !important;
 
     position: static !important;
 
@@ -40,22 +50,14 @@
     clip: auto !important;
     -webkit-clip-path: none !important;
     clip-path: none !important;
-  }
-
-  &:focus {
-    @include colour.colour-background("button-background", $important: true);
-
-    @include colour.colour-border("focus-outline", 0.3125rem, $important: true);
-
-    outline: none !important;
-  }
 
-  &:hover {
-    @include colour.colour-font("button-hover-text", $important: true);
+    &:hover {
+      @include colour.colour-font("button-hover-text", $important: true);
 
-    @include colour.colour-background(
-      "button-hover-background",
-      $important: true
-    );
+      @include colour.colour-background(
+        "button-hover-background",
+        $important: true
+      );
+    }
   }
 }

src/nationalarchives/components/skip-link/skip-link.stories.js

@@ -1,5 +1,7 @@
 import SkipLink from "./template.njk";
 import macroOptions from "./macro-options.json";
+import { expect } from "@storybook/jest";
+import { within, userEvent } from "@storybook/testing-library";
 
 const argTypes = {
   text: { control: "text" },
@@ -23,9 +25,50 @@ const Template = ({ text, href, classes, attributes }) =>
   `<p>To view the skip link component tab to this example, or click inside this example and press tab.</p>
   ${SkipLink({
     params: { text, href, classes, attributes },
-  })}`;
+  })}
+  <main id="main-content" role="main">
+    <h1>Main content</h1>
+  </main>`;
 
 export const Standard = Template.bind({});
 Standard.args = {
   classes: "tna-skip-link--demo",
 };
+
+export const Test = Template.bind({});
+Test.args = {
+  text: "Skip to main content",
+  href: "main-content",
+  classes: "tna-skip-link--demo",
+};
+Test.play = async ({ args, canvasElement, step }) => {
+  const canvas = within(canvasElement);
+
+  const $skipLink = canvas.getByText(args.text);
+  const $linkedElement = document.getElementById(args.href);
+
+  await expect($skipLink.getBoundingClientRect().width).toBe(1);
+  await expect($skipLink.getBoundingClientRect().height).toBe(1);
+  await expect($skipLink.getBoundingClientRect().x).toBeLessThanOrEqual(-1);
+  await expect($skipLink).not.toHaveFocus();
+  await expect($linkedElement).not.toHaveFocus();
+  await expect($linkedElement).not.toHaveAttribute("tabindex");
+
+  await userEvent.keyboard("[Tab]");
+  await expect($skipLink).toHaveFocus();
+  await expect($skipLink.getBoundingClientRect().width).toBeGreaterThan(1);
+  await expect($skipLink.getBoundingClientRect().height).toBeGreaterThan(1);
+  await expect($skipLink.getBoundingClientRect().x).toBeGreaterThanOrEqual(0);
+
+  await userEvent.click($skipLink);
+  await expect($skipLink.getBoundingClientRect().width).toBe(1);
+  await expect($skipLink.getBoundingClientRect().height).toBe(1);
+  await expect($skipLink.getBoundingClientRect().x).toBeLessThanOrEqual(-1);
+  await expect($skipLink).not.toHaveFocus();
+  await expect($linkedElement).toHaveAttribute("tabindex");
+  await expect($linkedElement).toHaveFocus();
+
+  await userEvent.keyboard("[Tab]");
+  await expect($linkedElement).not.toHaveFocus();
+  await expect($linkedElement).not.toHaveAttribute("tabindex");
+};

src/nationalarchives/components/skip-link/template.njk

@@ -1,4 +1,4 @@
 {%- set containerClasses = [params.classes] if params.classes else [] -%}
-<a href="#{{ params.href if params.href else 'main-content' }}" class="tna-skip-link {{ containerClasses | join(' ') }}" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+<a href="#{{ params.href if params.href else 'main-content' }}" class="tna-skip-link {{ containerClasses | join(' ') }}" data-module="tna-skip-link" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
   {{ params.text if params.text else 'Skip to main content' }}
 </a>