refactor: rename scrollViewPinning to scrollable

Author: lodev09

android/src/main/java/com/lodev09/truesheet/TrueSheetContainerView.kt

@@ -37,7 +37,7 @@ class TrueSheetContainerView(reactContext: ThemedReactContext) :
 
   var insetAdjustment: String = "automatic"
   var scrollViewBottomInset: Int = 0
-  var scrollViewPinningEnabled: Boolean = false
+  var scrollableEnabled: Boolean = false
   var scrollableOptions: ReadableMap? = null
     set(value) {
       field = value
@@ -53,9 +53,9 @@ class TrueSheetContainerView(reactContext: ThemedReactContext) :
     clipToPadding = false
   }
 
-  fun setupContentScrollViewPinning() {
+  fun setupScrollable() {
     val bottomInset = if (insetAdjustment == "automatic") scrollViewBottomInset else 0
-    contentView?.setupScrollViewPinning(scrollViewPinningEnabled, bottomInset)
+    contentView?.setupScrollable(scrollableEnabled, bottomInset)
   }
 
   fun setupKeyboardHandler() {

android/src/main/java/com/lodev09/truesheet/TrueSheetContentView.kt

@@ -52,9 +52,9 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
     }
   }
 
-  fun setupScrollViewPinning(enabled: Boolean, bottomInset: Int) {
+  fun setupScrollable(enabled: Boolean, bottomInset: Int) {
     if (!enabled) {
-      clearScrollViewPinning()
+      clearScrollable()
       return
     }
 
@@ -89,7 +89,7 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
     }
   }
 
