Skip to content

A platform for community discussion. Free, open, simple.

DEV: add delayed-hover trigger to float-kit (#39080)

Régis HANOLd88286f72662
diff --git a/frontend/discourse/app/components/emoji-picker/index.gjs b/frontend/discourse/app/components/emoji-picker/index.gjs
index db135438e0b..e6825ef7d90 100644
--- a/frontend/discourse/app/components/emoji-picker/index.gjs
+++ b/frontend/discourse/app/components/emoji-picker/index.gjs
@@ -36,6 +36,7 @@ export default class EmojiPicker extends Component {
@onShow={{@onShow}}
@onClose={{@onClose}}
@inline={{@inline}}
+ @disabled={{@disabled}}
>
<:trigger>
{{#if @emoji}}
diff --git a/frontend/discourse/float-kit/lib/d-menu-instance.js b/frontend/discourse/float-kit/lib/d-menu-instance.js
index 65cf4b80d72..730630b5014 100644
--- a/frontend/discourse/float-kit/lib/d-menu-instance.js
+++ b/frontend/discourse/float-kit/lib/d-menu-instance.js
@@ -2,6 +2,7 @@ import { tracked } from "@glimmer/tracking";
import { action } from "@ember/object";
import { guidFor } from "@ember/object/internals";
import { getOwner, setOwner } from "@ember/owner";
+import { cancel } from "@ember/runloop";
import { service } from "@ember/service";
import { MENU } from "discourse/float-kit/lib/constants";
import FloatKitInstance from "discourse/float-kit/lib/float-kit-instance";
@@ -65,6 +66,8 @@ export default class DMenuInstance extends FloatKitInstance {
@action
async close(options = { focusTrigger: true }) {
+ this.openedByDelayedHover = false;
+
if (getOwner(this).isDestroying) {
return;
}
@@ -103,6 +106,13 @@ export default class DMenuInstance extends FloatKitInstance {
@action
async onClick(event) {
+ cancel(this.delayedHoverTimeout);
+
+ if (this.openedByDelayedHover) {
+ this.openedByDelayedHover = false;
+ return;
+ }
+
if (this.expanded && this.untriggers.includes("click")) {
return await this.onUntrigger(event);
}
diff --git a/frontend/discourse/float-kit/lib/d-tooltip-instance.js b/frontend/discourse/float-kit/lib/d-tooltip-instance.js
index 4c66951fab5..297d5319f16 100644
--- a/frontend/discourse/float-kit/lib/d-tooltip-instance.js
+++ b/frontend/discourse/float-kit/lib/d-tooltip-instance.js
@@ -2,6 +2,7 @@ import { tracked } from "@glimmer/tracking";
import { action } from "@ember/object";
import { guidFor } from "@ember/object/internals";
import { setOwner } from "@ember/owner";
+import { cancel } from "@ember/runloop";
import { service } from "@ember/service";
import { TOOLTIP } from "discourse/float-kit/lib/constants";
import FloatKitInstance from "discourse/float-kit/lib/float-kit-instance";
@@ -64,6 +65,7 @@ export default class DTooltipInstance extends FloatKitInstance {
@action
async close() {
+ this.openedByDelayedHover = false;
await this.tooltip.close(this);
await super.close(...arguments);
@@ -84,6 +86,13 @@ export default class DTooltipInstance extends FloatKitInstance {
@action
async onClick(event) {
+ cancel(this.delayedHoverTimeout);
+
+ if (this.openedByDelayedHover) {
+ this.openedByDelayedHover = false;
+ return;
+ }
+
if (this.expanded && this.untriggers.includes("click")) {
return await this.onUntrigger(event);
}
diff --git a/frontend/discourse/float-kit/lib/float-kit-instance.js b/frontend/discourse/float-kit/lib/float-kit-instance.js
index f5aed5e390a..c8a04807c84 100644
--- a/frontend/discourse/float-kit/lib/float-kit-instance.js
+++ b/frontend/discourse/float-kit/lib/float-kit-instance.js
@@ -96,6 +96,23 @@ export default class FloatKitInstance {
}, 500);
}
+ @action
+ onDelayedHoverEnter(event) {
+ cancel(this.delayedHoverTimeout);
+ this.delayedHoverTimeout = discourseLater(() => {
+ if (this.expanded) {
+ return;
+ }
+ this.openedByDelayedHover = true;
+ this.onTrigger(event);
+ }, 250);
+ }
+
+ @action
+ onDelayedHoverLeave() {
+ cancel(this.delayedHoverTimeout);
+ }
+
@bind
onTouchCancel() {
cancel(this.touchTimeout);
@@ -138,6 +155,17 @@ export default class FloatKitInstance {
);
}
+ break;
+ case "delayed-hover":
+ cancel(this.delayedHoverTimeout);
+ this.trigger.removeEventListener(
+ "pointerenter",
+ this.onDelayedHoverEnter
+ );
+ this.trigger.removeEventListener(
+ "pointerleave",
+ this.onDelayedHoverLeave
+ );
break;
case "click":
this.trigger.removeEventListener("click", this.onClick);
@@ -198,6 +226,18 @@ export default class FloatKitInstance {
);
}
+ break;
+ case "delayed-hover":
+ this.trigger.addEventListener(
+ "pointerenter",
+ this.onDelayedHoverEnter,
+ { passive: true }
+ );
+ this.trigger.addEventListener(
+ "pointerleave",
+ this.onDelayedHoverLeave,
+ { passive: true }
+ );
break;
case "click":
this.trigger.addEventListener("click", this.onClick, {
diff --git a/frontend/discourse/tests/integration/components/float-kit/d-menu-test.gjs b/frontend/discourse/tests/integration/components/float-kit/d-menu-test.gjs
index 585be6fcf88..d25e2ea3009 100644
--- a/frontend/discourse/tests/integration/components/float-kit/d-menu-test.gjs
+++ b/frontend/discourse/tests/integration/components/float-kit/d-menu-test.gjs
@@ -1,10 +1,11 @@
-import { hash } from "@ember/helper";
+import { array, hash } from "@ember/helper";
import { getOwner } from "@ember/owner";
import didInsert from "@ember/render-modifiers/modifiers/did-insert";
import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";
import {
click,
render,
+ settled,
triggerEvent,
triggerKeyEvent,
} from "@ember/test-helpers";
@@ -587,6 +588,64 @@ module("Integration | Component | FloatKit | d-menu", function (hooks) {
});
});
+ test("delayed-hover opens menu after delay", async function (assert) {
+ await render(
+ <template>
+ <DMenu
+ @inline={{true}}
+ @label="label"
+ @triggers={{array "delayed-hover"}}
+ @content="content"
+ />
+ </template>
+ );
+
+ triggerEvent(".fk-d-menu__trigger", "pointerenter");
+ assert.dom(".fk-d-menu").doesNotExist("menu not open before delay");
+
+ await settled();
+
+ assert.dom(".fk-d-menu").exists("menu opens after delay");
+ });
+
+ test("delayed-hover cancels when pointer leaves before delay", async function (assert) {
+ await render(
+ <template>
+ <DMenu
+ @inline={{true}}
+ @label="label"
+ @triggers={{array "delayed-hover"}}
+ @content="content"
+ />
+ </template>
+ );
+
+ triggerEvent(".fk-d-menu__trigger", "pointerenter");
+ await triggerEvent(".fk-d-menu__trigger", "pointerleave");
+
+ assert.dom(".fk-d-menu").doesNotExist("menu does not open after leave");
+ });
+
+ test("delayed-hover click during pending delay opens menu", async function (assert) {
+ await render(
+ <template>
+ <DMenu
+ @inline={{true}}
+ @label="label"
+ @triggers={{array "delayed-hover" "click"}}
+ @content="content"
+ />
+ </template>
+ );
+
+ triggerEvent(".fk-d-menu__trigger", "pointerenter");
+ await click(".fk-d-menu__trigger");
+
+ assert
+ .dom(".fk-d-menu")
+ .exists("menu opens via click during pending hover");
+ });
+
test("@matchTriggerMinWidth", async function (assert) {
await render(
<template>
diff --git a/spec/system/page_objects/pages/review.rb b/spec/system/page_objects/pages/review.rb
index 4cf51155f18..84070257535 100644
--- a/spec/system/page_objects/pages/review.rb
+++ b/spec/system/page_objects/pages/review.rb
@@ -12,9 +12,18 @@ module PageObjects
self
end
- def select_bundled_action(reviewable, value)
+ def select_bundled_action(reviewable, value, bundle_index: nil)
within(reviewable_by_id(reviewable.id)) do
- reviewable_action_dropdown.select_row_by_value(value)
+ if bundle_index
+ dropdown =
+ PageObjects::Components::SelectKit.new(
+ "#{REVIEWABLE_ACTION_DROPDOWN}:nth-of-type(#{bundle_index})",
+ )
+ dropdown.expand
+ dropdown.select_row_by_name(value)
+ else
+ reviewable_action_dropdown.select_row_by_value(value)
+ end
end
end