@citolab/qti-components 7.26.1 → 7.27.1

package/custom-elements.json

@@ -644,38 +644,6 @@
           "description": "",
           "name": "QtiChoiceInteraction",
           "members": [
-            {
-              "kind": "method",
-              "name": "_addLabels",
-              "privacy": "private",
-              "inheritedFrom": {
-                "name": "VocabularyMixin",
-                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
-              }
-            },
-            {
-              "kind": "field",
-              "name": "_allLabels",
-              "type": {
-                "text": "array"
-              },
-              "privacy": "private",
-              "default": "['qti-labels-decimal', 'qti-labels-lower-alpha', 'qti-labels-upper-alpha']",
-              "inheritedFrom": {
-                "name": "VocabularyMixin",
-                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
-              }
-            },
-            {
-              "kind": "field",
-              "name": "_allLabelSuffixes",
-              "privacy": "private",
-              "default": "['qti-labels-suffix-period', 'qti-labels-suffix-parenthesis']",
-              "inheritedFrom": {
-                "name": "VocabularyMixin",
-                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
-              }
-            },
             {
               "kind": "field",
               "name": "_choiceElements",
@@ -706,19 +674,6 @@
                 "module": "packages/interactions/core/src/mixins/choices/choices.mixin.ts"
               }
             },
-            {
-              "kind": "field",
-              "name": "_classes",
-              "type": {
-                "text": "string[]"
-              },
-              "privacy": "private",
-              "default": "[]",
-              "inheritedFrom": {
-                "name": "VocabularyMixin",
-                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
-              }
-            },
             {
               "kind": "field",
               "name": "_configContext",
@@ -787,23 +742,6 @@
                 "module": "packages/interactions/core/src/mixins/choices/choices.mixin.ts"
               }
             },
-            {
-              "kind": "method",
-              "name": "_getLabel",
-              "privacy": "private",
-              "parameters": [
-                {
-                  "name": "index",
-                  "type": {
-                    "text": "number"
-                  }
-                }
-              ],
-              "inheritedFrom": {
-                "name": "VocabularyMixin",
-                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
-              }
-            },
             {
               "kind": "method",
               "name": "_handleChoiceSelection",
@@ -1029,11 +967,206 @@
                 "module": "packages/interactions/core/src/mixins/choices/choices.mixin.ts"
               }
             },
+            {
+              "kind": "field",
+              "name": "#allLabels",
+              "privacy": "private",
+              "type": {
+                "text": "LabelType[]"
+              },
+              "default": "[ 'qti-labels-none', 'qti-labels-decimal', 'qti-labels-lower-alpha', 'qti-labels-upper-alpha', ]",
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "#allLabelSuffixes",
+              "privacy": "private",
+              "type": {
+                "text": "LabelSuffixType[]"
+              },
+              "default": "[ 'qti-labels-suffix-none', 'qti-labels-suffix-period', 'qti-labels-suffix-parenthesis', ]",
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
+            {
+              "kind": "field",
+              "name": "#classes",
+              "privacy": "private",
+              "type": {
+                "text": "string[]"
+              },
+              "default": "[]",
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "#getActiveLabelSuffixType",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "LabelSuffixType | null"
+                }
+              },
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "#getActiveLabelType",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "LabelType | null"
+                }
+              },
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "#getLabel",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "string"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "index",
+                  "type": {
+                    "text": "number"
+                  }
+                },
+                {
+                  "name": "labelType",
+                  "type": {
+                    "text": "LabelType | null"
+                  }
+                },
+                {
+                  "name": "labelSuffixType",
+                  "type": {
+                    "text": "LabelSuffixType | null"
+                  }
+                }
+              ],
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "#getOrderedChoices",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "QtiSimpleChoice[]"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "choiceElements",
+                  "type": {
+                    "text": "QtiSimpleChoice[]"
+                  }
+                }
+              ],
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
             {
               "kind": "method",
               "name": "#handleSlotChange",
               "privacy": "private"
             },
