mirror of
https://github.com/discourse/discourse.git
synced 2024-12-22 23:16:03 +08:00
9c17588f6a
Some checks are pending
Licenses / run (push) Waiting to run
Linting / run (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (backend, plugins) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (frontend, plugins) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (frontend, themes) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, chat) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, core) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, plugins) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (system, themes) (push) Waiting to run
Tests / core frontend (${{ matrix.browser }}) (Chrome) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (annotations, core) (push) Waiting to run
Tests / ${{ matrix.target }} ${{ matrix.build_type }} (backend, core) (push) Waiting to run
Tests / core frontend (${{ matrix.browser }}) (Firefox ESR) (push) Waiting to run
Tests / core frontend (${{ matrix.browser }}) (Firefox Evergreen) (push) Waiting to run
This commit fixes the (?) tooltips for reports on the admin dashboard on mobile. The fix is that float-kit instances can now have different triggers and un-triggers for mobile and desktop, and float-kit is now aware of the site being in mobile view. Example usage: ``` @triggers={{hash mobile=(array "click")}} ``` So now, if you press on the tooltip trigger on mobile it shows correctly, and on desktop both hover and click can be used. --------- Co-authored-by: Joffrey JAFFEUX <j.jaffeux@gmail.com>
228 lines
5.7 KiB
JavaScript
228 lines
5.7 KiB
JavaScript
import { tracked } from "@glimmer/tracking";
|
|
import { action } from "@ember/object";
|
|
import { cancel } from "@ember/runloop";
|
|
import { service } from "@ember/service";
|
|
import { makeArray } from "discourse-common/lib/helpers";
|
|
import discourseLater from "discourse-common/lib/later";
|
|
import { bind } from "discourse-common/utils/decorators";
|
|
|
|
const TOUCH_OPTIONS = { passive: true, capture: true };
|
|
|
|
function cancelEvent(event) {
|
|
event.preventDefault();
|
|
event.stopImmediatePropagation();
|
|
}
|
|
|
|
export default class FloatKitInstance {
|
|
@service site;
|
|
|
|
@tracked id = null;
|
|
|
|
@action
|
|
async show() {
|
|
await this.options.onShow?.();
|
|
}
|
|
|
|
@action
|
|
async close() {
|
|
await this.options.onClose?.();
|
|
}
|
|
|
|
@action
|
|
async onFocus(event) {
|
|
await this.onTrigger(event);
|
|
}
|
|
|
|
@action
|
|
async onBlur(event) {
|
|
await this.onTrigger(event);
|
|
}
|
|
|
|
@action
|
|
async onFocusIn(event) {
|
|
await this.onTrigger(event);
|
|
}
|
|
|
|
@action
|
|
async onFocusOut(event) {
|
|
await this.onTrigger(event);
|
|
}
|
|
|
|
@action
|
|
trapPointerDown(event) {
|
|
// this is done to avoid trigger on click outside when you click on your own trigger
|
|
// given trigger and content are not in the same div, we can't just check if target is
|
|
// inside the menu
|
|
event.stopPropagation();
|
|
}
|
|
|
|
@action
|
|
onTouchStart(event) {
|
|
if (event.touches.length > 1) {
|
|
this.onTouchCancel();
|
|
return;
|
|
}
|
|
|
|
event.stopPropagation();
|
|
|
|
this.trigger.addEventListener(
|
|
"touchmove",
|
|
this.onTouchCancel,
|
|
TOUCH_OPTIONS
|
|
);
|
|
this.trigger.addEventListener(
|
|
"touchcancel",
|
|
this.onTouchCancel,
|
|
TOUCH_OPTIONS
|
|
);
|
|
this.trigger.addEventListener(
|
|
"touchend",
|
|
this.onTouchCancel,
|
|
TOUCH_OPTIONS
|
|
);
|
|
this.touchTimeout = discourseLater(() => {
|
|
if (this.isDestroying || this.isDestroyed) {
|
|
return;
|
|
}
|
|
|
|
this.trigger.addEventListener("touchend", cancelEvent, {
|
|
once: true,
|
|
capture: true,
|
|
});
|
|
|
|
this.onTrigger(event);
|
|
}, 500);
|
|
}
|
|
|
|
@bind
|
|
onTouchCancel() {
|
|
cancel(this.touchTimeout);
|
|
|
|
this.trigger.removeEventListener("touchmove", this.onTouchCancel);
|
|
this.trigger.removeEventListener("touchend", this.onTouchCancel);
|
|
this.trigger.removeEventListener("touchcancel", this.onTouchCancel);
|
|
}
|
|
|
|
tearDownListeners() {
|
|
if (typeof this.trigger.addEventListener === "function") {
|
|
this.trigger.removeEventListener("pointerdown", this.trapPointerDown);
|
|
}
|
|
|
|
if (!this.options?.listeners) {
|
|
return;
|
|
}
|
|
|
|
makeArray(this.triggers)
|
|
.filter(Boolean)
|
|
.forEach((trigger) => {
|
|
switch (trigger) {
|
|
case "hold":
|
|
this.trigger.addEventListener("touchstart", this.onTouchStart);
|
|
break;
|
|
case "focus":
|
|
this.trigger.removeEventListener("focus", this.onFocus);
|
|
this.trigger.removeEventListener("blur", this.onBlur);
|
|
break;
|
|
case "focusin":
|
|
this.trigger.removeEventListener("focusin", this.onFocusIn);
|
|
this.trigger.removeEventListener("focusout", this.onFocusOut);
|
|
break;
|
|
case "hover":
|
|
this.trigger.removeEventListener("mousemove", this.onMouseMove);
|
|
if (!this.options.interactive) {
|
|
this.trigger.removeEventListener("mouseleave", this.onMouseLeave);
|
|
}
|
|
|
|
break;
|
|
case "click":
|
|
this.trigger.removeEventListener("click", this.onClick);
|
|
break;
|
|
}
|
|
});
|
|
|
|
cancel(this.touchTimeout);
|
|
}
|
|
|
|
setupListeners() {
|
|
if (typeof this.trigger.addEventListener === "function") {
|
|
this.trigger.addEventListener("pointerdown", this.trapPointerDown);
|
|
}
|
|
|
|
if (!this.options?.listeners) {
|
|
return;
|
|
}
|
|
|
|
makeArray(this.triggers)
|
|
.filter(Boolean)
|
|
.forEach((trigger) => {
|
|
switch (trigger) {
|
|
case "hold":
|
|
this.trigger.addEventListener(
|
|
"touchstart",
|
|
this.onTouchStart,
|
|
TOUCH_OPTIONS
|
|
);
|
|
break;
|
|
case "focus":
|
|
this.trigger.addEventListener("focus", this.onFocus, {
|
|
passive: true,
|
|
});
|
|
this.trigger.addEventListener("blur", this.onBlur, {
|
|
passive: true,
|
|
});
|
|
break;
|
|
case "focusin":
|
|
this.trigger.addEventListener("focusin", this.onFocusIn, {
|
|
passive: true,
|
|
});
|
|
this.trigger.addEventListener("focusout", this.onFocusOut, {
|
|
passive: true,
|
|
});
|
|
break;
|
|
case "hover":
|
|
this.trigger.addEventListener("mousemove", this.onMouseMove, {
|
|
passive: true,
|
|
});
|
|
if (!this.options.interactive) {
|
|
this.trigger.addEventListener("mouseleave", this.onMouseLeave, {
|
|
passive: true,
|
|
});
|
|
}
|
|
|
|
break;
|
|
case "click":
|
|
this.trigger.addEventListener("click", this.onClick, {
|
|
passive: true,
|
|
});
|
|
break;
|
|
}
|
|
});
|
|
}
|
|
|
|
get triggers() {
|
|
if (
|
|
typeof this.options.triggers === "object" &&
|
|
!Array.isArray(this.options.triggers)
|
|
) {
|
|
return this.site.mobileView
|
|
? this.options.triggers.mobile ?? ["click"]
|
|
: this.options.triggers.desktop ?? ["click"];
|
|
}
|
|
|
|
return this.options.triggers ?? ["click"];
|
|
}
|
|
|
|
get untriggers() {
|
|
if (
|
|
typeof this.options.untriggers === "object" &&
|
|
!Array.isArray(this.options.untriggers)
|
|
) {
|
|
return this.site.mobileView
|
|
? this.options.untriggers.mobile ?? ["click"]
|
|
: this.options.untriggers.desktop ?? ["click"];
|
|
}
|
|
|
|
return this.options.untriggers ?? ["click"];
|
|
}
|
|
}
|