review

flutter · Nov 21, 2024 · 1bf0f5c · 1bf0f5c
1 parent e14b808
commit 1bf0f5c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart
@@ -89,7 +89,7 @@ class SemanticsAction {
 
   /// A request to scroll the scrollable container to a given scroll offset.
   ///
-  /// The payload of this [SemanticsAction] is a flutter-stanard-encoded
+  /// The payload of this [SemanticsAction] is a flutter-standard-encoded
   /// [Float64List] of length 2 containing the target horizontal and vertical
   /// offsets (in logical pixels) the receiving scrollable container should
   /// scroll to.

diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObject+UIFocusSystem.mm b/shell/platform/darwin/ios/framework/Source/SemanticsObject+UIFocusSystem.mm
@@ -214,9 +214,9 @@ - (void)setContentOffset:(CGPoint)contentOffset {
     return;
   }
 
-  double offsetData[2] = {contentOffset.x, contentOffset.y};
+  double offset[2] = {contentOffset.x, contentOffset.y};
   FlutterStandardTypedData* offsetData = [FlutterStandardTypedData
-      typedDataWithFloat64:[NSData dataWithBytes:&offsetData length:sizeof(offsetData)]];
+      typedDataWithFloat64:[NSData dataWithBytes:&offset length:sizeof(offset)]];
   NSData* encoded = [[FlutterStandardMessageCodec sharedInstance] encode:offsetData];
   self.semanticsObject.bridge->DispatchSemanticsAction(
       self.semanticsObject.uid, flutter::SemanticsAction::kScrollToOffset,

diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObject.h b/shell/platform/darwin/ios/framework/Source/SemanticsObject.h
@@ -10,6 +10,7 @@
 #include "flutter/fml/macros.h"
 #include "flutter/fml/memory/weak_ptr.h"
 #include "flutter/lib/ui/semantics/semantics_node.h"
+#import "flutter/shell/platform/darwin/ios/framework/Source/FlutterSemanticsScrollView.h"
 #import "flutter/shell/platform/darwin/ios/framework/Source/accessibility_bridge_ios.h"
 
 constexpr int32_t kRootNodeId = 0;

diff --git a/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm b/shell/platform/darwin/ios/framework/Source/SemanticsObject.mm
@@ -176,6 +176,7 @@ - (void)accessibilityBridgeDidFinishUpdate {
   // contentOffset is 0.0, only the scroll down action is available.
   self.scrollView.frame = self.accessibilityFrame;
   self.scrollView.contentSize = [self contentSizeInternal];
+  // See the documentation on `isDoingSystemScrolling`.
   if (!self.scrollView.isDoingSystemScrolling) {
     [self.scrollView setContentOffset:self.contentOffsetInternal animated:NO];
   }