@lodev09/react-native-true-sheet 3.4.1 → 3.5.0-beta.0

package/ios/TrueSheetViewController.mm

@@ -9,6 +9,7 @@
 #import "TrueSheetViewController.h"
 #import "TrueSheetContentView.h"
 #import "core/TrueSheetBlurView.h"
+#import "core/TrueSheetDetentCalculator.h"
 #import "core/TrueSheetGrabberView.h"
 #import "utils/GestureUtil.h"
 #import "utils/WindowUtil.h"
@@ -36,8 +37,7 @@
 
   TrueSheetBlurView *_blurView;
   TrueSheetGrabberView *_grabberView;
-
-  NSMutableArray<NSNumber *> *_resolvedDetentPositions;
+  TrueSheetDetentCalculator *_detentCalculator;
 }
 
 #pragma mark - Initialization
@@ -65,7 +65,7 @@
 
     _blurInteraction = YES;
     _insetAdjustment = @"automatic";
-    _resolvedDetentPositions = [NSMutableArray array];
+    _detentCalculator = [[TrueSheetDetentCalculator alloc] initWithMeasurements:self];
   }
   return self;
 }
@@ -464,131 +464,27 @@
 }
 
 - (void)storeResolvedPositionForIndex:(NSInteger)index {
-  if (index >= 0 && index < (NSInteger)_resolvedDetentPositions.count) {
-    _resolvedDetentPositions[index] = @(self.currentPosition);
-  }
+  [_detentCalculator storeResolvedPositionForIndex:index];
 }
 
 - (CGFloat)estimatedPositionForIndex:(NSInteger)index {
-  if (index < 0 || index >= (NSInteger)_resolvedDetentPositions.count)
-    return 0;
-
-  CGFloat storedPos = [_resolvedDetentPositions[index] doubleValue];
-  if (storedPos > 0) {
-    return storedPos;
-  }
-
-  CGFloat detentValue = [self detentValueForIndex:index];
-  CGFloat basePosition = self.screenHeight - (detentValue * self.screenHeight);
-
-  for (NSInteger i = 0; i < (NSInteger)_resolvedDetentPositions.count; i++) {
-    CGFloat pos = [_resolvedDetentPositions[i] doubleValue];
-    if (pos > 0) {
-      CGFloat knownDetent = [self detentValueForIndex:i];
-      CGFloat expectedPos = self.screenHeight - (knownDetent * self.screenHeight);
-      CGFloat offset = pos - expectedPos;
-      return basePosition + offset;
-    }
-  }
-
-  return basePosition;
+  return [_detentCalculator estimatedPositionForIndex:index];
 }
 
 - (BOOL)findSegmentForPosition:(CGFloat)position outIndex:(NSInteger *)outIndex outProgress:(CGFloat *)outProgress {
-  NSInteger count = _resolvedDetentPositions.count;
-  if (count == 0) {
-    *outIndex = -1;
-    *outProgress = 0;
-    return NO;
-  }
-
-  CGFloat firstPos = [self estimatedPositionForIndex:0];
-
-  // Above first detent - interpolating toward closed
-  if (position > firstPos) {
-    CGFloat range = self.screenHeight - firstPos;
-    *outIndex = -1;
-    *outProgress = range > 0 ? (position - firstPos) / range : 0;
-    return NO;
-  }
-
-  // Single detent - at or above the detent
-  if (count == 1) {
-    *outIndex = 0;
-    *outProgress = 0;
-    return NO;
-  }
-
-  CGFloat lastPos = [self estimatedPositionForIndex:count - 1];
-
-  // Below last detent
-  if (position < lastPos) {
-    *outIndex = count - 1;
-    *outProgress = 0;
-    return NO;
-  }
-
-  // Between detents
-  for (NSInteger i = 0; i < count - 1; i++) {
-    CGFloat pos = [self estimatedPositionForIndex:i];
-    CGFloat nextPos = [self estimatedPositionForIndex:i + 1];
-
-    if (position <= pos && position >= nextPos) {
-      CGFloat range = pos - nextPos;
-      *outIndex = i;
-      *outProgress = range > 0 ? (pos - position) / range : 0;
-      return YES;
-    }
-  }
-
-  *outIndex = count - 1;
-  *outProgress = 0;
-  return NO;
+  return [_detentCalculator findSegmentForPosition:position outIndex:outIndex outProgress:outProgress];
 }
 
 - (CGFloat)interpolatedIndexForPosition:(CGFloat)position {
-  NSInteger index;
-  CGFloat progress;
-  BOOL found = [self findSegmentForPosition:position outIndex:&index outProgress:&progress];
-
-  if (!found) {
-    if (index == -1) {
-      return -progress;
-    }
-    return index;
-  }
-
-  return index + fmax(0, fmin(1, progress));
+  return [_detentCalculator interpolatedIndexForPosition:position];
 }
 
 - (CGFloat)interpolatedDetentForPosition:(CGFloat)position {
-  NSInteger index;
-  CGFloat progress;
-  BOOL found = [self findSegmentForPosition:position outIndex:&index outProgress:&progress];
-
-  if (!found) {
-    if (index == -1) {
-      CGFloat firstDetent = [self detentValueForIndex:0];
-      return fmax(0, firstDetent * (1 - progress));
-    }
-    return [self detentValueForIndex:index];
-  }
-
-  CGFloat detent = [self detentValueForIndex:index];
-  CGFloat nextDetent = [self detentValueForIndex:index + 1];
-  return detent + progress * (nextDetent - detent);
+  return [_detentCalculator interpolatedDetentForPosition:position];
 }
 
 - (CGFloat)detentValueForIndex:(NSInteger)index {
-  if (index >= 0 && index < (NSInteger)_detents.count) {
-    CGFloat value = [_detents[index] doubleValue];
-    if (value == -1) {
-      CGFloat autoHeight = [self.contentHeight floatValue] + [self.headerHeight floatValue];
-      return autoHeight / self.screenHeight;
-    }
-    return value;
-  }
-  return 0;
+  return [_detentCalculator detentValueForIndex:index];
 }
 
 #pragma mark - Sheet Configuration
