@ons/design-system 53.1.0 → 54.0.1

package/components/collapsible/_collapsible.scss

@@ -1,106 +1,81 @@
 $collapsible-caret-width: 1.5rem;
 
 .ons-collapsible {
-  &--initialised & {
-    &__heading {
-      color: $color-text-link;
-      cursor: pointer;
-      display: inline-block;
-      outline: none;
-      padding: 0 0 0 $collapsible-caret-width;
-      pointer-events: initial;
-      position: relative;
-
-      &::marker {
-        display: none;
-      }
+  &__heading {
+    color: $color-text-link;
+    cursor: pointer;
+    display: inline-block;
+    outline: none;
+    padding: 0 0 0 $collapsible-caret-width;
+    pointer-events: initial;
+    position: relative;
+
+    &::marker {
+      display: none;
+    }
 
-      &:focus {
-        .ons-collapsible__title {
-          @extend %a-focus;
-          // extend collapsible focus background behind caret
-          margin-left: -$collapsible-caret-width;
-          padding-left: $collapsible-caret-width;
-        }
-        .ons-collapsible__icon .ons-svg-icon {
-          fill: $color-text-link-focus;
-        }
+    &:focus {
+      .ons-collapsible__title {
+        @extend %a-focus;
+        // extend collapsible focus background behind caret
+        margin-left: -$collapsible-caret-width;
+        padding-left: $collapsible-caret-width;
       }
-
-      &:hover:not(:focus) {
-        color: $color-text-link-hover;
-        .ons-collapsible__icon {
-          fill: $color-text-link-hover;
-        }
-        .ons-collapsible__title {
-          text-decoration: underline solid $color-text-link-hover 2px;
-        }
+      .ons-collapsible__icon .ons-svg-icon {
+        fill: $color-text-link-focus;
       }
     }
 
-    &__icon {
-      display: inline-block;
-      fill: $color-text-link;
-      height: $collapsible-caret-width;
-      left: -0.15rem;
-      position: absolute;
-      top: -0.25rem;
-      width: $collapsible-caret-width;
+    &:hover:not(:focus) {
+      color: $color-text-link-hover;
+      .ons-collapsible__icon {
+        fill: $color-text-link-hover;
+      }
+      .ons-collapsible__title {
+        text-decoration: underline solid $color-text-link-hover 2px;
+      }
     }
+  }
 
-    &__title {
-      font-size: 1rem;
-      font-weight: $font-weight-bold;
-      margin-bottom: 0;
-      text-decoration: underline;
-      text-underline-position: under;
-      transform: translateY(-1px);
-    }
+  &__icon {
+    display: inline-block;
+    fill: $color-text-link;
+    height: $collapsible-caret-width;
+    left: -0.15rem;
+    position: absolute;
+    top: -0.2rem;
+    width: $collapsible-caret-width;
+  }
 
-    &__content {
-      display: none;
-    }
+  &__title {
+    display: inline-block;
+    font-size: 1rem;
+    font-weight: $font-weight-bold;
+    margin-bottom: 0;
+    text-underline-position: under;
+    transform: translateY(-1px);
   }
 
-  &__icon {
-    display: none;
+  &__content {
+    border-left: 4px solid $color-borders-indent;
+    display: block;
+    margin: 1rem 0 0;
+    padding: 0 0 0 1.3em;
   }
 
-  &--open & {
+  &[open] & {
     &__icon {
       left: -0.1rem;
-      top: 0.1rem;
+      top: 0.2rem;
       transform: rotate(90deg);
     }
-
-    &__content {
-      border-left: 4px solid $color-borders-indent;
-      display: block;
-      margin: 1rem 0 0;
-      padding: 0 0 0 1.3em;
-
-      .ons-btn {
-        margin-bottom: 0.5rem;
-      }
-    }
-  }
-
-  &--accordion {
-    margin: 0;
-    &.ons-collapsible--open {
-      .ons-svg-icon {
-        left: 0.4rem;
-        position: absolute;
-        top: 0.25rem;
-      }
-    }
   }
 
   &--accordion & {
     &__heading {
       border-top: 1px solid $color-borders;
       margin: 0;
-      padding-bottom: 1rem;
+      padding-bottom: 0.9rem;
       padding-top: 1rem;
       width: 100%;
 
@@ -115,10 +90,6 @@ $collapsible-caret-width: 1.5rem;
 
     &__icon {
       top: 0.8rem;
-
-      @include mq(s) {
-        top: 1.15rem;
-      }
     }
 
     &__controls {
@@ -138,10 +109,12 @@ $collapsible-caret-width: 1.5rem;
       padding: 0;
     }
   }
+}
 
-  &--simple & {
-    &__icon {
-      top: 0.8rem;
+.ons-collapsible--accordion {
+  &[open] {
+    .ons-collapsible__icon {
+      top: 1.2rem;
     }
   }
 }

package/components/collapsible/_macro.njk

@@ -1,21 +1,16 @@
 {% macro onsCollapsible(params) %}
-    {% from "components/button/_macro.njk" import onsButton %}
-
-    <div
+    <details
         id="{{ params.id }}"
-        class="ons-collapsible ons-js-collapsible{% if params.isAccordion is defined and params.isAccordion %} ons-collapsible--accordion{% endif %}{% if params.classes is defined and params.classes %} {{ params.classes }}{% endif %}{% if params.variants is defined and params.variants %}{% if params.variants is not string %}{% for variant in params.variants %} ons-collapsible--{{ variant }}{% endfor %}{% else %} ons-collapsible--{{ params.variants }}{% endif %}{% endif %}"
-        {% if params.button is defined and params.button and params.button.close is defined and params.button.close %} data-btn-close="{{ params.button.close }}"{% endif %}
+        class="ons-collapsible ons-js-collapsible{% if params.isAccordion is defined and params.isAccordion %} ons-collapsible--accordion{% endif %}{% if params.classes is defined and params.classes %} {{ params.classes }}{% endif %}"
         {% if params.group is defined and params.group %} data-group="{{ params.group }}"{% endif %}
         {% if params.attributes is defined and params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %}{{ attribute }}{% if value is defined and value %}="{{ value }}"{% endif %} {% endfor %}{% endif %}
         {% if params.saveState is defined and params.saveState %} data-save-state="true"{% endif %}
         {% if params.open is defined and params.open %} data-open="true"{% endif %}
     >
-        <div
+        <summary
             class="ons-collapsible__heading ons-js-collapsible-heading"
             {% if params.headingAttributes is defined and params.headingAttributes %}{% for attribute, value in (params.headingAttributes.items() if params.headingAttributes is mapping and params.headingAttributes.items else params.headingAttributes) %}{{ attribute }}{% if value is defined and value %}="{{ value }}"{% endif %} {% endfor %}{% endif %}
         >
-            {# Required to use display flex on Safari as it's not currently supported: https://bugs.webkit.org/show_bug.cgi?id=167111 #}
-            <div class="ons-collapsible__controls">
                 {% set titleTag = params.titleTag | default("h2") %}
                 <{{ titleTag }} class="ons-collapsible__title">{{ params.title }}</{{ titleTag }}>
                 <span class="ons-collapsible__icon">
@@ -25,39 +20,11 @@
                             "iconType": "chevron"
                         })
                     }}</span>
-                {% if params.button is defined and params.button and params.button.open is defined and params.button.open and params.isAccordion is defined and params.isAccordion %}
-                    {{
-                        onsButton({
-                            "type": "button",
-                            "text": params.button.open,
-                            "classes": "ons-collapsible__btn ons-js-collapsible-button ons-u-d-no ons-u-d-no@xxs@s",
-                            "innerClasses": "ons-js-collapsible-button-inner",
-                            "variants": ["secondary", "small"],
-                            "attributes": params.button.attributes
-                        })
-                    }}
-                {% endif %}
-            </div>
-        </div>
+        </summary>
         <div id="{{ params.id }}-content" class="ons-collapsible__content ons-js-collapsible-content"
             {% if params.contentAttributes is defined and params.contentAttributes %}{% for attribute, value in (params.contentAttributes.items() if params.contentAttributes is mapping and params.contentAttributes.items else params.contentAttributes) %}{{ attribute }}{% if value is defined and value %}="{{ value }}"{% endif %} {% endfor %}{% endif %}
         >
-            {% if params.isAccordion is defined and params.isAccordion %}
-                {{ params.content | safe }}{{ caller() if caller }}
-            {% else %}
-                {{ params.content | safe }}{{ caller() if caller }}
-                {{
-                    onsButton({
-                        "type": "button",
-                        "text": params.button.close | default ('Hide this'),
-                        "buttonContext": (params.button.context | default(params.title)) + " " + params.button.contextSuffix | default("content"),
-                        "classes": "ons-js-collapsible-button ons-u-d-no " + (params.button.classes | default("ons-btn--secondary")),
-                        "innerClasses": "ons-js-collapsible-button-inner",
-                        "variants": "small",
-                        "attributes": params.button.attributes
-                    })
-                }}
-            {% endif %}
+            {{ params.content | safe }}{{ caller() if caller }}
         </div>
-    </div>
+    </details>
 {% endmacro %}

package/components/collapsible/_macro.spec.js

@@ -37,18 +37,6 @@ describe('macro: collapsible', () => {
     expect($('.ons-collapsible').hasClass('another-extra-class')).toBe(true);
   });
 
-  it('has provided variant style classes', () => {
-    const $ = cheerio.load(
-      renderComponent('collapsible', {
-        ...EXAMPLE_COLLAPSIBLE_BASIC,
-        variants: ['variant-a', 'variant-b'],
-      }),
-    );
-
-    expect($('.ons-collapsible--variant-a').length).toBe(1);
-    expect($('.ons-collapsible--variant-b').length).toBe(1);
-  });
-
   it('has provided title text', () => {
     const $ = cheerio.load(renderComponent('collapsible', EXAMPLE_COLLAPSIBLE_BASIC));
 
@@ -152,47 +140,6 @@ describe('macro: collapsible', () => {
     expect(iconsSpy.occurrences[0].iconType).toBe('chevron');
   });
 
-  it('has the expected button output', () => {
-    const faker = templateFaker();
-    const buttonSpy = faker.spy('button');
-
-    faker.renderComponent('collapsible', {
-      ...EXAMPLE_COLLAPSIBLE_BASIC,
-      button: {
-        close: 'Close this',
-        attributes: {
-          a: 123,
-          b: 456,
-        },
-      },
-    });
-
-    expect(buttonSpy.occurrences[0]).toEqual({
-      text: 'Close this',
-      type: 'button',
-      buttonContext: 'Title for collapsible content',
-      classes: 'ons-js-collapsible-button ons-u-d-no ons-btn--secondary',
-      innerClasses: 'ons-js-collapsible-button-inner',
-      variants: 'small',
-      attributes: {
-        a: 123,
-        b: 456,
-      },
-    });
-  });
-
-  it('has the expected data attribute when `button` is provided', () => {
-    const $ = cheerio.load(
-      renderComponent('collapsible', {
-        ...EXAMPLE_COLLAPSIBLE_BASIC,
-        button: {
-          close: 'Close this',
-        },
-      }),
-    );
-    expect($('.ons-collapsible').attr('data-btn-close')).toBe('Close this');
-  });
-
   it('calls with content', () => {
     const $ = cheerio.load(renderComponent('collapsible', { EXAMPLE_COLLAPSIBLE_BASIC }, 'Example content...'));
 

package/components/collapsible/collapsible.dom.js

@@ -2,20 +2,11 @@ import domready from '../../js/domready';
 
 async function initialiseCollapsibles() {
   const collapsibleComponents = [...document.querySelectorAll('.ons-js-collapsible')];
+  const accordionComponents = [...document.querySelectorAll('.ons-js-accordion')];
 
-  if (collapsibleComponents.length) {
-    const toggleAllButtons = [...document.querySelectorAll('.ons-js-collapsible-all')];
-
+  if (collapsibleComponents.length && !accordionComponents.length) {
     const Collapsible = (await import('./collapsible')).default;
-    const collapsibles = collapsibleComponents.map(element => new Collapsible(element));
-
-    if (toggleAllButtons.length) {
-      const CollapsibleGroup = (await import('./collapsible.group')).default;
-
-      toggleAllButtons.forEach(button => {
-        new CollapsibleGroup(button, collapsibles);
-      });
-    }
+    collapsibleComponents.map(element => new Collapsible(element));
   }
 }
 

package/components/collapsible/collapsible.js

@@ -2,79 +2,38 @@ export default class Collapsible {
   constructor(collapsibleElement) {
     this.saveState = collapsibleElement.getAttribute('data-save-state') === 'true';
     this.open = collapsibleElement.getAttribute('data-open') === 'true';
-
-    // State
     this.group = collapsibleElement.getAttribute('data-group');
-    this.isAccordion = collapsibleElement.classList.contains('ons-collapsible--accordion');
-    this.isSimpleAccordion = collapsibleElement.classList.contains('ons-collapsible--simple');
 
     // Elements
     this.collapsible = collapsibleElement;
     this.collapsibleHeader = this.collapsible.querySelector('.ons-js-collapsible-heading');
-    this.content = this.collapsible.querySelector('.ons-js-collapsible-content');
-    this.button = this.collapsible.querySelector('.ons-js-collapsible-button');
-    this.buttonInner = this.collapsible.querySelector('.ons-js-collapsible-button-inner');
 
     // Initialise
     const collapsibleId = collapsibleElement.getAttribute('id');
 
-    if (this.button) {
-      this.button.addEventListener('click', this.toggle.bind(this));
-      this.button.setAttribute('aria-controls', collapsibleId);
-      this.button.classList.remove('ons-u-d-no');
-      this.buttonOpen = this.buttonInner.innerHTML.trim();
-      this.closeButton = this.collapsible.getAttribute('data-btn-close') || this.buttonOpen;
-    }
-
-    this.collapsible.setAttribute('role', 'group');
-    this.collapsibleHeader.setAttribute('role', 'link');
-    this.collapsibleHeader.setAttribute('aria-controls', collapsibleId);
-
-    if (!this.isAccordion || this.isSimpleAccordion) {
-      this.collapsibleHeader.setAttribute('tabindex', 0);
-    }
     if (localStorage.getItem(collapsibleId) || this.open) {
       this.setOpen(true);
-    } else {
-      this.setOpen(false);
+      this.collapsible['setAttribute']('open', '');
     }
 
     this.collapsibleHeader.addEventListener('click', this.toggle.bind(this));
     this.collapsibleHeader.addEventListener('keydown', this.keyboardInteraction.bind(this));
-
-    this.collapsible.classList.add('ons-collapsible--initialised');
   }
 
   toggle(event) {
     event.preventDefault();
-
-    // Storing previous timestamp and checking against the current event's timestamp prevents event propagation
-    // to collapsibleHeader element when the button is in the collapsibleHeader, but does not prevent event propagation to the body for analytics
-    if (this.previousTimestamp !== event.timeStamp) {
-      this.previousTimestamp = event.timeStamp;
-      this.setOpen(!this.isOpen);
-    }
+    this.setOpen(!this.isOpen);
   }
 
   setOpen(open) {
     if (open !== this.isOpen) {
-      const openAttribute = open ? 'set' : 'remove';
-      const cls = open ? 'add' : 'remove';
       const action = open ? 'Open' : 'Close';
+      const openAttribute = open ? 'set' : 'remove';
 
       this.isOpen = open;
       this.collapsible[`${openAttribute}Attribute`]('open', '');
-      this.collapsible.classList[cls]('ons-collapsible--open');
-      this.collapsibleHeader.setAttribute('aria-expanded', open);
-      this.content.setAttribute('aria-hidden', !open);
-
       this.collapsibleHeader.setAttribute('data-ga-action', `${action} panel`);
 
-      if (this.button) {
-        this.button.setAttribute('data-ga-action', `${action} panel`);
-        this.buttonInner.innerHTML = open ? this.closeButton : this.buttonOpen;
-      }
-
       if (this.onOpen && this.onClose) {
         if (open) {
           this.onOpen();
@@ -100,7 +59,6 @@ export default class Collapsible {
         event.preventDefault();
         event.stopPropagation();
 
-        // Show answer content
         this.toggle(event);
         break;
     }

package/components/collapsible/collapsible.spec.js

@@ -7,53 +7,6 @@ const EXAMPLE_COLLAPSIBLE_BASIC = {
 };
 
 describe('script: collapsible', () => {
-  it('begins closed', async () => {
-    await setTestPage('/test', renderComponent('collapsible', EXAMPLE_COLLAPSIBLE_BASIC));
-
-    const openItemCount = await page.$$eval('.ons-collapsible--open', elements => elements.length);
-    expect(openItemCount).toBe(0);
-  });
-
-  it('sets the `role` attribute', async () => {
-    await setTestPage('/test', renderComponent('collapsible', EXAMPLE_COLLAPSIBLE_BASIC));
-
-    const role = await page.$eval('.ons-collapsible', element => element.getAttribute('role'));
-    expect(role).toBe('group');
-  });
-
-  it('adds the correct class', async () => {
-    await setTestPage('/test', renderComponent('collapsible', EXAMPLE_COLLAPSIBLE_BASIC));
-
-    const className = await page.$eval('.ons-collapsible', element => element.classList.contains('ons-collapsible--initialised'));
-    expect(className).toBe(true);
-  });
-
-  it('sets attributes on the heading element', async () => {
-    await setTestPage('/test', renderComponent('collapsible', EXAMPLE_COLLAPSIBLE_BASIC));
-
-    const role = await page.$eval('.ons-js-collapsible-heading', element => element.getAttribute('role'));
-    const ariaControls = await page.$eval('.ons-js-collapsible-heading', element => element.getAttribute('aria-controls'));
-    const tabIndex = await page.$eval('.ons-js-collapsible-heading', element => element.getAttribute('tabindex'));
-
-    expect(role).toBe('link');
-    expect(ariaControls).toBe('collapsible-id');
-    expect(tabIndex).toBe('0');
-  });
-
-  it('sets attributes on the button element', async () => {
-    await setTestPage('/test', renderComponent('collapsible', EXAMPLE_COLLAPSIBLE_BASIC));
-
-    const ariaControls = await page.$eval('.ons-js-collapsible-button', element => element.getAttribute('aria-controls'));
-    expect(ariaControls).toBe('collapsible-id');
-  });
-
-  it('sets the button element to be visible', async () => {
-    await setTestPage('/test', renderComponent('collapsible', EXAMPLE_COLLAPSIBLE_BASIC));
-
-    const openClass = await page.$eval('.ons-collapsible', element => element.classList.contains('ons-collapsible--open'));
-    expect(openClass).toBe(false);
-  });
-
   it('begins open when specified', async () => {
     await setTestPage(
       '/test',
@@ -63,8 +16,8 @@ describe('script: collapsible', () => {
       }),
     );
 
-    const openClass = await page.$eval('.ons-collapsible', element => element.classList.contains('ons-collapsible--open'));
-    expect(openClass).toBe(true);
+    const openAttribute = await page.$eval('.ons-js-collapsible', node => node.open !== null);
+    expect(openAttribute).toBe(true);
   });
 
   describe('when the collapsible heading is clicked to open the collapsible', () => {
@@ -78,59 +31,10 @@ describe('script: collapsible', () => {
       expect(openAttribute).toBe(true);
     });
 
-    it('sets the open class', async () => {
-      const openClass = await page.$eval('.ons-collapsible', element => element.classList.contains('ons-collapsible--open'));
-      expect(openClass).toBe(true);
-    });
-
-    it('sets the `aria` attributes', async () => {
-      const ariaExpanded = await page.$eval('.ons-js-collapsible-heading', element => element.getAttribute('aria-expanded'));
-      const ariaHidden = await page.$eval('.ons-js-collapsible-content', element => element.getAttribute('aria-hidden'));
-
-      expect(ariaExpanded).toBe('true');
-      expect(ariaHidden).toBe('false');
-    });
-
     it('sets the `ga` attributes', async () => {
       const gaHeadingAttribute = await page.$eval('.ons-js-collapsible-heading', element => element.getAttribute('data-ga-action'));
-      const gaButtonAttribute = await page.$eval('.ons-js-collapsible-button', element => element.getAttribute('data-ga-action'));
 
       expect(gaHeadingAttribute).toBe('Open panel');
-      expect(gaButtonAttribute).toBe('Open panel');
-    });
-  });
-
-  describe('when the collapsible button is clicked to close the collapsible', () => {
-    beforeEach(async () => {
-      await setTestPage('/test', renderComponent('collapsible', EXAMPLE_COLLAPSIBLE_BASIC));
-      await page.click('.ons-js-collapsible-heading');
-      await page.click('.ons-js-collapsible-button');
-    });
-
-    it('removes the `open` attribute', async () => {
-      const openAttribute = await page.$eval('.ons-js-collapsible', node => node.open === true);
-      expect(openAttribute).toBe(false);
-    });
-
-    it('removes the open class', async () => {
-      const openClass = await page.$eval('.ons-collapsible', element => element.classList.contains('ons-collapsible--open'));
-      expect(openClass).toBe(false);
-    });
-
-    it('sets the `aria` attributes', async () => {
-      const ariaExpanded = await page.$eval('.ons-js-collapsible-heading', element => element.getAttribute('aria-expanded'));
-      const ariaHidden = await page.$eval('.ons-js-collapsible-content', element => element.getAttribute('aria-hidden'));
-
-      expect(ariaExpanded).toBe('false');
-      expect(ariaHidden).toBe('true');
-    });
-
-    it('sets the `ga` attributes', async () => {
-      const gaHeadingAttribute = await page.$eval('.ons-js-collapsible-heading', element => element.getAttribute('data-ga-action'));
-      const gaButtonAttribute = await page.$eval('.ons-js-collapsible-button', element => element.getAttribute('data-ga-action'));
-
-      expect(gaHeadingAttribute).toBe('Close panel');
-      expect(gaButtonAttribute).toBe('Close panel');
     });
   });
 
@@ -146,8 +50,8 @@ describe('script: collapsible', () => {
       });
 
       it('opens the collapsible content', async () => {
-        const openClass = await page.$eval('.ons-collapsible', element => element.classList.contains('ons-collapsible--open'));
-        expect(openClass).toBe(true);
+        const openAttribute = await page.$eval('.ons-js-collapsible', node => node.open !== null);
+        expect(openAttribute).toBe(true);
       });
     });
 
@@ -157,8 +61,8 @@ describe('script: collapsible', () => {
       });
 
       it('opens the collapsible content', async () => {
-        const openClass = await page.$eval('.ons-collapsible', element => element.classList.contains('ons-collapsible--open'));
-        expect(openClass).toBe(true);
+        const openAttribute = await page.$eval('.ons-js-collapsible', node => node.open !== null);
+        expect(openAttribute).toBe(true);
       });
     });
   });
@@ -196,41 +100,4 @@ describe('script: collapsible', () => {
       });
     });
   });
-
-  describe('when the collapsible is an accordion', () => {
-    beforeEach(async () => {
-      await setTestPage(
-        '/test',
-        renderComponent('collapsible', {
-          ...EXAMPLE_COLLAPSIBLE_BASIC,
-          isAccordion: true,
-        }),
-      );
-    });
-
-    it('does not set `tabindex` on the heading element', async () => {
-      const tabIndex = await page.$eval('.ons-js-collapsible-heading', element => element.getAttribute('tabindex'));
-
-      expect(tabIndex).toBe(null);
-    });
-  });
-
-  describe('when the collapsible is an accordion and the simple variant', () => {
-    beforeEach(async () => {
-      await setTestPage(
-        '/test',
-        renderComponent('collapsible', {
-          ...EXAMPLE_COLLAPSIBLE_BASIC,
-          isAccordion: true,
-          variants: 'simple',
-        }),
-      );
-    });
-
-    it('does set `tabindex` on the heading element', async () => {
-      const tabIndex = await page.$eval('.ons-js-collapsible-heading', element => element.getAttribute('tabindex'));
-
-      expect(tabIndex).toBe('0');
-    });
-  });
 });

package/components/cookies-banner/_cookies-banner.scss

@@ -1,22 +1,30 @@
 .ons-cookies-banner {
   background: $color-banner-bg;
   display: none;
-  padding: 1rem 0;
+  padding: 1rem 0 1.5rem;
 
   &__title {
     color: $color-text;
   }
 
-  &__desc {
+  &__statement {
     color: $color-text;
-    margin-bottom: 1rem;
     word-break: break-word;
+    p {
+      margin: 0 0 0.5rem;
+
+      @include mq(xxs, s) {
+        font-size: 0.9rem;
+        line-height: 1.4;
+      }
+    }
+  }
+
+  &__link {
+    line-height: 2.1rem;
   }
 
   &__btn {
-    @include mq(xxs, 499px) {
-      display: block;
-      width: 100%;
-    }
+    margin: 0 0 0.8rem;
   }
 }