From 5ea2dd7457b8846d718da7d5de327e97085172fd Mon Sep 17 00:00:00 2001
From: Alice I Cecile <alice.i.cecile@gmail.com>
Date: Wed, 6 Aug 2025 16:10:13 -0700
Subject: [PATCH 1/2] Move feathers propagation into PostUpdate

---
 crates/bevy_feathers/src/lib.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/bevy_feathers/src/lib.rs b/crates/bevy_feathers/src/lib.rs
index ef70be1844ed0..406e06d2cb3da 100644
--- a/crates/bevy_feathers/src/lib.rs
+++ b/crates/bevy_feathers/src/lib.rs
@@ -18,7 +18,7 @@
 //! Please report issues, submit fixes and propose changes.
 //! Thanks for stress-testing; let's build something better together.
 
-use bevy_app::{HierarchyPropagatePlugin, Plugin, PostUpdate, Update};
+use bevy_app::{HierarchyPropagatePlugin, Plugin, PostUpdate};
 use bevy_asset::embedded_asset;
 use bevy_ecs::query::With;
 use bevy_text::{TextColor, TextFont};
@@ -63,8 +63,8 @@ impl Plugin for FeathersPlugin {
         app.add_plugins((
             ControlsPlugin,
             CursorIconPlugin,
-            HierarchyPropagatePlugin::<TextColor, With<ThemedText>>::new(Update),
-            HierarchyPropagatePlugin::<TextFont, With<ThemedText>>::new(Update),
+            HierarchyPropagatePlugin::<TextColor, With<ThemedText>>::new(PostUpdate),
+            HierarchyPropagatePlugin::<TextFont, With<ThemedText>>::new(PostUpdate),
             UiMaterialPlugin::<AlphaPatternMaterial>::default(),
         ));
 

From ba200c9354dc75c71239d847c469fe8045a43d70 Mon Sep 17 00:00:00 2001
From: Alice Cecile <alice.i.cecile@gmail.com>
Date: Sun, 10 Aug 2025 17:22:17 -0700
Subject: [PATCH 2/2] Add font propagation to the right system set

---
 crates/bevy_feathers/src/lib.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_feathers/src/lib.rs b/crates/bevy_feathers/src/lib.rs
index 406e06d2cb3da..1a4621d230ab5 100644
--- a/crates/bevy_feathers/src/lib.rs
+++ b/crates/bevy_feathers/src/lib.rs
@@ -18,10 +18,11 @@
 //! Please report issues, submit fixes and propose changes.
 //! Thanks for stress-testing; let's build something better together.
 
-use bevy_app::{HierarchyPropagatePlugin, Plugin, PostUpdate};
+use bevy_app::{HierarchyPropagatePlugin, Plugin, PostUpdate, PropagateSet};
 use bevy_asset::embedded_asset;
-use bevy_ecs::query::With;
+use bevy_ecs::{query::With, schedule::IntoScheduleConfigs};
 use bevy_text::{TextColor, TextFont};
+use bevy_ui::UiSystems;
 use bevy_ui_render::UiMaterialPlugin;
 
 use crate::{
@@ -68,6 +69,13 @@ impl Plugin for FeathersPlugin {
             UiMaterialPlugin::<AlphaPatternMaterial>::default(),
         ));
 
+        // This needs to run in UiSystems::Propagate so the fonts are up-to-date for `measure_text_system`
+        // and `detect_text_needs_rerender` in UiSystems::Content
+        app.configure_sets(
+            PostUpdate,
+            PropagateSet::<TextFont>::default().in_set(UiSystems::Propagate),
+        );
+
         app.insert_resource(DefaultCursor(EntityCursor::System(
             bevy_window::SystemCursorIcon::Default,
         )));