Skip to content

Refactor back block handling in CommonScaffold to simplify dispose logic and improve readability #1650

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

Open
Platohykj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Refactor back block handling in CommonScaffold to simplify dispose logic and improve readability #1650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions lib/widgets/pop_scope.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,8 @@ class _SystemBackBlockState extends State<SystemBackBlock> {

@override
void dispose() {
globalState.appController.unBackBlock();
super.dispose();
WidgetsBinding.instance.addPostFrameCallback((_) {
globalState.appController.unBackBlock();
});
}

@override
Expand Down
27 changes: 15 additions & 12 deletions lib/widgets/scaffold.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,19 +238,22 @@ class CommonScaffoldState extends State<CommonScaffold> {
Widget _buildAppBarWrap(Widget child) {
final appBar = _isSearch ? _buildSearchingAppBarTheme(child) : child;
if (_isEdit || _isSearch) {
return SystemBackBlock(
child: CommonPopScope(
onPop: (context) {
if (_isEdit || _isSearch) {
handleExitSearching();
_appBarState.value.editState?.onExit();
return false;
}
return true;
},
child: appBar,
),
final wrappedAppBar = CommonPopScope(
onPop: (context) {
if (_isEdit || _isSearch) {
handleExitSearching();
_appBarState.value.editState?.onExit();
return false;
}
return true;
},
child: appBar,
);
// Only block system back for edit mode, not search mode
if (_isEdit) {
return SystemBackBlock(child: wrappedAppBar);
}
return wrappedAppBar;
}
return appBar;
}
Expand Down