Merge branch 'macosui:dev' into dev

Adrian-Samoticha · Aug 13, 2024 · 56aa22c · 56aa22c
2 parents e4fde02 + e35fdab
commit 56aa22c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [2.0.8]
+### 🛠️ Updated 🛠️
+* Fixed `SidebarItem` text overflowing.
+
 ## [2.0.7]
 ### 🛠️ Updated 🛠️
 * Made most widgets aware of the user’s accent color and window state by adding respective fields to `MacosThemeData`.

diff --git a/lib/src/layout/sidebar/sidebar_items.dart b/lib/src/layout/sidebar/sidebar_items.dart
@@ -318,11 +318,14 @@ class _SidebarItem extends StatelessWidget {
                       child: item.leading!,
                     ),
                   ),
-                DefaultTextStyle(
-                  style: labelStyle.copyWith(
-                    color: selected ? textLuminance(selectedColor) : null,
+                Expanded(
+                  child: DefaultTextStyle(
+                    style: labelStyle.copyWith(
+                      color: selected ? textLuminance(selectedColor) : null,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                    child: item.label,
                   ),
-                  child: item.label,
                 ),
                 if (hasTrailing) ...[
                   const Spacer(),

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: macos_ui
 description: Flutter widgets and themes implementing the current macOS design language.
-version: 2.0.7
+version: 2.0.8
 homepage: "https://macosui.dev"
 repository: "https://github.com/GroovinChip/macos_ui"