Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: remove IntrinsicHeight from navigation rail #754

Merged
merged 2 commits into from
Aug 11, 2023
Merged

feat: remove IntrinsicHeight from navigation rail #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec8993b
feat: remove IntrinsicHeight from navigation rail
Jupi007 Aug 11, 2023
ae27589
Merge 'main' branch
Jupi007 Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 16 additions & 27 deletions lib/src/widgets/navi_rail/yaru_navigation_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,19 +148,14 @@ class _YaruNavigationPageState extends State<YaruNavigationPage> {
backgroundColor: theme.sideBarColor,
body: widget.length == 0 || widget.controller?.length == 0
? widget.emptyBuilder?.call(context) ?? const SizedBox.shrink()
: LayoutBuilder(
builder: (context, constraint) {
return Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildNavigationRail(context, constraint),
if (theme.includeSeparator != false)
_buildVerticalSeparator(),
_buildPageView(context),
],
);
},
: Row(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_buildNavigationRail(context),
if (theme.includeSeparator != false) _buildVerticalSeparator(),
_buildPageView(context),
],
),
);
}
Expand All @@ -171,26 +166,20 @@ class _YaruNavigationPageState extends State<YaruNavigationPage> {
_navigatorKey.currentState?.popUntil((route) => route.isFirst);
}

Widget _buildNavigationRail(BuildContext context, BoxConstraints constraint) {
Widget _buildNavigationRail(BuildContext context) {
return Theme(
data: Theme.of(context).copyWith(
scrollbarTheme: ScrollbarTheme.of(context).copyWith(
thickness: MaterialStateProperty.all(_kScrollbarThickness),
),
),
child: SingleChildScrollView(
controller: _scrollController,
child: ConstrainedBox(
constraints: BoxConstraints(minHeight: constraint.maxHeight),
child: YaruNavigationRail(
selectedIndex: max(_pageController.index, 0),
onDestinationSelected: _onTap,
length: _pageController.length,
itemBuilder: widget.itemBuilder,
leading: widget.leading,
trailing: widget.trailing,
),
),
child: YaruNavigationRail(
selectedIndex: max(_pageController.index, 0),
onDestinationSelected: _onTap,
length: _pageController.length,
itemBuilder: widget.itemBuilder,
leading: widget.leading,
trailing: widget.trailing,
),
);
}
Expand Down
69 changes: 49 additions & 20 deletions lib/src/widgets/navi_rail/yaru_navigation_rail.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,59 @@ class YaruNavigationRail extends StatelessWidget {

@override
Widget build(BuildContext context) {
final theme = YaruNavigationPageTheme.of(context);
final colorScheme = Theme.of(context).colorScheme;
final navigationPageTheme = YaruNavigationPageTheme.of(context);

return Padding(
padding: theme.railPadding ?? EdgeInsets.zero,
child: IntrinsicHeight(
child: Column(
children: <Widget>[
if (leading != null) leading!,
for (int i = 0; i < length; i += 1)
YaruNavigationRailItemScope(
index: i,
selected: i == selectedIndex,
onTap: () => onDestinationSelected?.call(i),
child: Builder(
builder: (context) => itemBuilder(
context,
i,
i == selectedIndex,
padding: navigationPageTheme.railPadding ?? EdgeInsets.zero,
child: Column(
children: [
if (leading != null)
Container(
margin: const EdgeInsets.only(bottom: 1.0),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: colorScheme.outline,
),
),
),
child: leading!,
),
Expanded(
child: SingleChildScrollView(
child: Column(
children: [
for (int i = 0; i < length; i += 1)
YaruNavigationRailItemScope(
index: i,
selected: i == selectedIndex,
onTap: () => onDestinationSelected?.call(i),
child: Builder(
builder: (context) => itemBuilder(
context,
i,
i == selectedIndex,
),
),
),
],
),
),
),
if (trailing != null)
Container(
margin: const EdgeInsets.only(top: 1.0),
decoration: BoxDecoration(
border: Border(
top: BorderSide(
color: colorScheme.outline,
),
),
),
const Spacer(),
if (trailing != null) trailing!,
],
),
child: trailing!,
),
],
),
);
}
Expand Down