diff --git a/example/ios/Podfile b/example/ios/Podfile index 2287614..9418d93 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -67,6 +67,13 @@ target 'example' do ) __apply_Xcode_12_5_M1_post_install_workaround(installer) + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = "13.0" + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)', '_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION'] + end + end + # This is necessary for Xcode 14, because it signs resource bundles by default # when building for devices. installer.target_installation_results.pod_target_installation_results diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index c118f89..e72d93a 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -724,6 +724,6 @@ SPEC CHECKSUMS: RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315 Yoga: 79dd7410de6f8ad73a77c868d3d368843f0c93e0 -PODFILE CHECKSUM: 675d5c47e1336b7b792d33fad9d8fbf19b97d359 +PODFILE CHECKSUM: 7d17b32e481e08392125f8ca365d4f9ddd000f1d COCOAPODS: 1.12.1 diff --git a/package.json b/package.json index 6db227d..d34abec 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,6 @@ "engines": { "node": ">= 16.0.0" }, - "packageManager": "^yarn@1.22.15", "jest": { "preset": "react-native", "modulePathIgnorePatterns": [ diff --git a/src/components/containers/ScrollView.tsx b/src/components/containers/ScrollView.tsx index d45359f..b319d80 100644 --- a/src/components/containers/ScrollView.tsx +++ b/src/components/containers/ScrollView.tsx @@ -68,6 +68,7 @@ const ScrollViewWithHeadersInputComp = ( debouncedFixScroll, absoluteHeaderHeight, onAbsoluteHeaderLayout, + scrollViewAdjustments, } = useScrollContainerLogic({ scrollRef, largeHeaderShown, @@ -112,10 +113,10 @@ const ScrollViewWithHeadersInputComp = ( if (onMomentumScrollEnd) onMomentumScrollEnd(e); }} contentContainerStyle={[ + scrollViewAdjustments.contentContainerStyle, // @ts-ignore // Reanimated typings are causing this error - will fix in the future. contentContainerStyle, - absoluteHeader ? { paddingTop: absoluteHeaderHeight } : undefined, ]} automaticallyAdjustsScrollIndicatorInsets={ automaticallyAdjustsScrollIndicatorInsets !== undefined