Skip to content

Commit

Permalink
fix(android): fix footer position bug (#48)
Browse files Browse the repository at this point in the history
* fix: footer position bug

* chore: bump example
  • Loading branch information
lodev09 authored Jun 29, 2024
1 parent a1ee889 commit 6300f67
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 40 deletions.
7 changes: 0 additions & 7 deletions android/src/main/java/com/lodev09/truesheet/TrueSheetView.kt
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,6 @@ class TrueSheetView(context: Context) :
eventDispatcher?.dispatchEvent(DismissEvent(surfaceId, id))
}

// Configure when showing and size changed
setOnSizeChangeListener(object : RootSheetView.OnSizeChangeListener {
override fun onSizeChange(width: Int, height: Int) {
maxScreenHeight = height
}
})

// Configure sheet behavior events
behavior.addBottomSheetCallback(
object : BottomSheetBehavior.BottomSheetCallback() {
Expand Down
2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"build:ios": "cd ios && xcodebuild -workspace TrueSheetExample.xcworkspace -scheme TrueSheetExample -configuration Debug -sdk iphonesimulator CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ GCC_OPTIMIZATION_LEVEL=0 GCC_PRECOMPILE_PREFIX_HEADER=YES ASSETCATALOG_COMPILER_OPTIMIZATION=time DEBUG_INFORMATION_FORMAT=dwarf COMPILER_INDEX_STORE_ENABLE=NO"
},
"dependencies": {
"expo": "~51.0.14",
"expo": "~51.0.17",
"expo-build-properties": "~0.12.3",
"react": "18.2.0",
"react-native": "0.74.2",
Expand Down
1 change: 1 addition & 0 deletions example/src/sheets/ScrollViewSheet.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const ScrollViewSheet = forwardRef((props: ScrollViewSheetProps, ref: Ref
return (
<TrueSheet
ref={ref}
sizes={['80%']}
scrollRef={scrollViewRef}
onDismiss={() => console.log('Sheet ScrollView dismissed!')}
onPresent={() => console.log(`Sheet ScrollView presented!`)}
Expand Down
98 changes: 66 additions & 32 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2821,9 +2821,9 @@ __metadata:
languageName: node
linkType: hard

"@expo/cli@npm:0.18.19":
version: 0.18.19
resolution: "@expo/cli@npm:0.18.19"
"@expo/cli@npm:0.18.21":
version: 0.18.21
resolution: "@expo/cli@npm:0.18.21"
dependencies:
"@babel/runtime": "npm:^7.20.0"
"@expo/code-signing-certificates": "npm:0.0.5"
Expand Down Expand Up @@ -2904,7 +2904,7 @@ __metadata:
ws: "npm:^8.12.1"
bin:
expo-internal: build/bin/cli
checksum: 10c0/1fc0e44a3d374b001cd90dabc49de0924e9059dfae8dec0be94cb3907e82e1d9fd3441846a4fa9a34c2fde166a8af237b97687fab572820cd2dc7842d732a89b
checksum: 10c0/698515a04da5830800a1e18c130dcea2be1ec25efa318a79a8dc89d0d8e66eaa2598fffc7288928b53e36f5e4c19c0f161770c2e47da88303d17cc69d6d6a1e9
languageName: node
linkType: hard

Expand All @@ -2918,9 +2918,9 @@ __metadata:
languageName: node
linkType: hard

"@expo/config-plugins@npm:8.0.5":
version: 8.0.5
resolution: "@expo/config-plugins@npm:8.0.5"
"@expo/config-plugins@npm:8.0.6":
version: 8.0.6
resolution: "@expo/config-plugins@npm:8.0.6"
dependencies:
"@expo/config-types": "npm:^51.0.0-unreleased"
"@expo/json-file": "npm:~8.3.0"
Expand All @@ -2937,7 +2937,7 @@ __metadata:
slugify: "npm:^1.6.6"
xcode: "npm:^3.0.1"
xml2js: "npm:0.6.0"
checksum: 10c0/9025bb8932368c71dc6a33a376c07c59f821b44cd1e188e48ac647b28a48c54b42e7f1ad186ac5b76faa4879c019c6888ae122aa49401d5f7214f90b5eeb631a
checksum: 10c0/4d4be4f7c9b791ef1a97c54e369219c08df2cd9a4f06604a54e927e1129e83912762339d198886febd82d045af3bf060eb197e1930fd0879a4ad90c9d3b555e6
languageName: node
linkType: hard

Expand Down Expand Up @@ -3053,7 +3053,33 @@ __metadata:
languageName: node
linkType: hard

"@expo/metro-config@npm:0.18.7, @expo/metro-config@npm:~0.18.6":
"@expo/metro-config@npm:0.18.8":
version: 0.18.8
resolution: "@expo/metro-config@npm:0.18.8"
dependencies:
"@babel/core": "npm:^7.20.0"
"@babel/generator": "npm:^7.20.5"
"@babel/parser": "npm:^7.20.0"
"@babel/types": "npm:^7.20.0"
"@expo/config": "npm:~9.0.0-beta.0"
"@expo/env": "npm:~0.3.0"
"@expo/json-file": "npm:~8.3.0"
"@expo/spawn-async": "npm:^1.7.2"
chalk: "npm:^4.1.0"
debug: "npm:^4.3.2"
find-yarn-workspace-root: "npm:~2.0.0"
fs-extra: "npm:^9.1.0"
getenv: "npm:^1.0.0"
glob: "npm:^7.2.3"
jsc-safe-url: "npm:^0.2.4"
lightningcss: "npm:~1.19.0"
postcss: "npm:~8.4.32"
resolve-from: "npm:^5.0.0"
checksum: 10c0/507aba80bcff43fd37ddd05d2535da8e6a247502a12b53dc3505e45a0ee9f4561e06f268a81b45813254fc60d511a6c2176361f288813851c6506c6098aeccea
languageName: node
linkType: hard

"@expo/metro-config@npm:~0.18.6":
version: 0.18.7
resolution: "@expo/metro-config@npm:0.18.7"
dependencies:
Expand Down Expand Up @@ -6881,6 +6907,13 @@ __metadata:
languageName: node
linkType: hard

"babel-plugin-react-compiler@npm:^0.0.0-experimental-592953e-20240517":
version: 0.0.0
resolution: "babel-plugin-react-compiler@npm:0.0.0"
checksum: 10c0/b7db0bd49dfe28ea8945a72e90a21f1ab8a14e5ed6987a4f8780bbf15e68bb742aa0be45c019084390623a73c39c44dd57964cc71a01093f4f929c09eb5e5e50
languageName: node
linkType: hard

"babel-plugin-react-native-web@npm:~0.19.10":
version: 0.19.11
resolution: "babel-plugin-react-native-web@npm:0.19.11"
Expand Down Expand Up @@ -6919,9 +6952,9 @@ __metadata:
languageName: node
linkType: hard

"babel-preset-expo@npm:~11.0.10":
version: 11.0.10
resolution: "babel-preset-expo@npm:11.0.10"
"babel-preset-expo@npm:~11.0.11":
version: 11.0.11
resolution: "babel-preset-expo@npm:11.0.11"
dependencies:
"@babel/plugin-proposal-decorators": "npm:^7.12.9"
"@babel/plugin-transform-export-namespace-from": "npm:^7.22.11"
Expand All @@ -6930,9 +6963,10 @@ __metadata:
"@babel/preset-react": "npm:^7.22.15"
"@babel/preset-typescript": "npm:^7.23.0"
"@react-native/babel-preset": "npm:0.74.84"
babel-plugin-react-compiler: "npm:^0.0.0-experimental-592953e-20240517"
babel-plugin-react-native-web: "npm:~0.19.10"
react-refresh: "npm:^0.14.2"
checksum: 10c0/61e4332afe74f0b77c4ec43956557103eaf0526f79de6eeeafe36e62e9697a3b460cb46be5504d77aef4e105b500fa8028f1d60b126fbddaa1b3e12c879a980d
checksum: 10c0/059c9f2e38251276c28de70b46d8adfb182d8372814c1540d6d6b057328410838fb43cae8463f8e02eefe8647018eca0d7536512713d2d09e83d48cd5b639235
languageName: node
linkType: hard

Expand Down Expand Up @@ -10331,16 +10365,16 @@ __metadata:
languageName: node
linkType: hard

"expo-asset@npm:~10.0.9":
version: 10.0.9
resolution: "expo-asset@npm:10.0.9"
"expo-asset@npm:~10.0.10":
version: 10.0.10
resolution: "expo-asset@npm:10.0.10"
dependencies:
expo-constants: "npm:~16.0.0"
invariant: "npm:^2.2.4"
md5-file: "npm:^3.2.3"
peerDependencies:
expo: "*"
checksum: 10c0/6dea9bd2de2f5219651998cfb93106c69f6cc8296eda7d48760f61029579680bc74f70676a177214ba195dbbd96d00c6c231c4df1cde729e441e22ff5b829a28
checksum: 10c0/aed3164cee4483e47fa56c8898384769d60ebb3f94553f7ad2a33a8902d73a1379aee3fc51833c8f0a4a59979ed842ba079e52c8e1903104b1ad312ad90fe1d1
languageName: node
linkType: hard

Expand Down Expand Up @@ -10411,37 +10445,37 @@ __metadata:
languageName: node
linkType: hard

"expo-modules-core@npm:1.12.15":
version: 1.12.15
resolution: "expo-modules-core@npm:1.12.15"
"expo-modules-core@npm:1.12.18":
version: 1.12.18
resolution: "expo-modules-core@npm:1.12.18"
dependencies:
invariant: "npm:^2.2.4"
checksum: 10c0/a68212b6308f781ac2a91b3129131356b006a14030149919ff29acc33cfbee9765a24e6f1ec11d18a7d7ca7d41d4599732a81e33259b3e83f27ce9e0c11776fa
checksum: 10c0/924d55d660d0f0ea40363b317c4eea7b67be6e0dfa8befd35395ec33502277a4c0ca34bb7701793bda14ba744f648708e9f896d6fa653c546d66fbaaae04a7e9
languageName: node
linkType: hard

"expo@npm:~51.0.14":
version: 51.0.14
resolution: "expo@npm:51.0.14"
"expo@npm:~51.0.17":
version: 51.0.17
resolution: "expo@npm:51.0.17"
dependencies:
"@babel/runtime": "npm:^7.20.0"
"@expo/cli": "npm:0.18.19"
"@expo/cli": "npm:0.18.21"
"@expo/config": "npm:9.0.1"
"@expo/config-plugins": "npm:8.0.5"
"@expo/metro-config": "npm:0.18.7"
"@expo/config-plugins": "npm:8.0.6"
"@expo/metro-config": "npm:0.18.8"
"@expo/vector-icons": "npm:^14.0.0"
babel-preset-expo: "npm:~11.0.10"
expo-asset: "npm:~10.0.9"
babel-preset-expo: "npm:~11.0.11"
expo-asset: "npm:~10.0.10"
expo-file-system: "npm:~17.0.1"
expo-font: "npm:~12.0.7"
expo-keep-awake: "npm:~13.0.2"
expo-modules-autolinking: "npm:1.11.1"
expo-modules-core: "npm:1.12.15"
expo-modules-core: "npm:1.12.18"
fbemitter: "npm:^3.0.0"
whatwg-url-without-unicode: "npm:8.0.0-3"
bin:
expo: bin/cli
checksum: 10c0/96828439b473f7b29c0f9876bf135b229a6f4c4aac26d9dd446033750c225b8883b6857561d04f292dd8b5c4582762e67a8e2dbf55bb50613f825025394b997a
checksum: 10c0/538cdb06bf62775611288976cc43b234accf5dd53df023591781fa030365dd114504213bfe7cf8d056adfcc9a34a4a60f904208f45196fd37c7f7a3f73b391d6
languageName: node
linkType: hard

Expand Down Expand Up @@ -20743,7 +20777,7 @@ __metadata:
"@react-native/babel-preset": "npm:0.74.83"
"@react-native/metro-config": "npm:0.74.83"
babel-plugin-module-resolver: "npm:^5.0.0"
expo: "npm:~51.0.14"
expo: "npm:~51.0.17"
expo-build-properties: "npm:~0.12.3"
react: "npm:18.2.0"
react-native: "npm:0.74.2"
Expand Down

0 comments on commit 6300f67

Please sign in to comment.