feat: update

red-armor · Jan 14, 2025 · d01e7d0 · d01e7d0
1 parent 9820c7a
commit d01e7d0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/ui/scroller/src/react-native/ScrollEventHelper.ts b/ui/scroller/src/react-native/ScrollEventHelper.ts
@@ -20,7 +20,7 @@ import Marshal from './Marshal';
 class ScrollEventHelper {
   private _disposer: Function;
   // private _scrollHelper: ScrollHelper;
-  private _marshal: Marshal;
+  readonly marshal: Marshal;
   private _onScroll: SyntheticEventHandler | undefined;
   private _onScrollEndDrag: SyntheticEventHandler | undefined;
   private _onScrollBeginDrag: SyntheticEventHandler | undefined;
@@ -42,7 +42,7 @@ class ScrollEventHelper {
       onMomentumScrollBegin,
     } = props;
 
-    this._marshal = marshal;
+    this.marshal = marshal;
     this._onScroll = onScroll;
     // this._scrollHelper = scrollHelper;
     this._onScrollBeginDrag = onScrollBeginDrag;
@@ -67,7 +67,7 @@ class ScrollEventHelper {
   }
 
   register() {
-    this._disposer = this._marshal
+    this._disposer = this.marshal
       .getScrollHelper()
       .registerScrollEventHelper(this);
   }

diff --git a/ui/scroller/src/react-native/ScrollHelper.ts b/ui/scroller/src/react-native/ScrollHelper.ts
@@ -83,7 +83,7 @@ class ScrollHelper {
 
   readonly _horizontal: boolean;
 
-  private _marshal?: Marshal;
+  private _marshal: Marshal;
 
   private _scrollEnabledHandler?: { (falsy: boolean): void };
 
@@ -131,7 +131,7 @@ class ScrollHelper {
     // }
 
     return this._marshal
-      ?.getScrollEventHelper()
+      .getScrollEventHelper()
       .subscribeEventHandler(eventName, handler);
   }
 
@@ -159,13 +159,6 @@ class ScrollHelper {
     }
   }
 
-  _setMarshal(marshal: Marshal) {
-    if (!this._marshal) {
-      // set marshal only if this._marshal is null
-      this._marshal = marshal;
-    }
-  }
-
   getMarshal() {
     return this._marshal;
   }

diff --git a/ui/scroller/src/react-native/ScrollView.tsx b/ui/scroller/src/react-native/ScrollView.tsx
@@ -14,11 +14,9 @@ import {
   ScrollView as RNScrollView,
   View as RNView,
 } from 'react-native';
-import { IntersectionObserver } from '@infinite-list/intersection-observer/react-native';
 import isRefObject from '@x-oasis/is-ref';
 
 import Marshal from './Marshal';
-import ScrollEventHelper from './ScrollEventHelper';
 import ScrollHelper from './ScrollHelper';
 import { DEFAULT_SCROLL_EVENT_THROTTLE } from './commons/constants';
 import { isIos } from './commons/platform';
@@ -93,8 +91,7 @@ const ScrollView: FC<SpectrumScrollViewPropsWithForwardRef> = (props) => {
 
   const removeClippedSubviews = false;
   const scrollHelperDisposerRef = useRef<Function>();
-  const { marshal: parentMarshal, intersectionObserver } =
-    scrollViewContextValues;
+  const { marshal: parentMarshal } = scrollViewContextValues;
   const defaultScrollViewRef = useRef<RNScrollView | RNView>();
   const scrollViewRef = (
     isRefObject(forwardRef) ? forwardRef : defaultScrollViewRef