ordering-ui-react-native 0.24.7 → 0.24.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.24.7",
+  "version": "0.24.9",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/original/src/components/GoogleMap/index.tsx

@@ -87,7 +87,7 @@ export const GoogleMap = (props: GoogleMapsParams) => {
         }
         handleChangeAddressMap && handleChangeAddressMap(address, details)
         setSaveLocation && setSaveLocation(false)
-        if (!isMovingRegion) {
+        if (isMovingRegion) {
           handleToggleMap && handleToggleMap()
         }
       } else {

package/themes/original/src/components/HelpOptions/index.tsx

@@ -1,18 +1,26 @@
-import React from 'react'
+import React, { useMemo } from 'react'
 import { Dimensions, Platform } from 'react-native'
 import { WebView } from 'react-native-webview'
 import { useLanguage } from 'ordering-components/native'
-
+import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { Container } from '../../layouts/Container'
 import { NotFoundSource } from '../NotFoundSource'
 import NavBar from '../NavBar'
 
-const HEIGHT_SCREEN = Dimensions.get('screen').height
-
 export const HelpOptions = (props: any) => {
   const { item, goToBack } = props
   const [, t] = useLanguage()
 
+  const insets = useSafeAreaInsets()
+
+  const containerHeight = useMemo(() => {
+    const windowHeight = Dimensions.get('window').height
+    const bottomPadding = Platform.OS === 'ios' ? insets.bottom : 0
+    const navigationBarHeight = Platform.OS === 'android' ? 48 : 0
+    const topPadding = (Platform.OS === 'ios' ? 20 : 10) + 48
+    return windowHeight - bottomPadding - navigationBarHeight - topPadding
+  }, [insets.bottom])
+
   return (
     <Container
       pt={Platform.OS === 'ios' ? 20 : 10}
@@ -30,7 +38,8 @@ export const HelpOptions = (props: any) => {
           originWhitelist={['*']}
           automaticallyAdjustContentInsets={false}
           source={{ html: item.body }}
-          style={{ flex: 1, height: HEIGHT_SCREEN }}
+          style={{ flex: 1, height: containerHeight }}
+          nestedScrollEnabled
         />
       )}
       {!item?.body && (