From a518402ef57486fd9e61f1b0f85f4c1e1f85f639 Mon Sep 17 00:00:00 2001 From: alduzy Date: Wed, 16 Oct 2024 11:29:19 +0200 Subject: [PATCH] chore: changed imports to relative --- src/components/Screen.tsx | 2 +- src/components/Screen.web.tsx | 2 +- src/components/ScreenContainer.tsx | 2 +- src/components/ScreenStack.tsx | 3 ++- src/components/ScreenStackHeaderConfig.tsx | 2 +- src/components/ScreenStackHeaderConfig.web.tsx | 2 +- src/components/SearchBar.tsx | 7 ++----- src/gesture-handler/GestureDetectorProvider.tsx | 2 +- src/native-stack/types.tsx | 2 +- src/native-stack/utils/getDefaultHeaderHeight.tsx | 2 +- src/native-stack/views/FooterComponent.tsx | 2 +- src/native-stack/views/HeaderConfig.tsx | 12 +++++++----- src/native-stack/views/NativeStackView.tsx | 13 +++++-------- src/reanimated/ReanimatedNativeStackScreen.tsx | 4 ++-- src/reanimated/ReanimatedScreen.tsx | 3 ++- src/reanimated/ReanimatedScreenProvider.tsx | 3 ++- 16 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/components/Screen.tsx b/src/components/Screen.tsx index ed369dd898..2d451acbeb 100644 --- a/src/components/Screen.tsx +++ b/src/components/Screen.tsx @@ -5,7 +5,7 @@ import { Animated, View, Platform } from 'react-native'; import TransitionProgressContext from '../TransitionProgressContext'; import DelayedFreeze from './helpers/DelayedFreeze'; -import { ScreenProps } from 'react-native-screens'; +import { ScreenProps } from '../types'; import { freezeEnabled, diff --git a/src/components/Screen.web.tsx b/src/components/Screen.web.tsx index 183b6f8512..6b7b5207ab 100644 --- a/src/components/Screen.web.tsx +++ b/src/components/Screen.web.tsx @@ -1,6 +1,6 @@ 'use client'; -import { ScreenProps } from 'react-native-screens'; +import { ScreenProps } from '../types'; import { Animated, View } from 'react-native'; import React from 'react'; diff --git a/src/components/ScreenContainer.tsx b/src/components/ScreenContainer.tsx index 65c907a1f6..c61b24eadf 100644 --- a/src/components/ScreenContainer.tsx +++ b/src/components/ScreenContainer.tsx @@ -2,7 +2,7 @@ import { Platform, View } from 'react-native'; import React from 'react'; -import { ScreenContainerProps } from 'react-native-screens'; +import { ScreenContainerProps } from '../types'; import { isNativePlatformSupported, screensEnabled } from '../core'; // Native components diff --git a/src/components/ScreenStack.tsx b/src/components/ScreenStack.tsx index 310b6a6938..6707146219 100644 --- a/src/components/ScreenStack.tsx +++ b/src/components/ScreenStack.tsx @@ -1,7 +1,8 @@ 'use client'; import React from 'react'; -import { ScreenStackProps, freezeEnabled } from 'react-native-screens'; +import { ScreenStackProps } from '../types'; +import { freezeEnabled } from '../core'; import DelayedFreeze from './helpers/DelayedFreeze'; // Native components diff --git a/src/components/ScreenStackHeaderConfig.tsx b/src/components/ScreenStackHeaderConfig.tsx index f9f4440049..7631446bd5 100644 --- a/src/components/ScreenStackHeaderConfig.tsx +++ b/src/components/ScreenStackHeaderConfig.tsx @@ -5,7 +5,7 @@ import { HeaderSubviewTypes, ScreenStackHeaderConfigProps, SearchBarProps, -} from 'react-native-screens'; +} from '../types'; import { Image, ImageProps, StyleSheet, ViewProps } from 'react-native'; // Native components diff --git a/src/components/ScreenStackHeaderConfig.web.tsx b/src/components/ScreenStackHeaderConfig.web.tsx index 5d672f5933..360f33099a 100644 --- a/src/components/ScreenStackHeaderConfig.web.tsx +++ b/src/components/ScreenStackHeaderConfig.web.tsx @@ -4,7 +4,7 @@ import { HeaderSubviewTypes, ScreenStackHeaderConfigProps, SearchBarProps, -} from 'react-native-screens'; +} from '../types'; export const ScreenStackHeaderBackButtonImage = ( props: ImageProps, diff --git a/src/components/SearchBar.tsx b/src/components/SearchBar.tsx index 0874531679..a26c51c2e4 100644 --- a/src/components/SearchBar.tsx +++ b/src/components/SearchBar.tsx @@ -1,11 +1,8 @@ 'use client'; import React from 'react'; -import { - isSearchBarAvailableForCurrentPlatform, - SearchBarCommands, - SearchBarProps, -} from 'react-native-screens'; +import { SearchBarCommands, SearchBarProps } from '../types'; +import { isSearchBarAvailableForCurrentPlatform } from '../utils'; import { View } from 'react-native'; // Native components diff --git a/src/gesture-handler/GestureDetectorProvider.tsx b/src/gesture-handler/GestureDetectorProvider.tsx index d506881860..eb19172a92 100644 --- a/src/gesture-handler/GestureDetectorProvider.tsx +++ b/src/gesture-handler/GestureDetectorProvider.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { GHContext } from 'react-native-screens'; +import { GHContext } from '../native-stack/contexts/GHContext'; import ScreenGestureDetector from './ScreenGestureDetector'; import type { GestureProviderProps } from '../native-stack/types'; diff --git a/src/native-stack/types.tsx b/src/native-stack/types.tsx index b9b57a403c..72187e3f88 100644 --- a/src/native-stack/types.tsx +++ b/src/native-stack/types.tsx @@ -22,7 +22,7 @@ import { ScreenProps, ScreenStackHeaderConfigProps, SearchBarProps, -} from 'react-native-screens'; +} from '../types'; export type NativeStackNavigationEventMap = { /** diff --git a/src/native-stack/utils/getDefaultHeaderHeight.tsx b/src/native-stack/utils/getDefaultHeaderHeight.tsx index 257858809c..c524dbe2eb 100644 --- a/src/native-stack/utils/getDefaultHeaderHeight.tsx +++ b/src/native-stack/utils/getDefaultHeaderHeight.tsx @@ -1,5 +1,5 @@ import { Platform } from 'react-native'; -import { StackPresentationTypes } from 'react-native-screens'; +import { StackPresentationTypes } from '../../types'; type Layout = { width: number; height: number }; const formSheetModalHeight = 56; diff --git a/src/native-stack/views/FooterComponent.tsx b/src/native-stack/views/FooterComponent.tsx index e495c022fe..33d380cd0f 100644 --- a/src/native-stack/views/FooterComponent.tsx +++ b/src/native-stack/views/FooterComponent.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ScreenFooter } from 'react-native-screens'; +import ScreenFooter from '../../components/ScreenFooter'; type FooterProps = { children?: React.ReactNode; diff --git a/src/native-stack/views/HeaderConfig.tsx b/src/native-stack/views/HeaderConfig.tsx index 6a7bd5cf82..5bda6e2d18 100644 --- a/src/native-stack/views/HeaderConfig.tsx +++ b/src/native-stack/views/HeaderConfig.tsx @@ -1,6 +1,11 @@ import { Route, useTheme } from '@react-navigation/native'; import * as React from 'react'; import { Platform } from 'react-native'; +import { SearchBarProps } from '../../types'; +import { + isSearchBarAvailableForCurrentPlatform, + executeNativeBackPress, +} from '../../utils'; import { ScreenStackHeaderBackButtonImage, ScreenStackHeaderCenterView, @@ -8,11 +13,8 @@ import { ScreenStackHeaderLeftView, ScreenStackHeaderRightView, ScreenStackHeaderSearchBarView, - SearchBar, - SearchBarProps, - isSearchBarAvailableForCurrentPlatform, - executeNativeBackPress, -} from 'react-native-screens'; +} from '../../components/ScreenStackHeaderConfig'; +import SearchBar from '../../components/SearchBar'; import { NativeStackNavigationOptions } from '../types'; import { useBackPressSubscription } from '../utils/useBackPressSubscription'; import { processFonts } from './FontProcessor'; diff --git a/src/native-stack/views/NativeStackView.tsx b/src/native-stack/views/NativeStackView.tsx index 5a50bc8949..50a22b5605 100644 --- a/src/native-stack/views/NativeStackView.tsx +++ b/src/native-stack/views/NativeStackView.tsx @@ -5,14 +5,11 @@ import { Animated, Platform, StyleSheet, ViewProps } from 'react-native'; // eslint-disable-next-line import/no-named-as-default, import/default, import/no-named-as-default-member, import/namespace import AppContainer from 'react-native/Libraries/ReactNative/AppContainer'; import warnOnce from 'warn-once'; -import { - ScreenStack, - StackPresentationTypes, - ScreenContext, - GHContext, - GestureDetectorBridge, - ScreenContentWrapper, -} from 'react-native-screens'; +import { StackPresentationTypes, GestureDetectorBridge } from '../../types'; +import ScreenStack from '../../components/ScreenStack'; +import ScreenContentWrapper from '../../components/ScreenContentWrapper'; +import { GHContext } from '../contexts/GHContext'; +import { ScreenContext } from '../../components/Screen'; import { ParamListBase, StackActions, diff --git a/src/reanimated/ReanimatedNativeStackScreen.tsx b/src/reanimated/ReanimatedNativeStackScreen.tsx index 98af80168a..7583867a56 100644 --- a/src/reanimated/ReanimatedNativeStackScreen.tsx +++ b/src/reanimated/ReanimatedNativeStackScreen.tsx @@ -1,11 +1,11 @@ import React from 'react'; import { Platform } from 'react-native'; +import { InnerScreen } from '../components/Screen'; import { HeaderHeightChangeEventType, - InnerScreen, ScreenProps, TransitionProgressEventType, -} from 'react-native-screens'; +} from '../types'; // @ts-ignore file to be used only if `react-native-reanimated` available in the project import Animated, { useEvent, useSharedValue } from 'react-native-reanimated'; diff --git a/src/reanimated/ReanimatedScreen.tsx b/src/reanimated/ReanimatedScreen.tsx index fef3c58a07..52d199b1a2 100644 --- a/src/reanimated/ReanimatedScreen.tsx +++ b/src/reanimated/ReanimatedScreen.tsx @@ -1,5 +1,6 @@ import React from 'react'; -import { InnerScreen, ScreenProps } from 'react-native-screens'; +import { InnerScreen } from '../components/Screen'; +import { ScreenProps } from '../types'; // @ts-ignore file to be used only if `react-native-reanimated` available in the project import Animated from 'react-native-reanimated'; diff --git a/src/reanimated/ReanimatedScreenProvider.tsx b/src/reanimated/ReanimatedScreenProvider.tsx index a74b7d560f..2df4ff49fe 100644 --- a/src/reanimated/ReanimatedScreenProvider.tsx +++ b/src/reanimated/ReanimatedScreenProvider.tsx @@ -1,6 +1,7 @@ import React, { PropsWithChildren } from 'react'; import { View } from 'react-native'; -import { ScreenProps, ScreenContext } from 'react-native-screens'; +import { ScreenContext } from '../components/Screen'; +import { ScreenProps } from '../types'; import ReanimatedNativeStackScreen from './ReanimatedNativeStackScreen'; import AnimatedScreen from './ReanimatedScreen';