#58 renamed textfragment wrap to word wrap

crates/attributed_string/src/lib.rs

@@ -16,7 +16,7 @@ use dyn_utils::{
     units::{abs::Abs, em::Em},
 };
 use glam::Vec2;
-use line_wrap::{no_wrap::NoLineWrap, text_fragment_wrap::TextFragmentWrap, LineWrapStrategy};
+use line_wrap::{no_wrap::NoLineWrap, word_wrap::WordWrap, LineWrapStrategy};
 use rust_lapper::Lapper;
 use tokens::{line::LineToken, span::SpanToken};
 use utils::is_range_within;
@@ -113,7 +113,7 @@ impl AttributedString {
     pub fn layout(&mut self) {
         let mut line_wrap_strategy: Box<dyn LineWrapStrategy> = match self.config.line_wrap {
             LineWrap::None => Box::new(NoLineWrap),
-            LineWrap::Word => Box::new(TextFragmentWrap),
+            LineWrap::Word => Box::new(WordWrap),
             _ => Box::new(NoLineWrap),
         };
         let lines =
@@ -128,12 +128,14 @@ impl AttributedString {
             let line_range = line.get_range();
 
             current_pos.x = 0.0;
-            current_pos.y += line.height(&self.spans, &self.attrs_intervals);
-
-            // To mirror figmas behavior
-            if index == 0 {
-                current_pos.y *= 0.78;
-            }
+            current_pos.y += if index == 0 {
+                // TODO: for the first line apply the glyph height
+                // starting from the baseline not the decsent
+                // so basically the plain ascent?
+                line.height(&self.spans, &self.attrs_intervals) * 0.78
+            } else {
+                line.height(&self.spans, &self.attrs_intervals)
+            };
 
             let mut max_ascent = Em::zero();
             let mut max_descent = Em::zero();

crates/attributed_string/src/line_wrap/mod.rs

@@ -1,5 +1,5 @@
 pub mod no_wrap;
-pub mod text_fragment_wrap;
+pub mod word_wrap;
 
 use crate::{
     attrs::AttrsIntervals,

crates/attributed_string/src/line_wrap/no_wrap.rs

@@ -20,8 +20,8 @@ impl LineWrapStrategy for NoLineWrap {
         _: &Size,
     ) -> Vec<LineToken> {
         let mut lines: Vec<LineToken> = Vec::new();
-
         let mut current_span_ranges: Vec<SpanRange> = Vec::new();
+
         for (index, span) in spans.iter().enumerate() {
             let mut span_range_start = span.get_range().start;
 
@@ -39,6 +39,7 @@ impl LineWrapStrategy for NoLineWrap {
                 }
             }
 
+            // Handle any remaining span range at the end
             if span_range_start < span.get_range().end {
                 current_span_ranges.push(SpanRange::new(
                     index,
@@ -47,6 +48,7 @@ impl LineWrapStrategy for NoLineWrap {
             }
         }
 
+        // Handle any remaining span ranges at the end
         if !current_span_ranges.is_empty() {
             lines.push(LineToken::new(current_span_ranges));
         }

crates/attributed_string/src/line_wrap/text_fragment_wrap.rs → crates/attributed_string/src/line_wrap/word_wrap.rs

@@ -11,9 +11,9 @@ use dyn_utils::{properties::size::Size, units::abs::Abs};
 
 /// Line wrap strategy that wraps text at word boundaries
 /// or line breaks based on specified width constraints.
-pub struct TextFragmentWrap;
+pub struct WordWrap;
 
-impl LineWrapStrategy for TextFragmentWrap {
+impl LineWrapStrategy for WordWrap {
     fn compute_lines(
         &mut self,
         spans: &[SpanToken],

crates/attributed_string/src/tokens/shape/mod.rs

@@ -25,6 +25,18 @@ pub enum ShapeTokenVariant {
     TextFragment(TextFragmentToken),
 }
 
+impl ShapeTokenVariant {
+    pub fn get_shape_token(&self) -> &dyn ShapeToken {
+        match self {
+            ShapeTokenVariant::Glyph(token) => token,
+            ShapeTokenVariant::WordSeparator(token) => token,
+            ShapeTokenVariant::Linebreak(token) => token,
+            ShapeTokenVariant::Bitmap(token) => token,
+            ShapeTokenVariant::TextFragment(token) => token,
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct ShapeBuffer {
     pub buffer: Option<rustybuzz::UnicodeBuffer>,