fix: sticky header not position in the right place

r0b0t3d · Aug 1, 2023 · 7c1aed0 · 7c1aed0
1 parent 9cdb8ff
commit 7c1aed0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/components/CollapsibleView.tsx b/src/components/CollapsibleView.tsx
@@ -93,7 +93,7 @@ export default function CollapsibleView({
   useAnimatedReaction(
     () => (collapseState.value === 0 ? 0 : collapseState.value === 1 ? 1 : 0),
     (result, prev) => {
-      if (result === prev) {
+      if (prev === null || result === prev) {
         return;
       }
       if (onToggle) {
@@ -158,7 +158,7 @@ export function CollapsibleHeaderText({
   iconInitialAngle = 0,
   children,
 }: {
-  title: string | Element;
+  title: string | ReactNode;
   style?: StyleProp<ViewStyle>;
   titleStyle?: StyleProp<TextStyle>;
   icon?: ReactNode;

diff --git a/src/components/header/CollapsibleHeaderContainerProvider.tsx b/src/components/header/CollapsibleHeaderContainerProvider.tsx
@@ -63,7 +63,9 @@ export default function CollapsibleHeaderContainerProvider({
       if (!currentLayout.value) {
         return -1;
       }
-      return currentLayout.value.height - stickyHeight.value;
+      return (
+        currentLayout.value.height - currentLayout.value.y - stickyHeight.value
+      );
     },
     (result, previous) => {
       if (result !== -1 && result !== previous) {

diff --git a/src/withCollapsibleContext.tsx b/src/withCollapsibleContext.tsx
@@ -91,11 +91,6 @@ export default function withCollapsibleContext<T>(Component: FC<T>) {
               acc += layout?.stickyHeight ?? 0;
               return acc;
             }, 0);
-            console.log({
-              top,
-              stickyHeightAbove,
-            });
-            //
             collapsibleHandlers.current?.scrollTo(
               top - stickyHeightAbove,
               animated