Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-09-28 07:51:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid triggering tab switch on long press.

Browse Source
This commit is contained in:
SiriusXT 2025-04-14 18:43:54 +08:00
parent 7ec73698ab
commit 91231874e3
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/types-lib.d.ts vendored
View File

@ -13,7 +13,7 @@ declare module "draggabilly" {
containment: HTMLElement containment: HTMLElement
}); });
element: HTMLElement; element: HTMLElement;
on(event: "pointerDown" | "dragStart" | "dragEnd" | "dragMove", callback: Callback); on(event: "pointerDown" | "pointerUp" | "dragStart" | "dragEnd" | "dragMove", callback: Callback);
dragEnd(); dragEnd();
isDragging: boolean; isDragging: boolean;
positionDrag: () => void; positionDrag: () => void;

18
src/public/app/widgets/tab_row.ts
View File

@ -388,13 +388,13 @@ export default class TabRowWidget extends BasicWidget {
setupScrollEvents() { setupScrollEvents() {
this.$scrollButtonLeft[0].addEventListener('click', () => this.scrollTabContainer(-200)); this.$scrollButtonLeft[0].addEventListener('click', () => this.scrollTabContainer(-200));
this.$scrollButtonRight[0].addEventListener('click', () => this.scrollTabContainer(200)); this.$scrollButtonRight[0].addEventListener('click', () => this.scrollTabContainer(200));
this.$tabScrollingContainer[0].addEventListener('wheel', (event) => { this.$tabScrollingContainer[0].addEventListener('wheel', (event) => {
const targetScrollLeft = event.deltaY*1.5; const targetScrollLeft = event.deltaY * 1.5;
this.scrollTabContainer(targetScrollLeft); this.scrollTabContainer(targetScrollLeft);
}); });
this.$tabScrollingContainer[0].addEventListener('scroll', () => { this.$tabScrollingContainer[0].addEventListener('scroll', () => {
clearTimeout(this.updateScrollTimeout); clearTimeout(this.updateScrollTimeout);
this.updateScrollTimeout = setTimeout(() => { this.updateScrollTimeout = setTimeout(() => {
@ -458,7 +458,7 @@ export default class TabRowWidget extends BasicWidget {
// this.$newTab may include margin, and using NEW_TAB_WIDTH could cause tabsContainerWidth to be slightly larger, // this.$newTab may include margin, and using NEW_TAB_WIDTH could cause tabsContainerWidth to be slightly larger,
// resulting in misaligned scrollbars/buttons. Therefore, use outerwidth. // resulting in misaligned scrollbars/buttons. Therefore, use outerwidth.
this.updateOuterWidth(); this.updateOuterWidth();
let tabsContainerWidth = Math.floor(this.$widget.width() ?? 0); let tabsContainerWidth = Math.floor(this.$widget.width() ?? 0);
tabsContainerWidth -= this.newTabOuterWidth + MIN_FILLER_WIDTH; tabsContainerWidth -= this.newTabOuterWidth + MIN_FILLER_WIDTH;
// Check whether the scroll buttons need to be displayed. // Check whether the scroll buttons need to be displayed.
if ((TAB_CONTAINER_MIN_WIDTH + MARGIN_WIDTH) * numberOfTabs > tabsContainerWidth) { if ((TAB_CONTAINER_MIN_WIDTH + MARGIN_WIDTH) * numberOfTabs > tabsContainerWidth) {
@ -671,8 +671,14 @@ export default class TabRowWidget extends BasicWidget {
this.draggabillies.push(draggabilly); this.draggabillies.push(draggabilly);
let pointerDownTime: number = 0;
draggabilly.on("pointerDown", () => { draggabilly.on("pointerDown", () => {
appContext.tabManager.activateNoteContext(tabEl.getAttribute("data-ntx-id")); pointerDownTime = Date.now();
});
draggabilly.on("pointerUp", () => {
if (Date.now() - pointerDownTime < 200) {
appContext.tabManager.activateNoteContext(tabEl.getAttribute("data-ntx-id"));
}
}); });
draggabilly.on("dragStart", () => { draggabilly.on("dragStart", () => {
@ -780,7 +786,7 @@ export default class TabRowWidget extends BasicWidget {
setupContainerAnchor() { setupContainerAnchor() {
this.$containerAnchor = $(CONTAINER_ANCHOR_TPL); this.$containerAnchor = $(CONTAINER_ANCHOR_TPL);
this.$tabContainer.append(this.$containerAnchor); this.$tabContainer.append(this.$containerAnchor);
} }