Skip to content

Build your personal knowledge base with Trilium Notes

client/ui/scrollable label: fix an issue

Adorian Doran9ba833284a71
diff --git a/apps/client/src/widgets/react/ScrollableLabel.css b/apps/client/src/widgets/react/ScrollableLabel.css
index a457056e72..e418640bd9 100644
--- a/apps/client/src/widgets/react/ScrollableLabel.css
+++ b/apps/client/src/widgets/react/ScrollableLabel.css
@@ -12,6 +12,10 @@
scrollbar-width: none;
}
+.scrollable-label[data-pressed] {
+ user-select: none;
+}
+
.scrollable-label::-webkit-scrollbar {
display: none;
}
diff --git a/apps/client/src/widgets/react/ScrollableLabel.spec.tsx b/apps/client/src/widgets/react/ScrollableLabel.spec.tsx
index 1cf032273a..bef3eb2dad 100644
--- a/apps/client/src/widgets/react/ScrollableLabel.spec.tsx
+++ b/apps/client/src/widgets/react/ScrollableLabel.spec.tsx
@@ -188,7 +188,7 @@ describe("ScrollableLabel", () => {
pointer(text, "pointerdown", 100);
expect(isPrevented(text, "dragstart")).toBe(true);
- expect(isPrevented(text, "selectstart")).toBe(true);
+ expect(label.hasAttribute("data-pressed")).toBe(true);
pointer(text, "pointermove", 98);
expect(label.scrollLeft).toBe(0);
expect(label.hasPointerCapture(1)).toBe(false);
@@ -199,6 +199,7 @@ describe("ScrollableLabel", () => {
pointer(label, "pointermove", 70);
expect(label.scrollLeft).toBe(30);
pointer(label, "pointerup", 70);
+ expect(label.hasAttribute("data-pressed")).toBe(false);
expect(isPrevented(label, "click")).toBe(true);
expect(click).not.toHaveBeenCalled();
@@ -208,6 +209,7 @@ describe("ScrollableLabel", () => {
pointer(text, "pointercancel", 20);
pointer(text, "pointermove", 0);
expect(label.scrollLeft).toBe(80);
+ expect(label.hasAttribute("data-pressed")).toBe(false);
expect(isPrevented(text, "click")).toBe(false);
// A press that stays put is a click.
@@ -233,6 +235,7 @@ describe("ScrollableLabel", () => {
pointer(label, "pointermove", 40, { buttons: 0 });
expect(label.scrollLeft).toBe(0);
expect(isPrevented(label, "dragstart")).toBe(false);
+ expect(label.hasAttribute("data-pressed")).toBe(false);
});
it("leaves the presses of a touch, another button, or on a label that fits alone", () => {
@@ -246,6 +249,7 @@ describe("ScrollableLabel", () => {
const label = renderLabel("a name", scrollWidth);
pointer(label, "pointerdown", 100, init);
expect(isPrevented(label, "dragstart")).toBe(false);
+ expect(label.hasAttribute("data-pressed")).toBe(false);
pointer(label, "pointermove", 40, init);
expect(label.scrollLeft).toBe(0);
pointer(label, "pointerup", 40, init);
diff --git a/apps/client/src/widgets/react/ScrollableLabel.tsx b/apps/client/src/widgets/react/ScrollableLabel.tsx
index a6ba2c5b03..d8696a1a35 100644
--- a/apps/client/src/widgets/react/ScrollableLabel.tsx
+++ b/apps/client/src/widgets/react/ScrollableLabel.tsx
@@ -156,9 +156,16 @@ function useMouseDragScroll(ref: RefObject<HTMLElement | null>) {
| undefined;
let isClickCanceled = false;
+ // `user-select: none` on a pressed label keeps Firefox from starting a selection drag, whose
+ // autoscroll moves the label toward the pointer even when `selectstart` is canceled.
+ const setPress = (next: typeof press) => {
+ press = next;
+ element.toggleAttribute("data-pressed", !!next);
+ };
+
const onPointerDown = (event: PointerEvent) => {
isClickCanceled = false;
- press = event.pointerType === "mouse" && event.button === 0
+ setPress(event.pointerType === "mouse" && event.button === 0
&& element.scrollWidth > element.clientWidth
? {
pointerId: event.pointerId,
@@ -166,13 +173,13 @@ function useMouseDragScroll(ref: RefObject<HTMLElement | null>) {
scrollLeft: element.scrollLeft,
isDragging: false
}
- : undefined;
+ : undefined);
};
const onPointerMove = (event: PointerEvent) => {
if (event.pointerId !== press?.pointerId) return;
// Released away from the label before the drag captured the pointer.
if (!(event.buttons & 1)) {
- press = undefined;
+ setPress(undefined);
return;
}
@@ -190,7 +197,7 @@ function useMouseDragScroll(ref: RefObject<HTMLElement | null>) {
if (event.pointerId !== press?.pointerId) return;
isClickCanceled = event.type === "pointerup" && press.isDragging;
- press = undefined;
+ setPress(undefined);
};
const preventWhilePressed = (event: Event) => {
if (press) {
@@ -210,7 +217,6 @@ function useMouseDragScroll(ref: RefObject<HTMLElement | null>) {
element.addEventListener("pointerup", onPointerUp);
element.addEventListener("pointercancel", onPointerUp);
element.addEventListener("dragstart", preventWhilePressed);
- element.addEventListener("selectstart", preventWhilePressed);
element.addEventListener("click", cancelClick, true);
return () => {
element.removeEventListener("pointerdown", onPointerDown);
@@ -218,8 +224,8 @@ function useMouseDragScroll(ref: RefObject<HTMLElement | null>) {
element.removeEventListener("pointerup", onPointerUp);
element.removeEventListener("pointercancel", onPointerUp);
element.removeEventListener("dragstart", preventWhilePressed);
- element.removeEventListener("selectstart", preventWhilePressed);
element.removeEventListener("click", cancelClick, true);
+ element.removeAttribute("data-pressed");
};
}, [ ref ]);
}