chore: disable log and try to fix some weird bugs

appflowy · appflowy · commit 2152bb71882f · 2022-08-23T20:02:14.000+08:00
diff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/utils/log.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/utils/log.dart
@@ -4,9 +4,7 @@ import 'package:flutter/material.dart';
 const DART_LOG = "Dart_LOG";
 
 class Log {
-  // static const enableLog = bool.hasEnvironment(DART_LOG);
-  // static final shared = Log();
-  static const enableLog = true;
+  static const enableLog = false;
 
   static void info(String? message) {
     if (enableLog) {
@@ -28,7 +26,7 @@ class Log {
 
   static void trace(String? message) {
     if (enableLog) {
-      // debugPrint('❗️[Trace] - ${DateTime.now().second}=> $message');
+      debugPrint('❗️[Trace] - ${DateTime.now().second}=> $message');
     }
   }
 }
diff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board.dart
@@ -159,7 +159,7 @@ class _BoardContentState extends State<BoardContent> {
           dataSource: widget.dataController,
           direction: Axis.horizontal,
           interceptor: interceptor,
-          children: _buildColumns(),
+          children: _buildColumns(interceptor.columnKeys),
         );
 
         return Stack(
@@ -191,7 +191,7 @@ class _BoardContentState extends State<BoardContent> {
     );
   }
 
-  List<Widget> _buildColumns() {
+  List<Widget> _buildColumns(List<ColumnKey> columnKeys) {
     final List<Widget> children =
         widget.dataController.columnDatas.asMap().entries.map(
       (item) {
@@ -208,21 +208,33 @@ class _BoardContentState extends State<BoardContent> {
           value: widget.dataController.columnController(columnData.id),
           child: Consumer<AFBoardColumnDataController>(
             builder: (context, value, child) {
+              final boardColumn = AFBoardColumnWidget(
+                margin: _marginFromIndex(columnIndex),
+                itemMargin: widget.config.columnItemPadding,
+                headerBuilder: widget.headerBuilder,
+                footBuilder: widget.footBuilder,
+                cardBuilder: widget.cardBuilder,
+                dataSource: dataSource,
+                scrollController: ScrollController(),
+                phantomController: widget.phantomController,
+                onReorder: widget.dataController.moveColumnItem,
+                cornerRadius: widget.config.cornerRadius,
+                backgroundColor: widget.config.columnBackgroundColor,
+              );
+
+              // columnKeys
+              //     .removeWhere((element) => element.columnId == columnData.id);
+
+              // columnKeys.add(
+              //   ColumnKey(
+              //     columnId: columnData.id,
+              //     key: boardColumn.columnGlobalKey,
+              //   ),
+              // );
+
               return ConstrainedBox(
                 constraints: widget.columnConstraints,
-                child: AFBoardColumnWidget(
-                  margin: _marginFromIndex(columnIndex),
-                  itemMargin: widget.config.columnItemPadding,
-                  headerBuilder: widget.headerBuilder,
-                  footBuilder: widget.footBuilder,
-                  cardBuilder: widget.cardBuilder,
-                  dataSource: dataSource,
-                  scrollController: ScrollController(),
-                  phantomController: widget.phantomController,
-                  onReorder: widget.dataController.moveColumnItem,
-                  cornerRadius: widget.config.cornerRadius,
-                  backgroundColor: widget.config.columnBackgroundColor,
-                ),
+                child: boardColumn,
               );
             },
           ),
diff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_column/board_column.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_column/board_column.dart
@@ -87,7 +87,9 @@ class AFBoardColumnWidget extends StatefulWidget {
 
   final Color backgroundColor;
 
-  const AFBoardColumnWidget({
+  final GlobalKey columnGlobalKey = GlobalKey();
+
+  AFBoardColumnWidget({
     Key? key,
     this.headerBuilder,
     this.footBuilder,
@@ -136,8 +138,8 @@ class _AFBoardColumnWidgetState extends State<AFBoardColumnWidget> {
           draggableTargetBuilder: PhantomDraggableBuilder(),
         );
 
-        final reorderFlex = ReorderFlex(
-          key: widget.key,
+        Widget reorderFlex = ReorderFlex(
+          key: widget.columnGlobalKey,
           scrollController: widget.scrollController,
           config: widget.config,
           onDragStarted: (index) {
@@ -160,6 +162,9 @@ class _AFBoardColumnWidgetState extends State<AFBoardColumnWidget> {
           children: children,
         );
 
+        // reorderFlex =
+        //     KeyedSubtree(key: widget.columnGlobalKey, child: reorderFlex);
+
         return Container(
           margin: widget.margin,
           clipBehavior: Clip.hardEdge,
diff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/reorder_flex/drag_state.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/reorder_flex/drag_state.dart
@@ -132,7 +132,7 @@ class DraggingState {
   }
 
   void updateNextIndex(int index) {
-    Log.trace('$reorderFlexId updateNextIndex: $index');
+    Log.debug('$reorderFlexId updateNextIndex: $index');
     nextIndex = index;
   }
 
diff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/reorder_flex/drag_target.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/reorder_flex/drag_target.dart
@@ -1,4 +1,3 @@
-import 'package:appflowy_board/src/utils/log.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:provider/provider.dart';
@@ -448,9 +447,9 @@ class _FakeDragTargetState<T extends DragTargetData>
     /// Start insert animation
     widget.insertAnimationController.forward(from: 0.0);
 
-    widget.eventTrigger.fakeOnDragStart((insertIndex) {
-      Log.debug("[$FakeDragTarget] on drag $insertIndex");
-    });
+    // widget.eventTrigger.fakeOnDragStart((insertIndex) {
+    //   Log.trace("[$FakeDragTarget] on drag $insertIndex");
+    // });
 
     widget.eventTrigger.fakeOnDragEnded(() {
       WidgetsBinding.instance.addPostFrameCallback((_) {
diff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/reorder_flex/drag_target_interceptor.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/reorder_flex/drag_target_interceptor.dart
@@ -55,6 +55,7 @@ class OverlappingDragTargetInterceptor extends DragTargetInterceptor {
   final String reorderFlexId;
   final List<String> acceptedReorderFlexId;
   final OverlapDragTargetDelegate delegate;
+  final List<ColumnKey> columnKeys = [];
   Timer? _delayOperation;
 
   OverlappingDragTargetInterceptor({
@@ -87,6 +88,15 @@ class OverlappingDragTargetInterceptor extends DragTargetInterceptor {
           Log.trace(
               '[$OverlappingDragTargetInterceptor] move to $dragTargetId at $index');
           delegate.moveTo(dragTargetId, dragTargetData, index);
+
+          // final columnIndex = columnKeys
+          //     .indexWhere((element) => element.columnId == dragTargetId);
+          // if (columnIndex != -1) {
+          //   final state = columnKeys[columnIndex].key.currentState;
+          //   if (state is ReorderFlexState) {
+          //     state.handleOnWillAccept(context, index);
+          //   }
+          // }
         }
       });
     }
@@ -95,6 +105,12 @@ class OverlappingDragTargetInterceptor extends DragTargetInterceptor {
   }
 }
 
+class ColumnKey {
+  String columnId;
+  GlobalKey key;
+  ColumnKey({required this.columnId, required this.key});
+}
+
 abstract class CrossReorderFlexDragTargetDelegate {
   /// * [reorderFlexId] is the id that the [ReorderFlex] passed in.
   bool acceptNewDragTargetData(
diff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/reorder_flex/reorder_flex.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/reorder_flex/reorder_flex.dart
@@ -213,8 +213,8 @@ class ReorderFlexState extends State<ReorderFlex>
         shiftedIndex = dragState.calculateShiftedIndex(childIndex);
       }
 
-      // Log.trace(
-      //     'Rebuild: Column:[${dragState.id}] ${dragState.toString()}, childIndex: $childIndex shiftedIndex: $shiftedIndex');
+      Log.trace(
+          'Rebuild: Column:[${dragState.reorderFlexId}] ${dragState.toString()}, childIndex: $childIndex shiftedIndex: $shiftedIndex');
       final currentIndex = dragState.currentIndex;
       final dragPhantomIndex = dragState.phantomIndex;
 
diff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/reorder_phantom/phantom_controller.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/reorder_phantom/phantom_controller.dart
@@ -214,12 +214,6 @@ class BoardPhantomController extends OverlapDragTargetDelegate
     } else {
       return 0;
     }
-
-    if (delegate.controller(dragTargetId)?.columnData.items.isEmpty ?? false) {
-      return 0;
-    } else {
-      return -1;
-    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,7 @@ import 'package:flutter/material.dart';`
`4`	`4`	`const DART_LOG = "Dart_LOG";`
`5`	`5`
`6`	`6`	`class Log {`
`7`		`- // static const enableLog = bool.hasEnvironment(DART_LOG);`
`8`		`- // static final shared = Log();`
`9`		`- static const enableLog = true;`
	`7`	`+ static const enableLog = false;`
`10`	`8`
`11`	`9`	`static void info(String? message) {`
`12`	`10`	`if (enableLog) {`
`@@ -28,7 +26,7 @@ class Log {`
`28`	`26`
`29`	`27`	`static void trace(String? message) {`
`30`	`28`	`if (enableLog) {`
`31`		`- // debugPrint('❗️[Trace] - ${DateTime.now().second}=> $message');`
	`29`	`+ debugPrint('❗️[Trace] - ${DateTime.now().second}=> $message');`
`32`	`30`	`}`
`33`	`31`	`}`
`34`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ class DraggingState {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`void updateNextIndex(int index) {`
`135`		`- Log.trace('$reorderFlexId updateNextIndex: $index');`
	`135`	`+ Log.debug('$reorderFlexId updateNextIndex: $index');`
`136`	`136`	`nextIndex = index;`
`137`	`137`	`}`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -213,8 +213,8 @@ class ReorderFlexState extends State<ReorderFlex>`
`213`	`213`	`shiftedIndex = dragState.calculateShiftedIndex(childIndex);`
`214`	`214`	`}`
`215`	`215`
`216`		`- // Log.trace(`
`217`		`- // 'Rebuild: Column:[${dragState.id}] ${dragState.toString()}, childIndex: $childIndex shiftedIndex: $shiftedIndex');`
	`216`	`+ Log.trace(`
	`217`	`+ 'Rebuild: Column:[${dragState.reorderFlexId}] ${dragState.toString()}, childIndex: $childIndex shiftedIndex: $shiftedIndex');`
`218`	`218`	`final currentIndex = dragState.currentIndex;`
`219`	`219`	`final dragPhantomIndex = dragState.phantomIndex;`
`220`	`220`
Original file line number	Diff line number	Diff line change
`@@ -214,12 +214,6 @@ class BoardPhantomController extends OverlapDragTargetDelegate`
`214`	`214`	`} else {`
`215`	`215`	`return 0;`
`216`	`216`	`}`
`217`		`-`
`218`		`- if (delegate.controller(dragTargetId)?.columnData.items.isEmpty ?? false) {`
`219`		`- return 0;`
`220`		`- } else {`
`221`		`- return -1;`
`222`		`- }`
`223`	`217`	`}`
`224`	`218`	`}`
`225`	`219`