@aarhus-university/au-designsystem-delphinus 0.33.0 → 0.33.2

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.33.2 (November 14, 2022)
+
+### Core Delphinus Updates
+Fix of Content-Toggle callbacks.
+
+### Delphinus Projects Updates
+None
+
+## 0.33.1 (November 14, 2022)
+
+### Core Delphinus Updates
+Fix of Content-Toggle naming and return types.
+
+### Delphinus Projects Updates
+None
+
 ## 0.33.0 (November 14, 2022)
 
 ### Core Delphinus Updates

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aarhus-university/au-designsystem-delphinus",
   "sideEffects": false,
-  "version": "0.33.0",
+  "version": "0.33.2",
   "devDependencies": {
     "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-class-properties": "^7.0.0",

package/source/js/components/content-toggle.ts

@@ -2,8 +2,8 @@
 /* eslint-disable import/prefer-default-export */
 const setContentToggle = (
   content: Element,
-  beforeCallback: (() => void | undefined),
-  afterCallback: ((button: HTMLButtonElement) => void) | undefined,
+  beforeCallback: ((content: HTMLElement, button: HTMLButtonElement) => void) | undefined,
+  afterCallback: ((content: HTMLElement, button: HTMLButtonElement) => void) | undefined,
 ): CleanUpPair | null => {
   const setContentClose = (button: HTMLElement, contentClose: HTMLElement, focus: boolean) => {
     if (contentClose) {
@@ -30,7 +30,7 @@ const setContentToggle = (
       // Til toolbar: hvis man klikker på en knap, der ikke er foldet ud
       // Så lukker vi alle åbne content-toggles
       if (typeof beforeCallback === 'function' && ariaExpanded === 'false') {
-        beforeCallback();
+        beforeCallback(content as HTMLElement, button as HTMLButtonElement);
       }
       // Og så går vi i gang med folde-ud-logikken
       button.setAttribute('aria-expanded', ariaExpanded === 'false' ? 'true' : 'false');
@@ -46,7 +46,7 @@ const setContentToggle = (
       }
 
       if (typeof afterCallback === 'function') {
-        afterCallback(button as HTMLButtonElement);
+        afterCallback(content as HTMLElement, button as HTMLButtonElement);
       }
     };
 

package/source/js/components/toolbar.ts

@@ -104,5 +104,5 @@ export {
   setToolbars,
   setToolbarToggle,
   findToolbar,
-  closeAllContentTogglesInToolbar as closeAllContentToggledToolbars,
+  closeAllContentTogglesInToolbar,
 };

package/source/js/production/app.ts

@@ -9,7 +9,7 @@ import { setMetaThemeColor } from '../components/helpers';
 import { setResponsiveTable } from '../components/table';
 import { setTabbedContent, isBelowViewportLimit, destroyTabs } from '../components/tabs';
 import { setContentToggle } from '../components/content-toggle';
-import { closeAllContentToggledToolbars, findToolbar } from '../components/toolbar';
+import { closeAllContentTogglesInToolbar, findToolbar } from '../components/toolbar';
 
 let windowInnerWidth = 0;
 
@@ -51,12 +51,12 @@ ready(() => {
 
   const toggles = document.querySelectorAll('.content-toggle__content');
   toggles.forEach((toggle) => {
-    const toolbar = findToolbar(toggle as HTMLElement);
     setContentToggle(
       toggle,
-      () => closeAllContentToggledToolbars(toolbar),
-      (button: HTMLButtonElement) => {
+      (content: HTMLElement) => closeAllContentTogglesInToolbar(findToolbar(content)),
+      (content: HTMLElement, button: HTMLButtonElement) => {
         const ariaExpanded = button.getAttribute('aria-expanded');
+        const toolbar = findToolbar(content);
         if (ariaExpanded === 'true') {
           toolbar?.classList.add('toolbar--has-popout');
         } else {