@descope/web-components-ui 1.0.198 → 1.0.200

package/dist/cjs/index.cjs.js

@@ -2034,7 +2034,11 @@ const getNestedInput = (ele) => {
 };
 
 const proxyInputMixin =
-  ({ proxyProps = [] }) =>
+  ({
+    proxyProps = [],
+    // allows us to set the event that should trigger validation
+    inputEvent = 'input',
+  }) =>
   (superclass) =>
     class ProxyInputMixinClass extends inputValidationMixin(superclass) {
       static get observedAttributes() {
@@ -2083,14 +2087,7 @@ const proxyInputMixin =
         return this.inputElement?.validity || {};
       }
 
-      handleInternalInputErrorMessage() {
-        if (!this.inputElement.checkValidity()) {
-          this.inputElement.setCustomValidity(this.validationMessage);
-        }
-      }
-
       #handleErrorMessage() {
-        this.handleInternalInputErrorMessage();
         this.setAttribute('error-message', this.validationMessage);
       }
 
@@ -2112,22 +2109,26 @@ const proxyInputMixin =
       init() {
         super.init?.();
 
+        // vaadin sets invalid indication on blur
+        // we want invalid indication to appear only when calling reportValidity
+        // this is why we are overriding vaadin's setInvalid behavior
+        // to update only when the element is valid (so invalid indication will only be removed)
+        // and we are adding it in reportValidity
+        // eslint-disable-next-line func-names
+        this.baseElement._setInvalid = function (invalid) {
+          if (!invalid && this._shouldSetInvalid(invalid)) {
+            this.invalid = invalid;
+          }
+        };
+
         // on some cases the base element is not ready so the inputElement is empty
         // we are deferring this section to make sure the base element is ready
         setTimeout(() => {
-          this.inputElement?.addEventListener('input', (e) => {
-            if (!this.inputElement.checkValidity()) {
-              this.inputElement.setCustomValidity('');
-              // after updating the input validity we want to trigger set validity on the wrapping element
-              // so we will get the updated validity
-              this.setCustomValidity('');
-
-              // Vaadin is getting the input event before us,
-              // so in order to make sure they use the updated validity
-              // we calling their fn after updating the input validity
-              this.baseElement.__onInput(e);
-
+          this.baseElement?.addEventListener(inputEvent, () => {
+            if (!this.baseElement.checkValidity()) {
               this.#handleErrorMessage();
+            } else {
+              this.removeAttribute('invalid');
             }
           });
 
@@ -2135,13 +2136,6 @@ const proxyInputMixin =
             this.#dispatchChange();
           });
 
-          this.#inputElement.addEventListener('blur', () => {
-            if (!this.checkValidity()) {
-              this.setAttribute('invalid', 'true');
-              this.#handleErrorMessage();
-            }
-          });
-
           this.addEventListener('invalid', () => {
             if (!this.checkValidity()) {
               this.setAttribute('invalid', 'true');
@@ -2149,8 +2143,6 @@ const proxyInputMixin =
             this.#handleErrorMessage();
           });
 
-          this.handleInternalInputErrorMessage();
-
           // sync properties
           proxyProps.forEach((prop) => {
             propertyObserver(this, this.inputElement, prop);
@@ -4903,12 +4895,7 @@ const ComboBoxMixin = (superclass) =>
     }
 
     handleSelectedItem() {
-      if (this.isDisabled || this.isReadOnly) {
-        this.baseElement.selectedItem = undefined;
-        return;
-      }
-
-      const currentSelected = this.selectedItem?.['data-id'];
+      const currentSelected = this.baseElement.selectedItem?.['data-id'];
 
       this.baseElement.selectedItem = undefined;
 
@@ -4921,11 +4908,6 @@ const ComboBoxMixin = (superclass) =>
       if (!this.value) {
         this.setDefaultValue();
       }
-
-      // otherwise, set first item as selected item
-      if (!this.value) {
-        this.value = this.items?.[0]?.['data-id'];
-      }
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -4948,7 +4930,7 @@ const ComboBoxMixin = (superclass) =>
         value: {
           ...valueDescriptor,
           set(val) {
-            if (!comboBox.items?.length) {
+            if (!comboBox.baseElement.items?.length) {
               return;
             }
 
@@ -4976,9 +4958,13 @@ const ComboBoxMixin = (superclass) =>
         items.forEach((node) => {
           Object.defineProperty(node, 'data-name', {
             value: node.getAttribute('data-name'),
+            configurable: true,
+            writable: true,
           });
           Object.defineProperty(node, 'data-id', {
             value: node.getAttribute('data-id'),
+            configurable: true,
+            writable: true,
           });
         });
 
@@ -4990,6 +4976,9 @@ const ComboBoxMixin = (superclass) =>
         }, 0);
       }
 
+      // use vaadin combobox custom renderer to render options as HTML
+      // and not via default renderer, which renders only the data-name's value
+      // in its own HTML template
       baseElement.renderer = (root, combo, model) => {
         // eslint-disable-next-line no-param-reassign
         root.innerHTML = model.item.outerHTML;
@@ -5011,6 +5000,16 @@ const ComboBoxMixin = (superclass) =>
     init() {
       super.init?.();
 
+      // eslint-disable-next-line func-names
+      this.getValidity = function () {
+        if (!this.value && this.isRequired) {
+          return {
+            valueMissing: true,
+          };
+        }
+        return {};
+      };
+
       this.setComboBoxDescriptor();
 
       this.#overrideOverlaySettings();
@@ -5029,13 +5028,15 @@ const ComboBoxMixin = (superclass) =>
     }
 
     set value(val) {
-      const child = this.baseElement.items.find((item) => item['data-id'] === val);
+      if (val) {
+        const child = this.baseElement.items?.find((item) => item['data-id'] === val);
 
-      if (!child) {
-        return;
+        if (child) {
+          this.baseElement.selectedItem = child;
+        }
+      } else {
+        this.baseElement.selectedItem = undefined;
       }
-
-      this.baseElement.selectedItem = child;
     }
 
     get value() {
@@ -5132,7 +5133,7 @@ const ComboBoxClass = compose(
       attributes: ['size'],
     },
   }),
-  composedProxyInputMixin({ proxyProps: ['selectionStart'] }),
+  composedProxyInputMixin({ proxyProps: ['selectionStart'], inputEvent: 'selected-item-changed' }),
   componentNameValidationMixin,
   ComboBoxMixin
 )(
@@ -7205,9 +7206,10 @@ class RawUploadFile extends BaseInputClass {
   */
 
   getValidity() {
-    if (this.isRequired && !this.value) {
+    if (this.isRequired && !this.input.value) {
       return { valueMissing: true };
     }
+    this.removeAttribute('invalid');
     return {};
   }