Merge branch 'AppFlowy-IO:main' into l10n

AppFlowy-IO · Sep 15, 2023 · 4c4848a · 4c4848a
2 parents bdac9cc + f5b3ea8
commit 4c4848a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -8,7 +8,7 @@ void main() {
 }
 
 class MyApp extends StatelessWidget {
-  const MyApp({Key? key}) : super(key: key);
+  const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {

diff --git a/lib/src/editor/editor_component/service/scroll/editor_scroll_controller.dart b/lib/src/editor/editor_component/service/scroll/editor_scroll_controller.dart
@@ -169,6 +169,21 @@ class EditorScrollController {
     }
   }
 
+  void jumpTo({
+    required double offset,
+  }) async {
+    if (shrinkWrap) {
+      return scrollController.jumpTo(
+        offset.clamp(
+          scrollController.position.minScrollExtent,
+          scrollController.position.maxScrollExtent,
+        ),
+      );
+    }
+
+    scrollOffsetController.jumpTo(offset: max(0, offset));
+  }
+
   void jumpToTop() {
     if (shrinkWrap) {
       scrollController.jumpTo(0);

diff --git a/lib/src/editor/editor_component/service/scroll_service_widget.dart b/lib/src/editor/editor_component/service/scroll_service_widget.dart
@@ -105,32 +105,26 @@ class _ScrollServiceWidgetState extends State<ScrollServiceWidget>
 
       if (editorState.selectionUpdateReason ==
           SelectionUpdateReason.searchNavigate) {
-        widget.editorScrollController.animateTo(
-          offset: endTouchPoint.dy - 100,
-          duration: const Duration(microseconds: 1),
-        );
-        return;
+        return widget.editorScrollController
+            .jumpTo(offset: endTouchPoint.dy - 100);
       }
 
       if (selection.isCollapsed) {
         if (PlatformExtension.isMobile) {
           // soft keyboard
           // workaround: wait for the soft keyboard to show up
-          Future.delayed(const Duration(milliseconds: 300), () {
+          return Future.delayed(const Duration(milliseconds: 300), () {
             startAutoScroll(endTouchPoint, edgeOffset: 50);
           });
-        } else {
-          startAutoScroll(
-            endTouchPoint,
-            edgeOffset: 100,
-            duration: Duration.zero,
-          );
         }
-      } else {
+
         startAutoScroll(
           endTouchPoint,
+          edgeOffset: 100,
           duration: Duration.zero,
         );
+      } else {
+        startAutoScroll(endTouchPoint, duration: Duration.zero);
       }
     });
   }

diff --git a/lib/src/flutter/scrollable_positioned_list/src/scrollable_positioned_list.dart b/lib/src/flutter/scrollable_positioned_list/src/scrollable_positioned_list.dart
@@ -302,6 +302,9 @@ class ScrollOffsetController {
     );
   }
 
+  void jumpTo({required double offset}) =>
+      _scrollableListState!.primary.scrollController.jumpTo(offset);
+
   _ScrollablePositionedListState? _scrollableListState;
 
   void _attach(_ScrollablePositionedListState scrollableListState) {