@lodev09/react-native-true-sheet 3.0.0-beta.13 → 3.0.0-beta.15

package/android/src/main/java/com/lodev09/truesheet/events/{PositionChangeEvent.kt → TrueSheetStateEvents.kt}

@@ -4,9 +4,31 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
+/**
+ * Fired when the detent changes
+ * Payload: { index: number, position: number, detent: number }
+ */
+class DetentChangeEvent(surfaceId: Int, viewId: Int, private val index: Int, private val position: Float, private val detent: Float) :
+  Event<DetentChangeEvent>(surfaceId, viewId) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap =
+    Arguments.createMap().apply {
+      putInt("index", index)
+      putDouble("position", position.toDouble())
+      putDouble("detent", detent.toDouble())
+    }
+
+  companion object {
+    const val EVENT_NAME = "topDetentChange"
+    const val REGISTRATION_NAME = "onDetentChange"
+  }
+}
+
 /**
  * Fired continuously for position updates during drag and animation
- * Payload: { index: number, position: number, detent: number, transitioning: boolean }
+ * Payload: { index: number, position: number, detent: number, realtime: boolean }
  */
 class PositionChangeEvent(
   surfaceId: Int,
@@ -14,7 +36,7 @@ class PositionChangeEvent(
   private val index: Float,
   private val position: Float,
   private val detent: Float,
-  private val transitioning: Boolean = false
+  private val realtime: Boolean = false
 ) : Event<PositionChangeEvent>(surfaceId, viewId) {
 
   override fun getEventName(): String = EVENT_NAME
@@ -24,7 +46,7 @@ class PositionChangeEvent(
       putDouble("index", index.toDouble())
       putDouble("position", position.toDouble())
       putDouble("detent", detent.toDouble())
-      putBoolean("transitioning", transitioning)
+      putBoolean("realtime", realtime)
     }
 
   companion object {

package/ios/TrueSheetView.mm

@@ -14,18 +14,10 @@
 #import "TrueSheetFooterView.h"
 #import "TrueSheetModule.h"
 #import "TrueSheetViewController.h"
-#import "events/OnDetentChangeEvent.h"
-#import "events/OnDidBlurEvent.h"
-#import "events/OnDidDismissEvent.h"
-#import "events/OnDidFocusEvent.h"
-#import "events/OnDidPresentEvent.h"
-#import "events/OnDragBeginEvent.h"
-#import "events/OnDragChangeEvent.h"
-#import "events/OnDragEndEvent.h"
-#import "events/OnMountEvent.h"
-#import "events/OnPositionChangeEvent.h"
-#import "events/OnWillDismissEvent.h"
-#import "events/OnWillPresentEvent.h"
+#import "events/TrueSheetDragEvents.h"
+#import "events/TrueSheetFocusEvents.h"
+#import "events/TrueSheetLifecycleEvents.h"
+#import "events/TrueSheetStateEvents.h"
 #import "utils/LayoutUtil.h"
 #import "utils/WindowUtil.h"
 
@@ -129,6 +121,12 @@ using namespace facebook::react;
   // Blur tint
   _controller.blurTint = !newProps.blurTint.empty() ? RCTNSStringFromString(newProps.blurTint) : nil;
 
+  // Blur intensity (-1 means use system default)
+  _controller.blurIntensity = newProps.blurIntensity >= 0 ? @(newProps.blurIntensity) : nil;
+
+  // Blur interaction
+  _controller.blurInteraction = newProps.blurInteraction;
+
   // Corner radius
   _controller.cornerRadius = newProps.cornerRadius < 0 ? nil : @(newProps.cornerRadius);
 
@@ -140,6 +138,7 @@ using namespace facebook::react;
   _controller.grabber = newProps.grabber;
   _controller.pageSizing = newProps.pageSizing;
   _controller.modalInPresentation = !newProps.dismissible;
+  _controller.draggable = newProps.draggable;
   _controller.dimmed = newProps.dimmed;
 
   if (newProps.dimmedDetentIndex >= 0) {
@@ -195,6 +194,7 @@ using namespace facebook::react;
       [self->_controller setupSheetDetents];
       [self->_controller applyActiveDetent];
     }];
+    [_controller updateDraggable];
   } else if (_initialDetentIndex >= 0) {
     [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
   }
@@ -244,7 +244,7 @@ using namespace facebook::react;
   _containerView.scrollViewPinningEnabled = _scrollable;
   [_containerView setupContentScrollViewPinning];
 
-  [OnMountEvent emit:_eventEmitter];
+  [TrueSheetLifecycleEvents emitMount:_eventEmitter];
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
@@ -372,27 +372,33 @@ using namespace facebook::react;
   NSInteger index = [_controller currentDetentIndex];
   _controller.activeDetentIndex = index;
   CGFloat detent = [_controller detentValueForIndex:index];
-  [OnWillPresentEvent emit:_eventEmitter index:index position:_controller.currentPosition detent:detent];
+  [TrueSheetLifecycleEvents emitWillPresent:_eventEmitter
+                                      index:index
+                                   position:_controller.currentPosition
+                                     detent:detent];
 }
 
 - (void)viewControllerDidPresent {
   NSInteger index = [_controller currentDetentIndex];
   CGFloat detent = [_controller detentValueForIndex:index];
-  [OnDidPresentEvent emit:_eventEmitter index:index position:_controller.currentPosition detent:detent];
+  [TrueSheetLifecycleEvents emitDidPresent:_eventEmitter
+                                     index:index
+                                  position:_controller.currentPosition
+                                    detent:detent];
 }
 
 - (void)viewControllerDidDrag:(UIGestureRecognizerState)state index:(NSInteger)index position:(CGFloat)position {
   CGFloat detent = [_controller detentValueForIndex:index];
   switch (state) {
     case UIGestureRecognizerStateBegan:
-      [OnDragBeginEvent emit:_eventEmitter index:index position:position detent:detent];
+      [TrueSheetDragEvents emitDragBegin:_eventEmitter index:index position:position detent:detent];
       break;
     case UIGestureRecognizerStateChanged:
-      [OnDragChangeEvent emit:_eventEmitter index:index position:position detent:detent];
+      [TrueSheetDragEvents emitDragChange:_eventEmitter index:index position:position detent:detent];
       break;
     case UIGestureRecognizerStateEnded:
     case UIGestureRecognizerStateCancelled:
-      [OnDragEndEvent emit:_eventEmitter index:index position:position detent:detent];
+      [TrueSheetDragEvents emitDragEnd:_eventEmitter index:index position:position detent:detent];
       break;
     default:
       break;
@@ -400,12 +406,12 @@ using namespace facebook::react;
 }
 
 - (void)viewControllerWillDismiss {
-  [OnWillDismissEvent emit:_eventEmitter];
+  [TrueSheetLifecycleEvents emitWillDismiss:_eventEmitter];
 }
 
 - (void)viewControllerDidDismiss {
   _controller.activeDetentIndex = -1;
-  [OnDidDismissEvent emit:_eventEmitter];
+  [TrueSheetLifecycleEvents emitDidDismiss:_eventEmitter];
 }
 
 - (void)viewControllerDidChangeDetent:(NSInteger)index position:(CGFloat)position {
@@ -413,26 +419,34 @@ using namespace facebook::react;
     _controller.activeDetentIndex = index;
   }
   CGFloat detent = [_controller detentValueForIndex:index];
-  [OnDetentChangeEvent emit:_eventEmitter index:index position:position detent:detent];
+  [TrueSheetStateEvents emitDetentChange:_eventEmitter index:index position:position detent:detent];
 }
 
 - (void)viewControllerDidChangePosition:(CGFloat)index
                                position:(CGFloat)position
                                  detent:(CGFloat)detent
-                          transitioning:(BOOL)transitioning {
-  [OnPositionChangeEvent emit:_eventEmitter index:index position:position detent:detent transitioning:transitioning];
+                               realtime:(BOOL)realtime {
+  [TrueSheetStateEvents emitPositionChange:_eventEmitter index:index position:position detent:detent realtime:realtime];
 }
 
 - (void)viewControllerDidChangeSize:(CGSize)size {
   [self updateStateWithSize:size];
 }
 
+- (void)viewControllerWillFocus {
+  [TrueSheetFocusEvents emitWillFocus:_eventEmitter];
+}
+
 - (void)viewControllerDidFocus {
-  [OnDidFocusEvent emit:_eventEmitter];
+  [TrueSheetFocusEvents emitDidFocus:_eventEmitter];
+}
+
+- (void)viewControllerWillBlur {
+  [TrueSheetFocusEvents emitWillBlur:_eventEmitter];
 }
 
 - (void)viewControllerDidBlur {
-  [OnDidBlurEvent emit:_eventEmitter];
+  [TrueSheetFocusEvents emitDidBlur:_eventEmitter];
 }
 
 #pragma mark - Private Helpers

package/ios/TrueSheetViewController.h

@@ -28,9 +28,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)viewControllerDidChangePosition:(CGFloat)index
                                position:(CGFloat)position
                                  detent:(CGFloat)detent
-                          transitioning:(BOOL)transitioning;
+                               realtime:(BOOL)realtime;
 - (void)viewControllerDidChangeSize:(CGSize)size;
+- (void)viewControllerWillFocus;
 - (void)viewControllerDidFocus;
+- (void)viewControllerWillBlur;
 - (void)viewControllerDidBlur;
 
 @end
@@ -50,9 +52,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong, nullable) UIColor *backgroundColor;
 @property (nonatomic, strong, nullable) NSNumber *cornerRadius;
 @property (nonatomic, assign) BOOL grabber;