+            {
+              "kind": "field",
+              "name": "#mutationObserver",
+              "privacy": "private",
+              "type": {
+                "text": "MutationObserver | null"
+              },
+              "default": "null",
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "#syncLabels",
+              "privacy": "private",
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "#toAlphabetic",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "string"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "index",
+                  "type": {
+                    "text": "number"
+                  }
+                },
+                {
+                  "name": "casing",
+                  "type": {
+                    "text": "'lower' | 'upper'"
+                  }
+                }
+              ],
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
+            {
+              "kind": "method",
+              "name": "#tokenizeClasses",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "string[]"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "value",
+                  "type": {
+                    "text": "string | null | undefined"
+                  }
+                }
+              ],
+              "inheritedFrom": {
+                "name": "VocabularyMixin",
+                "module": "packages/interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts"
+              }
+            },
             {
               "kind": "field",
               "name": "class",
@@ -9489,57 +9622,157 @@
           "description": "",
           "name": "VocabularyMixin",
           "members": [
-            {
-              "kind": "method",
-              "name": "_addLabels",
-              "privacy": "private"
-            },
             {
               "kind": "field",
-              "name": "_allLabels",
+              "name": "#allLabels",
+              "privacy": "private",
               "type": {
-                "text": "array"
+                "text": "LabelType[]"
               },
-              "privacy": "private",
-              "default": "['qti-labels-decimal', 'qti-labels-lower-alpha', 'qti-labels-upper-alpha']"
+              "default": "[ 'qti-labels-none', 'qti-labels-decimal', 'qti-labels-lower-alpha', 'qti-labels-upper-alpha', ]"
             },
             {
               "kind": "field",
-              "name": "_allLabelSuffixes",
+              "name": "#allLabelSuffixes",
               "privacy": "private",
-              "default": "['qti-labels-suffix-period', 'qti-labels-suffix-parenthesis']"
+              "type": {
+                "text": "LabelSuffixType[]"
+              },
+              "default": "[ 'qti-labels-suffix-none', 'qti-labels-suffix-period', 'qti-labels-suffix-parenthesis', ]"
             },
             {
               "kind": "field",
-              "name": "_classes",
+              "name": "#classes",
+              "privacy": "private",
               "type": {
                 "text": "string[]"
               },
-              "privacy": "private",
               "default": "[]"
             },
             {
               "kind": "method",
-              "name": "_getLabel",
+              "name": "#getActiveLabelSuffixType",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "LabelSuffixType | null"
+                }
+              }
+            },
+            {
+              "kind": "method",
+              "name": "#getActiveLabelType",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "LabelType | null"
+                }
+              }
+            },
+            {
+              "kind": "method",
+              "name": "#getLabel",
               "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "string"
+                }
+              },
               "parameters": [
                 {
                   "name": "index",
                   "type": {
                     "text": "number"
                   }
+                },
+                {
+                  "name": "labelType",
+                  "type": {
+                    "text": "LabelType | null"
+                  }
+                },
+                {
+                  "name": "labelSuffixType",
+                  "type": {
+                    "text": "LabelSuffixType | null"
+                  }
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "#getOrderedChoices",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "QtiSimpleChoice[]"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "choiceElements",
+                  "type": {
+                    "text": "QtiSimpleChoice[]"
+                  }
                 }
               ]
             },
             {
               "kind": "field",
-              "name": "_mutationObserver",
+              "name": "#mutationObserver",
+              "privacy": "private",
               "type": {
                 "text": "MutationObserver | null"
               },
-              "privacy": "private",
               "default": "null"
             },
