Skip to content
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.

Sign up for GitHub

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(ui5-toast): infinite loop prevented #1320

Merged
merged 2 commits into from
Mar 20, 2020
Merged

fix(ui5-toast): infinite loop prevented #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27aaa31
fix(ui5-toast): infinite loop prevented
vladitasev Mar 20, 2020
961e131
fix test
vladitasev Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 15 additions & 21 deletions packages/main/src/Toast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import ToastPlacement from "./types/ToastPlacement.js";
// Styles
import ToastCss from "./generated/themes/Toast.css.js";

// Static Constants
const MAXIMUM_ALLOWED_TRANSITION_DURATION_IN_MILLISECONDS = 1000;
const MINIMUM_ALLOWED_DURATION_IN_MILLISECONDS = 500;
// Constants
const MIN_DURATION = 500;
const MAX_DURATION = 1000;

/**
* @public
Expand Down Expand Up @@ -147,22 +147,6 @@ class Toast extends UI5Element {
return ToastTemplate;
}

static get maximumAllowedTransition() {
return MAXIMUM_ALLOWED_TRANSITION_DURATION_IN_MILLISECONDS;
}

static get minimumAllowedDuration() {
return MINIMUM_ALLOWED_DURATION_IN_MILLISECONDS;
}

onBeforeRendering() {
// If the minimum duration is lower than 500ms, we force
// it to be 500ms, as described in the documentation.
if (this.duration < Toast.minimumAllowedDuration) {
this.duration = Toast.minimumAllowedDuration;
}
}

onAfterRendering() {
if (this._reopen) {
this._reopen = false;
Expand All @@ -187,22 +171,32 @@ class Toast extends UI5Element {
}
}

/**
* If the minimum duration is lower than 500ms, we force
* it to be 500ms, as described in the documentation.
* @private
* @returns {*}
*/
get effectiveDuration() {
return this.duration < MIN_DURATION ? MIN_DURATION : this.duration;
}

get rtl() {
return getRTL() ? "rtl" : undefined;
}

get styles() {
// Transition duration (animation) should be a third of the duration
// property, but not bigger than the maximum allowed (1000ms).
const transitionDuration = Math.min(this.duration / 3, Toast.maximumAllowedTransition);
const transitionDuration = Math.min(this.effectiveDuration / 3, MAX_DURATION);

return {
root: {
"transition-duration": this.open ? `${transitionDuration}ms` : "",

// Transition delay is the duration property minus the
// transition duration (animation).
"transition-delay": this.open ? `${this.duration - transitionDuration}ms` : "",
"transition-delay": this.open ? `${this.effectiveDuration - transitionDuration}ms` : "",

// We alter the opacity property, in order to trigger transition
"opacity": this.open && !this.hover ? "0" : "",
Expand Down
2 changes: 1 addition & 1 deletion packages/main/test/specs/Toast.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ describe("Toast general interaction", () => {
it("tests minimum allowed duration", () => {
const toast = browser.$("#wcToastTE");

assert.strictEqual(toast.getProperty("duration"), 500,
assert.strictEqual(toast.getProperty("effectiveDuration"), 500,
"Duration property is forced to be 500, when -1 is passed for duration attribute.");
});
});