mirror of
https://github.com/zen-browser/desktop.git
synced 2026-08-29 18:01:31 +00:00
feat: Add learning for omnibox commands, p=#10564
This commit is contained in:
mr. m
@@ -103,6 +103,7 @@ var gZenCommonActions = {
|
||||
gZenUIManager.showToast('zen-copy-current-url-confirmation', { button, timeout: 3000 });
|
||||
}
|
||||
},
|
||||
|
||||
copyCurrentURLAsMarkdownToClipboard() {
|
||||
const currentUrl = gBrowser.currentURI.spec;
|
||||
const tabTitle = gBrowser.selectedTab.label;
|
||||
|
||||
@@ -29,8 +29,12 @@
|
||||
background.appendChild(grain);
|
||||
document.getElementById('browser').prepend(background);
|
||||
const toolbarBackground = background.cloneNode(true);
|
||||
toolbarBackground.id = 'zen-toolbar-background';
|
||||
toolbarBackground.removeAttribute('id');
|
||||
toolbarBackground.classList.add('zen-toolbar-background');
|
||||
document.getElementById('titlebar').prepend(toolbarBackground);
|
||||
document
|
||||
.getElementById('zen-appcontent-navbar-container')
|
||||
.prepend(toolbarBackground.cloneNode(true));
|
||||
}
|
||||
|
||||
#zenInitBrowserLayout() {
|
||||
|
||||
@@ -59,6 +59,10 @@ var gZenUIManager = {
|
||||
});
|
||||
|
||||
window.addEventListener('TabClose', this.onTabClose.bind(this));
|
||||
window.addEventListener(
|
||||
'Zen:UrlbarSearchModeChanged',
|
||||
this.onUrlbarSearchModeChanged.bind(this)
|
||||
);
|
||||
|
||||
gZenMediaController.init();
|
||||
gZenVerticalTabsManager.init();
|
||||
@@ -241,6 +245,53 @@ var gZenUIManager = {
|
||||
|
||||
// Section: URL bar
|
||||
|
||||
onUrlbarSearchModeChanged(event) {
|
||||
const { searchMode } = event.detail;
|
||||
const input = gURLBar.textbox;
|
||||
if (gURLBar.hasAttribute('breakout-extend') && !this._animatingSearchMode) {
|
||||
this._animatingSearchMode = true;
|
||||
this.motion
|
||||
.animate(input, { scale: [1, 0.98, 1] }, { duration: 0.25, delay: 0.1 })
|
||||
.then(() => {
|
||||
delete this._animatingSearchMode;
|
||||
});
|
||||
if (searchMode) {
|
||||
gURLBar.setAttribute('animate-searchmode', 'true');
|
||||
this._animatingSearchModeTimeout = setTimeout(() => {
|
||||
requestAnimationFrame(() => {
|
||||
gURLBar.removeAttribute('animate-searchmode');
|
||||
delete this._animatingSearchModeTimeout;
|
||||
});
|
||||
}, 700);
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
enableCommandsMode(event) {
|
||||
event.preventDefault();
|
||||
if (!gURLBar.hasAttribute('breakout-extend') || this._animatingSearchMode) {
|
||||
return;
|
||||
}
|
||||
const currentSearchMode = gURLBar.getSearchMode(gBrowser.selectedBrowser);
|
||||
let searchMode = null;
|
||||
if (!currentSearchMode) {
|
||||
searchMode = {
|
||||
source: UrlbarUtils.RESULT_SOURCE.ZEN_ACTIONS,
|
||||
isPreview: true,
|
||||
};
|
||||
}
|
||||
gURLBar.removeAttribute('animate-searchmode');
|
||||
if (this._animatingSearchModeTimeout) {
|
||||
clearTimeout(this._animatingSearchModeTimeout);
|
||||
delete this._animatingSearchModeTimeout;
|
||||
}
|
||||
gURLBar.searchMode = searchMode;
|
||||
gURLBar.startQuery({
|
||||
allowAutofill: false,
|
||||
event,
|
||||
});
|
||||
},
|
||||
|
||||
get newtabButtons() {
|
||||
return document.querySelectorAll('#tabs-newtab-button');
|
||||
},
|
||||
|
||||
@@ -57,113 +57,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes better-sidebar-pinned-hide {
|
||||
0% {
|
||||
opacity: 1;
|
||||
transform: scale(1) rotateX(0deg);
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: scale(0.99) rotateX(-5deg);
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes better-sidebar-pinned-show {
|
||||
0% {
|
||||
opacity: 0;
|
||||
|
||||
transform: scale(0.99) rotateX(-5deg);
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: scale(1) rotateX(0deg);
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes better-sidebar-hide {
|
||||
0% {
|
||||
opacity: 1;
|
||||
|
||||
transform: scale(1) rotateX(0deg);
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: scale(0.99) rotateX(-5deg);
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes better-sidebar-show {
|
||||
0% {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: scale(1);
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes better-sidebar-intro-show {
|
||||
0% {
|
||||
opacity: 0;
|
||||
transform: translateY(5px);
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: translateY(0px);
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes zen-vtabs-animation {
|
||||
0% {
|
||||
opacity: 0;
|
||||
transform: translateX(-10px);
|
||||
}
|
||||
|
||||
20% {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: translateX(0);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes zen-sidebar-panel-animation-right {
|
||||
0% {
|
||||
opacity: 0;
|
||||
transform: translateX(10px);
|
||||
}
|
||||
|
||||
20% {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: translateX(0);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes zen-sidebar-panel-animation-reverse {
|
||||
0% {
|
||||
opacity: 1;
|
||||
transform: translateX(0) scale3d(1, 1, 1);
|
||||
}
|
||||
|
||||
99% {
|
||||
opacity: 0;
|
||||
transform: translateX(-50px) scale3d(0.95, 0.95, 0.95);
|
||||
}
|
||||
|
||||
100% {
|
||||
display: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
/* Mark: Zen Glance */
|
||||
@keyframes zen-glance-overlay-animation {
|
||||
from {
|
||||
@@ -187,82 +80,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes zen-rice-form-out {
|
||||
0% {
|
||||
transform: translateX(0);
|
||||
max-height: 350px;
|
||||
opacity: 1;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
50% {
|
||||
transform: translateX(-100%);
|
||||
opacity: 0;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
99% {
|
||||
transform: translateX(-100%);
|
||||
opacity: 0;
|
||||
max-height: 15px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: translateX(-100%);
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes zen-rice-form-in {
|
||||
0% {
|
||||
position: absolute;
|
||||
transform: translateX(100%);
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
99% {
|
||||
position: absolute;
|
||||
transform: translateX(0);
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
100% {
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes zen-rice-form-in-2 {
|
||||
from {
|
||||
opacity: 0;
|
||||
transform: translateX(100%);
|
||||
max-height: 50px;
|
||||
}
|
||||
|
||||
to {
|
||||
opacity: 1;
|
||||
transform: translateX(0);
|
||||
max-height: 450px;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes zen-rice-submit-animation {
|
||||
/* Scale and shake the dialog */
|
||||
0% {
|
||||
transform: scale(1);
|
||||
}
|
||||
|
||||
50% {
|
||||
transform: scale(1.1);
|
||||
}
|
||||
|
||||
100% {
|
||||
transform: scale(1);
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes zen-back-and-forth-text {
|
||||
0%,
|
||||
10% {
|
||||
@@ -282,3 +99,14 @@
|
||||
left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
/* Mark: URL Bar */
|
||||
@keyframes zen-urlbar-searchmode {
|
||||
0% {
|
||||
box-shadow: 0 0 20px color-mix(in srgb, var(--zen-primary-color), var(--toolbox-textcolor) 40%);
|
||||
}
|
||||
|
||||
100% {
|
||||
box-shadow: 0 0 300px color-mix(in srgb, var(--zen-primary-color), transparent 100%);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
transition: 0s;
|
||||
}
|
||||
|
||||
&:is(#zen-toolbar-background) {
|
||||
&:is(.zen-toolbar-background) {
|
||||
&::after {
|
||||
background: var(--zen-main-browser-background-toolbar);
|
||||
}
|
||||
@@ -76,7 +76,7 @@
|
||||
transition: 0s;
|
||||
}
|
||||
|
||||
&:is(#zen-toolbar-background) {
|
||||
&:is(.zen-toolbar-background) {
|
||||
&::before {
|
||||
background: var(--zen-main-browser-background-toolbar-old);
|
||||
}
|
||||
|
||||
@@ -155,15 +155,15 @@
|
||||
order: 2 !important;
|
||||
}
|
||||
|
||||
#urlbar[breakout] {
|
||||
position: fixed;
|
||||
}
|
||||
|
||||
#urlbar[breakout-extend='true'] {
|
||||
position: fixed;
|
||||
z-index: 2;
|
||||
|
||||
& .urlbar-input-container {
|
||||
font-weight: 400;
|
||||
@media (-moz-platform: windows) {
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
|
||||
& #identity-box {
|
||||
@@ -188,13 +188,28 @@
|
||||
) !important;
|
||||
box-shadow: 0px 0px 90px -10px light-dark(rgba(0, 0, 0, 0.8), rgba(0, 0, 0, 0.75)) !important;
|
||||
backdrop-filter: none !important;
|
||||
border-radius: 12px !important;
|
||||
outline: 0.5px solid light-dark(rgba(0, 0, 0, 0.2), rgba(255, 255, 255, 0.2)) !important;
|
||||
outline-offset: var(--zen-urlbar-outline-offset) !important;
|
||||
@media -moz-pref('zen.theme.acrylic-elements') {
|
||||
backdrop-filter: blur(42px) saturate(110%) brightness(0.25) contrast(100%) !important;
|
||||
}
|
||||
}
|
||||
|
||||
&,
|
||||
.urlbar-background {
|
||||
border-radius: 12px !important;
|
||||
}
|
||||
|
||||
&[breakout-extend][animate-searchmode='true']::before {
|
||||
position: absolute;
|
||||
content: '';
|
||||
inset: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: inherit;
|
||||
pointer-events: none;
|
||||
animation: zen-urlbar-searchmode ease-out 0.7s forwards;
|
||||
}
|
||||
}
|
||||
|
||||
#urlbar-go-button {
|
||||
@@ -444,7 +459,7 @@
|
||||
font-size: 1.5em !important;
|
||||
}
|
||||
top: var(--zen-urlbar-top) !important;
|
||||
transform: translateX(-50%);
|
||||
translate: -50% 0%;
|
||||
left: 50% !important;
|
||||
|
||||
#urlbar-container:has(&) {
|
||||
@@ -617,7 +632,7 @@
|
||||
var(--zen-primary-color) 50%,
|
||||
light-dark(rgba(0, 0, 0, 0.5), rgba(255, 255, 255, 0.2)) 50%
|
||||
);
|
||||
--zen-selected-color: color-mix(in srgb, var(--zen-selected-bg), light-dark(white, black) 40%);
|
||||
--zen-selected-color: color-mix(in srgb, var(--zen-selected-bg), black 30%);
|
||||
background-color: var(--zen-selected-bg) !important;
|
||||
|
||||
& *,
|
||||
@@ -627,6 +642,7 @@
|
||||
|
||||
& .urlbarView-favicon {
|
||||
fill: currentColor !important;
|
||||
stroke: currentColor !important;
|
||||
}
|
||||
|
||||
& .urlbarView-shortcutContent {
|
||||
@@ -656,8 +672,14 @@
|
||||
& .action-contextualidentity {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.urlbarView[noresults] > .urlbarView-body-outer > .urlbarView-body-inner > & {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
/* Hide the results body when there are no results, to avoid showing an empty box */
|
||||
.urlbarView[noresults] > .urlbarView-body-outer > .urlbarView-body-inner,
|
||||
#urlbar-search-mode-indicator-close {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#urlbar-search-mode-indicator-title {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
@@ -46,12 +46,27 @@ var ZenThemeModifier = {
|
||||
Services.prefs.addObserver(pref, handleEvent);
|
||||
}
|
||||
|
||||
// Add fullscreen listener to update the theme when going in and out of fullscreen
|
||||
const eventsForSeparation = [
|
||||
'ZenViewSplitter:SplitViewDeactivated',
|
||||
'ZenViewSplitter:SplitViewActivated',
|
||||
'fullscreen',
|
||||
'ZenCompactMode:Toggled',
|
||||
];
|
||||
const separationHandler = this.updateElementSeparation.bind(this);
|
||||
for (let eventName of eventsForSeparation) {
|
||||
window.addEventListener(eventName, separationHandler);
|
||||
}
|
||||
|
||||
window.addEventListener(
|
||||
'unload',
|
||||
() => {
|
||||
for (let pref of kZenThemePrefsList) {
|
||||
Services.prefs.removeObserver(pref, handleEvent);
|
||||
}
|
||||
for (let eventName of eventsForSeparation) {
|
||||
window.removeEventListener(eventName, separationHandler);
|
||||
}
|
||||
},
|
||||
{ once: true }
|
||||
);
|
||||
@@ -78,6 +93,13 @@ var ZenThemeModifier = {
|
||||
|
||||
updateElementSeparation() {
|
||||
let separation = this.elementSeparation;
|
||||
if (
|
||||
window.fullScreen &&
|
||||
window.gZenCompactModeManager?.preference &&
|
||||
!document.getElementById('tabbrowser-tabbox')?.hasAttribute('zen-split-view')
|
||||
) {
|
||||
separation = 0;
|
||||
}
|
||||
document.documentElement.style.setProperty('--zen-element-separation', separation + 'px');
|
||||
if (separation == 0) {
|
||||
document.documentElement.setAttribute('zen-no-padding', true);
|
||||
|
||||
@@ -246,6 +246,7 @@ var gZenCompactModeManager = {
|
||||
} else {
|
||||
ZenHasPolyfill.disconnectObserver(this.sidebarObserverId);
|
||||
}
|
||||
window.dispatchEvent(new CustomEvent('ZenCompactMode:Toggled', { detail: this.preference }));
|
||||
},
|
||||
|
||||
// NOTE: Dont actually use event, it's just so we make sure
|
||||
|
||||
@@ -5,9 +5,32 @@
|
||||
*/
|
||||
/* All overrides for compact mode go here */
|
||||
|
||||
#zen-toolbar-background {
|
||||
.zen-toolbar-background {
|
||||
display: none;
|
||||
pointer-events: none;
|
||||
|
||||
overflow: clip;
|
||||
z-index: -1;
|
||||
background: black; /* Any color thats not white */
|
||||
box-shadow: var(--zen-big-shadow);
|
||||
@media -moz-pref('zen.theme.acrylic-elements') {
|
||||
background: transparent;
|
||||
backdrop-filter: blur(42px) saturate(110%) brightness(0.25) contrast(100%) !important;
|
||||
}
|
||||
|
||||
&::before,
|
||||
&::after {
|
||||
outline: 1px solid rgba(255, 255, 255, .15);
|
||||
outline-offset: -1px;
|
||||
background-attachment: fixed !important;
|
||||
background-size: 100vw 100vh !important;
|
||||
}
|
||||
|
||||
&,
|
||||
&::before,
|
||||
&::after {
|
||||
border-radius: calc(var(--zen-native-inner-radius) + var(--zen-element-separation) / 4 - var(--zen-compact-mode-no-padding-radius-fix, 0px));
|
||||
}
|
||||
}
|
||||
|
||||
:root[zen-compact-mode='true']:not([customizing]):not([inDOMFullscreen='true']) {
|
||||
@@ -140,30 +163,8 @@
|
||||
width: calc(var(--zen-sidebar-width) + var(--zen-toolbox-padding));
|
||||
}
|
||||
|
||||
& #zen-toolbar-background {
|
||||
& .zen-toolbar-background {
|
||||
display: flex;
|
||||
overflow: clip;
|
||||
z-index: -1;
|
||||
background: black; /* Any color thats not white */
|
||||
box-shadow: var(--zen-big-shadow);
|
||||
@media -moz-pref('zen.theme.acrylic-elements') {
|
||||
background: transparent;
|
||||
backdrop-filter: blur(42px) saturate(110%) brightness(0.25) contrast(100%) !important;
|
||||
}
|
||||
|
||||
&::before,
|
||||
&::after {
|
||||
outline: 1px solid rgba(255, 255, 255, .15);
|
||||
outline-offset: -1px;
|
||||
background-attachment: fixed !important;
|
||||
background-size: 100vw !important;
|
||||
}
|
||||
|
||||
&,
|
||||
&::before,
|
||||
&::after {
|
||||
border-radius: calc(var(--zen-native-inner-radius) + var(--zen-element-separation) / 4 - var(--zen-compact-mode-no-padding-radius-fix, 0px));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -348,11 +349,6 @@
|
||||
}
|
||||
transition: all 0.15s ease;
|
||||
width: 100%;
|
||||
background: var(--zen-dialog-background);
|
||||
|
||||
& > * {
|
||||
position: relative !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -364,19 +360,8 @@
|
||||
) {
|
||||
& #zen-appcontent-navbar-container {
|
||||
visibility: visible !important;
|
||||
:root[zen-show-grainy-background='true'] &::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
background-image: url(chrome://browser/content/zen-images/grain-bg.png);
|
||||
pointer-events: none;
|
||||
z-index: 0;
|
||||
opacity: var(--zen-grainy-background-opacity, 0);
|
||||
mix-blend-mode: overlay;
|
||||
transition: opacity 0.3s ease-in-out;
|
||||
& .zen-toolbar-background {
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
border-top-width: 0px;
|
||||
|
||||
@@ -297,7 +297,11 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
|
||||
}
|
||||
// Add a min width to all the browser elements to prevent them from resizing
|
||||
const panelsWidth = gBrowser.tabbox.getBoundingClientRect().width;
|
||||
const halfWidth = panelsWidth / 2;
|
||||
let numOfTabsToDivide = 2;
|
||||
if (currentView) {
|
||||
numOfTabsToDivide = currentView.tabs.length + 1;
|
||||
}
|
||||
const halfWidth = panelsWidth / numOfTabsToDivide;
|
||||
let threshold =
|
||||
gNavToolbox.getBoundingClientRect().width *
|
||||
(gZenVerticalTabsManager._prefsRightSide ? 0 : 1);
|
||||
@@ -397,7 +401,12 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
|
||||
return;
|
||||
}
|
||||
const panelsWidth = panelsRect.width;
|
||||
const halfWidth = panelsWidth / 2;
|
||||
let numOfTabsToDivide = 2;
|
||||
const currentView = this._data[this._lastOpenedTab.splitViewValue];
|
||||
if (currentView) {
|
||||
numOfTabsToDivide = currentView.tabs.length + 1;
|
||||
}
|
||||
const halfWidth = panelsWidth / numOfTabsToDivide;
|
||||
const padding = ZenThemeModifier.elementSeparation;
|
||||
if (!this.fakeBrowser) {
|
||||
return;
|
||||
@@ -1180,6 +1189,7 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
|
||||
this.currentView = -1;
|
||||
this.toggleWrapperDisplay(false);
|
||||
this.maybeDisableOpeningTabOnSplitView();
|
||||
window.dispatchEvent(new CustomEvent('ZenViewSplitter:SplitViewDeactivated'));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1754,24 +1764,12 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
|
||||
} else {
|
||||
// Create new split view with layout based on drop position
|
||||
let gridType = 'vsep';
|
||||
//switch (hoverSide) {
|
||||
// case 'left':
|
||||
// case 'right':
|
||||
// gridType = 'vsep';
|
||||
// break;
|
||||
// case 'top':
|
||||
// case 'bottom':
|
||||
// gridType = 'hsep';
|
||||
// break;
|
||||
// default:
|
||||
// gridType = 'grid';
|
||||
//}
|
||||
|
||||
// Put tabs always as if it was dropped from the left
|
||||
this.splitTabs(
|
||||
dropSide == 'left' ? [draggedTab, droppedOnTab] : [droppedOnTab, draggedTab],
|
||||
gridType,
|
||||
1
|
||||
dropSide == 'left' ? 0 : 1
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
import { XPCOMUtils } from 'resource://gre/modules/XPCOMUtils.sys.mjs';
|
||||
import { UrlbarProvider, UrlbarUtils } from 'resource:///modules/UrlbarUtils.sys.mjs';
|
||||
import { globalActions } from 'resource:///modules/ZenUBGlobalActions.sys.mjs';
|
||||
import { zenUrlbarResultsLearner } from './ZenUBResultsLearner.sys.mjs';
|
||||
|
||||
const lazy = {};
|
||||
|
||||
@@ -12,9 +13,9 @@ const DYNAMIC_TYPE_NAME = 'zen-actions';
|
||||
|
||||
// The suggestion index of the actions row within the urlbar results.
|
||||
const MAX_RECENT_ACTIONS = 5;
|
||||
const MINIMUM_QUERY_SCORE = 92;
|
||||
|
||||
const EN_LOCALE_MATCH = /^en(-.*)$/;
|
||||
const MINIMUM_QUERY_SCORE = 92;
|
||||
const MINIMUM_PREFIXED_QUERY_SCORE = 50;
|
||||
|
||||
ChromeUtils.defineESModuleGetters(lazy, {
|
||||
UrlbarResult: 'resource:///modules/UrlbarResult.sys.mjs',
|
||||
@@ -22,6 +23,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
|
||||
QueryScorer: 'resource:///modules/UrlbarProviderInterventions.sys.mjs',
|
||||
BrowserWindowTracker: 'resource:///modules/BrowserWindowTracker.sys.mjs',
|
||||
AddonManager: 'resource://gre/modules/AddonManager.sys.mjs',
|
||||
zenUrlbarResultsLearner: 'resource:///modules/ZenUBResultsLearner.sys.mjs',
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyPreferenceGetter(
|
||||
@@ -35,6 +37,8 @@ XPCOMUtils.defineLazyPreferenceGetter(
|
||||
* A provider that lets the user view all available global actions for a query.
|
||||
*/
|
||||
export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
|
||||
#seenCommands = new Set();
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
lazy.UrlbarResult.addDynamicResultType(DYNAMIC_TYPE_NAME);
|
||||
@@ -60,12 +64,12 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
|
||||
*/
|
||||
async isActive(queryContext) {
|
||||
return (
|
||||
lazy.enabledPref &&
|
||||
queryContext.searchString &&
|
||||
queryContext.searchString.length < UrlbarUtils.MAX_TEXT_LENGTH &&
|
||||
queryContext.searchString.length > 2 &&
|
||||
!lazy.UrlbarTokenizer.REGEXP_LIKE_PROTOCOL.test(queryContext.searchString) &&
|
||||
EN_LOCALE_MATCH.test(Services.locale.appLocaleAsBCP47)
|
||||
queryContext.searchMode?.source == UrlbarUtils.RESULT_SOURCE.ZEN_ACTIONS ||
|
||||
(lazy.enabledPref &&
|
||||
queryContext.searchString &&
|
||||
queryContext.searchString.length < UrlbarUtils.MAX_TEXT_LENGTH &&
|
||||
queryContext.searchString.length > 2 &&
|
||||
!lazy.UrlbarTokenizer.REGEXP_LIKE_PROTOCOL.test(queryContext.searchString))
|
||||
);
|
||||
}
|
||||
|
||||
@@ -92,6 +96,7 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
|
||||
prettyIcon: workspace.icon,
|
||||
accentColor,
|
||||
},
|
||||
commandId: `zen:workspace-${workspace.uuid}`,
|
||||
icon: 'chrome://browser/skin/zen-icons/forward.svg',
|
||||
});
|
||||
}
|
||||
@@ -116,6 +121,7 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
|
||||
return {
|
||||
icon: 'chrome://browser/skin/zen-icons/extension.svg',
|
||||
label: 'Extension',
|
||||
commandId: `zen:extension-${addon.id}`,
|
||||
extraPayload: {
|
||||
extensionId: addon.id,
|
||||
prettyName: addon.name,
|
||||
@@ -142,14 +148,18 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
|
||||
* @param {string} query The user's search query.
|
||||
*
|
||||
*/
|
||||
async #findMatchingActions(query) {
|
||||
async #findMatchingActions(query, isPrefixed) {
|
||||
const window = lazy.BrowserWindowTracker.getTopWindow();
|
||||
const actions = await this.#getAvailableActions(window);
|
||||
let results = [];
|
||||
for (let action of actions) {
|
||||
if (isPrefixed && query.length < 1) {
|
||||
results.push({ action, score: 100 });
|
||||
continue;
|
||||
}
|
||||
const label = action.extraPayload?.prettyName || action.label;
|
||||
const score = this.#calculateFuzzyScore(label, query);
|
||||
if (score > MINIMUM_QUERY_SCORE) {
|
||||
if (score > (isPrefixed ? MINIMUM_PREFIXED_QUERY_SCORE : MINIMUM_QUERY_SCORE)) {
|
||||
results.push({
|
||||
score,
|
||||
action,
|
||||
@@ -157,6 +167,10 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
|
||||
}
|
||||
}
|
||||
results.sort((a, b) => b.score - a.score);
|
||||
// We must show all we can when prefixed, to avoid showing no results.
|
||||
if (isPrefixed) {
|
||||
return results.map((r) => r.action);
|
||||
}
|
||||
return results.slice(0, MAX_RECENT_ACTIONS).map((r) => r.action);
|
||||
}
|
||||
|
||||
@@ -217,16 +231,18 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
|
||||
|
||||
async startQuery(queryContext, addCallback) {
|
||||
const query = queryContext.trimmedLowerCaseSearchString;
|
||||
if (!query) {
|
||||
const isPrefixed = queryContext.searchMode?.source == UrlbarUtils.RESULT_SOURCE.ZEN_ACTIONS;
|
||||
if (!query && !isPrefixed) {
|
||||
return;
|
||||
}
|
||||
|
||||
const actionsResults = await this.#findMatchingActions(query);
|
||||
const actionsResults = await this.#findMatchingActions(query, isPrefixed);
|
||||
if (!actionsResults.length) {
|
||||
return;
|
||||
}
|
||||
|
||||
const ownerGlobal = lazy.BrowserWindowTracker.getTopWindow();
|
||||
const finalResults = [];
|
||||
for (const action of actionsResults) {
|
||||
const [payload, payloadHighlights] = lazy.UrlbarResult.payloadAndSimpleHighlights([], {
|
||||
suggestion: action.label,
|
||||
@@ -235,7 +251,7 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
|
||||
zenCommand: action.command,
|
||||
dynamicType: DYNAMIC_TYPE_NAME,
|
||||
zenAction: true,
|
||||
icon: action.icon || 'chrome://browser/skin/trending.svg',
|
||||
icon: action.icon,
|
||||
shortcutContent: ownerGlobal.gZenKeyboardShortcutsManager.getShortcutDisplayFromCommand(
|
||||
action.command
|
||||
),
|
||||
@@ -245,15 +261,26 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
|
||||
|
||||
let result = new lazy.UrlbarResult(
|
||||
UrlbarUtils.RESULT_TYPE.DYNAMIC,
|
||||
UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
|
||||
UrlbarUtils.RESULT_SOURCE.ZEN_ACTIONS,
|
||||
payload,
|
||||
payloadHighlights
|
||||
);
|
||||
if (typeof action.suggestedIndex === 'number') {
|
||||
result.suggestedIndex = action.suggestedIndex;
|
||||
if (zenUrlbarResultsLearner.shouldPrioritize(action.commandId)) {
|
||||
result.heuristic = true;
|
||||
} else {
|
||||
result.suggestedIndex = zenUrlbarResultsLearner.getDeprioritizeIndex(action.commandId);
|
||||
}
|
||||
addCallback(this, result);
|
||||
result.commandId = action.commandId;
|
||||
if (!(isPrefixed && query.length < 2)) {
|
||||
// We dont want to record prefixed results, as the user explicitly asked for them.
|
||||
// Selecting other results would de-prioritize these actions unfairly.
|
||||
this.#seenCommands.add(action.commandId);
|
||||
}
|
||||
finalResults.push(result);
|
||||
}
|
||||
zenUrlbarResultsLearner.sortCommandsByPriority(finalResults).forEach((result) => {
|
||||
addCallback(this, result);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -362,6 +389,19 @@ export class ZenUrlbarProviderGlobalActions extends UrlbarProvider {
|
||||
};
|
||||
}
|
||||
|
||||
onSearchSessionEnd(_queryContext, _controller, details) {
|
||||
// We should only record the execution if a result was actually used.
|
||||
// Otherwise we would start de-prioritizing commands that were never used.
|
||||
if (details?.result) {
|
||||
let usedCommand = null;
|
||||
if (details?.provider === this.name) {
|
||||
usedCommand = details.result?.commandId;
|
||||
}
|
||||
zenUrlbarResultsLearner.recordExecution(usedCommand, [...this.#seenCommands]);
|
||||
}
|
||||
this.#seenCommands = new Set();
|
||||
}
|
||||
|
||||
onEngagement(queryContext, controller, details) {
|
||||
const result = details.result;
|
||||
const payload = result.payload;
|
||||
|
||||
@@ -11,7 +11,6 @@ const globalActionsTemplate = [
|
||||
label: 'Toggle Compact Mode',
|
||||
command: 'cmd_zenCompactModeToggle',
|
||||
icon: 'chrome://browser/skin/zen-icons/sidebar.svg',
|
||||
suggestedIndex: 0,
|
||||
},
|
||||
{
|
||||
label: 'Open Theme Picker',
|
||||
@@ -22,7 +21,6 @@ const globalActionsTemplate = [
|
||||
label: 'New Split View',
|
||||
command: 'cmd_zenNewEmptySplit',
|
||||
icon: 'chrome://browser/skin/zen-icons/split.svg',
|
||||
suggestedIndex: 0,
|
||||
},
|
||||
{
|
||||
label: 'New Folder',
|
||||
@@ -33,7 +31,6 @@ const globalActionsTemplate = [
|
||||
label: 'Copy Current URL',
|
||||
command: 'cmd_zenCopyCurrentURL',
|
||||
icon: 'chrome://browser/skin/zen-icons/edit-copy.svg',
|
||||
suggestedIndex: 0,
|
||||
},
|
||||
{
|
||||
label: 'Settings',
|
||||
@@ -89,7 +86,6 @@ const globalActionsTemplate = [
|
||||
label: 'Close Tab',
|
||||
command: 'cmd_close',
|
||||
icon: 'chrome://browser/skin/zen-icons/close.svg',
|
||||
suggestedIndex: 1,
|
||||
isAvailable: (window) => {
|
||||
return isNotEmptyTab(window);
|
||||
},
|
||||
@@ -121,13 +117,11 @@ const globalActionsTemplate = [
|
||||
isAvailable: (window) => {
|
||||
return isNotEmptyTab(window);
|
||||
},
|
||||
suggestedIndex: 1,
|
||||
},
|
||||
{
|
||||
label: 'Toggle Tabs on right',
|
||||
command: 'cmd_zenToggleTabsOnRight',
|
||||
icon: 'chrome://browser/skin/zen-icons/sidebars-right.svg',
|
||||
suggestedIndex: 1,
|
||||
},
|
||||
{
|
||||
label: 'Add to Essentials',
|
||||
@@ -139,14 +133,12 @@ const globalActionsTemplate = [
|
||||
);
|
||||
},
|
||||
icon: 'chrome://browser/skin/zen-icons/essential-add.svg',
|
||||
suggestedIndex: 1,
|
||||
},
|
||||
{
|
||||
label: 'Remove from Essentials',
|
||||
command: (window) => window.gZenPinnedTabManager.removeEssentials(window.gBrowser.selectedTab),
|
||||
isAvailable: (window) => window.gBrowser.selectedTab.hasAttribute('zen-essential'),
|
||||
icon: 'chrome://browser/skin/zen-icons/essential-remove.svg',
|
||||
suggestedIndex: 1,
|
||||
},
|
||||
{
|
||||
label: 'Find in Page',
|
||||
@@ -155,13 +147,11 @@ const globalActionsTemplate = [
|
||||
isAvailable: (window) => {
|
||||
return isNotEmptyTab(window);
|
||||
},
|
||||
suggestedIndex: 1,
|
||||
},
|
||||
{
|
||||
label: 'Manage Extensions',
|
||||
command: 'Tools:Addons',
|
||||
icon: 'chrome://browser/skin/zen-icons/extension.svg',
|
||||
suggestedIndex: 1,
|
||||
},
|
||||
];
|
||||
|
||||
@@ -169,6 +159,10 @@ export const globalActions = globalActionsTemplate.map((action) => ({
|
||||
isAvailable: (window) => {
|
||||
return window.document.getElementById(action.command)?.getAttribute('disabled') !== 'true';
|
||||
},
|
||||
commandId:
|
||||
typeof action.command === 'string'
|
||||
? action.command
|
||||
: `zen:global-action-${action.label.toLowerCase().replace(/\s+/g, '-')}`,
|
||||
extraPayload: {},
|
||||
...action,
|
||||
}));
|
||||
|
||||
108
src/zen/urlbar/ZenUBResultsLearner.sys.mjs
Normal file
108
src/zen/urlbar/ZenUBResultsLearner.sys.mjs
Normal file
@@ -0,0 +1,108 @@
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
import { XPCOMUtils } from 'resource://gre/modules/XPCOMUtils.sys.mjs';
|
||||
|
||||
const lazy = {};
|
||||
|
||||
const DEFAULT_DB_DATA = '{}';
|
||||
const DEPRIORITIZE_MAX = -4;
|
||||
const PRIORITIZE_MAX = 5;
|
||||
|
||||
XPCOMUtils.defineLazyPreferenceGetter(
|
||||
lazy,
|
||||
'database',
|
||||
'zen.urlbar.suggestions-learner',
|
||||
'DEFAULT_DB_DATA'
|
||||
);
|
||||
|
||||
/**
|
||||
* A class that manages the learning of URL bar results for commands,
|
||||
* can be used for any ID that can be executed in the URL bar.
|
||||
*
|
||||
* The schema would be something like:
|
||||
* {
|
||||
* "<command id>": <priority number>,
|
||||
* }
|
||||
*
|
||||
* If the current command is not on the list is because the user
|
||||
* has *seen* the command but never executed it. If the number is
|
||||
* less than -2, that means the user will most likely never use it.
|
||||
*
|
||||
* The priority number is incremented each time the command is executed.
|
||||
*/
|
||||
class ZenUrlbarResultsLearner {
|
||||
constructor() {}
|
||||
|
||||
get database() {
|
||||
try {
|
||||
return JSON.parse(lazy.database);
|
||||
} catch {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
saveDatabase(db) {
|
||||
Services.prefs.setStringPref(
|
||||
'zen.urlbar.suggestions-learner',
|
||||
JSON.stringify(db || DEFAULT_DB_DATA)
|
||||
);
|
||||
}
|
||||
|
||||
recordExecution(commandId, seenCommands = []) {
|
||||
const db = this.database;
|
||||
if (commandId) {
|
||||
const numberOfUsages = Math.min((db[commandId] || 0) + 1, PRIORITIZE_MAX);
|
||||
db[commandId] = numberOfUsages;
|
||||
}
|
||||
for (const cmd of seenCommands) {
|
||||
if (cmd !== commandId) {
|
||||
if (!db[cmd]) {
|
||||
db[cmd] = -1;
|
||||
} else {
|
||||
const newIndex = Math.max(db[cmd] - 1, DEPRIORITIZE_MAX);
|
||||
db[cmd] = newIndex;
|
||||
if (newIndex === 0) {
|
||||
// Save some space by deleting commands that are not used
|
||||
// and have a neutral score.
|
||||
delete db[cmd];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
this.saveDatabase(db);
|
||||
}
|
||||
|
||||
shouldPrioritize(commandId) {
|
||||
if (!commandId) {
|
||||
return false;
|
||||
}
|
||||
const db = this.database;
|
||||
return !!db[commandId] && db[commandId] > 0;
|
||||
}
|
||||
|
||||
getDeprioritizeIndex(commandId) {
|
||||
if (!commandId) {
|
||||
return 1;
|
||||
}
|
||||
const db = this.database;
|
||||
if (db[commandId] < 0) {
|
||||
return Math.abs(db[commandId]);
|
||||
}
|
||||
// This will most likely never run, since
|
||||
// positive commands are prioritized.
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sorts the given commands by their priority in the database.
|
||||
* @param {*} commands
|
||||
*/
|
||||
sortCommandsByPriority(commands) {
|
||||
const db = this.database;
|
||||
return commands.sort((a, b) => (db[b.commandId] || 0) - (db[a.commandId] || 0));
|
||||
}
|
||||
}
|
||||
|
||||
export const zenUrlbarResultsLearner = new ZenUrlbarResultsLearner();
|
||||
@@ -6,4 +6,5 @@ EXTRA_JS_MODULES += [
|
||||
"ZenUBActionsProvider.sys.mjs",
|
||||
"ZenUBGlobalActions.sys.mjs",
|
||||
"ZenUBProvider.sys.mjs",
|
||||
"ZenUBResultsLearner.sys.mjs",
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user