fix: move @ts-expect-error to body to avoid issue in type definitions

react-navigation · Oct 12, 2021 · 0a08688 · 0a08688
1 parent 0b40dd7
commit 0a08688
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 19 deletions.
diff --git a/packages/bottom-tabs/src/navigators/createBottomTabNavigator.tsx b/packages/bottom-tabs/src/navigators/createBottomTabNavigator.tsx
@@ -36,13 +36,14 @@ function BottomTabNavigator({
   sceneContainerStyle,
   ...restWithDeprecated
 }: Props) {
-  let {
+  const {
     // @ts-expect-error: lazy is deprecated
     lazy,
     // @ts-expect-error: tabBarOptions is deprecated
     tabBarOptions,
     ...rest
   } = restWithDeprecated;
+
   let defaultScreenOptions: BottomTabNavigationOptions = {};
 
   if (tabBarOptions) {

diff --git a/packages/drawer/src/navigators/createDrawerNavigator.tsx b/packages/drawer/src/navigators/createDrawerNavigator.tsx
@@ -35,14 +35,18 @@ function DrawerNavigator({
   children,
   screenListeners,
   screenOptions,
-  // @ts-expect-error: openByDefault is deprecated
-  openByDefault,
-  // @ts-expect-error: lazy is deprecated
-  lazy,
-  // @ts-expect-error: drawerContentOptions is deprecated
-  drawerContentOptions,
-  ...rest
+  ...restWithDeprecated
 }: Props) {
+  const {
+    // @ts-expect-error: openByDefault is deprecated
+    openByDefault,
+    // @ts-expect-error: lazy is deprecated
+    lazy,
+    // @ts-expect-error: drawerContentOptions is deprecated
+    drawerContentOptions,
+    ...rest
+  } = restWithDeprecated;
+
   let defaultScreenOptions: DrawerNavigationOptions = {};
 
   if (drawerContentOptions) {

diff --git a/packages/material-top-tabs/src/navigators/createMaterialTopTabNavigator.tsx b/packages/material-top-tabs/src/navigators/createMaterialTopTabNavigator.tsx
@@ -33,18 +33,22 @@ function MaterialTopTabNavigator({
   children,
   screenListeners,
   screenOptions,
-  // @ts-expect-error: swipeEnabled is deprecated
-  swipeEnabled,
-  // @ts-expect-error: lazy is deprecated
-  lazy,
-  // @ts-expect-error: lazyPlaceholder is deprecated
-  lazyPlaceholder,
-  // @ts-expect-error: lazyPreloadDistance is deprecated
-  lazyPreloadDistance,
-  // @ts-expect-error: tabBarOptions is deprecated
-  tabBarOptions,
-  ...rest
+  ...restWithDeprecated
 }: Props) {
+  const {
+    // @ts-expect-error: swipeEnabled is deprecated
+    swipeEnabled,
+    // @ts-expect-error: lazy is deprecated
+    lazy,
+    // @ts-expect-error: lazyPlaceholder is deprecated
+    lazyPlaceholder,
+    // @ts-expect-error: lazyPreloadDistance is deprecated
+    lazyPreloadDistance,
+    // @ts-expect-error: tabBarOptions is deprecated
+    tabBarOptions,
+    ...rest
+  } = restWithDeprecated;
+
   let defaultScreenOptions: MaterialTopTabNavigationOptions = {};
 
   if (tabBarOptions) {