@lodev09/react-native-true-sheet 4.0.0-beta.0 → 4.0.0-beta.10

package/ios/TrueSheetFooterView.mm

@@ -9,18 +9,24 @@
 #ifdef RCT_NEW_ARCH_ENABLED
 
 #import "TrueSheetFooterView.h"
-#import <react/renderer/components/TrueSheetSpec/ComponentDescriptors.h>
 #import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
 #import <react/renderer/components/TrueSheetSpec/Props.h>
 #import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
+#import <react/renderer/components/TrueSheetSpec/TrueSheetFooterViewComponentDescriptor.h>
+#import <react/renderer/components/TrueSheetSpec/TrueSheetFooterViewShadowNode.h>
 #import "TrueSheetViewController.h"
-#import "utils/LayoutUtil.h"
+#import "utils/UIView+ScrollEdgeInteraction.h"
 
 using namespace facebook::react;
 
 @implementation TrueSheetFooterView {
+  TrueSheetFooterViewShadowNode::ConcreteState::Shared _state;
   CGFloat _lastHeight;
-  BOOL _didInitialLayout;
+  CGFloat _currentKeyboardOffset;
+  CGFloat _bottomInset;
+  BOOL _keyboardVisible;
+  BOOL _didPushBottomInset;
+  CGFloat _appliedBottomInset;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider {
@@ -32,70 +38,216 @@ using namespace facebook::react;
     static const auto defaultProps = std::make_shared<const TrueSheetFooterViewProps>();
     _props = defaultProps;
 
-    // Set background color to clear by default
     self.backgroundColor = [UIColor clearColor];
+    self.isAccessibilityElement = NO;
 
     _lastHeight = 0;
-    _didInitialLayout = NO;
+    _currentKeyboardOffset = 0;
+    _bottomInset = 0;
+    _keyboardVisible = NO;
+    _didPushBottomInset = NO;
+    _appliedBottomInset = 0;
   }
   return self;
 }
 
