Skip to content

Fix content management malfunxtionned countries & languages dropdown #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 1, 2025
Merged

Fix content management malfunxtionned countries & languages dropdown #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36ba973
feat(ui): refactor SearchableDropdownFormField to be BLoC-aware
fulleni Aug 1, 2025
0b3a1c9
feat(content): update create headline page to use reactive dropdown
fulleni Aug 1, 2025
7cefb3c
feat(content): update edit headline page to use reactive dropdown
fulleni Aug 1, 2025
d429c4a
feat(content): update create source page to use reactive dropdowns
fulleni Aug 1, 2025
332cce0
refactor: update edit source page to use reactive dropdowns
fulleni Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions lib/content_management/view/create_headline_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,15 @@ class _CreateHeadlineViewState extends State<_CreateHeadlineView> {
.add(CreateHeadlineTopicChanged(value)),
),
const SizedBox(height: AppSpacing.lg),
SearchableDropdownFormField<Country>(
SearchableDropdownFormField<Country, CreateHeadlineBloc,
CreateHeadlineState>(
labelText: l10n.countryName,
items: state.countries,
bloc: context.read<CreateHeadlineBloc>(),
initialValue: state.eventCountry,
hasMore: state.countriesHasMore,
isLoading: state.status == CreateHeadlineStatus.loading,
itemsExtractor: (state) => state.countries,
hasMoreExtractor: (state) => state.countriesHasMore,
isLoadingExtractor: (state) =>
state.status == CreateHeadlineStatus.loading,
onChanged: (value) => context
.read<CreateHeadlineBloc>()
.add(CreateHeadlineCountryChanged(value)),
Expand Down
22 changes: 14 additions & 8 deletions lib/content_management/view/create_source_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,15 @@ class _CreateSourceViewState extends State<_CreateSourceView> {
.add(CreateSourceUrlChanged(value)),
),
const SizedBox(height: AppSpacing.lg),
SearchableDropdownFormField<Language>(
SearchableDropdownFormField<Language, CreateSourceBloc,
CreateSourceState>(
labelText: l10n.language,
items: state.languages,
bloc: context.read<CreateSourceBloc>(),
initialValue: state.language,
hasMore: state.languagesHasMore,
isLoading: state.status == CreateSourceStatus.loading,
itemsExtractor: (state) => state.languages,
hasMoreExtractor: (state) => state.languagesHasMore,
isLoadingExtractor: (state) =>
state.status == CreateSourceStatus.loading,
onChanged: (value) => context
.read<CreateSourceBloc>()
.add(CreateSourceLanguageChanged(value)),
Expand Down Expand Up @@ -206,12 +209,15 @@ class _CreateSourceViewState extends State<_CreateSourceView> {
.add(CreateSourceTypeChanged(value)),
),
const SizedBox(height: AppSpacing.lg),
SearchableDropdownFormField<Country>(
SearchableDropdownFormField<Country, CreateSourceBloc,
CreateSourceState>(
labelText: l10n.headquarters,
items: state.countries,
bloc: context.read<CreateSourceBloc>(),
initialValue: state.headquarters,
hasMore: state.countriesHasMore,
isLoading: state.status == CreateSourceStatus.loading,
itemsExtractor: (state) => state.countries,
hasMoreExtractor: (state) => state.countriesHasMore,
isLoadingExtractor: (state) =>
state.status == CreateSourceStatus.loading,
onChanged: (value) => context
.read<CreateSourceBloc>()
.add(CreateSourceHeadquartersChanged(value)),
Expand Down
11 changes: 7 additions & 4 deletions lib/content_management/view/edit_headline_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,15 @@ class _EditHeadlineViewState extends State<_EditHeadlineView> {
.add(EditHeadlineTopicChanged(value)),
),
const SizedBox(height: AppSpacing.lg),
SearchableDropdownFormField<Country>(
SearchableDropdownFormField<Country, EditHeadlineBloc,
EditHeadlineState>(
labelText: l10n.countryName,
items: state.countries,
bloc: context.read<EditHeadlineBloc>(),
initialValue: selectedCountry,
hasMore: state.countriesHasMore,
isLoading: state.status == EditHeadlineStatus.loading,
itemsExtractor: (state) => state.countries,
hasMoreExtractor: (state) => state.countriesHasMore,
isLoadingExtractor: (state) =>
state.status == EditHeadlineStatus.loading,
onChanged: (value) => context
.read<EditHeadlineBloc>()
.add(EditHeadlineCountryChanged(value)),
Expand Down
22 changes: 14 additions & 8 deletions lib/content_management/view/edit_source_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,15 @@ class _EditSourceViewState extends State<_EditSourceView> {
),
),
const SizedBox(height: AppSpacing.lg),
SearchableDropdownFormField<Language>(
SearchableDropdownFormField<Language, EditSourceBloc,
EditSourceState>(
labelText: l10n.language,
items: state.languages,
bloc: context.read<EditSourceBloc>(),
initialValue: state.language,
hasMore: state.languagesHasMore,
isLoading: state.status == EditSourceStatus.loading,
itemsExtractor: (state) => state.languages,
hasMoreExtractor: (state) => state.languagesHasMore,
isLoadingExtractor: (state) =>
state.status == EditSourceStatus.loading,
onChanged: (value) => context
.read<EditSourceBloc>()
.add(EditSourceLanguageChanged(value)),
Expand Down Expand Up @@ -236,12 +239,15 @@ class _EditSourceViewState extends State<_EditSourceView> {
),
),
const SizedBox(height: AppSpacing.lg),
SearchableDropdownFormField<Country>(
SearchableDropdownFormField<Country, EditSourceBloc,
EditSourceState>(
labelText: l10n.headquarters,
items: state.countries,
bloc: context.read<EditSourceBloc>(),
initialValue: state.headquarters,
hasMore: state.countriesHasMore,
isLoading: state.status == EditSourceStatus.loading,
itemsExtractor: (state) => state.countries,
hasMoreExtractor: (state) => state.countriesHasMore,
isLoadingExtractor: (state) =>
state.status == EditSourceStatus.loading,
onChanged: (value) => context
.read<EditSourceBloc>()
.add(EditSourceHeadquartersChanged(value)),
Expand Down
83 changes: 52 additions & 31 deletions lib/shared/widgets/searchable_dropdown_form_field.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:ui_kit/ui_kit.dart';

/// A generic type for the builder function that creates list items in the
Expand All @@ -21,17 +22,19 @@ typedef SearchableDropdownSelectedItemBuilder<T> = Widget Function(
/// This widget is generic and can be used for any type [T]. It requires
/// builders for constructing the list items and the selected item display,
/// as well as callbacks to handle searching and pagination.
class SearchableDropdownFormField<T> extends FormField<T> {
class SearchableDropdownFormField<T, B extends BlocBase<S>, S>
extends FormField<T> {
/// {@macro searchable_dropdown_form_field}
SearchableDropdownFormField({
required List<T> items,
required B bloc,
required List<T> Function(S state) itemsExtractor,
required bool Function(S state) hasMoreExtractor,
required bool Function(S state) isLoadingExtractor,
required ValueChanged<T?> onChanged,
required ValueChanged<String> onSearchChanged,
required VoidCallback onLoadMore,
required SearchableDropdownItemBuilder<T> itemBuilder,
required SearchableDropdownSelectedItemBuilder<T> selectedItemBuilder,
required bool hasMore,
bool? isLoading,
super.key,
T? initialValue,
String? labelText,
Expand All @@ -49,13 +52,14 @@ class SearchableDropdownFormField<T> extends FormField<T> {
onTap: () async {
final selectedItem = await showDialog<T>(
context: state.context,
builder: (context) => _SearchableSelectionDialog<T>(
items: items,
builder: (context) => _SearchableSelectionDialog<T, B, S>(
bloc: bloc,
itemsExtractor: itemsExtractor,
hasMoreExtractor: hasMoreExtractor,
isLoadingExtractor: isLoadingExtractor,
onSearchChanged: onSearchChanged,
onLoadMore: onLoadMore,
itemBuilder: itemBuilder,
hasMore: hasMore,
isLoading: isLoading ?? false,
searchHintText: searchHintText,
noItemsFoundText: noItemsFoundText,
),
Expand Down Expand Up @@ -83,35 +87,38 @@ class SearchableDropdownFormField<T> extends FormField<T> {
}

/// The modal dialog that contains the searchable and paginated list.
class _SearchableSelectionDialog<T> extends StatefulWidget {
class _SearchableSelectionDialog<T, B extends BlocBase<S>, S>
extends StatefulWidget {
const _SearchableSelectionDialog({
required this.items,
required this.bloc,
required this.itemsExtractor,
required this.hasMoreExtractor,
required this.isLoadingExtractor,
required this.onSearchChanged,
required this.onLoadMore,
required this.itemBuilder,
required this.hasMore,
required this.isLoading,
this.searchHintText,
this.noItemsFoundText,
super.key,
});

final List<T> items;
final B bloc;
final List<T> Function(S state) itemsExtractor;
final bool Function(S state) hasMoreExtractor;
final bool Function(S state) isLoadingExtractor;
final ValueChanged<String> onSearchChanged;
final VoidCallback onLoadMore;
final SearchableDropdownItemBuilder<T> itemBuilder;
final bool hasMore;
final bool isLoading;
final String? searchHintText;
final String? noItemsFoundText;

@override
State<_SearchableSelectionDialog<T>> createState() =>
_SearchableSelectionDialogState<T>();
State<_SearchableSelectionDialog<T, B, S>> createState() =>
_SearchableSelectionDialogState<T, B, S>();
}

class _SearchableSelectionDialogState<T>
extends State<_SearchableSelectionDialog<T>> {
class _SearchableSelectionDialogState<T, B extends BlocBase<S>, S>
extends State<_SearchableSelectionDialog<T, B, S>> {
final _scrollController = ScrollController();
final _searchController = TextEditingController();

Expand Down Expand Up @@ -168,7 +175,16 @@ class _SearchableSelectionDialogState<T>
),
const SizedBox(height: AppSpacing.md),
Expanded(
child: _buildList(),
child: BlocBuilder<B, S>(
bloc: widget.bloc,
builder: (context, state) {
final items = widget.itemsExtractor(state);
final hasMore = widget.hasMoreExtractor(state);
final isLoading = widget.isLoadingExtractor(state);

return _buildList(items, hasMore, isLoading);
},
),
),
],
),
Expand All @@ -177,29 +193,34 @@ class _SearchableSelectionDialogState<T>
);
}

Widget _buildList() {
if (widget.isLoading && widget.items.isEmpty) {
Widget _buildList(List<T> items, bool hasMore, bool isLoading) {
if (isLoading && items.isEmpty) {
return const Center(child: CircularProgressIndicator());
}

if (widget.items.isEmpty) {
if (items.isEmpty) {
return Center(
child: Text(widget.noItemsFoundText ?? 'No items found.'),
);
}

return ListView.builder(
controller: _scrollController,
itemCount:
widget.hasMore ? widget.items.length + 1 : widget.items.length,
itemCount: items.length + (hasMore ? 1 : 0),
itemBuilder: (context, index) {
if (index >= widget.items.length) {
return const Padding(
padding: EdgeInsets.symmetric(vertical: AppSpacing.md),
child: Center(child: CircularProgressIndicator()),
);
if (index >= items.length) {
// This is the last item, which is the loading indicator.
// It's only shown if we have more items and are currently loading.
return isLoading
? const Padding(
padding: EdgeInsets.symmetric(vertical: AppSpacing.md),
child: Center(child: CircularProgressIndicator()),
)
: const SizedBox.shrink();
}
final item = widget.items[index];

// This is a regular item.
final item = items[index];
return InkWell(
onTap: () => Navigator.of(context).pop(item),
child: widget.itemBuilder(context, item),
Expand Down
Loading