-
Notifications
You must be signed in to change notification settings - Fork 77
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(alert): pause auto-close alert when link focused #9503
Merged
Merged
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
cd4c16a
fix(alert): pause auto-close alert when link focused
josercarcamo 8c19242
Renamed data member and method; set autoCloseTimeoutId to null; rewro…
josercarcamo 70b651c
Modified test
josercarcamo 4e25335
Modified test
josercarcamo 39a6dd5
Modified test
josercarcamo a68baca
Added constant for class name; made close button stop auto close; mod…
josercarcamo 3619ef4
Adding focused
josercarcamo cfa5312
Merge branch 'main' into josercarcamo/5960-timer-pause-when-focus
josercarcamo 5cd9d9c
Changed name of test case
josercarcamo 170dd62
Merge branch 'josercarcamo/5960-timer-pause-when-focus' of github.com…
josercarcamo fa89422
Merge branch 'main' into josercarcamo/5960-timer-pause-when-focus
josercarcamo 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 |
---|---|---|
|
@@ -232,7 +232,13 @@ export class Alert implements OpenCloseComponent, LoadableComponent, T9nComponen | |
ref={this.setTransitionEl} | ||
> | ||
{effectiveIcon && this.renderIcon(effectiveIcon)} | ||
<div class={CSS.textContainer}> | ||
<div | ||
class={CSS.textContainer} | ||
onFocusin={this.autoClose && this.autoCloseTimeoutId ? this.handleKeyBoardFocus : null} | ||
driskull marked this conversation as resolved.
Show resolved
Hide resolved
|
||
onFocusout={ | ||
this.autoClose && this.autoCloseTimeoutId ? this.handleKeyBoardUnfocus : null | ||
} | ||
> | ||
<slot name={SLOTS.title} /> | ||
<slot name={SLOTS.message} /> | ||
<slot name={SLOTS.link} /> | ||
|
@@ -246,6 +252,20 @@ export class Alert implements OpenCloseComponent, LoadableComponent, T9nComponen | |
); | ||
} | ||
|
||
private handleKeyBoardFocus = (): void => { | ||
this.transitionEl.classList.add("focused"); | ||
this.keyBoardFocus = true; | ||
driskull marked this conversation as resolved.
Show resolved
Hide resolved
|
||
this.handleFocus(); | ||
}; | ||
|
||
private handleKeyBoardUnfocus = (): void => { | ||
this.transitionEl.classList.remove("focused"); | ||
this.keyBoardFocus = false; | ||
if (!this.mouseFocus) { | ||
this.handleUnfocus(); | ||
} | ||
}; | ||
|
||
private renderCloseButton(): VNode { | ||
return ( | ||
<button | ||
|
@@ -447,6 +467,10 @@ export class Alert implements OpenCloseComponent, LoadableComponent, T9nComponen | |
|
||
transitionEl: HTMLDivElement; | ||
|
||
keyBoardFocus: boolean; | ||
driskull marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
mouseFocus: boolean; | ||
|
||
//-------------------------------------------------------------------------- | ||
// | ||
// Private Methods | ||
|
@@ -510,12 +534,24 @@ export class Alert implements OpenCloseComponent, LoadableComponent, T9nComponen | |
}; | ||
|
||
private handleMouseOver = (): void => { | ||
this.mouseFocus = true; | ||
this.handleFocus(); | ||
}; | ||
|
||
private handleMouseLeave = (): void => { | ||
this.mouseFocus = false; | ||
if (!this.keyBoardFocus) { | ||
this.handleUnfocus(); | ||
} | ||
}; | ||
|
||
private handleFocus = (): void => { | ||
window.clearTimeout(this.autoCloseTimeoutId); | ||
this.totalOpenTime = Date.now() - this.initialOpenTime; | ||
this.lastMouseOverBegin = Date.now(); | ||
}; | ||
|
||
private handleMouseLeave = (): void => { | ||
private handleUnfocus = (): void => { | ||
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. maybe rename to |
||
const hoverDuration = Date.now() - this.lastMouseOverBegin; | ||
const timeRemaining = | ||
DURATIONS[this.autoCloseDuration] - this.totalOpenTime + this.totalHoverTime; | ||
|
Oops, something went wrong.
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.
I think these can be combined like this: