@swiftwc/ui 0.0.0-dev.39 → 0.0.0-dev.40

package/generated/components/picker-view.js

@@ -166,7 +166,7 @@ export class PickerView extends FormAssociatedBase {
                 const currentValueLabel = this.querySelector(':scope>label-view:not([slot])') ?? this.appendChild($(`<label-view></label-view>`, '>1'));
                 // reset state
                 currentValueLabel.setAttribute('system-image', 'dots-three'); // overwritten
-                currentValueLabel.setAttribute('title', this.#selection); // overwritten
+                currentValueLabel.setAttribute('title', this.#currentValueLabel); // overwritten
                 // clear all siblings
                 for (const el of this.querySelectorAll(':scope>:not([slot])'))
                     if (currentValueLabel !== el)
@@ -202,7 +202,7 @@ export class PickerView extends FormAssociatedBase {
                         el.remove();
                 const currentValueLabel = menu.querySelector(':scope>label-view[slot=label]') ?? menu.appendChild($(`<label-view slot="label"></label-view>`, '>1'));
                 currentValueLabel.setAttribute('system-image', 'dots-three'); // overwritten
-                currentValueLabel.setAttribute('title', this.#selection); // overwritten
+                currentValueLabel.setAttribute('title', this.#currentValueLabel); // overwritten
                 _a.#reflectButtons([...(this.#slots?.get('list')?.assignedElements() ?? [])], menu);
                 break;
             }
@@ -587,24 +587,30 @@ export class PickerView extends FormAssociatedBase {
             for (const el of this.#spawn.querySelectorAll('list-view button[value]:not([slot])'))
                 el.querySelector('label-view[system-image="check"]')?.style.setProperty('visibility', el.getAttribute('value') === this.#selection ? 'visible' : 'hidden');
     }
-    #reflectCurrentValueLabel() {
-        const selectedTag = this.#slots
+    get #currentTag() {
+        return this.#slots
             ?.get('list')
             ?.assignedElements({ flatten: true })
             .flatMap((el) => [...(el.matches('option') ? [el] : []), ...el.querySelectorAll('option')])
-            .find((el) => this.#selection === extractTagFromOption(el)), cvl = selectedTag ? extractCurrentValueFromOption(selectedTag) : '', final = (this.getAttribute('current-value-label') ?? '').replaceAll('{{selection}}', this.#selection).replaceAll('{{currentValueLabel}}', this.#selection) || cvl || this.#selection;
+            .find((el) => this.#selection === extractTagFromOption(el));
+    }
+    get #currentValueLabel() {
+        const cvl = this.#currentTag ? extractCurrentValueFromOption(this.#currentTag) : '';
+        return (this.getAttribute('current-value-label') ?? '').replaceAll('{{selection}}', this.#selection).replaceAll('{{currentValueLabel}}', this.#selection) || cvl || this.#selection;
+    }
+    #reflectCurrentValueLabel() {
         switch (this.pickerStyle) {
             case 'sheet':
             case 'navigation-link': {
                 const currentValueLabel = this.querySelector(':scope>label-view:not([slot])');
                 currentValueLabel?.setAttribute('system-image', 'dots-three');
-                currentValueLabel?.setAttribute('title', final);
+                currentValueLabel?.setAttribute('title', this.#currentValueLabel);
                 break;
             }
             case 'menu': {
                 const currentValueLabel = this.querySelector(':scope>menu-view:not([slot])>label-view[slot=label]');
                 currentValueLabel?.setAttribute('system-image', 'dots-three');
-                currentValueLabel?.setAttribute('title', final);
+                currentValueLabel?.setAttribute('title', this.#currentValueLabel);
                 break;
             }
             case 'inline':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swiftwc/ui",
-  "version": "0.0.0-dev.39",
+  "version": "0.0.0-dev.40",
   "description": "Elegant SwiftUI-inspired web components for standalone web apps and web extensions.",
   "publishConfig": {
     "access": "public"