Make each TextSection its own entity.

crates/bevy_dev_tools/src/fps_overlay.rs

@@ -11,11 +11,8 @@ use bevy_ecs::{
     system::{Commands, Query, Res, Resource},
 };
 use bevy_hierarchy::{BuildChildren, ChildBuild};
-use bevy_text::{Font, Text, TextSection, TextStyle};
-use bevy_ui::{
-    node_bundles::{NodeBundle, TextBundle},
-    PositionType, Style, ZIndex,
-};
+use bevy_text::{Font, TextSection, TextStyle};
+use bevy_ui::{node_bundles::TextBundle, PositionType, Style, ZIndex};
 use bevy_utils::default;
 
 /// Global [`ZIndex`] used to render the fps overlay.
@@ -78,7 +75,7 @@ struct FpsText;
 
 fn setup(mut commands: Commands, overlay_config: Res<FpsOverlayConfig>) {
     commands
-        .spawn(NodeBundle {
+        .spawn((TextBundle {
             style: Style {
                 // We need to make sure the overlay doesn't affect the position of other UI nodes
                 position_type: PositionType::Absolute,
@@ -87,35 +84,38 @@ fn setup(mut commands: Commands, overlay_config: Res<FpsOverlayConfig>) {
             // Render overlay on top of everything
             z_index: ZIndex::Global(FPS_OVERLAY_ZINDEX),
             ..default()
-        })
+        },))
         .with_children(|c| {
+            c.spawn(TextSection::new(
+                "FPS: ",
+                overlay_config.text_config.clone(),
+            ));
+
             c.spawn((
-                TextBundle::from_sections([
-                    TextSection::new("FPS: ", overlay_config.text_config.clone()),
-                    TextSection::from_style(overlay_config.text_config.clone()),
-                ]),
+                TextSection::from_style(overlay_config.text_config.clone()),
                 FpsText,
             ));
         });
 }
 
-fn update_text(diagnostic: Res<DiagnosticsStore>, mut query: Query<&mut Text, With<FpsText>>) {
-    for mut text in &mut query {
+fn update_text(
+    diagnostic: Res<DiagnosticsStore>,
+    mut query: Query<&mut TextSection, With<FpsText>>,
+) {
+    for mut section in &mut query {
         if let Some(fps) = diagnostic.get(&FrameTimeDiagnosticsPlugin::FPS) {
             if let Some(value) = fps.smoothed() {
-                text.sections[1].value = format!("{value:.2}");
+                section.value = format!("{value:.2}");
             }
         }
     }
 }
 
 fn customize_text(
     overlay_config: Res<FpsOverlayConfig>,
-    mut query: Query<&mut Text, With<FpsText>>,
+    mut query: Query<&mut TextSection, With<FpsText>>,
 ) {
-    for mut text in &mut query {
-        for section in text.sections.iter_mut() {
-            section.style = overlay_config.text_config.clone();
-        }
+    for mut section in &mut query {
+        section.style = overlay_config.text_config.clone();
     }
 }

crates/bevy_text/Cargo.toml

@@ -18,6 +18,7 @@ bevy_asset = { path = "../bevy_asset", version = "0.15.0-dev" }
 bevy_color = { path = "../bevy_color", version = "0.15.0-dev" }
 bevy_derive = { path = "../bevy_derive", version = "0.15.0-dev" }
 bevy_ecs = { path = "../bevy_ecs", version = "0.15.0-dev" }
+bevy_hierarchy = { path = "../bevy_hierarchy", version = "0.15.0-dev" }
 bevy_math = { path = "../bevy_math", version = "0.15.0-dev" }
 bevy_reflect = { path = "../bevy_reflect", version = "0.15.0-dev", features = [
   "bevy",

crates/bevy_text/src/pipeline.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use bevy_asset::{AssetId, Assets};
-use bevy_ecs::{component::Component, reflect::ReflectComponent, system::Resource};
+use bevy_ecs::{component::Component, reflect::ReflectComponent, system::Resource, world::Ref};
 use bevy_math::{UVec2, Vec2};
 use bevy_reflect::{std_traits::ReflectDefault, Reflect};
 use bevy_render::texture::Image;
@@ -61,7 +61,7 @@ impl TextPipeline {
     pub fn update_buffer(
         &mut self,
         fonts: &Assets<Font>,
-        sections: &[TextSection],
+        sections: &[(usize, Ref<TextSection>)],
         linebreak_behavior: BreakLineOn,
         bounds: TextBounds,
         scale_factor: f64,
@@ -72,7 +72,7 @@ impl TextPipeline {
 
         // return early if the fonts are not loaded yet
         let mut font_size = 0.;
-        for section in sections {
+        for (_, section) in sections {
             if section.style.font_size > font_size {
                 font_size = section.style.font_size;
             }
@@ -85,7 +85,7 @@ impl TextPipeline {
 
         // Load Bevy fonts into cosmic-text's font system.
         // This is done as as separate pre-pass to avoid borrow checker issues
-        for section in sections.iter() {
+        for (_, section) in sections {
             load_font_to_fontdb(section, font_system, &mut self.map_handle_to_font_id, fonts);
         }
 
@@ -97,14 +97,13 @@ impl TextPipeline {
         // in cosmic-text.
         let spans: Vec<(&str, Attrs)> = sections
             .iter()
-            .enumerate()
             .filter(|(_section_index, section)| section.style.font_size > 0.0)
             .map(|(section_index, section)| {
                 (
                     &section.value[..],
                     get_attrs(
                         section,
-                        section_index,
+                        *section_index,
                         font_system,
                         &self.map_handle_to_font_id,
                         scale_factor,
@@ -146,7 +145,7 @@ impl TextPipeline {
     pub fn queue_text(
         &mut self,
         fonts: &Assets<Font>,
-        sections: &[TextSection],
+        sections: &[(usize, Ref<TextSection>)],
         scale_factor: f64,
         text_alignment: JustifyText,
         linebreak_behavior: BreakLineOn,
@@ -185,7 +184,7 @@ impl TextPipeline {
             .map(|(layout_glyph, line_y)| {
                 let section_index = layout_glyph.metadata;
 
-                let font_handle = sections[section_index].style.font.clone_weak();
+                let font_handle = sections[section_index].1.style.font.clone_weak();
                 let font_atlas_set = font_atlas_sets.sets.entry(font_handle.id()).or_default();
 
                 let physical_glyph = layout_glyph.physical((0., 0.), 1.);
@@ -238,10 +237,11 @@ impl TextPipeline {
     ///
     /// Produces a [`TextMeasureInfo`] which can be used by a layout system
     /// to measure the text area on demand.
+    #[allow(clippy::too_many_arguments)]
     pub fn create_text_measure(
         &mut self,
         fonts: &Assets<Font>,
-        sections: &[TextSection],
+        sections: &[(usize, Ref<TextSection>)],
         scale_factor: f64,
         linebreak_behavior: BreakLineOn,
         buffer: &mut CosmicBuffer,

crates/bevy_text/src/text.rs

@@ -29,8 +29,6 @@ impl Default for CosmicBuffer {
 #[derive(Component, Debug, Clone, Default, Reflect)]
 #[reflect(Component, Default)]
 pub struct Text {
-    /// The text's sections
-    pub sections: Vec<TextSection>,
     /// The text's internal alignment.
     /// Should not affect its position within a container.
     pub justify: JustifyText,
@@ -39,79 +37,6 @@ pub struct Text {
 }
 
 impl Text {
-    /// Constructs a [`Text`] with a single section.
-    ///
-    /// ```
-    /// # use bevy_asset::Handle;
-    /// # use bevy_color::Color;
-    /// # use bevy_text::{Font, Text, TextStyle, JustifyText};
-    /// #
-    /// # let font_handle: Handle<Font> = Default::default();
-    /// #
-    /// // Basic usage.
-    /// let hello_world = Text::from_section(
-    ///     // Accepts a String or any type that converts into a String, such as &str.
-    ///     "hello world!",
-    ///     TextStyle {
-    ///         font: font_handle.clone().into(),
-    ///         font_size: 60.0,
-    ///         color: Color::WHITE,
-    ///     },
-    /// );
-    ///
-    /// let hello_bevy = Text::from_section(
-    ///     "hello world\nand bevy!",
-    ///     TextStyle {
-    ///         font: font_handle.into(),
-    ///         font_size: 60.0,
-    ///         color: Color::WHITE,
-    ///     },
-    /// ) // You can still add text justifaction.
-    /// .with_justify(JustifyText::Center);
-    /// ```
-    pub fn from_section(value: impl Into<String>, style: TextStyle) -> Self {
-        Self {
-            sections: vec![TextSection::new(value, style)],
-            ..default()
-        }
-    }
-
-    /// Constructs a [`Text`] from a list of sections.
-    ///
-    /// ```
-    /// # use bevy_asset::Handle;
-    /// # use bevy_color::Color;
-    /// # use bevy_color::palettes::basic::{RED, BLUE};
-    /// # use bevy_text::{Font, Text, TextStyle, TextSection};
-    /// #
-    /// # let font_handle: Handle<Font> = Default::default();
-    /// #
-    /// let hello_world = Text::from_sections([
-    ///     TextSection::new(
-    ///         "Hello, ",
-    ///         TextStyle {
-    ///             font: font_handle.clone().into(),
-    ///             font_size: 60.0,
-    ///             color: BLUE.into(),
-    ///         },
-    ///     ),
-    ///     TextSection::new(
-    ///         "World!",
-    ///         TextStyle {
-    ///             font: font_handle.into(),
-    ///             font_size: 60.0,
-    ///             color: RED.into(),
-    ///         },
-    ///     ),
-    /// ]);
-    /// ```
-    pub fn from_sections(sections: impl IntoIterator<Item = TextSection>) -> Self {
-        Self {
-            sections: sections.into_iter().collect(),
-            ..default()
-        }
-    }
-
     /// Returns this [`Text`] with a new [`JustifyText`].
     pub const fn with_justify(mut self, justify: JustifyText) -> Self {
         self.justify = justify;
@@ -127,7 +52,7 @@ impl Text {
 }
 
 /// Contains the value of the text in a section and how it should be styled.
-#[derive(Debug, Default, Clone, Reflect)]
+#[derive(Component, Debug, Default, Clone, Reflect)]
 #[reflect(Default)]
 pub struct TextSection {
     /// The content (in `String` form) of the text in the section.