@jungherz-de/glasskit-elements 1.11.0 → 1.13.0

package/src/base.js

@@ -84,6 +84,14 @@ export class GlkElement extends HTMLElement {
    */
   static get hostStyles() { return null; }
 
+  /**
+   * Opt in when the component copies light-DOM children into its shadow tree.
+   * A MutationObserver then calls projectLightDom() again whenever those
+   * children change, so a framework that swaps them keeps the rendered element
+   * in step. Without it the copy is made once and silently goes stale.
+   */
+  static get observesLightDom() { return false; }
+
   static get observedAttributes() {
     return [];
   }
@@ -110,15 +118,26 @@ export class GlkElement extends HTMLElement {
       this._shadow.appendChild(this._wrapper);
 
       this.render();
-      this.setupEvents();
+    }
 
-      // Register for theme sync
-      instances.add(this);
+    // Everything below runs on every connect, not just the first. Moving an
+    // element in the DOM disconnects and reconnects it, and disconnectedCallback
+    // tears all of this down — without re-arming it here a moved element would
+    // keep its markup but silently stop reacting.
+    this.setupEvents();
+    instances.add(this);
+
+    if (this.constructor.observesLightDom) {
+      this._lightDomObserver ??= new MutationObserver(records => this.projectLightDom(records));
+      this._lightDomObserver.observe(this, {
+        childList: true, subtree: true, characterData: true
+      });
     }
   }
 
   disconnectedCallback() {
     instances.delete(this);
+    this._lightDomObserver?.disconnect();
     this.teardownEvents();
   }
 
