fix ios closed initialState issue

sorokin0andrey · Feb 13, 2020 · 6a65245 · 6a65245
1 parent 47c5323
commit 6a65245
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/src/CollapsibleNavBarScrollView.tsx b/src/CollapsibleNavBarScrollView.tsx
@@ -13,8 +13,6 @@ import {
   Animated,
   ScrollView,
   View,
-  Dimensions,
-  Platform,
   NativeSyntheticEvent,
   NativeScrollEvent,
   ScrollViewProps,
@@ -29,8 +27,7 @@ import {
   CollapsibleNavBarState,
   CollapsibleNavBarActionOptions,
 } from './types'
-
-const { height: SCREEN_HEIGHT } = Dimensions.get('window')
+import { SCREEN_HEIGHT, isAndroid } from './constants'
 
 export const CollapsibleNavBarScrollView = memo(
   forwardRef<CollapsibleNavBarScrollViewRef | null, CollapsibleNavBarScrollViewProps & ScrollViewProps>(
@@ -137,7 +134,7 @@ export const CollapsibleNavBarScrollView = memo(
         (e: NativeSyntheticEvent<NativeScrollEvent>) => {
           isDraging.current = false
           const velocity = e.nativeEvent.velocity?.y || 0
-          if (velocity === 0 || (Platform.OS === 'android' && Math.abs(Math.round(velocity)) <= 2)) {
+          if (velocity === 0 || (isAndroid && Math.abs(Math.round(velocity)) <= 2)) {
             handleIntermediateState()
           }
         },
@@ -155,7 +152,7 @@ export const CollapsibleNavBarScrollView = memo(
 
       const handleLayout = useCallback(
         (event: LayoutChangeEvent) => {
-          if (firstRender.current && initialState === CollapsibleNavBarState.closed) {
+          if (firstRender.current && initialState === CollapsibleNavBarState.closed && isAndroid) {
             close({ animated: false })
           }
           if (onLayout) {

diff --git a/src/constants.ts b/src/constants.ts
@@ -0,0 +1,5 @@
+import { Dimensions, Platform } from 'react-native'
+
+export const SCREEN_HEIGHT = Dimensions.get('window').height
+
+export const isAndroid = Platform.OS === 'android'
diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,2 @@
-export { CollapsibleNavBarScrollView } from './CollapsibleNavBarScrollView'
-export {
-  CollapsibleNavBarActionOptions,
-  CollapsibleNavBarState,
-  CollapsibleNavBarScrollViewProps,
-  CollapsibleNavBarScrollViewRef,
-} from './types'
+export * from './CollapsibleNavBarScrollView'
+export * from './types'
diff --git a/tsconfig.json b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "outDir": "dist",
     "module": "esnext",
-    "target": "es5",
+    "target": "ESNext",
     "lib": ["es6", "dom", "es2016", "es2017"],
     "sourceMap": true,
     "allowJs": false,