fix: action bar jumps to top when vocabulary list is empty

subconcept-labs · Jan 12, 2020 · 38fbc62 · 38fbc62
1 parent c129327
commit 38fbc62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/packages/ulangi-mobile/src/views/category/CategoryDetailScreen.tsx b/packages/ulangi-mobile/src/views/category/CategoryDetailScreen.tsx
@@ -63,7 +63,7 @@ export class CategoryDetailScreen extends React.Component<
     );
   }
 
-  private renderVocabularyList(): null | React.ReactElement<any> {
+  private renderVocabularyList(): React.ReactElement<any> {
     if (
       this.props.observableScreen.vocabularyListState.vocabularyList !== null &&
       this.props.observableScreen.vocabularyListState.noMore === true &&
@@ -75,9 +75,7 @@ export class CategoryDetailScreen extends React.Component<
           refresh={this.props.screenDelegate.refreshCurrentList}
         />
       );
-    } else if (
-      this.props.observableScreen.vocabularyListState.vocabularyList !== null
-    ) {
+    } else {
       return (
         <VocabularyList
           key={this.props.observableScreen.selectedFilterType.get()}
@@ -93,8 +91,6 @@ export class CategoryDetailScreen extends React.Component<
           refresh={this.props.screenDelegate.refreshCurrentList}
         />
       );
-    } else {
-      return null;
     }
   }
 

diff --git a/packages/ulangi-mobile/src/views/manage/ManageScreen.tsx b/packages/ulangi-mobile/src/views/manage/ManageScreen.tsx
@@ -60,7 +60,7 @@ export class ManageScreen extends React.Component<ManageScreenProps> {
     );
   }
 
-  private renderVocabularyList(): null | React.ReactElement<any> {
+  private renderVocabularyList(): React.ReactElement<any> {
     if (
       this.props.observableScreen.vocabularyListState.vocabularyList !== null &&
       this.props.observableScreen.vocabularyListState.noMore === true &&
@@ -73,9 +73,7 @@ export class ManageScreen extends React.Component<ManageScreenProps> {
           showQuickTutorial={this.props.screenDelegate.showQuickTutorial}
         />
       );
-    } else if (
-      this.props.observableScreen.vocabularyListState.vocabularyList !== null
-    ) {
+    } else {
       return (
         <VocabularyList
           key={this.props.observableScreen.selectedFilterType.get()}
@@ -91,12 +89,10 @@ export class ManageScreen extends React.Component<ManageScreenProps> {
           refresh={this.props.screenDelegate.refreshCurrentList}
         />
       );
-    } else {
-      return null;
     }
   }
 
-  private renderCategoryList(): null | React.ReactElement<any> {
+  private renderCategoryList(): React.ReactElement<any> {
     if (
       this.props.observableScreen.categoryListState.categoryList !== null &&
       this.props.observableScreen.categoryListState.noMore === true &&
@@ -109,9 +105,7 @@ export class ManageScreen extends React.Component<ManageScreenProps> {
           showQuickTutorial={this.props.screenDelegate.showQuickTutorial}
         />
       );
-    } else if (
-      this.props.observableScreen.categoryListState.categoryList !== null
-    ) {
+    } else {
       return (
         <CategoryList
           testID={ManageScreenIds.CATEGORY_LIST}
@@ -135,8 +129,6 @@ export class ManageScreen extends React.Component<ManageScreenProps> {
           }
         />
       );
-    } else {
-      return null;
     }
   }