Merge branch 'main' into update-pickers

Nate Butler created 2 years ago

Change summary

crates/ui2/src/components/label.rs         | 5 ++++-
crates/ui2/src/components/stories/label.rs | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)

Detailed changes

crates/ui2/src/components/label.rs

@@ -129,6 +129,9 @@ impl RenderOnce for HighlightedLabel {
             ));
         }
 
+        let mut text_style = cx.text_style().clone();
+        text_style.color = self.color.color(cx);
+
         div()
             .flex()
             .when(self.strikethrough, |this| {
@@ -146,7 +149,7 @@ impl RenderOnce for HighlightedLabel {
                 LabelSize::Default => this.text_ui(),
                 LabelSize::Small => this.text_ui_sm(),
             })
-            .child(StyledText::new(self.label).with_highlights(&cx.text_style(), highlights))
+            .child(StyledText::new(self.label).with_highlights(&text_style, highlights))
     }
 }
 

crates/ui2/src/components/stories/label.rs

@@ -23,5 +23,9 @@ impl Render for LabelStory {
                 "Héllo, world!",
                 vec![0, 1, 3, 8, 9, 13],
             ))
+            .child(Story::label("Highlighted with `color`"))
+            .child(
+                HighlightedLabel::new("Hello, world!", vec![0, 1, 2, 7, 8, 12]).color(Color::Error),
+            )
     }
 }