@@ -611,7 +507,7 @@
     return;
 
   NSMutableArray<UISheetPresentationControllerDetent *> *detents = [NSMutableArray array];
-  [_resolvedDetentPositions removeAllObjects];
+  [_detentCalculator clearResolvedPositions];
 
   CGFloat autoHeight = [self.contentHeight floatValue] + [self.headerHeight floatValue];
 
@@ -621,9 +517,9 @@
                                                              withAutoHeight:autoHeight
                                                                     atIndex:index];
     [detents addObject:sheetDetent];
-    [_resolvedDetentPositions addObject:@(0)];
   }
 
+  [_detentCalculator setDetentCount:self.detents.count];
   sheet.detents = detents;
 
   if (self.dimmed && [self.dimmedDetentIndex integerValue] == 0) {

package/ios/core/TrueSheetDetentCalculator.h

@@ -0,0 +1,87 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Protocol that provides dynamic measurements for detent calculations.
+ Implemented by TrueSheetViewController to supply real-time values.
+ */
+@protocol TrueSheetDetentMeasurements <NSObject>
+
+@property (nonatomic, readonly) CGFloat screenHeight;
+@property (nonatomic, readonly) CGFloat currentPosition;
+@property (nonatomic, strong, readonly) NSArray<NSNumber *> *detents;
+@property (nonatomic, strong, readonly, nullable) NSNumber *contentHeight;
+@property (nonatomic, strong, readonly, nullable) NSNumber *headerHeight;
+
+@end
+
+/**
+ Encapsulates all detent-related calculations for the sheet.
+ Uses the TrueSheetDetentMeasurements protocol to read dynamic values.
+ */
+@interface TrueSheetDetentCalculator : NSObject
+
+- (instancetype)initWithMeasurements:(id<TrueSheetDetentMeasurements>)measurements;
+
+/**
+ Returns the detent value (0-1 fraction) for a given index.
+ For auto (-1) detents, calculates based on content + header height.
+ */
+- (CGFloat)detentValueForIndex:(NSInteger)index;
+
+/**
+ Returns the estimated screen position (Y coordinate) for a detent index.
+ Uses stored resolved positions if available, otherwise calculates from detent value.
+ */
+- (CGFloat)estimatedPositionForIndex:(NSInteger)index;
+
+/**
+ Stores the current resolved position for a detent index.
+ Called when the sheet settles at a detent.
+ */
+- (void)storeResolvedPositionForIndex:(NSInteger)index;
+
+/**
+ Finds the segment between detents for a given position.
+ Returns YES if position is between two detents, NO if at edges.
+ outIndex: The lower detent index of the segment (-1 if above first detent)
+ outProgress: Progress within the segment (0-1)
+ */
+- (BOOL)findSegmentForPosition:(CGFloat)position outIndex:(NSInteger *)outIndex outProgress:(CGFloat *)outProgress;
+
+/**
+ Returns a continuous index value representing position between detents.
+ Examples: 0.5 means halfway between detent 0 and 1
+           -0.3 means 30% toward closed from detent 0
+ */
+- (CGFloat)interpolatedIndexForPosition:(CGFloat)position;
+
+/**
+ Returns the interpolated detent value for a given position.
+ Useful for getting a smooth detent value during drag.
+ */
+- (CGFloat)interpolatedDetentForPosition:(CGFloat)position;
+
+/**
+ Clears all stored resolved positions.
+ Called when detents configuration changes.
+ */
+- (void)clearResolvedPositions;
+
+/**
+ Sets the count of detents (initializes storage for resolved positions).
+ */
+- (void)setDetentCount:(NSInteger)count;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/core/TrueSheetDetentCalculator.mm

@@ -0,0 +1,170 @@
+//
+//  Created by Jovanni Lo (@lodev09)
+//  Copyright (c) 2024-present. All rights reserved.
+//
+//  This source code is licensed under the MIT license found in the
+//  LICENSE file in the root directory of this source tree.
+//
+
+#import "TrueSheetDetentCalculator.h"
+
+@implementation TrueSheetDetentCalculator {
+  __weak id<TrueSheetDetentMeasurements> _measurements;
+  NSMutableArray<NSNumber *> *_resolvedDetentPositions;
+}
+
+- (instancetype)initWithMeasurements:(id<TrueSheetDetentMeasurements>)measurements {
+  if (self = [super init]) {
+    _measurements = measurements;
+    _resolvedDetentPositions = [NSMutableArray array];
+  }
+  return self;
+}
+
+#pragma mark - Public Methods
+
+- (CGFloat)detentValueForIndex:(NSInteger)index {
+  NSArray<NSNumber *> *detents = _measurements.detents;
+  if (index >= 0 && index < (NSInteger)detents.count) {
+    CGFloat value = [detents[index] doubleValue];
+    if (value == -1) {
+      CGFloat autoHeight = [_measurements.contentHeight floatValue] + [_measurements.headerHeight floatValue];
+      return autoHeight / _measurements.screenHeight;
+    }
+    return value;
+  }
+  return 0;
+}
+
+- (CGFloat)estimatedPositionForIndex:(NSInteger)index {
+  if (index < 0 || index >= (NSInteger)_resolvedDetentPositions.count) {
+    return 0;
+  }
+
+  CGFloat storedPos = [_resolvedDetentPositions[index] doubleValue];
+  if (storedPos > 0) {
+    return storedPos;
+  }
+
+  CGFloat screenHeight = _measurements.screenHeight;
+  CGFloat detentValue = [self detentValueForIndex:index];
+  CGFloat basePosition = screenHeight - (detentValue * screenHeight);
+
+  // Try to find offset from a known resolved position
+  for (NSInteger i = 0; i < (NSInteger)_resolvedDetentPositions.count; i++) {
+    CGFloat pos = [_resolvedDetentPositions[i] doubleValue];
+    if (pos > 0) {
+      CGFloat knownDetent = [self detentValueForIndex:i];
+      CGFloat expectedPos = screenHeight - (knownDetent * screenHeight);
+      CGFloat offset = pos - expectedPos;
+      return basePosition + offset;
+    }
+  }
+
+  return basePosition;
+}
+
+- (void)storeResolvedPositionForIndex:(NSInteger)index {
+  if (index >= 0 && index < (NSInteger)_resolvedDetentPositions.count) {
+    _resolvedDetentPositions[index] = @(_measurements.currentPosition);
+  }
+}
+
+- (BOOL)findSegmentForPosition:(CGFloat)position outIndex:(NSInteger *)outIndex outProgress:(CGFloat *)outProgress {
+  NSInteger count = _resolvedDetentPositions.count;
+  if (count == 0) {
+    *outIndex = -1;
+    *outProgress = 0;
+    return NO;
+  }
+
+  CGFloat screenHeight = _measurements.screenHeight;
+  CGFloat firstPos = [self estimatedPositionForIndex:0];
+
+  // Above first detent - interpolating toward closed
+  if (position > firstPos) {
+    CGFloat range = screenHeight - firstPos;
+    *outIndex = -1;
+    *outProgress = range > 0 ? (position - firstPos) / range : 0;
+    return NO;
+  }
+
+  // Single detent - at or above the detent
+  if (count == 1) {
+    *outIndex = 0;
+    *outProgress = 0;
+    return NO;
+  }
+
+  CGFloat lastPos = [self estimatedPositionForIndex:count - 1];
+
+  // Below last detent
+  if (position < lastPos) {
+    *outIndex = count - 1;
+    *outProgress = 0;
+    return NO;
+  }
+
+  // Between detents
+  for (NSInteger i = 0; i < count - 1; i++) {
+    CGFloat pos = [self estimatedPositionForIndex:i];
+    CGFloat nextPos = [self estimatedPositionForIndex:i + 1];
+
+    if (position <= pos && position >= nextPos) {
+      CGFloat range = pos - nextPos;
+      *outIndex = i;
+      *outProgress = range > 0 ? (pos - position) / range : 0;
+      return YES;
+    }
+  }
+
+  *outIndex = count - 1;
+  *outProgress = 0;
+  return NO;
+}
+
+- (CGFloat)interpolatedIndexForPosition:(CGFloat)position {
+  NSInteger index;
+  CGFloat progress;
+  BOOL found = [self findSegmentForPosition:position outIndex:&index outProgress:&progress];
+
+  if (!found) {
+    if (index == -1) {
+      return -progress;
+    }
+    return index;
+  }
+
+  return index + fmax(0, fmin(1, progress));
+}
+
+- (CGFloat)interpolatedDetentForPosition:(CGFloat)position {
+  NSInteger index;
+  CGFloat progress;
+  BOOL found = [self findSegmentForPosition:position outIndex:&index outProgress:&progress];
+
+  if (!found) {
+    if (index == -1) {
+      CGFloat firstDetent = [self detentValueForIndex:0];
+      return fmax(0, firstDetent * (1 - progress));
+    }
+    return [self detentValueForIndex:index];
+  }
+
+  CGFloat detent = [self detentValueForIndex:index];
+  CGFloat nextDetent = [self detentValueForIndex:index + 1];
+  return detent + progress * (nextDetent - detent);
+}
+
+- (void)clearResolvedPositions {
+  [_resolvedDetentPositions removeAllObjects];
+}
+
+- (void)setDetentCount:(NSInteger)count {
+  [_resolvedDetentPositions removeAllObjects];
+  for (NSInteger i = 0; i < count; i++) {
+    [_resolvedDetentPositions addObject:@(0)];
+  }
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.4.1",
+  "version": "3.5.0-beta.0",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",

package/android/src/main/res/anim/true_sheet_fade_out.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<alpha xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="100"
-    android:fromAlpha="1.0"
-    android:toAlpha="0.0"
-    android:interpolator="@android:interpolator/accelerate_cubic" />

package/android/src/main/res/anim/true_sheet_slide_in.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="250"
-        android:fromYDelta="20%p"
-        android:toYDelta="0"
-        android:interpolator="@android:interpolator/decelerate_cubic" />
-    <alpha
-        android:duration="150"
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0"
-        android:interpolator="@android:interpolator/decelerate_cubic" />
-</set>

package/android/src/main/res/anim/true_sheet_slide_out.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="200"
-        android:fromYDelta="0"
-        android:toYDelta="20%p"
-        android:interpolator="@android:interpolator/accelerate_cubic" />
-    <alpha
-        android:duration="150"
-        android:startOffset="50"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0"
-        android:interpolator="@android:interpolator/accelerate_cubic" />
-</set>