diff --git a/app/lib/blocs/sourced_paging.dart b/app/lib/blocs/sourced_paging.dart
new file mode 100644
index 00000000000..677415fda4d
--- /dev/null
+++ b/app/lib/blocs/sourced_paging.dart
@@ -0,0 +1,176 @@
+import 'dart:async';
+
+import 'package:collection/collection.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:dart_mappable/dart_mappable.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flow/cubits/flow.dart';
+import 'package:flow_api/models/model.dart';
+import 'package:flow_api/services/source.dart';
+
+part 'sourced_paging_event.dart';
+part 'sourced_paging_state.dart';
+
+part 'sourced_paging.mapper.dart';
+
+typedef DateFetcher<T> = Future<List<T>?> Function(
+    String source, SourceService service, int offset, int limit, int date);
+typedef ItemFetcher<T> = Future<List<T>?> Function(
+    String source, SourceService service, int offset, int limit);
+typedef SourceFetcher<T> = Future<List<T>?> Function(
+    SourceService service, int offset, int limit);
+
+class SourcedPagingBloc<T>
+    extends Bloc<SourcedPagingEvent, SourcedPagingState<T>> {
+  final FlowCubit cubit;
+  final int pageSize;
+  final bool useDates;
+  final List<String>? sources;
+  final DateFetcher<T> _fetch;
+
+  SourcedPagingBloc.dated(
+      {required this.cubit,
+      this.sources,
+      required DateFetcher<T> fetch,
+      this.pageSize = 50})
+      : _fetch = fetch,
+        useDates = true,
+        super(const SourcedPagingInitial()) {
+    _init();
+  }
+
+  SourcedPagingBloc.item(
+      {required this.cubit, this.sources, required fetch, this.pageSize = 50})
+      : useDates = false,
+        _fetch = _buildDatedFetch(fetch),
+        super(const SourcedPagingInitial()) {
+    _init();
+  }
+
+  SourcedPagingBloc.source({
+    required this.cubit,
+    required String source,
+    required SourceFetcher fetch,
+    this.pageSize = 50,
+  })  : sources = [source],
+        useDates = false,
+        _fetch = _buildDatedFetchSource(fetch),
+        super(const SourcedPagingInitial()) {
+    _init();
+  }
+
+  void _init() {
+    on<SourcedPagingFetched>(_onFetched);
+    on<SourcedPagingRefresh>((event, emit) {
+      emit(const SourcedPagingInitial());
+      fetch();
+    });
+    on<SourcedPagingRemoved>((event, emit) {
+      final state = this.state;
+      if (state is SourcedPagingSuccess<T>) {
+        final items = state.dates.map((e) => e
+            .where((i) =>
+                i.model == event.item &&
+                (event.source == null || (i.source == event.source)))
+            .toList());
+        emit(SourcedPagingSuccess(
+          currentPageKey: state.currentPageKey,
+          dates: items.toList(),
+          hasReachedMax: state.hasReachedMax,
+          currentDate: state.currentDate,
+        ));
+      }
+    });
+    fetch();
+  }
+
+  Future<void> _onFetched(
+    SourcedPagingFetched event,
+    Emitter<SourcedPagingState<T>> emit,
+  ) async {
+    final state = this.state;
+    if (state.hasReachedMax && !useDates) return;
+
+    final date = state.currentDate;
+    final previousItems = state is SourcedPagingSuccess<T>
+        ? state.dates
+        : <List<SourcedModel<T>>>[];
+    try {
+      final currentPageKey = state.currentPageKey ??
+          SourcedModel(cubit.getCurrentSources().first, 0);
+
+      final fetchedItems = (await _fetch(
+                  currentPageKey.source,
+                  cubit.getService(currentPageKey.source),
+                  currentPageKey.model * pageSize,
+                  pageSize,
+                  state.currentDate) ??
+              <T>[])
+          .map((e) => SourcedModel(currentPageKey.source, e))
+          .toList();
+
+      final sources = this.sources ?? cubit.getCurrentSources();
+      final currentSourceIndex = sources.indexOf(currentPageKey.source);
+      final keepSource = fetchedItems.length >= pageSize;
+      final isLastSource = currentSourceIndex >= sources.length - 1;
+      final items = List<List<SourcedModel<T>>>.from(previousItems);
+      if (items.length <= date) {
+        items.addAll(List.generate(
+          date - items.length + 1,
+          (_) => <SourcedModel<T>>[],
+        ));
+      }
+      items[date] = [...?previousItems.elementAtOrNull(date), ...fetchedItems];
+
+      if (isLastSource && !keepSource) {
+        emit(SourcedPagingSuccess(
+          currentPageKey: currentPageKey,
+          dates: items,
+          hasReachedMax: true,
+          currentDate: useDates ? (state.currentDate + 1) : state.currentDate,
+        ));
+      } else if (keepSource) {
+        emit(SourcedPagingSuccess(
+          dates: items,
+          currentPageKey: SourcedModel(
+            currentPageKey.source,
+            currentPageKey.model + 1,
+          ),
+        ));
+      } else {
+        final nextSource = sources[currentSourceIndex + 1];
+        emit(SourcedPagingSuccess(
+          dates: items,
+          currentPageKey: SourcedModel(nextSource, 0),
+          currentDate: date,
+        ));
+      }
+    } catch (e) {
+      emit(SourcedPagingFailure(
+        e,
+        currentDate: date,
+        dates: previousItems,
+      ));
+    }
+  }
+
+  void refresh() => add(SourcedPagingRefresh());
+  void fetch() {
+    add(SourcedPagingFetched());
+  }
+
+  void remove(SourcedModel<T> item) =>
+      add(SourcedPagingRemoved(item.model, item.source));
+  void removeSourced(T item) => add(SourcedPagingRemoved(item));
+}
+
+_buildDatedFetch<T>(ItemFetcher fetch) => (String source, SourceService service,
+        int offset, int limit, int date) async {
+      final items = await fetch(source, service, offset, limit);
+      return items;
+    };
+_buildDatedFetchSource<T>(SourceFetcher fetch) => (String source,
+        SourceService service, int offset, int limit, int date) async {
+      final items = await fetch(service, offset, limit);
+      return items;
+    };
diff --git a/app/lib/blocs/sourced_paging.mapper.dart b/app/lib/blocs/sourced_paging.mapper.dart
new file mode 100644
index 00000000000..2020406a8ae
--- /dev/null
+++ b/app/lib/blocs/sourced_paging.mapper.dart
@@ -0,0 +1,164 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member
+// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter
+
+part of 'sourced_paging.dart';
+
+class SourcedPagingSuccessMapper extends ClassMapperBase<SourcedPagingSuccess> {
+  SourcedPagingSuccessMapper._();
+
+  static SourcedPagingSuccessMapper? _instance;
+  static SourcedPagingSuccessMapper ensureInitialized() {
+    if (_instance == null) {
+      MapperContainer.globals.use(_instance = SourcedPagingSuccessMapper._());
+      ConnectedModelMapper.ensureInitialized();
+    }
+    return _instance!;
+  }
+
+  @override
+  final String id = 'SourcedPagingSuccess';
+  @override
+  Function get typeFactory => <T>(f) => f<SourcedPagingSuccess<T>>();
+
+  static List<List<ConnectedModel<String, dynamic>>> _$dates(
+          SourcedPagingSuccess v) =>
+      v.dates;
+  static dynamic _arg$dates<T>(f) => f<List<List<ConnectedModel<String, T>>>>();
+  static const Field<SourcedPagingSuccess,
+          List<List<ConnectedModel<String, dynamic>>>> _f$dates =
+      Field('dates', _$dates, opt: true, def: const [], arg: _arg$dates);
+  static ConnectedModel<String, int> _$currentPageKey(SourcedPagingSuccess v) =>
+      v.currentPageKey;
+  static const Field<SourcedPagingSuccess, ConnectedModel<String, int>>
+      _f$currentPageKey = Field('currentPageKey', _$currentPageKey);
+  static bool _$hasReachedMax(SourcedPagingSuccess v) => v.hasReachedMax;
+  static const Field<SourcedPagingSuccess, bool> _f$hasReachedMax =
+      Field('hasReachedMax', _$hasReachedMax, opt: true, def: false);
+  static int _$currentDate(SourcedPagingSuccess v) => v.currentDate;
+  static const Field<SourcedPagingSuccess, int> _f$currentDate =
+      Field('currentDate', _$currentDate, opt: true, def: 0);
+
+  @override
+  final MappableFields<SourcedPagingSuccess> fields = const {
+    #dates: _f$dates,
+    #currentPageKey: _f$currentPageKey,
+    #hasReachedMax: _f$hasReachedMax,
+    #currentDate: _f$currentDate,
+  };
+
+  static SourcedPagingSuccess<T> _instantiate<T>(DecodingData data) {
+    return SourcedPagingSuccess(
+        dates: data.dec(_f$dates),
+        currentPageKey: data.dec(_f$currentPageKey),
+        hasReachedMax: data.dec(_f$hasReachedMax),
+        currentDate: data.dec(_f$currentDate));
+  }
+
+  @override
+  final Function instantiate = _instantiate;
+}
+
+mixin SourcedPagingSuccessMappable<T> {
+  SourcedPagingSuccessCopyWith<SourcedPagingSuccess<T>, SourcedPagingSuccess<T>,
+          SourcedPagingSuccess<T>, T>
+      get copyWith => _SourcedPagingSuccessCopyWithImpl<
+          SourcedPagingSuccess<T>,
+          SourcedPagingSuccess<T>,
+          T>(this as SourcedPagingSuccess<T>, $identity, $identity);
+  @override
+  String toString() {
+    return SourcedPagingSuccessMapper.ensureInitialized()
+        .stringifyValue(this as SourcedPagingSuccess<T>);
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return SourcedPagingSuccessMapper.ensureInitialized()
+        .equalsValue(this as SourcedPagingSuccess<T>, other);
+  }
+
+  @override
+  int get hashCode {
+    return SourcedPagingSuccessMapper.ensureInitialized()
+        .hashValue(this as SourcedPagingSuccess<T>);
+  }
+}
+
+extension SourcedPagingSuccessValueCopy<$R, $Out, T>
+    on ObjectCopyWith<$R, SourcedPagingSuccess<T>, $Out> {
+  SourcedPagingSuccessCopyWith<$R, SourcedPagingSuccess<T>, $Out, T>
+      get $asSourcedPagingSuccess => $base.as((v, t, t2) =>
+          _SourcedPagingSuccessCopyWithImpl<$R, $Out, T>(v, t, t2));
+}
+
+abstract class SourcedPagingSuccessCopyWith<
+    $R,
+    $In extends SourcedPagingSuccess<T>,
+    $Out,
+    T> implements ClassCopyWith<$R, $In, $Out> {
+  ListCopyWith<
+      $R,
+      List<ConnectedModel<String, T>>,
+      ObjectCopyWith<$R, List<ConnectedModel<String, T>>,
+          List<ConnectedModel<String, T>>>> get dates;
+  ConnectedModelCopyWith<$R, ConnectedModel<String, int>,
+      ConnectedModel<String, int>, String, int> get currentPageKey;
+  $R call(
+      {List<List<ConnectedModel<String, T>>>? dates,
+      ConnectedModel<String, int>? currentPageKey,
+      bool? hasReachedMax,
+      int? currentDate});
+  SourcedPagingSuccessCopyWith<$R2, $In, $Out2, T> $chain<$R2, $Out2>(
+      Then<$Out2, $R2> t);
+}
+
+class _SourcedPagingSuccessCopyWithImpl<$R, $Out, T>
+    extends ClassCopyWithBase<$R, SourcedPagingSuccess<T>, $Out>
+    implements
+        SourcedPagingSuccessCopyWith<$R, SourcedPagingSuccess<T>, $Out, T> {
+  _SourcedPagingSuccessCopyWithImpl(super.value, super.then, super.then2);
+
+  @override
+  late final ClassMapperBase<SourcedPagingSuccess> $mapper =
+      SourcedPagingSuccessMapper.ensureInitialized();
+  @override
+  ListCopyWith<
+      $R,
+      List<ConnectedModel<String, T>>,
+      ObjectCopyWith<$R, List<ConnectedModel<String, T>>,
+          List<ConnectedModel<String, T>>>> get dates => ListCopyWith(
+      $value.dates,
+      (v, t) => ObjectCopyWith(v, $identity, t),
+      (v) => call(dates: v));
+  @override
+  ConnectedModelCopyWith<$R, ConnectedModel<String, int>,
+          ConnectedModel<String, int>, String, int>
+      get currentPageKey =>
+          $value.currentPageKey.copyWith.$chain((v) => call(currentPageKey: v));
+  @override
+  $R call(
+          {List<List<ConnectedModel<String, T>>>? dates,
+          ConnectedModel<String, int>? currentPageKey,
+          bool? hasReachedMax,
+          int? currentDate}) =>
+      $apply(FieldCopyWithData({
+        if (dates != null) #dates: dates,
+        if (currentPageKey != null) #currentPageKey: currentPageKey,
+        if (hasReachedMax != null) #hasReachedMax: hasReachedMax,
+        if (currentDate != null) #currentDate: currentDate
+      }));
+  @override
+  SourcedPagingSuccess<T> $make(CopyWithData data) => SourcedPagingSuccess(
+      dates: data.get(#dates, or: $value.dates),
+      currentPageKey: data.get(#currentPageKey, or: $value.currentPageKey),
+      hasReachedMax: data.get(#hasReachedMax, or: $value.hasReachedMax),
+      currentDate: data.get(#currentDate, or: $value.currentDate));
+
+  @override
+  SourcedPagingSuccessCopyWith<$R2, SourcedPagingSuccess<T>, $Out2, T>
+      $chain<$R2, $Out2>(Then<$Out2, $R2> t) =>
+          _SourcedPagingSuccessCopyWithImpl<$R2, $Out2, T>($value, $cast, t);
+}
diff --git a/app/lib/blocs/sourced_paging_event.dart b/app/lib/blocs/sourced_paging_event.dart
new file mode 100644
index 00000000000..511c84d4d45
--- /dev/null
+++ b/app/lib/blocs/sourced_paging_event.dart
@@ -0,0 +1,30 @@
+part of 'sourced_paging.dart';
+
+abstract class SourcedPagingEvent extends Equatable {
+  @override
+  List<Object> get props => [];
+}
+
+class SourcedPagingFetched extends SourcedPagingEvent {
+  SourcedPagingFetched();
+
+  @override
+  List<Object> get props => [];
+}
+
+class SourcedPagingRefresh extends SourcedPagingEvent {
+  SourcedPagingRefresh();
+
+  @override
+  List<Object> get props => [];
+}
+
+class SourcedPagingRemoved extends SourcedPagingEvent {
+  final String? source;
+  final Object? item;
+
+  SourcedPagingRemoved(this.item, [this.source]);
+
+  @override
+  List<Object> get props => [source, item].nonNulls.toList(growable: false);
+}
diff --git a/app/lib/blocs/sourced_paging_state.dart b/app/lib/blocs/sourced_paging_state.dart
new file mode 100644
index 00000000000..64c8f236755
--- /dev/null
+++ b/app/lib/blocs/sourced_paging_state.dart
@@ -0,0 +1,54 @@
+part of 'sourced_paging.dart';
+
+enum SourcedPagingStatus { initial, success, failure }
+
+sealed class SourcedPagingState<T> {
+  const SourcedPagingState();
+
+  SourcedModel<int>? get currentPageKey => null;
+  bool get hasReachedMax => false;
+  List<List<SourcedModel<T>>> get dates => const [];
+  List<SourcedModel<T>> get items => dates.expand((e) => e).toList();
+  int get currentDate => 0;
+}
+
+final class SourcedPagingInitial<T> extends SourcedPagingState<T> {
+  const SourcedPagingInitial();
+}
+
+@MappableClass(
+    generateMethods: GenerateMethods.copy |
+        GenerateMethods.stringify |
+        GenerateMethods.equals)
+final class SourcedPagingSuccess<T> extends SourcedPagingState<T>
+    with SourcedPagingSuccessMappable<T> {
+  @override
+  final List<List<SourcedModel<T>>> dates;
+  @override
+  final SourcedModel<int> currentPageKey;
+  @override
+  final bool hasReachedMax;
+  @override
+  final int currentDate;
+
+  const SourcedPagingSuccess({
+    this.dates = const [],
+    required this.currentPageKey,
+    this.hasReachedMax = false,
+    this.currentDate = 0,
+  });
+}
+
+final class SourcedPagingFailure<T> extends SourcedPagingState<T> {
+  final Object error;
+  @override
+  final List<List<SourcedModel<T>>> dates;
+  @override
+  final int currentDate;
+
+  const SourcedPagingFailure(this.error,
+      {this.dates = const [], this.currentDate = 0});
+
+  @override
+  bool get hasReachedMax => true;
+}
diff --git a/app/lib/helpers/sourced_paging_controller.dart b/app/lib/helpers/sourced_paging_controller.dart
deleted file mode 100644
index a5c92241b8f..00000000000
--- a/app/lib/helpers/sourced_paging_controller.dart
+++ /dev/null
@@ -1,53 +0,0 @@
-import 'dart:async';
-
-import 'package:flow/cubits/flow.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
-import 'package:flow_api/models/model.dart';
-import 'package:flow_api/services/source.dart';
-
-class SourcedPagingController<T>
-    extends PagingController<SourcedModel<int>, SourcedModel<T>> {
-  final FlowCubit cubit;
-  final int pageSize;
-
-  List<String> get sources => cubit.getCurrentSources();
-
-  SourcedPagingController(this.cubit, {this.pageSize = 50})
-      : super(firstPageKey: const SourcedModel("", -1));
-
-  PageRequestListener<SourcedModel<int>> addFetchListener(
-      Future<List<T>?> Function(String, SourceService, int offset, int limit)
-          fetch) {
-    FutureOr<void> listener(SourcedModel<int> pageKey) async {
-      final isFirstPage = pageKey.model < 0;
-      var currentPageKey = pageKey;
-      if (isFirstPage) {
-        currentPageKey = SourcedModel(sources.first, 0);
-      }
-      final fetched = (await fetch(
-                  currentPageKey.source,
-                  cubit.getService(currentPageKey.source),
-                  currentPageKey.model * pageSize,
-                  pageSize) ??
-              <T>[])
-          .map((e) => SourcedModel(currentPageKey.source, e))
-          .toList();
-      final index = sources.indexOf(currentPageKey.source);
-      final currentSource = isFirstPage ? sources.first : currentPageKey.source;
-      final keepSource = fetched.length >= pageSize;
-      final isLastSource = index >= sources.length - 1;
-      if (isLastSource && !keepSource) {
-        appendLastPage(fetched);
-      } else if (keepSource) {
-        appendPage(
-            fetched, SourcedModel(currentSource, currentPageKey.model + 1));
-      } else {
-        final nextSource = sources[index + 1];
-        appendPage(fetched, SourcedModel(nextSource, 0));
-      }
-    }
-
-    addPageRequestListener(listener);
-    return listener;
-  }
-}
diff --git a/app/lib/pages/calendar/list.dart b/app/lib/pages/calendar/list.dart
index f2a7310ce10..59b05bc49d9 100644
--- a/app/lib/pages/calendar/list.dart
+++ b/app/lib/pages/calendar/list.dart
@@ -1,8 +1,9 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/cubits/flow.dart';
-import 'package:flow/widgets/builder_delegate.dart';
+import 'package:flow/widgets/paging/list.dart';
+import 'package:flow_api/services/source.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:intl/intl.dart';
 import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
@@ -33,108 +34,61 @@ class CalendarListView extends StatefulWidget {
 
 class _CalendarListViewState extends State<CalendarListView> {
   late FlowCubit _cubit;
-  late final PagingController<
-      ConnectedModel<int, ConnectedModel<Map<String, int>, Map<String, int>>>,
-      List<SourcedConnectedModel<CalendarItem, Event?>>> _controller;
+  late final SourcedPagingBloc<ConnectedModel<CalendarItem, Event?>> _bloc;
   static const _pageSize = 50;
 
   @override
   void initState() {
     super.initState();
     _cubit = context.read<FlowCubit>();
-    _controller = PagingController(
-        firstPageKey: const ConnectedModel(-1, ConnectedModel({}, {})));
-    _controller.addPageRequestListener(_requestPage);
+    _bloc = SourcedPagingBloc.dated(
+      cubit: _cubit,
+      fetch: _fetchCalendarItems,
+      pageSize: _pageSize,
+    );
   }
 
   @override
   void dispose() {
-    _controller.dispose();
+    _bloc.close();
     super.dispose();
   }
 
-  Future<void> _requestPage(
-      ConnectedModel<int, ConnectedModel<Map<String, int>, Map<String, int>>>
-          key) async {
-    var day = key.source;
-    var sources = key.model;
-    final allSources = widget.filter.source != null
-        ? [
-            widget.filter.source!,
-          ]
-        : _cubit.getCurrentSources();
-
-    ConnectedModel<Map<String, int>, Map<String, int>> createFullSourceMap() {
-      final map = Map.fromEntries(allSources.map((e) => MapEntry(e, 0)));
-      return ConnectedModel(map, Map.from(map));
-    }
-
-    if (day < 0) {
-      day = 0;
-      sources = createFullSourceMap();
-    }
-    var appointmentSource = sources.source;
-    var items = <SourcedConnectedModel<CalendarItem, Event?>>[];
-    if (appointmentSource.isNotEmpty) {
-      final model = await _fetchCalendarItems(day, appointmentSource);
-      items.addAll(model.source);
-      appointmentSource.removeWhere((key, value) => !model.model.contains(key));
-    }
-    if (appointmentSource.isEmpty) {
-      day++;
-      sources = createFullSourceMap();
-    }
-    if (mounted) {
-      _controller.appendPage([items], ConnectedModel(day, sources));
-    }
-  }
-
-  Future<
-      ConnectedModel<List<SourcedConnectedModel<CalendarItem, Event?>>,
-          List<String>>> _fetchCalendarItems(
-      int day, Map<String, int> sources) async {
-    if (!mounted) return ConnectedModel([], sources.keys.toList());
-    var date = DateTime.now().onlyDate();
+  Future<List<ConnectedModel<CalendarItem, Event?>>> _fetchCalendarItems(
+    String source,
+    SourceService service,
+    int offset,
+    int limit,
+    int date,
+  ) async {
+    var dateTime = DateTime.now().onlyDate();
     if (widget.filter.past) {
-      date = date.subtract(Duration(days: day));
+      dateTime = dateTime.subtract(Duration(days: date));
     } else {
-      date = date.add(Duration(days: day));
+      dateTime = dateTime.add(Duration(days: date));
     }
 
-    if (!mounted) return ConnectedModel([], sources.keys.toList());
-
-    final appointments = <SourcedConnectedModel<CalendarItem, Event?>>[];
-    final nextSources = <String>[];
-    for (final source in sources.entries) {
-      final fetched =
-          await _cubit.getService(source.key).calendarItem?.getCalendarItems(
-                date: date,
-                status: EventStatus.values
-                    .where((element) =>
-                        !widget.filter.hiddenStatuses.contains(element))
-                    .toList(),
-                search: widget.search,
-                groupIds: widget.filter.groups,
-                eventId: widget.filter.event,
-                offset: source.value * _pageSize,
-                limit: _pageSize,
-                resourceIds: widget.filter.resources,
-              );
-      if (fetched == null) continue;
-      appointments
-          .addAll(fetched.map((event) => SourcedModel(source.key, event)));
-      if (fetched.length >= _pageSize) {
-        nextSources.add(source.key);
-      }
-    }
-    return ConnectedModel(appointments, nextSources);
+    return await service.calendarItem?.getCalendarItems(
+          date: dateTime,
+          status: EventStatus.values
+              .where(
+                  (element) => !widget.filter.hiddenStatuses.contains(element))
+              .toList(),
+          search: widget.search,
+          groupIds: widget.filter.groups,
+          eventId: widget.filter.event,
+          offset: offset * _pageSize,
+          limit: _pageSize,
+          resourceIds: widget.filter.resources,
+        ) ??
+        const [];
   }
 
   @override
   void didUpdateWidget(covariant CalendarListView oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.filter != widget.filter) {
-      _controller.refresh();
+      _bloc.refresh();
     }
   }
 
@@ -143,7 +97,7 @@ class _CalendarListViewState extends State<CalendarListView> {
     final locale = Localizations.localeOf(context).languageCode;
     final dateFormatter = DateFormat.yMMMMd(locale);
     return CreateEventScaffold(
-      onCreated: _controller.refresh,
+      onCreated: _bloc.refresh,
       event: widget.filter.sourceEvent,
       child: Column(
         children: [
@@ -155,97 +109,93 @@ class _CalendarListViewState extends State<CalendarListView> {
           const SizedBox(height: 8),
           Expanded(
             child: LayoutBuilder(
-              builder: (context, constraints) => PagedListView(
-                pagingController: _controller,
-                builderDelegate: buildMaterialPagedDelegate<
-                    List<SourcedConnectedModel<CalendarItem, Event?>>>(
-                  _controller,
-                  (context, item, index) {
-                    var date = DateTime.now();
-                    if (widget.filter.past) {
-                      date = date.subtract(Duration(days: index));
-                    } else {
-                      date = date.add(Duration(days: index));
-                    }
-                    final header = Padding(
-                      padding: const EdgeInsets.symmetric(
-                        vertical: 64,
-                        horizontal: 16,
-                      ),
-                      child: Column(
-                        children: [
-                          if (index == 0)
-                            Padding(
-                              padding: const EdgeInsets.symmetric(vertical: 16),
-                              child: PhosphorIcon(
-                                PhosphorIconsLight.calendarBlank,
-                                color: Theme.of(context).colorScheme.secondary,
-                                size: 64,
-                              ),
-                            ),
-                          Text(
-                            dateFormatter.format(date),
-                            style: Theme.of(context).textTheme.titleLarge,
-                          ),
-                          Text(
-                            DateFormat.EEEE(locale).format(date),
-                          ),
-                        ],
-                      ),
-                    );
-                    final list = Column(
+              builder: (context, constraints) => PagedListView.dated(
+                bloc: _bloc,
+                dateBuilder: (context, items, index) {
+                  var date = DateTime.now();
+                  if (widget.filter.past) {
+                    date = date.subtract(Duration(days: index));
+                  } else {
+                    date = date.add(Duration(days: index));
+                  }
+                  final header = Padding(
+                    padding: const EdgeInsets.symmetric(
+                      vertical: 64,
+                      horizontal: 16,
+                    ),
+                    child: Column(
                       children: [
-                        if (item.isEmpty)
+                        if (index == 0)
                           Padding(
                             padding: const EdgeInsets.symmetric(vertical: 16),
-                            child: Text(
-                              AppLocalizations.of(context).noEvents,
-                              style: Theme.of(context).textTheme.bodyLarge,
+                            child: PhosphorIcon(
+                              PhosphorIconsLight.calendarBlank,
+                              color: Theme.of(context).colorScheme.secondary,
+                              size: 64,
                             ),
                           ),
-                        ...item.map((event) {
-                          return CalendarListTile(
-                            key: ValueKey([
-                              event.main.id,
-                              event.source,
-                              event.main.runtimeType
-                            ]),
-                            eventItem: event,
-                            date: date,
-                            onRefresh: _controller.refresh,
-                          );
-                        }),
+                        Text(
+                          dateFormatter.format(date),
+                          style: Theme.of(context).textTheme.titleLarge,
+                        ),
+                        Text(
+                          DateFormat.EEEE(locale).format(date),
+                        ),
                       ],
-                    );
-                    final isMobile = constraints.maxWidth < 800;
-                    return Align(
-                      alignment: Alignment.topCenter,
-                      child: ConstrainedBox(
-                          constraints: const BoxConstraints(maxWidth: 1000),
-                          child: GestureDetector(
-                            onTap: () => showCalendarCreate(
-                              context: context,
-                              time: date,
-                              event: widget.filter.sourceEvent,
-                            ).then((value) => _controller.refresh()),
-                            child: isMobile
-                                ? Column(
-                                    children: [
-                                      header,
-                                      list,
-                                    ],
-                                  )
-                                : Row(
-                                    children: [
-                                      header,
-                                      const SizedBox(width: 16),
-                                      Expanded(child: list),
-                                    ],
-                                  ),
-                          )),
-                    );
-                  },
-                ),
+                    ),
+                  );
+                  final list = Column(
+                    children: [
+                      if (items.isEmpty)
+                        Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 16),
+                          child: Text(
+                            AppLocalizations.of(context).noEvents,
+                            style: Theme.of(context).textTheme.bodyLarge,
+                          ),
+                        ),
+                      ...items.map((event) {
+                        return CalendarListTile(
+                          key: ValueKey([
+                            event.main.id,
+                            event.source,
+                            event.main.runtimeType
+                          ]),
+                          eventItem: event,
+                          date: date,
+                          onRefresh: _bloc.refresh,
+                        );
+                      }),
+                    ],
+                  );
+                  final isMobile = constraints.maxWidth < 800;
+                  return Align(
+                    alignment: Alignment.topCenter,
+                    child: ConstrainedBox(
+                        constraints: const BoxConstraints(maxWidth: 1000),
+                        child: GestureDetector(
+                          onTap: () => showCalendarCreate(
+                            context: context,
+                            time: date,
+                            event: widget.filter.sourceEvent,
+                          ).then((value) => _bloc.refresh()),
+                          child: isMobile
+                              ? Column(
+                                  children: [
+                                    header,
+                                    list,
+                                  ],
+                                )
+                              : Row(
+                                  children: [
+                                    header,
+                                    const SizedBox(width: 16),
+                                    Expanded(child: list),
+                                  ],
+                                ),
+                        )),
+                  );
+                },
               ),
             ),
           ),
diff --git a/app/lib/pages/calendar/pending.dart b/app/lib/pages/calendar/pending.dart
index b72c2d87900..147fa4dfa2d 100644
--- a/app/lib/pages/calendar/pending.dart
+++ b/app/lib/pages/calendar/pending.dart
@@ -1,13 +1,12 @@
+import 'package:flow/blocs/sourced_paging.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:flow_api/models/event/item/model.dart';
 import 'package:flow_api/models/event/model.dart';
 import 'package:flow_api/models/model.dart';
 
 import '../../cubits/flow.dart';
-import '../../helpers/sourced_paging_controller.dart';
-import '../../widgets/builder_delegate.dart';
 import 'filter.dart';
 import 'page.dart';
 import 'tile.dart';
@@ -30,30 +29,30 @@ class CalendarPendingView extends StatefulWidget {
 
 class _CalendarPendingViewState extends State<CalendarPendingView> {
   late FlowCubit _cubit;
-  late final SourcedPagingController<ConnectedModel<CalendarItem, Event?>>
-      _controller;
+  late final SourcedPagingBloc<ConnectedModel<CalendarItem, Event?>> _bloc;
   @override
   void initState() {
     super.initState();
     _cubit = context.read<FlowCubit>();
-    _controller = SourcedPagingController(_cubit);
-    _controller.addFetchListener((source, service, offset, limit) async =>
-        service.calendarItem?.getCalendarItems(
-          status: EventStatus.values
-              .where(
-                  (element) => !widget.filter.hiddenStatuses.contains(element))
-              .toList(),
-          search: widget.search,
-          pending: true,
-          offset: offset,
-          limit: limit,
-          resourceIds: widget.filter.resources,
-        ));
+    _bloc = SourcedPagingBloc.item(
+        cubit: _cubit,
+        fetch: (source, service, offset, limit) async =>
+            service.calendarItem?.getCalendarItems(
+              status: EventStatus.values
+                  .where((element) =>
+                      !widget.filter.hiddenStatuses.contains(element))
+                  .toList(),
+              search: widget.search,
+              pending: true,
+              offset: offset,
+              limit: limit,
+              resourceIds: widget.filter.resources,
+            ));
   }
 
   @override
   void dispose() {
-    _controller.dispose();
+    _bloc.close();
     super.dispose();
   }
 
@@ -61,14 +60,14 @@ class _CalendarPendingViewState extends State<CalendarPendingView> {
   void didUpdateWidget(covariant CalendarPendingView oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (widget.filter != oldWidget.filter) {
-      _controller.refresh();
+      _bloc.refresh();
     }
   }
 
   @override
   Widget build(BuildContext context) {
     return CreateEventScaffold(
-      onCreated: _controller.refresh,
+      onCreated: _bloc.refresh,
       event: widget.filter.sourceEvent,
       child: Column(
         children: [
@@ -80,22 +79,19 @@ class _CalendarPendingViewState extends State<CalendarPendingView> {
           const SizedBox(height: 8),
           Expanded(
             child: LayoutBuilder(
-              builder: (context, constraints) => PagedListView(
-                pagingController: _controller,
-                builderDelegate: buildMaterialPagedDelegate<
-                    SourcedConnectedModel<CalendarItem, Event?>>(
-                  _controller,
-                  (context, item, index) {
-                    return ConstrainedBox(
-                      constraints: const BoxConstraints(maxWidth: 1000),
-                      child: CalendarListTile(
-                        key: ValueKey('${item.source}@${item.main.id}'),
-                        eventItem: item,
-                        onRefresh: _controller.refresh,
-                      ),
-                    );
-                  },
-                ),
+              builder: (context, constraints) =>
+                  PagedListView<ConnectedModel<CalendarItem, Event?>>.item(
+                bloc: _bloc,
+                itemBuilder: (context, item, index) {
+                  return ConstrainedBox(
+                    constraints: const BoxConstraints(maxWidth: 1000),
+                    child: CalendarListTile(
+                      key: ValueKey('${item.source}@${item.main.id}'),
+                      eventItem: item,
+                      onRefresh: _bloc.refresh,
+                    ),
+                  );
+                },
               ),
             ),
           ),
diff --git a/app/lib/pages/events/page.dart b/app/lib/pages/events/page.dart
index 1b164e4833a..0924af9d263 100644
--- a/app/lib/pages/events/page.dart
+++ b/app/lib/pages/events/page.dart
@@ -1,16 +1,14 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/pages/events/event.dart';
-import 'package:flow/widgets/builder_delegate.dart';
 import 'package:flow/widgets/navigation.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:flow_api/models/event/model.dart';
-import 'package:flow_api/models/model.dart';
 
 import '../../cubits/flow.dart';
-import '../../helpers/sourced_paging_controller.dart';
 import 'filter.dart';
 import 'tile.dart';
 
@@ -105,28 +103,29 @@ class EventsBodyView extends StatefulWidget {
 
 class _EventsBodyViewState extends State<EventsBodyView> {
   late final FlowCubit _flowCubit;
-  late final SourcedPagingController<Event> _controller;
+  late final SourcedPagingBloc<Event> _bloc;
   late EventFilter _filter;
 
   @override
   void initState() {
     _flowCubit = context.read<FlowCubit>();
-    _controller = SourcedPagingController(_flowCubit);
-    _controller.addFetchListener((source, service, offset, limit) async =>
-        _filter.source != null && _filter.source != source
-            ? null
-            : service.event?.getEvents(
-                offset: offset,
-                limit: limit,
-                groupId: _filter.source == source ? _filter.group : null,
-                search: widget.search));
+    _bloc = SourcedPagingBloc.item(
+        cubit: _flowCubit,
+        fetch: (source, service, offset, limit) async =>
+            _filter.source != null && _filter.source != source
+                ? null
+                : service.event?.getEvents(
+                    offset: offset,
+                    limit: limit,
+                    groupId: _filter.source == source ? _filter.group : null,
+                    search: widget.search));
     _filter = widget.filter;
     super.initState();
   }
 
   @override
   void dispose() {
-    _controller.dispose();
+    _bloc.close();
     super.dispose();
   }
 
@@ -135,7 +134,7 @@ class _EventsBodyViewState extends State<EventsBodyView> {
     super.didUpdateWidget(oldWidget);
 
     if (oldWidget.search != widget.search) {
-      _controller.refresh();
+      _bloc.refresh();
     }
   }
 
@@ -150,37 +149,34 @@ class _EventsBodyViewState extends State<EventsBodyView> {
               setState(() {
                 _filter = filter;
               });
-              _controller.refresh();
+              _bloc.refresh();
             },
           ),
           const SizedBox(height: 8),
           Expanded(
-            child: PagedListView(
-              pagingController: _controller,
-              builderDelegate: buildMaterialPagedDelegate<SourcedModel<Event>>(
-                _controller,
-                (ctx, item, index) => Align(
-                  alignment: Alignment.topCenter,
-                  child: Container(
-                    constraints: const BoxConstraints(maxWidth: 800),
-                    child: Dismissible(
-                      key: ValueKey('${item.model.id}@${item.source}'),
-                      onDismissed: (direction) async {
-                        await _flowCubit
-                            .getService(item.source)
-                            .event
-                            ?.deleteEvent(item.model.id!);
-                        _controller.itemList!.remove(item);
-                      },
-                      background: Container(
-                        color: Colors.red,
-                      ),
-                      child: EventTile(
-                        flowCubit: _flowCubit,
-                        pagingController: _controller,
-                        source: item.source,
-                        event: item.model,
-                      ),
+            child: PagedListView.item(
+              bloc: _bloc,
+              itemBuilder: (ctx, item, index) => Align(
+                alignment: Alignment.topCenter,
+                child: Container(
+                  constraints: const BoxConstraints(maxWidth: 800),
+                  child: Dismissible(
+                    key: ValueKey('${item.model.id}@${item.source}'),
+                    onDismissed: (direction) async {
+                      await _flowCubit
+                          .getService(item.source)
+                          .event
+                          ?.deleteEvent(item.model.id!);
+                      _bloc.remove(item);
+                    },
+                    background: Container(
+                      color: Colors.red,
+                    ),
+                    child: EventTile(
+                      flowCubit: _flowCubit,
+                      bloc: _bloc,
+                      source: item.source,
+                      event: item.model,
                     ),
                   ),
                 ),
@@ -192,7 +188,7 @@ class _EventsBodyViewState extends State<EventsBodyView> {
       floatingActionButton: FloatingActionButton.extended(
         onPressed: () => showDialog(
                 context: context, builder: (context) => const EventDialog())
-            .then((_) => _controller.refresh()),
+            .then((_) => _bloc.refresh()),
         label: Text(AppLocalizations.of(context).create),
         icon: const PhosphorIcon(PhosphorIconsLight.plus),
       ),
diff --git a/app/lib/pages/events/tile.dart b/app/lib/pages/events/tile.dart
index ded2fca866b..651176c65ff 100644
--- a/app/lib/pages/events/tile.dart
+++ b/app/lib/pages/events/tile.dart
@@ -1,16 +1,13 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:flow_api/models/event/model.dart';
 import 'package:flow_api/models/model.dart';
 
 import '../../cubits/flow.dart';
-import '../../helpers/sourced_paging_controller.dart';
-import '../../widgets/builder_delegate.dart';
 import '../../widgets/markdown_field.dart';
 import '../calendar/filter.dart';
 import 'event.dart';
@@ -21,13 +18,13 @@ class EventTile extends StatelessWidget {
     required this.source,
     required this.event,
     required this.flowCubit,
-    required this.pagingController,
+    required this.bloc,
   });
 
   final FlowCubit flowCubit;
   final Event event;
   final String source;
-  final SourcedPagingController<Event> pagingController;
+  final SourcedPagingBloc<Event> bloc;
 
   @override
   Widget build(BuildContext context) {
@@ -87,11 +84,11 @@ class EventTile extends StatelessWidget {
             onPressed: () async {
               Navigator.of(context).pop();
               await flowCubit.getService(source).event?.deleteEvent(event.id!);
-              pagingController.itemList!.remove(SourcedModel(
+              bloc.remove(SourcedModel(
                 source,
                 event,
               ));
-              pagingController.refresh();
+              bloc.refresh();
             },
             child: Text(
               AppLocalizations.of(context).delete,
@@ -109,57 +106,6 @@ class EventTile extends StatelessWidget {
         event: event,
         source: source,
       ),
-    ).then((value) => pagingController.refresh());
+    ).then((value) => bloc.refresh());
   }
 }
-
-Future<SourcedModel<Event>?> showEventModalBottomSheet(
-    {required BuildContext context, Event? event, DateTime? time}) async {
-  SourcedModel<Event>? event;
-  final cubit = context.read<FlowCubit>();
-  final pagingController = SourcedPagingController<Event>(cubit);
-  pagingController.addFetchListener((source, service, offset, limit) async =>
-      service.event?.getEvents(offset: offset, limit: limit));
-  final shouldCreate = await showLeapBottomSheet<bool>(
-      context: context,
-      titleBuilder: (ctx) => Text(AppLocalizations.of(context).events),
-      actionsBuilder: (ctx) => [
-            TextButton.icon(
-              icon: const PhosphorIcon(PhosphorIconsLight.plusCircle),
-              label: Text(AppLocalizations.of(context).create),
-              onPressed: () {
-                Navigator.of(ctx).pop(true);
-              },
-            ),
-          ],
-      childrenBuilder: (ctx) => [
-            PagedListView(
-                shrinkWrap: true,
-                pagingController: pagingController,
-                builderDelegate:
-                    buildMaterialPagedDelegate<SourcedModel<Event>>(
-                  pagingController,
-                  (ctx, item, index) {
-                    return ListTile(
-                      title: Text(item.model.name),
-                      leading: const PhosphorIcon(PhosphorIconsLight.calendar),
-                      onTap: () {
-                        event = item;
-                        Navigator.of(ctx).pop();
-                      },
-                    );
-                  },
-                )),
-          ]);
-  pagingController.dispose();
-  if (shouldCreate == true && context.mounted) {
-    event = await showDialog(
-      context: context,
-      builder: (ctx) => EventDialog(
-        event: event?.model,
-        source: event?.source,
-      ),
-    );
-  }
-  return event;
-}
diff --git a/app/lib/pages/groups/page.dart b/app/lib/pages/groups/page.dart
index 641cf46cc86..a7ae52a89c2 100644
--- a/app/lib/pages/groups/page.dart
+++ b/app/lib/pages/groups/page.dart
@@ -1,16 +1,14 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/pages/groups/group.dart';
-import 'package:flow/widgets/builder_delegate.dart';
 import 'package:flow/widgets/navigation.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:flow_api/models/group/model.dart';
-import 'package:flow_api/models/model.dart';
 
 import '../../cubits/flow.dart';
-import '../../helpers/sourced_paging_controller.dart';
 import 'tile.dart';
 
 class GroupsPage extends StatefulWidget {
@@ -89,20 +87,21 @@ class GroupsBodyView extends StatefulWidget {
 
 class _GroupsBodyViewState extends State<GroupsBodyView> {
   late final FlowCubit _flowCubit;
-  late final SourcedPagingController<Group> _controller;
+  late final SourcedPagingBloc<Group> _bloc;
 
   @override
   void initState() {
     _flowCubit = context.read<FlowCubit>();
-    _controller = SourcedPagingController(_flowCubit);
-    _controller.addFetchListener((source, service, offset, limit) async =>
-        service.group?.getGroups(offset: offset, limit: limit));
+    _bloc = SourcedPagingBloc.item(
+        cubit: _flowCubit,
+        fetch: (source, service, offset, limit) async =>
+            service.group?.getGroups(offset: offset, limit: limit));
     super.initState();
   }
 
   @override
   void dispose() {
-    _controller.dispose();
+    _bloc.close();
     super.dispose();
   }
 
@@ -111,39 +110,36 @@ class _GroupsBodyViewState extends State<GroupsBodyView> {
     super.didUpdateWidget(oldWidget);
 
     if (oldWidget.search != widget.search) {
-      _controller.refresh();
+      _bloc.refresh();
     }
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: PagedListView(
-        pagingController: _controller,
-        builderDelegate: buildMaterialPagedDelegate<SourcedModel<Group>>(
-          _controller,
-          (ctx, item, index) => Align(
-            alignment: Alignment.topCenter,
-            child: Container(
-              constraints: const BoxConstraints(maxWidth: 800),
-              child: Dismissible(
-                key: ValueKey('${item.model.id}@${item.source}'),
-                onDismissed: (direction) async {
-                  await _flowCubit
-                      .getService(item.source)
-                      .group
-                      ?.deleteGroup(item.model.id!);
-                  _controller.itemList!.remove(item);
-                },
-                background: Container(
-                  color: Colors.red,
-                ),
-                child: GroupTile(
-                  flowCubit: _flowCubit,
-                  pagingController: _controller,
-                  source: item.source,
-                  group: item.model,
-                ),
+      body: PagedListView.item(
+        bloc: _bloc,
+        itemBuilder: (ctx, item, index) => Align(
+          alignment: Alignment.topCenter,
+          child: Container(
+            constraints: const BoxConstraints(maxWidth: 800),
+            child: Dismissible(
+              key: ValueKey('${item.model.id}@${item.source}'),
+              onDismissed: (direction) async {
+                await _flowCubit
+                    .getService(item.source)
+                    .group
+                    ?.deleteGroup(item.model.id!);
+                _bloc.remove(item);
+              },
+              background: Container(
+                color: Colors.red,
+              ),
+              child: GroupTile(
+                flowCubit: _flowCubit,
+                bloc: _bloc,
+                source: item.source,
+                group: item.model,
               ),
             ),
           ),
@@ -152,7 +148,7 @@ class _GroupsBodyViewState extends State<GroupsBodyView> {
       floatingActionButton: FloatingActionButton.extended(
         onPressed: () => showDialog(
                 context: context, builder: (context) => const GroupDialog())
-            .then((_) => _controller.refresh()),
+            .then((_) => _bloc.refresh()),
         label: Text(AppLocalizations.of(context).create),
         icon: const PhosphorIcon(PhosphorIconsLight.plus),
       ),
diff --git a/app/lib/pages/groups/tile.dart b/app/lib/pages/groups/tile.dart
index afca152a7c9..dede3bcfa34 100644
--- a/app/lib/pages/groups/tile.dart
+++ b/app/lib/pages/groups/tile.dart
@@ -1,3 +1,4 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
@@ -7,7 +8,6 @@ import 'package:flow_api/models/group/model.dart';
 import 'package:flow_api/models/model.dart';
 
 import '../../cubits/flow.dart';
-import '../../helpers/sourced_paging_controller.dart';
 import '../../widgets/markdown_field.dart';
 import '../calendar/filter.dart';
 import '../users/filter.dart';
@@ -19,13 +19,13 @@ class GroupTile extends StatelessWidget {
     required this.source,
     required this.group,
     required this.flowCubit,
-    required this.pagingController,
+    required this.bloc,
   });
 
   final FlowCubit flowCubit;
   final Group group;
   final String source;
-  final SourcedPagingController<Group> pagingController;
+  final SourcedPagingBloc<Group> bloc;
 
   @override
   Widget build(BuildContext context) {
@@ -80,11 +80,11 @@ class GroupTile extends StatelessWidget {
             onPressed: () async {
               Navigator.of(context).pop();
               await flowCubit.getService(source).group?.deleteGroup(group.id!);
-              pagingController.itemList!.remove(SourcedModel(
+              bloc.remove(SourcedModel(
                 source,
                 group,
               ));
-              pagingController.refresh();
+              bloc.refresh();
             },
             child: Text(
               AppLocalizations.of(context).delete,
@@ -122,6 +122,6 @@ class GroupTile extends StatelessWidget {
         group: group,
         source: source,
       ),
-    ).then((value) => pagingController.refresh());
+    ).then((value) => bloc.refresh());
   }
 }
diff --git a/app/lib/pages/groups/view.dart b/app/lib/pages/groups/view.dart
index 3f6d9e89673..c3c63d55926 100644
--- a/app/lib/pages/groups/view.dart
+++ b/app/lib/pages/groups/view.dart
@@ -1,15 +1,15 @@
+import 'package:flow/blocs/sourced_paging.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flow_api/services/source.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:flow_api/models/model.dart';
 import 'package:flow_api/models/group/model.dart';
 import 'package:flow_api/models/group/service.dart';
 
 import '../../cubits/flow.dart';
-import '../../widgets/builder_delegate.dart';
 import 'group.dart';
 
 class GroupsView<T extends DescriptiveModel> extends StatefulWidget {
@@ -35,77 +35,55 @@ class GroupsView<T extends DescriptiveModel> extends StatefulWidget {
 
 class _GroupsViewState<T extends DescriptiveModel>
     extends State<GroupsView<T>> {
-  static const _pageSize = 20;
-
   late final GroupService? _groupService;
 
-  final PagingController<int, Group> _pagingController =
-      PagingController(firstPageKey: 0);
+  late final SourcedPagingBloc<Group> _bloc;
 
   @override
   void initState() {
-    final service = context.read<FlowCubit>().getService(widget.source);
+    final cubit = context.read<FlowCubit>();
+    final service = cubit.getService(widget.source);
     _groupService = service.group;
-    _pagingController.addPageRequestListener((pageKey) {
-      _fetchPage(pageKey);
-    });
+    _bloc = SourcedPagingBloc.source(
+      cubit: cubit,
+      source: widget.source,
+      fetch: (service, offset, limit) => widget.connector
+          .getItems(widget.model.id!, offset: offset, limit: limit),
+    );
     super.initState();
   }
 
-  Future<void> _fetchPage(int pageKey) async {
-    try {
-      final newItems = await widget.connector.getItems(widget.model.id!,
-          offset: pageKey * _pageSize, limit: _pageSize);
-      final isLastPage = newItems.length < _pageSize;
-      if (isLastPage) {
-        _pagingController.appendLastPage(newItems);
-      } else {
-        final nextPageKey = pageKey + 1;
-        _pagingController.appendPage(newItems, nextPageKey);
-      }
-    } catch (error) {
-      _pagingController.error = error;
-    }
-  }
-
   @override
-  Widget build(BuildContext context) =>
-      // Don't worry about displaying progress or error indicators on screen; the
-      // package takes care of that. If you want to customize them, use the
-      // [PagedChildBuilderDelegate] properties.
-      Stack(
+  Widget build(BuildContext context) => Stack(
         children: [
           Column(
             children: [
               Flexible(
-                child: PagedListView<int, Group>(
-                  pagingController: _pagingController,
-                  builderDelegate: buildMaterialPagedDelegate<Group>(
-                    _pagingController,
-                    (context, item, index) {
-                      return Dismissible(
-                        key: ValueKey(item.id),
-                        background: Container(color: Colors.red),
-                        onDismissed: (direction) {
-                          _groupService?.deleteGroup(item.id!);
-                          _pagingController.itemList!.remove(item);
+                child: PagedListView.source(
+                  bloc: _bloc,
+                  itemBuilder: (context, item, index) {
+                    return Dismissible(
+                      key: ValueKey(item.id),
+                      background: Container(color: Colors.red),
+                      onDismissed: (direction) {
+                        _groupService?.deleteGroup(item.id!);
+                        _bloc.removeSourced(item);
+                      },
+                      child: ListTile(
+                        title: Text(item.name),
+                        onTap: () async {
+                          await showDialog<SourcedModel<Group>>(
+                            context: context,
+                            builder: (context) => GroupDialog(
+                              source: widget.source,
+                              group: item,
+                            ),
+                          );
+                          _bloc.refresh();
                         },
-                        child: ListTile(
-                          title: Text(item.name),
-                          onTap: () async {
-                            await showDialog<SourcedModel<Group>>(
-                              context: context,
-                              builder: (context) => GroupDialog(
-                                source: widget.source,
-                                group: item,
-                              ),
-                            );
-                            _pagingController.refresh();
-                          },
-                        ),
-                      );
-                    },
-                  ),
+                      ),
+                    );
+                  },
                 ),
               ),
               const SizedBox(height: 64),
@@ -129,7 +107,7 @@ class _GroupsViewState<T extends DescriptiveModel>
                     await widget.connector
                         .connect(widget.model.id!, group.model.id!);
                   }
-                  _pagingController.refresh();
+                  _bloc.refresh();
                 },
               ),
             ),
@@ -139,7 +117,7 @@ class _GroupsViewState<T extends DescriptiveModel>
 
   @override
   void dispose() {
-    _pagingController.dispose();
+    _bloc.close();
     super.dispose();
   }
 }
diff --git a/app/lib/pages/notes/details.dart b/app/lib/pages/notes/details.dart
index 9ecd86b72bf..240251df660 100644
--- a/app/lib/pages/notes/details.dart
+++ b/app/lib/pages/notes/details.dart
@@ -1,7 +1,7 @@
 import 'dart:math';
 
 import 'package:collection/collection.dart';
-import 'package:flow/helpers/sourced_paging_controller.dart';
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/pages/notes/select.dart';
 import 'package:flow/widgets/markdown_field.dart';
 import 'package:flutter/material.dart';
@@ -22,13 +22,13 @@ import 'label.dart';
 class NoteDetailsView extends StatefulWidget {
   final String source;
   final Note note;
-  final SourcedPagingController<Note> controller;
+  final SourcedPagingBloc<Note> bloc;
 
   const NoteDetailsView({
     super.key,
     required this.source,
     required this.note,
-    required this.controller,
+    required this.bloc,
   });
 
   @override
@@ -202,7 +202,7 @@ class _NoteDetailsViewState extends State<NoteDetailsView> {
                       AppLocalizations.of(context).delete,
                       () async {
                         await _noteService?.deleteNote(_newNote.id!);
-                        widget.controller.refresh();
+                        widget.bloc.refresh();
                       }
                     )
                   ]
diff --git a/app/lib/pages/notes/list.dart b/app/lib/pages/notes/list.dart
index 61affef7322..8a8b39a5ef8 100644
--- a/app/lib/pages/notes/list.dart
+++ b/app/lib/pages/notes/list.dart
@@ -1,24 +1,21 @@
 part of 'navigator/drawer.dart';
 
 class NotesListView extends StatelessWidget {
-  final SourcedPagingController<Note> controller;
+  final SourcedPagingBloc<Note> bloc;
 
   const NotesListView({
     super.key,
-    required this.controller,
+    required this.bloc,
   });
 
   @override
   Widget build(BuildContext context) {
-    return PagedListView(
-      pagingController: controller,
-      builderDelegate: buildMaterialPagedDelegate<SourcedModel<Note>>(
-        controller,
-        (ctx, item, index) => NoteListTile(
-          note: item.model,
-          source: item.source,
-          controller: controller,
-        ),
+    return PagedListView.item(
+      bloc: bloc,
+      itemBuilder: (ctx, item, index) => NoteListTile(
+        note: item.model,
+        source: item.source,
+        bloc: bloc,
       ),
     );
   }
diff --git a/app/lib/pages/notes/navigator/drawer.dart b/app/lib/pages/notes/navigator/drawer.dart
index 80fc325c4bf..ec1fa2fa736 100644
--- a/app/lib/pages/notes/navigator/drawer.dart
+++ b/app/lib/pages/notes/navigator/drawer.dart
@@ -1,10 +1,10 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/cubits/flow.dart';
-import 'package:flow/helpers/sourced_paging_controller.dart';
 import 'package:flow/pages/notes/tile.dart';
 import 'package:flow/pages/notes/filter.dart';
 import 'package:flow/pages/notes/label.dart';
 import 'package:flow/pages/notes/notebook.dart';
-import 'package:flow/widgets/builder_delegate.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flow/widgets/select.dart';
 import 'package:flow_api/models/label/model.dart';
 import 'package:flow_api/models/model.dart';
@@ -13,7 +13,6 @@ import 'package:flow_api/services/database.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'dart:typed_data';
 import 'package:material_leap/material_leap.dart';
 import 'package:material_leap/widgets.dart';
@@ -28,14 +27,14 @@ class NotesNavigatorDrawer extends StatelessWidget {
   final ValueChanged<NoteFilter>? onFilterChanged;
   final NoteFilter filter;
   final bool isSearching;
-  final SourcedPagingController<Note> controller;
+  final SourcedPagingBloc<Note> bloc;
 
   const NotesNavigatorDrawer({
     super.key,
     this.note,
     this.onFilterChanged,
     required this.filter,
-    required this.controller,
+    required this.bloc,
     required this.isSearching,
   });
 
@@ -75,7 +74,7 @@ class NotesNavigatorDrawer extends StatelessWidget {
           if (note != null && !isSearching)
             Expanded(
               child: NotesListView(
-                controller: controller,
+                bloc: bloc,
               ),
             ),
         ],
diff --git a/app/lib/pages/notes/navigator/labels.dart b/app/lib/pages/notes/navigator/labels.dart
index 4ba03e5c370..58a55ff755b 100644
--- a/app/lib/pages/notes/navigator/labels.dart
+++ b/app/lib/pages/notes/navigator/labels.dart
@@ -11,23 +11,24 @@ class _NoteLabelsView extends StatefulWidget {
 }
 
 class _NoteLabelsViewState extends State<_NoteLabelsView> {
-  late final SourcedPagingController<Label> _pagingController;
+  late final SourcedPagingBloc<Label> _bloc;
   late final FlowCubit _cubit;
 
   @override
   void initState() {
     super.initState();
     _cubit = context.read<FlowCubit>();
-    _pagingController = SourcedPagingController(_cubit);
-    _pagingController.addFetchListener((source, service, offset, limit) =>
-        Future.value(service.label?.getLabels(offset: offset, limit: limit)));
+    _bloc = SourcedPagingBloc.item(
+        cubit: _cubit,
+        fetch: (source, service, offset, limit) => Future.value(
+            service.label?.getLabels(offset: offset, limit: limit)));
   }
 
   @override
   void dispose() {
     super.dispose();
 
-    _pagingController.dispose();
+    _bloc.close();
   }
 
   @override
@@ -35,7 +36,7 @@ class _NoteLabelsViewState extends State<_NoteLabelsView> {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.filter.selectedLabel != widget.filter.selectedLabel) {
       setState(() {});
-      _pagingController.refresh();
+      _bloc.refresh();
     }
   }
 
@@ -57,84 +58,78 @@ class _NoteLabelsViewState extends State<_NoteLabelsView> {
           child: Row(
             children: [
               Expanded(
-                child: PagedListView(
+                child: PagedListView.item(
                   scrollDirection: Axis.horizontal,
-                  pagingController: _pagingController,
-                  builderDelegate:
-                      buildMaterialPagedDelegate<SourcedModel<Label>>(
-                    _pagingController,
-                    (context, item, index) {
-                      final selected = equalUint8List(
-                          widget.filter.selectedLabel, item.model.id);
-                      return MenuAnchor(
-                        builder: (context, controller, child) => Tooltip(
-                          message: item.model.name,
-                          child: ColorButton.srgb(
-                            onTap: () =>
-                                widget.onChanged?.call(widget.filter.copyWith(
-                              selectedLabel: selected ? null : item.model.id,
-                              source: item.source,
-                            )),
-                            selected: selected,
-                            color: item.model.color.withOpacity(1),
-                            onLongPress: controller.toggle,
-                            onSecondaryTap: controller.toggle,
-                          ),
+                  bloc: _bloc,
+                  itemBuilder: (context, item, index) {
+                    final selected = equalUint8List(
+                        widget.filter.selectedLabel, item.model.id);
+                    return MenuAnchor(
+                      builder: (context, controller, child) => Tooltip(
+                        message: item.model.name,
+                        child: ColorButton.srgb(
+                          onTap: () =>
+                              widget.onChanged?.call(widget.filter.copyWith(
+                            selectedLabel: selected ? null : item.model.id,
+                            source: item.source,
+                          )),
+                          selected: selected,
+                          color: item.model.color.withOpacity(1),
+                          onLongPress: controller.toggle,
+                          onSecondaryTap: controller.toggle,
                         ),
-                        menuChildren: [
-                          MenuItemButton(
-                              leadingIcon:
-                                  const PhosphorIcon(PhosphorIconsLight.pencil),
-                              child: Text(AppLocalizations.of(context).edit),
-                              onPressed: () => showDialog(
-                                  context: context,
-                                  builder: (context) => LabelDialog(
-                                        source: item.source,
-                                        label: item.model,
-                                      )).then(
-                                  (value) => _pagingController.refresh())),
-                          MenuItemButton(
+                      ),
+                      menuChildren: [
+                        MenuItemButton(
                             leadingIcon:
-                                const PhosphorIcon(PhosphorIconsLight.trash),
-                            child: Text(AppLocalizations.of(context).delete),
+                                const PhosphorIcon(PhosphorIconsLight.pencil),
+                            child: Text(AppLocalizations.of(context).edit),
                             onPressed: () => showDialog(
-                              context: context,
-                              builder: (context) => AlertDialog(
-                                title: Text(AppLocalizations.of(context)
-                                    .deleteLabel(item.model.name)),
-                                content: Text(AppLocalizations.of(context)
-                                    .deleteLabelDescription(item.model.name)),
-                                actions: [
-                                  TextButton(
-                                    onPressed: () =>
-                                        Navigator.of(context).pop(),
-                                    child: Text(
-                                        AppLocalizations.of(context).cancel),
-                                  ),
-                                  ElevatedButton(
-                                    onPressed: () async {
-                                      final id = item.model.id;
-                                      if (id == null) return;
-                                      await _cubit
-                                          .getService(item.source)
-                                          .label
-                                          ?.deleteLabel(id);
-                                      _pagingController.refresh();
-                                      if (context.mounted) {
-                                        Navigator.of(context).pop();
-                                      }
-                                    },
-                                    child: Text(
-                                        AppLocalizations.of(context).delete),
-                                  ),
-                                ],
-                              ),
+                                context: context,
+                                builder: (context) => LabelDialog(
+                                      source: item.source,
+                                      label: item.model,
+                                    )).then((value) => _bloc.refresh())),
+                        MenuItemButton(
+                          leadingIcon:
+                              const PhosphorIcon(PhosphorIconsLight.trash),
+                          child: Text(AppLocalizations.of(context).delete),
+                          onPressed: () => showDialog(
+                            context: context,
+                            builder: (context) => AlertDialog(
+                              title: Text(AppLocalizations.of(context)
+                                  .deleteLabel(item.model.name)),
+                              content: Text(AppLocalizations.of(context)
+                                  .deleteLabelDescription(item.model.name)),
+                              actions: [
+                                TextButton(
+                                  onPressed: () => Navigator.of(context).pop(),
+                                  child:
+                                      Text(AppLocalizations.of(context).cancel),
+                                ),
+                                ElevatedButton(
+                                  onPressed: () async {
+                                    final id = item.model.id;
+                                    if (id == null) return;
+                                    await _cubit
+                                        .getService(item.source)
+                                        .label
+                                        ?.deleteLabel(id);
+                                    _bloc.refresh();
+                                    if (context.mounted) {
+                                      Navigator.of(context).pop();
+                                    }
+                                  },
+                                  child:
+                                      Text(AppLocalizations.of(context).delete),
+                                ),
+                              ],
                             ),
                           ),
-                        ],
-                      );
-                    },
-                  ),
+                        ),
+                      ],
+                    );
+                  },
                 ),
               ),
               IconButton(
@@ -143,7 +138,7 @@ class _NoteLabelsViewState extends State<_NoteLabelsView> {
                 onPressed: () => showDialog(
                   context: context,
                   builder: (context) => const LabelDialog(),
-                ).then((value) => _pagingController.refresh()),
+                ).then((value) => _bloc.refresh()),
               ),
             ],
           ),
diff --git a/app/lib/pages/notes/page.dart b/app/lib/pages/notes/page.dart
index 5a763e300c2..9f5570d0d65 100644
--- a/app/lib/pages/notes/page.dart
+++ b/app/lib/pages/notes/page.dart
@@ -1,3 +1,4 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/pages/notes/navigator/drawer.dart';
 import 'package:flow/pages/notes/note.dart';
 import 'package:flow/widgets/navigation.dart';
@@ -11,7 +12,6 @@ import 'package:flow_api/models/note/model.dart';
 import 'package:flow_api/models/model.dart';
 
 import '../../cubits/flow.dart';
-import '../../helpers/sourced_paging_controller.dart';
 import 'filter.dart';
 import 'details.dart';
 
@@ -98,7 +98,7 @@ class NotesBodyView extends StatefulWidget {
 
 class _NotesBodyViewState extends State<NotesBodyView> {
   late final FlowCubit _flowCubit;
-  late final SourcedPagingController<Note> _controller;
+  late final SourcedPagingBloc<Note> _bloc;
   late final Future<Note?> _parent;
   late NoteFilter _filter;
 
@@ -106,34 +106,35 @@ class _NotesBodyViewState extends State<NotesBodyView> {
   void initState() {
     _flowCubit = context.read<FlowCubit>();
     _parent = _fetchParent();
-    _controller = SourcedPagingController(_flowCubit);
-    _controller.addFetchListener((source, service, offset, limit) async {
-      if (_filter.source != null && _filter.source != source) return null;
-      final notes = _filter.selectedLabel != null
-          ? await service.labelNote?.getItems(
-              _filter.selectedLabel!,
-              offset: offset,
-              limit: limit,
-              notebook: _filter.notebook,
-              statuses: _filter.statuses,
-              parent: widget.parent?.source == source
-                  ? widget.parent?.model
-                  : createEmptyUint8List(),
-              search: widget.search,
-            )
-          : await service.note?.getNotes(
-              offset: offset,
-              limit: limit,
-              notebook: _filter.notebook,
-              statuses: _filter.statuses,
-              parent: widget.parent?.source == source
-                  ? widget.parent?.model
-                  : createEmptyUint8List(),
-              search: widget.search);
-      if (notes == null) return null;
-      if (source != widget.parent?.source) return notes;
-      return notes;
-    });
+    _bloc = SourcedPagingBloc.item(
+        cubit: _flowCubit,
+        fetch: (source, service, offset, limit) async {
+          if (_filter.source != null && _filter.source != source) return null;
+          final notes = _filter.selectedLabel != null
+              ? await service.labelNote?.getItems(
+                  _filter.selectedLabel!,
+                  offset: offset,
+                  limit: limit,
+                  notebook: _filter.notebook,
+                  statuses: _filter.statuses,
+                  parent: widget.parent?.source == source
+                      ? widget.parent?.model
+                      : createEmptyUint8List(),
+                  search: widget.search,
+                )
+              : await service.note?.getNotes(
+                  offset: offset,
+                  limit: limit,
+                  notebook: _filter.notebook,
+                  statuses: _filter.statuses,
+                  parent: widget.parent?.source == source
+                      ? widget.parent?.model
+                      : createEmptyUint8List(),
+                  search: widget.search);
+          if (notes == null) return null;
+          if (source != widget.parent?.source) return notes;
+          return notes;
+        });
     _filter = widget.filter;
     super.initState();
   }
@@ -150,7 +151,7 @@ class _NotesBodyViewState extends State<NotesBodyView> {
   @override
   void dispose() {
     super.dispose();
-    _controller.dispose();
+    _bloc.close();
   }
 
   @override
@@ -159,13 +160,13 @@ class _NotesBodyViewState extends State<NotesBodyView> {
 
     if (oldWidget.search != widget.search ||
         oldWidget.parent != widget.parent) {
-      _controller.refresh();
+      _bloc.refresh();
     }
     if (oldWidget.filter != widget.filter) {
       setState(() {
         _filter = widget.filter;
       });
-      _controller.refresh();
+      _bloc.refresh();
     }
   }
 
@@ -176,12 +177,12 @@ class _NotesBodyViewState extends State<NotesBodyView> {
       endDrawer: NotesNavigatorDrawer(
         note: widget.parent?.model,
         filter: _filter,
-        controller: _controller,
+        bloc: _bloc,
         isSearching: widget.search.isNotEmpty,
         onFilterChanged: (value) {
           setState(() {
             _filter = value;
-            _controller.refresh();
+            _bloc.refresh();
           });
         },
       ),
@@ -204,7 +205,7 @@ class _NotesBodyViewState extends State<NotesBodyView> {
             onChanged: (filter) {
               setState(() {
                 _filter = filter;
-                _controller.refresh();
+                _bloc.refresh();
               });
             },
           ),
@@ -218,7 +219,7 @@ class _NotesBodyViewState extends State<NotesBodyView> {
                     const Divider(),
                     const SizedBox(height: 8),
                     NoteDetailsView(
-                      controller: _controller,
+                      bloc: _bloc,
                       source: widget.parent!.source,
                       note: data,
                     ),
@@ -229,7 +230,7 @@ class _NotesBodyViewState extends State<NotesBodyView> {
             const SizedBox(height: 8),
             Expanded(
               child: NotesListView(
-                controller: _controller,
+                bloc: _bloc,
               ),
             ),
           ],
@@ -245,7 +246,7 @@ class _NotesBodyViewState extends State<NotesBodyView> {
                   ),
                   source: widget.parent?.source,
                   create: true,
-                )).then((_) => _controller.refresh()),
+                )).then((_) => _bloc.refresh()),
         label: Text(AppLocalizations.of(context).create),
         icon: const PhosphorIcon(PhosphorIconsLight.plus),
       ),
diff --git a/app/lib/pages/notes/tile.dart b/app/lib/pages/notes/tile.dart
index 93d7c844419..d3f04977930 100644
--- a/app/lib/pages/notes/tile.dart
+++ b/app/lib/pages/notes/tile.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:flow/helpers/sourced_paging_controller.dart';
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/widgets/markdown_field.dart';
 import 'package:flow_api/models/note/model.dart';
 import 'package:flutter/material.dart';
@@ -9,13 +9,13 @@ import 'package:go_router/go_router.dart';
 class NoteListTile extends StatelessWidget {
   final String source;
   final Note note;
-  final SourcedPagingController<Note>? controller;
+  final SourcedPagingBloc<Note>? bloc;
 
   const NoteListTile({
     super.key,
     required this.source,
     required this.note,
-    this.controller,
+    this.bloc,
   });
 
   @override
@@ -38,7 +38,7 @@ class NoteListTile extends StatelessWidget {
             "id": base64Encode(note.id!),
           },
         );
-        controller?.refresh();
+        bloc?.refresh();
       },
     );
   }
diff --git a/app/lib/pages/notes/view.dart b/app/lib/pages/notes/view.dart
index 68e738c9c78..0b93b6262ec 100644
--- a/app/lib/pages/notes/view.dart
+++ b/app/lib/pages/notes/view.dart
@@ -1,15 +1,15 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/pages/notes/select.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:flow_api/models/model.dart';
 import 'package:flow_api/models/note/model.dart';
 import 'package:flow_api/models/note/service.dart';
 
 import '../../cubits/flow.dart';
-import '../../widgets/builder_delegate.dart';
 import 'note.dart';
 
 class NotesView<T extends DescriptiveModel> extends StatefulWidget {
@@ -28,39 +28,24 @@ class NotesView<T extends DescriptiveModel> extends StatefulWidget {
 }
 
 class _NotesViewState<T extends DescriptiveModel> extends State<NotesView<T>> {
-  static const _pageSize = 20;
-
   late final NoteService? _noteService;
 
-  final PagingController<int, Note> _pagingController =
-      PagingController(firstPageKey: 0);
+  late final SourcedPagingBloc<Note> _bloc;
 
   @override
   void initState() {
-    final service = context.read<FlowCubit>().getService(widget.source);
+    final cubit = context.read<FlowCubit>();
+    final service = cubit.getService(widget.source);
     _noteService = service.note;
-    _pagingController.addPageRequestListener((pageKey) {
-      _fetchPage(pageKey);
-    });
+    _bloc = SourcedPagingBloc.source(
+      cubit: cubit,
+      source: widget.source,
+      fetch: (service, offset, limit) => widget.connector
+          .getItems(widget.model.id!, offset: offset, limit: limit),
+    );
     super.initState();
   }
 
-  Future<void> _fetchPage(int pageKey) async {
-    try {
-      final newItems = await widget.connector.getItems(widget.model.id!,
-          offset: pageKey * _pageSize, limit: _pageSize);
-      final isLastPage = newItems.length < _pageSize;
-      if (isLastPage) {
-        _pagingController.appendLastPage(newItems);
-      } else {
-        final nextPageKey = pageKey + 1;
-        _pagingController.appendPage(newItems, nextPageKey);
-      }
-    } catch (error) {
-      _pagingController.error = error;
-    }
-  }
-
   @override
   Widget build(BuildContext context) =>
       // Don't worry about displaying progress or error indicators on screen; the
@@ -71,58 +56,54 @@ class _NotesViewState<T extends DescriptiveModel> extends State<NotesView<T>> {
           Column(
             children: [
               Flexible(
-                child: PagedListView<int, Note>(
-                  pagingController: _pagingController,
-                  builderDelegate: buildMaterialPagedDelegate<Note>(
-                    _pagingController,
-                    (context, item, index) {
-                      var status = item.status;
-                      return Dismissible(
-                        key: ValueKey(item.id),
-                        background: Container(color: Colors.red),
-                        onDismissed: (direction) {
-                          _noteService?.deleteNote(item.id!);
-                          _pagingController.itemList!.remove(item);
-                        },
-                        child: ListTile(
-                          title: Text(item.name),
-                          leading: status == null
-                              ? null
-                              : StatefulBuilder(
-                                  builder: (context, setState) => Checkbox(
-                                    value: status?.isDone,
-                                    tristate: true,
-                                    onChanged: (_) async {
-                                      bool? newState;
-                                      if (status?.isDone == null) {
-                                        newState = true;
-                                      } else if (status?.isDone == true) {
-                                        newState = false;
-                                      } else {
-                                        newState = null;
-                                      }
-                                      final next =
-                                          NoteStatus.fromDone(newState);
-                                      _noteService?.updateNote(
-                                          item.copyWith(status: next));
-                                      setState(() => status = next);
-                                    },
-                                  ),
+                child: PagedListView<Note>.source(
+                  bloc: _bloc,
+                  itemBuilder: (context, item, index) {
+                    var status = item.status;
+                    return Dismissible(
+                      key: ValueKey(item.id),
+                      background: Container(color: Colors.red),
+                      onDismissed: (direction) {
+                        _noteService?.deleteNote(item.id!);
+                        _bloc.removeSourced(item);
+                      },
+                      child: ListTile(
+                        title: Text(item.name),
+                        leading: status == null
+                            ? null
+                            : StatefulBuilder(
+                                builder: (context, setState) => Checkbox(
+                                  value: status?.isDone,
+                                  tristate: true,
+                                  onChanged: (_) async {
+                                    bool? newState;
+                                    if (status?.isDone == null) {
+                                      newState = true;
+                                    } else if (status?.isDone == true) {
+                                      newState = false;
+                                    } else {
+                                      newState = null;
+                                    }
+                                    final next = NoteStatus.fromDone(newState);
+                                    _noteService?.updateNote(
+                                        item.copyWith(status: next));
+                                    setState(() => status = next);
+                                  },
                                 ),
-                          onTap: () async {
-                            await showDialog<SourcedModel<Note>>(
-                              context: context,
-                              builder: (context) => NoteDialog(
-                                source: widget.source,
-                                note: item,
                               ),
-                            );
-                            _pagingController.refresh();
-                          },
-                        ),
-                      );
-                    },
-                  ),
+                        onTap: () async {
+                          await showDialog<SourcedModel<Note>>(
+                            context: context,
+                            builder: (context) => NoteDialog(
+                              source: widget.source,
+                              note: item,
+                            ),
+                          );
+                          _bloc.refresh();
+                        },
+                      ),
+                    );
+                  },
                 ),
               ),
               const SizedBox(height: 64),
@@ -146,7 +127,7 @@ class _NotesViewState<T extends DescriptiveModel> extends State<NotesView<T>> {
                     await widget.connector
                         .connect(widget.model.id!, note.model.id!);
                   }
-                  _pagingController.refresh();
+                  _bloc.refresh();
                 },
               ),
             ),
@@ -156,7 +137,7 @@ class _NotesViewState<T extends DescriptiveModel> extends State<NotesView<T>> {
 
   @override
   void dispose() {
-    _pagingController.dispose();
+    _bloc.close();
     super.dispose();
   }
 }
diff --git a/app/lib/pages/resources/page.dart b/app/lib/pages/resources/page.dart
index 738006660e0..c1188a70dd1 100644
--- a/app/lib/pages/resources/page.dart
+++ b/app/lib/pages/resources/page.dart
@@ -1,16 +1,14 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/pages/resources/resource.dart';
-import 'package:flow/widgets/builder_delegate.dart';
 import 'package:flow/widgets/navigation.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flow_api/models/resource/model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
-import 'package:flow_api/models/model.dart';
 
 import '../../cubits/flow.dart';
-import '../../helpers/sourced_paging_controller.dart';
 import 'tile.dart';
 
 class ResourcesPage extends StatefulWidget {
@@ -89,20 +87,21 @@ class ResourcesBodyView extends StatefulWidget {
 
 class _ResourcesBodyViewState extends State<ResourcesBodyView> {
   late final FlowCubit _flowCubit;
-  late final SourcedPagingController<Resource> _controller;
+  late final SourcedPagingBloc<Resource> _bloc;
 
   @override
   void initState() {
     _flowCubit = context.read<FlowCubit>();
-    _controller = SourcedPagingController(_flowCubit);
-    _controller.addFetchListener((source, service, offset, limit) async =>
-        service.resource?.getResources(offset: offset, limit: limit));
+    _bloc = SourcedPagingBloc.item(
+        cubit: _flowCubit,
+        fetch: (source, service, offset, limit) async =>
+            service.resource?.getResources(offset: offset, limit: limit));
     super.initState();
   }
 
   @override
   void dispose() {
-    _controller.dispose();
+    _bloc.close();
     super.dispose();
   }
 
@@ -111,39 +110,36 @@ class _ResourcesBodyViewState extends State<ResourcesBodyView> {
     super.didUpdateWidget(oldWidget);
 
     if (oldWidget.search != widget.search) {
-      _controller.refresh();
+      _bloc.refresh();
     }
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: PagedListView(
-        pagingController: _controller,
-        builderDelegate: buildMaterialPagedDelegate<SourcedModel<Resource>>(
-          _controller,
-          (ctx, item, index) => Align(
-            alignment: Alignment.topCenter,
-            child: Container(
-              constraints: const BoxConstraints(maxWidth: 800),
-              child: Dismissible(
-                key: ValueKey('${item.model.id}@${item.source}'),
-                onDismissed: (direction) async {
-                  await _flowCubit
-                      .getService(item.source)
-                      .resource
-                      ?.deleteResource(item.model.id!);
-                  _controller.itemList!.remove(item);
-                },
-                background: Container(
-                  color: Colors.red,
-                ),
-                child: ResourceTile(
-                  flowCubit: _flowCubit,
-                  pagingController: _controller,
-                  source: item.source,
-                  resource: item.model,
-                ),
+      body: PagedListView.item(
+        bloc: _bloc,
+        itemBuilder: (ctx, item, index) => Align(
+          alignment: Alignment.topCenter,
+          child: Container(
+            constraints: const BoxConstraints(maxWidth: 800),
+            child: Dismissible(
+              key: ValueKey('${item.model.id}@${item.source}'),
+              onDismissed: (direction) async {
+                await _flowCubit
+                    .getService(item.source)
+                    .resource
+                    ?.deleteResource(item.model.id!);
+                _bloc.remove(item);
+              },
+              background: Container(
+                color: Colors.red,
+              ),
+              child: ResourceTile(
+                flowCubit: _flowCubit,
+                bloc: _bloc,
+                source: item.source,
+                resource: item.model,
               ),
             ),
           ),
@@ -152,7 +148,7 @@ class _ResourcesBodyViewState extends State<ResourcesBodyView> {
       floatingActionButton: FloatingActionButton.extended(
         onPressed: () => showDialog(
                 context: context, builder: (context) => const ResourceDialog())
-            .then((_) => _controller.refresh()),
+            .then((_) => _bloc.refresh()),
         label: Text(AppLocalizations.of(context).create),
         icon: const PhosphorIcon(PhosphorIconsLight.plus),
       ),
diff --git a/app/lib/pages/resources/tile.dart b/app/lib/pages/resources/tile.dart
index d5634aff885..b06e23d53ff 100644
--- a/app/lib/pages/resources/tile.dart
+++ b/app/lib/pages/resources/tile.dart
@@ -1,4 +1,4 @@
-import 'package:flow/helpers/sourced_paging_controller.dart';
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/pages/resources/resource.dart';
 import 'package:flow_api/models/resource/model.dart';
 import 'package:flutter/material.dart';
@@ -18,13 +18,13 @@ class ResourceTile extends StatelessWidget {
     required this.source,
     required this.resource,
     required this.flowCubit,
-    required this.pagingController,
+    required this.bloc,
   });
 
   final FlowCubit flowCubit;
   final Resource resource;
   final String source;
-  final SourcedPagingController<Resource> pagingController;
+  final SourcedPagingBloc<Resource> bloc;
 
   @override
   Widget build(BuildContext context) {
@@ -77,11 +77,11 @@ class ResourceTile extends StatelessWidget {
                   .getService(source)
                   .resource
                   ?.deleteResource(resource.id!);
-              pagingController.itemList!.remove(SourcedModel(
+              bloc.remove(SourcedModel(
                 source,
                 resource,
               ));
-              pagingController.refresh();
+              bloc.refresh();
             },
             child: Text(
               AppLocalizations.of(context).delete,
@@ -108,6 +108,6 @@ class ResourceTile extends StatelessWidget {
         resource: resource,
         source: source,
       ),
-    ).then((value) => pagingController.refresh());
+    ).then((value) => bloc.refresh());
   }
 }
diff --git a/app/lib/pages/resources/view.dart b/app/lib/pages/resources/view.dart
index 54c9ccf6493..e88dd261e12 100644
--- a/app/lib/pages/resources/view.dart
+++ b/app/lib/pages/resources/view.dart
@@ -1,15 +1,15 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/pages/resources/select.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:flow_api/models/model.dart';
 import 'package:flow_api/models/resource/model.dart';
 import 'package:flow_api/models/resource/service.dart';
 
 import '../../cubits/flow.dart';
-import '../../widgets/builder_delegate.dart';
 import 'resource.dart';
 
 class ResourcesView<T extends DescriptiveModel> extends StatefulWidget {
@@ -29,39 +29,24 @@ class ResourcesView<T extends DescriptiveModel> extends StatefulWidget {
 
 class _ResourcesViewState<T extends DescriptiveModel>
     extends State<ResourcesView<T>> {
-  static const _pageSize = 20;
-
   late final ResourceService? _resourceService;
 
-  final PagingController<int, Resource> _pagingController =
-      PagingController(firstPageKey: 0);
+  late final SourcedPagingBloc<Resource> _bloc;
 
   @override
   void initState() {
-    final service = context.read<FlowCubit>().getService(widget.source);
+    final cubit = context.read<FlowCubit>();
+    final service = cubit.getService(widget.source);
     _resourceService = service.resource;
-    _pagingController.addPageRequestListener((pageKey) {
-      _fetchPage(pageKey);
-    });
+    _bloc = SourcedPagingBloc.source(
+      cubit: cubit,
+      source: widget.source,
+      fetch: (service, offset, limit) => widget.connector
+          .getItems(widget.model.id!, offset: offset, limit: limit),
+    );
     super.initState();
   }
 
-  Future<void> _fetchPage(int pageKey) async {
-    try {
-      final newItems = await widget.connector.getItems(widget.model.id!,
-          offset: pageKey * _pageSize, limit: _pageSize);
-      final isLastPage = newItems.length < _pageSize;
-      if (isLastPage) {
-        _pagingController.appendLastPage(newItems);
-      } else {
-        final nextPageKey = pageKey + 1;
-        _pagingController.appendPage(newItems, nextPageKey);
-      }
-    } catch (error) {
-      _pagingController.error = error;
-    }
-  }
-
   @override
   Widget build(BuildContext context) =>
       // Don't worry about displaying progress or error indicators on screen; the
@@ -72,34 +57,31 @@ class _ResourcesViewState<T extends DescriptiveModel>
           Column(
             children: [
               Flexible(
-                child: PagedListView<int, Resource>(
-                  pagingController: _pagingController,
-                  builderDelegate: buildMaterialPagedDelegate<Resource>(
-                    _pagingController,
-                    (context, item, index) {
-                      return Dismissible(
-                        key: ValueKey(item.id),
-                        background: Container(color: Colors.red),
-                        onDismissed: (direction) {
-                          _resourceService?.deleteResource(item.id!);
-                          _pagingController.itemList!.remove(item);
+                child: PagedListView<Resource>.source(
+                  bloc: _bloc,
+                  itemBuilder: (context, item, index) {
+                    return Dismissible(
+                      key: ValueKey(item.id),
+                      background: Container(color: Colors.red),
+                      onDismissed: (direction) {
+                        _resourceService?.deleteResource(item.id!);
+                        _bloc.removeSourced(item);
+                      },
+                      child: ListTile(
+                        title: Text(item.name),
+                        onTap: () async {
+                          await showDialog(
+                            context: context,
+                            builder: (context) => ResourceDialog(
+                              source: widget.source,
+                              resource: item,
+                            ),
+                          );
+                          _bloc.refresh();
                         },
-                        child: ListTile(
-                          title: Text(item.name),
-                          onTap: () async {
-                            await showDialog(
-                              context: context,
-                              builder: (context) => ResourceDialog(
-                                source: widget.source,
-                                resource: item,
-                              ),
-                            );
-                            _pagingController.refresh();
-                          },
-                        ),
-                      );
-                    },
-                  ),
+                      ),
+                    );
+                  },
                 ),
               ),
               const SizedBox(height: 64),
@@ -123,7 +105,7 @@ class _ResourcesViewState<T extends DescriptiveModel>
                     await widget.connector
                         .connect(widget.model.id!, resource.model.id!);
                   }
-                  _pagingController.refresh();
+                  _bloc.refresh();
                 },
               ),
             ),
@@ -133,7 +115,7 @@ class _ResourcesViewState<T extends DescriptiveModel>
 
   @override
   void dispose() {
-    _pagingController.dispose();
+    _bloc.close();
     super.dispose();
   }
 }
diff --git a/app/lib/pages/users/page.dart b/app/lib/pages/users/page.dart
index 9fd5794abe6..600cf5dbeeb 100644
--- a/app/lib/pages/users/page.dart
+++ b/app/lib/pages/users/page.dart
@@ -1,16 +1,14 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/pages/users/user.dart';
-import 'package:flow/widgets/builder_delegate.dart';
 import 'package:flow/widgets/navigation.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:flow_api/models/user/model.dart';
-import 'package:flow_api/models/model.dart';
 
 import '../../cubits/flow.dart';
-import '../../helpers/sourced_paging_controller.dart';
 import 'filter.dart';
 import 'tile.dart';
 
@@ -105,28 +103,29 @@ class UsersBodyView extends StatefulWidget {
 
 class _UsersBodyViewState extends State<UsersBodyView> {
   late final FlowCubit _flowCubit;
-  late final SourcedPagingController<User> _controller;
+  late final SourcedPagingBloc<User> _bloc;
   late UserFilter _filter;
 
   @override
   void initState() {
     _flowCubit = context.read<FlowCubit>();
-    _controller = SourcedPagingController(_flowCubit);
-    _controller.addFetchListener((source, service, offset, limit) async =>
-        _filter.source != null && _filter.source != source
-            ? null
-            : service.user?.getUsers(
-                offset: offset,
-                limit: limit,
-                groupId: _filter.group,
-                search: widget.search));
+    _bloc = SourcedPagingBloc.item(
+        cubit: _flowCubit,
+        fetch: (source, service, offset, limit) async =>
+            _filter.source != null && _filter.source != source
+                ? null
+                : service.user?.getUsers(
+                    offset: offset,
+                    limit: limit,
+                    groupId: _filter.group,
+                    search: widget.search));
     _filter = widget.filter;
     super.initState();
   }
 
   @override
   void dispose() {
-    _controller.dispose();
+    _bloc.close();
     super.dispose();
   }
 
@@ -135,7 +134,7 @@ class _UsersBodyViewState extends State<UsersBodyView> {
     super.didUpdateWidget(oldWidget);
 
     if (oldWidget.search != widget.search) {
-      _controller.refresh();
+      _bloc.refresh();
     }
   }
 
@@ -150,37 +149,34 @@ class _UsersBodyViewState extends State<UsersBodyView> {
               setState(() {
                 _filter = filter;
               });
-              _controller.refresh();
+              _bloc.refresh();
             },
           ),
           const SizedBox(height: 8),
           Expanded(
-            child: PagedListView(
-              pagingController: _controller,
-              builderDelegate: buildMaterialPagedDelegate<SourcedModel<User>>(
-                _controller,
-                (ctx, item, index) => Align(
-                  alignment: Alignment.topCenter,
-                  child: Container(
-                    constraints: const BoxConstraints(maxWidth: 800),
-                    child: Dismissible(
-                      key: ValueKey('${item.model.id}@${item.source}'),
-                      onDismissed: (direction) async {
-                        await _flowCubit
-                            .getService(item.source)
-                            .user
-                            ?.deleteUser(item.model.id!);
-                        _controller.itemList!.remove(item);
-                      },
-                      background: Container(
-                        color: Colors.red,
-                      ),
-                      child: UserTile(
-                        flowCubit: _flowCubit,
-                        pagingController: _controller,
-                        source: item.source,
-                        user: item.model,
-                      ),
+            child: PagedListView.item(
+              bloc: _bloc,
+              itemBuilder: (ctx, item, index) => Align(
+                alignment: Alignment.topCenter,
+                child: Container(
+                  constraints: const BoxConstraints(maxWidth: 800),
+                  child: Dismissible(
+                    key: ValueKey('${item.model.id}@${item.source}'),
+                    onDismissed: (direction) async {
+                      await _flowCubit
+                          .getService(item.source)
+                          .user
+                          ?.deleteUser(item.model.id!);
+                      _bloc.remove(item);
+                    },
+                    background: Container(
+                      color: Colors.red,
+                    ),
+                    child: UserTile(
+                      flowCubit: _flowCubit,
+                      bloc: _bloc,
+                      source: item.source,
+                      user: item.model,
                     ),
                   ),
                 ),
@@ -192,7 +188,7 @@ class _UsersBodyViewState extends State<UsersBodyView> {
       floatingActionButton: FloatingActionButton.extended(
         onPressed: () => showDialog(
                 context: context, builder: (context) => const UserDialog())
-            .then((_) => _controller.refresh()),
+            .then((_) => _bloc.refresh()),
         label: Text(AppLocalizations.of(context).create),
         icon: const PhosphorIcon(PhosphorIconsLight.plus),
       ),
diff --git a/app/lib/pages/users/tile.dart b/app/lib/pages/users/tile.dart
index bfa49a0b523..85aea6ac6f5 100644
--- a/app/lib/pages/users/tile.dart
+++ b/app/lib/pages/users/tile.dart
@@ -1,4 +1,4 @@
-import 'package:flow/helpers/sourced_paging_controller.dart';
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flutter/material.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
 import 'package:go_router/go_router.dart';
@@ -18,13 +18,13 @@ class UserTile extends StatelessWidget {
     required this.source,
     required this.user,
     required this.flowCubit,
-    required this.pagingController,
+    required this.bloc,
   });
 
   final FlowCubit flowCubit;
   final User user;
   final String source;
-  final SourcedPagingController<User> pagingController;
+  final SourcedPagingBloc<User> bloc;
 
   @override
   Widget build(BuildContext context) {
@@ -74,11 +74,11 @@ class UserTile extends StatelessWidget {
             onPressed: () async {
               Navigator.of(context).pop();
               await flowCubit.getService(source).user?.deleteUser(user.id!);
-              pagingController.itemList!.remove(SourcedModel(
+              bloc.remove(SourcedModel(
                 source,
                 user,
               ));
-              pagingController.refresh();
+              bloc.refresh();
             },
             child: Text(
               AppLocalizations.of(context).delete,
@@ -105,6 +105,6 @@ class UserTile extends StatelessWidget {
         user: user,
         source: source,
       ),
-    ).then((value) => pagingController.refresh());
+    ).then((value) => bloc.refresh());
   }
 }
diff --git a/app/lib/pages/users/view.dart b/app/lib/pages/users/view.dart
index 0943380b175..ffea2363313 100644
--- a/app/lib/pages/users/view.dart
+++ b/app/lib/pages/users/view.dart
@@ -1,15 +1,15 @@
+import 'package:flow/blocs/sourced_paging.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flow_api/services/source.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:flow_api/models/model.dart';
 import 'package:flow_api/models/user/model.dart';
 import 'package:flow_api/models/user/service.dart';
 
 import '../../cubits/flow.dart';
-import '../../widgets/builder_delegate.dart';
 import 'user.dart';
 
 class UsersView<T extends DescriptiveModel> extends StatefulWidget {
@@ -35,39 +35,24 @@ class UsersView<T extends DescriptiveModel> extends StatefulWidget {
 }
 
 class _UsersViewState<T extends DescriptiveModel> extends State<UsersView<T>> {
-  static const _pageSize = 20;
-
   late final UserService? _userService;
 
-  final PagingController<int, User> _pagingController =
-      PagingController(firstPageKey: 0);
+  late final SourcedPagingBloc<User> _bloc;
 
   @override
   void initState() {
-    final service = context.read<FlowCubit>().getService(widget.source);
+    final cubit = context.read<FlowCubit>();
+    final service = cubit.getService(widget.source);
     _userService = service.user;
-    _pagingController.addPageRequestListener((pageKey) {
-      _fetchPage(pageKey);
-    });
+    _bloc = SourcedPagingBloc.source(
+      cubit: cubit,
+      source: widget.source,
+      fetch: (service, offset, limit) => widget.connector
+          .getItems(widget.model.id!, offset: offset, limit: limit),
+    );
     super.initState();
   }
 
-  Future<void> _fetchPage(int pageKey) async {
-    try {
-      final newItems = await widget.connector.getItems(widget.model.id!,
-          offset: pageKey * _pageSize, limit: _pageSize);
-      final isLastPage = newItems.length < _pageSize;
-      if (isLastPage) {
-        _pagingController.appendLastPage(newItems);
-      } else {
-        final nextPageKey = pageKey + 1;
-        _pagingController.appendPage(newItems, nextPageKey);
-      }
-    } catch (error) {
-      _pagingController.error = error;
-    }
-  }
-
   @override
   Widget build(BuildContext context) =>
       // Don't worry about displaying progress or error indicators on screen; the
@@ -78,34 +63,31 @@ class _UsersViewState<T extends DescriptiveModel> extends State<UsersView<T>> {
           Column(
             children: [
               Flexible(
-                child: PagedListView<int, User>(
-                  pagingController: _pagingController,
-                  builderDelegate: buildMaterialPagedDelegate<User>(
-                    _pagingController,
-                    (context, item, index) {
-                      return Dismissible(
-                        key: ValueKey(item.id),
-                        background: Container(color: Colors.red),
-                        onDismissed: (direction) {
-                          _userService?.deleteUser(item.id!);
-                          _pagingController.itemList!.remove(item);
+                child: PagedListView<User>.source(
+                  bloc: _bloc,
+                  itemBuilder: (context, item, index) {
+                    return Dismissible(
+                      key: ValueKey(item.id),
+                      background: Container(color: Colors.red),
+                      onDismissed: (direction) {
+                        _userService?.deleteUser(item.id!);
+                        _bloc.removeSourced(item);
+                      },
+                      child: ListTile(
+                        title: Text(item.name),
+                        onTap: () async {
+                          await showDialog(
+                            context: context,
+                            builder: (context) => UserDialog(
+                              source: widget.source,
+                              user: item,
+                            ),
+                          );
+                          _bloc.refresh();
                         },
-                        child: ListTile(
-                          title: Text(item.name),
-                          onTap: () async {
-                            await showDialog(
-                              context: context,
-                              builder: (context) => UserDialog(
-                                source: widget.source,
-                                user: item,
-                              ),
-                            );
-                            _pagingController.refresh();
-                          },
-                        ),
-                      );
-                    },
-                  ),
+                      ),
+                    );
+                  },
                 ),
               ),
               const SizedBox(height: 64),
@@ -129,7 +111,7 @@ class _UsersViewState<T extends DescriptiveModel> extends State<UsersView<T>> {
                     await widget.connector
                         .connect(widget.model.id!, user.model.id!);
                   }
-                  _pagingController.refresh();
+                  _bloc.refresh();
                 },
               ),
             ),
@@ -139,7 +121,7 @@ class _UsersViewState<T extends DescriptiveModel> extends State<UsersView<T>> {
 
   @override
   void dispose() {
-    _pagingController.dispose();
+    _bloc.close();
     super.dispose();
   }
 }
diff --git a/app/lib/widgets/builder_delegate.dart b/app/lib/widgets/builder_delegate.dart
deleted file mode 100644
index 68e03f16a57..00000000000
--- a/app/lib/widgets/builder_delegate.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-import 'package:flow/widgets/indicators/empty.dart';
-import 'package:flow/widgets/indicators/error.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
-
-import 'indicators/loading.dart';
-
-PagedChildBuilderDelegate<T> buildMaterialPagedDelegate<T>(
-        PagingController<dynamic, T> controller,
-        ItemWidgetBuilder<T> itemBuilder) =>
-    PagedChildBuilderDelegate<T>(
-      itemBuilder: itemBuilder,
-      firstPageProgressIndicatorBuilder: (context) =>
-          const LoadingIndicatorDisplay(),
-      firstPageErrorIndicatorBuilder: (context) =>
-          ErrorIndicatorDisplay(onTryAgain: controller.refresh),
-      animateTransitions: true,
-      newPageErrorIndicatorBuilder: (context) => ErrorIndicatorDisplay(
-        onTryAgain: controller.retryLastFailedRequest,
-      ),
-      newPageProgressIndicatorBuilder: (context) =>
-          const LoadingIndicatorDisplay(),
-      noItemsFoundIndicatorBuilder: (context) => const EmptyIndicatorDisplay(),
-    );
diff --git a/app/lib/widgets/paging/builder.dart b/app/lib/widgets/paging/builder.dart
new file mode 100644
index 00000000000..4cda3e31361
--- /dev/null
+++ b/app/lib/widgets/paging/builder.dart
@@ -0,0 +1,27 @@
+import 'package:flow/blocs/sourced_paging.dart';
+import 'package:flow/widgets/paging/error.dart';
+import 'package:flow/widgets/paging/loading.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+final class PagedBuilder<T> extends StatelessWidget {
+  final Widget Function(BuildContext, SourcedPagingSuccess<T> state) builder;
+  final SourcedPagingBloc<T>? bloc;
+
+  const PagedBuilder({super.key, required this.builder, this.bloc});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<SourcedPagingBloc<T>, SourcedPagingState<T>>(
+      bloc: bloc,
+      builder: (context, state) => switch (state) {
+        SourcedPagingInitial<T>() => LoadingIndicatorDisplay(),
+        SourcedPagingFailure<T>() => ErrorIndicatorDisplay(
+            onTryAgain: () => (bloc ?? context.read<SourcedPagingBloc<T>>())
+                .add(SourcedPagingRefresh()),
+          ),
+        SourcedPagingSuccess<T>() => builder(context, state),
+      },
+    );
+  }
+}
diff --git a/app/lib/widgets/indicators/empty.dart b/app/lib/widgets/paging/empty.dart
similarity index 88%
rename from app/lib/widgets/indicators/empty.dart
rename to app/lib/widgets/paging/empty.dart
index 95daa8b8376..a0dd6c2f49d 100644
--- a/app/lib/widgets/indicators/empty.dart
+++ b/app/lib/widgets/paging/empty.dart
@@ -1,4 +1,4 @@
-import 'package:flow/widgets/indicators/indicator.dart';
+import 'package:flow/widgets/paging/indicator.dart';
 import 'package:flutter/material.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
 
diff --git a/app/lib/widgets/indicators/error.dart b/app/lib/widgets/paging/error.dart
similarity index 90%
rename from app/lib/widgets/indicators/error.dart
rename to app/lib/widgets/paging/error.dart
index ea536fa633a..4ae6e5413e2 100644
--- a/app/lib/widgets/indicators/error.dart
+++ b/app/lib/widgets/paging/error.dart
@@ -1,4 +1,4 @@
-import 'package:flow/widgets/indicators/indicator.dart';
+import 'package:flow/widgets/paging/indicator.dart';
 import 'package:flutter/material.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
 
diff --git a/app/lib/widgets/indicators/indicator.dart b/app/lib/widgets/paging/indicator.dart
similarity index 100%
rename from app/lib/widgets/indicators/indicator.dart
rename to app/lib/widgets/paging/indicator.dart
diff --git a/app/lib/widgets/paging/list.dart b/app/lib/widgets/paging/list.dart
new file mode 100644
index 00000000000..1fdc4be57b3
--- /dev/null
+++ b/app/lib/widgets/paging/list.dart
@@ -0,0 +1,144 @@
+import 'package:flow/blocs/sourced_paging.dart';
+import 'package:flow/widgets/paging/builder.dart';
+import 'package:flow/widgets/paging/empty.dart';
+import 'package:flow_api/models/model.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+
+typedef ItemBuilder<T> = Widget Function(
+    BuildContext context, SourcedModel<T> item, int index);
+typedef DateBuilder<T> = Widget Function(
+    BuildContext context, List<SourcedModel<T>> date, int index);
+typedef SourceBuilder<T> = Widget Function(
+    BuildContext context, T item, int index);
+
+_buildSourceItem<T>(SourceBuilder<T> itemBuilder) =>
+    (BuildContext context, SourcedModel<T> item, int index) =>
+        itemBuilder(context, item.model, index);
+
+class PagedListView<T> extends StatelessWidget {
+  final ItemBuilder<T>? itemBuilder;
+  final DateBuilder<T>? dateBuilder;
+  final SourcedPagingBloc<T>? bloc;
+  final Axis? scrollDirection;
+
+  const PagedListView.item({
+    super.key,
+    required this.itemBuilder,
+    this.bloc,
+    this.scrollDirection,
+  }) : dateBuilder = null;
+  const PagedListView.dated({
+    super.key,
+    required this.dateBuilder,
+    this.bloc,
+    this.scrollDirection,
+  }) : itemBuilder = null;
+
+  PagedListView.source({
+    super.key,
+    required SourceBuilder<T> itemBuilder,
+    this.bloc,
+    this.scrollDirection,
+  })  : itemBuilder = _buildSourceItem(itemBuilder),
+        dateBuilder = null;
+
+  @override
+  Widget build(BuildContext context) {
+    return PagedBuilder(
+      bloc: bloc,
+      builder: (p0, state) => _PagedListView(
+        state: state,
+        itemBuilder: itemBuilder,
+        dateBuilder: dateBuilder,
+        bloc: bloc,
+        scrollDirection: scrollDirection,
+      ),
+    );
+  }
+}
+
+final class _PagedListView<T> extends StatefulWidget {
+  final SourcedPagingState<T> state;
+  final ItemBuilder<T>? itemBuilder;
+  final DateBuilder<T>? dateBuilder;
+  final SourcedPagingBloc<T>? bloc;
+  final Axis? scrollDirection;
+
+  const _PagedListView({
+    super.key,
+    required this.state,
+    this.itemBuilder,
+    this.dateBuilder,
+    this.bloc,
+    this.scrollDirection,
+  });
+
+  @override
+  State<_PagedListView<T>> createState() => _PagedListViewState<T>();
+}
+
+class _PagedListViewState<T> extends State<_PagedListView<T>> {
+  final ScrollController _scrollController = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    _scrollController.addListener(_onScroll);
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _fetch();
+    });
+  }
+
+  @override
+  void didUpdateWidget(covariant _PagedListView<T> oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.state != oldWidget.state) {
+      setState((() => {}));
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _onScroll();
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final useDates = widget.dateBuilder != null;
+    final state = widget.state;
+    final items = state.items;
+    final dates = state.dates;
+    if (useDates ? dates.isEmpty : items.isEmpty) {
+      return const EmptyIndicatorDisplay();
+    }
+    return ListView.builder(
+      itemCount: useDates ? dates.length : items.length,
+      scrollDirection: widget.scrollDirection ?? Axis.vertical,
+      controller: _scrollController,
+      itemBuilder: (context, index) => useDates
+          ? widget.dateBuilder!(context, dates[index], index)
+          : widget.itemBuilder!(context, items[index], index),
+    );
+  }
+
+  bool get _isBottom {
+    if (!_scrollController.hasClients) return false;
+    final maxScroll = _scrollController.position.maxScrollExtent;
+    final currentScroll = _scrollController.offset;
+    return currentScroll >= (maxScroll * 0.9);
+  }
+
+  void _fetch() =>
+      (widget.bloc ?? context.read<SourcedPagingBloc<T>>()).fetch();
+
+  void _onScroll() {
+    if (_isBottom) {
+      _fetch();
+    }
+  }
+}
diff --git a/app/lib/widgets/indicators/loading.dart b/app/lib/widgets/paging/loading.dart
similarity index 87%
rename from app/lib/widgets/indicators/loading.dart
rename to app/lib/widgets/paging/loading.dart
index 47174e45f41..3722fec2195 100644
--- a/app/lib/widgets/indicators/loading.dart
+++ b/app/lib/widgets/paging/loading.dart
@@ -1,4 +1,4 @@
-import 'package:flow/widgets/indicators/indicator.dart';
+import 'package:flow/widgets/paging/indicator.dart';
 import 'package:flutter/material.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
 
diff --git a/app/lib/widgets/select.dart b/app/lib/widgets/select.dart
index 2c01b033d67..8b4cf05f8a9 100644
--- a/app/lib/widgets/select.dart
+++ b/app/lib/widgets/select.dart
@@ -1,17 +1,15 @@
+import 'package:flow/blocs/sourced_paging.dart';
 import 'package:flow/cubits/flow.dart';
-import 'package:flow/helpers/sourced_paging_controller.dart';
+import 'package:flow/widgets/paging/list.dart';
 import 'package:flow_api/services/database.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
-import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
 import 'dart:typed_data';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:flow_api/models/model.dart';
 import 'package:flow_api/services/source.dart';
 
-import '../../widgets/builder_delegate.dart';
-
 typedef ModelFetchCallback<T> = Future<T?> Function(
     String source, SourceService service, Uint8List id);
 typedef ModelWidgetBuilder<T> = Widget? Function(
@@ -140,14 +138,12 @@ class _SelectTileState<T extends NamedModel> extends State<SelectTile<T>> {
   }
 }
 
-typedef SelectFetchCallback<T> = Future<List<T>?> Function(
-    String source, SourceService service, String search, int offset, int limit);
-
 class SelectDialog<T extends NamedModel> extends StatefulWidget {
   final String title;
   final String? source;
   final SourcedModel<Uint8List>? selected;
-  final SelectFetchCallback<T> onFetch;
+  final Future<List<T>?> Function(String source, SourceService service,
+      String search, int offset, int limit) onFetch;
   final Future<SourcedModel<T>?> Function(String?)? onCreate;
 
   const SelectDialog({
@@ -165,24 +161,25 @@ class SelectDialog<T extends NamedModel> extends StatefulWidget {
 
 class _SelectDialogState<T extends NamedModel> extends State<SelectDialog<T>> {
   final TextEditingController _controller = TextEditingController();
-  late final SourcedPagingController<T> _pagingController;
+  late final SourcedPagingBloc<T> _bloc;
 
   @override
   void initState() {
     super.initState();
-    _pagingController = SourcedPagingController<T>(
-      context.read<FlowCubit>(),
+    _bloc = SourcedPagingBloc<T>.item(
+      cubit: context.read<FlowCubit>(),
+      fetch: (source, service, offset, limit) async {
+        final search = _controller.text;
+        return widget.onFetch(source, service, search, offset, limit);
+      },
     );
-
-    _pagingController.addFetchListener((source, service, offset, limit) =>
-        widget.onFetch(source, service, _controller.text, offset, limit));
   }
 
   @override
   void dispose() {
     super.dispose();
 
-    _pagingController.dispose();
+    _bloc.close();
   }
 
   @override
@@ -202,26 +199,23 @@ class _SelectDialogState<T extends NamedModel> extends State<SelectDialog<T>> {
               ),
               controller: _controller,
               onSubmitted: (_) {
-                _pagingController.refresh();
+                _bloc.refresh();
               },
             ),
             const SizedBox(height: 8),
             const Divider(),
             const SizedBox(height: 8),
             Expanded(
-              child: PagedListView(
-                pagingController: _pagingController,
-                builderDelegate: buildMaterialPagedDelegate<SourcedModel<T>>(
-                  _pagingController,
-                  (context, item, index) => ListTile(
-                    title: Text(item.model.name),
-                    selected:
-                        equalUint8List(widget.selected?.model, item.model.id) &&
-                            widget.selected?.source == item.source,
-                    onTap: () {
-                      Navigator.of(context).pop(item);
-                    },
-                  ),
+              child: PagedListView.item(
+                bloc: _bloc,
+                itemBuilder: (context, item, index) => ListTile(
+                  title: Text(item.model.name),
+                  selected:
+                      equalUint8List(widget.selected?.model, item.model.id) &&
+                          widget.selected?.source == item.source,
+                  onTap: () {
+                    Navigator.of(context).pop(item);
+                  },
                 ),
               ),
             ),
diff --git a/app/pubspec.lock b/app/pubspec.lock
index da85ef97796..0429a95fe97 100644
--- a/app/pubspec.lock
+++ b/app/pubspec.lock
@@ -274,6 +274,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.7.0"
+  equatable:
+    dependency: "direct main"
+    description:
+      name: equatable
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.7"
   fake_async:
     dependency: transitive
     description:
@@ -491,14 +499,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
-  flutter_staggered_grid_view:
-    dependency: transitive
-    description:
-      name: flutter_staggered_grid_view
-      sha256: "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -545,10 +545,10 @@ packages:
     dependency: transitive
     description:
       name: html
-      sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
+      sha256: "9475be233c437f0e3637af55e7702cbbe5c23a68bd56e8a5fa2d426297b7c6c8"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.5"
+    version: "0.15.5+1"
   http:
     dependency: "direct main"
     description:
@@ -581,14 +581,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.5.4"
-  infinite_scroll_pagination:
-    dependency: "direct main"
-    description:
-      name: infinite_scroll_pagination
-      sha256: "4047eb8191e8b33573690922a9e995af64c3949dc87efc844f936b039ea279df"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.0"
   intl:
     dependency: "direct main"
     description:
@@ -980,10 +972,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad"
+      sha256: c2c8c46297b5d6a80bed7741ec1f2759742c77d272f1a1698176ae828f8e1a18
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.8"
+    version: "2.4.9"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1045,14 +1037,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  sliver_tools:
-    dependency: transitive
-    description:
-      name: sliver_tools
-      sha256: eae28220badfb9d0559207badcbbc9ad5331aac829a88cb0964d330d2a4636a6
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.12"
   source_gen:
     dependency: transitive
     description:
diff --git a/app/pubspec.yaml b/app/pubspec.yaml
index 34c6de42665..b23ef9ade26 100644
--- a/app/pubspec.yaml
+++ b/app/pubspec.yaml
@@ -46,7 +46,6 @@ dependencies:
   flutter_bloc: ^9.0.0
   shared_preferences: ^2.2.3
   collection: ^1.17.1
-  infinite_scroll_pagination: ^4.0.0
   window_manager: ^0.4.3
   package_info_plus: ^8.0.0
   # Database
@@ -73,6 +72,7 @@ dependencies:
       ref: e901983295b103f2fe27738e8f2cbf35941d99ea
       path: packages/lw_sysapi
   file_selector: ^1.0.3
+  equatable: ^2.0.7
 dev_dependencies:
   build_runner: ^2.4.14
   flutter_lints: ^5.0.0
diff --git a/docs/package.json b/docs/package.json
index 938439b4923..3fb19accdb0 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -15,7 +15,7 @@
     "@astrojs/starlight": "^0.33.0",
     "@phosphor-icons/react": "^2.1.7",
     "@types/react": "^19.1.0",
-    "@types/react-dom": "^19.1.1",
+    "@types/react-dom": "^19.1.2",
     "astro": "^5.6.1",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
index 2b8087d7e25..e70024b74a9 100644
--- a/docs/pnpm-lock.yaml
+++ b/docs/pnpm-lock.yaml
@@ -13,7 +13,7 @@ importers:
         version: 0.9.4(typescript@5.8.3)
       '@astrojs/react':
         specifier: ^4.2.3
-        version: 4.2.3(@types/react-dom@19.1.1(@types/react@19.1.0))(@types/react@19.1.0)(jiti@2.4.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
+        version: 4.2.3(@types/react-dom@19.1.2(@types/react@19.1.0))(@types/react@19.1.0)(jiti@2.4.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
       '@astrojs/starlight':
         specifier: ^0.33.0
         version: 0.33.0(astro@5.6.1(jiti@2.4.2)(rollup@2.79.2)(sass@1.86.3)(terser@5.39.0)(typescript@5.8.3)(yaml@2.7.1))
@@ -24,8 +24,8 @@ importers:
         specifier: ^19.1.0
         version: 19.1.0
       '@types/react-dom':
-        specifier: ^19.1.1
-        version: 19.1.1(@types/react@19.1.0)
+        specifier: ^19.1.2
+        version: 19.1.2(@types/react@19.1.0)
       astro:
         specifier: ^5.6.1
         version: 5.6.1(jiti@2.4.2)(rollup@2.79.2)(sass@1.86.3)(terser@5.39.0)(typescript@5.8.3)(yaml@2.7.1)
@@ -47,7 +47,7 @@ importers:
     devDependencies:
       '@vite-pwa/astro':
         specifier: ^1.0.0
-        version: 1.0.0(astro@5.6.1(jiti@2.4.2)(rollup@2.79.2)(sass@1.86.3)(terser@5.39.0)(typescript@5.8.3)(yaml@2.7.1))(vite-plugin-pwa@1.0.0(vite@6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))(workbox-build@7.3.0(@types/babel__core@7.20.5))(workbox-window@7.3.0))
+        version: 1.0.0(astro@5.6.1(jiti@2.4.2)(rollup@2.79.2)(sass@1.86.3)(terser@5.39.0)(typescript@5.8.3)(yaml@2.7.1))(vite-plugin-pwa@1.0.0(vite@6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))(workbox-build@7.3.0(@types/babel__core@7.20.5))(workbox-window@7.3.0))
       sass:
         specifier: ^1.86.3
         version: 1.86.3
@@ -56,7 +56,7 @@ importers:
         version: 0.34.1
       vite-plugin-pwa:
         specifier: ^1.0.0
-        version: 1.0.0(vite@6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))(workbox-build@7.3.0(@types/babel__core@7.20.5))(workbox-window@7.3.0)
+        version: 1.0.0(vite@6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))(workbox-build@7.3.0(@types/babel__core@7.20.5))(workbox-window@7.3.0)
       workbox-window:
         specifier: ^7.3.0
         version: 7.3.0
@@ -1344,38 +1344,38 @@ packages:
   '@shikijs/core@1.29.2':
     resolution: {integrity: sha512-vju0lY9r27jJfOY4Z7+Rt/nIOjzJpZ3y+nYpqtUZInVoXQ/TJZcfGnNOGnKjFdVZb8qexiCuSlZRKcGfhhTTZQ==}
 
-  '@shikijs/core@3.2.1':
-    resolution: {integrity: sha512-FhsdxMWYu/C11sFisEp7FMGBtX/OSSbnXZDMBhGuUDBNTdsoZlMSgQv5f90rwvzWAdWIW6VobD+G3IrazxA6dQ==}
+  '@shikijs/core@3.2.2':
+    resolution: {integrity: sha512-yvlSKVMLjddAGBa2Yu+vUZxuu3sClOWW1AG+UtJkvejYuGM5BVL35s6Ijiwb75O9QdEx6IkMxinHZSi8ZyrBaA==}
 
   '@shikijs/engine-javascript@1.29.2':
     resolution: {integrity: sha512-iNEZv4IrLYPv64Q6k7EPpOCE/nuvGiKl7zxdq0WFuRPF5PAE9PRo2JGq/d8crLusM59BRemJ4eOqrFrC4wiQ+A==}
 
-  '@shikijs/engine-javascript@3.2.1':
-    resolution: {integrity: sha512-eMdcUzN3FMQYxOmRf2rmU8frikzoSHbQDFH2hIuXsrMO+IBOCI9BeeRkCiBkcLDHeRKbOCtYMJK3D6U32ooU9Q==}
+  '@shikijs/engine-javascript@3.2.2':
+    resolution: {integrity: sha512-tlDKfhWpF4jKLUyVAnmL+ggIC+0VyteNsUpBzh1iwWLZu4i+PelIRr0TNur6pRRo5UZIv3ss/PLMuwahg9S2hg==}
 
   '@shikijs/engine-oniguruma@1.29.2':
     resolution: {integrity: sha512-7iiOx3SG8+g1MnlzZVDYiaeHe7Ez2Kf2HrJzdmGwkRisT7r4rak0e655AcM/tF9JG/kg5fMNYlLLKglbN7gBqA==}
 
-  '@shikijs/engine-oniguruma@3.2.1':
-    resolution: {integrity: sha512-wZZAkayEn6qu2+YjenEoFqj0OyQI64EWsNR6/71d1EkG4sxEOFooowKivsWPpaWNBu3sxAG+zPz5kzBL/SsreQ==}
+  '@shikijs/engine-oniguruma@3.2.2':
+    resolution: {integrity: sha512-vyXRnWVCSvokwbaUD/8uPn6Gqsf5Hv7XwcW4AgiU4Z2qwy19sdr6VGzMdheKKN58tJOOe5MIKiNb901bgcUXYQ==}
 
   '@shikijs/langs@1.29.2':
     resolution: {integrity: sha512-FIBA7N3LZ+223U7cJDUYd5shmciFQlYkFXlkKVaHsCPgfVLiO+e12FmQE6Tf9vuyEsFe3dIl8qGWKXgEHL9wmQ==}
 
-  '@shikijs/langs@3.2.1':
-    resolution: {integrity: sha512-If0iDHYRSGbihiA8+7uRsgb1er1Yj11pwpX1c6HLYnizDsKAw5iaT3JXj5ZpaimXSWky/IhxTm7C6nkiYVym+A==}
+  '@shikijs/langs@3.2.2':
+    resolution: {integrity: sha512-NY0Urg2dV9ETt3JIOWoMPuoDNwte3geLZ4M1nrPHbkDS8dWMpKcEwlqiEIGqtwZNmt5gKyWpR26ln2Bg2ecPgw==}
 
   '@shikijs/themes@1.29.2':
     resolution: {integrity: sha512-i9TNZlsq4uoyqSbluIcZkmPL9Bfi3djVxRnofUHwvx/h6SRW3cwgBC5SML7vsDcWyukY0eCzVN980rqP6qNl9g==}
 
-  '@shikijs/themes@3.2.1':
-    resolution: {integrity: sha512-k5DKJUT8IldBvAm8WcrDT5+7GA7se6lLksR+2E3SvyqGTyFMzU2F9Gb7rmD+t+Pga1MKrYFxDIeyWjMZWM6uBQ==}
+  '@shikijs/themes@3.2.2':
+    resolution: {integrity: sha512-Zuq4lgAxVKkb0FFdhHSdDkALuRpsj1so1JdihjKNQfgM78EHxV2JhO10qPsMrm01FkE3mDRTdF68wfmsqjt6HA==}
 
   '@shikijs/types@1.29.2':
     resolution: {integrity: sha512-VJjK0eIijTZf0QSTODEXCqinjBn0joAHQ+aPSBzrv4O2d/QSbsMw+ZeSRx03kV34Hy7NzUvV/7NqfYGRLrASmw==}
 
-  '@shikijs/types@3.2.1':
-    resolution: {integrity: sha512-/NTWAk4KE2M8uac0RhOsIhYQf4pdU0OywQuYDGIGAJ6Mjunxl2cGiuLkvu4HLCMn+OTTLRWkjZITp+aYJv60yA==}
+  '@shikijs/types@3.2.2':
+    resolution: {integrity: sha512-a5TiHk7EH5Lso8sHcLHbVNNhWKP0Wi3yVnXnu73g86n3WoDgEra7n3KszyeCGuyoagspQ2fzvy4cpSc8pKhb0A==}
 
   '@shikijs/vscode-textmate@10.0.2':
     resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==}
@@ -1428,8 +1428,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@types/react-dom@19.1.1':
-    resolution: {integrity: sha512-jFf/woGTVTjUJsl2O7hcopJ1r0upqoq/vIOoCj0yLh3RIXxWcljlpuZ+vEBRXsymD1jhfeJrlyTy/S1UW+4y1w==}
+  '@types/react-dom@19.1.2':
+    resolution: {integrity: sha512-XGJkWF41Qq305SKWEILa1O8vzhb3aOo3ogBlSmiqNko/WmRb6QIaweuZCXjKygVDXpzXb5wyxKTSOsmkuqj+Qw==}
     peerDependencies:
       '@types/react': ^19.0.0
 
@@ -1657,8 +1657,8 @@ packages:
     resolution: {integrity: sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==}
     engines: {node: '>=16'}
 
-  caniuse-lite@1.0.30001712:
-    resolution: {integrity: sha512-MBqPpGYYdQ7/hfKiet9SCI+nmN5/hp4ZzveOJubl5DTAMa5oggjAuoi0Z4onBpKPFI2ePGnQuQIzF3VxDjDJig==}
+  caniuse-lite@1.0.30001713:
+    resolution: {integrity: sha512-wCIWIg+A4Xr7NfhTuHdX+/FKh3+Op3LBbSp2N5Pfx6T/LhdQy3GTyoTg48BReaW/MyMNZAkTadsBtai3ldWK0Q==}
 
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
@@ -1856,8 +1856,8 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
 
-  electron-to-chromium@1.5.134:
-    resolution: {integrity: sha512-zSwzrLg3jNP3bwsLqWHmS5z2nIOQ5ngMnfMZOWWtXnqqQkPVyOipxK98w+1beLw1TB+EImPNcG8wVP/cLVs2Og==}
+  electron-to-chromium@1.5.135:
+    resolution: {integrity: sha512-8gXUdEmvb+WCaYUhA0Svr08uSeRjM2w3x5uHOc1QbaEVzJXB8rgm5eptieXzyKoVEtinLvW6MtTcurA65PeS1Q==}
 
   emmet@2.4.11:
     resolution: {integrity: sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==}
@@ -3055,8 +3055,8 @@ packages:
   shiki@1.29.2:
     resolution: {integrity: sha512-njXuliz/cP+67jU2hukkxCNuH1yUi4QfdZZY+sMr5PPrIyXSu5iTb/qYC4BiWWB0vZ+7TbdvYUCeL23zpwCfbg==}
 
-  shiki@3.2.1:
-    resolution: {integrity: sha512-VML/2o1/KGYkEf/stJJ+s9Ypn7jUKQPomGLGYso4JJFMFxVDyPNsjsI3MB3KLjlMOeH44gyaPdXC6rik2WXvUQ==}
+  shiki@3.2.2:
+    resolution: {integrity: sha512-0qWBkM2t/0NXPRcVgtLhtHv6Ak3Q5yI4K/ggMqcgLRKm4+pCs3namgZlhlat/7u2CuqNtlShNs9lENOG6n7UaQ==}
 
   side-channel-list@1.0.0:
     resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
@@ -3431,8 +3431,8 @@ packages:
       '@vite-pwa/assets-generator':
         optional: true
 
-  vite@6.2.5:
-    resolution: {integrity: sha512-j023J/hCAa4pRIUH6J9HemwYfjB5llR2Ps0CWeikOtdR8+pAURAk0DoJC5/mm9kd+UgdnIy7d6HE4EAvlYhPhA==}
+  vite@6.2.6:
+    resolution: {integrity: sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
     peerDependencies:
@@ -3806,7 +3806,7 @@ snapshots:
       remark-parse: 11.0.0
       remark-rehype: 11.1.2
       remark-smartypants: 3.0.2
-      shiki: 3.2.1
+      shiki: 3.2.2
       smol-toml: 1.3.1
       unified: 11.0.5
       unist-util-remove-position: 5.0.0
@@ -3839,15 +3839,15 @@ snapshots:
     dependencies:
       prismjs: 1.30.0
 
-  '@astrojs/react@4.2.3(@types/react-dom@19.1.1(@types/react@19.1.0))(@types/react@19.1.0)(jiti@2.4.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)':
+  '@astrojs/react@4.2.3(@types/react-dom@19.1.2(@types/react@19.1.0))(@types/react@19.1.0)(jiti@2.4.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)':
     dependencies:
       '@types/react': 19.1.0
-      '@types/react-dom': 19.1.1(@types/react@19.1.0)
-      '@vitejs/plugin-react': 4.3.4(vite@6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))
+      '@types/react-dom': 19.1.2(@types/react@19.1.0)
+      '@vitejs/plugin-react': 4.3.4(vite@6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))
       react: 19.1.0
       react-dom: 19.1.0(react@19.1.0)
       ultrahtml: 1.6.0
-      vite: 6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
+      vite: 6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -5115,9 +5115,9 @@ snapshots:
       '@types/hast': 3.0.4
       hast-util-to-html: 9.0.5
 
-  '@shikijs/core@3.2.1':
+  '@shikijs/core@3.2.2':
     dependencies:
-      '@shikijs/types': 3.2.1
+      '@shikijs/types': 3.2.2
       '@shikijs/vscode-textmate': 10.0.2
       '@types/hast': 3.0.4
       hast-util-to-html: 9.0.5
@@ -5128,9 +5128,9 @@ snapshots:
       '@shikijs/vscode-textmate': 10.0.2
       oniguruma-to-es: 2.3.0
 
-  '@shikijs/engine-javascript@3.2.1':
+  '@shikijs/engine-javascript@3.2.2':
     dependencies:
-      '@shikijs/types': 3.2.1
+      '@shikijs/types': 3.2.2
       '@shikijs/vscode-textmate': 10.0.2
       oniguruma-to-es: 4.1.0
 
@@ -5139,33 +5139,33 @@ snapshots:
       '@shikijs/types': 1.29.2
       '@shikijs/vscode-textmate': 10.0.2
 
-  '@shikijs/engine-oniguruma@3.2.1':
+  '@shikijs/engine-oniguruma@3.2.2':
     dependencies:
-      '@shikijs/types': 3.2.1
+      '@shikijs/types': 3.2.2
       '@shikijs/vscode-textmate': 10.0.2
 
   '@shikijs/langs@1.29.2':
     dependencies:
       '@shikijs/types': 1.29.2
 
-  '@shikijs/langs@3.2.1':
+  '@shikijs/langs@3.2.2':
     dependencies:
-      '@shikijs/types': 3.2.1
+      '@shikijs/types': 3.2.2
 
   '@shikijs/themes@1.29.2':
     dependencies:
       '@shikijs/types': 1.29.2
 
-  '@shikijs/themes@3.2.1':
+  '@shikijs/themes@3.2.2':
     dependencies:
-      '@shikijs/types': 3.2.1
+      '@shikijs/types': 3.2.2
 
   '@shikijs/types@1.29.2':
     dependencies:
       '@shikijs/vscode-textmate': 10.0.2
       '@types/hast': 3.0.4
 
-  '@shikijs/types@3.2.1':
+  '@shikijs/types@3.2.2':
     dependencies:
       '@shikijs/vscode-textmate': 10.0.2
       '@types/hast': 3.0.4
@@ -5232,7 +5232,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@types/react-dom@19.1.1(@types/react@19.1.0)':
+  '@types/react-dom@19.1.2(@types/react@19.1.0)':
     dependencies:
       '@types/react': 19.1.0
 
@@ -5254,19 +5254,19 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vite-pwa/astro@1.0.0(astro@5.6.1(jiti@2.4.2)(rollup@2.79.2)(sass@1.86.3)(terser@5.39.0)(typescript@5.8.3)(yaml@2.7.1))(vite-plugin-pwa@1.0.0(vite@6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))(workbox-build@7.3.0(@types/babel__core@7.20.5))(workbox-window@7.3.0))':
+  '@vite-pwa/astro@1.0.0(astro@5.6.1(jiti@2.4.2)(rollup@2.79.2)(sass@1.86.3)(terser@5.39.0)(typescript@5.8.3)(yaml@2.7.1))(vite-plugin-pwa@1.0.0(vite@6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))(workbox-build@7.3.0(@types/babel__core@7.20.5))(workbox-window@7.3.0))':
     dependencies:
       astro: 5.6.1(jiti@2.4.2)(rollup@2.79.2)(sass@1.86.3)(terser@5.39.0)(typescript@5.8.3)(yaml@2.7.1)
-      vite-plugin-pwa: 1.0.0(vite@6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))(workbox-build@7.3.0(@types/babel__core@7.20.5))(workbox-window@7.3.0)
+      vite-plugin-pwa: 1.0.0(vite@6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))(workbox-build@7.3.0(@types/babel__core@7.20.5))(workbox-window@7.3.0)
 
-  '@vitejs/plugin-react@4.3.4(vite@6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))':
+  '@vitejs/plugin-react@4.3.4(vite@6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))':
     dependencies:
       '@babel/core': 7.26.10
       '@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/core@7.26.10)
       '@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/core@7.26.10)
       '@types/babel__core': 7.20.5
       react-refresh: 0.14.2
-      vite: 6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
+      vite: 6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -5425,7 +5425,7 @@ snapshots:
       prompts: 2.4.2
       rehype: 13.0.2
       semver: 7.7.1
-      shiki: 3.2.1
+      shiki: 3.2.2
       tinyexec: 0.3.2
       tinyglobby: 0.2.12
       tsconfck: 3.1.5(typescript@5.8.3)
@@ -5433,8 +5433,8 @@ snapshots:
       unist-util-visit: 5.0.0
       unstorage: 1.15.0
       vfile: 6.0.3
-      vite: 6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
-      vitefu: 1.0.6(vite@6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))
+      vite: 6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
+      vitefu: 1.0.6(vite@6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))
       xxhash-wasm: 1.1.0
       yargs-parser: 21.1.1
       yocto-spinner: 0.2.1
@@ -5555,8 +5555,8 @@ snapshots:
 
   browserslist@4.24.4:
     dependencies:
-      caniuse-lite: 1.0.30001712
-      electron-to-chromium: 1.5.134
+      caniuse-lite: 1.0.30001713
+      electron-to-chromium: 1.5.135
       node-releases: 2.0.19
       update-browserslist-db: 1.1.3(browserslist@4.24.4)
 
@@ -5581,7 +5581,7 @@ snapshots:
 
   camelcase@8.0.0: {}
 
-  caniuse-lite@1.0.30001712: {}
+  caniuse-lite@1.0.30001713: {}
 
   ccount@2.0.1: {}
 
@@ -5745,7 +5745,7 @@ snapshots:
     dependencies:
       jake: 10.9.2
 
-  electron-to-chromium@1.5.134: {}
+  electron-to-chromium@1.5.135: {}
 
   emmet@2.4.11:
     dependencies:
@@ -7601,14 +7601,14 @@ snapshots:
       '@shikijs/vscode-textmate': 10.0.2
       '@types/hast': 3.0.4
 
-  shiki@3.2.1:
+  shiki@3.2.2:
     dependencies:
-      '@shikijs/core': 3.2.1
-      '@shikijs/engine-javascript': 3.2.1
-      '@shikijs/engine-oniguruma': 3.2.1
-      '@shikijs/langs': 3.2.1
-      '@shikijs/themes': 3.2.1
-      '@shikijs/types': 3.2.1
+      '@shikijs/core': 3.2.2
+      '@shikijs/engine-javascript': 3.2.2
+      '@shikijs/engine-oniguruma': 3.2.2
+      '@shikijs/langs': 3.2.2
+      '@shikijs/themes': 3.2.2
+      '@shikijs/types': 3.2.2
       '@shikijs/vscode-textmate': 10.0.2
       '@types/hast': 3.0.4
 
@@ -7983,18 +7983,18 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.2
 
-  vite-plugin-pwa@1.0.0(vite@6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))(workbox-build@7.3.0(@types/babel__core@7.20.5))(workbox-window@7.3.0):
+  vite-plugin-pwa@1.0.0(vite@6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1))(workbox-build@7.3.0(@types/babel__core@7.20.5))(workbox-window@7.3.0):
     dependencies:
       debug: 4.4.0
       pretty-bytes: 6.1.1
       tinyglobby: 0.2.12
-      vite: 6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
+      vite: 6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
       workbox-build: 7.3.0(@types/babel__core@7.20.5)
       workbox-window: 7.3.0
     transitivePeerDependencies:
       - supports-color
 
-  vite@6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1):
+  vite@6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1):
     dependencies:
       esbuild: 0.25.2
       postcss: 8.5.3
@@ -8006,9 +8006,9 @@ snapshots:
       terser: 5.39.0
       yaml: 2.7.1
 
-  vitefu@1.0.6(vite@6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)):
+  vitefu@1.0.6(vite@6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)):
     optionalDependencies:
-      vite: 6.2.5(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
+      vite: 6.2.6(jiti@2.4.2)(sass@1.86.3)(terser@5.39.0)(yaml@2.7.1)
 
   volar-service-css@0.0.62(@volar/language-service@2.4.12):
     dependencies: