From 2bc3328ab4d939db0de76f76483968a495b2937c Mon Sep 17 00:00:00 2001
From: Nigel Breslaw <nigel.breslaw@slint.dev>
Date: Fri, 5 Sep 2025 11:30:54 +0300
Subject: [PATCH] material: ActionChip SearchBar: avatar -> avatar-icon
 (https://github.com/slint-ui/material-components/issues/154)

Imported from https://github.com/slint-ui/material-components/commit/5de14badc5c184bc21a3d088daebc226665bee73
---
 .../docs/src/content/docs/components/AppBars/search_bar.mdx | 2 +-
 .../docs/src/content/docs/components/Chips/action_chip.mdx  | 4 ++--
 ui-libraries/material/ui/components/base_button.slint       | 6 +++---
 ui-libraries/material/ui/components/chip.slint              | 4 ++--
 ui-libraries/material/ui/components/search_bar.slint        | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ui-libraries/material/docs/src/content/docs/components/AppBars/search_bar.mdx b/ui-libraries/material/docs/src/content/docs/components/AppBars/search_bar.mdx
index a2e4be675..e5326f130 100644
--- a/ui-libraries/material/docs/src/content/docs/components/AppBars/search_bar.mdx
+++ b/ui-libraries/material/docs/src/content/docs/components/AppBars/search_bar.mdx
@@ -28,7 +28,7 @@ A `SearchBar` is a text input field designed for search functionality, with opti
 ## Properties
 
 ### avatar
-<SlintProperty propName="avatar" typeName="image">
+<SlintProperty propName="avatar-icon" typeName="image">
 An optional avatar image displayed in the search bar.
 </SlintProperty>
 
diff --git a/ui-libraries/material/docs/src/content/docs/components/Chips/action_chip.mdx b/ui-libraries/material/docs/src/content/docs/components/Chips/action_chip.mdx
index ceafdcc39..cb91fb6ba 100644
--- a/ui-libraries/material/docs/src/content/docs/components/Chips/action_chip.mdx
+++ b/ui-libraries/material/docs/src/content/docs/components/Chips/action_chip.mdx
@@ -28,8 +28,8 @@ An `ActionChip` is a compact element that represents an action or choice. It can
 
 ## Properties
 
-### avatar
-<SlintProperty propName="avatar" typeName="image">
+### avatar-icon
+<SlintProperty propName="avatar-icon" typeName="image">
 An optional avatar image displayed on the chip.
 </SlintProperty>
 
diff --git a/ui-libraries/material/ui/components/base_button.slint b/ui-libraries/material/ui/components/base_button.slint
index e62402f68..318eae6a7 100644
--- a/ui-libraries/material/ui/components/base_button.slint
+++ b/ui-libraries/material/ui/components/base_button.slint
@@ -18,11 +18,11 @@ export component BaseButton inherits StateLayerArea {
     in property <length> min_layout_width: MaterialStyleMetrics.size_40;
     in property <length> min_layout_height: MaterialStyleMetrics.size_40;
     in property <length> icon_size: MaterialStyleMetrics.icon_size_18;
-    in property <image> avatar;
+    in property <image> avatar_icon;
     in property <length> avatar_size;
     in property <color> avatar_background: #00000000;
     out property <bool> has_icon: root.icon.width > 0 && root.icon.height > 0;
-    out property <bool> has_avatar: root.avatar.width > 0 && root.avatar.height > 0;
+    out property <bool> has_avatar: root.avatar_icon.width > 0 && root.avatar_icon.height > 0;
 
     min_width: max(root.min_layout_width, layout.min_width);
     min_height: max(root.min_layout_height, layout.min_height);
@@ -46,7 +46,7 @@ export component BaseButton inherits StateLayerArea {
             if root.has_avatar && root.avatar_size > 0 : Avatar {
                 width: root.avatar_size;
                 height: self.width;
-                image: root.avatar;
+                image: root.avatar_icon;
                 background: root.avatar_background;
             }
 
diff --git a/ui-libraries/material/ui/components/chip.slint b/ui-libraries/material/ui/components/chip.slint
index 3ef795b71..b5c075227 100644
--- a/ui-libraries/material/ui/components/chip.slint
+++ b/ui-libraries/material/ui/components/chip.slint
@@ -14,7 +14,7 @@ export component ActionChip {
     in property <string> text <=> base.text;
     in property <bool> enabled <=> base.enabled;
     in property <string> tooltip <=> base.tooltip;
-    in property <image> avatar <=> base.avatar;
+    in property <image> avatar_icon <=> base.avatar-icon;
     in property <color> avatar_background <=> base.avatar_background;
 
     callback clicked <=> base.clicked;
@@ -117,7 +117,7 @@ export component FilterChip {
 export component InputChip {
     in property <image> leading_icon <=> base.icon;
     in property <image> trailing_icon;
-    in property <image> avatar <=> base.avatar;
+    in property <image> avatar <=> base.avatar-icon;
     in property <color> avatar_background <=> base.avatar_background;
     in property <string> text <=> base.text;
     in property <bool> enabled <=> base.enabled;
diff --git a/ui-libraries/material/ui/components/search_bar.slint b/ui-libraries/material/ui/components/search_bar.slint
index ffa03e85f..dece776ba 100644
--- a/ui-libraries/material/ui/components/search_bar.slint
+++ b/ui-libraries/material/ui/components/search_bar.slint
@@ -119,7 +119,7 @@ component SearchTextInput  {
 export component SearchBar {
     in property <image> leading_icon: Icons.menu;
     in property <image> trailing_icon;
-    in property <image> avatar;
+    in property <image> avatar_icon;
     in property <color> avatar_background: #00000000;
     in property <string> placeholder;
     in property <string> empty_text;
@@ -176,11 +176,11 @@ export component SearchBar {
                     color: root.color;
                 }
 
-                if (root.avatar.width > 0 && root.avatar.height > 0) || root.avatar_background != #00000000 : VerticalLayout {
+                if (root.avatar_icon.width > 0 && root.avatar_icon.height > 0) || root.avatar_background != #00000000 : VerticalLayout {
                     alignment: center;
 
                     Avatar  {
-                        image: root.avatar;
+                        image: root.avatar_icon;
                         background: root.avatar_background;
                     }
                 }