Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@ import {
StyleSheet,
type ViewStyle
} from 'react-native';
import type { SharedValue, TransformArrayItem } from 'react-native-reanimated';
import type {
AnimatedStyle,
SharedValue,
TransformArrayItem
} from 'react-native-reanimated';
import Animated, { useAnimatedStyle } from 'react-native-reanimated';

import { HIDDEN_X_OFFSET } from '../../../constants';
import { HIDDEN_X_OFFSET, IS_WEB } from '../../../constants';
import type {
AnimatedStyleProp,
LayoutAnimation
Expand Down Expand Up @@ -51,21 +55,27 @@ export default function ItemCell({
);

const animatedCellStyle = useAnimatedStyle(() => ({
...overriddenCellDimensions.value,
...decorationStyleValue.value,
...layoutStyleValue.value,
transform: [
...((layoutStyleValue.value.transform ?? []) as TransformsArray),
...((decorationStyleValue.value.transform ?? []) as TransformsArray)
]
],
...(!IS_WEB && overriddenCellDimensions.value)
}));

let innerAnimatedStyle: AnimatedStyle | undefined;
if (IS_WEB) {
// eslint-disable-next-line react-hooks/rules-of-hooks
innerAnimatedStyle = useAnimatedStyle(() => overriddenCellDimensions.value);
}

return (
<Animated.View style={[baseStyle, styles.decoration, animatedCellStyle]}>
<AnimatedOnLayoutView
entering={entering}
exiting={exiting}
style={hidden && styles.hidden}
style={[styles.inner, innerAnimatedStyle, hidden && styles.hidden]}
onLayout={onLayout}>
{children}
</AnimatedOnLayoutView>
Expand Down Expand Up @@ -93,5 +103,9 @@ const styles = StyleSheet.create({
// affect item dimensions, etc., so the safest way is to put the item
// far away from the viewport to hide it)
left: HIDDEN_X_OFFSET
}
},
inner: Platform.select<ViewStyle>({
default: {},
web: { flex: 1 }
})
});
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,9 @@ const { GridLayoutProvider, useGridLayoutContext } = createProvider(

if (isVertical) {
itemWidths.value = value;
overriddenCellDimensions.value = { width: value + mainGap.value };
overriddenCellDimensions.value = {
width: value + (IS_WEB ? 0 : mainGap.value)
};
} else {
itemHeights.value = value;
}
Expand Down
Loading