@ons/design-system 53.0.4 → 54.0.0

package/components/accordion/_macro.njk

@@ -15,9 +15,9 @@
                 onsButton({
                     "type": "button",
                     "text": params.allButton.open,
-                    "classes": "ons-js-collapsible-all ons-u-mb-s ons-u-d-no",
+                    "classes": "ons-js-accordion-all ons-u-mb-s ons-u-d-no",
                     "variants": ["secondary", "small"],
-                    "innerClasses": "ons-js-collapsible-all-inner",
+                    "innerClasses": "ons-js-accordion-all-inner",
                     "attributes": attributes
                 })
             }}
@@ -36,7 +36,6 @@
                     "content": item.content,
                     "group": params.id,
                     "saveState": params.saveState,
-                    "variants": params.variants,
                     "open": params.open
                 })
             }}

package/components/accordion/_macro.spec.js

@@ -54,18 +54,6 @@ describe('macro: accordion', () => {
   });
 
   describe('item', () => {
-    it('has provided variant style classes', () => {
-      const $ = cheerio.load(
-        renderComponent('accordion', {
-          ...EXAMPLE_ACCORDION_WITH_TWO_ITEMS,
-          variants: ['variant-a', 'variant-b'],
-        }),
-      );
-
-      expect($('.ons-collapsible--variant-a').length).toBe(2);
-      expect($('.ons-collapsible--variant-b').length).toBe(2);
-    });
-
     it('has provided title text', () => {
       const $ = cheerio.load(renderComponent('accordion', EXAMPLE_ACCORDION_WITH_TWO_ITEMS));
 
@@ -103,31 +91,6 @@ describe('macro: accordion', () => {
       expect(titleText).toBe('Content for item 1');
     });
 
-    it('outputs a button with the expected class', () => {
-      const $ = cheerio.load(
-        renderComponent('accordion', {
-          itemsList: [
-            {
-              title: 'Title for item 1',
-              button: {
-                open: 'Open label',
-                close: 'Close label',
-              },
-            },
-            {
-              title: 'Title for item 2',
-              button: {
-                open: 'Open label',
-                close: 'Close label',
-              },
-            },
-          ],
-        }),
-      );
-
-      expect($('button.ons-js-collapsible-button').length).toBe(2);
-    });
-
     it('has additionally provided `attributes`', () => {
       const $ = cheerio.load(
         renderComponent('accordion', {
@@ -199,7 +162,7 @@ describe('macro: accordion', () => {
         }),
       );
 
-      expect($('button.ons-js-collapsible-all').length).toBe(1);
+      expect($('button.ons-js-accordion-all').length).toBe(1);
     });
 
     it('has additionally provided `attributes`', () => {
@@ -217,8 +180,8 @@ describe('macro: accordion', () => {
         }),
       );
 
-      expect($('button.ons-js-collapsible-all').attr('a')).toBe('123');
-      expect($('button.ons-js-collapsible-all').attr('b')).toBe('456');
+      expect($('button.ons-js-accordion-all').attr('a')).toBe('123');
+      expect($('button.ons-js-accordion-all').attr('b')).toBe('456');
     });
   });
 });

package/components/accordion/accordion.dom.js

@@ -0,0 +1,19 @@
+import domready from '../../js/domready';
+
+async function initialiseAccordions() {
+  const toggleAllButtons = [...document.querySelectorAll('.ons-js-accordion-all')];
+
+  if (toggleAllButtons.length) {
+    const collapsibleComponents = [...document.querySelectorAll('.ons-js-collapsible')];
+
+    const Collapsible = (await import('../collapsible/collapsible')).default;
+    const Accordion = (await import('./accordion')).default;
+    const collapsibles = collapsibleComponents.map(element => new Collapsible(element));
+
+    toggleAllButtons.forEach(button => {
+      new Accordion(button, collapsibles);
+    });
+  }
+}
+
+domready(initialiseAccordions);

package/components/{collapsible/collapsible.group.js → accordion/accordion.js}

@@ -1,23 +1,28 @@
-export default class CollapsibleGroup {
+export default class Accordion {
   constructor(button, collapsibles) {
     this.openCollapsibles = 0;
 
     this.button = button;
-    this.buttonInner = button.querySelector('.ons-js-collapsible-all-inner');
+    this.buttonInner = button.querySelector('.ons-js-accordion-all-inner');
     this.group = button.getAttribute('data-group');
     this.collapsibles = collapsibles.filter(collapsible => collapsible.group === this.group);
-
     this.totalCollapsibles = this.collapsibles.length;
-    this.buttonOpen = this.buttonInner.innerHTML.trim();
+    this.buttonOpenEl = this.buttonInner.querySelector('.ons-btn__text');
+    this.buttonOpen = this.buttonOpenEl.innerHTML.trim();
     this.closeButton = button.getAttribute('data-close-all');
+    this.open = this.collapsibles.find(collapsible => collapsible.open === true);
 
     this.collapsibles.forEach(collapsible => {
       collapsible.onOpen = this.onOpen.bind(this);
       collapsible.onClose = this.onClose.bind(this);
     });
 
-    this.button.addEventListener('click', this.handleButtonClick.bind(this));
+    if (this.open) {
+      this.openCollapsibles = this.totalCollapsibles;
+    }
 
+    this.button.addEventListener('click', this.handleButtonClick.bind(this));
+    this.setButton();
     this.button.classList.remove('ons-u-d-no');
   }
 
@@ -49,9 +54,11 @@ export default class CollapsibleGroup {
     if (this.canClose()) {
       this.buttonInner.innerHTML = this.closeButton;
       this.button.setAttribute('data-ga-label', this.buttonOpen);
+      this.button.setAttribute('aria-expanded', 'true');
     } else {
       this.buttonInner.innerHTML = this.buttonOpen;
       this.button.setAttribute('data-ga-label', this.closeButton);
+      this.button.setAttribute('aria-expanded', 'false');
     }
   }
 }

package/components/accordion/accordion.spec.js

@@ -6,26 +6,14 @@ const EXAMPLE_ACCORDION_WITH_THREE_ITEMS = {
     {
       title: 'Title for item 1',
       content: 'Content for item 1',
-      button: {
-        open: 'Open item',
-        close: 'Close item',
-      },
     },
     {
       title: 'Title for item 2',
       content: 'Content for item 2',
-      button: {
-        open: 'Open item',
-        close: 'Close item',
-      },
     },
     {
       title: 'Title for item 3',
       content: 'Content for item 3',
-      button: {
-        open: 'Open item',
-        close: 'Close item',
-      },
     },
   ],
 };
@@ -42,43 +30,68 @@ const EXAMPLE_ACCORDION_WITH_ALL_BUTTON = {
 };
 
 describe('script: accordion', () => {
-  it('begins with all items closed', async () => {
-    await setTestPage('/test', renderComponent('accordion', EXAMPLE_ACCORDION_WITH_THREE_ITEMS));
+  it('begins with all items open when specified', async () => {
+    await setTestPage(
+      '/test',
+      renderComponent('accordion', {
+        ...EXAMPLE_ACCORDION_WITH_THREE_ITEMS,
+        open: true,
+      }),
+    );
 
-    const openItemCount = await page.$$eval('.ons-collapsible--open', elements => elements.length);
-    expect(openItemCount).toBe(0);
+    const openElements = await page.$$eval('.ons-js-collapsible', nodes => nodes.filter(node => node.open));
+    expect(openElements[0]).not.toBe(undefined);
+    expect(openElements[1]).not.toBe(undefined);
+    expect(openElements[2]).not.toBe(undefined);
   });
 
-  it('begins with all items open when specified', async () => {
+  it('sets toggle all button label to "Hide all" when open is specified', async () => {
     await setTestPage(
       '/test',
       renderComponent('accordion', {
-        ...EXAMPLE_ACCORDION_WITH_THREE_ITEMS,
+        ...EXAMPLE_ACCORDION_WITH_ALL_BUTTON,
+        open: true,
+      }),
+    );
+
+    const buttonText = await page.$eval('button[data-test-trigger]', element => element.innerText);
+    expect(buttonText.trim()).toBe('Close all');
+  });
+
+  it('sets toggle all button aria-expanded set to true when open is specified', async () => {
+    await setTestPage(
+      '/test',
+      renderComponent('accordion', {
+        ...EXAMPLE_ACCORDION_WITH_ALL_BUTTON,
         open: true,
       }),
     );
 
-    const openItemCount = await page.$$eval('.ons-collapsible--open', elements => elements.length);
-    expect(openItemCount).toBe(3);
+    const ariaExpanded = await page.$eval('button[data-test-trigger]', element => element.getAttribute('aria-expanded'));
+    expect(ariaExpanded).toBe('true');
   });
 
-  it('opens all items when accordion "Open all" button is clicked', async () => {
+  it('opens all items when accordion `allbutton` is clicked', async () => {
     await setTestPage('/test', renderComponent('accordion', EXAMPLE_ACCORDION_WITH_ALL_BUTTON));
 
     await page.click('button[data-test-trigger]');
 
-    const openItemCount = await page.$$eval('.ons-collapsible--open', elements => elements.length);
-    expect(openItemCount).toBe(3);
+    const openElements = await page.$$eval('.ons-js-collapsible', nodes => nodes.filter(node => node.open));
+    expect(openElements[0]).not.toBe(undefined);
+    expect(openElements[1]).not.toBe(undefined);
+    expect(openElements[2]).not.toBe(undefined);
   });
 
-  it('closes all items when accordion "Open all" button is clicked twice', async () => {
+  it('closes all items when accordion `allbutton` is clicked twice', async () => {
     await setTestPage('/test', renderComponent('accordion', EXAMPLE_ACCORDION_WITH_ALL_BUTTON));
 
     await page.click('button[data-test-trigger]');
     await page.click('button[data-test-trigger]');
 
-    const openItemCount = await page.$$eval('.ons-collapsible--open', elements => elements.length);
-    expect(openItemCount).toBe(0);
+    const openElements = await page.$$eval('.ons-js-collapsible', nodes => nodes.filter(node => node.open));
+    expect(openElements[0]).toBe(undefined);
+    expect(openElements[1]).toBe(undefined);
+    expect(openElements[2]).toBe(undefined);
   });
 
   it('starts with the toggle all button labelled as "Open all"', async () => {
@@ -88,47 +101,39 @@ describe('script: accordion', () => {
     expect(buttonText.trim()).toBe('Open all');
   });
 
-  it('sets toggle all button label to "Hide all" when clicked', async () => {
+  it('starts with the toggle all button aria-expanded set to false', async () => {
     await setTestPage('/test', renderComponent('accordion', EXAMPLE_ACCORDION_WITH_ALL_BUTTON));
 
-    await page.click('button[data-test-trigger]');
-
-    const buttonText = await page.$eval('button[data-test-trigger]', element => element.innerText);
-    expect(buttonText.trim()).toBe('Close all');
+    const ariaExpanded = await page.$eval('button[data-test-trigger]', element => element.getAttribute('aria-expanded'));
+    expect(ariaExpanded).toBe('false');
   });
 
-  it('sets toggle all button label to "Hide all" when all items are shown', async () => {
+  it('sets toggle all button label to "Hide all" when clicked', async () => {
     await setTestPage('/test', renderComponent('accordion', EXAMPLE_ACCORDION_WITH_ALL_BUTTON));
 
-    await page.click('#example-accordion-1 .ons-collapsible__btn');
-    await page.click('#example-accordion-2 .ons-collapsible__btn');
-    await page.click('#example-accordion-3 .ons-collapsible__btn');
+    await page.click('button[data-test-trigger]');
 
     const buttonText = await page.$eval('button[data-test-trigger]', element => element.innerText);
     expect(buttonText.trim()).toBe('Close all');
   });
 
-  it('opens an item when its open button is clicked', async () => {
-    await setTestPage('/test', renderComponent('accordion', EXAMPLE_ACCORDION_WITH_THREE_ITEMS));
+  it('sets toggle all button aria-expanded set to true when clicked', async () => {
+    await setTestPage('/test', renderComponent('accordion', EXAMPLE_ACCORDION_WITH_ALL_BUTTON));
 
-    await page.click('#example-accordion-2 .ons-collapsible__btn');
-    await page.click('#example-accordion-3 .ons-collapsible__btn');
+    await page.click('button[data-test-trigger]');
 
-    const openItemCount = await page.$$eval('.ons-collapsible--open', elements => elements.length);
-    expect(openItemCount).toBe(2);
+    const ariaExpanded = await page.$eval('button[data-test-trigger]', element => element.getAttribute('aria-expanded'));
+    expect(ariaExpanded).toBe('true');
   });
 
-  it('closes an item when its open button is clicked twice', async () => {
-    await setTestPage('/test', renderComponent('accordion', EXAMPLE_ACCORDION_WITH_THREE_ITEMS));
-
-    await page.click('#example-accordion-2 .ons-collapsible__btn');
-    await page.click('#example-accordion-3 .ons-collapsible__btn');
-    await page.click('#example-accordion-3 .ons-collapsible__btn');
+  it('sets toggle all button label to "Hide all" when all items are shown', async () => {
+    await setTestPage('/test', renderComponent('accordion', EXAMPLE_ACCORDION_WITH_ALL_BUTTON));
 
-    const isItem2Open = await page.$eval('#example-accordion-2', element => element.classList.contains('ons-collapsible--open'));
-    expect(isItem2Open).toBe(true);
+    await page.click('#example-accordion-1 .ons-collapsible__heading');
+    await page.click('#example-accordion-2 .ons-collapsible__heading');
+    await page.click('#example-accordion-3 .ons-collapsible__heading');
 
-    const isItem3Open = await page.$eval('#example-accordion-3', element => element.classList.contains('ons-collapsible--open'));
-    expect(isItem3Open).toBe(false);
+    const buttonText = await page.$eval('button[data-test-trigger]', element => element.innerText);
+    expect(buttonText.trim()).toBe('Close all');
   });
 });

package/components/autosuggest/_autosuggest.scss

@@ -131,7 +131,7 @@
       box-shadow: 0 0 5px 0 rgba($color-black, 0.6);
       left: 0;
       position: absolute;
-      z-index: 1;
+      z-index: 10;
     }
   }
 }

package/components/browser-banner/_browser-banner.scss

@@ -0,0 +1,39 @@
+.ons-browser-banner {
+  background-color: $color-banner-browser-bg;
+  display: none; // Hides unsupported browser banner unless targeted below
+  padding: 0.8rem 0;
+
+  &__content {
+    @extend .ons-u-fs-s;
+
+    color: $color-text-inverse;
+    margin: 0;
+  }
+
+  &__lead {
+    @extend .ons-u-fw-b;
+  }
+
+  &__link {
+    color: $color-text-inverse-link;
+
+    &:hover {
+      color: $color-text-inverse-link-hover;
+      text-decoration: underline solid $color-text-inverse-link-hover 2px;
+    }
+  }
+}
+
+// Targets browsers IE10 & IE11 and displays unsupported browser banner
+@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
+  .ons-browser-banner {
+    display: block;
+  }
+}
+
+// Targets browsers IE8 & IE9 and displays unsupported browser banner
+@media screen\0 {
+  .ons-browser-banner {
+    display: block;
+  }
+}

package/components/browser-banner/_macro.njk

@@ -0,0 +1,17 @@
+{% macro onsBrowserBanner(params) %}
+    {% if params.lang == "cy" %}
+        {% set bannerLeadingText = 'Nid yw’r wefan hon yn cefnogi eich porwr mwyach.' %}
+        {% set bannerLinkUrl = 'https://cy.ons.gov.uk/help/browsers' %}
+        {% set bannerCTA = 'Gallwch <a class="ons-browser-banner__link" href="' + bannerLinkUrl + '">ddiweddaru eich porwr i’r fersiwn ddiweddaraf</a>.' %}
+    {% else %}
+        {% set bannerLeadingText = 'This website no longer supports your browser.' %}
+        {% set bannerLinkUrl = 'https://www.ons.gov.uk/help/browsers' %}
+        {% set bannerCTA = 'You can <a class="ons-browser-banner__link" href="' + bannerLinkUrl + '">upgrade your browser to the latest version</a>.' %}
+    {% endif %}
+
+    <div class="ons-browser-banner">
+        <div class="ons-container{{ ' ons-container--wide' if params.wide is defined and params.wide }}">
+            <p class="ons-browser-banner__content"><span class="ons-browser-banner__lead">{{ bannerLeadingText }}</span><span class="ons-browser-banner__cta"> {{ bannerCTA | safe }}</span></p>
+        </div>
+    </div>
+{% endmacro %}

package/components/browser-banner/_macro.spec.js

@@ -0,0 +1,83 @@
+/** @jest-environment jsdom */
+
+import * as cheerio from 'cheerio';
+
+import axe from '../../tests/helpers/axe';
+import { renderComponent } from '../../tests/helpers/rendering';
+
+const EXAMPLE_BROWSER_BANNER_DEFAULT = {};
+
+describe('macro: browser-banner', () => {
+  it('passes jest-axe checks with', async () => {
+    const $ = cheerio.load(renderComponent('browser-banner', EXAMPLE_BROWSER_BANNER_DEFAULT));
+
+    const results = await axe($.html());
+    expect(results).toHaveNoViolations();
+  });
+
+  it('has the default `bannerLeadingText`', () => {
+    const $ = cheerio.load(renderComponent('browser-banner', EXAMPLE_BROWSER_BANNER_DEFAULT));
+
+    const bannerLeadingText = $('.ons-browser-banner__lead')
+      .text()
+      .trim();
+    expect(bannerLeadingText).toBe('This website no longer supports your browser.');
+  });
+
+  it('has the default `bannerCTA`', () => {
+    const $ = cheerio.load(renderComponent('browser-banner', EXAMPLE_BROWSER_BANNER_DEFAULT));
+
+    const bannerCtaHtml = $('.ons-browser-banner__cta')
+      .text()
+      .trim();
+    expect(bannerCtaHtml).toBe('You can upgrade your browser to the latest version.');
+  });
+
+  it('has the default `bannerLinkUrl`', () => {
+    const $ = cheerio.load(renderComponent('browser-banner', EXAMPLE_BROWSER_BANNER_DEFAULT));
+
+    expect($('.ons-browser-banner__link').attr('href')).toBe('https://www.ons.gov.uk/help/browsers');
+  });
+
+  it('has `container--wide` class when `wide` is true', () => {
+    const $ = cheerio.load(
+      renderComponent('browser-banner', {
+        ...EXAMPLE_BROWSER_BANNER_DEFAULT,
+        wide: true,
+      }),
+    );
+
+    expect($('.ons-container').hasClass('ons-container--wide')).toBe(true);
+  });
+});
+
+describe('mode: Welsh language', () => {
+  it('has the welsh version of default `bannerLeadingText`', () => {
+    const $ = cheerio.load(
+      renderComponent('browser-banner', {
+        ...EXAMPLE_BROWSER_BANNER_DEFAULT,
+        lang: 'cy',
+      }),
+    );
+
+    const bannerLeadingText = $('.ons-browser-banner__lead')
+      .text()
+      .trim();
+    expect(bannerLeadingText).toBe('Nid yw’r wefan hon yn cefnogi eich porwr mwyach.');
+  });
+
+  it('has the welsh version of default `bannerCTA`', () => {
+    const $ = cheerio.load(renderComponent('browser-banner', { lang: 'cy' }));
+
+    const bannerCtaHtml = $('.ons-browser-banner__cta')
+      .text()
+      .trim();
+    expect(bannerCtaHtml).toBe('Gallwch ddiweddaru eich porwr i’r fersiwn ddiweddaraf.');
+  });
+
+  it('has the welsh version of default `bannerLinkUrl`', () => {
+    const $ = cheerio.load(renderComponent('browser-banner', { lang: 'cy' }));
+
+    expect($('.ons-browser-banner__link').attr('href')).toBe('https://cy.ons.gov.uk/help/browsers');
+  });
+});

package/components/checkboxes/_macro.njk

@@ -85,7 +85,7 @@
                                     "text": checkbox.other.label.text
                                 },
                                 "legend": checkbox.other.legend,
-                                "legendClasses": checkbox.other.legendClasses | default('') + ' ons-u-mb-xs',
+                                "legendClasses": checkbox.other.legendClasses,
                                 "value": checkbox.other.value,
                                 "autoSelect": checkbox.other.autoSelect,
                                 "selectAllChildren": checkbox.other.selectAllChildren,