+            {
+              "kind": "method",
+              "name": "#syncLabels",
+              "privacy": "private"
+            },
+            {
+              "kind": "method",
+              "name": "#toAlphabetic",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "string"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "index",
+                  "type": {
+                    "text": "number"
+                  }
+                },
+                {
+                  "name": "casing",
+                  "type": {
+                    "text": "'lower' | 'upper'"
+                  }
+                }
+              ]
+            },
+            {
+              "kind": "method",
+              "name": "#tokenizeClasses",
+              "privacy": "private",
+              "return": {
+                "type": {
+                  "text": "string[]"
+                }
+              },
+              "parameters": [
+                {
+                  "name": "value",
+                  "type": {
+                    "text": "string | null | undefined"
+                  }
+                }
+              ]
+            },
             {
               "kind": "field",
               "name": "class",

package/dist/{chunk-XZY2TIZJ.js → chunk-KY3II5OX.js}

@@ -3749,83 +3749,127 @@ var ChoicesMixin = (superClass, selector) => {
 // ../interactions/core/src/mixins/vocabulary/vocabulary-mixin.ts
 var VocabularyMixin = (superClass, _selector) => {
   class VocabularyElement extends superClass {
-    constructor() {
-      super(...arguments);
-      this._classes = [];
-      this._allLabels = ["qti-labels-decimal", "qti-labels-lower-alpha", "qti-labels-upper-alpha"];
-      this._allLabelSuffixes = ["qti-labels-suffix-period", "qti-labels-suffix-parenthesis"];
-      this._mutationObserver = null;
-    }
+    #classes = [];
+    #allLabels = [
+      "qti-labels-none",
+      "qti-labels-decimal",
+      "qti-labels-lower-alpha",
+      "qti-labels-upper-alpha"
+    ];
+    #allLabelSuffixes = [
+      "qti-labels-suffix-none",
+      "qti-labels-suffix-period",
+      "qti-labels-suffix-parenthesis"
+    ];
+    #mutationObserver = null;
     set class(value) {
-      if (!value) {
-        return;
-      }
-      this._classes = value.split(" ");
-      this._addLabels();
+      this.#classes = this.#tokenizeClasses(value);
+      this.#syncLabels();
     }
     get class() {
-      return this._classes?.join(" ") || "";
+      return this.#classes.join(" ");
+    }
+    attributeChangedCallback(name, oldValue, newValue) {
+      super.attributeChangedCallback(name, oldValue, newValue);
+      if (name === "class" && oldValue !== newValue) {
+        this.class = newValue ?? "";
+      }
     }
     updated(_changedProperties) {
       super.updated(_changedProperties);
-      this._addLabels();
+      this.#syncLabels();
     }
     connectedCallback() {
       super.connectedCallback();
-      this._mutationObserver = new MutationObserver(() => this._addLabels());
-      this._mutationObserver.observe(this, { childList: true, subtree: true });
+      this.class = this.getAttribute("class") ?? "";
+      this.#mutationObserver = new MutationObserver((mutations) => {
+        if (mutations.some(
+          (mutation) => mutation.type === "childList" || mutation.type === "attributes" && mutation.attributeName === "style"
+        )) {
+          this.#syncLabels();
+        }
+      });
+      this.#mutationObserver.observe(this, {
+        childList: true,
+        subtree: true,
+        attributes: true,
+        attributeFilter: ["style"]
+      });
     }
     disconnectedCallback() {
       super.disconnectedCallback();
-      this._mutationObserver?.disconnect();
-      this._mutationObserver = null;
+      this.#mutationObserver?.disconnect();
+      this.#mutationObserver = null;
+    }
+    #tokenizeClasses(value) {
+      if (!value) return [];
+      return value.split(/\s+/).map((token) => token.trim()).filter(Boolean).filter((token, index, tokens) => tokens.indexOf(token) === index);
+    }
+    #syncLabels() {
+      const choiceElements = Array.from(this.querySelectorAll("qti-simple-choice")).map((c3) => c3);
+      const choices = this.#getOrderedChoices(choiceElements);
+      const labelType = this.#getActiveLabelType();
+      const labelSuffixType = this.#getActiveLabelSuffixType();
+      choices.forEach((choice, index) => {
+        choice.marker = this.#getLabel(index + 1, labelType, labelSuffixType);
+      });
     }
