@teipublisher/pb-components 3.5.0 → 3.6.1

package/dist/pb-elements.json

@@ -4723,7 +4723,7 @@
         },
         {
           "name": "key",
-          "description": "The key to which this element is connected.",
+          "description": "One or more keys (space or comma separated) to which this element is connected.",
           "type": "string"
         },
         {
@@ -4825,7 +4825,7 @@
         {
           "name": "key",
           "attribute": "key",
-          "description": "The key to which this element is connected.",
+          "description": "One or more keys (space or comma separated) to which this element is connected.",
           "type": "string"
         },
         {
@@ -5198,11 +5198,11 @@
     {
       "name": "pb-highlight",
       "path": "./src/pb-highlight.js",
-      "description": "Link elements to each other: when a trigger action occurs on one element,\nthe others are highlighted by changing their background color. Which elements\nare linked is determined by the `key` property: elements with the same key\nare linked. The trigger action is configured via the `trigger` property and\nsends a `pb-highlight-on` event. Other elements with the same key react to this event.\n\n`pb-highlight` should be output for relevant elements via ODD processing model.",
+      "description": "Link elements to each other: when a trigger action occurs on one element,\nthe others are highlighted by changing their background color. Which elements\nare linked is determined by the `key` property: elements with the same key\nare linked. Multiple keys (space or comma separated) may be specified; in that\ncase the emitted `pb-highlight-on` event passes an array of ids and receivers\nhighlight when any of their keys matches. The trigger action is configured via the `trigger` property and\nsends a `pb-highlight-on` event. Other elements with the same key react to this event.\n\n`pb-highlight` should be output for relevant elements via ODD processing model.",
       "attributes": [
         {
           "name": "key",
-          "description": "The key to which this element is connected.",
+          "description": "One or more keys (space or comma separated) to which this element is connected.",
           "type": "string"
         },
         {
@@ -5264,7 +5264,7 @@
         {
           "name": "key",
           "attribute": "key",
-          "description": "The key to which this element is connected.",
+          "description": "One or more keys (space or comma separated) to which this element is connected.",
           "type": "string"
         },
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teipublisher/pb-components",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "description": "Collection of webcomponents underlying TEI Publisher",
   "repository": "https://github.com/eeditiones/tei-publisher-components.git",
   "main": "index.html",

package/pb-elements.json

@@ -4723,7 +4723,7 @@
         },
         {
           "name": "key",
-          "description": "The key to which this element is connected.",
+          "description": "One or more keys (space or comma separated) to which this element is connected.",
           "type": "string"
         },
         {
@@ -4825,7 +4825,7 @@
         {
           "name": "key",
           "attribute": "key",
-          "description": "The key to which this element is connected.",
+          "description": "One or more keys (space or comma separated) to which this element is connected.",
           "type": "string"
         },
         {
@@ -5198,11 +5198,11 @@
     {
       "name": "pb-highlight",
       "path": "./src/pb-highlight.js",
-      "description": "Link elements to each other: when a trigger action occurs on one element,\nthe others are highlighted by changing their background color. Which elements\nare linked is determined by the `key` property: elements with the same key\nare linked. The trigger action is configured via the `trigger` property and\nsends a `pb-highlight-on` event. Other elements with the same key react to this event.\n\n`pb-highlight` should be output for relevant elements via ODD processing model.",
+      "description": "Link elements to each other: when a trigger action occurs on one element,\nthe others are highlighted by changing their background color. Which elements\nare linked is determined by the `key` property: elements with the same key\nare linked. Multiple keys (space or comma separated) may be specified; in that\ncase the emitted `pb-highlight-on` event passes an array of ids and receivers\nhighlight when any of their keys matches. The trigger action is configured via the `trigger` property and\nsends a `pb-highlight-on` event. Other elements with the same key react to this event.\n\n`pb-highlight` should be output for relevant elements via ODD processing model.",
       "attributes": [
         {
           "name": "key",
-          "description": "The key to which this element is connected.",
+          "description": "One or more keys (space or comma separated) to which this element is connected.",
           "type": "string"
         },
         {
@@ -5264,7 +5264,7 @@
         {
           "name": "key",
           "attribute": "key",
-          "description": "The key to which this element is connected.",
+          "description": "One or more keys (space or comma separated) to which this element is connected.",
           "type": "string"
         },
         {

package/src/pb-highlight.js

@@ -5,7 +5,9 @@ import { pbMixin } from './pb-mixin';
  * Link elements to each other: when a trigger action occurs on one element,
  * the others are highlighted by changing their background color. Which elements
  * are linked is determined by the `key` property: elements with the same key
- * are linked. The trigger action is configured via the `trigger` property and
+ * are linked. Multiple keys (space or comma separated) may be specified; in that
+ * case the emitted `pb-highlight-on` event passes an array of ids and receivers
+ * highlight when any of their keys matches. The trigger action is configured via the `trigger` property and
  * sends a `pb-highlight-on` event. Other elements with the same key react to this event.
  *
  * `pb-highlight` should be output for relevant elements via ODD processing model.
@@ -16,7 +18,7 @@ import { pbMixin } from './pb-mixin';
  * @fires pb-highlight-off - Fires removal of all highlights that might have existed before
  * @fires pb-highlight-on - Fires highlight event with a key passed to which other pb-highlight elements with the same key will react
  * @fires pb-highlight-off - When received, triggers removal of a highlight that might have been on for this element before
- * @fires pb-highlight-on - When received, switches the highlight on if the same key was received as the current element has
+ * @fires pb-highlight-on - When received, switches the highlight on if any received key matches one of this element's keys
  * @prop {"click" | "mouseenter"} trigger - Defines one or more actions (space separated) which should cause
  * the highlight to show. Default is `mouseenter`. If `click` is among the triggers, matching elements scroll into view.
  * @cssprop --pb-highlight-color - Background color to highlight an element
@@ -26,7 +28,7 @@ export class PbHighlight extends pbMixin(LitElement) {
     return {
       ...super.properties,
       /**
-       * The key to which this element is connected.
+       * One or more keys (space or comma separated) to which this element is connected.
        */
       key: {
         type: String,
@@ -74,6 +76,26 @@ export class PbHighlight extends pbMixin(LitElement) {
     return (this.trigger || 'mouseenter').trim().split(/\s+/);
   }
 
+  _getKeys() {
+    return (this.key || '').trim().split(/[\s,]+/).filter(Boolean);
+  }
+
+  _getEventId() {
+    const keys = this._getKeys();
+    return keys.length > 1 ? keys : keys[0] || null;
+  }
+
+  _matchesKey(eventId) {
+    const keys = this._getKeys();
+    if (!keys.length || eventId == null) {
+      return false;
+    }
+    if (Array.isArray(eventId)) {
+      return keys.some(key => eventId.includes(key));
+    }
+    return keys.includes(eventId);
+  }
+
   _isClickable() {
     return this._getTriggers().includes('click');
   }
@@ -95,11 +117,12 @@ export class PbHighlight extends pbMixin(LitElement) {
     this.emitTo('pb-highlight-off', {
       source: this,
     });
+    const id = this._getEventId();
     if (this.highlightSelf) {
-      this._highlightOn({ detail: { id: this.key } });
+      this._highlightOn({ detail: { id } });
     }
     this.emitTo('pb-highlight-on', {
-      id: this.key,
+      id,
       source: this,
       scroll: this.scroll || this._isClickable(),
     });
@@ -157,7 +180,7 @@ export class PbHighlight extends pbMixin(LitElement) {
   }
 
   _highlightOn(ev) {
-    if (ev.detail.source != this && ev.detail.id === this.key) {
+    if (ev.detail.source != this && this._matchesKey(ev.detail.id)) {
       this._className = 'highlight-on';
       if (ev.detail.scroll && this.disabled == false) {
         this.scrollIntoView({ block: 'center', behavior: 'smooth' });
@@ -180,7 +203,7 @@ export class PbHighlight extends pbMixin(LitElement) {
    * Fired when a trigger action occurs on the element
    *
    * @event pb-highlight-on
-   * @param {String} id key
+   * @param {String|Array<String>} id key or keys
    * @param {Object} source this element
    * @param {Boolean} scroll should target scroll to highlighted position
    */

package/src/pb-view.js

@@ -832,18 +832,31 @@ export class PbView extends themableMixin(pbMixin(LitElement)) {
     this.emitTo('pb-end-update', null);
   }
 
+  /**
+   * Move markup from a server-rendered light-DOM wrapper into a target container.
+   *
+   * Re-parses the HTML string (same as the dynamic `innerHTML = resp.content`
+   * path) so nested custom elements such as `pb-popover` and `pb-highlight`
+   * upgrade when the target is connected to the shadow tree. Moving live nodes
+   * with `appendChild` leaves those elements inert: they may have been parsed
+   * before the component bundle loaded, or their lifecycle already ran in the
+   * wrong document root.
+   *
+   * @param {HTMLElement} container destination element inside the shadow content
+   * @param {HTMLElement} ssrWrapper `[data-pb-ssr]` or `[data-pb-ssr-footnotes]`
+   */
+  _adoptSsrMarkup(container, ssrWrapper) {
+    container.innerHTML = ssrWrapper.innerHTML;
+    ssrWrapper.remove();
+  }
+
   _replaceContent(resp, direction) {
     const fragment = document.createDocumentFragment();
     const elem = document.createElement('div');
     // elem.style.opacity = 0; //hide it - animation has to make sure to blend it in
     fragment.appendChild(elem);
     if (this._ssrContent && (!resp.content || resp.content.length === 0)) {
-      // Adopt the server-rendered content from light DOM (SSR) rather than
-      // re-rendering it: move its children into the shadow content container.
-      while (this._ssrContent.firstChild) {
-        elem.appendChild(this._ssrContent.firstChild);
-      }
-      this._ssrContent.remove();
+      this._adoptSsrMarkup(elem, this._ssrContent);
       this._ssrContent = null;
     } else {
       elem.innerHTML = resp.content;
@@ -910,10 +923,7 @@ export class PbView extends themableMixin(pbMixin(LitElement)) {
     if (this.appendFootnotes) {
       const footnotes = document.createElement('div');
       if (this._ssrFootnotes) {
-        // Adopt the server-rendered footnotes from light DOM (SSR).
-        while (this._ssrFootnotes.firstChild) {
-          footnotes.appendChild(this._ssrFootnotes.firstChild);
-        }
+        this._adoptSsrMarkup(footnotes, this._ssrFootnotes);
       } else if (resp.footnotes) {
         footnotes.innerHTML = resp.footnotes;
       }