NarrowLayout: fix item widget if selected (#153)

ubuntu · Jun 14, 2022 · f33a5d5 · f33a5d5
1 parent 08e6f41
commit f33a5d5
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/lib/src/yaru_narrow_layout.dart b/lib/src/yaru_narrow_layout.dart
@@ -63,12 +63,10 @@ class _YaruNarrowLayoutState extends State<YaruNarrowLayout> {
             items: widget.pageItems
                 .map(
                   (pageItem) => BottomNavigationBarItem(
-                      icon: pageItem.itemWidget != null
-                          ? pageItem.itemWidget!
-                          : Icon(pageItem.iconData),
-                      activeIcon: pageItem.selectedItemWidget != null
-                          ? pageItem.selectedItemWidget!
-                          : (pageItem.selectedIconData != null
+                      icon: pageItem.itemWidget ?? Icon(pageItem.iconData),
+                      activeIcon: pageItem.selectedItemWidget ??
+                          pageItem.itemWidget ??
+                          (pageItem.selectedIconData != null
                               ? Icon(pageItem.selectedIconData)
                               : Icon(pageItem.iconData)),
                       label: convertWidgetToString(