fix: listener called after tabcontroller got disposed

squidrye · Sep 22, 2023 · 58b0a06 · 58b0a06
1 parent 72b03dd
commit 58b0a06
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 48 deletions.
diff --git a/...pflowy_flutter/lib/workspace/application/panes/pane_node_cubit/cubit/pane_node_cubit.dart b/...pflowy_flutter/lib/workspace/application/panes/pane_node_cubit/cubit/pane_node_cubit.dart
@@ -2,7 +2,6 @@ import 'dart:math';
 
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
 
 part 'pane_node_state.dart';
 

diff --git a/...pflowy_flutter/lib/workspace/application/panes/pane_node_cubit/cubit/pane_node_state.dart b/...pflowy_flutter/lib/workspace/application/panes/pane_node_cubit/cubit/pane_node_state.dart
@@ -1,6 +1,5 @@
 part of 'pane_node_cubit.dart';
 
-@freezed
 class PaneNodeState extends Equatable {
   final List<double> flex;
   const PaneNodeState({required this.flex});

diff --git a/frontend/appflowy_flutter/lib/workspace/application/panes/panes.dart b/frontend/appflowy_flutter/lib/workspace/application/panes/panes.dart
@@ -1,4 +1,4 @@
-import 'package:appflowy/workspace/application/tabs/tabs.dart';
+import 'package:appflowy/workspace/application/tabs/tabs_controller.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 
@@ -7,22 +7,22 @@ class PaneNode extends Equatable {
   final PaneNode? parent;
   final Axis? axis;
   final String paneId;
-  final Tabs tabs;
+  final TabsController tabs;
 
   PaneNode({
     required this.paneId,
     required this.children,
     this.parent,
     this.axis,
-    Tabs? tabs,
-  }) : tabs = tabs ?? Tabs();
+    TabsController? tabs,
+  }) : tabs = tabs ?? TabsController();
 
   PaneNode copyWith({
     PaneNode? parent,
     List<PaneNode>? children,
     Axis? axis,
     String? paneId,
-    Tabs? tabs,
+    TabsController? tabs,
   }) {
     return PaneNode(
       parent: parent ?? this.parent,

diff --git a/frontend/appflowy_flutter/lib/workspace/application/panes/panes_cubit/panes_cubit.dart b/frontend/appflowy_flutter/lib/workspace/application/panes/panes_cubit/panes_cubit.dart
@@ -1,7 +1,7 @@
 import 'package:appflowy/startup/plugin/plugin.dart';
 import 'package:appflowy/workspace/application/panes/panes_service.dart';
-import 'package:appflowy/workspace/application/tabs/tabs.dart';
-import 'package:appflowy/workspace/presentation/home/panes/draggable_pane_item.dart';
+import 'package:appflowy/workspace/application/tabs/tabs_controller.dart';
+import 'package:appflowy/workspace/presentation/home/panes/draggable_pane_target.dart';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
@@ -48,7 +48,6 @@ class PanesCubit extends Cubit<PanesState> {
       plugin: plugin,
       direction: direction,
       axis: axis,
-      setActivePaneCallback: setActivePane,
     );
 
     emit(
@@ -57,6 +56,7 @@ class PanesCubit extends Cubit<PanesState> {
         count: state.count + 1,
       ),
     );
+    setActivePane(state.root.children.last);
   }
 
   void closePane({required String paneId}) {
@@ -65,11 +65,13 @@ class PanesCubit extends Cubit<PanesState> {
         root: panesService.closePaneHandler(
           node: state.root,
           targetPaneId: paneId,
-          setActivePaneCallback: setActivePane,
         ),
         count: state.count - 1,
       ),
     );
+
+    final children = state.root.children;
+    setActivePane(children.isEmpty ? state.root : children.last);
   }
 
   void openTab({required Plugin plugin}) {
@@ -117,7 +119,6 @@ class PanesCubit extends Cubit<PanesState> {
           targetPaneId: to.paneId,
           direction: direction,
           axis: axis,
-          setActivePaneCallback: setActivePane,
           fromNode: from,
         ),
         count: state.count + 1,

diff --git a/frontend/appflowy_flutter/lib/workspace/application/panes/panes_cubit/panes_state.dart b/frontend/appflowy_flutter/lib/workspace/application/panes/panes_cubit/panes_state.dart
@@ -13,7 +13,7 @@ class PanesState extends Equatable {
 
   factory PanesState.initial() {
     final pane = PaneNode(
-      tabs: Tabs(),
+      tabs: TabsController(),
       children: const [],
       paneId: nanoid(),
       axis: null,

diff --git a/frontend/appflowy_flutter/lib/workspace/application/panes/panes_service.dart b/frontend/appflowy_flutter/lib/workspace/application/panes/panes_service.dart
@@ -1,6 +1,6 @@
 import 'package:appflowy/startup/plugin/plugin.dart';
 import 'package:appflowy/workspace/application/panes/panes.dart';
-import 'package:appflowy/workspace/application/tabs/tabs.dart';
+import 'package:appflowy/workspace/application/tabs/tabs_controller.dart';
 import 'package:appflowy/workspace/presentation/home/home_stack.dart';
 import 'package:flutter/material.dart';
 import 'package:nanoid/nanoid.dart';
@@ -13,7 +13,6 @@ class PanesService {
     required String targetPaneId,
     required Direction direction,
     required Axis axis,
-    required void Function(PaneNode) setActivePaneCallback,
     PaneNode? fromNode,
     Plugin? plugin,
   }) {
@@ -32,8 +31,7 @@ class PanesService {
         paneId: nanoid(),
         parent: newHolderNode,
         axis: null,
-        tabs: Tabs(
-          currentIndex: node.tabs.currentIndex,
+        tabs: TabsController(
           pageManagers: node.tabs.pageManagers,
         ),
       );
@@ -42,8 +40,7 @@ class PanesService {
             paneId: nanoid(),
             children: const [],
             axis: null,
-            tabs: Tabs(
-              currentIndex: fromNode.tabs.currentIndex,
+            tabs: TabsController(
               pageManagers: fromNode.tabs.pageManagers,
             ),
           ) ??
@@ -52,9 +49,8 @@ class PanesService {
             children: const [],
             parent: newHolderNode,
             axis: null,
-            tabs: Tabs(
-              pageManagers: [PageManager()..setPlugin(plugin!)],
-            ),
+            tabs: TabsController(pageManagers: [PageManager()])
+              ..openPlugin(plugin: plugin!),
           );
       final ret = newHolderNode.copyWith(
         children: direction == Direction.front
@@ -67,7 +63,6 @@ class PanesService {
                 oldChildNode,
               ],
       );
-      setActivePaneCallback(ret.children[0]);
       return ret;
     }
 
@@ -78,18 +73,16 @@ class PanesService {
         if (node.children[i].paneId == targetPaneId) {
           final newNode = fromNode?.copyWith(
                 paneId: nanoid(),
-                tabs: Tabs(
-                  currentIndex: fromNode.tabs.currentIndex,
+                tabs: TabsController(
                   pageManagers: fromNode.tabs.pageManagers,
                 ),
               ) ??
               PaneNode(
                 paneId: nanoid(),
                 children: const [],
                 parent: node.parent,
-                tabs: Tabs(
-                  pageManagers: [PageManager()..setPlugin(plugin!)],
-                ),
+                tabs: TabsController(pageManagers: [PageManager()])
+                  ..openPlugin(plugin: plugin!),
               );
           if (direction == Direction.front) {
             if (i == node.children.length) {
@@ -102,19 +95,17 @@ class PanesService {
           }
           final ret = node.copyWith(
             paneId: nanoid(),
-            tabs: Tabs(),
+            tabs: TabsController(),
             children: node.children
                 .map(
                   (e) => e.copyWith(
-                    tabs: Tabs(
-                      currentIndex: e.tabs.currentIndex,
+                    tabs: TabsController(
                       pageManagers: e.tabs.pageManagers,
                     ),
                   ),
                 )
                 .toList(),
           );
-          setActivePaneCallback(ret.children[i]);
           return ret;
         }
       }
@@ -131,7 +122,6 @@ class PanesService {
             plugin: plugin,
             direction: direction,
             axis: axis,
-            setActivePaneCallback: setActivePaneCallback,
             fromNode: fromNode,
           ),
         )
@@ -142,43 +132,46 @@ class PanesService {
   PaneNode closePaneHandler({
     required PaneNode node,
     required String targetPaneId,
-    required Function(PaneNode) setActivePaneCallback,
   }) {
     if (node.paneId == targetPaneId) {
       return node;
     }
-    for (final element in node.children) {
+    for (var i = 0; i < node.children.length; i++) {
+      final element = node.children[i];
       if (element.paneId == targetPaneId) {
-        node.children.remove(element);
-        setActivePaneCallback(node);
-
+        node.children.remove(element..tabs.closeAllViews);
         if (node.children.length == 1) {
-          setActivePaneCallback(node.children.first);
-          return node.children.first.copyWith(
+          final ret = node.children.first.copyWith(
             paneId: nanoid(),
             parent: node.parent,
-            tabs: Tabs(
-              currentIndex: node.children.first.tabs.currentIndex,
+            tabs: TabsController(
               pageManagers: node.children.first.tabs.pageManagers,
             ),
           );
+          return ret;
         }
 
-        return node.copyWith(
+        final ret = node.copyWith(
+          children: node.children
+              .map(
+                (e) => e.copyWith(
+                  tabs: TabsController(
+                    pageManagers: e.tabs.pageManagers,
+                  ),
+                ),
+              )
+              .toList(),
           paneId: nanoid(),
-          tabs: Tabs(
-            currentIndex: node.tabs.currentIndex,
-            pageManagers: node.tabs.pageManagers,
-          ),
         );
+
+        return ret;
       }
     }
 
     final newChildren = node.children.map((childNode) {
       return closePaneHandler(
         node: childNode,
         targetPaneId: targetPaneId,
-        setActivePaneCallback: setActivePaneCallback,
       );
     }).toList();