@jungherz-de/glasskit-elements 1.11.0 → 1.12.0

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() {