fix(core): 🐛 resolved Storybook crash and enhanced panic location rep…

CHANGELOG.md

@@ -29,6 +29,15 @@ Please only add new entries below the [Unreleased](#unreleased---releasedate) he
 
 - **ribir**: compile wasm (#543 @wjian23)
 
+### Changed
+
+- **core**: Enhanced panic location tracking during widget build (#559 @M-Adoo)
+
+### Fixed
+
+- **examples**: fix crash issue in Storybook (#559 @M-Adoo)
+
+
 ## [0.3.0-alpha.2] - 2024-04-03
 
 

Cargo.toml

@@ -34,7 +34,7 @@ keywords = ["gui", "ui", "declarative", "compose-ui"]
 license = "MIT"
 readme = "README.md"
 version = "0.3.0-alpha.3"
-package.rust-version = "1.77.0"
+package = "1.77.0"
 
 [workspace.dependencies]
 ahash = "0.8.11"

core/src/builtin_widgets.rs

@@ -174,6 +174,7 @@ impl<T> FatObj<T> {
   /// Maps an `FatObj<T>` to `FatObj<V>` by applying a function to the host
   /// object.
   #[inline]
+  #[track_caller]
   pub fn map<V>(self, f: impl FnOnce(T) -> V) -> FatObj<V> {
     FatObj {
       host: f(self.host),
@@ -985,6 +986,7 @@ impl<T: MultiChild> MultiChild for FatObj<T> {}
 
 crate::widget::multi_build_replace_impl! {
   impl<T: {#} > {#} for FatObj<T> {
+    #[track_caller]
     fn build(self, ctx: &BuildCtx) -> Widget {
       self.map(|host| host.build(ctx)).build(ctx)
     }
@@ -993,6 +995,7 @@ crate::widget::multi_build_replace_impl! {
 
 impl WidgetBuilder for FatObj<Widget> {
   #[inline]
+  #[track_caller]
   fn build(self, ctx: &BuildCtx) -> Widget {
     let mut host = self.host;
     self.host_id.set(host.id());
@@ -1069,32 +1072,40 @@ impl<T: ComposeWithChild<C, M>, C, M> ComposeWithChild<C, M> for FatObj<T> {
   type Target = FatObj<T::Target>;
 
   #[inline]
+  #[track_caller]
   fn with_child(self, child: C, ctx: &BuildCtx) -> Self::Target {
-    self.map(|host| host.with_child(child, ctx))
+    self.map(
+      #[cfg_attr(feature = "nightly", track_caller)]
+      |host| host.with_child(child, ctx),
+    )
   }
 }
 
 impl<C> SingleWithChild<C, ()> for FatObj<()> {
   type Target = FatObj<C>;
 
   #[inline]
+  #[track_caller]
   fn with_child(self, child: C, _: &BuildCtx) -> Self::Target { self.map(move |_| child) }
 }
 
 impl<T: PairWithChild<C>, C> PairWithChild<C> for FatObj<T> {
   type Target = Pair<FatObj<T>, C>;
 
   #[inline]
+  #[track_caller]
   fn with_child(self, child: C, _: &BuildCtx) -> Self::Target { Pair::new(self, child) }
 }
 
 impl<T: SingleParent + 'static> SingleParent for FatObj<T> {
+  #[track_caller]
   fn compose_child(self, child: Widget, ctx: &BuildCtx) -> Widget {
     self.map(|host| host.compose_child(child, ctx)).build(ctx)
   }
 }
 
 impl<T: MultiParent + 'static> MultiParent for FatObj<T> {
+  #[track_caller]
   fn compose_children(self, children: impl Iterator<Item = Widget>, ctx: &BuildCtx) -> Widget {
     self
       .map(|host| host.compose_children(children, ctx))

core/src/builtin_widgets/theme/compose_decorators.rs

@@ -25,6 +25,7 @@ where
   State<T>: ComposeWithChild<C, M>,
 {
   type Target = <State<T> as ComposeWithChild<C, M>>::Target;
+  #[track_caller]
   fn with_child(self, child: C, ctx: &BuildCtx) -> Self::Target {
     State::value(self).with_child(child, ctx)
   }
@@ -36,6 +37,7 @@ where
   Widget: ChildFrom<C, M>,
 {
   type Target = Widget;
+  #[track_caller]
   fn with_child(self, child: C, ctx: &BuildCtx) -> Self::Target {
     let tid = TypeId::of::<W>();
     let style = ctx.find_cfg(|t| match t {

core/src/lib.rs

@@ -1,3 +1,4 @@
+#![cfg_attr(feature = "nightly", feature(closure_track_caller))]
 #[macro_use]
 extern crate bitflags;
 extern crate lazy_static;

core/src/widget_children.rs

@@ -167,12 +167,14 @@ impl<W: PairChild, C> PairWithChild<C> for W {
   type Target = Pair<W, C>;
 
   #[inline]
+  #[track_caller]
   fn with_child(self, child: C, _: &BuildCtx) -> Self::Target { Pair { parent: self, child } }
 }
 
 impl<W, C1: PairChild, C2> PairWithChild<C2> for Pair<W, C1> {
   type Target = Pair<W, Pair<C1, C2>>;
 
+  #[track_caller]
   fn with_child(self, c: C2, ctx: &BuildCtx) -> Self::Target {
     let Pair { parent: widget, child } = self;
     Pair {

core/src/widget_children/child_convert.rs

@@ -19,6 +19,7 @@ impl<T> ChildFrom<T, ()> for T {
 
 impl<C, T: FromAnother<C, M>, M> ChildFrom<C, (M,)> for T {
   #[inline]
+  #[track_caller]
   fn child_from(value: C, ctx: &BuildCtx) -> Self { FromAnother::from_another(value, ctx) }
 }
 

core/src/widget_children/compose_child_impl.rs

@@ -31,6 +31,7 @@ where
   State<T>: ComposeWithChild<C, M>,
 {
   type Target = <State<T> as ComposeWithChild<C, M>>::Target;
+  #[track_caller]
   fn with_child(self, child: C, ctx: &BuildCtx) -> Self::Target {
     State::value(self).with_child(child, ctx)
   }
@@ -41,7 +42,7 @@ where
   C1: ComposeWithChild<C2, M>,
 {
   type Target = Pair<W, C1::Target>;
-
+  #[track_caller]
   fn with_child(self, c: C2, ctx: &BuildCtx) -> Self::Target {
     let Pair { parent: widget, child } = self;
     Pair {
@@ -60,6 +61,7 @@ where
   type Target = Pair<Self, Child>;
 
   #[inline]
+  #[track_caller]
   fn with_child(self, child: C, ctx: &BuildCtx) -> Self::Target {
     Pair {
       parent: self,
@@ -78,6 +80,7 @@ where
   type Target = Pair<W, Child::Builder>;
 
   #[inline]
+  #[track_caller]
   fn with_child(self, c: C, ctx: &BuildCtx) -> Self::Target {
     let builder = Child::builder();
     let child = builder.with_child(c, ctx);
@@ -93,7 +96,7 @@ where
   Child::Builder: ComposeWithChild<C, M, Target = Child::Builder>,
 {
   type Target = Pair<W, Child::Builder>;
-
+  #[track_caller]
   fn with_child(self, c: C, ctx: &BuildCtx) -> Self::Target {
     let builder = Child::builder();
     let child = builder.with_child(c, ctx);
@@ -146,6 +149,7 @@ where
   type Target = Self;
 
   #[inline]
+  #[track_caller]
   fn with_child(mut self, child: C, ctx: &BuildCtx) -> Self::Target {
     self.push(ChildFrom::child_from(child, ctx));
     self
@@ -160,6 +164,7 @@ where
   type Target = Self;
 
   #[inline]
+  #[track_caller]
   fn with_child(mut self, child: C, ctx: &BuildCtx) -> Self::Target {
     self.extend(child.into_iter().map(|v| ChildFrom::child_from(v, ctx)));
     self

core/src/widget_children/multi_child_impl.rs

@@ -54,7 +54,7 @@ where
   C: FillVec<M>,
 {
   type Target = MultiPair<P>;
-
+  #[track_caller]
   fn with_child(self, child: C, ctx: &BuildCtx) -> Self::Target {
     let mut children = vec![];
     child.fill_vec(&mut children, ctx);
@@ -68,6 +68,7 @@ where
 {
   type Target = Self;
   #[inline]
+  #[track_caller]
   fn with_child(mut self, child: C, ctx: &BuildCtx) -> Self::Target {
     child.fill_vec(&mut self.children, ctx);
     self

core/src/widget_children/single_child_impl.rs

@@ -12,7 +12,7 @@ pub trait SingleWithChild<C, M: ?Sized> {
 crate::widget::multi_build_replace_impl_include_self! {
   impl<P: SingleParent, C: {#}> SingleWithChild<C, dyn {#}> for P {
     type Target = Widget;
-
+    #[track_caller]
     fn with_child(self, child: C, ctx: &BuildCtx) -> Self::Target {
       self.compose_child(child.build(ctx), ctx)
     }
@@ -24,7 +24,7 @@ crate::widget::multi_build_replace_impl_include_self! {
     C: {#},
   {
     type Target = Widget;
-
+    #[track_caller]
     fn with_child(self, child: Option<C>, ctx: &BuildCtx) -> Self::Target {
       if let Some(child) = child {
         self.with_child(child, ctx)
@@ -43,7 +43,7 @@ crate::widget::multi_build_replace_impl_include_self! {
     V: {#} + 'static,
   {
     type Target = Widget;
-
+    #[track_caller]
     fn with_child(self, child: PP, ctx: &BuildCtx) -> Self::Target {
       let child = crate::pipe::pipe_option_to_widget!(child, ctx);
       self.with_child(child, ctx)

examples/storybook/src/storybook.rs

@@ -180,18 +180,21 @@ fn content() -> impl WidgetBuilder {
             @ { svgs::HOME }
             @ { Label::new("Video") }
           }
+          @TabPane { @ { fn_widget!(Void) } }
         }
         @Tab {
           @TabItem {
             @ { svgs::HOME }
             @ { Label::new("Photos") }
           }
+          @TabPane { @ { fn_widget!(Void) } }
         }
         @Tab {
           @TabItem {
             @ { svgs::HOME }
             @ { Label::new("Audio") }
           }
+          @TabPane { @ { fn_widget!(Void) } }
         }
       }
     }

macros/src/child_template.rs

@@ -38,6 +38,7 @@ pub(crate) fn derive_child_template(input: &mut syn::DeriveInput) -> syn::Result
     tokens.extend(quote! {
       impl #g_impl ComposeWithChild<_C, [_M; #f_idx]> for #builder #g_ty #g_where  {
         type Target = Self;
+        #[track_caller]
         fn with_child(mut self, c: _C, ctx: &BuildCtx) -> Self::Target {
           assert!(self.#field_name.is_none(), "Try to fill same type twice.");
           self.#field_name = Some(ChildFrom::child_from(c, ctx));
@@ -71,16 +72,19 @@ pub(crate) fn derive_child_template(input: &mut syn::DeriveInput) -> syn::Result
 
         impl #g_impl FromAnother<#builder #g_ty, ()> for #name #g_ty #g_where {
           #[inline]
+          #[track_caller]
           fn from_another(value: #builder #g_ty, _: &BuildCtx) -> Self { value.build_tml() }
         }
 
         impl #g_impl std::convert::From<#builder #g_ty> for #name #g_ty #g_where {
           #[inline]
+          #[track_caller]
           fn from(value: #builder #g_ty) -> Self { value.build_tml() }
         }
 
         impl #g_impl std::convert::From<#builder #g_ty> for Option<#name #g_ty> #g_where {
           #[inline]
+          #[track_caller]
           fn from(value: #builder #g_ty) -> Self { Some(value.build_tml()) }
         }
       });
@@ -110,6 +114,7 @@ pub(crate) fn derive_child_template(input: &mut syn::DeriveInput) -> syn::Result
             impl #g_impl TemplateBuilder for #builder #g_ty #g_where {
               type Target = #name #g_ty;
               #[inline]
+              #[track_caller]
               fn build_tml(self) -> Self::Target {#name { #(#init_values),* }}
             }
           });
@@ -133,7 +138,7 @@ pub(crate) fn derive_child_template(input: &mut syn::DeriveInput) -> syn::Result
           tokens.extend(quote! {
             impl #g_impl TemplateBuilder for #builder #g_ty #g_where {
               type Target = #name #g_ty;
-              #[inline]
+              #[track_caller]
               fn build_tml(self) -> Self::Target {#name(#(#init_values),* ) }
             }
           });
@@ -152,7 +157,7 @@ pub(crate) fn derive_child_template(input: &mut syn::DeriveInput) -> syn::Result
 
         impl #g_impl TemplateBuilder for #builder #g_ty #g_where {
           type Target = #name #g_ty;
-          #[inline]
+          #[track_caller]
           fn build_tml(self) -> Self::Target {
             self.0.expect(&#err_str)
           }