Skip to content

feat: non-contiguous selection with command key on macOS #2483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spalmesano0 wants to merge 1 commit into
base: v5
Choose a base branch
from
Open

feat: non-contiguous selection with command key on macOS #2483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/services/mouse.fg.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import * as Tabs from 'src/services/tabs.fg'
import * as DnD from 'src/services/drag-and-drop.fg'
import * as Preview from 'src/services/tabs.fg.preview'
import * as Search from 'src/services/search.fg'
import * as Info from 'src/services/info'

import * as Mouse from 'src/services/mouse.fg'

Expand Down Expand Up @@ -217,6 +218,10 @@ export function stopLongClick(): void {
}

let clickLock = false
export function isCmdOrCtrl(e: MouseEvent): boolean {
return e.ctrlKey || (Info.reactive.os === 'mac' && e.metaKey)
}

export function isLocked(): boolean {
return clickLock
}
Expand Down
8 changes: 4 additions & 4 deletions src/sidebar/components/bar.new-tab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ function onNewTabMouseUp(e: MouseEvent, btn?: NewTabBtn): void {

// Left
if (e.button === 0) {
if (e.ctrlKey) {
if (Mouse.isCmdOrCtrl(e)) {
Mouse.blockWheel()
const actTab = Tabs.byId[Tabs.activeId]
if (actTab && !actTab.pinned && actTab.panelId === props.panel.id) {
Expand Down Expand Up @@ -287,7 +287,7 @@ function onNewTabMouseUp(e: MouseEvent, btn?: NewTabBtn): void {

// Right
else if (e.button === 2) {
if (e.ctrlKey || e.shiftKey || Windows.incognito) return
if (Mouse.isCmdOrCtrl(e) || e.shiftKey || Windows.incognito) return

if (Menu.isBlocked()) return
if (!Selection.isSet() && !Settings.state.ctxMenuNative) {
Expand Down Expand Up @@ -315,14 +315,14 @@ function onNewTabCtxMenu(e: MouseEvent): void {

e.stopPropagation()

if (Mouse.isLocked() || !Settings.state.ctxMenuNative || e.ctrlKey || e.shiftKey) {
if (Mouse.isLocked() || !Settings.state.ctxMenuNative || Mouse.isCmdOrCtrl(e) || e.shiftKey) {
Mouse.resetClickLock()
e.stopPropagation()
e.preventDefault()
return
}

if (!e.ctrlKey && !e.shiftKey && !props.panel.selNewTab) {
if (!Mouse.isCmdOrCtrl(e) && !e.shiftKey && !props.panel.selNewTab) {
Selection.resetSelection()
}

Expand Down
10 changes: 5 additions & 5 deletions src/sidebar/components/bookmark-card.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ async function onMouseDown(e: MouseEvent): Promise<void> {

// Left
if (e.button === 0) {
if (e.ctrlKey) {
if (Mouse.isCmdOrCtrl(e)) {
if (!props.node.sel) Selection.selectBookmark(props.node.id)
else Selection.deselectBookmark(props.node.id)
return
Expand Down Expand Up @@ -115,7 +115,7 @@ async function onMouseDown(e: MouseEvent): Promise<void> {
function onMouseUp(e: MouseEvent): void {
if (e.button === 0) {
if (!Mouse.isTarget('bookmark', props.node.id)) return
if (e.ctrlKey || e.shiftKey) return
if (Mouse.isCmdOrCtrl(e) || e.shiftKey) return

if (Selection.isBookmarks()) {
return Selection.resetSelection()
Expand All @@ -135,7 +135,7 @@ function onMouseUp(e: MouseEvent): void {
if (conf.removeBookmark) Bookmarks.removeBookmarks([props.node.id], { noNotif: true })
}
} else if (e.button === 2) {
if (e.ctrlKey || e.shiftKey) return
if (Mouse.isCmdOrCtrl(e) || e.shiftKey) return

Mouse.stopMultiSelection()
if (!Settings.state.ctxMenuNative) {
Expand All @@ -146,13 +146,13 @@ function onMouseUp(e: MouseEvent): void {
}

function onCtxMenu(e: MouseEvent): void {
if (!Settings.state.ctxMenuNative || e.ctrlKey || e.shiftKey) {
if (!Settings.state.ctxMenuNative || Mouse.isCmdOrCtrl(e) || e.shiftKey) {
e.stopPropagation()
e.preventDefault()
return
}

if (!e.ctrlKey && !e.shiftKey && !props.node.sel) {
if (!Mouse.isCmdOrCtrl(e) && !e.shiftKey && !props.node.sel) {
Selection.resetSelection()
}

Expand Down
8 changes: 4 additions & 4 deletions src/sidebar/components/history-item.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function onMouseDown(e: MouseEvent, visit: Visit): void {

// Left
if (e.button === 0) {
if (e.ctrlKey) {
if (Mouse.isCmdOrCtrl(e)) {
if (!visit.reactive.sel) Selection.selectHistory(visit.id)
else Selection.deselectHistory(visit.id)
return
Expand Down Expand Up @@ -119,7 +119,7 @@ function onMouseUp(e: MouseEvent, visit: Visit): void {
}

if (e.button === 2) {
if (e.ctrlKey || e.shiftKey) return
if (Mouse.isCmdOrCtrl(e) || e.shiftKey) return

if (Menu.isBlocked()) return
if (!Selection.isSet() && !Settings.state.ctxMenuNative) {
Expand All @@ -146,14 +146,14 @@ function onFavMouseDown(e: MouseEvent, visit: Visit): void {
}

function onCtxMenu(e: MouseEvent, visit: Visit): void {
if (Mouse.isLocked() || !Settings.state.ctxMenuNative || e.ctrlKey || e.shiftKey) {
if (Mouse.isLocked() || !Settings.state.ctxMenuNative || Mouse.isCmdOrCtrl(e) || e.shiftKey) {
Mouse.resetClickLock()
e.stopPropagation()
e.preventDefault()
return
}

if (!e.ctrlKey && !e.shiftKey && !visit.reactive.sel) {
if (!Mouse.isCmdOrCtrl(e) && !e.shiftKey && !visit.reactive.sel) {
Selection.resetSelection()
}

Expand Down
12 changes: 6 additions & 6 deletions src/sidebar/components/tab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ function onMouseDown(e: MouseEvent): void {

// Left
if (e.button === 0) {
if (e.ctrlKey) {
if (Mouse.isCmdOrCtrl(e)) {
if (!(tab.sel || tab.selLock)) {
const noSel = !Selection.isSet()

Expand Down Expand Up @@ -453,7 +453,7 @@ function onMouseUp(e: MouseEvent): void {
if (tab.reactive.customTitleEdit) return

if (e.button === 0) {
const withoutMods = !e.ctrlKey && !e.shiftKey
const withoutMods = !Mouse.isCmdOrCtrl(e) && !e.shiftKey
if (sameTarget) {
if (withoutMods) Selection.resetSelection()
if (Settings.state.activateOnMouseUp && withoutMods) activate()
Expand Down Expand Up @@ -492,7 +492,7 @@ function onMouseUp(e: MouseEvent): void {
}
}
} else if (e.button === 2) {
if (e.ctrlKey || e.shiftKey) return
if (Mouse.isCmdOrCtrl(e) || e.shiftKey) return

const inMultiSelectionMode = Mouse.multiSelectionMode
Mouse.stopMultiSelection()
Expand All @@ -512,7 +512,7 @@ function onCtxMenu(e: MouseEvent): void {
if (
Mouse.isLocked() ||
!Settings.state.ctxMenuNative ||
e.ctrlKey ||
Mouse.isCmdOrCtrl(e) ||
e.shiftKey ||
Mouse.longClickApplied
) {
Expand All @@ -522,7 +522,7 @@ function onCtxMenu(e: MouseEvent): void {
return
}

if (!e.ctrlKey && !e.shiftKey && !(tab.sel || tab.selLock)) {
if (!Mouse.isCmdOrCtrl(e) && !e.shiftKey && !(tab.sel || tab.selLock)) {
Selection.resetSelection()
}

Expand Down Expand Up @@ -774,7 +774,7 @@ function onExpandMouseUp(e: MouseEvent): void {
}

// Select whole branch and show menu
if (e.button === 2 && !e.ctrlKey && !e.shiftKey && sameTarget) {
if (e.button === 2 && !Mouse.isCmdOrCtrl(e) && !e.shiftKey && sameTarget) {
Selection.resetSelection()
Selection.selectTabsBranch(tab)
}
Expand Down