verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

fix: Change useSnaps logic to be based on component size (#5032) 

* change useSnaps logic to be based on component size

* fix logic

* fix iphone without notch
This commit is contained in:
Gleidson Daniel Silva 2023-05-19 14:40:31 -03:00 committed by GitHub
parent 0079229a34
commit 2d07b1682c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/lib/hooks/useSnaps.ts
View File

@ -1,14 +1,22 @@
import { useDimensions } from '@react-native-community/hooks'; import { StatusBar } from 'react-native';
import { useSafeAreaInsets } from 'react-native-safe-area-context'; import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { isIOS, isTablet } from '../methods/helpers';
// Not sure if it's worth adding this here in the context of the actionSheet // Not sure if it's worth adding this here in the context of the actionSheet
/** /**
* Return the snaps based on the size you pass (aka: Size of action sheet) * Return the snaps based on the size you pass (aka: Size of action sheet)
* @param {Number[]} snaps Sizes you want to pass, pass only one if you want the action sheet to start at a specific size * @param {number} componentSize size of the component that will be rendered in the action sheet
*/ */
export const useSnaps = (snaps: number[]): string[] => { export const useSnaps = (componentSize: number): number[] | string[] => {
const insets = useSafeAreaInsets(); const insets = useSafeAreaInsets();
const { screen } = useDimensions(); if (isIOS) {
const percentage = insets.bottom + insets.top > 75 ? 110 : 100; const fixTabletInset = isTablet ? 2 : 1;
return snaps.map(snap => `${((percentage * snap) / (screen.height * screen.scale)).toFixed(2)}%`); return [componentSize + (insets.bottom || insets.top) * fixTabletInset];
}
let statusHeight = 0;
if (StatusBar.currentHeight) {
statusHeight = StatusBar.currentHeight;
}
return [componentSize + statusHeight];
}; };

2
app/lib/hooks/useVideoConf.tsx
View File

@ -36,7 +36,7 @@ export const useVideoConf = (rid: string): { showInitCallActionSheet: () => Prom
const isServer5OrNewer = compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '5.0.0'); const isServer5OrNewer = compareServerVersion(serverVersion, 'greaterThanOrEqualTo', '5.0.0');
const { showActionSheet } = useActionSheet(); const { showActionSheet } = useActionSheet();
const snaps = useSnaps([1250]); const snaps = useSnaps(404);
const handleShowCallOption = async () => { const handleShowCallOption = async () => {
if (isServer5OrNewer) return setShowCallOption(true); if (isServer5OrNewer) return setShowCallOption(true);