@r0b0t3d/react-native-collapsible 1.3.5-beta.6 → 1.4.0

package/src/types.ts

@@ -1,5 +1,5 @@
 import type React from 'react';
-import type { LayoutRectangle } from 'react-native';
+import type { LayoutRectangle, SectionListScrollParams } from 'react-native';
 import type Animated from 'react-native-reanimated';
 
 export type ScrollToIndexParams = {
@@ -14,6 +14,7 @@ export type CollapsibleHandles = {
   expand: () => void;
   scrollTo: (offset: number, animate?: boolean) => void;
   scrollToIndex: (params: ScrollToIndexParams) => void;
+  scrollToLocation: (params: SectionListScrollParams) => void;
 };
 
 export type CollapsibleContextType = CollapsibleHandles & {
@@ -36,6 +37,7 @@ export type CollapsibleContextInternalType = {
     Record<string, { top: number; stickyHeight: number }>
   >;
   fixedHeaderHeight: Animated.SharedValue<number>;
+  headerHeight: Animated.SharedValue<number>;
   handleContainerHeight: (height: number) => void;
   handleHeaderContainerLayout: (
     key: string,

package/src/withCollapsibleContext.tsx

@@ -3,11 +3,7 @@ import React, { useCallback, useMemo, useRef, FC } from 'react';
 import type { CollapsibleHandles } from './types';
 import { CollapsibleContext } from './hooks/useCollapsibleContext';
 import { InternalCollapsibleContext } from './hooks/useInternalCollapsibleContext';
-import {
-  useDerivedValue,
-  useSharedValue,
-  withTiming,
-} from 'react-native-reanimated';
+import { useDerivedValue, useSharedValue } from 'react-native-reanimated';
 import type { LayoutRectangle, View } from 'react-native';
 
 export default function withCollapsibleContext<T>(Component: FC<T>) {
@@ -47,16 +43,6 @@ export default function withCollapsibleContext<T>(Component: FC<T>) {
         const headerContainers = Object.keys(
           headerContainerLayouts.current
         ).filter((k: string) => !!headerContainerLayouts.current[k]);
-        // Calculate total header height
-        const totalHeight = headerContainers.reduce(
-          (acc, value) =>
-            acc + (headerContainerLayouts.current[value]?.height ?? 0),
-          0
-        );
-        headerHeight.value = withTiming(totalHeight, {
-          duration: fixedHeaderHeight.value === 0 ? 0 : 10,
-        });
-        fixedHeaderHeight.value = totalHeight;
         // Calculate header positions
         const sortedHeaders = headerContainers.sort((a, b) => {
           return (
@@ -94,6 +80,8 @@ export default function withCollapsibleContext<T>(Component: FC<T>) {
           collapsibleHandlers.current?.scrollTo(offset, animate),
         scrollToIndex: (params: any) =>
           collapsibleHandlers.current?.scrollToIndex(params),
+        scrollToLocation: (params: any) =>
+          collapsibleHandlers.current?.scrollToLocation(params),
         headerHeight,
         scrollY,
         headerCollapsed,
@@ -106,6 +94,7 @@ export default function withCollapsibleContext<T>(Component: FC<T>) {
         handleHeaderContainerLayout,
         setCollapsibleHandlers,
         handleContainerHeight,
+        headerHeight,
         fixedHeaderHeight,
         contentMinHeight,
         headerViewPositions,
@@ -114,6 +103,7 @@ export default function withCollapsibleContext<T>(Component: FC<T>) {
         setCollapsibleHandlers,
         handleHeaderContainerLayout,
         handleContainerHeight,
+        headerHeight,
         fixedHeaderHeight,
         contentMinHeight,
         headerViewPositions,