merge the parent branch into the current branch, resolve conflicts

Author: slavaleleka

CHANGELOG.md

@@ -15,17 +15,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Updated blocking pages for MV2 — Safebrowsing and blocked by `$document` rules.
+- Ability to exit editor by pressing `Escape` keyboard button [#2333].
+- Updated Safebrowsing and blocked by rules blocking pages.
+- Improved accessibility for visually impaired users [#3035], [#2315], [#2332].
 
 ### Removed
 
 ### Fixed
 
+- Cannot maximize Filtering log in Firefox for Windows [#2464].
 - Unable to paste text into user rules input field on Android [#3061].
 - Invalid HTML rule selectors are breaking site loading [#2646].
 
+[#2464]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2464
 [#2646]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2646
 [#3055]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/3055
 [#3061]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/3061
+[#3035]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/3035
+[#2315]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2315
+[#2332]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2332
+[#2333]: https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2333
 
 ## [5.1.68] - 2025-03-07
 

Extension/_locales/en/messages.json

@@ -14,6 +14,9 @@
     "options_filters_empty_title": {
         "message": "Nothing found"
     },
+    "options_filters_of_group": {
+        "message": "Filters of \"%groupName%\" group"
+    },
     "options_antibanner_custom_filter_already_exists": {
         "message": "This custom filter has already been added"
     },
@@ -59,6 +62,12 @@
     "options_filters_filter_updated": {
         "message": "updated:"
     },
+    "options_filters_filter_tags": {
+        "message": "Filter tags"
+    },
+    "options_filters_back_button": {
+        "message": "Go back"
+    },
     "options_popup_version_update_disable_notification": {
         "message": "Disable notifications"
     },
@@ -309,6 +318,9 @@
     "popup_site_exception_information": {
         "message": "Filtering is disabled because it can interfere with this website's operation."
     },
+    "popup_tab_current_website": {
+        "message": "Current website"
+    },
     "popup_tab_blocked_count": {
         "message": "Blocked: %num%"
     },
@@ -318,6 +330,9 @@
     "popup_statistics_total": {
         "message": "Total"
     },
+    "popup_statistics_category_label": {
+        "message": "Statistics category"
+    },
     "popup_statistics_all_categories": {
         "message": "All"
     },
@@ -393,6 +408,9 @@
     "popup_statistics_months_dec": {
         "message": "Dec"
     },
+    "options_popup_updating_filters": {
+        "message": "Updating filters..."
+    },
     "options_popup_update_title_error": {
         "message": "Error updating filters"
     },
@@ -435,6 +453,12 @@
     "popup_reset_page_user_rules": {
         "message": "Delete user rules for this website"
     },
+    "popup_open_settings": {
+        "message": "Open AdGuard settings"
+    },
+    "popup_protection_button": {
+        "message": "AdGuard protection"
+    },
     "context_block_site_ads": {
         "message": "Block ads manually"
     },
@@ -540,6 +564,12 @@
     "filtering_table_filter": {
         "message": "Filter"
     },
+    "filtering_table_action": {
+        "message": "Action"
+    },
+    "filtering_table_open_details": {
+        "message": "Open details"
+    },
     "filtering_table_empty_reload_page_desc": {
         "message": "Nothing found. <reset>Disable filters<\/reset> or <refresh>reload the page<\/refresh> to view log records."
     },
@@ -681,6 +711,12 @@
     "filtering_log_status_modified": {
         "message": "Modified"
     },
+    "options_skip_to_main_content": {
+        "message": "Skip to main content"
+    },
+    "options_navigation": {
+        "message": "Navigation"
+    },
     "options_settings": {
         "message": "AdGuard Settings"
     },
@@ -768,6 +804,9 @@
     "options_userfilter_subtitle_key": {
         "message": "Fine-tune ad blocking with your own filtering rules"
     },
+    "options_userfilter_line_break": {
+        "message": "Line break"
+    },
     "options_userfilter_line_break_off": {
         "message": "Line break: Disabled"
     },
@@ -1006,12 +1045,18 @@
     "popup_open_filtering_log": {
         "message": "Open filtering log"
     },
+    "popup_tabs": {
+        "message": "Tabs"
+    },
     "popup_tab_actions": {
         "message": "Actions"
     },
     "popup_tab_statistics": {
         "message": "Statistics"
     },
+    "popup_statistics_time_label": {
+        "message": "Statistics time period"
+    },
     "popup_statistics_time_day": {
         "message": "Last day"
     },
@@ -1025,7 +1070,7 @@
         "message": "Last year"
     },
     "popup_switch_button": {
-        "message": "Protection switch"
+        "message": "Protection for current website"
     },
     "popup_limits_exceeded_warning": {
         "message": "Your browser has modified the list of active built-in filters"
@@ -1051,6 +1096,9 @@
     "options_about_version": {
         "message": "Version"
     },
+    "options_about_libs": {
+        "message": "Used libraries"
+    },
     "options_copyright": {
         "message": "All rights reserved."
     },
@@ -1069,6 +1117,9 @@
     "options_filters_search": {
         "message": "Search"
     },
+    "options_filters_search_filter": {
+        "message": "Search filter"
+    },
     "options_about_title": {
         "message": "AdGuard Browser extension"
     },
@@ -1138,12 +1189,18 @@
     "filtering_log_details_modal_try_again": {
         "message": "Try again"
     },
+    "filtering_log_tag_request_source": {
+        "message": "Request source"
+    },
     "filtering_log_tag_tooltip_first_party": {
         "message": "First-party requests"
     },
     "filtering_log_tag_tooltip_third_party": {
         "message": "Third-party requests"
     },
+    "filtering_log_tag_request_status": {
+        "message": "Request status"
+    },
     "filtering_log_tag_tooltip_regular": {
         "message": "Requests processed without filtering"
     },
@@ -1159,6 +1216,9 @@
     "filtering_log_tag_tooltip_user_rules": {
         "message": "Requests affected by user rules"
     },
+    "filtering_log_tag_request_type": {
+        "message": "Request type"
+    },
     "filtering_log_tag_tooltip_html": {
         "message": "Documents and subdocuments"
     },
@@ -1243,6 +1303,9 @@
     "close_button_title": {
         "message": "Close"
     },
+    "clear_button_title": {
+        "message": "Clear"
+    },
     "filtering_modal_applied_rules": {
         "message": "| Applied rule: | Applied rules:",
         "description": "WARNING: correct number of plural forms is required"

Extension/src/background/api/ui/pages.ts

@@ -209,14 +209,22 @@ export class PagesApi {
 
         const windowStateString = await browserStorage.get(FILTERING_LOG_WINDOW_STATE);
 
+        // Firefox does not allow to maximize popup windows on Windows operating system.
+        // For more details, see the Bugzilla report:
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=1756507
+        // As a temporary solution, we open the window in a normal state for Firefox on Windows
+        // to fix issue reported to us:
+        // https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2464
+        const windowType = UserAgent.isFirefox && UserAgent.isWindows ? 'normal' : 'popup';
+
         try {
             const options = typeof windowStateString === 'string'
                 ? JSON.parse(windowStateString)
                 : PagesApi.defaultPopupWindowState;
 
             await WindowsApi.create({
                 url,
-                type: 'popup',
+                type: windowType,
                 ...options,
             });
         } catch (e) {
@@ -227,7 +235,7 @@ export class PagesApi {
                 // https://github.com/AdguardTeam/AdguardBrowserExtension/issues/2100
                 await WindowsApi.create({
                     url,
-                    type: 'popup',
+                    type: windowType,
                     ...PagesApi.defaultPopupWindowState,
                 });
             }

Extension/src/background/api/ui/toasts.ts

@@ -333,7 +333,7 @@ export class Toasts {
      *
      * @returns Title and text lines for message.
      */
-    private static getFiltersUpdateResultMessage(
+    public static getFiltersUpdateResultMessage(
         success: boolean,
         updatedFilters?: FilterMetadata[],
     ): {

Extension/src/pages/common/common-script.ts

@@ -50,7 +50,7 @@ export async function sleepIfNecessary(
  */
 export function addMinDurationTime<
     T extends (...args: any[]) => Promise<R>,
-    R,
+    R = Awaited<ReturnType<T>>,
 >(fn: T, minDurationMs: number): (...args: Parameters<T>) => Promise<R> {
     return async (...args: Parameters<T>): Promise<R> => {
         const start = Date.now();

Extension/src/pages/common/components/ConfirmModal/ConfirmModal.tsx

@@ -142,10 +142,10 @@ export const ConfirmModal = ({
                         <button
                             type="button"
                             className="button modal__close"
-                            aria-label={translator.getMessage('close_button_title')}
+                            title={translator.getMessage('close_button_title')}
                             onClick={handleCancel}
                         >
-                            <Icon id="#cross" />
+                            <Icon id="#cross" aria-hidden="true" />
                         </button>
                     </div>
                     {subtitle && (

Extension/src/pages/common/components/Editor/Editor.jsx

@@ -43,11 +43,13 @@ const Editor = ({
     name,
     value,
     editorRef,
-    shortcuts,
+    shortcuts = [],
     onChange,
     fullscreen,
     highlightRules,
     shouldResetSize,
+    onSave,
+    onExit,
 }) => {
     const SIZE_STORAGE_KEY = `${name}_editor-size`;
     const editorStorageSize = localStorage.getItem(SIZE_STORAGE_KEY);
@@ -94,6 +96,20 @@ const Editor = ({
     // highlight rules syntax only for user rules
     const editorMode = highlightRules ? 'adguard' : 'text';
 
+    const mergedShortcuts = [
+        {
+            name: 'save',
+            bindKey: { win: 'Ctrl-S', mac: 'Command-S' },
+            exec: onSave,
+        },
+        {
+            name: 'exit',
+            bindKey: { win: 'Esc', mac: 'Esc' },
+            exec: onExit,
+        },
+        ...shortcuts,
+    ];
+
     return (
         <div style={editorStyles} className={editorClassName}>
             <AceEditor
@@ -107,7 +123,7 @@ const Editor = ({
                 editorProps={{ $blockScrolling: true }}
                 fontSize={14}
                 value={value}
-                commands={shortcuts}
+                commands={mergedShortcuts}
                 onChange={onChange}
             />
             <ReactResizeDetector

Extension/src/pages/common/components/SavingButton/SavingButton.tsx

@@ -23,6 +23,7 @@ import classnames from 'classnames';
 import { SavingFSMState } from '../Editor/savingFSM';
 import { translator } from '../../../../common/translators/translator';
 import { Icon } from '../ui/Icon';
+import { UserAgent } from '../../../../common/user-agent';
 
 const renderSavingState = (savingRulesState: SavingFSMState) => {
     type IndicatorTextMapType = {
@@ -51,6 +52,7 @@ const renderSavingState = (savingRulesState: SavingFSMState) => {
             <Icon
                 id="#tick"
                 classname="icon--18 icon--green-default editor__icon"
+                aria-hidden="true"
             />
             {indicatorText}
         </div>
@@ -84,6 +86,7 @@ export const SavingButton = ({ onClick, savingState, contentChanged }: SavingBut
                 onClick={onClick}
                 title={translator.getMessage('options_editor_save')}
                 disabled={!contentChanged}
+                aria-keyshortcuts={UserAgent.isMacOs ? 'Meta+S' : 'Ctrl+S'}
             >
                 {translator.getMessage('options_editor_save')}
             </button>