claude refactor

lib/state/app/infrastructure/loadableState/view/loadable_state_consumer.dart

@@ -25,8 +25,9 @@ class LoadableStateConsumer<TController extends Bloc<LoadableHydratedBlocEvent<T
   Widget build(BuildContext context) {
     var loadableState = context.watch<TController>().state;
 
-    if(!loadableState.isLoading && onLoad != null) {
-      WidgetsBinding.instance.addPostFrameCallback((timeStamp) => onLoad!(loadableState.data!));
+    final loadedData = loadableState.data;
+    if(!loadableState.isLoading && onLoad != null && loadedData is TState) {
+      WidgetsBinding.instance.addPostFrameCallback((timeStamp) => onLoad!(loadedData));
     }
 
     var childWidget = ConditionalWrapper(
@@ -47,8 +48,8 @@ class LoadableStateConsumer<TController extends Bloc<LoadableHydratedBlocEvent<T
       ),
       child: SizedBox(
         height: MediaQuery.of(context).size.height,
-        child: loadableState.showContent()
-          ? child(loadableState.data!, loadableState.isLoading)
+        child: loadableState.showContent() && loadedData is TState
+          ? child(loadedData, loadableState.isLoading)
           : const SizedBox.shrink(),
       ),
     );

lib/state/app/infrastructure/utilityWidgets/bloc_module.dart

@@ -14,8 +14,8 @@ class BlocModule<TBloc extends StateStreamableSource<TState>, TState> extends St
   @override
   Widget build(BuildContext context) => BlocProvider<TBloc>(
     create: (context) {
-      var bloc = create(context);
-      this.onInitialisation != null ? this.onInitialisation!(context, bloc) : null;
+      final bloc = create(context);
+      onInitialisation?.call(context, bloc);
       return bloc;
     },
     child: Builder(

lib/state/app/infrastructure/utilityWidgets/loadableHydratedBloc/loadable_hydrated_bloc.dart

@@ -103,7 +103,8 @@ abstract class LoadableHydratedBloc<
   Map<String, dynamic>? toJson(LoadableState<TState> state) {
     Map<String, dynamic>? data;
     try {
-      data = state.data == null ? null : toStorage(state.data!);
+      final stateData = state.data;
+      data = stateData is TState ? toStorage(stateData) : null;
     } catch(e) {
       log('Failed to save state ${TState.toString()}: ${e.toString()}');
     }