+@property (nonatomic, assign) BOOL draggable;
 @property (nonatomic, assign) BOOL dimmed;
 @property (nonatomic, strong, nullable) NSNumber *dimmedDetentIndex;
 @property (nonatomic, copy, nullable) NSString *blurTint;
+@property (nonatomic, strong, nullable) NSNumber *blurIntensity;
+@property (nonatomic, assign) BOOL blurInteraction;
 @property (nonatomic, assign) BOOL pageSizing;
 @property (nonatomic, assign) BOOL layoutTransitioning;
 @property (nonatomic, assign) BOOL isPresented;
@@ -62,6 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setupActiveDetentWithIndex:(NSInteger)index;
 - (void)setupSheetDetents;
 - (void)setupSheetProps;
+- (void)updateDraggable;
 - (NSInteger)currentDetentIndex;
 - (CGFloat)currentPosition;
 - (CGFloat)bottomInset;

package/ios/TrueSheetViewController.mm

@@ -8,7 +8,7 @@
 
 #import "TrueSheetViewController.h"
 #import "TrueSheetContentView.h"
-#import "utils/ConversionUtil.h"
+#import "core/TrueSheetBlurView.h"
 #import "utils/GestureUtil.h"
 #import "utils/WindowUtil.h"
 
@@ -21,10 +21,8 @@
 
 @implementation TrueSheetViewController {
   CGFloat _lastPosition;
-  CGFloat _lastTransitionPosition;
   BOOL _isTransitioning;
   BOOL _isDragging;
-  BOOL _isTrackingPositionFromLayout;
 
   // Hidden view used to track position during native transition animations
   UIView *_fakeTransitionView;
@@ -32,6 +30,9 @@
 
   // Reference to parent TrueSheetViewController (if presented from another sheet)
   __weak TrueSheetViewController *_parentSheetController;
+
+  // Blur effect view
+  TrueSheetBlurView *_blurView;
 }
 
 #pragma mark - Initialization
