@@ -188,7 +188,7 @@ index cecee07..533a9e9 100644
188188 padding,
189189 currentHeight,
190190diff --git a/lib/commonjs/components/KeyboardChatScrollView/useExtraContentPadding/index.js b/lib/commonjs/components/KeyboardChatScrollView/useExtraContentPadding/index.js
191- index 54a1c57..19b44fc 100644
191+ index 54a1c57..00c2941 100644
192192--- a/lib/commonjs/components/KeyboardChatScrollView/useExtraContentPadding/index.js
193193+++ b/lib/commonjs/components/KeyboardChatScrollView/useExtraContentPadding/index.js
194194@@ -31,6 +31,8 @@ function useExtraContentPadding(options) {
@@ -200,7 +200,23 @@ index 54a1c57..19b44fc 100644
200200 scroll,
201201 layout,
202202 size,
203- @@ -70,8 +72,8 @@ function useExtraContentPadding(options) {
203+ @@ -50,8 +52,13 @@ function useExtraContentPadding(options) {
204+ // otherwise the native ScrollView clamps to the old range.
205+ requestAnimationFrame(() => {
206+ // check that view is still mounted and ref is actual
207+ - // otherwise it may lead to a crash
208+ - if (!scrollViewRef()) {
209+ + // otherwise it may lead to a crash. Reanimated 4.7+ passes the
210+ + // ref to the UI runtime as a shareable holding the node in `.value`.
211+ + const node =
212+ + typeof scrollViewRef === "function"
213+ + ? scrollViewRef()
214+ + : scrollViewRef.value;
215+ + if (!node) {
216+ return;
217+ }
218+ (0, _reactNativeReanimated.scrollTo)(scrollViewRef, 0, target, false);
219+ @@ -70,8 +77,8 @@ function useExtraContentPadding(options) {
204220 }
205221
206222 // Compute effective delta considering blankSpace floor
@@ -211,7 +227,7 @@ index 54a1c57..19b44fc 100644
211227 const effectiveDelta = currentTotal - previousTotal;
212228 if (effectiveDelta === 0) {
213229 // blankSpace absorbed the change
214- @@ -90,10 +92 ,11 @@ function useExtraContentPadding(options) {
230+ @@ -90,10 +97 ,11 @@ function useExtraContentPadding(options) {
215231 const target = Math.max(scroll.value - effectiveDelta, -currentTotal);
216232 scrollToTarget(target);
217233 } else {
@@ -426,7 +442,7 @@ index 407275d..19427d7 100644
426442 padding,
427443 currentHeight,
428444diff --git a/lib/module/components/KeyboardChatScrollView/useExtraContentPadding/index.js b/lib/module/components/KeyboardChatScrollView/useExtraContentPadding/index.js
429- index 5885415..6e694fa 100644
445+ index 5885415..8b3c4f0 100644
430446--- a/lib/module/components/KeyboardChatScrollView/useExtraContentPadding/index.js
431447+++ b/lib/module/components/KeyboardChatScrollView/useExtraContentPadding/index.js
432448@@ -25,6 +25,8 @@ function useExtraContentPadding(options) {
@@ -438,7 +454,23 @@ index 5885415..6e694fa 100644
438454 scroll,
439455 layout,
440456 size,
441- @@ -64,8 +66,8 @@ function useExtraContentPadding(options) {
457+ @@ -44,8 +46,13 @@ function useExtraContentPadding(options) {
458+ // otherwise the native ScrollView clamps to the old range.
459+ requestAnimationFrame(() => {
460+ // check that view is still mounted and ref is actual
461+ - // otherwise it may lead to a crash
462+ - if (!scrollViewRef()) {
463+ + // otherwise it may lead to a crash. Reanimated 4.7+ passes the
464+ + // ref to the UI runtime as a shareable holding the node in `.value`.
465+ + const node =
466+ + typeof scrollViewRef === "function"
467+ + ? scrollViewRef()
468+ + : scrollViewRef.value;
469+ + if (!node) {
470+ return;
471+ }
472+ scrollTo(scrollViewRef, 0, target, false);
473+ @@ -64,8 +71,8 @@ function useExtraContentPadding(options) {
442474 }
443475
444476 // Compute effective delta considering blankSpace floor
@@ -449,7 +481,7 @@ index 5885415..6e694fa 100644
449481 const effectiveDelta = currentTotal - previousTotal;
450482 if (effectiveDelta === 0) {
451483 // blankSpace absorbed the change
452- @@ -84,11 +86 ,12 @@ function useExtraContentPadding(options) {
484+ @@ -84,11 +91 ,12 @@ function useExtraContentPadding(options) {
453485 const target = Math.max(scroll.value - effectiveDelta, -currentTotal);
454486 scrollToTarget(target);
455487 } else {
@@ -810,7 +842,7 @@ index 02abf5c..4ee0ddd 100644
810842
811843 type UseChatKeyboardReturn = {
812844diff --git a/src/components/KeyboardChatScrollView/useExtraContentPadding/index.ts b/src/components/KeyboardChatScrollView/useExtraContentPadding/index.ts
813- index c9c93f3..76a201d 100644
845+ index c9c93f3..02f95c0 100644
814846--- a/src/components/KeyboardChatScrollView/useExtraContentPadding/index.ts
815847+++ b/src/components/KeyboardChatScrollView/useExtraContentPadding/index.ts
816848@@ -16,6 +16,10 @@ type UseExtraContentPaddingOptions = {
@@ -833,7 +865,23 @@ index c9c93f3..76a201d 100644
833865 scroll,
834866 layout,
835867 size,
836- @@ -99,14 +105,12 @@ function useExtraContentPadding(options: UseExtraContentPaddingOptions): void {
868+ @@ -72,8 +78,13 @@ function useExtraContentPadding(options: UseExtraContentPaddingOptions): void {
869+ // otherwise the native ScrollView clamps to the old range.
870+ requestAnimationFrame(() => {
871+ // check that view is still mounted and ref is actual
872+ - // otherwise it may lead to a crash
873+ - if (!scrollViewRef()) {
874+ + // otherwise it may lead to a crash. Reanimated 4.7+ passes the
875+ + // ref to the UI runtime as a shareable holding the node in `.value`.
876+ + const node =
877+ + typeof scrollViewRef === "function"
878+ + ? scrollViewRef()
879+ + : (scrollViewRef as unknown as { value: unknown }).value;
880+ + if (!node) {
881+ return;
882+ }
883+ scrollTo(scrollViewRef, 0, target, false);
884+ @@ -99,14 +110,12 @@ function useExtraContentPadding(options: UseExtraContentPaddingOptions): void {
837885 }
838886
839887 // Compute effective delta considering blankSpace floor
@@ -854,7 +902,7 @@ index c9c93f3..76a201d 100644
854902 const effectiveDelta = currentTotal - previousTotal;
855903
856904 if (effectiveDelta === 0) {
857- @@ -139,16 +143 ,25 @@ function useExtraContentPadding(options: UseExtraContentPaddingOptions): void {
905+ @@ -139,16 +148 ,25 @@ function useExtraContentPadding(options: UseExtraContentPaddingOptions): void {
858906
859907 scrollToTarget(target);
860908 } else {
0 commit comments