Skip to content
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.

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

fix: "Stores" field to not show loading spinner (#4669) #4678

Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -75,27 +75,31 @@ class _SimpleInputTextFieldState extends State<SimpleInputTextField> {
Future<_SearchResults> _getSuggestions(String search) async {
final DateTime start = DateTime.now();

if (_suggestions[search] == null) {
if (_manager == null || search.length < widget.minLengthForSuggestions) {
_suggestions[search] = _SearchResults.empty();
} else {
try {
_suggestions[search] =
_SearchResults(await _manager!.getSuggestions(search));
} catch (_) {}
}
if (_suggestions[search] != null) {
return _suggestions[search]!;
} else if (_manager == null ||
search.length < widget.minLengthForSuggestions) {
_suggestions[search] = _SearchResults.empty();
return _suggestions[search]!;
}

if (_suggestions[search]?.isEmpty == true && search == _searchInput) {
_hideLoading();
_setLoading(true);

try {
_suggestions[search] =
_SearchResults(await _manager!.getSuggestions(search));
} catch (_) {}

if (_suggestions[search]?.isEmpty ?? true && search == _searchInput) {
_setLoading(false);
}

if (_searchInput != search &&
start.difference(DateTime.now()).inSeconds > 5) {
// Ignore this request, it's too long and this is not even the current search
return _SearchResults.empty();
} else {
return _suggestions[search]!;
return _suggestions[search] ?? _SearchResults.empty();
}
}

Expand Down Expand Up @@ -123,7 +127,6 @@ class _SimpleInputTextFieldState extends State<SimpleInputTextField> {
VoidCallback onFieldSubmitted) =>
TextField(
controller: widget.controller,
onChanged: (_) => setState(() => _loading = true),
decoration: InputDecoration(
filled: true,
border: const OutlineInputBorder(
Expand Down Expand Up @@ -170,7 +173,7 @@ class _SimpleInputTextFieldState extends State<SimpleInputTextField> {
}

if (input == _searchInput) {
_hideLoading();
_setLoading(false);
}

return AutocompleteOptions<String>(
Expand Down Expand Up @@ -199,10 +202,10 @@ class _SimpleInputTextFieldState extends State<SimpleInputTextField> {

String get _searchInput => widget.controller.text.trim();

void _hideLoading() {
if (_loading) {
void _setLoading(bool loading) {
if (_loading != loading) {
WidgetsBinding.instance.addPostFrameCallback(
(_) => setState(() => _loading = false),
(_) => setState(() => _loading = loading),
);
}
}
Expand Down