From 75df5129959028679081f68d3330860e291a1aaa Mon Sep 17 00:00:00 2001
From: wjian23 <w_jian23@163.com>
Date: Tue, 10 Dec 2024 17:42:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(core):=20=F0=9F=90=9B=20fix=20mismatch=20of?=
 =?UTF-8?q?=20providers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         |  3 ++
 core/src/builtin_widgets/provider.rs | 50 ++++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 421cea045..ddd29de16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,9 @@ Please only add new entries below the [Unreleased](#unreleased---releasedate) he
 
 ## [@Unreleased] - @ReleaseDate
 
+### Fixed
+- **core**: fix mismatch of providers (#pr @wjian23)
+
 ## [0.4.0-alpha.18] - 2024-12-11
 
 ### Features
diff --git a/core/src/builtin_widgets/provider.rs b/core/src/builtin_widgets/provider.rs
index 101d060c8..c77acdb60 100644
--- a/core/src/builtin_widgets/provider.rs
+++ b/core/src/builtin_widgets/provider.rs
@@ -118,14 +118,17 @@ impl<'c> ComposeChild<'c> for Provider {
       })
       .provider;
 
+    fn_widget! {
     // We push the provider into the build context to ensure that the widget build
     // logic can access this provider.
-    let ctx = BuildCtx::get_mut();
-    ctx.current_providers.push(provider);
-    child.into_widget().on_build(|id| {
-      let provider = ctx.current_providers.pop().unwrap();
-      id.attach_data(provider, ctx.tree_mut());
-    })
+      let ctx = BuildCtx::get_mut();
+      ctx.current_providers.push(provider);
+      child.into_widget().on_build(move |id| {
+        let provider = ctx.current_providers.pop().unwrap();
+        id.attach_data(provider, ctx.tree_mut());
+      })
+    }
+    .into_widget()
   }
 }
 
@@ -260,6 +263,41 @@ mod tests {
     assert_eq!(*value.read(), 1);
   }
 
+  #[test]
+  fn with_multi_providers() {
+    reset_test_env!();
+
+    let (value1, w_value1) = split_value(0);
+    let (value2, w_value2) = split_value(0);
+    let w = fn_widget! {
+      let w_value1 = w_value1.clone_writer();
+      let w_value2 = w_value2.clone_writer();
+      @MockMulti {
+        @ {
+          Provider::new(Box::new(Queryable(1i32))).with_child(fn_widget! {
+            let v = Provider::of::<i32>(BuildCtx::get()).unwrap();
+            *$w_value1.write() = *v;
+            @ Void{}
+          })
+        }
+
+        @ {
+          Provider::new(Box::new(Queryable(2i32))).with_child(fn_widget! {
+            let v = Provider::of::<i32>(BuildCtx::get()).unwrap();
+            *$w_value2.write() = *v;
+            @ Void{}
+          })
+        }
+      }
+    };
+
+    let mut wnd = TestWindow::new(w);
+    wnd.draw_frame();
+
+    assert_eq!(*value1.read(), 1);
+    assert_eq!(*value2.read(), 2);
+  }
+
   #[test]
   fn provider_for_pipe() {
     reset_test_env!();