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

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

@@ -14,6 +14,7 @@ import com.facebook.react.uimanager.ThemedReactContext
 import com.facebook.react.views.view.ReactViewGroup
 import com.lodev09.truesheet.core.TrueSheetKeyboardObserver
 import com.lodev09.truesheet.core.TrueSheetKeyboardObserverDelegate
+import com.lodev09.truesheet.utils.ScreenUtils
 import com.lodev09.truesheet.utils.isDescendantOf
 import com.lodev09.truesheet.utils.smoothScrollTo
 
@@ -123,7 +124,6 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
 
   private val scrollableLayoutListener = ViewTreeObserver.OnGlobalLayoutListener {
     updateContentInset()
-    clampScrollPosition()
   }
 
   private val scrollContentLayoutListener = View.OnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
@@ -198,12 +198,6 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
     }
 
     updateContentInset()
-
-    // If keyboard is currently showing, re-apply the keyboard inset to the new ScrollView
-    val keyboardHeight = keyboardObserver?.currentHeight ?: 0
-    if (keyboardHeight > 0) {
-      updateScrollViewInsetForKeyboard(keyboardHeight)
-    }
   }
 
   /**
@@ -221,7 +215,7 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
       0
     }
 
-    applyBottomInset()
+    updateScrollViewInsetForKeyboard(keyboardObserver?.currentHeight ?: 0)
   }
 
   // Fabric's measured height excludes the native inset, avoiding feedback.
@@ -339,12 +333,15 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
   }
 
   private fun updateScrollViewInsetForKeyboard(keyboardHeight: Int) {
-    // A relative footer stays behind the keyboard below the content, so its
-    // height shields that much of the keyboard's overlap. An absolute footer
-    // floats within the viewport — its clearance is the content padding's job
-    // (the caret reveal accounts for it, see scrollToFocusedInput).
+    val scrollView = detectedScrollView ?: return
+
+    // Short or nested scroll views can end above the sheet's bottom edge.
+    // Their position also accounts for space occupied by a relative footer.
     keyboardBottomInset = if (keyboardHeight > 0) {
-      val baseInset = maxOf(0, keyboardHeight + minOf(0, delegate?.footerKeyboardOcclusion ?: 0))
+      val location = IntArray(2)
+      scrollView.getLocationInWindow(location)
+      val keyboardTop = ScreenUtils.getRealScreenHeight(reactContext) - keyboardHeight
+      val baseInset = maxOf(0, location[1] + scrollView.height - keyboardTop)
       val adjustedInset = maxOf(0, baseInset + keyboardOffset.toInt())
       appliedKeyboardOffset = adjustedInset - baseInset
       adjustedInset

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewComponentDescriptor.h

@@ -13,4 +13,4 @@ class TrueSheetContentViewComponentDescriptor final
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewShadowNode.cpp

@@ -1,35 +1,70 @@
 #include "TrueSheetContentViewShadowNode.h"
 
-#include <limits>
-
+#include <folly/ScopeGuard.h>
 #include <react/renderer/components/view/conversions.h>
+#include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/core/LayoutContext.h>
 
+#include <limits>
+
 namespace facebook::react {
 
 using namespace yoga;
 
 extern const char TrueSheetContentViewComponentName[] = "TrueSheetContentView";
 
-// measure() lays out a clone of this node, which re-enters layout() on the
-// clone — guard so the measurement pass doesn't measure again recursively.
+// The measurement pass re-enters layout() on a clone — guard so it doesn't
+// measure again recursively.
 static thread_local bool gIsMeasuringNaturalHeight = false;
 
+TrueSheetContentViewShadowNode::TrueSheetContentViewShadowNode(
+  const ShadowNode &sourceShadowNode, const ShadowNodeFragment &fragment)
+    : ConcreteViewShadowNode(sourceShadowNode, fragment),
+      measurement_(static_cast<const TrueSheetContentViewShadowNode &>(sourceShadowNode).measurement_),
+      measurementSourceChildren_(
+        static_cast<const TrueSheetContentViewShadowNode &>(sourceShadowNode).measurementSourceChildren_),
+      contentChanged_(static_cast<const TrueSheetContentViewShadowNode &>(sourceShadowNode).contentChanged_ ||
+                      fragment.props || fragment.children) {
+}
+
 void TrueSheetContentViewShadowNode::layout(LayoutContext layoutContext) {
+  // The sizing tree needs Yoga's result, not Fabric state updates or events.
+  if (gIsMeasuringNaturalHeight) {
+    return;
+  }
   ConcreteViewShadowNode::layout(layoutContext);
   updateNaturalHeightIfNeeded(layoutContext);
 }
 
-// The content's committed height follows the container instead of its own
-// content when it can grow/shrink along the main axis or uses a percent
-// height. Reporting that height as the natural height would echo the sheet's
-// own size back as a content size change — e.g. flex: 1 content tracking a
-// drag frame by frame.
-static bool isHeightContainerDerived(const yoga::Style &style) {
-  return style.flexGrow().unwrapOrDefault(0) > 0 ||
-      style.flexShrink().unwrapOrDefault(0) > 0 ||
-      style.dimension(Dimension::Height).isPercent();
+// Every descendant must be detached from React's runtime references before
+// Yoga clones it during measurement. Disabling transfer only on the root
+// still lets descendant clones replace React's live nodes. Reuse unchanged
+// measurement subtrees; Yoga owns copy-on-write when their layout changes.
+std::shared_ptr<ShadowNode> TrueSheetContentViewShadowNode::cloneForMeasurement(
+  const ShadowNode &node, const Children &previousSourceChildren, const Children &previousMeasurementChildren) {
+  auto children = std::make_shared<Children>();
+  children->reserve(node.getChildren().size());
+  for (size_t index = 0; index < node.getChildren().size(); index++) {
+    const auto &child = node.getChildren()[index];
+    if (index < previousSourceChildren.size() && ShadowNode::sameFamily(*child, *previousSourceChildren[index])) {
+      const auto &previousSource = previousSourceChildren[index];
+      const auto &previousMeasurement = previousMeasurementChildren[index];
+      children->push_back(child == previousSource ? previousMeasurement
+                                                  : cloneForMeasurement(*child, previousSource->getChildren(),
+                                                      previousMeasurement->getChildren()));
+    } else {
+      children->push_back(cloneForMeasurement(*child, {}, {}));
+    }
+  }
+
+  auto clone = node.getComponentDescriptor().cloneShadowNode(
+    node, {.children = children, .state = node.getState(), .runtimeShadowNodeReference = false});
+  if (auto content = dynamic_cast<TrueSheetContentViewShadowNode *>(clone.get())) {
+    content->measurement_.reset();
+    content->measurementSourceChildren_.reset();
+  }
+  return clone;
 }
 
 // The natural height is the height the content wants when unbounded — the
@@ -38,26 +73,46 @@ static bool isHeightContainerDerived(const yoga::Style &style) {
 // subtree with an unconstrained height instead. Yoga respects the user's
 // styles: an explicit-height ScrollView keeps its height while a flexible one
 // expands to its content — no ScrollView discovery involved.
-void TrueSheetContentViewShadowNode::updateNaturalHeightIfNeeded(
-    const LayoutContext &layoutContext) {
-  if (gIsMeasuringNaturalHeight) {
-    return;
-  }
-
+void TrueSheetContentViewShadowNode::updateNaturalHeightIfNeeded(const LayoutContext &layoutContext) {
   auto stateData = getStateData();
   auto size = getLayoutMetrics().frame.size;
 
   Float naturalHeight = size.height;
-  if (isHeightContainerDerived(getConcreteProps().yogaStyle)) {
+  // Auto-height content can also be capped by a shrinking ScrollView. Only
+  // a fixed, non-flexible height can be taken from the viewport layout.
+  if (yogaNode_.isNodeFlexible() || !getConcreteProps().yogaStyle.dimension(Dimension::Height).isPoints()) {
     auto constraints = LayoutConstraints{};
     constraints.minimumSize = {size.width, 0};
     constraints.maximumSize = {size.width, std::numeric_limits<Float>::infinity()};
     constraints.layoutDirection = getLayoutMetrics().layoutDirection;
 
-    gIsMeasuringNaturalHeight = true;
-    naturalHeight = measure(layoutContext, constraints).height;
-    gIsMeasuringNaturalHeight = false;
+    auto measurementContext = layoutContext;
+    measurementContext.affectedNodes = nullptr;
+    auto errata = YGConfigGetErrata(&yogaConfig_);
+
+    // Yoga's viewport-only clones carry no new props or children. Reuse the
+    // intrinsic height across those layouts instead of measuring each drag frame.
+    if (contentChanged_ || !measurement_ || !(measurement_->constraints == constraints) ||
+        !(measurement_->context == measurementContext) || measurement_->errata != errata) {
+      gIsMeasuringNaturalHeight = true;
+      auto restoreMeasurement = folly::makeGuard([] { gIsMeasuringNaturalHeight = false; });
+      auto measurementNode =
+        measurement_ ? cloneForMeasurement(*this, *measurementSourceChildren_, measurement_->root->getChildren())
+                     : cloneForMeasurement(*this, {}, {});
+      auto &measurement = static_cast<LayoutableShadowNode &>(*measurementNode);
+      measurement.layoutTree(measurementContext, constraints);
+      measurement_ = std::make_shared<const Measurement>(Measurement{.root = measurementNode,
+        .constraints = constraints,
+        .context = measurementContext,
+        .errata = errata,
+        .height = measurement.getLayoutMetrics().frame.size.height});
+    }
+    naturalHeight = measurement_->height;
+  } else {
+    measurement_.reset();
   }
+  measurementSourceChildren_ = children_;
+  contentChanged_ = false;
 
   if (stateData.naturalHeight != naturalHeight) {
     stateData.naturalHeight = naturalHeight;
@@ -65,4 +120,4 @@ void TrueSheetContentViewShadowNode::updateNaturalHeightIfNeeded(
   }
 }
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewShadowNode.h

@@ -5,6 +5,8 @@
 #include <react/renderer/components/TrueSheetSpec/Props.h>
 #include <react/renderer/components/TrueSheetSpec/TrueSheetContentViewState.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/core/LayoutContext.h>
 
 namespace facebook::react {
 
@@ -14,20 +16,36 @@ JSI_EXPORT extern const char TrueSheetContentViewComponentName[];
  * `ShadowNode` for <TrueSheetContentView> component.
  */
 class JSI_EXPORT TrueSheetContentViewShadowNode final
