CM6: Further fixes/improvements after testing

[bookstack] / resources / js / components / tabs.js

diff --git a/resources/js/components/tabs.js b/resources/js/components/tabs.js
index 7121d70448c728530231eed0cbd74dc5647326f3..8d22e3e9b57279648ce4c2bc45856ff351e84a79 100644 (file)
--- a/resources/js/components/tabs.js
+++ b/resources/js/components/tabs.js
@@ -1,51 +1,49 @@
+import {Component} from "./component";
+

 /**
  * Tabs
 /**
  * Tabs

- * Works by matching 'tabToggle<Key>' with 'tabContent<Key>' sections.
- * @extends {Component}
+ * Uses accessible attributes to drive its functionality.
+ * On tab wrapping element:
+ * - role=tablist
+ * On tabs (Should be a button):
+ * - id
+ * - role=tab
+ * - aria-selected=true/false
+ * - aria-controls=<id-of-panel-section>
+ * On panels:
+ * - id
+ * - tabindex=0
+ * - role=tabpanel
+ * - aria-labelledby=<id-of-tab-for-panel>
+ * - hidden (If not shown by default).

  */
  */

-import {onSelect} from "../services/dom";
-
-class Tabs {
+export class Tabs extends Component {

 
     setup() {
 
     setup() {

-        this.tabContentsByName = {};
-        this.tabButtonsByName = {};
-        this.allContents = [];
-        this.allButtons = [];
+        this.container = this.$el;
+        this.tabs = Array.from(this.container.querySelectorAll('[role="tab"]'));
+        this.panels = Array.from(this.container.querySelectorAll('[role="tabpanel"]'));

 
 

-        for (const [key, elems] of Object.entries(this.$manyRefs || {})) {
-            if (key.startsWith('toggle')) {
-                const cleanKey = key.replace('toggle', '').toLowerCase();
-                onSelect(elems, e => this.show(cleanKey));
-                this.allButtons.push(...elems);
-                this.tabButtonsByName[cleanKey] = elems;
-            }
-            if (key.startsWith('content')) {
-                const cleanKey = key.replace('content', '').toLowerCase();
-                this.tabContentsByName[cleanKey] = elems;
-                this.allContents.push(...elems);
+        this.container.addEventListener('click', event => {
+            const button = event.target.closest('[role="tab"]');
+            if (button) {
+                this.show(button.getAttribute('aria-controls'));

             }
             }

-        }
+        });

     }
 
     }
 

-    show(key) {
-        this.allContents.forEach(c => {
-            c.classList.add('hidden');
-            c.classList.remove('selected');
-        });
-        this.allButtons.forEach(b => b.classList.remove('selected'));
+    show(sectionId) {
+        for (const panel of this.panels) {
+            panel.toggleAttribute('hidden', panel.id !== sectionId);
+        }

 
 

-        const contents = this.tabContentsByName[key] || [];
-        const buttons = this.tabButtonsByName[key] || [];
-        if (contents.length > 0) {
-            contents.forEach(c => {
-                c.classList.remove('hidden')
-                c.classList.add('selected')
-            });
-            buttons.forEach(b => b.classList.add('selected'));
+        for (const tab of this.tabs) {
+            const tabSection = tab.getAttribute('aria-controls');
+            const selected = tabSection === sectionId;
+            tab.setAttribute('aria-selected', selected ? 'true' : 'false');

         }
         }

-    }

 
 

-}
+        this.$emit('change', {showing: sectionId});
+    }

 
 

-export default Tabs;
\ No newline at end of file
+}
\ No newline at end of file