diff --git a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateAriaRoles.cpp b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateAriaRoles.cpp index 7c7b354551e..cc112485a7d 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateAriaRoles.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibWeb/GenerateAriaRoles.cpp @@ -139,6 +139,10 @@ StringView aria_name_to_enum_name(StringView name) return "AriaAtomic"sv; } else if (name == "aria-autocomplete"sv) { return "AriaAutoComplete"sv; + } else if (name == "aria-braillelabel"sv) { + return "AriaBrailleLabel"sv; + } else if (name == "aria-brailleroledescription"sv) { + return "AriaBrailleRoleDescription"sv; } else if (name == "aria-busy"sv) { return "AriaBusy"sv; } else if (name == "aria-checked"sv) { @@ -147,6 +151,8 @@ StringView aria_name_to_enum_name(StringView name) return "AriaColCount"sv; } else if (name == "aria-colindex"sv) { return "AriaColIndex"sv; + } else if (name == "aria-colindextext"sv) { + return "AriaColIndexText"sv; } else if (name == "aria-colspan"sv) { return "AriaColSpan"sv; } else if (name == "aria-controls"sv) { @@ -155,6 +161,8 @@ StringView aria_name_to_enum_name(StringView name) return "AriaCurrent"sv; } else if (name == "aria-describedby"sv) { return "AriaDescribedBy"sv; + } else if (name == "aria-description"sv) { + return "AriaDescription"sv; } else if (name == "aria-details"sv) { return "AriaDetails"sv; } else if (name == "aria-disabled"sv) { @@ -213,6 +221,8 @@ StringView aria_name_to_enum_name(StringView name) return "AriaRowCount"sv; } else if (name == "aria-rowindex"sv) { return "AriaRowIndex"sv; + } else if (name == "aria-rowindextext"sv) { + return "AriaRowIndexText"sv; } else if (name == "aria-rowspan"sv) { return "AriaRowSpan"sv; } else if (name == "aria-selected"sv) { diff --git a/Tests/LibWeb/Text/expected/aria-attribute-reflection.txt b/Tests/LibWeb/Text/expected/aria-attribute-reflection.txt index 020dcfafd50..5fe97188466 100644 --- a/Tests/LibWeb/Text/expected/aria-attribute-reflection.txt +++ b/Tests/LibWeb/Text/expected/aria-attribute-reflection.txt @@ -15,19 +15,15 @@ Testing: aria-autocomplete attribute reflects. ✅ PASS: null is equal to null as expected. ✅ PASS: null is equal to null as expected. Testing: aria-braillelabel attribute reflects. - ❌ FAIL: undefined is not equal to x. - ❌ FAIL: x is not equal to y. + ✅ PASS: x is equal to x as expected. + ✅ PASS: y is equal to y as expected. + ✅ PASS: null is equal to null as expected. ✅ PASS: null is equal to null as expected. - ❌ FAIL: Expected false but got true. - ✅ PASS: undefined is equal to null as expected. - ❌ FAIL: Expected false but got true. Testing: aria-brailleroledescription attribute reflects. - ❌ FAIL: undefined is not equal to x. - ❌ FAIL: x is not equal to y. + ✅ PASS: x is equal to x as expected. + ✅ PASS: y is equal to y as expected. + ✅ PASS: null is equal to null as expected. ✅ PASS: null is equal to null as expected. - ❌ FAIL: Expected false but got true. - ✅ PASS: undefined is equal to null as expected. - ❌ FAIL: Expected false but got true. Testing: aria-busy attribute reflects. ✅ PASS: true is equal to true as expected. ✅ PASS: false is equal to false as expected. @@ -49,12 +45,10 @@ Testing: aria-colindex attribute reflects. ✅ PASS: null is equal to null as expected. ✅ PASS: null is equal to null as expected. Testing: aria-colindextext attribute reflects. - ❌ FAIL: undefined is not equal to x. - ❌ FAIL: x is not equal to y. + ✅ PASS: x is equal to x as expected. + ✅ PASS: y is equal to y as expected. + ✅ PASS: null is equal to null as expected. ✅ PASS: null is equal to null as expected. - ❌ FAIL: Expected false but got true. - ✅ PASS: undefined is equal to null as expected. - ❌ FAIL: Expected false but got true. Testing: aria-colspan attribute reflects. ✅ PASS: 2 is equal to 2 as expected. ✅ PASS: 3 is equal to 3 as expected. @@ -66,12 +60,10 @@ Testing: aria-current attribute reflects. ✅ PASS: null is equal to null as expected. ✅ PASS: null is equal to null as expected. Testing: aria-description attribute reflects. - ❌ FAIL: undefined is not equal to cold as ice. - ❌ FAIL: cold as ice is not equal to hot as fire. + ✅ PASS: cold as ice is equal to cold as ice as expected. + ✅ PASS: hot as fire is equal to hot as fire as expected. + ✅ PASS: null is equal to null as expected. ✅ PASS: null is equal to null as expected. - ❌ FAIL: Expected false but got true. - ✅ PASS: undefined is equal to null as expected. - ❌ FAIL: Expected false but got true. Testing: aria-disabled attribute reflects. ✅ PASS: true is equal to true as expected. ✅ PASS: false is equal to false as expected. @@ -183,12 +175,10 @@ Testing: aria-rowindex attribute reflects. ✅ PASS: null is equal to null as expected. ✅ PASS: null is equal to null as expected. Testing: aria-rowindextext attribute reflects. - ❌ FAIL: undefined is not equal to x. - ❌ FAIL: x is not equal to y. + ✅ PASS: x is equal to x as expected. + ✅ PASS: y is equal to y as expected. + ✅ PASS: null is equal to null as expected. ✅ PASS: null is equal to null as expected. - ❌ FAIL: Expected false but got true. - ✅ PASS: undefined is equal to null as expected. - ❌ FAIL: Expected false but got true. Testing: aria-rowspan attribute reflects. ✅ PASS: 2 is equal to 2 as expected. ✅ PASS: 3 is equal to 3 as expected. diff --git a/Userland/Libraries/LibWeb/ARIA/ARIAMixin.cpp b/Userland/Libraries/LibWeb/ARIA/ARIAMixin.cpp index 840f98ecc00..836e3a9ce16 100644 --- a/Userland/Libraries/LibWeb/ARIA/ARIAMixin.cpp +++ b/Userland/Libraries/LibWeb/ARIA/ARIAMixin.cpp @@ -42,10 +42,13 @@ Optional ARIAMixin::role_or_default() const bool ARIAMixin::has_global_aria_attribute() const { return aria_atomic().has_value() + || aria_braille_label().has_value() + || aria_braille_role_description().has_value() || aria_busy().has_value() || aria_controls().has_value() || aria_current().has_value() || aria_described_by().has_value() + || aria_description().has_value() || aria_details().has_value() || aria_disabled().has_value() || aria_drop_effect().has_value() diff --git a/Userland/Libraries/LibWeb/ARIA/ARIAMixin.h b/Userland/Libraries/LibWeb/ARIA/ARIAMixin.h index 47411ed0507..f6aebc1b0ca 100644 --- a/Userland/Libraries/LibWeb/ARIA/ARIAMixin.h +++ b/Userland/Libraries/LibWeb/ARIA/ARIAMixin.h @@ -31,6 +31,12 @@ public: 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; @@ -43,6 +49,9 @@ public: 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; @@ -55,6 +64,9 @@ public: 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; @@ -142,6 +154,9 @@ public: 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; diff --git a/Userland/Libraries/LibWeb/ARIA/ARIAMixin.idl b/Userland/Libraries/LibWeb/ARIA/ARIAMixin.idl index 24916eda0f2..294760cd65e 100644 --- a/Userland/Libraries/LibWeb/ARIA/ARIAMixin.idl +++ b/Userland/Libraries/LibWeb/ARIA/ARIAMixin.idl @@ -3,12 +3,16 @@ interface mixin ARIAMixin { [CEReactions] attribute DOMString? role; [CEReactions] attribute DOMString? ariaAtomic; [CEReactions] attribute DOMString? ariaAutoComplete; + [CEReactions] attribute DOMString? ariaBrailleLabel; + [CEReactions] attribute DOMString? ariaBrailleRoleDescription; [CEReactions] attribute DOMString? ariaBusy; [CEReactions] attribute DOMString? ariaChecked; [CEReactions] attribute DOMString? ariaColCount; [CEReactions] attribute DOMString? ariaColIndex; + [CEReactions] attribute DOMString? ariaColIndexText; [CEReactions] attribute DOMString? ariaColSpan; [CEReactions] attribute DOMString? ariaCurrent; + [CEReactions] attribute DOMString? ariaDescription; [CEReactions] attribute DOMString? ariaDisabled; [CEReactions] attribute DOMString? ariaExpanded; [CEReactions] attribute DOMString? ariaHasPopup; @@ -31,6 +35,7 @@ interface mixin ARIAMixin { [CEReactions] attribute DOMString? ariaRoleDescription; [CEReactions] attribute DOMString? ariaRowCount; [CEReactions] attribute DOMString? ariaRowIndex; + [CEReactions] attribute DOMString? ariaRowIndexText; [CEReactions] attribute DOMString? ariaRowSpan; [CEReactions] attribute DOMString? ariaSelected; [CEReactions] attribute DOMString? ariaSetSize; diff --git a/Userland/Libraries/LibWeb/ARIA/AriaData.cpp b/Userland/Libraries/LibWeb/ARIA/AriaData.cpp index 31806fc25d4..fab32dcfcb6 100644 --- a/Userland/Libraries/LibWeb/ARIA/AriaData.cpp +++ b/Userland/Libraries/LibWeb/ARIA/AriaData.cpp @@ -15,14 +15,18 @@ AriaData::AriaData(Web::ARIA::ARIAMixin const& source) m_aria_active_descendant = source.aria_active_descendant(); m_aria_atomic = AriaData::parse_optional_true_false(source.aria_atomic()); m_aria_auto_complete = AriaData::parse_aria_autocomplete(source.aria_auto_complete()); + m_aria_braille_label = source.aria_braille_label().value_or(String {}); + m_aria_braille_role_description = source.aria_braille_role_description().value_or(String {}); m_aria_busy = AriaData::parse_true_false(source.aria_busy()); m_aria_checked = AriaData::parse_tristate(source.aria_checked()); m_aria_col_count = AriaData::parse_integer(source.aria_col_count()); m_aria_col_index = AriaData::parse_integer(source.aria_col_index()); + m_aria_col_index_text = source.aria_col_index_text().value_or(String {}); m_aria_col_span = AriaData::parse_integer(source.aria_col_span()); m_aria_controls = source.parse_id_reference_list(source.aria_controls()); m_aria_current = AriaData::parse_aria_current(source.aria_current()); m_aria_described_by = source.parse_id_reference_list(source.aria_described_by()); + m_aria_description = source.aria_description().value_or(String {}); m_aria_details = source.parse_id_reference(source.aria_details()); m_aria_disabled = AriaData::parse_true_false(source.aria_disabled()); m_aria_drop_effect = AriaData::parse_aria_drop_effect(source.aria_drop_effect()); @@ -52,6 +56,7 @@ AriaData::AriaData(Web::ARIA::ARIAMixin const& source) m_aria_role_description = source.aria_role_description().value_or(String {}); m_aria_row_count = AriaData::parse_integer(source.aria_row_count()); m_aria_row_index = AriaData::parse_integer(source.aria_row_index()); + m_aria_row_index_text = source.aria_row_index_text().value_or(String {}); m_aria_row_span = AriaData::parse_integer(source.aria_row_span()); m_aria_selected = AriaData::parse_true_false_undefined(source.aria_selected()); m_aria_set_size = AriaData::parse_integer(source.aria_set_size()); @@ -127,6 +132,16 @@ AriaAutocomplete AriaData::aria_auto_complete_or_default() const return m_aria_auto_complete; } +String AriaData::aria_braille_label_or_default() const +{ + return m_aria_braille_label; +} + +String AriaData::aria_braille_role_description_or_default() const +{ + return m_aria_braille_role_description; +} + bool AriaData::aria_busy_or_default() const { return m_aria_busy; @@ -147,6 +162,11 @@ Optional AriaData::aria_col_index_or_default() const return m_aria_col_index; } +String AriaData::aria_col_index_text_or_default() const +{ + return m_aria_col_index_text; +} + Optional AriaData::aria_col_span_or_default() const { return m_aria_col_span; @@ -167,6 +187,11 @@ Vector AriaData::aria_described_by_or_default() const return m_aria_described_by; } +String AriaData::aria_description_or_default() const +{ + return m_aria_description; +} + Optional AriaData::aria_details_or_default() const { return m_aria_details; @@ -320,6 +345,11 @@ Optional AriaData::aria_row_index_or_default() const return m_aria_row_index; } +String AriaData::aria_row_index_text_or_default() const +{ + return m_aria_row_index_text; +} + Optional AriaData::aria_row_span_or_default() const { return m_aria_row_span; diff --git a/Userland/Libraries/LibWeb/ARIA/AriaData.h b/Userland/Libraries/LibWeb/ARIA/AriaData.h index feca3eb7d4c..5746e97ffde 100644 --- a/Userland/Libraries/LibWeb/ARIA/AriaData.h +++ b/Userland/Libraries/LibWeb/ARIA/AriaData.h @@ -154,14 +154,18 @@ public: Optional aria_active_descendant_or_default() const; bool aria_atomic_or_default(bool default_value = false) const; AriaAutocomplete aria_auto_complete_or_default() const; + String aria_braille_label_or_default() const; + String aria_braille_role_description_or_default() const; bool aria_busy_or_default() const; Tristate aria_checked_or_default() const; Optional aria_col_count_or_default() const; Optional aria_col_index_or_default() const; + String aria_col_index_text_or_default() const; Optional aria_col_span_or_default() const; Vector aria_controls_or_default() const; AriaCurrent aria_current_or_default() const; Vector aria_described_by_or_default() const; + String aria_description_or_default() const; Optional aria_details_or_default() const; bool aria_disabled_or_default() const; Vector aria_drop_effect_or_default() const; @@ -191,6 +195,7 @@ public: String aria_role_description_or_default() const; Optional aria_row_count_or_default() const; Optional aria_row_index_or_default() const; + String aria_row_index_text_or_default() const; Optional aria_row_span_or_default() const; Optional aria_selected_or_default() const; Optional aria_set_size_or_default() const; @@ -235,14 +240,18 @@ private: Optional m_aria_active_descendant; Optional m_aria_atomic; AriaAutocomplete m_aria_auto_complete; + String m_aria_braille_label; + String m_aria_braille_role_description; bool m_aria_busy; Tristate m_aria_checked; Optional m_aria_col_count; Optional m_aria_col_index; + String m_aria_col_index_text; Optional m_aria_col_span; Vector m_aria_controls; AriaCurrent m_aria_current; Vector m_aria_described_by; + String m_aria_description; Optional m_aria_details; bool m_aria_disabled; Vector m_aria_drop_effect; @@ -272,6 +281,7 @@ private: String m_aria_role_description; Optional m_aria_row_count; Optional m_aria_row_index; + String m_aria_row_index_text; Optional m_aria_row_span; Optional m_aria_selected; Optional m_aria_set_size; diff --git a/Userland/Libraries/LibWeb/ARIA/AriaRoles.json b/Userland/Libraries/LibWeb/ARIA/AriaRoles.json index fec69c3b12f..e3af331929d 100644 --- a/Userland/Libraries/LibWeb/ARIA/AriaRoles.json +++ b/Userland/Libraries/LibWeb/ARIA/AriaRoles.json @@ -15,8 +15,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -56,8 +59,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -97,8 +103,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -140,8 +149,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -183,8 +195,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -225,8 +240,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -268,6 +286,7 @@ "aria-atomic", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -308,8 +327,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -354,8 +376,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -395,8 +420,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -440,8 +468,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -481,8 +512,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -522,8 +556,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -563,8 +600,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -614,8 +654,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -657,8 +700,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -700,8 +746,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -750,8 +799,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -799,8 +851,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -819,6 +874,7 @@ ], "requiredStates": [], "requiredProperties": [ + "aria-brailleroledescription", "aria-controls", "aria-valuenow" ], @@ -852,8 +908,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -906,8 +965,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -956,8 +1018,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -1003,8 +1068,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1044,8 +1112,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1091,10 +1161,14 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", "aria-colindex", + "aria-colindextext", "aria-colspan", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1107,6 +1181,7 @@ "aria-relevant", "aria-roledescription", "aria-rowindex", + "aria-rowindextext", "aria-rowspan" ], "requiredStates": [], @@ -1138,8 +1213,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1180,8 +1257,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1221,8 +1300,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1263,8 +1344,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1305,8 +1388,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1347,8 +1433,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1388,8 +1477,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1429,8 +1521,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1471,8 +1565,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1512,8 +1609,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1555,8 +1655,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1602,8 +1705,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1645,8 +1751,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1686,8 +1795,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1727,8 +1839,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1768,8 +1883,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1810,8 +1927,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1854,8 +1974,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1896,8 +2018,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1938,8 +2062,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -1980,9 +2106,12 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", "aria-colcount", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2025,8 +2154,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2066,8 +2198,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2107,8 +2241,10 @@ ], "supportedProperties": [ "aria-atomic", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2148,8 +2284,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2189,8 +2328,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -2233,8 +2375,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2277,10 +2422,13 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", "aria-colindex", "aria-colspan", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -2330,10 +2478,13 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", "aria-colindex", "aria-colspan", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -2383,10 +2534,13 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", "aria-colindex", "aria-colspan", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2436,9 +2590,12 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-colindex", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-expanded", @@ -2454,6 +2611,7 @@ "aria-relevant", "aria-roledescription", "aria-rowindex", + "aria-rowindextext", "aria-setsize" ], "requiredStates": [], @@ -2495,8 +2653,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -2539,8 +2700,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2585,8 +2749,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -2637,8 +2804,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2686,8 +2856,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -2734,8 +2907,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -2784,8 +2960,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2832,9 +3011,12 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", "aria-colcount", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2879,8 +3061,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2920,8 +3105,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -2961,8 +3149,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3002,8 +3193,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3043,8 +3237,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3084,8 +3281,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3125,8 +3325,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3166,8 +3369,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3207,8 +3413,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3248,8 +3457,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3293,8 +3505,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -3345,8 +3560,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3388,8 +3606,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3433,9 +3654,12 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", "aria-colcount", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -3480,8 +3704,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3525,8 +3752,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3573,8 +3803,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3615,8 +3848,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -3659,8 +3895,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3702,8 +3941,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3749,8 +3991,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -3800,8 +4045,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3848,8 +4096,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", @@ -3892,8 +4143,10 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", "aria-autocomplete", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -3913,6 +4166,7 @@ "aria-expanded" ], "requiredProperties": [ + "aria-brailleroledescription", "aria-controls" ], "prohibitedStates": [], @@ -3942,8 +4196,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -3989,9 +4246,12 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", "aria-autocomplete", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -4037,8 +4297,11 @@ ], "supportedProperties": [ "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -4083,9 +4346,12 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", "aria-autocomplete", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-errormessage", @@ -4131,8 +4397,11 @@ "supportedProperties": [ "aria-activedescendant", "aria-atomic", + "aria-braillelabel", + "aria-brailleroledescription", "aria-controls", "aria-describedby", + "aria-description", "aria-details", "aria-dropeffect", "aria-flowto", diff --git a/Userland/Libraries/LibWeb/ARIA/RoleType.cpp b/Userland/Libraries/LibWeb/ARIA/RoleType.cpp index d7832c34176..ccf32da5e13 100644 --- a/Userland/Libraries/LibWeb/ARIA/RoleType.cpp +++ b/Userland/Libraries/LibWeb/ARIA/RoleType.cpp @@ -15,6 +15,7 @@ RoleType::RoleType(AriaData const& data) { } +// https://w3c.github.io/aria/#global_states constexpr StateAndProperties supported_state_array[] = { StateAndProperties::AriaBusy, StateAndProperties::AriaCurrent, @@ -23,10 +24,14 @@ constexpr StateAndProperties supported_state_array[] = { StateAndProperties::AriaHidden, StateAndProperties::AriaInvalid }; +// https://w3c.github.io/aria/#global_states constexpr StateAndProperties supported_properties_array[] = { StateAndProperties::AriaAtomic, + StateAndProperties::AriaBrailleLabel, + StateAndProperties::AriaBrailleRoleDescription, StateAndProperties::AriaControls, StateAndProperties::AriaDescribedBy, + StateAndProperties::AriaDescription, StateAndProperties::AriaDetails, StateAndProperties::AriaDropEffect, StateAndProperties::AriaFlowTo, diff --git a/Userland/Libraries/LibWeb/ARIA/StateAndProperties.cpp b/Userland/Libraries/LibWeb/ARIA/StateAndProperties.cpp index a88570f604f..ece5560fd02 100644 --- a/Userland/Libraries/LibWeb/ARIA/StateAndProperties.cpp +++ b/Userland/Libraries/LibWeb/ARIA/StateAndProperties.cpp @@ -37,6 +37,10 @@ ErrorOr state_or_property_to_string_value(StateAndProperties state_or_pr } VERIFY_NOT_REACHED(); } + case StateAndProperties::AriaBrailleLabel: + return aria_data.aria_braille_label_or_default(); + case StateAndProperties::AriaBrailleRoleDescription: + return aria_data.aria_braille_role_description_or_default(); case StateAndProperties::AriaBusy: return String::from_utf8(aria_data.aria_busy_or_default() ? "true"sv : "false"sv); case StateAndProperties::AriaChecked: @@ -45,6 +49,8 @@ ErrorOr state_or_property_to_string_value(StateAndProperties state_or_pr return ARIA::optional_integer_to_string(aria_data.aria_col_count_or_default()); case StateAndProperties::AriaColIndex: return ARIA::optional_integer_to_string(aria_data.aria_col_index_or_default()); + case StateAndProperties::AriaColIndexText: + return aria_data.aria_col_index_text_or_default(); case StateAndProperties::AriaColSpan: return ARIA::optional_integer_to_string(aria_data.aria_col_span_or_default()); case StateAndProperties::AriaControls: @@ -71,6 +77,8 @@ ErrorOr state_or_property_to_string_value(StateAndProperties state_or_pr } case StateAndProperties::AriaDescribedBy: return id_reference_list_to_string(aria_data.aria_described_by_or_default()); + case StateAndProperties::AriaDescription: + return aria_data.aria_description_or_default(); case StateAndProperties::AriaDetails: { return aria_data.aria_details_or_default().value_or(String {}); } @@ -252,6 +260,8 @@ ErrorOr state_or_property_to_string_value(StateAndProperties state_or_pr return ARIA::optional_integer_to_string(aria_data.aria_row_count_or_default()); case StateAndProperties::AriaRowIndex: return ARIA::optional_integer_to_string(aria_data.aria_row_index_or_default()); + case StateAndProperties::AriaRowIndexText: + return aria_data.aria_row_index_text_or_default(); case StateAndProperties::AriaRowSpan: return ARIA::optional_integer_to_string(aria_data.aria_row_span_or_default()); case StateAndProperties::AriaSelected: @@ -351,6 +361,10 @@ StringView state_or_property_to_string(StateAndProperties value) return "aria-atomic"sv; case StateAndProperties::AriaAutoComplete: return "aria-autocomplete"sv; + case StateAndProperties::AriaBrailleLabel: + return "aria-braillelabel"sv; + case StateAndProperties::AriaBrailleRoleDescription: + return "aria-brailleroledescription"sv; case StateAndProperties::AriaBusy: return "aria-busy"sv; case StateAndProperties::AriaChecked: @@ -359,6 +373,8 @@ StringView state_or_property_to_string(StateAndProperties value) return "aria-colcount"sv; case StateAndProperties::AriaColIndex: return "aria-colindex"sv; + case StateAndProperties::AriaColIndexText: + return "aria-colindextext"sv; case StateAndProperties::AriaColSpan: return "aria-colspan"sv; case StateAndProperties::AriaControls: @@ -367,6 +383,8 @@ StringView state_or_property_to_string(StateAndProperties value) return "aria-current"sv; case StateAndProperties::AriaDescribedBy: return "aria-describedby"sv; + case StateAndProperties::AriaDescription: + return "aria-description"sv; case StateAndProperties::AriaDetails: return "aria-details"sv; case StateAndProperties::AriaDisabled: @@ -425,6 +443,8 @@ StringView state_or_property_to_string(StateAndProperties value) return "aria-rowcount"sv; case StateAndProperties::AriaRowIndex: return "aria-rowindex"sv; + case StateAndProperties::AriaRowIndexText: + return "aria-rowindextext"sv; case StateAndProperties::AriaRowSpan: return "aria-rowspan"sv; case StateAndProperties::AriaSelected: diff --git a/Userland/Libraries/LibWeb/ARIA/StateAndProperties.h b/Userland/Libraries/LibWeb/ARIA/StateAndProperties.h index e3ed4711c30..7a9eb71b5c3 100644 --- a/Userland/Libraries/LibWeb/ARIA/StateAndProperties.h +++ b/Userland/Libraries/LibWeb/ARIA/StateAndProperties.h @@ -16,14 +16,18 @@ enum class StateAndProperties { AriaActiveDescendant, AriaAtomic, AriaAutoComplete, + AriaBrailleLabel, + AriaBrailleRoleDescription, AriaBusy, AriaChecked, AriaColCount, AriaColIndex, + AriaColIndexText, AriaColSpan, AriaControls, AriaCurrent, AriaDescribedBy, + AriaDescription, AriaDetails, AriaDisabled, AriaDropEffect, @@ -53,6 +57,7 @@ enum class StateAndProperties { AriaRoleDescription, AriaRowCount, AriaRowIndex, + AriaRowIndexText, AriaRowSpan, AriaSelected, AriaSetSize, diff --git a/Userland/Libraries/LibWeb/DOM/Element.h b/Userland/Libraries/LibWeb/DOM/Element.h index b7bd4ed79ac..f0640bb5cd2 100644 --- a/Userland/Libraries/LibWeb/DOM/Element.h +++ b/Userland/Libraries/LibWeb/DOM/Element.h @@ -291,14 +291,18 @@ public: 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); @@ -328,6 +332,7 @@ public: 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);