Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 16:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Stop event propagation in DTooltip (#20897)

Browse Source
This commit is contained in:
Jan Cernik 2023-04-11 12:07:03 -03:00 committed by GitHub
parent 9a562f54d7
commit a3801a9e16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/components/d-tooltip.js
View File

@ -17,6 +17,10 @@ export default class DiscourseTooltip extends Component {
this._tippyInstance.destroy();
}
stopPropagation(instance, event) {
event.stopPropagation();
}
_initTippy() {
schedule("afterRender", () => {
// Ember.ViewUtils.getViewBounds is a private API,
@ -33,6 +37,8 @@ export default class DiscourseTooltip extends Component {
theme: "d-tooltip",
arrow: false,
placement: "bottom-start",
onTrigger: this.stopPropagation,
onUntrigger: this.stopPropagation,
});
});
}

39
app/assets/javascripts/discourse/tests/integration/components/user-status-message-test.js
View File

@ -13,6 +13,7 @@ module("Integration | Component | user-status-message", function (hooks) {
hooks.beforeEach(function () {
this.currentUser.user_option.timezone = "UTC";
this.status = { emoji: "tooth", description: "off to dentist" };
});
hooks.afterEach(function () {
@ -22,24 +23,22 @@ module("Integration | Component | user-status-message", function (hooks) {
});
test("it renders user status emoji", async function (assert) {
this.set("status", { emoji: "tooth", description: "off to dentist" });
await render(hbs`<UserStatusMessage @status={{this.status}} />`);
assert.ok(exists("img.emoji[alt='tooth']"), "the status emoji is shown");
});
test("it doesn't render status description by default", async function (assert) {
this.set("status", { emoji: "tooth", description: "off to dentist" });
await render(hbs`<UserStatusMessage @status={{this.status}} />`);
assert.notOk(exists(".user-status-message-description"));
});
test("it renders status description if enabled", async function (assert) {
this.set("status", { emoji: "tooth", description: "off to dentist" });
await render(hbs`
<UserStatusMessage
@status={{this.status}}
@showDescription=true/>
`);
assert.equal(
query(".user-status-message-description").innerText.trim(),
"off to dentist"
@ -52,11 +51,7 @@ module("Integration | Component | user-status-message", function (hooks) {
this.currentUser.user_option.timezone,
true
);
this.set("status", {
emoji: "tooth",
description: "off to dentist",
ends_at: "2100-02-01T12:30:00.000Z",
});
this.status.ends_at = "2100-02-01T12:30:00.000Z";
await render(hbs`<UserStatusMessage @status={{this.status}} />`);
@ -75,11 +70,7 @@ module("Integration | Component | user-status-message", function (hooks) {
this.currentUser.user_option.timezone,
true
);
this.set("status", {
emoji: "tooth",
description: "off to dentist",
ends_at: "2100-02-02T12:30:00.000Z",
});
this.status.ends_at = "2100-02-02T12:30:00.000Z";
await render(hbs`<UserStatusMessage @status={{this.status}} />`);
@ -98,11 +89,7 @@ module("Integration | Component | user-status-message", function (hooks) {
this.currentUser.user_option.timezone,
true
);
this.set("status", {
emoji: "tooth",
description: "off to dentist",
ends_at: null,
});
this.status.ends_at = null;
await render(hbs`<UserStatusMessage @status={{this.status}} />`);
@ -113,11 +100,6 @@ module("Integration | Component | user-status-message", function (hooks) {
});
test("it shows tooltip by default", async function (assert) {
this.set("status", {
emoji: "tooth",
description: "off to dentist",
});
await render(hbs`<UserStatusMessage @status={{this.status}} />`);
await mouseenter();
@ -127,11 +109,6 @@ module("Integration | Component | user-status-message", function (hooks) {
});
test("it doesn't show tooltip if disabled", async function (assert) {
this.set("status", {
emoji: "tooth",
description: "off to dentist",
});
await render(
hbs`<UserStatusMessage @status={{this.status}} @showTooltip={{false}} />`
);
@ -144,11 +121,7 @@ module("Integration | Component | user-status-message", function (hooks) {
test("doesn't blow up with an anonymous user", async function (assert) {
this.owner.unregister("service:current-user");
this.set("status", {
emoji: "tooth",
description: "off to dentist",
ends_at: "2100-02-02T12:30:00.000Z",
});
this.status.ends_at = "2100-02-02T12:30:00.000Z";
await render(hbs`<UserStatusMessage @status={{this.status}} />`);