From 2a5390ef4f77aea8a565da87033382c4f6192a8f Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Wed, 18 Sep 2024 11:09:07 +0100 Subject: [PATCH] LibWeb/DOM: Move "text node directionality" algorithm into DOM::Text --- Userland/Libraries/LibWeb/DOM/Element.cpp | 29 ++--------------------- Userland/Libraries/LibWeb/DOM/Text.cpp | 27 +++++++++++++++++++++ Userland/Libraries/LibWeb/DOM/Text.h | 3 +++ 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/Userland/Libraries/LibWeb/DOM/Element.cpp b/Userland/Libraries/LibWeb/DOM/Element.cpp index 848ede80d98..9be3823972a 100644 --- a/Userland/Libraries/LibWeb/DOM/Element.cpp +++ b/Userland/Libraries/LibWeb/DOM/Element.cpp @@ -2575,31 +2575,6 @@ bool Element::is_auto_directionality_form_associated_element() const // https://html.spec.whatwg.org/multipage/dom.html#auto-directionality Optional Element::auto_directionality() const { - // https://html.spec.whatwg.org/multipage/dom.html#text-node-directionality - auto text_node_directionality = [](Text const& text_node) -> Optional { - // 1. If text's data does not contain a code point whose bidirectional character type is L, AL, or R, then return null. - // 2. Let codePoint be the first code point in text's data whose bidirectional character type is L, AL, or R. - Optional found_character_bidi_class; - for (auto code_point : Utf8View(text_node.data())) { - auto bidi_class = Unicode::bidirectional_class(code_point); - if (first_is_one_of(bidi_class, Unicode::BidiClass::LeftToRight, Unicode::BidiClass::RightToLeftArabic, Unicode::BidiClass::RightToLeft)) { - found_character_bidi_class = bidi_class; - break; - } - } - if (!found_character_bidi_class.has_value()) - return {}; - - // 3. If codePoint is of bidirectional character type AL or R, then return 'rtl'. - if (first_is_one_of(*found_character_bidi_class, Unicode::BidiClass::RightToLeftArabic, Unicode::BidiClass::RightToLeft)) - return Directionality::Rtl; - - // 4. If codePoint is of bidirectional character type L, then return 'ltr'. - // NOTE: codePoint should always be of bidirectional character type L by this point, so we can just return 'ltr' here. - VERIFY(*found_character_bidi_class == Unicode::BidiClass::LeftToRight); - return Directionality::Ltr; - }; - // 1. If element is an auto-directionality form-associated element: if (is_auto_directionality_form_associated_element()) { auto const* form_associated_element = dynamic_cast(this); @@ -2635,7 +2610,7 @@ Optional Element::auto_directionality() const // 2. If child is a Text node, then set childDirection to the text node directionality of child. if (child->is_text()) - child_direction = text_node_directionality(static_cast(*child)); + child_direction = static_cast(*child).directionality(); // 3. Otherwise: else { @@ -2689,7 +2664,7 @@ Optional Element::auto_directionality() const return TraversalDecision::Continue; // 4. Let result be the text node directionality of descendant. - result = text_node_directionality(static_cast(descendant)); + result = static_cast(descendant).directionality(); // 5. If result is not null, then return result. if (result.has_value()) diff --git a/Userland/Libraries/LibWeb/DOM/Text.cpp b/Userland/Libraries/LibWeb/DOM/Text.cpp index 824a704ebd8..882c88786ac 100644 --- a/Userland/Libraries/LibWeb/DOM/Text.cpp +++ b/Userland/Libraries/LibWeb/DOM/Text.cpp @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include #include #include @@ -149,4 +150,30 @@ String Text::whole_text() return MUST(builder.to_string()); } +// https://html.spec.whatwg.org/multipage/dom.html#text-node-directionality +Optional Text::directionality() const +{ + // 1. If text's data does not contain a code point whose bidirectional character type is L, AL, or R, then return null. + // 2. Let codePoint be the first code point in text's data whose bidirectional character type is L, AL, or R. + Optional found_character_bidi_class; + for (auto code_point : Utf8View(data())) { + auto bidi_class = Unicode::bidirectional_class(code_point); + if (first_is_one_of(bidi_class, Unicode::BidiClass::LeftToRight, Unicode::BidiClass::RightToLeftArabic, Unicode::BidiClass::RightToLeft)) { + found_character_bidi_class = bidi_class; + break; + } + } + if (!found_character_bidi_class.has_value()) + return {}; + + // 3. If codePoint is of bidirectional character type AL or R, then return 'rtl'. + if (first_is_one_of(*found_character_bidi_class, Unicode::BidiClass::RightToLeftArabic, Unicode::BidiClass::RightToLeft)) + return Element::Directionality::Rtl; + + // 4. If codePoint is of bidirectional character type L, then return 'ltr'. + // NOTE: codePoint should always be of bidirectional character type L by this point, so we can just return 'ltr' here. + VERIFY(*found_character_bidi_class == Unicode::BidiClass::LeftToRight); + return Element::Directionality::Ltr; +} + } diff --git a/Userland/Libraries/LibWeb/DOM/Text.h b/Userland/Libraries/LibWeb/DOM/Text.h index 7c1a9e0ae8f..cd211bdbc5d 100644 --- a/Userland/Libraries/LibWeb/DOM/Text.h +++ b/Userland/Libraries/LibWeb/DOM/Text.h @@ -8,6 +8,7 @@ #pragma once #include +#include #include namespace Web::DOM { @@ -48,6 +49,8 @@ public: bool is_password_input() const { return m_is_password_input; } void set_is_password_input(Badge, bool b) { m_is_password_input = b; } + Optional directionality() const; + protected: Text(Document&, String const&); Text(Document&, NodeType, String const&);