Merge branch 'cmq/feat-#INFR-8645' of https://github.com/atinc/ngx-te…

…thys into cmq/feat-#INFR-8645
atinc · Jul 13, 2023 · 0006186 · 0006186
2 parents 0ffbab8 + adc34ee
commit 0006186
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/color-picker/color-picker.component.ts b/src/color-picker/color-picker.component.ts
@@ -65,12 +65,16 @@ export class ThyColorPickerDirective extends ThyOverlayDirectiveBase implements
     /**
      * panel 展开后触发
      */
-    @Output() thyPanelOpen: EventEmitter<void> = new EventEmitter<void>();
+    @Output() thyPanelOpen: EventEmitter<ThyPopoverRef<ThyColorPickerPanelComponent>> = new EventEmitter<
+        ThyPopoverRef<ThyColorPickerPanelComponent>
+    >();
 
     /**
      * panel 关闭后触发
      */
-    @Output() thyPanelClose: EventEmitter<void> = new EventEmitter<void>();
+    @Output() thyPanelClose: EventEmitter<ThyPopoverRef<ThyColorPickerPanelComponent>> = new EventEmitter<
+        ThyPopoverRef<ThyColorPickerPanelComponent>
+    >();
 
     /**
      * 弹出悬浮层的触发方式
@@ -180,10 +184,10 @@ export class ThyColorPickerDirective extends ThyOverlayDirectiveBase implements
         });
         if (this.popoverRef) {
             this.popoverRef.afterOpened().subscribe(() => {
-                this.thyPanelOpen.emit();
+                this.thyPanelOpen.emit(this.popoverRef);
             });
             this.popoverRef.afterClosed().subscribe(() => {
-                this.thyPanelClose.emit();
+                this.thyPanelClose.emit(this.popoverRef);
             });
         }
         if (this.popoverRef && !this.thyHasBackdrop) {

diff --git a/src/color-picker/test/color-picker.spec.ts b/src/color-picker/test/color-picker.spec.ts
@@ -31,8 +31,8 @@ import { ThyColorPickerModule } from '../module';
             [thyShowDelay]="showDelay"
             [thyHideDelay]="hideDelay"
             (ngModelChange)="change($event)"
-            (thyPanelOpen)="panelOpen()"
-            (thyPanelClose)="panelClose()"
+            (thyPanelOpen)="panelOpen($event)"
+            (thyPanelClose)="panelClose($event)"
             [thyPresetColors]="presetColors"></div>
         <thy-color-picker-panel [colorChange]="defaultPanelColorChange" [color]="defaultPanelColor"></thy-color-picker-panel>
     `,
@@ -355,6 +355,7 @@ describe(`color-picker`, () => {
             openDefaultPanel();
             fixture.detectChanges();
             expect(panelOpen).toHaveBeenCalled();
+            expect(panelOpen).toHaveBeenCalledWith((colorPickerDirective as any).popoverRef);
         }));
 
         it('should dispatch thyPanelClose', fakeAsync(() => {
@@ -369,6 +370,7 @@ describe(`color-picker`, () => {
             tick();
             flush();
             expect(panelClose).toHaveBeenCalled();
+            expect(panelClose).toHaveBeenCalledWith((colorPickerDirective as any).popoverRef);
         }));
 
         it('should get recentColors from localStorage', fakeAsync(() => {