fix: remove flutter overlay (AppFlowy-IO#358)

* fix: remove flutter overlay * fix: hide toolbar if selection is not visible --------- Co-authored-by: Lucas.Xu <lucas.xu@appflowy.io>
LucasXu0 · Aug 29, 2023 · 81fbb40 · 81fbb40
1 parent 7a03439
commit 81fbb40
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 972 deletions.
diff --git a/example/macos/Runner.xcodeproj/project.pbxproj b/example/macos/Runner.xcodeproj/project.pbxproj
@@ -203,7 +203,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {

diff --git a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/lib/src/editor/editor_component/service/editor.dart b/lib/src/editor/editor_component/service/editor.dart
@@ -1,7 +1,6 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/flutter/overlay.dart';
 import 'package:appflowy_editor/src/service/context_menu/built_in_context_menu_item.dart';
-import 'package:flutter/material.dart' hide Overlay, OverlayEntry;
+import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 // workaround for the issue:

diff --git a/lib/src/editor/editor_component/service/editor_service.dart b/lib/src/editor/editor_component/service/editor_service.dart
@@ -1,5 +1,5 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:flutter/material.dart' hide Overlay, OverlayEntry, OverlayState;
+import 'package:flutter/material.dart';
 
 class EditorService {
   // selection service

diff --git a/lib/src/editor/editor_component/service/selection/desktop_selection_service.dart b/lib/src/editor/editor_component/service/selection/desktop_selection_service.dart
@@ -1,9 +1,8 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/flutter/overlay.dart';
 import 'package:appflowy_editor/src/render/selection/cursor_widget.dart';
 import 'package:appflowy_editor/src/render/selection/selection_widget.dart';
 import 'package:appflowy_editor/src/service/selection/selection_gesture.dart';
-import 'package:flutter/material.dart' hide Overlay, OverlayEntry;
+import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
 class DesktopSelectionServiceWidget extends StatefulWidget {
@@ -362,7 +361,7 @@ class _DesktopSelectionServiceWidgetState
     );
     _selectionAreas.add(overlay);
 
-    Overlay.of(context)?.insertAll(_selectionAreas);
+    Overlay.of(context).insertAll(_selectionAreas);
   }
 
   void _updateSelectionAreas(Selection selection) {
@@ -479,7 +478,7 @@ class _DesktopSelectionServiceWidgetState
     }
 
     final overlay = Overlay.of(context);
-    overlay?.insertAll(
+    overlay.insertAll(
       _selectionAreas,
     );
   }
@@ -514,7 +513,7 @@ class _DesktopSelectionServiceWidgetState
 
       _cursorAreas.add(cursorArea);
       selectionRects.add(selectable.transformRectToGlobal(cursorRect));
-      Overlay.of(context)?.insertAll(_cursorAreas);
+      Overlay.of(context).insertAll(_cursorAreas);
 
       _forceShowCursor();
     }
@@ -564,7 +563,7 @@ class _DesktopSelectionServiceWidgetState
     );
 
     _contextMenuAreas.add(contextMenu);
-    Overlay.of(context)?.insert(contextMenu);
+    Overlay.of(context).insert(contextMenu);
   }
 
   Node? _getNodeInOffset(

diff --git a/lib/src/editor/editor_component/service/selection/mobile_selection_service.dart b/lib/src/editor/editor_component/service/selection/mobile_selection_service.dart
@@ -1,9 +1,8 @@
+import 'package:flutter/material.dart';
+
 import 'package:appflowy_editor/appflowy_editor.dart';
-import 'package:appflowy_editor/src/flutter/overlay.dart';
 import 'package:appflowy_editor/src/render/selection/mobile_selection_widget.dart';
 import 'package:appflowy_editor/src/service/selection/mobile_selection_gesture.dart';
-import 'package:flutter/material.dart' hide Overlay, OverlayEntry;
-
 import 'package:appflowy_editor/src/render/selection/cursor_widget.dart';
 import 'package:appflowy_editor/src/render/selection/selection_widget.dart';
 import 'package:provider/provider.dart';
@@ -368,7 +367,7 @@ class _MobileSelectionServiceWidgetState
     );
     _selectionAreas.add(overlay);
 
-    Overlay.of(context)?.insertAll(_selectionAreas);
+    Overlay.of(context).insertAll(_selectionAreas);
   }
 
   void _updateSelectionAreas(Selection selection) {
@@ -445,8 +444,7 @@ class _MobileSelectionServiceWidgetState
       }
     }
 
-    final overlay = Overlay.of(context);
-    overlay?.insertAll(
+    Overlay.of(context).insertAll(
       _selectionAreas,
     );
   }
@@ -481,7 +479,7 @@ class _MobileSelectionServiceWidgetState
 
       _cursorAreas.add(cursorArea);
       selectionRects.add(selectable.transformRectToGlobal(cursorRect));
-      Overlay.of(context)?.insertAll(_cursorAreas);
+      Overlay.of(context).insertAll(_cursorAreas);
 
       _forceShowCursor();
     }

diff --git a/lib/src/editor/editor_component/service/selection_service.dart b/lib/src/editor/editor_component/service/selection_service.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart' hide Overlay, OverlayEntry;
+import 'package:flutter/material.dart';
 
 import 'package:appflowy_editor/src/core/document/node.dart';
 import 'package:appflowy_editor/src/core/location/position.dart';

diff --git a/lib/src/editor/editor_component/service/selection_service_widget.dart b/lib/src/editor/editor_component/service/selection_service_widget.dart
@@ -1,7 +1,7 @@
 import 'package:appflowy_editor/appflowy_editor.dart';
 import 'package:appflowy_editor/src/editor/editor_component/service/selection/desktop_selection_service.dart';
 import 'package:appflowy_editor/src/editor/editor_component/service/selection/mobile_selection_service.dart';
-import 'package:flutter/material.dart' hide Overlay, OverlayEntry;
+import 'package:flutter/material.dart';
 
 class SelectionServiceWidget extends StatefulWidget {
   const SelectionServiceWidget({

diff --git a/lib/src/editor/editor_component/service/toolbar_service.dart b/lib/src/editor/editor_component/service/toolbar_service.dart
@@ -0,0 +1,16 @@
+import 'package:flutter/material.dart';
+
+abstract class AppFlowyToolbarService {
+  /// Show the toolbar widget beside the offset.
+  void showInOffset(
+    Offset offset,
+    Alignment alignment,
+    LayerLink layerLink,
+  );
+
+  /// Hide the toolbar widget.
+  void hide();
+
+  /// Trigger the specified handler.
+  bool triggerHandler(String id);
+}
diff --git a/lib/src/editor/toolbar/desktop/floating_toolbar.dart b/lib/src/editor/toolbar/desktop/floating_toolbar.dart
@@ -152,6 +152,10 @@ class _FloatingToolbarState extends State<FloatingToolbar>
 
     final rect = _findSuitableRect(rects);
     final (left, top, right) = calculateToolbarOffset(rect);
+    // if the selection is not visible, then don't show the toolbar.
+    if (top <= floatingToolbarHeight || (left == 0 && right == 0)) {
+      return;
+    }
     _toolbarContainer = OverlayEntry(
       builder: (context) {
         return Positioned(