-  fun clearScrollViewPinning() {
+  fun clearScrollable() {
     pinnedScrollView?.setPadding(
       pinnedScrollView!!.paddingLeft,
       pinnedScrollView!!.paddingTop,

android/src/main/java/com/lodev09/truesheet/TrueSheetView.kt

@@ -120,7 +120,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     if (child is TrueSheetContainerView) {
       child.delegate = this
       viewController.createSheet()
-      setupContentScrollViewPinning()
+      setupScrollable()
 
       val surfaceId = UIManagerHelper.getSurfaceId(this)
       eventDispatcher?.dispatchEvent(MountEvent(surfaceId, id))
@@ -186,7 +186,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
    * Reconfigures the sheet if it's currently presented.
    */
   fun finalizeUpdates() {
-    setupContentScrollViewPinning()
+    setupScrollable()
 
     if (viewController.isPresented) {
       viewController.sheetView?.setupBackground()
@@ -256,26 +256,26 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   fun setInsetAdjustment(insetAdjustment: String) {
     viewController.insetAdjustment = insetAdjustment
-    setupContentScrollViewPinning()
+    setupScrollable()
   }
 
   fun setScrollable(scrollable: Boolean) {
     viewController.scrollable = scrollable
-    setupContentScrollViewPinning()
+    setupScrollable()
   }
 
   fun setScrollableOptions(options: ReadableMap?) {
     viewController.scrollableOptions = options
-    setupContentScrollViewPinning()
+    setupScrollable()
   }
 
-  private fun setupContentScrollViewPinning() {
+  private fun setupScrollable() {
     viewController.containerView?.let {
       it.insetAdjustment = viewController.insetAdjustment
-      it.scrollViewPinningEnabled = viewController.scrollable
+      it.scrollableEnabled = viewController.scrollable
       it.scrollViewBottomInset = viewController.contentBottomInset
       it.scrollableOptions = viewController.scrollableOptions
-      it.setupContentScrollViewPinning()
+      it.setupScrollable()
     }
   }
 

example/shared/src/components/sheets/PromptSheet.tsx

@@ -92,6 +92,7 @@ export const PromptSheet = forwardRef((props: PromptSheetProps, ref: Ref<TrueShe
         nestedScrollEnabled
         keyboardShouldPersistTaps="handled"
         contentContainerStyle={styles.content}
+        scrollIndicatorInsets={{ bottom: FOOTER_HEIGHT }}
       >
         <Input ref={input1Ref} placeholder="First name" />
         <Input ref={input2Ref} placeholder="Last name" />

ios/TrueSheetContainerView.h

@@ -39,12 +39,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, weak, nullable) id<TrueSheetContainerViewDelegate> delegate;
 
 /**
- * Enable ScrollView pinning
+ * Enable scrollable content
  */
-@property (nonatomic, assign) BOOL scrollViewPinningEnabled;
+@property (nonatomic, assign) BOOL scrollableEnabled;
 
 /**
- * Inset adjustment mode for pinned ScrollView
+ * Inset adjustment mode for scrollable content
  */
 @property (nonatomic, copy, nullable) NSString *insetAdjustment;
 
@@ -69,9 +69,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)layoutFooter;
 
 /**
- * Setup ScrollView pinning
+ * Setup scrollable content
  */
-- (void)setupContentScrollViewPinning;
+- (void)setupScrollable;
 
 /**
  * Setup keyboard observer for content and footer

ios/TrueSheetContainerView.mm

@@ -34,7 +34,7 @@ @implementation TrueSheetContainerView {
   TrueSheetHeaderView *_headerView;
   TrueSheetFooterView *_footerView;
   TrueSheetKeyboardObserver *_keyboardObserver;
-  BOOL _scrollViewPinningSet;
+  BOOL _scrollableSet;
 }
 
 #pragma mark - Initialization
@@ -52,7 +52,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
     _contentView = nil;
     _headerView = nil;
     _footerView = nil;
-    _scrollViewPinningSet = NO;
+    _scrollableSet = NO;
   }
   return self;
 }
@@ -81,9 +81,9 @@ - (void)layoutFooter {
   }
 }
 
-- (void)setScrollViewPinningEnabled:(BOOL)scrollViewPinningEnabled {
-  _scrollViewPinningEnabled = scrollViewPinningEnabled;
-  _scrollViewPinningSet = YES;
+- (void)setScrollableEnabled:(BOOL)scrollableEnabled {
+  _scrollableEnabled = scrollableEnabled;
+  _scrollableSet = YES;
 }
 
 - (void)setScrollableOptions:(NSDictionary *)scrollableOptions {
@@ -96,13 +96,13 @@ - (void)setScrollableOptions:(NSDictionary *)scrollableOptions {
   }
 }
 
-- (void)setupContentScrollViewPinning {
-  if (_scrollViewPinningSet && _contentView) {
+- (void)setupScrollable {
+  if (_scrollableSet && _contentView) {
     CGFloat bottomInset = 0;
     if ([_insetAdjustment isEqualToString:@"automatic"]) {
       bottomInset = [WindowUtil keyWindow].safeAreaInsets.bottom;
     }
-    [_contentView setupScrollViewPinning:_scrollViewPinningEnabled bottomInset:bottomInset];
+    [_contentView setupScrollable:_scrollableEnabled bottomInset:bottomInset];
   }
 }
 
@@ -169,7 +169,7 @@ - (void)contentViewDidChangeSize:(CGSize)newSize {
 }
 
 - (void)contentViewDidChangeChildren {
-  [self setupContentScrollViewPinning];
+  [self setupScrollable];
 }
 
 #pragma mark - TrueSheetHeaderViewDelegate

ios/TrueSheetContentView.h

@@ -35,11 +35,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (RCTScrollViewComponentView *_Nullable)findScrollView;
 
 /**
- * Setup ScrollView pinning
- * @param pinned Whether to pin the scroll view
+ * Setup scrollable content
+ * @param enabled Whether scrollable is enabled
  * @param bottomInset Bottom content inset for the scroll view
  */
-- (void)setupScrollViewPinning:(BOOL)pinned bottomInset:(CGFloat)bottomInset;
+- (void)setupScrollable:(BOOL)enabled bottomInset:(CGFloat)bottomInset;
 
 /**
  * Update the pinned scroll view's height to fill the container

ios/TrueSheetContentView.mm

@@ -65,9 +65,9 @@ - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompo
   [self.delegate contentViewDidChangeChildren];
 }
 
-#pragma mark - ScrollView Pinning
+#pragma mark - Scrollable
 
-- (void)clearPinning {
+- (void)clearScrollable {
   if (_pinnedScrollView) {
     CGRect frame = _pinnedScrollView.frame;
     frame.size.height = _originalScrollViewHeight;
@@ -87,13 +87,13 @@ - (void)clearPinning {
   _originalIndicatorBottomInset = 0;
 }
 
-- (void)setupScrollViewPinning:(BOOL)pinned bottomInset:(CGFloat)bottomInset {
-  if (!pinned) {
-    [self clearPinning];
+- (void)setupScrollable:(BOOL)enabled bottomInset:(CGFloat)bottomInset {
+  if (!enabled) {
+    [self clearScrollable];
     return;
   }
 
-  // Already pinned with same inset
+  // Already set up with same inset
   if (_pinnedScrollView && _bottomInset == bottomInset) {
     return;
   }
@@ -232,7 +232,7 @@ - (void)keyboardWillHide:(NSTimeInterval)duration curve:(UIViewAnimationOptions)
 
 - (void)prepareForRecycle {
   [super prepareForRecycle];
-  [self clearPinning];
+  [self clearScrollable];
 }
 
 @end

ios/TrueSheetView.mm

@@ -254,7 +254,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   _controller.insetAdjustment = _insetAdjustment;
 
   if (_containerView) {
-    _containerView.scrollViewPinningEnabled = _scrollable;
+    _containerView.scrollableEnabled = _scrollable;
     _containerView.insetAdjustment = _insetAdjustment;
     _containerView.scrollableOptions = _scrollableOptions;
   }
@@ -299,7 +299,7 @@ - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask {
     return;
 
   if (_containerView) {
-    [_containerView setupContentScrollViewPinning];
+    [_containerView setupScrollable];
   }
 
   if (_controller.isPresented) {
@@ -366,10 +366,10 @@ - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childCompone
     _controller.headerHeight = @(headerHeight);
   }
 
-  _containerView.scrollViewPinningEnabled = _scrollable;
+  _containerView.scrollableEnabled = _scrollable;
   _containerView.insetAdjustment = _insetAdjustment;
   _containerView.scrollableOptions = _scrollableOptions;
-  [_containerView setupContentScrollViewPinning];
+  [_containerView setupScrollable];
 
   if (_eventEmitter) {
     [TrueSheetLifecycleEvents emitMount:_eventEmitter];