Skip to content

Commit 48881c9

Browse files
authored
Merge branch 'main' into randerson/omnibar-tab-switcher-hover-improvements
2 parents 2b0528e + 5e1597c commit 48881c9

File tree

10 files changed

+89
-19
lines changed

10 files changed

+89
-19
lines changed

special-pages/pages/new-tab/app/omnibar/components/AiChatForm.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@ export function AiChatForm({ chat, autoFocus, onFocus, onBlur, onInput, onChange
9797
aria-label={t('omnibar_aiChatFormPlaceholder')}
9898
autoComplete="off"
9999
rows={1}
100-
onFocus={onFocus}
101-
onBlur={onBlur}
100+
// Using capture to work around WebKit which doesn't fire focus/blur event when user moves focus from/to address bar.
101+
onFocusCapture={onFocus}
102+
onBlurCapture={onBlur}
102103
onInput={onInput}
103104
onKeyDown={handleKeyDown}
104105
onChange={handleChange}

special-pages/pages/new-tab/app/omnibar/components/SearchForm.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,12 @@ export function SearchForm({ term, autoFocus, onChangeTerm, onOpenSuggestion, on
6666
};
6767

6868
return (
69-
<form class={styles.form} onBlur={handleBlur} onSubmit={handleSubmit}>
69+
<form
70+
class={styles.form}
71+
// Using onBlurCapture to work around WebKit which doesn't fire blur event when user selects address bar.
72+
onBlurCapture={handleBlur}
73+
onSubmit={handleSubmit}
74+
>
7075
<div class={styles.inputContainer} style={{ '--suffix-text-width': `${measureText(inputSuffixText)}px` }}>
7176
{inputSuffix?.kind === 'visit' ? <GlobeIcon inert /> : <SearchIcon inert />}
7277
<input

special-pages/pages/new-tab/public/locales/de/new-tab.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"description" : "Title of the omnibar widget in the customizer panel."
130130
},
131131
"omnibar_aiChatFormPlaceholder" : {
132-
"title" : "Privat mit Duck.ai chatten",
132+
"title" : "Privat fragen",
133133
"description" : "Placeholder text for the AI chat input field."
134134
},
135135
"omnibar_aiChatFormSubmitButtonLabel" : {
@@ -153,9 +153,17 @@
153153
"description" : "Label for the AI chat tab."
154154
},
155155
"omnibar_searchFormPlaceholder" : {
156-
"title" : "Adresse suchen oder eingeben",
156+
"title" : "Privat suchen",
157157
"description" : "Placeholder text for the search input field."
158158
},
159+
"omnibar_hideDuckAi" : {
160+
"title" : "Duck.ai ausblenden",
161+
"description" : "Label for the button to hide the Duck.ai chat interface."
162+
},
163+
"omnibar_showDuckAi" : {
164+
"title" : "Duck.ai anzeigen",
165+
"description" : "Label for the button to show the Duck.ai chat interface."
166+
},
159167
"omnibar_searchDuckDuckGoSuffix" : {
160168
"title" : "Mit DuckDuckGo suchen",
161169
"description" : "Text placed after suggestions that will search DuckDuckGo."

special-pages/pages/new-tab/public/locales/es/new-tab.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"description" : "Title of the omnibar widget in the customizer panel."
130130
},
131131
"omnibar_aiChatFormPlaceholder" : {
132-
"title" : "Chatea en privado con Duck.ai",
132+
"title" : "Pregunta en privado",
133133
"description" : "Placeholder text for the AI chat input field."
134134
},
135135
"omnibar_aiChatFormSubmitButtonLabel" : {
@@ -153,9 +153,17 @@
153153
"description" : "Label for the AI chat tab."
154154
},
155155
"omnibar_searchFormPlaceholder" : {
156-
"title" : "Buscar o introducir dirección",
156+
"title" : "Busca de manera privada",
157157
"description" : "Placeholder text for the search input field."
158158
},
159+
"omnibar_hideDuckAi" : {
160+
"title" : "Ocultar Duck.ai",
161+
"description" : "Label for the button to hide the Duck.ai chat interface."
162+
},
163+
"omnibar_showDuckAi" : {
164+
"title" : "Mostrar Duck.ai",
165+
"description" : "Label for the button to show the Duck.ai chat interface."
166+
},
159167
"omnibar_searchDuckDuckGoSuffix" : {
160168
"title" : "Buscar en DuckDuckGo",
161169
"description" : "Text placed after suggestions that will search DuckDuckGo."

special-pages/pages/new-tab/public/locales/fr/new-tab.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"description" : "Title of the omnibar widget in the customizer panel."
130130
},
131131
"omnibar_aiChatFormPlaceholder" : {
132-
"title" : "Discutez en privé avec Duck.ai",
132+
"title" : "Demander en privé",
133133
"description" : "Placeholder text for the AI chat input field."
134134
},
135135
"omnibar_aiChatFormSubmitButtonLabel" : {
@@ -153,9 +153,17 @@
153153
"description" : "Label for the AI chat tab."
154154
},
155155
"omnibar_searchFormPlaceholder" : {
156-
"title" : "Rechercher ou saisir une adresse",
156+
"title" : "Faites une recherche privée",
157157
"description" : "Placeholder text for the search input field."
158158
},
159+
"omnibar_hideDuckAi" : {
160+
"title" : "Masquer Duck.ai",
161+
"description" : "Label for the button to hide the Duck.ai chat interface."
162+
},
163+
"omnibar_showDuckAi" : {
164+
"title" : "Afficher Duck.ai",
165+
"description" : "Label for the button to show the Duck.ai chat interface."
166+
},
159167
"omnibar_searchDuckDuckGoSuffix" : {
160168
"title" : "Rechercher avec DuckDuckGo",
161169
"description" : "Text placed after suggestions that will search DuckDuckGo."

special-pages/pages/new-tab/public/locales/it/new-tab.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"description" : "Title of the omnibar widget in the customizer panel."
130130
},
131131
"omnibar_aiChatFormPlaceholder" : {
132-
"title" : "Chatta in privato con Duck.ai",
132+
"title" : "Chiedi in privato",
133133
"description" : "Placeholder text for the AI chat input field."
134134
},
135135
"omnibar_aiChatFormSubmitButtonLabel" : {
@@ -153,9 +153,17 @@
153153
"description" : "Label for the AI chat tab."
154154
},
155155
"omnibar_searchFormPlaceholder" : {
156-
"title" : "Cerca o digita l'indirizzo",
156+
"title" : "Cerca privatamente",
157157
"description" : "Placeholder text for the search input field."
158158
},
159+
"omnibar_hideDuckAi" : {
160+
"title" : "Nascondi Duck.ai",
161+
"description" : "Label for the button to hide the Duck.ai chat interface."
162+
},
163+
"omnibar_showDuckAi" : {
164+
"title" : "Mostra Duck.ai",
165+
"description" : "Label for the button to show the Duck.ai chat interface."
166+
},
159167
"omnibar_searchDuckDuckGoSuffix" : {
160168
"title" : "Cerca con DuckDuckGo",
161169
"description" : "Text placed after suggestions that will search DuckDuckGo."

special-pages/pages/new-tab/public/locales/nl/new-tab.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"description" : "Title of the omnibar widget in the customizer panel."
130130
},
131131
"omnibar_aiChatFormPlaceholder" : {
132-
"title" : "Privé chatten met Duck.ai",
132+
"title" : "Vraag privé",
133133
"description" : "Placeholder text for the AI chat input field."
134134
},
135135
"omnibar_aiChatFormSubmitButtonLabel" : {
@@ -153,9 +153,17 @@
153153
"description" : "Label for the AI chat tab."
154154
},
155155
"omnibar_searchFormPlaceholder" : {
156-
"title" : "Zoek of voer een adres in",
156+
"title" : "Privé zoeken",
157157
"description" : "Placeholder text for the search input field."
158158
},
159+
"omnibar_hideDuckAi" : {
160+
"title" : "Duck.ai verbergen",
161+
"description" : "Label for the button to hide the Duck.ai chat interface."
162+
},
163+
"omnibar_showDuckAi" : {
164+
"title" : "Duck.ai weergeven",
165+
"description" : "Label for the button to show the Duck.ai chat interface."
166+
},
159167
"omnibar_searchDuckDuckGoSuffix" : {
160168
"title" : "Zoek in DuckDuckGo",
161169
"description" : "Text placed after suggestions that will search DuckDuckGo."

special-pages/pages/new-tab/public/locales/pl/new-tab.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"description" : "Title of the omnibar widget in the customizer panel."
130130
},
131131
"omnibar_aiChatFormPlaceholder" : {
132-
"title" : "Czatuj prywatnie z Duck.ai",
132+
"title" : "Zapytaj prywatnie",
133133
"description" : "Placeholder text for the AI chat input field."
134134
},
135135
"omnibar_aiChatFormSubmitButtonLabel" : {
@@ -153,9 +153,17 @@
153153
"description" : "Label for the AI chat tab."
154154
},
155155
"omnibar_searchFormPlaceholder" : {
156-
"title" : "Wyszukaj lub wprowadź adres",
156+
"title" : "Szukaj prywatnie",
157157
"description" : "Placeholder text for the search input field."
158158
},
159+
"omnibar_hideDuckAi" : {
160+
"title" : "Ukryj Duck.ai",
161+
"description" : "Label for the button to hide the Duck.ai chat interface."
162+
},
163+
"omnibar_showDuckAi" : {
164+
"title" : "Pokaż Duck.ai",
165+
"description" : "Label for the button to show the Duck.ai chat interface."
166+
},
159167
"omnibar_searchDuckDuckGoSuffix" : {
160168
"title" : "Szukaj w DuckDuckGo",
161169
"description" : "Text placed after suggestions that will search DuckDuckGo."

special-pages/pages/new-tab/public/locales/pt/new-tab.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"description" : "Title of the omnibar widget in the customizer panel."
130130
},
131131
"omnibar_aiChatFormPlaceholder" : {
132-
"title" : "Conversa em privado com o Duck.ai",
132+
"title" : "Perguntar em privado",
133133
"description" : "Placeholder text for the AI chat input field."
134134
},
135135
"omnibar_aiChatFormSubmitButtonLabel" : {
@@ -153,9 +153,17 @@
153153
"description" : "Label for the AI chat tab."
154154
},
155155
"omnibar_searchFormPlaceholder" : {
156-
"title" : "Pesquisar ou inserir endereço",
156+
"title" : "Pesquisar em privado",
157157
"description" : "Placeholder text for the search input field."
158158
},
159+
"omnibar_hideDuckAi" : {
160+
"title" : "Ocultar Duck.ai",
161+
"description" : "Label for the button to hide the Duck.ai chat interface."
162+
},
163+
"omnibar_showDuckAi" : {
164+
"title" : "Mostrar Duck.ai",
165+
"description" : "Label for the button to show the Duck.ai chat interface."
166+
},
159167
"omnibar_searchDuckDuckGoSuffix" : {
160168
"title" : "Pesquisar no DuckDuckGo",
161169
"description" : "Text placed after suggestions that will search DuckDuckGo."

special-pages/pages/new-tab/public/locales/ru/new-tab.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
"description" : "Title of the omnibar widget in the customizer panel."
130130
},
131131
"omnibar_aiChatFormPlaceholder" : {
132-
"title" : "Приватный чат с Duck.ai",
132+
"title" : "Задать вопрос (конфиденциально)",
133133
"description" : "Placeholder text for the AI chat input field."
134134
},
135135
"omnibar_aiChatFormSubmitButtonLabel" : {
@@ -153,9 +153,17 @@
153153
"description" : "Label for the AI chat tab."
154154
},
155155
"omnibar_searchFormPlaceholder" : {
156-
"title" : "Введите поисковый запрос или адрес сайта",
156+
"title" : "Конфиденциальный поиск",
157157
"description" : "Placeholder text for the search input field."
158158
},
159+
"omnibar_hideDuckAi" : {
160+
"title" : "Скрыть Duck.ai",
161+
"description" : "Label for the button to hide the Duck.ai chat interface."
162+
},
163+
"omnibar_showDuckAi" : {
164+
"title" : "Показать Duck.ai",
165+
"description" : "Label for the button to show the Duck.ai chat interface."
166+
},
159167
"omnibar_searchDuckDuckGoSuffix" : {
160168
"title" : "Поиск в DuckDuckGo",
161169
"description" : "Text placed after suggestions that will search DuckDuckGo."

0 commit comments

Comments
 (0)