@ekzo-dev/bootstrap-addons 5.3.5 → 5.3.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ekzo-dev/bootstrap-addons",
   "description": "Aurelia Bootstrap additional component",
-  "version": "5.3.5",
+  "version": "5.3.6",
   "homepage": "https://github.com/ekzo-dev/aurelia-components/tree/main/packages/bootstrap-addons",
   "repository": {
     "type": "git",

package/src/forms/select/select.ts

@@ -33,27 +33,18 @@ export class BsSelect extends BaseBsSelect implements ICustomElementViewModel {
 
   filter: string = '';
 
-  optionsCount: number = 0;
-
-  deactivating: boolean = false;
-
   emptyOption?: ISelectOption;
 
   popperConfig: Partial<Options> | Tooltip.PopperConfigFunction | null = null;
 
   binding() {
     super.binding();
-    this.deactivating = false;
 
     if (this.multiple && !Array.isArray(this.value)) {
       this.value = [];
     }
   }
 
-  unbinding() {
-    this.deactivating = true;
-  }
-
   attached() {
     this.setPopperConfig();
   }
@@ -100,6 +91,8 @@ export class BsSelect extends BaseBsSelect implements ICustomElementViewModel {
   }
 
   get showClear(): boolean {
+    console.warn(`BsSelect #${this.id}: get showClear`);
+
     return (
       !this.disabled &&
       ((this.emptyOption && this.selectedOption?.value !== this.emptyOption.value) ||
@@ -119,14 +112,18 @@ export class BsSelect extends BaseBsSelect implements ICustomElementViewModel {
     this.control.dispatchEvent(change);
   }
 
-  get selectedOption(): ISelectOption | undefined {
-    const thisRaw = this['__raw__'] as this;
+  get optionsCount(): number {
+    const { options } = this;
+    const isObj = options instanceof Object && options.constructor === Object;
 
-    if (thisRaw.deactivating || this.multiple) return;
+    return isObj ? Object.keys(options).length : (options as []).length;
+  }
 
-    const { value, emptyValue } = this;
-    // take matcher from unproxied object to avoid unnecessary getter call
-    const { matcher } = thisRaw;
+  get selectedOption(): ISelectOption | undefined {
+    console.warn(`BsSelect #${this.id}: get selectedOption`);
+    if (this.multiple) return;
+
+    const { value, emptyValue, matcher } = this;
     let { options } = this;
     let emptyOption: ISelectOption;
 
@@ -134,8 +131,6 @@ export class BsSelect extends BaseBsSelect implements ICustomElementViewModel {
       options = Object.entries(options);
     }
 
-    this.optionsCount = (options as []).length;
-
     const isEntries = Array.isArray(options[0]);
     let option = (options as Array<ISelectOption | readonly [unknown, string]>).find((option) => {
       const optionValue: unknown = isEntries ? option[0] : (option as ISelectOption).value;