@@ -146,6 +165,20 @@ export class GlkElement extends HTMLElement {
   /** Subclasses override to react to attribute changes. */
   onAttributeChanged(name, oldValue, newValue) {}
 
+  /**
+   * Subclasses that set observesLightDom override this to (re-)copy their
+   * light-DOM children into the shadow tree. Runs on every change to those
+   * children, so it has to be safe to call repeatedly.
+   */
+  projectLightDom() {}
+
+  /**
+   * Escape hatch: re-copy the light-DOM children now. The observer covers the
+   * ordinary cases; this is for the ones it cannot see, so nobody has to reach
+   * into element.shadowRoot.
+   */
+  refresh() { this.projectLightDom(); }
+
   // ── Utility Methods ──
 
   getBoolAttr(name) {

package/src/components/content/glk-badge.js

@@ -5,18 +5,70 @@ const VARIANTS = ['primary', 'success', 'error'];
 class GlkBadge extends GlkElement {
   static get displayInline() { return true; }
   static get observedAttributes() {
-    return ['variant'];
+    return ['variant', 'interactive', 'selected'];
   }
 
   render() {
-    this._badge = this.createElement('span', this._computeClasses());
-    this._badge.appendChild(document.createElement('slot'));
-    this._wrapper.appendChild(this._badge);
+    // One slot for the lifetime of the element — it moves between hosts when
+    // the badge turns into a chip and back, so the light-DOM children never
+    // have to be re-assigned.
+    this._slot = document.createElement('slot');
+    this._mount();
+  }
+
+  // A chip is a real <button>, so the keyboard, the focus ring and the
+  // aria-pressed announcement come for free; a plain badge stays a <span>.
+  // Toggling `interactive` therefore swaps the element, not just a class.
+  _mount() {
+    const interactive = this.getBoolAttr('interactive');
+    const el = this.createElement(interactive ? 'button' : 'span', this._computeClasses());
+    if (interactive) {
+      el.type = 'button';
+      el.setAttribute('aria-pressed', String(this.getBoolAttr('selected')));
+    }
+    el.appendChild(this._slot);
+
+    if (this._badge) {
+      this._badge.removeEventListener('click', this._onClick);
+      this._badge.replaceWith(el);
+    } else {
+      this._wrapper.appendChild(el);
+    }
+    this._badge = el;
+    // setupEvents() has not run yet on the very first mount; it attaches then.
+    if (this._onClick) el.addEventListener('click', this._onClick);
+  }
+
+  setupEvents() {
+    // Forward clicks as glk-click — only for chips, like glk-list-item.
+    this._onClick = () => {
+      if (this.getBoolAttr('interactive')) {
+        this.emit('glk-click');
+      }
+    };
+    this._badge.addEventListener('click', this._onClick);
+  }
+
+  teardownEvents() {
+    this._badge?.removeEventListener('click', this._onClick);
+    // Forget the handler, or a swap while disconnected would re-attach it and
+    // the next connect would add a second one — two glk-click per click.
+    this._onClick = null;
   }
 
   onAttributeChanged(name) {
-    if (name === 'variant' && this._badge) {
-      this._badge.className = this._computeClasses().join(' ');
+    if (!this._badge) return;
+    switch (name) {
+      case 'interactive':
+        this._mount();
+        break;
+      case 'variant':
+      case 'selected':
+        this._badge.className = this._computeClasses().join(' ');
+        if (this._badge.tagName === 'BUTTON') {
+          this._badge.setAttribute('aria-pressed', String(this.getBoolAttr('selected')));
+        }
+        break;
     }
   }
 
@@ -26,11 +78,19 @@ class GlkBadge extends GlkElement {
     if (variant && VARIANTS.includes(variant)) {
       classes.push(`glass-badge--${variant}`);
     }
+    if (this.getBoolAttr('interactive')) classes.push('glass-badge--interactive');
+    if (this.getBoolAttr('selected')) classes.push('glass-badge--selected');
     return classes;
   }
 
   get variant() { return this.getAttribute('variant'); }
   set variant(v) { this.setAttribute('variant', v); }
+
+  get interactive() { return this.getBoolAttr('interactive'); }
+  set interactive(v) { this.setBoolAttr('interactive', v); }
+
+  get selected() { return this.getBoolAttr('selected'); }
+  set selected(v) { this.setBoolAttr('selected', v); }
 }
 
 customElements.define('glk-badge', GlkBadge);

package/src/components/feedback/glk-modal.js

@@ -5,6 +5,8 @@ class GlkModal extends GlkElement {
     return ['open', 'title'];
   }
 
+  static get observesLightDom() { return true; }
+
   render() {
     this._overlay = this.createElement('div', ['glass-modal-overlay'], { part: 'overlay' });
 
@@ -28,7 +30,7 @@ class GlkModal extends GlkElement {
     modal.appendChild(this._footer);
 
     // Defer footer population — children may not be parsed yet
-    requestAnimationFrame(() => this._populateFooter());
+    requestAnimationFrame(() => this.projectLightDom());
 
     this._overlay.appendChild(modal);
     this._wrapper.appendChild(this._overlay);
@@ -38,18 +40,23 @@ class GlkModal extends GlkElement {
     }
   }
 
-  _populateFooter() {
+  projectLightDom() {
+    const buttons = [...this.querySelectorAll('[slot="actions"] button')];
+    const signature = buttons.map(b => b.outerHTML).join('');
+    if (signature === this._footerSignature) return;
+    this._footerSignature = signature;
+
     this._footer.innerHTML = '';
-    const actionsSlot = this.querySelector('[slot="actions"]');
-    if (actionsSlot) {
-      const buttons = actionsSlot.querySelectorAll('button');
-      buttons.forEach(btn => {
-        const clone = btn.cloneNode(true);
-        // Forward click events to the original button
-        clone.addEventListener('click', () => btn.click());
-        this._footer.appendChild(clone);
+    buttons.forEach((btn, i) => {
+      const clone = btn.cloneNode(true);
+      // Look the original up again at click time instead of closing over it: a
+      // framework that re-renders replaces the node, and a captured reference
+      // would then forward the click to a button no longer in the document.
+      clone.addEventListener('click', () => {
+        this.querySelectorAll('[slot="actions"] button')[i]?.click();
       });
-    }
+      this._footer.appendChild(clone);
+    });
   }
 
   setupEvents() {

package/src/components/forms/glk-select.js

@@ -5,6 +5,8 @@ class GlkSelect extends GlkFormElement {
     return ['label', 'disabled', 'name', 'value', 'required'];
   }
 
+  static get observesLightDom() { return true; }
+
   render() {
     const group = this.createElement('div', ['glass-input-group']);
 
@@ -25,12 +27,29 @@ class GlkSelect extends GlkFormElement {
     this._wrapper.appendChild(group);
 
     // Defer option copying — children may not be parsed yet in connectedCallback
-    requestAnimationFrame(() => {
-      this._moveOptions();
-      const value = this.getAttribute('value');
-      if (value) this._select.value = value;
-      this._syncFormValue();
-    });
+    requestAnimationFrame(() => this.projectLightDom());
+  }
+
+  projectLightDom() {
+    // The options are pure data — the clones carry no listeners — so skipping an
+    // unchanged rebuild is safe, and it keeps an open dropdown from snapping shut
+    // on light-DOM churn elsewhere.
+    const signature = [...this.querySelectorAll('option')].map(o => o.outerHTML).join('');
+    if (signature === this._optionSignature) return;
+    this._optionSignature = signature;
+
+    // innerHTML = '' below drops the selection, so remember it first. A
+    // selectedIndex of -1 means "nothing is selected", which is not the same as
+    // an option whose value happens to be the empty string.
+    const previous = this._select.selectedIndex >= 0 ? this._select.value : null;
+
+    this._moveOptions();
+
+    // Keep the live selection when it survived the rebuild; otherwise fall back
+    // to the value attribute. Without this the selection jumps back to the first
+    // entry every time the list is updated.
+    if (!this._applyValue(previous)) this._applyValue(this.getAttribute('value'));
+    this._syncFormValue();
   }
 
   _moveOptions() {
@@ -41,6 +60,18 @@ class GlkSelect extends GlkFormElement {
     });
   }
 
+  /**
+   * Selects `value` if an option carries it, and reports whether it did. The
+   * empty string is a value like any other — "" is a real option in plenty of
+   * forms ("detect automatically", "enter your own below").
+   */
+  _applyValue(value) {
+    if (value === null) return false;
+    if (![...this._select.options].some(o => o.value === value)) return false;
+    this._select.value = value;
+    return true;
+  }
+
   setupEvents() {
     this._onChange = () => {
       this._syncFormValue();
@@ -67,7 +98,7 @@ class GlkSelect extends GlkFormElement {
         this._select.setAttribute('name', this.getAttribute('name') || '');
         break;
       case 'value':
-        this._select.value = this.getAttribute('value') || '';
+        this._applyValue(this.getAttribute('value'));
         this._syncFormValue();
         break;
     }

package/src/components/navigation/glk-tab-item.js

@@ -5,6 +5,8 @@ class GlkTabItem extends GlkElement {
     return ['label', 'active', 'badge'];
   }
 
+  static get observesLightDom() { return true; }
+
   render() {
     this._btn = this.createElement('button', ['glass-tab-bar__item']);
     if (this.getBoolAttr('active')) this._btn.classList.add('is-active');
@@ -30,23 +32,32 @@ class GlkTabItem extends GlkElement {
     this._wrapper.appendChild(this._btn);
 
     // Defer icon cloning — children may not be parsed yet
-    requestAnimationFrame(() => this._cloneIcon());
+    requestAnimationFrame(() => this.projectLightDom());
   }
 
-  _cloneIcon() {
+  projectLightDom() {
     const svg = this.querySelector('svg');
-    if (svg) {
-      const clone = svg.cloneNode(true);
-      // Remove inline attributes that would override GlassKit styles
-      clone.removeAttribute('width');
-      clone.removeAttribute('height');
-      clone.removeAttribute('stroke');
-      clone.removeAttribute('stroke-width');
-      clone.removeAttribute('stroke-linecap');
-      clone.removeAttribute('stroke-linejoin');
-      clone.removeAttribute('fill');
-      this._iconEl.insertBefore(clone, this._iconEl.firstChild);
-    }
+    const signature = svg ? svg.outerHTML : '';
+    if (signature === this._iconSignature) return;
+    this._iconSignature = signature;
+
+    // Drop the previous clone by hand: the icon container also holds the badge,
+    // and inserting without removing would stack a second icon on every update.
+    this._iconClone?.remove();
+    this._iconClone = null;
+    if (!svg) return;
+
+    const clone = svg.cloneNode(true);
+    // Remove inline attributes that would override GlassKit styles
+    clone.removeAttribute('width');
+    clone.removeAttribute('height');
+    clone.removeAttribute('stroke');
+    clone.removeAttribute('stroke-width');
+    clone.removeAttribute('stroke-linecap');
+    clone.removeAttribute('stroke-linejoin');
+    clone.removeAttribute('fill');
+    this._iconEl.insertBefore(clone, this._iconEl.firstChild);
+    this._iconClone = clone;
   }
 
   setupEvents() {