chore: bugfix event emitter infinite loop

azimgd · Nov 25, 2024 · 9a0b53e · 9a0b53e
1 parent 5f05ce7
commit 9a0b53e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/android/src/main/java/com/shadowlist/SLContainer.java b/android/src/main/java/com/shadowlist/SLContainer.java
@@ -234,8 +234,6 @@ public void setStateWrapper(
 
     mScrollContainerVertical.scrollTo((int)PixelUtil.toPixelFromDIP(scrollPosition[0]), (int)PixelUtil.toPixelFromDIP(scrollPosition[1]));
 
-    updateObservers(scrollPosition, visibleStartIndex, visibleEndIndex);
-
     Handler handler = new Handler();
     handler.postDelayed(new Runnable() {
       @Override

diff --git a/example/src/App.tsx b/example/src/App.tsx
@@ -12,7 +12,7 @@ import {
 import useData from './useData';
 import Element from './Element';
 
-const ITEMS_COUNT = 20;
+const ITEMS_COUNT = 50;
 const IS_INVERTED = false;
 const IS_HORIZONTAL = false;
 const INITIAL_SCROLL_INDEX = 0;

diff --git a/ios/SLContainer.mm b/ios/SLContainer.mm
@@ -113,21 +113,9 @@ - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &
     scrollContentWidth:nextStateData.scrollContent.width
     scrollContentHeight:nextStateData.scrollContent.height];
 
-  /**
-   * Dispatch event emitters
-   */
-  const auto &eventEmitter = static_cast<const SLContainerEventEmitter &>(*_eventEmitter);
-  eventEmitter.onVisibleChange({visibleStartIndex, visibleEndIndex});
-
-  int distanceFromStart = [self->_scrollable shouldNotifyStart:scrollPositionCGPoint];
-  if (distanceFromStart) {
-    eventEmitter.onStartReached({distanceFromStart});
-  }
-
-  int distanceFromEnd = [self->_scrollable shouldNotifyEnd:scrollPositionCGPoint];
-  if (distanceFromEnd) {
-    eventEmitter.onEndReached({distanceFromEnd});
-  }
+  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(16 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
+    [self updateVirtualization];
+  });
 }
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
@@ -158,7 +146,7 @@ - (void)updateVirtualization
   [self->_containerChildrenManager
     mount:visibleStartIndex
     visibleEndIndex:visibleEndIndex];
-    
+
   [self updateObservers:scrollPositionCGPoint visibleStartIndex:visibleStartIndex visibleEndIndex:visibleEndIndex];
 }
 
@@ -183,10 +171,6 @@ - (void)updateObservers:(CGPoint)scrollPosition visibleStartIndex:(int)visibleSt
   if (distanceFromEnd) {
     eventEmitter.onEndReached({distanceFromEnd});
   }
-
-  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(16 * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
-    [self updateVirtualization];
-  });
 }
 
 - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args