@@ -42,14 +43,13 @@
     _contentHeight = @(0);
     _headerHeight = @(0);
     _grabber = YES;
+    _draggable = YES;
     _dimmed = YES;
     _dimmedDetentIndex = @(0);
     _pageSizing = YES;
     _lastPosition = 0;
-    _lastTransitionPosition = 0;
     _isTransitioning = NO;
     _isDragging = NO;
-    _isTrackingPositionFromLayout = NO;
     _layoutTransitioning = NO;
     _isPresented = NO;
     _activeDetentIndex = -1;
@@ -57,6 +57,8 @@
     _fakeTransitionView = [[UIView alloc] init];
     _fakeTransitionView.hidden = YES;
     _fakeTransitionView.userInteractionEnabled = NO;
+
+    _blurInteraction = YES;
   }
   return self;
 }
@@ -148,9 +150,9 @@
     UIViewController *presenter = self.presentingViewController;
     if ([presenter isKindOfClass:[TrueSheetViewController class]]) {
       _parentSheetController = (TrueSheetViewController *)presenter;
-      // Notify parent that it lost focus
-      if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerDidBlur)]) {
-        [_parentSheetController.delegate viewControllerDidBlur];
+      // Notify parent that it is about to lose focus
+      if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerWillBlur)]) {
+        [_parentSheetController.delegate viewControllerWillBlur];
       }
     }
 
@@ -165,6 +167,13 @@
   [super viewDidAppear:animated];
 
   if (!_isPresented) {
+    // Notify parent that it has lost focus (after the child sheet appeared)
+    if (_parentSheetController) {
+      if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerDidBlur)]) {
+        [_parentSheetController.delegate viewControllerDidBlur];
+      }
+    }
+
     if ([self.delegate respondsToSelector:@selector(viewControllerDidPresent)]) {
       [self.delegate viewControllerDidPresent];
     }
