Fix filter selection in reducers

This commit is contained in:
Hillel Coren 2020-05-20 09:15:29 +03:00
parent 063ae8427f
commit ae8cf5806c
2 changed files with 4 additions and 3 deletions

View File

@ -158,12 +158,12 @@ abstract class AppState implements Built<AppState, AppStateBuilder> {
bool shouldSelectEntity({EntityType entityType, List<String> entityList}) { bool shouldSelectEntity({EntityType entityType, List<String> entityList}) {
final entityUIState = getUIState(entityType); final entityUIState = getUIState(entityType);
if (prefState.isMobile || entityList.isEmpty || uiState.isEditing) { if (prefState.isMobile || uiState.isEditing) {
return false; return false;
} }
if ((entityUIState.selectedId ?? '').isNotEmpty && entityList.isEmpty) { if (entityList.isEmpty) {
return true; return (entityUIState.selectedId ?? '').isNotEmpty;
} else if ((entityUIState.selectedId ?? '').isEmpty || } else if ((entityUIState.selectedId ?? '').isEmpty ||
!entityList.contains(entityUIState.selectedId)) { !entityList.contains(entityUIState.selectedId)) {
return true; return true;

View File

@ -106,6 +106,7 @@ class _EntityListState extends State<EntityList> {
if (state.shouldSelectEntity( if (state.shouldSelectEntity(
entityType: entityType, entityList: entityList)) { entityType: entityType, entityList: entityList)) {
WidgetsBinding.instance.addPostFrameCallback((duration) { WidgetsBinding.instance.addPostFrameCallback((duration) {
print('## viewEntityById: $entityType, ${entityList.isEmpty ? null : entityList.first}');
viewEntityById( viewEntityById(
context: context, context: context,
entityType: entityType, entityType: entityType,