fix: Correct the placement of the leading widget in disclosure sideba…

…r items (#272)
macosui · Jul 1, 2022 · 098c22f · 098c22f
1 parent 9b8f75d
commit 098c22f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [1.5.1]
+* Correct the placement of the leading widget in disclosure sidebar items [#268](https://github.com/GroovinChip/macos_ui/issues/268)
+
 ## [1.5.0]
 * Adds `endSidebar` to `MacosWindow`
 

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -188,6 +188,7 @@ class _WidgetGalleryState extends State<WidgetGallery> {
                   label: Text('Fields'),
                 ),
                 SidebarItem(
+                  leading: Icon(CupertinoIcons.folder),
                   label: Text('Disclosure'),
                   disclosureItems: [
                     SidebarItem(

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -87,7 +87,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.5.0"
+    version: "1.5.1"
   matcher:
     dependency: transitive
     description:

diff --git a/lib/src/layout/sidebar/sidebar_items.dart b/lib/src/layout/sidebar/sidebar_items.dart
@@ -338,20 +338,21 @@ class __DisclosureSidebarItemState extends State<_DisclosureSidebarItem>
               label: widget.item.label,
               leading: Row(
                 children: [
-                  if (widget.item.leading != null)
-                    Padding(
-                      padding: EdgeInsets.only(right: spacing),
-                      child: widget.item.leading!,
-                    ),
                   RotationTransition(
                     turns: _iconTurns,
                     child: Icon(
                       CupertinoIcons.chevron_right,
+                      size: 12.0,
                       color: theme.brightness == Brightness.light
                           ? MacosColors.black
                           : MacosColors.white,
                     ),
                   ),
+                  if (widget.item.leading != null)
+                    Padding(
+                      padding: EdgeInsets.only(left: spacing),
+                      child: widget.item.leading!,
+                    ),
                 ],
               ),
               unselectedColor: MacosColors.transparent,

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: 1.5.0
+version: 1.5.1
 homepage: "https://macosui.dev"
 repository: "https://github.com/GroovinChip/macos_ui"