@@ -176,12 +185,22 @@
 - (void)viewWillDisappear:(BOOL)animated {
   [super viewWillDisappear:animated];
 
-  if (self.isBeingDismissed && [self.delegate respondsToSelector:@selector(viewControllerWillDismiss)]) {
-    [self.delegate viewControllerWillDismiss];
+  BOOL isActuallyDismissing = self.presentingViewController == nil || self.isBeingDismissed;
+
+  if (isActuallyDismissing) {
+    // Notify the parent sheet (if any) that it is about to regain focus
+    if (_parentSheetController) {
+      if ([_parentSheetController.delegate respondsToSelector:@selector(viewControllerWillFocus)]) {
+        [_parentSheetController.delegate viewControllerWillFocus];
+      }
+    }
+
+    if ([self.delegate respondsToSelector:@selector(viewControllerWillDismiss)]) {
+      [self.delegate viewControllerWillDismiss];
+    }
   }
 
   [self setupTransitionPositionTracking];
-  _isTrackingPositionFromLayout = NO;
 }
 
 - (void)viewDidDisappear:(BOOL)animated {
@@ -204,8 +223,6 @@
     }
   }
 
-  _isTrackingPositionFromLayout = NO;
-
   if (isActuallyDismissing) {
     _isPresented = NO;
     _activeDetentIndex = -1;
@@ -219,12 +236,9 @@
     [self.delegate viewControllerDidChangeSize:self.view.frame.size];
   }
 
-  if (!_isTransitioning && self.isActiveAndVisible) {
-    _isTrackingPositionFromLayout = YES;
-
-    // Treat position changes as transitioning when another controller is presented on top
-    [self emitChangePositionDelegateWithPosition:self.currentPosition
-                                   transitioning:_layoutTransitioning || !self.isTopmostPresentedController];
+  if (!_isTransitioning && !_isDragging && self.isActiveAndVisible) {
+    // Not realtime when layout changes (e.g., another controller is presented on top)
+    [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO];
 
     // On iOS 26, this is called twice when we have a ScrollView
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -255,6 +269,21 @@
   if (!presentedView)
     return;
 
+  // Disable pan gestures if draggable is NO
+  if (!self.draggable) {
+    [GestureUtil setPanGesturesEnabled:NO forView:presentedView];
+
+    // Also disable ScrollView's pan gesture if present
+    TrueSheetContentView *contentView = [self findContentView:presentedView];
+    if (contentView) {
+      RCTScrollViewComponentView *scrollViewComponent = [contentView findScrollView:nil];
+      if (scrollViewComponent && scrollViewComponent.scrollView) {
+        [GestureUtil setPanGesturesEnabled:NO forView:scrollViewComponent.scrollView];
+      }
+    }
+    return;
+  }
+
   // Attach to presented view's pan gesture (sheet's drag gesture from UIKit)
   [GestureUtil attachPanGestureHandler:presentedView target:self selector:@selector(handlePanGesture:)];
 
@@ -270,6 +299,23 @@
   }
 }
 
+- (void)updateDraggable {
+  UIView *presentedView = self.presentedView;
+  if (!presentedView)
+    return;
+
+  [GestureUtil setPanGesturesEnabled:self.draggable forView:presentedView];
+
+  // Also update ScrollView's pan gesture if present
+  TrueSheetContentView *contentView = [self findContentView:presentedView];
+  if (contentView) {
+    RCTScrollViewComponentView *scrollViewComponent = [contentView findScrollView:nil];
+    if (scrollViewComponent && scrollViewComponent.scrollView) {
+      [GestureUtil setPanGesturesEnabled:self.draggable forView:scrollViewComponent.scrollView];
+    }
+  }
+}
+
 - (void)handlePanGesture:(UIPanGestureRecognizer *)gesture {
   NSInteger index = [self currentDetentIndex];
 
@@ -282,14 +328,16 @@
       _isDragging = YES;
       break;
     case UIGestureRecognizerStateChanged:
-      if (!_isTrackingPositionFromLayout) {
-        [self emitChangePositionDelegateWithPosition:self.currentPosition transitioning:NO];
-      }
+      [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:YES];
       break;
     case UIGestureRecognizerStateEnded:
-    case UIGestureRecognizerStateCancelled:
-      _isDragging = NO;
+    case UIGestureRecognizerStateCancelled: {
+      [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO];
+      dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        self->_isDragging = NO;
+      });
       break;
