iOS: fix non ui thread access view content offset

doric-pub · Jul 20, 2023 · 761a6f6 · 761a6f6
1 parent 01b30f4
commit 761a6f6
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/doric-iOS/Pod/Classes/Shader/DoricFlowLayoutNode.m b/doric-iOS/Pod/Classes/Shader/DoricFlowLayoutNode.m
@@ -565,15 +565,16 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
         if (!self.jsDispatcher) {
             self.jsDispatcher = [DoricJSDispatcher new];
         }
+
+        NSDictionary *offset = @{
+            @"x": @(self.view.contentOffset.x),
+            @"y": @(self.view.contentOffset.y),
+        };
+
         __weak typeof(self) __self = self;
         [self.jsDispatcher dispatch:^DoricAsyncResult * {
             __strong typeof(__self) self = __self;
-            return [self callJSResponse:self.onScrollFuncId,
-                                        @{
-                                                @"x": @(self.view.contentOffset.x),
-                                                @"y": @(self.view.contentOffset.y),
-                                        },
-                            nil];
+            return [self callJSResponse:self.onScrollFuncId, offset, nil];
         }];
     }
 }

diff --git a/doric-iOS/Pod/Classes/Shader/DoricHorizontalListNode.m b/doric-iOS/Pod/Classes/Shader/DoricHorizontalListNode.m
@@ -471,15 +471,16 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
         if (!self.jsDispatcher) {
             self.jsDispatcher = [DoricJSDispatcher new];
         }
+
+        NSDictionary *offset = @{
+            @"x": @(self.view.contentOffset.x),
+            @"y": @(self.view.contentOffset.y),
+        };
+
         __weak typeof(self) __self = self;
         [self.jsDispatcher dispatch:^DoricAsyncResult * {
             __strong typeof(__self) self = __self;
-            return [self callJSResponse:self.onScrollFuncId,
-                                        @{
-                                                @"x": @(self.view.contentOffset.x),
-                                                @"y": @(self.view.contentOffset.y),
-                                        },
-                            nil];
+            return [self callJSResponse:self.onScrollFuncId, offset, nil];
         }];
     }
 }

diff --git a/doric-iOS/Pod/Classes/Shader/DoricListNode.m b/doric-iOS/Pod/Classes/Shader/DoricListNode.m
@@ -587,15 +587,16 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
         if (!self.jsDispatcher) {
             self.jsDispatcher = [DoricJSDispatcher new];
         }
+
+        NSDictionary *offset = @{
+            @"x": @(self.view.contentOffset.x),
+            @"y": @(self.view.contentOffset.y),
+        };
+
         __weak typeof(self) __self = self;
         [self.jsDispatcher dispatch:^DoricAsyncResult * {
             __strong typeof(__self) self = __self;
-            return [self callJSResponse:self.onScrollFuncId,
-                                        @{
-                                                @"x": @(self.view.contentOffset.x),
-                                                @"y": @(self.view.contentOffset.y),
-                                        },
-                            nil];
+            return [self callJSResponse:self.onScrollFuncId, offset, nil];
         }];
     }
 }

diff --git a/doric-iOS/Pod/Classes/Shader/DoricScrollerNode.m b/doric-iOS/Pod/Classes/Shader/DoricScrollerNode.m
@@ -136,15 +136,16 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
         if (!self.jsDispatcher) {
             self.jsDispatcher = [DoricJSDispatcher new];
         }
+
+        NSDictionary *offset = @{
+            @"x": @(self.view.contentOffset.x),
+            @"y": @(self.view.contentOffset.y),
+        };
+
         __weak typeof(self) __self = self;
         [self.jsDispatcher dispatch:^DoricAsyncResult * {
             __strong typeof(__self) self = __self;
-            return [self callJSResponse:self.onScrollFuncId,
-                                        @{
-                                                @"x": @(self.view.contentOffset.x),
-                                                @"y": @(self.view.contentOffset.y),
-                                        },
-                            nil];
+            return [self callJSResponse:self.onScrollFuncId, offset, nil];
         }];
     }
 }