-    : public ConcreteViewShadowNode<
-          TrueSheetContentViewComponentName,
-          TrueSheetContentViewProps,
-          TrueSheetContentViewEventEmitter,
-          TrueSheetContentViewState> {
+    : public ConcreteViewShadowNode<TrueSheetContentViewComponentName, TrueSheetContentViewProps,
+        TrueSheetContentViewEventEmitter, TrueSheetContentViewState> {
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
  public:
+  TrueSheetContentViewShadowNode(const ShadowNode &sourceShadowNode, const ShadowNodeFragment &fragment);
+
 #pragma mark - LayoutableShadowNode
 
   void layout(LayoutContext layoutContext) override;
 
  private:
+  using Children = std::vector<std::shared_ptr<const ShadowNode>>;
+
+  struct Measurement {
+    std::shared_ptr<const ShadowNode> root;
+    LayoutConstraints constraints;
+    LayoutContext context;
+    YGErrata errata;
+    Float height;
+  };
+
+  std::shared_ptr<const Measurement> measurement_;
+  std::shared_ptr<const Children> measurementSourceChildren_;
+  bool contentChanged_{true};
+
+  static std::shared_ptr<ShadowNode> cloneForMeasurement(
+    const ShadowNode &node, const Children &previousSourceChildren, const Children &previousMeasurementChildren);
+
   void updateNaturalHeightIfNeeded(const LayoutContext &layoutContext);
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewState.cpp

@@ -8,4 +8,4 @@ folly::dynamic TrueSheetContentViewState::getDynamic() const {
 }
 #endif
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewState.h

@@ -20,10 +20,9 @@ class TrueSheetContentViewState final {
   TrueSheetContentViewState() = default;
 
 #ifdef ANDROID
-  TrueSheetContentViewState(
-      TrueSheetContentViewState const &previousState,
-      folly::dynamic data)
-      : naturalHeight(previousState.naturalHeight) {}
+  TrueSheetContentViewState(TrueSheetContentViewState const &previousState, folly::dynamic data)
+      : naturalHeight(previousState.naturalHeight) {
+  }
 #endif
 
   Float naturalHeight{0};
@@ -36,4 +35,4 @@ class TrueSheetContentViewState final {
 #endif
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewComponentDescriptor.h

@@ -8,17 +8,15 @@ namespace facebook::react {
 /*
  * Descriptor for <TrueSheetFooterView> component.
  */
-class TrueSheetFooterViewComponentDescriptor final
-    : public ConcreteComponentDescriptor<TrueSheetFooterViewShadowNode> {
+class TrueSheetFooterViewComponentDescriptor final : public ConcreteComponentDescriptor<TrueSheetFooterViewShadowNode> {
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 
   void adopt(ShadowNode &shadowNode) const override {
-    auto &concreteShadowNode =
-        static_cast<TrueSheetFooterViewShadowNode &>(shadowNode);
+    auto &concreteShadowNode = static_cast<TrueSheetFooterViewShadowNode &>(shadowNode);
     concreteShadowNode.adjustLayoutWithState();
 
     ConcreteComponentDescriptor::adopt(shadowNode);
   }
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewShadowNode.cpp

@@ -13,8 +13,7 @@ extern const char TrueSheetFooterViewComponentName[] = "TrueSheetFooterView";
 void TrueSheetFooterViewShadowNode::adjustLayoutWithState() {
   ensureUnsealed();
 
-  auto state = std::static_pointer_cast<
-      const TrueSheetFooterViewShadowNode::ConcreteState>(getState());
+  auto state = std::static_pointer_cast<const TrueSheetFooterViewShadowNode::ConcreteState>(getState());
   auto stateData = state->getData();
 
   auto &props = getConcreteProps();
@@ -60,4 +59,4 @@ void TrueSheetFooterViewShadowNode::adjustLayoutWithState() {
   }
 }
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewShadowNode.h

@@ -14,15 +14,12 @@ JSI_EXPORT extern const char TrueSheetFooterViewComponentName[];
  * `ShadowNode` for <TrueSheetFooterView> component.
  */
 class JSI_EXPORT TrueSheetFooterViewShadowNode final
-    : public ConcreteViewShadowNode<
-          TrueSheetFooterViewComponentName,
-          TrueSheetFooterViewProps,
-          TrueSheetFooterViewEventEmitter,
-          TrueSheetFooterViewState> {
+    : public ConcreteViewShadowNode<TrueSheetFooterViewComponentName, TrueSheetFooterViewProps,
+        TrueSheetFooterViewEventEmitter, TrueSheetFooterViewState> {
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
  public:
   void adjustLayoutWithState();
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewState.cpp

@@ -8,4 +8,4 @@ folly::dynamic TrueSheetFooterViewState::getDynamic() const {
 }
 #endif
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetFooterViewState.h

@@ -18,11 +18,9 @@ class TrueSheetFooterViewState final {
   TrueSheetFooterViewState() = default;
 
 #ifdef ANDROID
-  TrueSheetFooterViewState(
-      TrueSheetFooterViewState const &previousState,
-      folly::dynamic data)
-      : bottomInset(static_cast<float>(data["bottomInset"].getDouble())),
-        initialized(true) {}
+  TrueSheetFooterViewState(TrueSheetFooterViewState const &previousState, folly::dynamic data)
+      : bottomInset(static_cast<float>(data["bottomInset"].getDouble())), initialized(true) {
+  }
 #endif
 
   float bottomInset{0};
@@ -38,4 +36,4 @@ class TrueSheetFooterViewState final {
 #endif
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetInsets.cpp

@@ -15,4 +15,4 @@ float TrueSheetInsets::bottomSafeArea() {
   return gBottomSafeArea.load(std::memory_order_relaxed);
 }
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetInsets.h

@@ -13,4 +13,4 @@ class TrueSheetInsets {
   static float bottomSafeArea();
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetLayoutUtils.h

@@ -11,10 +11,7 @@ namespace facebook::react {
  * native. A zero dimension leaves that axis to Yoga.
  */
 inline void applyContainerSizeToYogaNode(
-    yoga::Node &node,
-    const yoga::Style &baseStyle,
-    float containerWidth,
-    float containerHeight) {
+  yoga::Node &node, const yoga::Style &baseStyle, float containerWidth, float containerHeight) {
   if (containerWidth <= 0 && containerHeight <= 0) {
     return;
   }
@@ -43,4 +40,4 @@ inline void applyContainerSizeToYogaNode(
   }
 }
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetOverlayViewComponentDescriptor.h

@@ -18,4 +18,4 @@ class TrueSheetOverlayViewComponentDescriptor final
   }
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetOverlayViewShadowNode.cpp

@@ -11,7 +11,7 @@ void TrueSheetOverlayViewShadowNode::adjustLayoutWithState() {
 
   const auto &stateData = getStateData();
   applyContainerSizeToYogaNode(
-      yogaNode_, getConcreteProps().yogaStyle, stateData.containerWidth, stateData.containerHeight);
+    yogaNode_, getConcreteProps().yogaStyle, stateData.containerWidth, stateData.containerHeight);
 }
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetOverlayViewShadowNode.h

@@ -16,11 +16,8 @@ JSI_EXPORT extern const char TrueSheetOverlayViewComponentName[];
  * lay out against the full window like the sheet's container.
  */
 class JSI_EXPORT TrueSheetOverlayViewShadowNode final
-    : public ConcreteViewShadowNode<
-          TrueSheetOverlayViewComponentName,
-          TrueSheetOverlayViewProps,
-          TrueSheetOverlayViewEventEmitter,
-          TrueSheetViewState> {
+    : public ConcreteViewShadowNode<TrueSheetOverlayViewComponentName, TrueSheetOverlayViewProps,
+        TrueSheetOverlayViewEventEmitter, TrueSheetViewState> {
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
  public:
@@ -33,4 +30,4 @@ class JSI_EXPORT TrueSheetOverlayViewShadowNode final
   void adjustLayoutWithState();
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewComponentDescriptor.h

@@ -8,13 +8,11 @@ namespace facebook::react {
 /*
  * Descriptor for <TrueSheetView> component.
  */
-class TrueSheetViewComponentDescriptor final
-    : public ConcreteComponentDescriptor<TrueSheetViewShadowNode> {
+class TrueSheetViewComponentDescriptor final : public ConcreteComponentDescriptor<TrueSheetViewShadowNode> {
   using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
 
   void adopt(ShadowNode &shadowNode) const override {
-    auto &concreteShadowNode =
-        static_cast<TrueSheetViewShadowNode &>(shadowNode);
+    auto &concreteShadowNode = static_cast<TrueSheetViewShadowNode &>(shadowNode);
     concreteShadowNode.adjustLayoutWithState();
 
     ConcreteComponentDescriptor::adopt(shadowNode);
@@ -25,4 +23,4 @@ class TrueSheetViewComponentDescriptor final
   }
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.cpp

@@ -11,20 +11,18 @@ void TrueSheetViewShadowNode::adjustLayoutWithState() {
 
   const auto &stateData = getStateData();
   applyContainerSizeToYogaNode(
-      yogaNode_, getConcreteProps().yogaStyle, stateData.containerWidth, stateData.containerHeight);
+    yogaNode_, getConcreteProps().yogaStyle, stateData.containerWidth, stateData.containerHeight);
 }
 
 #if !defined(ANDROID)
-void TrueSheetViewShadowNode::setEventDispatcher(
-    std::weak_ptr<const EventDispatcher> dispatcher) {
+void TrueSheetViewShadowNode::setEventDispatcher(std::weak_ptr<const EventDispatcher> dispatcher) {
   getStateDataMutable().setEventDispatcher(dispatcher);
 }
 
-TrueSheetViewShadowNode::StateData &
-TrueSheetViewShadowNode::getStateDataMutable() {
+TrueSheetViewShadowNode::StateData &TrueSheetViewShadowNode::getStateDataMutable() {
   ensureUnsealed();
   return const_cast<TrueSheetViewShadowNode::StateData &>(getStateData());
 }
 #endif
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewShadowNode.h

@@ -15,12 +15,8 @@ JSI_EXPORT extern const char TrueSheetViewComponentName[];
 /*
  * `ShadowNode` for <TrueSheetView> component.
  */
-class JSI_EXPORT TrueSheetViewShadowNode final
-    : public ConcreteViewShadowNode<
-          TrueSheetViewComponentName,
-          TrueSheetViewProps,
-          TrueSheetViewEventEmitter,
-          TrueSheetViewState> {
+class JSI_EXPORT TrueSheetViewShadowNode final : public ConcreteViewShadowNode<TrueSheetViewComponentName,
+                                                   TrueSheetViewProps, TrueSheetViewEventEmitter, TrueSheetViewState> {
   using ConcreteViewShadowNode::ConcreteViewShadowNode;
 
  public:
@@ -42,4 +38,4 @@ class JSI_EXPORT TrueSheetViewShadowNode final
 #endif
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewState.cpp

@@ -9,15 +9,13 @@ folly::dynamic TrueSheetViewState::getDynamic() const {
 #endif
 
 #if !defined(ANDROID)
-void TrueSheetViewState::setEventDispatcher(
-    std::weak_ptr<const EventDispatcher> dispatcher) {
+void TrueSheetViewState::setEventDispatcher(std::weak_ptr<const EventDispatcher> dispatcher) {
   eventDispatcher_ = dispatcher;
 }
 
-std::weak_ptr<const EventDispatcher> TrueSheetViewState::getEventDispatcher()
-    const noexcept {
+std::weak_ptr<const EventDispatcher> TrueSheetViewState::getEventDispatcher() const noexcept {
   return eventDispatcher_;
 }
 #endif
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetViewState.h

@@ -23,11 +23,10 @@ class TrueSheetViewState final {
   TrueSheetViewState() = default;
 
 #ifdef ANDROID
-  TrueSheetViewState(
-      TrueSheetViewState const &previousState,
-      folly::dynamic data)
+  TrueSheetViewState(TrueSheetViewState const &previousState, folly::dynamic data)
       : containerWidth(static_cast<float>(data["containerWidth"].getDouble())),
-        containerHeight(static_cast<float>(data["containerHeight"].getDouble())) {}
+        containerHeight(static_cast<float>(data["containerHeight"].getDouble())) {
+  }
 #endif
 
   float containerWidth{0};
@@ -49,4 +48,4 @@ class TrueSheetViewState final {
 #endif
 };
 
-} // namespace facebook::react
+}  // namespace facebook::react

package/ios/TrueSheetContentView.mm

@@ -168,6 +168,8 @@ using namespace facebook::react;
   if (_scrollableHandle > 0 && !_detectedScrollView) {
     [self.delegate contentViewScrollViewDidChange];
   }
+
+  [self updateKeyboardInset];
 }
 
 #pragma mark - Scrollable
@@ -183,6 +185,13 @@ using namespace facebook::react;
   _detectedScrollView.scrollView.contentInset = contentInset;
 }
 
+- (void)updateKeyboardInset {
+  CGFloat keyboardHeight = _keyboardObserver.currentHeight;
+  if (_detectedScrollView && keyboardHeight > 0) {
+    [self setKeyboardInset:[self keyboardInsetWithHeight:keyboardHeight]];
+  }
+}
+
 - (void)clearScrollable {
   [self setKeyboardInset:0];
   _appliedKeyboardOffset = 0;
@@ -213,26 +222,22 @@ using namespace facebook::react;
   [self applyContentInsetAdjustment];
 
   // If keyboard is currently showing, re-apply the keyboard inset to the new ScrollView
-  CGFloat keyboardHeight = _keyboardObserver ? _keyboardObserver.currentHeight : 0;
-  if (keyboardHeight > 0) {
-    [self setKeyboardInset:[self keyboardInsetWithHeight:keyboardHeight]];
-  }
+  [self updateKeyboardInset];
 }
 
-// A relative footer stays behind the keyboard below the content, so its
-// height shields that much of the keyboard's overlap. An absolute footer
-// floats within the viewport — its clearance is the content padding's job
-// (the caret reveal accounts for it, see footerOcclusion).
+// Short or nested scroll views can end above the sheet's bottom edge.
+// Their frame also accounts for space occupied by a relative footer.
 - (CGFloat)keyboardInsetWithHeight:(CGFloat)height {
-  CGFloat inset = height;
-  if (self.footerView && !_keyboardObserver.viewController.absoluteFooter) {
-    inset = MAX(0, height - self.footerView.frame.size.height);
-  }
+  UIScrollView *scrollView = _detectedScrollView.scrollView;
+  UIWindow *window = scrollView.window;
+  CGRect scrollFrame = [scrollView convertRect:scrollView.bounds toView:window];
+  CGFloat keyboardTop = CGRectGetMaxY(window.bounds) - height;
+  CGFloat inset = MAX(0, CGRectGetMaxY(scrollFrame) - keyboardTop);
 
   // UIKit stacks the safe area on top of contentInset while the adjustment
   // behavior is automatic — take it out so the total lands on the keyboard edge.
   if (_appliedContentInsetAdjustment) {
-    inset = MAX(0, inset - _detectedScrollView.scrollView.safeAreaInsets.bottom);
+    inset = MAX(0, inset - scrollView.safeAreaInsets.bottom);
   }
 
   // Track how much of keyboardOffset actually lands in the inset so the caret
@@ -242,7 +247,6 @@ using namespace facebook::react;
 
   // Content that already fits above the keyboard has nothing to reveal — the
   // inset would only open blank scroll range below it (huge gap at the bottom).
-  UIScrollView *scrollView = _detectedScrollView.scrollView;
   if (scrollView.contentSize.height <= scrollView.bounds.size.height - adjustedInset) {
     _appliedKeyboardOffset = 0;
     return 0;
@@ -334,12 +338,14 @@ using namespace facebook::react;
 
   CGFloat inset = [self keyboardInsetWithHeight:height];
   [UIView animateWithDuration:duration
-                        delay:0
-                      options:curve | UIViewAnimationOptionBeginFromCurrentState
-                   animations:^{
-                     [self setKeyboardInset:inset];
-                   }
-                   completion:nil];
+    delay:0
+    options:curve | UIViewAnimationOptionBeginFromCurrentState
+    animations:^{
+      [self setKeyboardInset:inset];
+    }
+    completion:^(BOOL finished) {
+      [self updateKeyboardInset];
+    }];
 
   // Defer scroll until the next run loop so content insets are applied first
   if (firstResponder) {
@@ -363,7 +369,7 @@ using namespace facebook::react;
   dispatch_async(dispatch_get_main_queue(), ^{
     // Typing can grow the content (e.g. a multiline input) past the fits-above-
     // the-keyboard threshold — keep the inset in sync before revealing the caret.
-    [self setKeyboardInset:[self keyboardInsetWithHeight:self->_keyboardObserver.currentHeight]];
+    [self updateKeyboardInset];
     [self scrollToFocusedCaretAnimated:YES];
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.12",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -58,7 +58,7 @@
     "typecheck": "tsc",
     "lint": "eslint --fix \"**/*.{ts,tsx}\"",
     "format": "prettier --write \"**/*.{ts,tsx}\"",
-    "tidy": "yarn typecheck && yarn lint && yarn format && scripts/objclint.sh && scripts/ktlint.sh",
+    "tidy": "yarn typecheck && yarn lint && yarn format && scripts/objclint.sh && scripts/cpplint.sh && scripts/ktlint.sh",
     "clean": "scripts/clean.sh",
     "prepare": "bob build",
     "release": "release-it",