+    }
     default:
       break;
   }
@@ -297,15 +345,16 @@
 
 #pragma mark - Position Tracking
 
-- (void)emitChangePositionDelegateWithPosition:(CGFloat)position transitioning:(BOOL)transitioning {
-  if (_lastPosition != position) {
+- (void)emitChangePositionDelegateWithPosition:(CGFloat)position realtime:(BOOL)realtime {
+  // Use epsilon comparison to avoid missing updates due to floating point precision
+  if (fabs(_lastPosition - position) > 0.01) {
     _lastPosition = position;
 
     CGFloat index = [self interpolatedIndexForPosition:position];
     NSInteger discreteIndex = (NSInteger)round(index);
     CGFloat detent = [self detentValueForIndex:discreteIndex];
-    if ([self.delegate respondsToSelector:@selector(viewControllerDidChangePosition:position:detent:transitioning:)]) {
-      [self.delegate viewControllerDidChangePosition:index position:position detent:detent transitioning:transitioning];
+    if ([self.delegate respondsToSelector:@selector(viewControllerDidChangePosition:position:detent:realtime:)]) {
+      [self.delegate viewControllerDidChangePosition:index position:position detent:detent realtime:realtime];
     }
   }
 }
@@ -395,8 +444,6 @@
     finalFrame.origin.y = presentedView.frame.origin.y;
     self->_fakeTransitionView.frame = finalFrame;
 
-    self->_lastTransitionPosition = finalFrame.origin.y;
-
     // Track position at screen refresh rate via display link
     self->_displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(trackTransitionPosition:)];
     [self->_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
@@ -422,18 +469,12 @@
   CALayer *presentationLayer = _fakeTransitionView.layer.presentationLayer;
 
   if (presentationLayer) {
-    BOOL transitioning = NO;
-    CGFloat position = presentationLayer.frame.origin.y;
+    CGFloat transitioningPosition = presentationLayer.frame.origin.y;
+    CGFloat staticPosition = _fakeTransitionView.frame.origin.y;
 
-    // If position matches last transition position (within epsilon), sheet is repositioning after drag
-    if (fabs(_lastTransitionPosition - position) < 0.5) {
-      transitioning = YES;
-      position = presentedView.frame.origin.y;
-    } else {
-      _lastTransitionPosition = position;
+    if (fabs(staticPosition - transitioningPosition) > 0.01) {
+      [self emitChangePositionDelegateWithPosition:transitioningPosition realtime:YES];
     }
-
-    [self emitChangePositionDelegateWithPosition:position transitioning:transitioning];
   }
 }
 
@@ -447,7 +488,7 @@
   NSMutableArray<UISheetPresentationControllerDetent *> *detents = [NSMutableArray array];
 
   // Subtract bottomInset to prevent iOS from adding extra bottom insets
-  CGFloat autoHeight = [self.contentHeight floatValue] + [self.headerHeight floatValue] - self.bottomInset;
+  CGFloat autoHeight = [self.contentHeight floatValue] + [self.headerHeight floatValue];
 
   for (NSInteger index = 0; index < self.detents.count; index++) {
     id detent = self.detents[index];
@@ -597,7 +638,7 @@
   }
 
   sheet.prefersEdgeAttachedInCompactHeight = YES;
-  sheet.prefersGrabberVisible = self.grabber;
+  sheet.prefersGrabberVisible = self.grabber && self.draggable;
 
   if (self.cornerRadius) {
     sheet.preferredCornerRadius = [self.cornerRadius floatValue];
@@ -609,16 +650,25 @@
 
   // Setup or remove blur effect
   if (self.blurTint && self.blurTint.length > 0) {
-    UIBlurEffectStyle style = [ConversionUtil blurEffectStyleFromString:self.blurTint];
-    UIVisualEffectView *blurView = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:style]];
-    blurView.frame = self.view.bounds;
-    blurView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    [self.view insertSubview:blurView atIndex:0];
+    // Create blur view if needed
+    if (!_blurView) {
+      _blurView = [[TrueSheetBlurView alloc] init];
+      _blurView.frame = self.view.bounds;
+      _blurView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+      [self.view insertSubview:_blurView atIndex:0];
+    }
+
+    // Update blur properties and apply effect
+    _blurView.blurTint = self.blurTint;
+    _blurView.blurIntensity = self.blurIntensity;
+    _blurView.blurInteraction = self.blurInteraction;
+    [_blurView applyBlurEffect];
   } else {
-    for (UIView *subview in self.view.subviews) {
-      if ([subview isKindOfClass:[UIVisualEffectView class]]) {
-        [subview removeFromSuperview];
-      }
+    // Remove blur effect
+    if (_blurView) {
+      [_blurView removeBlurEffect];
+      [_blurView removeFromSuperview];
+      _blurView = nil;
     }
   }
 }

package/ios/core/TrueSheetBlurView.h

@@ -0,0 +1,24 @@
+//
+//  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
+
+@interface TrueSheetBlurView : UIVisualEffectView
+
+@property (nonatomic, copy, nullable) NSString *blurTint;
+@property (nonatomic, strong, nullable) NSNumber *blurIntensity;
+@property (nonatomic, assign) BOOL blurInteraction;
+
+- (void)applyBlurEffect;
+- (void)removeBlurEffect;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/{utils/ConversionUtil.mm → core/TrueSheetBlurView.mm}

@@ -6,9 +6,13 @@
 //  LICENSE file in the root directory of this source tree.
 //
 
-#import "ConversionUtil.h"
+#import "TrueSheetBlurView.h"
 
-@implementation ConversionUtil
+@implementation TrueSheetBlurView {
+  UIViewPropertyAnimator *_blurAnimator;
+}
+
+#pragma mark - Private
 
 + (UIBlurEffectStyle)blurEffectStyleFromString:(NSString *)tintString {
   static NSDictionary<NSString *, NSNumber *> *styleMap = nil;
@@ -43,8 +47,66 @@
     return (UIBlurEffectStyle)[style integerValue];
   }
 
-  // Default to light if not recognized
   return UIBlurEffectStyleLight;
 }
 
+#pragma mark - Initialization
+
+- (instancetype)init {
+  if (self = [super init]) {
+    _blurInteraction = YES;
+  }
+  return self;
+}
+
+#pragma mark - Public
+
+- (void)applyBlurEffect {
+  if (!self.blurTint || self.blurTint.length == 0) {
+    [self removeBlurEffect];
+    return;
+  }
+
+  // Stop and clear existing animator
+  if (_blurAnimator) {
+    [_blurAnimator stopAnimation:YES];
+    _blurAnimator = nil;
+  }
+
+  // Clear existing effect
+  self.effect = nil;
+
+  UIBlurEffectStyle style = [TrueSheetBlurView blurEffectStyleFromString:self.blurTint];
+  UIBlurEffect *blurEffect = [UIBlurEffect effectWithStyle:style];
+
+  self.userInteractionEnabled = self.blurInteraction;
+
+  // Use animator to control blur intensity
+  __weak typeof(self) weakSelf = self;
+  _blurAnimator = [[UIViewPropertyAnimator alloc] initWithDuration:1.0
+                                                             curve:UIViewAnimationCurveLinear
+                                                        animations:^{
+                                                          weakSelf.effect = blurEffect;
+                                                        }];
+  _blurAnimator.pausesOnCompletion = YES;
+
+  // Set intensity: nil means system default (100%), otherwise use provided value (0-100)
+  CGFloat intensity =
+    (self.blurIntensity && [self.blurIntensity floatValue] >= 0) ? [self.blurIntensity floatValue] / 100.0 : 1.0;
+  _blurAnimator.fractionComplete = intensity;
+}
+
+- (void)removeBlurEffect {
+  if (_blurAnimator) {
+    [_blurAnimator stopAnimation:YES];
+    _blurAnimator = nil;
+  }
+
+  self.effect = nil;
+}
+
+- (void)dealloc {
+  [self removeBlurEffect];
+}
+
 @end

package/ios/events/TrueSheetDragEvents.h

@@ -0,0 +1,39 @@
+//
+//  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.
+//
+
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <Foundation/Foundation.h>
+#import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
+
+using namespace facebook::react;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TrueSheetDragEvents : NSObject
+
++ (void)emitDragBegin:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter
+                index:(NSInteger)index
+             position:(CGFloat)position
+               detent:(CGFloat)detent;
+
++ (void)emitDragChange:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter
+                 index:(NSInteger)index
+              position:(CGFloat)position
+                detent:(CGFloat)detent;
+
++ (void)emitDragEnd:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter
+              index:(NSInteger)index
+           position:(CGFloat)position
+             detent:(CGFloat)detent;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif  // RCT_NEW_ARCH_ENABLED