extended logging for bottom sheet with unique keys
This commit is contained in:
@@ -25,6 +25,7 @@ import 'package:flutter/services.dart';
|
|||||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||||
|
import 'package:weblibre/core/logger.dart';
|
||||||
import 'package:weblibre/core/providers/global_drop.dart';
|
import 'package:weblibre/core/providers/global_drop.dart';
|
||||||
import 'package:weblibre/core/routing/routes.dart';
|
import 'package:weblibre/core/routing/routes.dart';
|
||||||
import 'package:weblibre/data/models/drag_data.dart';
|
import 'package:weblibre/data/models/drag_data.dart';
|
||||||
@@ -251,59 +252,84 @@ class _Browser extends HookConsumerWidget {
|
|||||||
final overlayBuilder = ref.watch(overlayControllerProvider);
|
final overlayBuilder = ref.watch(overlayControllerProvider);
|
||||||
|
|
||||||
ref.listen(bottomSheetControllerProvider, (previous, next) {
|
ref.listen(bottomSheetControllerProvider, (previous, next) {
|
||||||
if (sheetController.value != null) {
|
if (!context.mounted) {
|
||||||
try {
|
logger.e('Cannot show sheet, context not mounted');
|
||||||
sheetController.value!.close();
|
return;
|
||||||
} catch (_) {
|
}
|
||||||
//silently drop closing errors
|
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (!context.mounted) {
|
||||||
|
logger.e('Cannot show sheet, context not mounted (post frame)');
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (next != null) {
|
// Close existing sheet
|
||||||
final relativeSafeArea = MediaQuery.of(context).relativeSafeArea();
|
if (sheetController.value != null) {
|
||||||
final controller = Scaffold.of(context).showBottomSheet((context) {
|
try {
|
||||||
bool dismissOnThreshold(
|
final existingController = sheetController.value!;
|
||||||
DraggableScrollableNotification notification,
|
sheetController.value = null;
|
||||||
) {
|
existingController.close();
|
||||||
if (notification.extent <= 0.1) {
|
} catch (e) {
|
||||||
ref.read(bottomSheetControllerProvider.notifier).requestDismiss();
|
logger.e('Error closing existing sheet', error: e);
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final sheet = switch (next) {
|
// Show new sheet
|
||||||
ViewTabsSheet() =>
|
if (next != null) {
|
||||||
NotificationListener<DraggableScrollableNotification>(
|
try {
|
||||||
key: ValueKey(next),
|
final relativeSafeArea = MediaQuery.of(context).relativeSafeArea();
|
||||||
onNotification: dismissOnThreshold,
|
|
||||||
child: _ViewTabsSheet(maxChildSize: relativeSafeArea),
|
|
||||||
),
|
|
||||||
final EditUrlSheet parameter =>
|
|
||||||
NotificationListener<DraggableScrollableNotification>(
|
|
||||||
key: ValueKey(parameter),
|
|
||||||
onNotification: dismissOnThreshold,
|
|
||||||
child: _ViewUrlSheet(
|
|
||||||
initialTabState: parameter.tabState,
|
|
||||||
maxChildSize: relativeSafeArea,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
};
|
|
||||||
|
|
||||||
return sheet;
|
final controller = Scaffold.of(context).showBottomSheet((context) {
|
||||||
});
|
logger.i(
|
||||||
|
'Building bottom sheet, relativeSafeArea: $relativeSafeArea, mounted: ${context.mounted}',
|
||||||
|
);
|
||||||
|
|
||||||
unawaited(
|
bool dismissOnThreshold(
|
||||||
controller.closed.whenComplete(() {
|
DraggableScrollableNotification notification,
|
||||||
ref.read(bottomSheetControllerProvider.notifier).closed(next);
|
) {
|
||||||
}),
|
if (notification.extent <= 0.1) {
|
||||||
);
|
logger.i('Dismissing sheet, reached min extend');
|
||||||
|
ref
|
||||||
|
.read(bottomSheetControllerProvider.notifier)
|
||||||
|
.requestDismiss();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
sheetController.value = controller;
|
final sheet = switch (next) {
|
||||||
} else {
|
ViewTabsSheet() =>
|
||||||
sheetController.value = null;
|
NotificationListener<DraggableScrollableNotification>(
|
||||||
}
|
key: UniqueKey(),
|
||||||
|
onNotification: dismissOnThreshold,
|
||||||
|
child: _ViewTabsSheet(maxChildSize: relativeSafeArea),
|
||||||
|
),
|
||||||
|
final EditUrlSheet parameter =>
|
||||||
|
NotificationListener<DraggableScrollableNotification>(
|
||||||
|
key: UniqueKey(),
|
||||||
|
onNotification: dismissOnThreshold,
|
||||||
|
child: _ViewUrlSheet(
|
||||||
|
initialTabState: parameter.tabState,
|
||||||
|
maxChildSize: relativeSafeArea,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
};
|
||||||
|
|
||||||
|
return sheet;
|
||||||
|
});
|
||||||
|
|
||||||
|
unawaited(
|
||||||
|
controller.closed.whenComplete(() {
|
||||||
|
ref.read(bottomSheetControllerProvider.notifier).closed(next);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
sheetController.value = controller;
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('Failed to show bottom sheet: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
return DragTarget<TabDragData>(
|
return DragTarget<TabDragData>(
|
||||||
|
|||||||
Reference in New Issue
Block a user