diff --git a/src/zen/common/ZenActorsManager.sys.mjs b/src/zen/common/ZenActorsManager.sys.mjs index bfaf184af..2d7b8c10a 100644 --- a/src/zen/common/ZenActorsManager.sys.mjs +++ b/src/zen/common/ZenActorsManager.sys.mjs @@ -42,7 +42,7 @@ let JSWINDOWACTORS = { esModuleURI: 'resource:///actors/ZenGlanceChild.sys.mjs', events: { DOMContentLoaded: {}, - click: { + mousedown: { capture: true, }, keydown: { diff --git a/src/zen/folders/ZenFolders.mjs b/src/zen/folders/ZenFolders.mjs index 0b9a4a77a..4245f4cd6 100644 --- a/src/zen/folders/ZenFolders.mjs +++ b/src/zen/folders/ZenFolders.mjs @@ -1156,7 +1156,7 @@ let dragDownThreshold = Services.prefs.getIntPref('zen.view.drag-and-drop.drop-inside-lower-threshold') / 100; - const dropElementGroup = dropElement; + const dropElementGroup = dropElement?.isZenFolder ? dropElement : dropElement?.group; const isSplitGroup = dropElement?.group?.hasAttribute('split-view-group'); let firstGroupElem = dropElementGroup.querySelector('.zen-tab-group-start').nextElementSibling; diff --git a/src/zen/glance/actors/ZenGlanceChild.sys.mjs b/src/zen/glance/actors/ZenGlanceChild.sys.mjs index e3f78f2a0..47337790a 100644 --- a/src/zen/glance/actors/ZenGlanceChild.sys.mjs +++ b/src/zen/glance/actors/ZenGlanceChild.sys.mjs @@ -35,9 +35,12 @@ export class ZenGlanceChild extends JSWindowActorChild { } #sendClickDataToParent(target, element) { - if (!element || !target) { + if (!element && !target) { return; } + if (!target) { + target = element; + } // Get the largest element we can get. If the `A` element // is a parent of the original target, use the anchor element, // otherwise use the original target. @@ -54,7 +57,7 @@ export class ZenGlanceChild extends JSWindowActorChild { }); } - on_click(event) { + on_mousedown(event) { // get closest A element const target = event.target.closest('A'); const elementToRecord = event.originalTarget || event.target; diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css index 2cedddc4d..ce6669ef8 100644 --- a/src/zen/tabs/zen-tabs/vertical-tabs.css +++ b/src/zen/tabs/zen-tabs/vertical-tabs.css @@ -329,6 +329,13 @@ scale: 0.92; } + &:not(:hover) { + .tab-close-button, + .tab-reset-button { + display: none !important; + } + } + & .tab-icon-image { &:not([src]), &:-moz-broken { diff --git a/src/zen/toolkit/common/cocoa/ZenHapticFeedback.mm b/src/zen/toolkit/common/cocoa/ZenHapticFeedback.mm index eaea43ca7..060b6a426 100644 --- a/src/zen/toolkit/common/cocoa/ZenHapticFeedback.mm +++ b/src/zen/toolkit/common/cocoa/ZenHapticFeedback.mm @@ -24,9 +24,6 @@ nsresult ZenCommonUtils::PlayHapticFeedbackInternal() { id performer = [NSHapticFeedbackManager defaultPerformer]; [performer performFeedbackPattern:NSHapticFeedbackPatternAlignment performanceTime:NSHapticFeedbackPerformanceTimeDefault]; - } else { - // Fallback on earlier versions - // Note: This is a no-op on older versions of iOS/macOS } return NS_OK; NS_OBJC_END_TRY_BLOCK_RETURN(NS_OK);