Remove setTimeout not necessary

Harvest-Dev · Dec 11, 2024 · b492d26 · b492d26
1 parent 513a75c
commit b492d26
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/projects/ng-select2-component/src/lib/select2.component.html b/projects/ng-select2-component/src/lib/select2.component.html
@@ -192,6 +192,7 @@
           (scrolled)="onScroll('down')"
           (scrolledUp)="onScroll('up')"
           (keydown)="keyDown($event)"
+
         >
           @if (showSelectAll() && multiple()) {
             <li class="select2-results__option select2-selectall" (click)="selectAll()" tabindex="1" aria-selected>

diff --git a/projects/ng-select2-component/src/lib/select2.component.ts b/projects/ng-select2-component/src/lib/select2.component.ts
@@ -515,8 +515,6 @@ export class Select2 implements ControlValueAccessor, OnInit, DoCheck, AfterView
     }
 
     reset(event?: MouseEvent) {
-        // const test = Select2Utils.getOptionByValue(this._data, this.resetSelectedValue);
-        // debugger;
         const resetSelectedValue = this.resetSelectedValue();
         this.select(
             resetSelectedValue !== undefined
@@ -556,22 +554,16 @@ export class Select2 implements ControlValueAccessor, OnInit, DoCheck, AfterView
             if (this.isSearchboxHidden && !changeEmit && event) {
                 this.keyDown(event);
             } else {
-                setTimeout(() => {
-                    if (this.selectedOption) {
-                        const option = Array.isArray(this.selectedOption)
-                            ? this.selectedOption[0]
-                            : this.selectedOption;
-                        this.updateScrollFromOption(option);
-                    } else if (this.resultsElement) {
-                        this.resultsElement.scrollTop = 0;
-                    }
-                    this._changeDetectorRef.detectChanges();
+                if (this.selectedOption) {
+                    const option = Array.isArray(this.selectedOption) ? this.selectedOption[0] : this.selectedOption;
+                    this.updateScrollFromOption(option);
+                } else if (this.resultsElement) {
+                    this.resultsElement.scrollTop = 0;
+                }
+                this._changeDetectorRef.detectChanges();
 
-                    setTimeout(() => {
-                        this.triggerRect();
-                        this.cdkConnectedOverlay().overlayRef?.updatePosition();
-                    }, 100);
-                });
+                this.triggerRect();
+                this.cdkConnectedOverlay().overlayRef?.updatePosition();
             }
             if (changeEmit) {
                 this.open.emit(this);