feat: add preventDefault functionality in material bottom tabs

kidroca · Jan 22, 2020 · 3dede31 · 3dede31
1 parent 63988e0
commit 3dede31
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/example/package.json b/example/package.json
@@ -21,7 +21,7 @@
     "react-dom": "~16.9.0",
     "react-native": "~0.61.5",
     "react-native-gesture-handler": "~1.5.3",
-    "react-native-paper": "^3.4.0",
+    "react-native-paper": "^3.5.0",
     "react-native-reanimated": "^1.4.0",
     "react-native-safe-area-context": "^0.6.2",
     "react-native-screens": "^2.0.0-alpha.25",

diff --git a/packages/material-bottom-tabs/package.json b/packages/material-bottom-tabs/package.json
@@ -41,15 +41,15 @@
     "del-cli": "^3.0.0",
     "react": "~16.9.0",
     "react-native": "~0.61.5",
-    "react-native-paper": "^3.4.0",
+    "react-native-paper": "^3.5.0",
     "react-native-vector-icons": "^6.6.0",
     "typescript": "^3.7.4"
   },
   "peerDependencies": {
     "@react-navigation/native": "^5.0.0-alpha.0",
     "react": "*",
     "react-native": "*",
-    "react-native-paper": "^3.0.0",
+    "react-native-paper": "^3.5.0",
     "react-native-vector-icons": "^6.0.0"
   },
   "@react-native-community/bob": {

diff --git a/packages/material-bottom-tabs/src/types.tsx b/packages/material-bottom-tabs/src/types.tsx
@@ -11,7 +11,7 @@ export type MaterialBottomTabNavigationEventMap = {
   /**
    * Event which fires on tapping on the tab in the tab bar.
    */
-  tabPress: { data: undefined };
+  tabPress: { data: undefined; canPreventDefault: true };
 };
 
 export type MaterialBottomTabNavigationHelpers = NavigationHelpers<

diff --git a/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx b/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx
@@ -89,11 +89,16 @@ export default function MaterialBottomTabView({
         descriptors[route.key].options.tabBarAccessibilityLabel
       }
       getTestID={({ route }) => descriptors[route.key].options.tabBarTestID}
-      onTabPress={({ route }) => {
-        navigation.emit({
+      onTabPress={({ route, preventDefault }) => {
+        const event = navigation.emit({
           type: 'tabPress',
           target: route.key,
+          canPreventDefault: true,
         });
+
+        if (event.defaultPrevented) {
+          preventDefault();
+        }
       }}
     />
   );

diff --git a/yarn.lock b/yarn.lock
@@ -13555,10 +13555,10 @@ react-native-iphone-x-helper@^1.2.1:
   resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.1.tgz#645e2ffbbb49e80844bb4cbbe34a126fda1e6772"
   integrity sha512-/VbpIEp8tSNNHIvstuA3Swx610whci1Zpc9mqNkqn14DkMbw+ORviln2u0XyHG1kPvvwTNGZY6QpeFwxYaSdbQ==
 
-react-native-paper@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-3.4.0.tgz#b8d3643b33177ff41a2505aaa801d313defaf707"
-  integrity sha512-QVd6vZ4iJbUqp1OI1DY/0HwBS4y0SVixa2IeBIVyYM4ZZeoeOOlWCXdgtQk7tlf1ju5t1MJunyRGPOXOXTLGNg==
+react-native-paper@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/react-native-paper/-/react-native-paper-3.5.0.tgz#d74db26fa1714911ec1c9187c430726c680f4b52"
+  integrity sha512-W347plzhV/EsVzC8aT8se6s/jmIx1kSF7E4fpbptA950OHxb4gPFFruHZkffHTByLUiZEgKl3nXKqXkRDDp1UA==
   dependencies:
     "@callstack/react-theme-provider" "^3.0.5"
     color "^3.1.2"