diff --git a/Libraries/LibWeb/ARIA/ARIAMixin.h b/Libraries/LibWeb/ARIA/ARIAMixin.h index f6aebc1b0ca..6c78c66d91a 100644 --- a/Libraries/LibWeb/ARIA/ARIAMixin.h +++ b/Libraries/LibWeb/ARIA/ARIAMixin.h @@ -9,177 +9,21 @@ #include #include #include +#include #include #include namespace Web::ARIA { class ARIAMixin { - public: virtual ~ARIAMixin() = default; - virtual Optional role() const = 0; - virtual WebIDL::ExceptionOr set_role(Optional const&) = 0; - - virtual Optional aria_active_descendant() const = 0; - virtual WebIDL::ExceptionOr set_aria_active_descendant(Optional const&) = 0; - - virtual Optional aria_atomic() const = 0; - virtual WebIDL::ExceptionOr set_aria_atomic(Optional const&) = 0; - - virtual Optional aria_auto_complete() const = 0; - virtual WebIDL::ExceptionOr set_aria_auto_complete(Optional const&) = 0; - - virtual Optional aria_braille_label() const = 0; - virtual WebIDL::ExceptionOr set_aria_braille_label(Optional const&) = 0; - - virtual Optional aria_braille_role_description() const = 0; - virtual WebIDL::ExceptionOr set_aria_braille_role_description(Optional const&) = 0; - - virtual Optional aria_busy() const = 0; - virtual WebIDL::ExceptionOr set_aria_busy(Optional const&) = 0; - - virtual Optional aria_checked() const = 0; - virtual WebIDL::ExceptionOr set_aria_checked(Optional const&) = 0; - - virtual Optional aria_col_count() const = 0; - virtual WebIDL::ExceptionOr set_aria_col_count(Optional const&) = 0; - - virtual Optional aria_col_index() const = 0; - virtual WebIDL::ExceptionOr set_aria_col_index(Optional const&) = 0; - - virtual Optional aria_col_index_text() const = 0; - virtual WebIDL::ExceptionOr set_aria_col_index_text(Optional const&) = 0; - - virtual Optional aria_col_span() const = 0; - virtual WebIDL::ExceptionOr set_aria_col_span(Optional const&) = 0; - - virtual Optional aria_controls() const = 0; - virtual WebIDL::ExceptionOr set_aria_controls(Optional const&) = 0; - - virtual Optional aria_current() const = 0; - virtual WebIDL::ExceptionOr set_aria_current(Optional const&) = 0; - - virtual Optional aria_described_by() const = 0; - virtual WebIDL::ExceptionOr set_aria_described_by(Optional const&) = 0; - - virtual Optional aria_description() const = 0; - virtual WebIDL::ExceptionOr set_aria_description(Optional const&) = 0; - - virtual Optional aria_details() const = 0; - virtual WebIDL::ExceptionOr set_aria_details(Optional const&) = 0; - - virtual Optional aria_disabled() const = 0; - virtual WebIDL::ExceptionOr set_aria_disabled(Optional const&) = 0; - - virtual Optional aria_drop_effect() const = 0; - virtual WebIDL::ExceptionOr set_aria_drop_effect(Optional const&) = 0; - - virtual Optional aria_error_message() const = 0; - virtual WebIDL::ExceptionOr set_aria_error_message(Optional const&) = 0; - - virtual Optional aria_expanded() const = 0; - virtual WebIDL::ExceptionOr set_aria_expanded(Optional const&) = 0; - - virtual Optional aria_flow_to() const = 0; - virtual WebIDL::ExceptionOr set_aria_flow_to(Optional const&) = 0; - - virtual Optional aria_grabbed() const = 0; - virtual WebIDL::ExceptionOr set_aria_grabbed(Optional const&) = 0; - - virtual Optional aria_has_popup() const = 0; - virtual WebIDL::ExceptionOr set_aria_has_popup(Optional const&) = 0; - - virtual Optional aria_hidden() const = 0; - virtual WebIDL::ExceptionOr set_aria_hidden(Optional const&) = 0; - - virtual Optional aria_invalid() const = 0; - virtual WebIDL::ExceptionOr set_aria_invalid(Optional const&) = 0; - - virtual Optional aria_key_shortcuts() const = 0; - virtual WebIDL::ExceptionOr set_aria_key_shortcuts(Optional const&) = 0; - - virtual Optional aria_label() const = 0; - virtual WebIDL::ExceptionOr set_aria_label(Optional const&) = 0; - - virtual Optional aria_labelled_by() const = 0; - virtual WebIDL::ExceptionOr set_aria_labelled_by(Optional const&) = 0; - - virtual Optional aria_level() const = 0; - virtual WebIDL::ExceptionOr set_aria_level(Optional const&) = 0; - - virtual Optional aria_live() const = 0; - virtual WebIDL::ExceptionOr set_aria_live(Optional const&) = 0; - - virtual Optional aria_modal() const = 0; - virtual WebIDL::ExceptionOr set_aria_modal(Optional const&) = 0; - - virtual Optional aria_multi_line() const = 0; - virtual WebIDL::ExceptionOr set_aria_multi_line(Optional const&) = 0; - - virtual Optional aria_multi_selectable() const = 0; - virtual WebIDL::ExceptionOr set_aria_multi_selectable(Optional const&) = 0; - - virtual Optional aria_orientation() const = 0; - virtual WebIDL::ExceptionOr set_aria_orientation(Optional const&) = 0; - - virtual Optional aria_owns() const = 0; - virtual WebIDL::ExceptionOr set_aria_owns(Optional const&) = 0; - - virtual Optional aria_placeholder() const = 0; - virtual WebIDL::ExceptionOr set_aria_placeholder(Optional const&) = 0; - - virtual Optional aria_pos_in_set() const = 0; - virtual WebIDL::ExceptionOr set_aria_pos_in_set(Optional const&) = 0; - - virtual Optional aria_pressed() const = 0; - virtual WebIDL::ExceptionOr set_aria_pressed(Optional const&) = 0; - - virtual Optional aria_read_only() const = 0; - virtual WebIDL::ExceptionOr set_aria_read_only(Optional const&) = 0; - - virtual Optional aria_relevant() const = 0; - virtual WebIDL::ExceptionOr set_aria_relevant(Optional const&) = 0; - - virtual Optional aria_required() const = 0; - virtual WebIDL::ExceptionOr set_aria_required(Optional const&) = 0; - - virtual Optional aria_role_description() const = 0; - virtual WebIDL::ExceptionOr set_aria_role_description(Optional const&) = 0; - - virtual Optional aria_row_count() const = 0; - virtual WebIDL::ExceptionOr set_aria_row_count(Optional const&) = 0; - - virtual Optional aria_row_index() const = 0; - virtual WebIDL::ExceptionOr set_aria_row_index(Optional const&) = 0; - - virtual Optional aria_row_index_text() const = 0; - virtual WebIDL::ExceptionOr set_aria_row_index_text(Optional const&) = 0; - - virtual Optional aria_row_span() const = 0; - virtual WebIDL::ExceptionOr set_aria_row_span(Optional const&) = 0; - - virtual Optional aria_selected() const = 0; - virtual WebIDL::ExceptionOr set_aria_selected(Optional const&) = 0; - - virtual Optional aria_set_size() const = 0; - virtual WebIDL::ExceptionOr set_aria_set_size(Optional const&) = 0; - - virtual Optional aria_sort() const = 0; - virtual WebIDL::ExceptionOr set_aria_sort(Optional const&) = 0; - - virtual Optional aria_value_max() const = 0; - virtual WebIDL::ExceptionOr set_aria_value_max(Optional const&) = 0; - - virtual Optional aria_value_min() const = 0; - virtual WebIDL::ExceptionOr set_aria_value_min(Optional const&) = 0; - - virtual Optional aria_value_now() const = 0; - virtual WebIDL::ExceptionOr set_aria_value_now(Optional const&) = 0; - - virtual Optional aria_value_text() const = 0; - virtual WebIDL::ExceptionOr set_aria_value_text(Optional const&) = 0; +#define __ENUMERATE_ARIA_ATTRIBUTE(name, attribute) \ + virtual Optional name() const = 0; \ + virtual WebIDL::ExceptionOr set_##name(Optional const&) = 0; + ENUMERATE_ARIA_ATTRIBUTES +#undef __ENUMERATE_ARIA_ATTRIBUTE // https://www.w3.org/TR/html-aria/#docconformance virtual Optional default_role() const { return {}; } diff --git a/Libraries/LibWeb/ARIA/AttributeNames.cpp b/Libraries/LibWeb/ARIA/AttributeNames.cpp new file mode 100644 index 00000000000..8ecd09f5b23 --- /dev/null +++ b/Libraries/LibWeb/ARIA/AttributeNames.cpp @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2024, Tim Flynn + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +namespace Web::ARIA::AttributeNames { + +#define __ENUMERATE_ARIA_ATTRIBUTE(name, attribute) \ + FlyString name = attribute##_fly_string; +ENUMERATE_ARIA_ATTRIBUTES +#undef __ENUMERATE_ARIA_ATTRIBUTE + +} diff --git a/Libraries/LibWeb/ARIA/AttributeNames.h b/Libraries/LibWeb/ARIA/AttributeNames.h new file mode 100644 index 00000000000..ee175694288 --- /dev/null +++ b/Libraries/LibWeb/ARIA/AttributeNames.h @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2024, Tim Flynn + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace Web::ARIA::AttributeNames { + +// https://www.w3.org/TR/wai-aria-1.2/#accessibilityroleandproperties-correspondence +#define ENUMERATE_ARIA_ATTRIBUTES \ + __ENUMERATE_ARIA_ATTRIBUTE(role, "role") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_active_descendant, "aria-activedescendant") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_atomic, "aria-atomic") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_auto_complete, "aria-autocomplete") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_braille_label, "aria-braillelabel") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_braille_role_description, "aria-brailleroledescription") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_busy, "aria-busy") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_checked, "aria-checked") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_col_count, "aria-colcount") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_col_index, "aria-colindex") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_col_index_text, "aria-colindextext") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_col_span, "aria-colspan") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_controls, "aria-controls") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_current, "aria-current") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_described_by, "aria-describedby") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_description, "aria-description") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_details, "aria-details") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_drop_effect, "aria-dropeffect") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_error_message, "aria-errormessage") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_disabled, "aria-disabled") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_expanded, "aria-expanded") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_flow_to, "aria-flowto") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_grabbed, "aria-grabbed") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_has_popup, "aria-haspopup") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_hidden, "aria-hidden") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_invalid, "aria-invalid") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_key_shortcuts, "aria-keyshortcuts") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_label, "aria-label") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_labelled_by, "aria-labelledby") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_level, "aria-level") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_live, "aria-live") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_modal, "aria-modal") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_multi_line, "aria-multiline") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_multi_selectable, "aria-multiselectable") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_orientation, "aria-orientation") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_owns, "aria-owns") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_placeholder, "aria-placeholder") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_pos_in_set, "aria-posinset") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_pressed, "aria-pressed") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_read_only, "aria-readonly") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_relevant, "aria-relevant") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_required, "aria-required") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_role_description, "aria-roledescription") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_row_count, "aria-rowcount") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_row_index, "aria-rowindex") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_row_index_text, "aria-rowindextext") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_row_span, "aria-rowspan") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_selected, "aria-selected") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_set_size, "aria-setsize") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_sort, "aria-sort") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_value_max, "aria-valuemax") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_value_min, "aria-valuemin") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_value_now, "aria-valuenow") \ + __ENUMERATE_ARIA_ATTRIBUTE(aria_value_text, "aria-valuetext") + +#define __ENUMERATE_ARIA_ATTRIBUTE(name, attribute) \ + extern FlyString name; +ENUMERATE_ARIA_ATTRIBUTES +#undef __ENUMERATE_ARIA_ATTRIBUTE + +} diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index defc6c2e1f9..c88ea9f0f8c 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -17,6 +17,7 @@ set(SOURCES Animations/PseudoElementParsing.cpp ARIA/AriaData.cpp ARIA/ARIAMixin.cpp + ARIA/AttributeNames.cpp ARIA/Roles.cpp ARIA/RoleType.cpp ARIA/StateAndProperties.cpp diff --git a/Libraries/LibWeb/DOM/Element.h b/Libraries/LibWeb/DOM/Element.h index 382e3b29393..9faa23e7e63 100644 --- a/Libraries/LibWeb/DOM/Element.h +++ b/Libraries/LibWeb/DOM/Element.h @@ -8,6 +8,7 @@ #include #include +#include #include #include #include @@ -271,78 +272,22 @@ public: ErrorOr scroll_into_view(Optional> = {}); // https://www.w3.org/TR/wai-aria-1.2/#ARIAMixin -#define ARIA_IMPL(name, attribute) \ +#define __ENUMERATE_ARIA_ATTRIBUTE(name, attribute) \ Optional name() const override \ { \ - return get_attribute(attribute); \ + return get_attribute(ARIA::AttributeNames::name); \ } \ \ WebIDL::ExceptionOr set_##name(Optional const& value) override \ { \ if (value.has_value()) \ - TRY(set_attribute(attribute, *value)); \ + TRY(set_attribute(ARIA::AttributeNames::name, *value)); \ else \ - remove_attribute(attribute); \ + remove_attribute(ARIA::AttributeNames::name); \ return {}; \ } - - // https://www.w3.org/TR/wai-aria-1.2/#accessibilityroleandproperties-correspondence - ARIA_IMPL(role, "role"_fly_string); - ARIA_IMPL(aria_active_descendant, "aria-activedescendant"_fly_string); - ARIA_IMPL(aria_atomic, "aria-atomic"_fly_string); - ARIA_IMPL(aria_auto_complete, "aria-autocomplete"_fly_string); - ARIA_IMPL(aria_braille_label, "aria-braillelabel"_fly_string); - ARIA_IMPL(aria_braille_role_description, "aria-brailleroledescription"_fly_string); - ARIA_IMPL(aria_busy, "aria-busy"_fly_string); - ARIA_IMPL(aria_checked, "aria-checked"_fly_string); - ARIA_IMPL(aria_col_count, "aria-colcount"_fly_string); - ARIA_IMPL(aria_col_index, "aria-colindex"_fly_string); - ARIA_IMPL(aria_col_index_text, "aria-colindextext"_fly_string); - ARIA_IMPL(aria_col_span, "aria-colspan"_fly_string); - ARIA_IMPL(aria_controls, "aria-controls"_fly_string); - ARIA_IMPL(aria_current, "aria-current"_fly_string); - ARIA_IMPL(aria_described_by, "aria-describedby"_fly_string); - ARIA_IMPL(aria_description, "aria-description"_fly_string); - ARIA_IMPL(aria_details, "aria-details"_fly_string); - ARIA_IMPL(aria_drop_effect, "aria-dropeffect"_fly_string); - ARIA_IMPL(aria_error_message, "aria-errormessage"_fly_string); - ARIA_IMPL(aria_disabled, "aria-disabled"_fly_string); - ARIA_IMPL(aria_expanded, "aria-expanded"_fly_string); - ARIA_IMPL(aria_flow_to, "aria-flowto"_fly_string); - ARIA_IMPL(aria_grabbed, "aria-grabbed"_fly_string); - ARIA_IMPL(aria_has_popup, "aria-haspopup"_fly_string); - ARIA_IMPL(aria_hidden, "aria-hidden"_fly_string); - ARIA_IMPL(aria_invalid, "aria-invalid"_fly_string); - ARIA_IMPL(aria_key_shortcuts, "aria-keyshortcuts"_fly_string); - ARIA_IMPL(aria_label, "aria-label"_fly_string); - ARIA_IMPL(aria_labelled_by, "aria-labelledby"_fly_string); - ARIA_IMPL(aria_level, "aria-level"_fly_string); - ARIA_IMPL(aria_live, "aria-live"_fly_string); - ARIA_IMPL(aria_modal, "aria-modal"_fly_string); - ARIA_IMPL(aria_multi_line, "aria-multiline"_fly_string); - ARIA_IMPL(aria_multi_selectable, "aria-multiselectable"_fly_string); - ARIA_IMPL(aria_orientation, "aria-orientation"_fly_string); - ARIA_IMPL(aria_owns, "aria-owns"_fly_string); - ARIA_IMPL(aria_placeholder, "aria-placeholder"_fly_string); - ARIA_IMPL(aria_pos_in_set, "aria-posinset"_fly_string); - ARIA_IMPL(aria_pressed, "aria-pressed"_fly_string); - ARIA_IMPL(aria_read_only, "aria-readonly"_fly_string); - ARIA_IMPL(aria_relevant, "aria-relevant"_fly_string); - ARIA_IMPL(aria_required, "aria-required"_fly_string); - ARIA_IMPL(aria_role_description, "aria-roledescription"_fly_string); - ARIA_IMPL(aria_row_count, "aria-rowcount"_fly_string); - ARIA_IMPL(aria_row_index, "aria-rowindex"_fly_string); - ARIA_IMPL(aria_row_index_text, "aria-rowindextext"_fly_string); - ARIA_IMPL(aria_row_span, "aria-rowspan"_fly_string); - ARIA_IMPL(aria_selected, "aria-selected"_fly_string); - ARIA_IMPL(aria_set_size, "aria-setsize"_fly_string); - ARIA_IMPL(aria_sort, "aria-sort"_fly_string); - ARIA_IMPL(aria_value_max, "aria-valuemax"_fly_string); - ARIA_IMPL(aria_value_min, "aria-valuemin"_fly_string); - ARIA_IMPL(aria_value_now, "aria-valuenow"_fly_string); - ARIA_IMPL(aria_value_text, "aria-valuetext"_fly_string); - -#undef ARIA_IMPL + ENUMERATE_ARIA_ATTRIBUTES +#undef __ENUMERATE_ARIA_ATTRIBUTE virtual bool exclude_from_accessibility_tree() const override;