This repository has been archived by the owner on Dec 8, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 65
Fixed dropdown positioning lag; bad unit test #1655
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -325,7 +325,7 @@ describe('SkyPopoverComponent', () => { | |
})); | ||
|
||
it('should expose a method to return the placement to the preferred placement', fakeAsync(() => { | ||
spyOn(mockAdapterService, 'getPopoverPosition').and.returnValue({ | ||
const spy = spyOn(mockAdapterService, 'getPopoverPosition').and.returnValue({ | ||
top: 0, | ||
left: 0, | ||
arrowLeft: 0, | ||
|
@@ -342,8 +342,7 @@ describe('SkyPopoverComponent', () => { | |
expect(component.placement).toEqual('right'); | ||
|
||
component.reposition(); | ||
expect(component.placement).toEqual('above'); | ||
tick(); | ||
expect(spy.calls.argsFor(1)[1]).toEqual('above'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a better way to write this test: checking which value is provided to |
||
})); | ||
|
||
it('should hide the popover if its top or bottom boundaries leave its scrollable parent', fakeAsync(() => { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -160,13 +160,11 @@ export class SkyPopoverComponent implements OnInit, OnDestroy { | |
this.placement = this.preferredPlacement; | ||
this.changeDetector.markForCheck(); | ||
|
||
this.windowRef.getWindow().setTimeout(() => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is the line that was causing the lag; it's running a |
||
if (this.adapterService.isPopoverLargerThanParent(this.popoverContainer)) { | ||
this.placement = 'fullscreen'; | ||
} | ||
if (this.adapterService.isPopoverLargerThanParent(this.popoverContainer)) { | ||
this.placement = 'fullscreen'; | ||
} | ||
|
||
this.positionPopover(); | ||
}); | ||
this.positionPopover(); | ||
} | ||
|
||
public close() { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -129,9 +129,10 @@ describe('Timepicker', () => { | |
const closeButton = fixture.nativeElement.querySelector('.sky-timepicker-footer button'); | ||
closeButton.click(); | ||
tick(); | ||
fixture.detectChanges(); | ||
tick(); | ||
const dropdown = fixture.nativeElement.querySelector('.sky-popover-container') as HTMLElement; | ||
expect(dropdown.classList.contains('sky-popover-hidden')).toEqual(false); | ||
const hiddenPopover = fixture.nativeElement.querySelector('.sky-popover-hidden') as HTMLElement; | ||
expect(hiddenPopover).not.toBeNull(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I found this bad test during my work on this bugfix. We were supposed to be checking if the popover had closed! |
||
})); | ||
|
||
it('should handle input change with a string with the expected timeFormat', fakeAsync(() => { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is inconsequential;
compileComponents()
is not needed when running in AoT mode.