@momo-kits/foundation 0.92.6-rc.21 → 0.92.6-rc.23

package/Application/BottomTab/BottomTabBar.tsx

@@ -46,8 +46,6 @@ type Options = {
 };
 
 const DEFAULT_MAX_TAB_ITEM_WIDTH = 125;
-const DEFAULT_TABBAR_HEIGHT = 49;
-const COMPACT_TABBAR_HEIGHT = 32;
 
 const shouldUseHorizontalLabels = ({
   state,
@@ -87,38 +85,6 @@ const shouldUseHorizontalLabels = ({
 const getPaddingBottom = (insets: EdgeInsets) =>
   Math.max(insets.bottom - Platform.select({ios: 4, default: 0}), 0);
 
-export const getTabBarHeight = ({
-  dimensions,
-  insets,
-  style,
-  ...rest
-}: Options & {
-  insets: EdgeInsets;
-  style: Animated.WithAnimatedValue<StyleProp<ViewStyle>>;
-}) => {
-  // @ts-ignore
-  const customHeight = StyleSheet.flatten(style)?.height;
-
-  if (typeof customHeight === 'number') {
-    return customHeight;
-  }
-
-  const isLandscape = dimensions.width > dimensions.height;
-  const horizontalLabels = shouldUseHorizontalLabels({dimensions, ...rest});
-  const paddingBottom = getPaddingBottom(insets);
-
-  if (
-    Platform.OS === 'ios' &&
-    !Platform.isPad &&
-    isLandscape &&
-    horizontalLabels
-  ) {
-    return COMPACT_TABBAR_HEIGHT + paddingBottom;
-  }
-
-  return DEFAULT_TABBAR_HEIGHT + paddingBottom;
-};
-
 export default function BottomTabBar({
   state,
   navigation,
@@ -409,7 +375,7 @@ export default function BottomTabBar({
           position: isTabBarHidden ? 'absolute' : (null as any),
         },
         {
-          paddingBottom: paddingBottom - 0,
+          paddingBottom: paddingBottom,
           paddingHorizontal: Math.max(insets.left, insets.right),
         },
         style,
@@ -464,7 +430,6 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     height: 48,
     width: 48,
-
     borderRadius: 100,
     top: -12,
   },

package/Application/BottomTab/index.tsx

@@ -75,7 +75,7 @@ const BottomTab: React.FC<BottomTabProps> = ({
       )}
       tabBarOptions={{
         style: {
-          height: 68 + Math.min(insets.bottom, 21),
+          height: 64 + Math.min(insets.bottom, 21),
         },
         tabStyle: {
           height: 68,

package/Layout/Screen.tsx

@@ -89,6 +89,10 @@ export interface ScreenProps extends ViewProps {
    */
   floatingButtonProps?: Omit<FloatingButtonProps, 'animatedValue' | 'bottom'>;
 
+  /**
+   * optional animated value
+   */
+  animatedValue?: Animated.Value;
   /**
    * Optional. If `true`, the screen content is using grid layout by span.
    */
@@ -111,10 +115,13 @@ const Screen = forwardRef(
       headerType = 'default',
       floatingButtonProps,
       useGridLayout = true,
+      animatedValue: animated,
     }: ScreenProps,
     ref,
   ) => {
-    const animatedValue = useRef<Animated.Value>(new Animated.Value(0));
+    const animatedValue = useRef<Animated.Value>(
+      animated ?? new Animated.Value(0),
+    );
     const {theme} = useContext(ApplicationContext);
     const insets = useSafeAreaInsets();
     const heightHeader = useHeaderHeight();
@@ -236,6 +243,7 @@ const Screen = forwardRef(
           {
             useNativeDriver: true,
             listener: (e: NativeSyntheticEvent<NativeScrollEvent>) => {
+              scrollViewProps?.onScroll?.(e);
               if (animatedHeader?.type == 'surface') {
                 const offsetY = e.nativeEvent.contentOffset.y;
                 let color = Colors.black_01;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.92.6-rc.21",
+    "version": "0.92.6-rc.23",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},