MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix riverpod lifecycle issues

Browse Source
This commit is contained in:
Fabian Freund
2025-10-03 07:45:01 +02:00
parent 6421901505
commit 59c567d495
5 changed files with 304 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/features/geckoview/domain/controllers/bottom_sheet.dart
+1 -1
View File
@@ -23,7 +23,7 @@ import 'package:weblibre/features/geckoview/features/browser/domain/entities/she
part 'bottom_sheet.g.dart'; part 'bottom_sheet.g.dart';
@Riverpod() @Riverpod(keepAlive: true)
class BottomSheetController extends _$BottomSheetController { class BottomSheetController extends _$BottomSheetController {
@override @override
Sheet? build() { Sheet? build() {
app/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart
+2 -2
View File
@@ -20,7 +20,7 @@ final class BottomSheetControllerProvider
argument: null, argument: null,
retry: null, retry: null,
name: r'bottomSheetControllerProvider', name: r'bottomSheetControllerProvider',
isAutoDispose: true, isAutoDispose: false,
dependencies: null, dependencies: null,
$allTransitiveDependencies: null, $allTransitiveDependencies: null,
); );
@@ -42,7 +42,7 @@ final class BottomSheetControllerProvider
} }
String _$bottomSheetControllerHash() => String _$bottomSheetControllerHash() =>
r'0b0ea53a96b80b8c1cba79b1d5913274b7127d5b'; r'94b9467731de45d4edd24028d76279e17fc26d02';
abstract class _$BottomSheetController extends $Notifier<Sheet?> { abstract class _$BottomSheetController extends $Notifier<Sheet?> {
Sheet? build(); Sheet? build();
app/lib/features/geckoview/domain/controllers/overlay.dart
+1 -1
View File
@@ -22,7 +22,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
part 'overlay.g.dart'; part 'overlay.g.dart';
@Riverpod() @Riverpod(keepAlive: true)
class OverlayController extends _$OverlayController { class OverlayController extends _$OverlayController {
@override @override
WidgetBuilder? build() { WidgetBuilder? build() {
app/lib/features/geckoview/domain/controllers/overlay.g.dart
+2 -2
View File
@@ -20,7 +20,7 @@ final class OverlayControllerProvider
argument: null, argument: null,
retry: null, retry: null,
name: r'overlayControllerProvider', name: r'overlayControllerProvider',
isAutoDispose: true, isAutoDispose: false,
dependencies: null, dependencies: null,
$allTransitiveDependencies: null, $allTransitiveDependencies: null,
); );
@@ -41,7 +41,7 @@ final class OverlayControllerProvider
} }
} }
String _$overlayControllerHash() => r'7b7885e07ae557c14199b6942b5d6392592ab747'; String _$overlayControllerHash() => r'd0cd7c4cf867397f10f801ec2f7733be56520fb3';
abstract class _$OverlayController extends $Notifier<WidgetBuilder?> { abstract class _$OverlayController extends $Notifier<WidgetBuilder?> {
WidgetBuilder? build(); WidgetBuilder? build();
app/lib/features/geckoview/features/browser/presentation/screens/browser.dart
+298 -287
View File
@@ -107,331 +107,342 @@ class BrowserScreen extends HookConsumerWidget {
final sheetController = useRef<PersistentBottomSheetController?>(null); final sheetController = useRef<PersistentBottomSheetController?>(null);
return PopScope( return TickerMode(
//We need this for BackButtonListener to work downstream //Lets not pause riverpod subscriptions for nnow
//No direct pop result will be handled here enabled: true,
canPop: false, child: PopScope(
child: Theme( //We need this for BackButtonListener to work downstream
data: themeData, //No direct pop result will be handled here
child: Scaffold( canPop: false,
extendBodyBehindAppBar: tabInFullScreen, child: Theme(
bottomNavigationBar: HookConsumer( data: themeData,
builder: (context, ref, child) { child: Scaffold(
final tabId = ref.watch(selectedTabProvider); extendBodyBehindAppBar: tabInFullScreen,
final displayedSheet = ref.watch(bottomSheetControllerProvider); bottomNavigationBar: HookConsumer(
builder: (context, ref, child) {
final tabId = ref.watch(selectedTabProvider);
final displayedSheet = ref.watch(bottomSheetControllerProvider);
final tabInFullScreen = ref.watch( final tabInFullScreen = ref.watch(
selectedTabStateProvider.select( selectedTabStateProvider.select(
(value) => value?.isFullScreen ?? false, (value) => value?.isFullScreen ?? false,
), ),
);
final autoHideTabBar = ref.watch(
generalSettingsWithDefaultsProvider.select(
(value) => value.autoHideTabBar,
),
);
if (!autoHideTabBar) {
return Visibility(
visible: !tabInFullScreen,
child: BrowserBottomAppBar(displayedSheet: displayedSheet),
); );
}
final appBarVisible = useValueListenable(showAppBar); final autoHideTabBar = ref.watch(
final diffAcc = useRef(0.0); generalSettingsWithDefaultsProvider.select(
(value) => value.autoHideTabBar,
),
);
void resetHiddenState() { if (!autoHideTabBar) {
showAppBar.value = true; return Visibility(
diffAcc.value = 0.0; visible: !tabInFullScreen,
} child: BrowserBottomAppBar(displayedSheet: displayedSheet),
);
useEffect(() {
WidgetsBinding.instance.addPostFrameCallback((_) {
resetHiddenState();
});
return null;
}, [tabId]);
useOnAppLifecycleStateChange((previous, current) {
if (current == AppLifecycleState.resumed) {
resetHiddenState();
} }
});
ref.listen( final appBarVisible = useValueListenable(showAppBar);
tabStateProvider(tabId).select((value) => value?.isLoading), final diffAcc = useRef(0.0);
(previous, next) {
if (next == true) { void resetHiddenState() {
showAppBar.value = true;
diffAcc.value = 0.0;
}
useEffect(() {
WidgetsBinding.instance.addPostFrameCallback((_) {
resetHiddenState();
});
return null;
}, [tabId]);
useOnAppLifecycleStateChange((previous, current) {
if (current == AppLifecycleState.resumed) {
resetHiddenState(); resetHiddenState();
} }
}, });
);
ref.listen( ref.listen(
tabStateProvider(tabId).select((value) => value?.historyState), tabStateProvider(tabId).select((value) => value?.isLoading),
(previous, next) { (previous, next) {
if (next != null && previous != null) { if (next == true) {
if (previous != next) {
resetHiddenState(); resetHiddenState();
} }
} },
}, );
);
ref.listen( ref.listen(
tabScrollYProvider(tabId, const Duration(milliseconds: 50)), tabStateProvider(
(previous, next) { tabId,
if (previous?.value != null && next.value != null) { ).select((value) => value?.historyState),
final diff = previous!.value! - next.value!; (previous, next) {
if (diff < 0) { if (next != null && previous != null) {
if (diffAcc.value > 0) { if (previous != next) {
diffAcc.value = 0.0;
}
diffAcc.value += diff;
if (diffAcc.value.abs() > kToolbarHeight * 1.5) {
showAppBar.value = false;
}
} else if (diff > 0) {
if (diffAcc.value < 0) {
diffAcc.value = 0.0;
}
diffAcc.value += diff;
if (diffAcc.value.abs() > (kToolbarHeight / 2)) {
resetHiddenState(); resetHiddenState();
} }
} }
},
);
ref.listen(
tabScrollYProvider(tabId, const Duration(milliseconds: 50)),
(previous, next) {
if (previous?.value != null && next.value != null) {
final diff = previous!.value! - next.value!;
if (diff < 0) {
if (diffAcc.value > 0) {
diffAcc.value = 0.0;
}
diffAcc.value += diff;
if (diffAcc.value.abs() > kToolbarHeight * 1.5) {
showAppBar.value = false;
}
} else if (diff > 0) {
if (diffAcc.value < 0) {
diffAcc.value = 0.0;
}
diffAcc.value += diff;
if (diffAcc.value.abs() > (kToolbarHeight / 2)) {
resetHiddenState();
}
}
}
},
);
return Visibility(
visible: !tabInFullScreen && appBarVisible,
child: BrowserBottomAppBar(displayedSheet: displayedSheet),
);
},
),
body: Consumer(
child: DragTarget<TabDragData>(
onMove: (details) {
ref
.read(willAcceptDropProvider.notifier)
.setData(DeleteDropData(details.data.tabId));
},
onLeave: (data) {
ref.read(willAcceptDropProvider.notifier).clear();
},
onAcceptWithDetails: (details) async {
ref.read(willAcceptDropProvider.notifier).clear();
await ref
.read(tabRepositoryProvider.notifier)
.closeTab(details.data.tabId);
if (context.mounted) {
ui_helper.showTabUndoClose(
context,
ref.read(tabRepositoryProvider.notifier).undoClose,
);
} }
}, },
); builder: (context, _, _) {
return OverlayPortal(
controller: overlayController,
overlayChildBuilder: (context) {
return overlayBuilder!.call(context);
},
child: Listener(
onPointerDown: sheetDisplayed
? (_) {
ref
.read(bottomSheetControllerProvider.notifier)
.dismiss();
}
: null,
child: BackButtonListener(
onBackButtonPressed: () async {
final tabState = ref.read(selectedTabStateProvider);
return Visibility( final tabCount = ref.read(
visible: !tabInFullScreen && appBarVisible, tabListProvider.select((tabs) => tabs.value.length),
child: BrowserBottomAppBar(displayedSheet: displayedSheet), );
);
},
),
body: Consumer(
child: DragTarget<TabDragData>(
onMove: (details) {
ref
.read(willAcceptDropProvider.notifier)
.setData(DeleteDropData(details.data.tabId));
},
onLeave: (data) {
ref.read(willAcceptDropProvider.notifier).clear();
},
onAcceptWithDetails: (details) async {
ref.read(willAcceptDropProvider.notifier).clear();
await ref
.read(tabRepositoryProvider.notifier)
.closeTab(details.data.tabId);
if (context.mounted) { //Don't do anything if a child route is active
ui_helper.showTabUndoClose( if (GoRouterState.of(context).topRoute?.name !=
context, BrowserRoute.name) {
ref.read(tabRepositoryProvider.notifier).undoClose, return false;
); }
}
}, if (sheetDisplayed) {
builder: (context, _, _) {
return OverlayPortal(
controller: overlayController,
overlayChildBuilder: (context) {
return overlayBuilder!.call(context);
},
child: Listener(
onPointerDown: sheetDisplayed
? (_) {
ref ref
.read(bottomSheetControllerProvider.notifier) .read(bottomSheetControllerProvider.notifier)
.dismiss(); .dismiss();
return true;
} }
: null,
child: BackButtonListener(
onBackButtonPressed: () async {
final tabState = ref.read(selectedTabStateProvider);
final tabCount = ref.read( if (overlayBuilder != null) {
tabListProvider.select((tabs) => tabs.value.length), ref
); .read(overlayControllerProvider.notifier)
.dismiss();
return true;
}
//Don't do anything if a child route is active if (tabState?.isFullScreen == true) {
if (GoRouterState.of(context).topRoute?.name != await ref
BrowserRoute.name) { .read(selectedTabSessionProvider)
return false; .exitFullscreen();
} return true;
}
if (sheetDisplayed) { //Make sure app bar is visible
showAppBar.value = true;
if (tabState?.isLoading == true) {
lastBackButtonPress.value = null;
final controller = ref.read(
selectedTabSessionProvider,
);
await controller.stopLoading();
return true;
} else if (tabState?.readerableState.active == true) {
lastBackButtonPress.value = null;
await ref
.read(
readerableScreenControllerProvider.notifier,
)
.toggleReaderView(false);
return true;
} else if (tabState?.historyState.canGoBack == true) {
lastBackButtonPress.value = null;
final controller = ref.read(
selectedTabSessionProvider,
);
await controller.goBack();
return true;
}
//Go router has routes to go back to
if (context.canPop()) {
return true;
}
if (ref
.read(tabRepositoryProvider.notifier)
.hasLaunchedFromIntent(tabState?.id)) {
//Mark back as unhandled and navigator will pop
await SystemNavigator.pop();
return false;
}
if (lastBackButtonPress.value != null &&
DateTime.now().difference(
lastBackButtonPress.value!,
) <
_backButtonPressTimeout) {
lastBackButtonPress.value = null;
if (tabState != null && tabCount > 1) {
await ref
.read(tabRepositoryProvider.notifier)
.closeTab(tabState.id);
if (context.mounted) {
ui_helper.showTabUndoClose(
context,
ref
.read(tabRepositoryProvider.notifier)
.undoClose,
);
}
return true;
} else {
//Mark back as unhandled and navigator will pop
await SystemNavigator.pop();
return false;
}
} else {
lastBackButtonPress.value = DateTime.now();
ui_helper.showTabBackButtonMessage(
context,
tabCount,
_backButtonPressTimeout,
);
return true;
}
},
child: _BrowserView(
sheetDisplayed: sheetDisplayed,
isFullscreen: tabInFullScreen,
),
),
),
);
},
),
builder: (context, ref, child) {
ref.listen(bottomSheetControllerProvider, (previous, next) {
if (sheetController.value != null) {
sheetController.value!.close();
sheetController.value = null;
}
if (next != null) {
final relativeSafeArea = MediaQuery.of(
context,
).relativeSafeArea();
sheetController
.value = Scaffold.of(context).showBottomSheet((
context,
) {
bool dismissOnThreshold(
DraggableScrollableNotification notification,
) {
if (notification.extent <= 0.1) {
ref ref
.read(bottomSheetControllerProvider.notifier) .read(bottomSheetControllerProvider.notifier)
.dismiss(); .dismiss();
return true; return true;
} }
if (overlayBuilder != null) { return false;
ref
.read(overlayControllerProvider.notifier)
.dismiss();
return true;
}
if (tabState?.isFullScreen == true) {
await ref
.read(selectedTabSessionProvider)
.exitFullscreen();
return true;
}
//Make sure app bar is visible
showAppBar.value = true;
if (tabState?.isLoading == true) {
lastBackButtonPress.value = null;
final controller = ref.read(
selectedTabSessionProvider,
);
await controller.stopLoading();
return true;
} else if (tabState?.readerableState.active == true) {
lastBackButtonPress.value = null;
await ref
.read(readerableScreenControllerProvider.notifier)
.toggleReaderView(false);
return true;
} else if (tabState?.historyState.canGoBack == true) {
lastBackButtonPress.value = null;
final controller = ref.read(
selectedTabSessionProvider,
);
await controller.goBack();
return true;
}
//Go router has routes to go back to
if (context.canPop()) {
return true;
}
if (ref
.read(tabRepositoryProvider.notifier)
.hasLaunchedFromIntent(tabState?.id)) {
//Mark back as unhandled and navigator will pop
await SystemNavigator.pop();
return false;
}
if (lastBackButtonPress.value != null &&
DateTime.now().difference(
lastBackButtonPress.value!,
) <
_backButtonPressTimeout) {
lastBackButtonPress.value = null;
if (tabState != null && tabCount > 1) {
await ref
.read(tabRepositoryProvider.notifier)
.closeTab(tabState.id);
if (context.mounted) {
ui_helper.showTabUndoClose(
context,
ref
.read(tabRepositoryProvider.notifier)
.undoClose,
);
}
return true;
} else {
//Mark back as unhandled and navigator will pop
await SystemNavigator.pop();
return false;
}
} else {
lastBackButtonPress.value = DateTime.now();
ui_helper.showTabBackButtonMessage(
context,
tabCount,
_backButtonPressTimeout,
);
return true;
}
},
child: _BrowserView(
sheetDisplayed: sheetDisplayed,
isFullscreen: tabInFullScreen,
),
),
),
);
},
),
builder: (context, ref, child) {
ref.listen(bottomSheetControllerProvider, (previous, next) {
if (sheetController.value != null) {
sheetController.value!.close();
sheetController.value = null;
}
if (next != null) {
final relativeSafeArea = MediaQuery.of(
context,
).relativeSafeArea();
sheetController.value = Scaffold.of(context).showBottomSheet((
context,
) {
bool dismissOnThreshold(
DraggableScrollableNotification notification,
) {
if (notification.extent <= 0.1) {
ref
.read(bottomSheetControllerProvider.notifier)
.dismiss();
return true;
} }
return false; final sheet = switch (next) {
} ViewTabsSheet() =>
NotificationListener<DraggableScrollableNotification>(
final sheet = switch (next) { key: ValueKey(next),
ViewTabsSheet() => onNotification: dismissOnThreshold,
NotificationListener<DraggableScrollableNotification>( child: _ViewTabsSheet(
key: ValueKey(next), maxChildSize: relativeSafeArea,
onNotification: dismissOnThreshold, ),
child: _ViewTabsSheet(maxChildSize: relativeSafeArea),
),
final EditUrlSheet parameter =>
NotificationListener<DraggableScrollableNotification>(
key: ValueKey(parameter),
onNotification: dismissOnThreshold,
child: _ViewUrlSheet(
initialTabState: parameter.tabState,
maxChildSize: relativeSafeArea,
), ),
), final EditUrlSheet parameter =>
}; NotificationListener<DraggableScrollableNotification>(
key: ValueKey(parameter),
onNotification: dismissOnThreshold,
child: _ViewUrlSheet(
initialTabState: parameter.tabState,
maxChildSize: relativeSafeArea,
),
),
};
return sheet; return sheet;
}); });
} }
}); });
return child!; return child!;
}, },
),
floatingActionButton: ReaderAppearanceButton(),
), ),
floatingActionButton: ReaderAppearanceButton(),
), ),
), ),
); );