-- (void)setupConstraintsWithHeight:(CGFloat)height {
-  UIView *parentView = self.superview;
-  if (!parentView) {
+- (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState {
+  _state = std::static_pointer_cast<TrueSheetFooterViewShadowNode::ConcreteState const>(state);
+}
+
+// Tells the shadow node to pad the footer's bottom edge with the sheet's
+// bottom safe-area inset — the footer owns the sheet's bottom edge, so it
+// absorbs the inset and its background fills it.
+- (void)setBottomInset:(CGFloat)bottomInset {
+  // The first push must go through even when the value matches the ivar
+  // default (0) — it marks the state initialized so the shadow node stops
+  // seeding from the app-wide precalculated inset, which may belong to
+  // another sheet (e.g. a floating sheet whose real inset is 0).
+  if (_didPushBottomInset && _bottomInset == bottomInset) {
     return;
   }
+  _bottomInset = bottomInset;
+  [self pushBottomInsetState];
+}
 
-  // Remove existing constraints before applying new ones
-  [LayoutUtil unpinView:self];
+// Skipped while the keyboard is open — an absolute footer rises above the
+// keyboard, so the inset would leave a gap.
+- (void)setKeyboardVisible:(BOOL)keyboardVisible {
+  if (_keyboardVisible == keyboardVisible) {
+    return;
+  }
+  _keyboardVisible = keyboardVisible;
+  [self pushBottomInsetState];
+}
 
-  // Pin footer to bottom and sides of container with specific height
-  [LayoutUtil pinView:self
-         toParentView:parentView
-                edges:UIRectEdgeLeft | UIRectEdgeRight | UIRectEdgeBottom
-               height:height];
+- (void)pushBottomInsetState {
+  if (!_state) {
+    return;
+  }
 
-  _lastHeight = height;
+  TrueSheetFooterViewState newState;
+  newState.bottomInset = _keyboardVisible ? 0 : _bottomInset;
+  newState.initialized = true;
+  // Immediate so the inset lands before anything reads the footer's height —
+  // the async path races the keyboard caret scroll and detent setup, leaving
+  // them an inset stale (same reason Android bridges through
+  // TrueSheetStateUpdater).
+  _state->updateState(std::move(newState), EventQueue::UpdateMode::unstable_Immediate);
+  _didPushBottomInset = YES;
 }
 
-- (void)didMoveToSuperview {
-  [super didMoveToSuperview];
+// The inset baked into the current layout by the shadow node (pushed or
+// seeded — see TrueSheetFooterViewShadowNode). Refreshed in
+// updateLayoutMetrics so it always pairs with the measured height.
+- (CGFloat)appliedBottomInset {
+  return _appliedBottomInset;
+}
+
+// Height the footer occupies above the keyboard — its layout height minus the
+// safe-area inset it drops while the keyboard is open.
+- (CGFloat)keyboardOcclusionHeight {
+  return MAX(0, _lastHeight - (_keyboardVisible ? 0 : _bottomInset));
+}
 
-  // Setup footer constraints when added to container
-  if (self.superview) {
-    CGFloat initialHeight = self.frame.size.height;
-    [self setupConstraintsWithHeight:initialHeight];
+#pragma mark - Accessibility
+
+- (NSArray *)accessibilityElements {
+  NSMutableArray *elements = [NSMutableArray array];
+  [self collectAccessibilityElementsFromView:self into:elements];
+  if (elements.count > 0) {
+    return elements;
+  }
+
+  return [super accessibilityElements];
+}
+
+- (void)collectAccessibilityElementsFromView:(UIView *)view into:(NSMutableArray *)elements {
+  for (UIView *subview in view.subviews) {
+    if (subview.isAccessibilityElement || subview.accessibilityLabel || subview.accessibilityIdentifier) {
+      [elements addObject:subview];
+    } else if (subview.accessibilityElements.count > 0) {
+      [elements addObjectsFromArray:subview.accessibilityElements];
+    } else {
+      [self collectAccessibilityElementsFromView:subview into:elements];
+    }
   }
 }
 
+#pragma mark - Layout
+
 - (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
            oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics {
-  CGFloat height = layoutMetrics.frame.size.height;
-
-  // On initial layout, call super to let React Native position the view
-  // After that, we use Auto Layout constraints instead
-  if (!_didInitialLayout) {
-    [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
-    _didInitialLayout = YES;
+  [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+
+  // State lands before layout metrics within the same mount transaction, so
+  // this reflects the inset the shadow node baked into this frame — seeded
+  // values are recorded back into the state at layout time (see
+  // TrueSheetFooterViewShadowNode).
+  CGFloat previousAppliedBottomInset = _appliedBottomInset;
+  if (_state) {
+    _appliedBottomInset = _state->getData().bottomInset;
   }
 
-  // Update footer constraints when height changes
-  if (height != _lastHeight) {
-    [self setupConstraintsWithHeight:height];
+  CGFloat height = layoutMetrics.frame.size.height;
+  // An inset change alone (fixed-height footer: padding moves, frame doesn't)
+  // still changes what's baked in — report so the controller re-pairs.
+  if (height != _lastHeight || _appliedBottomInset != previousAppliedBottomInset) {
+    _lastHeight = height;
+    [self.delegate footerViewDidChangeSize:CGSizeMake(layoutMetrics.frame.size.width, height)];
   }
 }
 
 - (void)prepareForRecycle {
   [super prepareForRecycle];
 
-  // Remove footer constraints
-  [LayoutUtil unpinView:self];
+  if (@available(iOS 26.0, *)) {
+    [self cleanupEdgeInteraction];
+  }
 
+  self.transform = CGAffineTransformIdentity;
+  _state = nullptr;
   _lastHeight = 0;
-  _didInitialLayout = NO;
+  _currentKeyboardOffset = 0;
+  _bottomInset = 0;
+  _keyboardVisible = NO;
+  _didPushBottomInset = NO;
+  _appliedBottomInset = 0;
+}
+
+#pragma mark - TrueSheetKeyboardObserverDelegate
+
+// Yoga owns the footer's frame (pinned to the container's bottom edge), so the
+// keyboard slide is carried by a transform instead of layout. Only an absolute
+// footer floats above the keyboard — a relative footer stays in the layout
+// flow behind it.
+- (void)keyboardWillShow:(CGFloat)height duration:(NSTimeInterval)duration curve:(UIViewAnimationOptions)curve {
+  if (!self.keyboardObserver.viewController.absoluteFooter) {
+    return;
+  }
+
+  [self setKeyboardVisible:YES];
+
+  CGFloat keyboardOffset = self.keyboardObserver.viewController.footerKeyboardOffset;
+  CGFloat slide = MAX(0, height + keyboardOffset);
+  _currentKeyboardOffset = slide;
+
+  [UIView animateWithDuration:duration
+                        delay:0
+                      options:curve | UIViewAnimationOptionBeginFromCurrentState
+                   animations:^{
+                     self.transform = CGAffineTransformMakeTranslation(0, -slide);
+                     [self syncEdgeEffect];
+                   }
+                   completion:nil];
+}
+
+- (void)keyboardWillHide:(NSTimeInterval)duration curve:(UIViewAnimationOptions)curve {
+  [self setKeyboardVisible:NO];
+  _currentKeyboardOffset = 0;
+
+  [UIView animateWithDuration:duration
+                        delay:0
+                      options:curve | UIViewAnimationOptionBeginFromCurrentState
+                   animations:^{
+                     self.transform = CGAffineTransformIdentity;
+                     [self syncEdgeEffect];
+                   }
+                   completion:nil];
+}
+
+// UIKit derives the edge effect region from model geometry at commit time,
+// outside our animation context — the blur snaps to the footer's final
+// position while the footer is still animating. Re-evaluating the scroll
+// view's layout inside the animation block makes the region change inherit
+// the keyboard curve.
+- (void)syncEdgeEffect {
+  if (@available(iOS 26.0, *)) {
+    UIScrollView *scrollView = [self edgeInteractionScrollView];
+    if (scrollView) {
+      [scrollView setNeedsLayout];
+      [scrollView layoutIfNeeded];
+    }
+  }
+}
+
+- (void)applyKeyboardOffset {
+  CGFloat height = self.keyboardObserver.currentHeight;
+  if (height <= 0 || !self.keyboardObserver.viewController.absoluteFooter) {
+    return;
+  }
+
+  [self setKeyboardVisible:YES];
+
+  CGFloat keyboardOffset = self.keyboardObserver.viewController.footerKeyboardOffset;
+  CGFloat slide = MAX(0, height + keyboardOffset);
+  _currentKeyboardOffset = slide;
+  self.transform = CGAffineTransformMakeTranslation(0, -slide);
 }
 
 @end
 
+Class<RCTComponentViewProtocol> TrueSheetFooterViewCls(void) {
+  return TrueSheetFooterView.class;
+}
+
 #endif

package/ios/{events/OnWillDismissEvent.h → TrueSheetHeaderView.h}

@@ -8,19 +8,22 @@
 
 #ifdef RCT_NEW_ARCH_ENABLED
 
-#import <Foundation/Foundation.h>
-#import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
-
-using namespace facebook::react;
+#import <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface OnWillDismissEvent : NSObject
+@protocol TrueSheetHeaderViewDelegate <NSObject>
+@optional
+- (void)headerViewDidChangeSize:(CGSize)size;
+@end
+
+@interface TrueSheetHeaderView : RCTViewComponentView
 
-+ (void)emit:(std::shared_ptr<const facebook::react::EventEmitter>)eventEmitter;
+@property (nonatomic, weak, nullable) id<TrueSheetHeaderViewDelegate> delegate;
 
 @end
 
 NS_ASSUME_NONNULL_END
 
-#endif  // RCT_NEW_ARCH_ENABLED
+#endif

package/ios/TrueSheetHeaderView.mm

@@ -0,0 +1,64 @@
+//
+//  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 "TrueSheetHeaderView.h"
+#import <react/renderer/components/TrueSheetSpec/ComponentDescriptors.h>
+#import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
+#import <react/renderer/components/TrueSheetSpec/Props.h>
+#import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
+#import "utils/UIView+ScrollEdgeInteraction.h"
+
+using namespace facebook::react;
+
+@implementation TrueSheetHeaderView {
+  CGSize _lastSize;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider {
+  return concreteComponentDescriptorProvider<TrueSheetHeaderViewComponentDescriptor>();
+}
+
+- (instancetype)initWithFrame:(CGRect)frame {
+  if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const TrueSheetHeaderViewProps>();
+    _props = defaultProps;
+
+    _lastSize = CGSizeZero;
+  }
+  return self;
+}
+
+- (void)updateLayoutMetrics:(const facebook::react::LayoutMetrics &)layoutMetrics
+           oldLayoutMetrics:(const facebook::react::LayoutMetrics &)oldLayoutMetrics {
+  [super updateLayoutMetrics:layoutMetrics oldLayoutMetrics:oldLayoutMetrics];
+
+  CGSize newSize = CGSizeMake(layoutMetrics.frame.size.width, layoutMetrics.frame.size.height);
+
+  if (!CGSizeEqualToSize(newSize, _lastSize)) {
+    _lastSize = newSize;
+    [self.delegate headerViewDidChangeSize:newSize];
+  }
+}
+
+- (void)prepareForRecycle {
+  [super prepareForRecycle];
+  _lastSize = CGSizeZero;
+  if (@available(iOS 26.0, *)) {
+    [self cleanupEdgeInteraction];
+  }
+}
+
+@end
+
+Class<RCTComponentViewProtocol> TrueSheetHeaderViewCls(void) {
+  return TrueSheetHeaderView.class;
+}
+
+#endif

package/ios/TrueSheetModule.h

@@ -27,16 +27,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * Register a sheet component view with its React tag
- * Called automatically by TrueSheetView during initialization
+ * Called automatically by TrueSheetView when it attaches to a window.
+ * The registry holds views weakly, so no unregistration is needed.
  */
 + (void)registerView:(TrueSheetView *)view withTag:(NSNumber *)tag;
 
-/**
- * Unregister a sheet component view
- * Called automatically by TrueSheetView during dealloc
- */
-+ (void)unregisterViewWithTag:(NSNumber *)tag;
-
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/TrueSheetModule.mm

@@ -14,11 +14,13 @@
 #import "TrueSheetModule.h"
 #import <React/RCTUtils.h>
 #import "TrueSheetView.h"
+#import "TrueSheetViewController.h"
 
 #import <TrueSheetSpec/TrueSheetSpec.h>
 
-// Static registry to store view references by tag
-static NSMutableDictionary<NSNumber *, TrueSheetView *> *viewRegistry;
+// Static registry of live hosts by tag — weak so an unmounted host deallocates
+// (RN zeroes the tag before teardown, so hosts can't unregister themselves)
+static NSMapTable<NSNumber *, TrueSheetView *> *viewRegistry;
 
 @interface TrueSheetModule () <NativeTrueSheetModuleSpec>
 @end
@@ -29,7 +31,7 @@ RCT_EXPORT_MODULE(TrueSheetModule)
 
 + (void)initialize {
   if (self == [TrueSheetModule class]) {
-    viewRegistry = [NSMutableDictionary new];
+    viewRegistry = [NSMapTable strongToWeakObjectsMapTable];
   }
 }
 
@@ -46,6 +48,7 @@ RCT_EXPORT_MODULE(TrueSheetModule)
 
 - (void)presentByRef:(double)viewTag
                index:(double)index
+            animated:(BOOL)animated
              resolve:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject {
   RCTExecuteOnMainQueue(^{
@@ -57,7 +60,7 @@ RCT_EXPORT_MODULE(TrueSheetModule)
     }
 
     [trueSheetView presentAtIndex:(NSInteger)index
-                         animated:YES
+                         animated:animated
                        completion:^(BOOL success, NSError *_Nullable error) {
                          if (success) {
                            resolve(nil);
@@ -68,7 +71,10 @@ RCT_EXPORT_MODULE(TrueSheetModule)
   });
 }
 
-- (void)dismissByRef:(double)viewTag resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+- (void)dismissByRef:(double)viewTag
+            animated:(BOOL)animated
+             resolve:(RCTPromiseResolveBlock)resolve
+              reject:(RCTPromiseRejectBlock)reject {
   RCTExecuteOnMainQueue(^{
     TrueSheetView *trueSheetView = [TrueSheetModule getTrueSheetViewByTag:@((NSInteger)viewTag)];
 
@@ -77,7 +83,7 @@ RCT_EXPORT_MODULE(TrueSheetModule)
       return;
     }
 
-    [trueSheetView dismissAnimated:YES
+    [trueSheetView dismissAnimated:animated
                         completion:^(BOOL success, NSError *_Nullable error) {
                           if (success) {
                             resolve(nil);
@@ -88,12 +94,94 @@ RCT_EXPORT_MODULE(TrueSheetModule)
   });
 }
 
+- (void)dismissStackByRef:(double)viewTag
+                 animated:(BOOL)animated
+                  resolve:(RCTPromiseResolveBlock)resolve
+                   reject:(RCTPromiseRejectBlock)reject {
+  RCTExecuteOnMainQueue(^{
+    TrueSheetView *trueSheetView = [TrueSheetModule getTrueSheetViewByTag:@((NSInteger)viewTag)];
+
+    if (!trueSheetView) {
+      reject(@"SHEET_NOT_FOUND", [NSString stringWithFormat:@"No sheet found with tag %d", (int)viewTag], nil);
+      return;
+    }
+
+    [trueSheetView
+      dismissStackAnimated:animated
+                completion:^(BOOL success, NSError *_Nullable error) {
+                  if (success) {
+                    resolve(nil);
+                  } else {
+                    reject(@"DISMISS_FAILED", error.localizedDescription ?: @"Failed to dismiss stack", error);
+                  }
+                }];
+  });
+}
+
 - (void)resizeByRef:(double)viewTag
               index:(double)index
             resolve:(RCTPromiseResolveBlock)resolve
              reject:(RCTPromiseRejectBlock)reject {
-  // Resize is just present with a different index
-  [self presentByRef:viewTag index:index resolve:resolve reject:reject];
+  RCTExecuteOnMainQueue(^{
+    TrueSheetView *trueSheetView = [TrueSheetModule getTrueSheetViewByTag:@((NSInteger)viewTag)];
+
+    if (!trueSheetView) {
+      reject(@"SHEET_NOT_FOUND", [NSString stringWithFormat:@"No sheet found with tag %d", (int)viewTag], nil);
+      return;
+    }
+
+    [trueSheetView resizeToIndex:(NSInteger)index
+                      completion:^(BOOL success, NSError *_Nullable error) {
+                        if (success) {
+                          resolve(nil);
+                        } else {
+                          reject(@"RESIZE_FAILED", error.localizedDescription ?: @"Failed to resize sheet", error);
+                        }
+                      }];
+  });
+}
+
+- (void)handleBackPress:(double)viewTag resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+  // No-op on iOS — no hardware back button
+  resolve(nil);
+}
+
+- (void)dismissAll:(BOOL)animated resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+  RCTExecuteOnMainQueue(^{
+    @synchronized(viewRegistry) {
+      // Find the root presented sheet (one without a parent TrueSheet)
+      TrueSheetView *rootSheet = nil;
+
+      for (TrueSheetView *view in viewRegistry.objectEnumerator) {
+        if (!view.viewController.isPresented) {
+          continue;
+        }
+
+        UIViewController *presenter = view.viewController.presentingViewController;
+        BOOL hasParentSheet = [presenter isKindOfClass:[TrueSheetViewController class]];
+
+        if (!hasParentSheet) {
+          rootSheet = view;
+          break;
+        }
+      }
+
+      if (!rootSheet) {
+        resolve(nil);
+        return;
+      }
+
+      [rootSheet emitDismissedPosition];
+      [rootSheet dismissAnimated:animated
+                      completion:^(BOOL success, NSError *_Nullable error) {
+                        if (success) {
+                          resolve(nil);
+                        } else {
+                          reject(@"DISMISS_FAILED", error.localizedDescription ?: @"Failed to dismiss sheets", error);
+                        }
+                      }];
+    }
+  });
 }
 
 #pragma mark - Helper Methods
@@ -104,7 +192,7 @@ RCT_EXPORT_MODULE(TrueSheetModule)
   }
 
   @synchronized(viewRegistry) {
-    return viewRegistry[reactTag];
+    return [viewRegistry objectForKey:reactTag];
   }
 }
 
@@ -114,17 +202,7 @@ RCT_EXPORT_MODULE(TrueSheetModule)
   }
 
   @synchronized(viewRegistry) {
-    viewRegistry[tag] = view;
-  }
-}
-
-+ (void)unregisterViewWithTag:(NSNumber *)tag {
-  if (!tag) {
-    return;
-  }
-
-  @synchronized(viewRegistry) {
-    [viewRegistry removeObjectForKey:tag];
+    [viewRegistry setObject:view forKey:tag];
   }
 }
 

package/ios/TrueSheetOverlayView.h

@@ -0,0 +1,32 @@
+//
+//  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 <React/RCTViewComponentView.h>
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Hidden host that renders its children in a container attached directly to
+ * the window, above every presented sheet.
+ */
+@interface TrueSheetOverlayView : RCTViewComponentView
+
+/**
+ * Re-stacks every overlay container above the window's other subviews.
+ * Called when a sheet presents, since presenting adds its transition view on top.
+ */
++ (void)bringOverlaysToFrontInWindow:(nullable UIWindow *)window;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif