Revert "fix: remove flutter overlay (#358)" (#427)

* Revert "fix: remove flutter overlay (#358)" This reverts commit 81fbb40. * fix: hide toolbar when the selection area is invisible
AppFlowy-IO · Aug 29, 2023 · e59b361 · e59b361
1 parent 836e4cb
commit e59b361
Show file tree

Hide file tree

Showing 13 changed files with 972 additions and 35 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 = 1300;
+				LastUpgradeCheck = 1430;
 				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 = "1300"
+   LastUpgradeVersion = "1430"
    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,6 +1,7 @@
 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';
+import 'package:flutter/material.dart' hide Overlay, OverlayEntry;
 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';
+import 'package:flutter/material.dart' hide Overlay, OverlayEntry, OverlayState;
 
 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,8 +1,9 @@
 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';
+import 'package:flutter/material.dart' hide Overlay, OverlayEntry;
 import 'package:provider/provider.dart';
 
 class DesktopSelectionServiceWidget extends StatefulWidget {
@@ -361,7 +362,7 @@ class _DesktopSelectionServiceWidgetState
     );
     _selectionAreas.add(overlay);
 
-    Overlay.of(context).insertAll(_selectionAreas);
+    Overlay.of(context)?.insertAll(_selectionAreas);
   }
 
   void _updateSelectionAreas(Selection selection) {
@@ -478,7 +479,7 @@ class _DesktopSelectionServiceWidgetState
     }
 
     final overlay = Overlay.of(context);
-    overlay.insertAll(
+    overlay?.insertAll(
       _selectionAreas,
     );
   }
@@ -513,7 +514,7 @@ class _DesktopSelectionServiceWidgetState
 
       _cursorAreas.add(cursorArea);
       selectionRects.add(selectable.transformRectToGlobal(cursorRect));
-      Overlay.of(context).insertAll(_cursorAreas);
+      Overlay.of(context)?.insertAll(_cursorAreas);
 
       _forceShowCursor();
     }
@@ -563,7 +564,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,8 +1,9 @@
-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';
@@ -367,7 +368,7 @@ class _MobileSelectionServiceWidgetState
     );
     _selectionAreas.add(overlay);
 
-    Overlay.of(context).insertAll(_selectionAreas);
+    Overlay.of(context)?.insertAll(_selectionAreas);
   }
 
   void _updateSelectionAreas(Selection selection) {
@@ -444,7 +445,8 @@ class _MobileSelectionServiceWidgetState
       }
     }
 
-    Overlay.of(context).insertAll(
+    final overlay = Overlay.of(context);
+    overlay?.insertAll(
       _selectionAreas,
     );
   }
@@ -479,7 +481,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';
+import 'package:flutter/material.dart' hide Overlay, OverlayEntry;
 
 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';
+import 'package:flutter/material.dart' hide Overlay, OverlayEntry;
 
 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