diff --git a/packages/bottom-tabs/src/index.tsx b/packages/bottom-tabs/src/index.tsx index 26957cd2..58a8b47f 100644 --- a/packages/bottom-tabs/src/index.tsx +++ b/packages/bottom-tabs/src/index.tsx @@ -6,6 +6,7 @@ export { default as createBottomTabNavigator } from './navigators/createBottomTa /** * Views */ +export { default as BottomTabView } from './views/BottomTabView'; export { default as BottomTabBar } from './views/BottomTabBar'; /** diff --git a/packages/drawer/src/index.tsx b/packages/drawer/src/index.tsx index 17db04e3..e8be5a7e 100644 --- a/packages/drawer/src/index.tsx +++ b/packages/drawer/src/index.tsx @@ -6,10 +6,10 @@ export { default as createDrawerNavigator } from './navigators/createDrawerNavig /** * Views */ +export { default as DrawerView } from './views/DrawerView'; export { default as DrawerItem } from './views/DrawerItem'; export { default as DrawerItemList } from './views/DrawerItemList'; export { default as DrawerContent } from './views/DrawerContent'; -export { default as DrawerView } from './views/DrawerView'; /** * Utilities diff --git a/packages/drawer/src/navigators/createDrawerNavigator.tsx b/packages/drawer/src/navigators/createDrawerNavigator.tsx index 1f60d7a8..7ff9bba7 100644 --- a/packages/drawer/src/navigators/createDrawerNavigator.tsx +++ b/packages/drawer/src/navigators/createDrawerNavigator.tsx @@ -40,10 +40,10 @@ function DrawerNavigator({ return ( ); } diff --git a/packages/material-bottom-tabs/src/index.tsx b/packages/material-bottom-tabs/src/index.tsx index 50dcf059..80240d8d 100644 --- a/packages/material-bottom-tabs/src/index.tsx +++ b/packages/material-bottom-tabs/src/index.tsx @@ -3,6 +3,11 @@ */ export { default as createMaterialBottomTabNavigator } from './navigators/createMaterialBottomTabNavigator'; +/** + * Views + */ +export { default as MaterialBottomTabView } from './views/MaterialBottomTabView'; + /** * Types */ diff --git a/packages/material-top-tabs/src/index.tsx b/packages/material-top-tabs/src/index.tsx index 3df97026..8e91ba70 100644 --- a/packages/material-top-tabs/src/index.tsx +++ b/packages/material-top-tabs/src/index.tsx @@ -6,6 +6,7 @@ export { default as createMaterialTopTabNavigator } from './navigators/createMat /** * Views */ +export { default as MaterialTopTabView } from './views/MaterialTopTabView'; export { default as MaterialTopTabBar } from './views/MaterialTopTabBar'; /** diff --git a/packages/native-stack/src/index.tsx b/packages/native-stack/src/index.tsx index d148a06e..eff584ff 100644 --- a/packages/native-stack/src/index.tsx +++ b/packages/native-stack/src/index.tsx @@ -3,6 +3,11 @@ */ export { default as createNativeStackNavigator } from './navigators/createNativeStackNavigator'; +/** + * Views + */ +export { default as NativeStackView } from './views/NativeStackView'; + /** * Types */ diff --git a/packages/native-stack/src/navigators/createNativeStackNavigator.tsx b/packages/native-stack/src/navigators/createNativeStackNavigator.tsx index 25ea993d..0161a570 100644 --- a/packages/native-stack/src/navigators/createNativeStackNavigator.tsx +++ b/packages/native-stack/src/navigators/createNativeStackNavigator.tsx @@ -16,7 +16,7 @@ import { screensEnabled, // eslint-disable-next-line import/no-unresolved } from 'react-native-screens'; -import StackView from '../views/StackView'; +import NativeStackView from '../views/NativeStackView'; import { NativeStackNavigatorProps, NativeStackNavigationOptions, @@ -64,11 +64,11 @@ function NativeStackNavigator(props: NativeStackNavigatorProps) { ); return ( - ); } diff --git a/packages/native-stack/src/views/StackView.tsx b/packages/native-stack/src/views/NativeStackView.tsx similarity index 95% rename from packages/native-stack/src/views/StackView.tsx rename to packages/native-stack/src/views/NativeStackView.tsx index e027de9d..8cf2c759 100644 --- a/packages/native-stack/src/views/StackView.tsx +++ b/packages/native-stack/src/views/NativeStackView.tsx @@ -29,7 +29,11 @@ type Props = { descriptors: NativeStackDescriptorMap; }; -export default function StackView({ state, navigation, descriptors }: Props) { +export default function NativeStackView({ + state, + navigation, + descriptors, +}: Props) { return ( {state.routes.map(route => { diff --git a/packages/stack/src/index.tsx b/packages/stack/src/index.tsx index a01078b9..e517bb82 100644 --- a/packages/stack/src/index.tsx +++ b/packages/stack/src/index.tsx @@ -16,6 +16,7 @@ export const Assets = [ /** * Views */ +export { default as StackView } from './views/Stack/StackView'; export { default as Header } from './views/Header/Header'; export { default as HeaderTitle } from './views/Header/HeaderTitle'; export { default as HeaderBackButton } from './views/Header/HeaderBackButton'; diff --git a/packages/stack/src/navigators/createStackNavigator.tsx b/packages/stack/src/navigators/createStackNavigator.tsx index 353a1a44..8e06df1f 100644 --- a/packages/stack/src/navigators/createStackNavigator.tsx +++ b/packages/stack/src/navigators/createStackNavigator.tsx @@ -11,7 +11,6 @@ import { StackNavigationState, StackActions, } from '@react-navigation/routers'; -import KeyboardManager from '../views/KeyboardManager'; import StackView from '../views/Stack/StackView'; import { StackNavigationConfig, @@ -24,7 +23,6 @@ type Props = DefaultNavigatorOptions & StackNavigationConfig; function StackNavigator({ - keyboardHandlingEnabled, initialRouteName, children, screenOptions, @@ -64,17 +62,12 @@ function StackNavigator({ ); return ( - - {props => ( - - )} - + ); } diff --git a/packages/stack/src/views/Stack/StackItem.tsx b/packages/stack/src/views/Stack/CardContainer.tsx similarity index 98% rename from packages/stack/src/views/Stack/StackItem.tsx rename to packages/stack/src/views/Stack/CardContainer.tsx index 31dd36ce..e572d5ce 100644 --- a/packages/stack/src/views/Stack/StackItem.tsx +++ b/packages/stack/src/views/Stack/CardContainer.tsx @@ -60,7 +60,7 @@ type Props = TransitionPreset & { floatingHeaderHeight: number; }; -export default class StackItem extends React.PureComponent { +export default class CardContainer extends React.PureComponent { private handleOpen = () => { const { scene, onTransitionEnd, onOpenRoute } = this.props; diff --git a/packages/stack/src/views/Stack/Stack.tsx b/packages/stack/src/views/Stack/CardStack.tsx similarity index 99% rename from packages/stack/src/views/Stack/Stack.tsx rename to packages/stack/src/views/Stack/CardStack.tsx index 4ee9caf9..f5a4ea19 100755 --- a/packages/stack/src/views/Stack/Stack.tsx +++ b/packages/stack/src/views/Stack/CardStack.tsx @@ -16,7 +16,7 @@ import { StackNavigationState } from '@react-navigation/routers'; import { getDefaultHeaderHeight } from '../Header/HeaderSegment'; import { Props as HeaderContainerProps } from '../Header/HeaderContainer'; -import StackItem from './StackItem'; +import CardContainer from './CardContainer'; import { DefaultTransition, ModalTransition, @@ -139,7 +139,7 @@ const getFloatingHeaderHeights = ( }, {}); }; -export default class Stack extends React.Component { +export default class CardStack extends React.Component { static getDerivedStateFromProps(props: Props, state: State) { if ( props.routes === state.routes && @@ -431,7 +431,7 @@ export default class Stack extends React.Component { active={isScreenActive} pointerEvents="box-none" > - void; - onPageChangeConfirm?: () => void; - onPageChangeCancel?: () => void; }; type State = { @@ -307,9 +305,7 @@ class StackView extends React.Component { const { state, navigation, - onPageChangeStart, - onPageChangeConfirm, - onPageChangeCancel, + keyboardHandlingEnabled, mode = 'card', ...rest } = this.props; @@ -328,28 +324,30 @@ class StackView extends React.Component { {insets => ( - + + {props => ( + + )} + )}