-    _addLabels() {
-      const classContainsLabel = this._classes.some(
-        (cls) => this._allLabels.includes(cls) || this._allLabelSuffixes.includes(cls)
-      );
-      const isNumber = (value) => {
-        return !isNaN(+value);
-      };
-      if (classContainsLabel) {
-        const choiceElements = Array.from(this.querySelectorAll("qti-simple-choice")).map((c3) => c3);
-        const choices = choiceElements.map((choice, index) => {
-          return { el: choice, order: isNumber(choice.style.order) ? +choice.style.order : index + 1 };
-        }).sort((a, b) => a.order - b.order).map((choice) => choice.el);
-        for (let i5 = 0; i5 < choices.length; i5++) {
-          choices[i5].marker = this._getLabel(i5 + 1);
-        }
-      }
+    #getOrderedChoices(choiceElements) {
+      return choiceElements.map((choice, index) => {
+        const order = Number(choice.style.order);
+        return { el: choice, order: Number.isFinite(order) ? order : index + 1, index };
+      }).sort((a, b) => a.order - b.order || a.index - b.index).map((choice) => choice.el);
+    }
+    #getActiveLabelType() {
+      return this.#classes.filter((c3) => this.#allLabels.includes(c3)).pop() ?? null;
     }
-    _getLabel(index) {
-      let lastLabel = this._classes.filter((c3) => this._allLabels.includes(c3)).pop();
-      const lastLabelSuffix = this._classes.filter((c3) => this._allLabelSuffixes.includes(c3)).pop();
-      if (!lastLabel && lastLabelSuffix) {
-        lastLabel = "qti-labels-upper-alpha";
+    #getActiveLabelSuffixType() {
+      return this.#classes.filter((c3) => this.#allLabelSuffixes.includes(c3)).pop() ?? null;
+    }
+    #getLabel(index, labelType, labelSuffixType) {
+      let effectiveLabelType = labelType;
+      if (!effectiveLabelType && labelSuffixType && labelSuffixType !== "qti-labels-suffix-none") {
+        effectiveLabelType = "qti-labels-upper-alpha";
+      }
+      if (!effectiveLabelType || effectiveLabelType === "qti-labels-none") {
+        return "";
       }
       let label = "";
-      switch (lastLabel) {
+      switch (effectiveLabelType) {
         case "qti-labels-decimal":
           label = `${index}`;
           break;
         case "qti-labels-lower-alpha":
-          label = `${String.fromCharCode(97 + index - 1)}`;
+          label = this.#toAlphabetic(index, "lower");
           break;
         case "qti-labels-upper-alpha":
-          label = `${String.fromCharCode(65 + index - 1)}`;
+          label = this.#toAlphabetic(index, "upper");
           break;
       }
-      if (lastLabelSuffix === "qti-labels-suffix-period") {
-        label += ".";
-      } else if (lastLabelSuffix === "qti-labels-suffix-parenthesis") {
-        label += `)`;
+      if (labelSuffixType === "qti-labels-suffix-period") {
+        return `${label}.`;
+      }
+      if (labelSuffixType === "qti-labels-suffix-parenthesis") {
+        return `${label})`;
+      }
+      return label;
+    }
+    #toAlphabetic(index, casing) {
+      let value = index;
+      let label = "";
+      const charCodeBase = casing === "lower" ? 97 : 65;
+      while (value > 0) {
+        value -= 1;
+        label = String.fromCharCode(charCodeBase + value % 26) + label;
+        value = Math.floor(value / 26);
       }
       return label;
     }
   }
   __decorateClass([
     n({
-      type: String
+      type: String,
+      attribute: "class"
     })
   ], VocabularyElement.prototype, "class", 1);
   return VocabularyElement;
@@ -9674,4 +9718,4 @@ lit-html/node/directives/ref.js:
    * SPDX-License-Identifier: BSD-3-Clause
    *)
 */
-//# sourceMappingURL=chunk-XZY2TIZJ.js.map
+//# sourceMappingURL=chunk-KY3II5OX.js.map