@optionfactory/ful 4.0.15 → 4.0.16

package/dist/ful.mjs

@@ -1461,15 +1461,15 @@ class Input extends ParsedElement {
     _fragment(type, slots) {
         return this.template().withOverlay({ type, slots }).render();
     }
-    render({ slots, observed, disabled, skipValueSetup }) {
+    render({ slots, observed, disabled, skipObservedSetup }) {
         const type = this._type();
         const fragment = this._fragment(type, slots);
         this._input = fragment.querySelector("input,textarea");
 
         Attributes.forward('input-', this, this._input);
-        this.disabled = disabled;
-        this.readonly = observed.readonly;
-        if(!skipValueSetup){
+        if (!skipObservedSetup) {
+            this.disabled = disabled;
+            this.readonly = observed.readonly;
             this.value = observed.value;
         }
 
@@ -2992,7 +2992,8 @@ class Table extends ParsedElement {
             }, this.#latestRequest.sortRequest, this.#latestRequest.filterRequest);
         });
         this.addEventListener('sort-requested', async (/** @type any */e) => {
-            await this.load(this.#latestRequest.pageRequest, e.detail.value, this.#latestRequest.filterRequest);
+            const sortRequest = e.detail.value.order ? e.detail.value : null;
+            await this.load(this.#latestRequest.pageRequest, sortRequest, this.#latestRequest.filterRequest);
             this.#sorters.forEach(s => s.order = null);
             e.target.order = e.detail.value.order;
         });
@@ -3077,10 +3078,13 @@ class InstantFilter extends Input {
     #value1;
     #value2;
     render(conf) {
-        super.render({...conf, skipValueSetup: true});
+        super.render({...conf, skipObservedSetup: true});
         this.#operator = this.querySelector('[data-ref=operator]');
         this.#value1 = this.querySelector('[data-ref=value1]');
         this.#value2 = this.querySelector('[data-ref=value2]');
+
+        this.disabled = conf.disabled;
+        this.readonly = conf.observed.readonly;
         this.value = conf.observed.value;
 
         this.addEventListener('click', (evt) => {
@@ -3112,6 +3116,19 @@ class InstantFilter extends Input {
         this.#value1.value = values[0] ? Instant.isoToLocal(values[0]) : values[0];
         this.#value2.value = values[1] ? Instant.isoToLocal(values[1]) : values[1];
     }
+    set readonly(v) {
+        this.#value2.readOnly = v;
+        super.readonly = v;
+    }    
+    set disabled(d) {
+        Attributes.toggle(this.#value2, 'disabled', d);
+        super.disabled = d;
+    }
+    formResetCallback() {
+        const v = this.getAttribute("value");
+        this.value = v === null ? null : JSON.parse(v);
+    }
+
 }
 
 class LocalDateFilter extends Input {
@@ -3145,13 +3162,16 @@ class LocalDateFilter extends Input {
     #value1;
     #value2;
     render(conf) {
-        super.render({...conf, skipValueSetup: true});
+        super.render({...conf, skipObservedSetup: true});
 
         this.#operator = this.querySelector('[data-ref=operator]');
         this.#value1 = this.querySelector('[data-ref=value1]');
         this.#value2 = this.querySelector('[data-ref=value2]');
+
+        this.disabled = conf.disabled;
+        this.readonly = conf.observed.readonly;
         this.value = conf.observed.value;
-        
+
         this.addEventListener('click', (evt) => {
             const target = /** @type HTMLElement */(evt.target);
             if (!target.matches('ul > li > a')) {
@@ -3180,6 +3200,18 @@ class LocalDateFilter extends Input {
         this.#value1.value = values[0];
         this.#value2.value = values[1];
     }
+    set readonly(v) {
+        this.#value2.readOnly = v;
+        super.readonly = v;
+    }
+    set disabled(d) {
+        Attributes.toggle(this.#value2, 'disabled', d);
+        super.disabled = d;
+    }
+    formResetCallback() {
+        const v = this.getAttribute("value");
+        this.value = v === null ? null : JSON.parse(v);
+    }
 }
 
 class TextFilter extends Input {
@@ -3208,10 +3240,13 @@ class TextFilter extends Input {
     #operator;
     #value;
     render(conf) {
-        super.render({...conf, skipValueSetup: true});
+        super.render({...conf, skipObservedSetup: true});
 
         this.#operator = this.querySelector('[data-ref=operator]');
         this.#value = this.querySelector('[data-ref=value]');
+
+        this.disabled = conf.disabled;
+        this.readonly = conf.observed.readonly;
         this.value = conf.observed.value;
 
         this.addEventListener('click', (evt) => {
@@ -3225,12 +3260,10 @@ class TextFilter extends Input {
             btn.innerHTML = target.innerHTML;
         });
     }
-
     get value() {
         const operator = this.#operator.getAttribute('value');
         return this.#value.value === '' ? undefined : [operator, 'IGNORE_CASE', this.#value.value];
     }
-
     set value(v) {
         if (v === null || v === undefined) {
             this.#value.value = '';
@@ -3240,6 +3273,10 @@ class TextFilter extends Input {
         this.#operator.setAttribute('value', operator);
         this.#value.value = value;
     }
+    formResetCallback() {
+        const v = this.getAttribute("value");
+        this.value = v === null ? null : JSON.parse(v);
+    }
 }
 
 class LocalizationModule {