Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
fix: select card text
appflowy73e81da35680
diff --git a/frontend/app_flowy/ios/Runner/Info.plist b/frontend/app_flowy/ios/Runner/Info.plistindex 848c264d70..122f6a8cd7 100644--- a/frontend/app_flowy/ios/Runner/Info.plist+++ b/frontend/app_flowy/ios/Runner/Info.plist@@ -45,5 +45,7 @@<array><string>en</string></array>+ <key>CADisableMinimumFrameDurationOnPhone</key>+ <true/></dict></plist>diff --git a/frontend/app_flowy/lib/plugins/board/application/board_bloc.dart b/frontend/app_flowy/lib/plugins/board/application/board_bloc.dartindex afb04e8f38..a02eb0dd4d 100644--- a/frontend/app_flowy/lib/plugins/board/application/board_bloc.dart+++ b/frontend/app_flowy/lib/plugins/board/application/board_bloc.dart@@ -89,18 +89,30 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {(err) => Log.error(err),);},- didCreateRow: (String groupId, RowPB row, int? index) {+ didCreateRow: (group, row, int? index) {emit(state.copyWith(editingRow: Some(BoardEditingRow(- columnId: groupId,+ group: group,row: row,index: index,)),));+ _groupItemStartEditing(group, row, true);},- endEditRow: (rowId) {+ startEditingRow: (group, row) {+ emit(state.copyWith(+ editingRow: Some(BoardEditingRow(+ group: group,+ row: row,+ index: null,+ )),+ ));+ _groupItemStartEditing(group, row, true);+ },+ endEditingRow: (rowId) {state.editingRow.fold(() => null, (editingRow) {assert(editingRow.row.id == rowId);+ _groupItemStartEditing(editingRow.group, editingRow.row, false);emit(state.copyWith(editingRow: none()));});},@@ -122,6 +134,24 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {);}+ void _groupItemStartEditing(GroupPB group, RowPB row, bool isEdit) {+ final fieldContext = fieldController.getField(group.fieldId);+ if (fieldContext == null) {+ Log.warn("FieldContext should not be null");+ return;+ }++ boardController.enableGroupDragging(!isEdit);+ // boardController.updateGroupItem(+ // group.groupId,+ // GroupItem(+ // row: row,+ // fieldContext: fieldContext,+ // isDraggable: !isEdit,+ // ),+ // );+ }+void _moveRow(RowPB? fromRow, String columnId, RowPB? toRow) {if (fromRow != null) {_rowService@@ -156,7 +186,7 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {return super.close();}- void initializeGroups(List<GroupPB> groups) {+ void initializeGroups(List<GroupPB> groupsData) {for (var controller in groupControllers.values) {controller.dispose();}@@ -164,27 +194,27 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {boardController.clear();//- List<AppFlowyGroupData> columns = groups+ List<AppFlowyGroupData> groups = groupsData.where((group) => fieldController.getField(group.fieldId) != null).map((group) {return AppFlowyGroupData(id: group.groupId,name: group.desc,- items: _buildRows(group),- customData: BoardCustomData(+ items: _buildGroupItems(group),+ customData: GroupData(group: group,fieldContext: fieldController.getField(group.fieldId)!,),);}).toList();- boardController.addGroups(columns);+ boardController.addGroups(groups);- for (final group in groups) {+ for (final group in groupsData) {final delegate = GroupControllerDelegateImpl(controller: boardController,fieldController: fieldController,onNewColumnItem: (groupId, row, index) {- add(BoardEvent.didCreateRow(groupId, row, index));+ add(BoardEvent.didCreateRow(group, row, index));},);final controller = GroupController(@@ -242,10 +272,13 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {);}- List<AppFlowyGroupItem> _buildRows(GroupPB group) {+ List<AppFlowyGroupItem> _buildGroupItems(GroupPB group) {final items = group.rows.map((row) {final fieldContext = fieldController.getField(group.fieldId);- return BoardColumnItem(row: row, fieldContext: fieldContext!);+ return GroupItem(+ row: row,+ fieldContext: fieldContext!,+ );}).toList();return <AppFlowyGroupItem>[...items];@@ -270,11 +303,15 @@ class BoardEvent with _$BoardEvent {const factory BoardEvent.createBottomRow(String groupId) = _CreateBottomRow;const factory BoardEvent.createHeaderRow(String groupId) = _CreateHeaderRow;const factory BoardEvent.didCreateRow(- String groupId,+ GroupPB group,RowPB row,int? index,) = _DidCreateRow;- const factory BoardEvent.endEditRow(String rowId) = _EndEditRow;+ const factory BoardEvent.startEditingRow(+ GroupPB group,+ RowPB row,+ ) = _StartEditRow;+ const factory BoardEvent.endEditingRow(String rowId) = _EndEditRow;const factory BoardEvent.didReceiveError(FlowyError error) = _DidReceiveError;const factory BoardEvent.didReceiveGridUpdate(GridPB grid,@@ -334,14 +371,17 @@ class GridFieldEquatable extends Equatable {UnmodifiableListView<FieldPB> get value => UnmodifiableListView(_fields);}-class BoardColumnItem extends AppFlowyGroupItem {+class GroupItem extends AppFlowyGroupItem {final RowPB row;final GridFieldContext fieldContext;- BoardColumnItem({+ GroupItem({required this.row,required this.fieldContext,- });+ bool draggable = true,+ }) {+ super.draggable = draggable;+ }@overrideString get id => row.id;@@ -367,10 +407,16 @@ class GroupControllerDelegateImpl extends GroupControllerDelegate {}if (index != null) {- final item = BoardColumnItem(row: row, fieldContext: fieldContext);+ final item = GroupItem(+ row: row,+ fieldContext: fieldContext,+ );controller.insertGroupItem(group.groupId, index, item);} else {- final item = BoardColumnItem(row: row, fieldContext: fieldContext);+ final item = GroupItem(+ row: row,+ fieldContext: fieldContext,+ );controller.addGroupItem(group.groupId, item);}}@@ -389,7 +435,10 @@ class GroupControllerDelegateImpl extends GroupControllerDelegate {}controller.updateGroupItem(group.groupId,- BoardColumnItem(row: row, fieldContext: fieldContext),+ GroupItem(+ row: row,+ fieldContext: fieldContext,+ ),);}@@ -400,7 +449,11 @@ class GroupControllerDelegateImpl extends GroupControllerDelegate {Log.warn("FieldContext should not be null");return;}- final item = BoardColumnItem(row: row, fieldContext: fieldContext);+ final item = GroupItem(+ row: row,+ fieldContext: fieldContext,+ draggable: false,+ );if (index != null) {controller.insertGroupItem(group.groupId, index, item);@@ -412,21 +465,21 @@ class GroupControllerDelegateImpl extends GroupControllerDelegate {}class BoardEditingRow {- String columnId;+ GroupPB group;RowPB row;int? index;BoardEditingRow({- required this.columnId,+ required this.group,required this.row,required this.index,});}-class BoardCustomData {+class GroupData {final GroupPB group;final GridFieldContext fieldContext;- BoardCustomData({+ GroupData({required this.group,required this.fieldContext,});diff --git a/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart b/frontend/app_flowy/lib/plugins/board/presentation/board_page.dartindex dd5e619b46..a7f0d90557 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart+++ b/frontend/app_flowy/lib/plugins/board/presentation/board_page.dart@@ -83,7 +83,7 @@ class _BoardContentState extends State<BoardContent> {@overrideWidget build(BuildContext context) {return BlocListener<BoardBloc, BoardState>(- listener: (context, state) => _handleEditState(state, context),+ listener: (context, state) => _handleEditStateChanged(state, context),child: BlocBuilder<BoardBloc, BoardState>(buildWhen: (previous, current) => previous.groupIds != current.groupIds,builder: (context, state) {@@ -128,21 +128,14 @@ class _BoardContentState extends State<BoardContent> {);}- void _handleEditState(BoardState state, BuildContext context) {+ void _handleEditStateChanged(BoardState state, BuildContext context) {state.editingRow.fold(() => null,(editingRow) {WidgetsBinding.instance.addPostFrameCallback((_) {if (editingRow.index != null) {- context- .read<BoardBloc>()- .add(BoardEvent.endEditRow(editingRow.row.id));} else {- scrollManager.scrollToBottom(editingRow.columnId, (boardContext) {- context- .read<BoardBloc>()- .add(BoardEvent.endEditRow(editingRow.row.id));- });+ scrollManager.scrollToBottom(editingRow.group.groupId);}});},@@ -156,14 +149,14 @@ class _BoardContentState extends State<BoardContent> {Widget _buildHeader(BuildContext context,- AppFlowyGroupData columnData,+ AppFlowyGroupData groupData,) {- final boardCustomData = columnData.customData as BoardCustomData;+ final boardCustomData = groupData.customData as GroupData;return AppFlowyGroupHeader(title: Flexible(fit: FlexFit.tight,child: FlowyText.medium(- columnData.headerData.groupName,+ groupData.headerData.groupName,fontSize: 14,overflow: TextOverflow.clip,color: context.read<AppTheme>().textColor,@@ -180,7 +173,7 @@ class _BoardContentState extends State<BoardContent> {),onAddButtonClick: () {context.read<BoardBloc>().add(- BoardEvent.createHeaderRow(columnData.id),+ BoardEvent.createHeaderRow(groupData.id),);},height: 50,@@ -218,15 +211,16 @@ class _BoardContentState extends State<BoardContent> {Widget _buildCard(BuildContext context,- AppFlowyGroupData group,- AppFlowyGroupItem columnItem,+ AppFlowyGroupData afGroupData,+ AppFlowyGroupItem afGroupItem,) {- final boardColumnItem = columnItem as BoardColumnItem;- final rowPB = boardColumnItem.row;+ final groupItem = afGroupItem as GroupItem;+ final groupData = afGroupData.customData as GroupData;+ final rowPB = groupItem.row;final rowCache = context.read<BoardBloc>().getRowCache(rowPB.blockId);/// Return placeholder widget if the rowCache is null.- if (rowCache == null) return SizedBox(key: ObjectKey(columnItem));+ if (rowCache == null) return SizedBox(key: ObjectKey(groupItem));final fieldController = context.read<BoardBloc>().fieldController;final gridId = context.read<BoardBloc>().gridId;@@ -241,19 +235,19 @@ class _BoardContentState extends State<BoardContent> {context.read<BoardBloc>().state.editingRow.fold(() => null,(editingRow) {- isEditing = editingRow.row.id == columnItem.row.id;+ isEditing = editingRow.row.id == groupItem.row.id;},);- final groupItemId = columnItem.id + group.id;+ final groupItemId = groupItem.row.id + groupData.group.groupId;return AppFlowyGroupCard(key: ValueKey(groupItemId),margin: config.cardPadding,decoration: _makeBoxDecoration(context),child: BoardCard(gridId: gridId,- groupId: group.id,- fieldId: boardColumnItem.fieldContext.id,+ groupId: groupData.group.groupId,+ fieldId: groupItem.fieldContext.id,isEditing: isEditing,cellBuilder: cellBuilder,dataController: cardController,@@ -264,6 +258,19 @@ class _BoardContentState extends State<BoardContent> {rowCache,context,),+ onStartEditing: () {+ context.read<BoardBloc>().add(+ BoardEvent.startEditingRow(+ groupData.group,+ groupItem.row,+ ),+ );+ },+ onEndEditing: () {+ context+ .read<BoardBloc>()+ .add(BoardEvent.endEditingRow(groupItem.row.id));+ },),);}@@ -345,7 +352,7 @@ extension HexColor on Color {}}-Widget? _buildHeaderIcon(BoardCustomData customData) {+Widget? _buildHeaderIcon(GroupData customData) {Widget? widget;switch (customData.fieldType) {case FieldType.Checkbox:diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/board_cell.dart b/frontend/app_flowy/lib/plugins/board/presentation/card/board_cell.dartindex 3968c6463c..549f7ba64c 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/board_cell.dart+++ b/frontend/app_flowy/lib/plugins/board/presentation/card/board_cell.dart@@ -76,6 +76,10 @@ class EditableRowNotifier {}abstract class EditableCell {+ // Each cell notifier will be bind to the [EditableRowNotifier], which enable+ // the row notifier receive its cells event. For example: begin editing the+ // cell or end editing the cell.+ //EditableCellNotifier? get editableNotifier;}diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/board_text_cell.dart b/frontend/app_flowy/lib/plugins/board/presentation/card/board_text_cell.dartindex 4a48e8fe48..3237316c13 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/board_text_cell.dart+++ b/frontend/app_flowy/lib/plugins/board/presentation/card/board_text_cell.dart@@ -42,6 +42,9 @@ class _BoardTextCellState extends State<BoardTextCell> {focusNode.requestFocus();}+ // If the focusNode lost its focus, the widget's editableNotifier will+ // set to false, which will cause the [EditableRowNotifier] to receive+ // end edit event.focusNode.addListener(() {if (!focusNode.hasFocus) {focusWhenInit = false;@@ -131,7 +134,11 @@ class _BoardTextCellState extends State<BoardTextCell> {padding: EdgeInsets.symmetric(vertical: BoardSizes.cardCellVPadding,),- child: FlowyText.medium(state.content, fontSize: 14),+ child: FlowyText.medium(+ state.content,+ fontSize: 14,+ maxLines: null, // Enable multiple lines+ ),);}diff --git a/frontend/app_flowy/lib/plugins/board/presentation/card/card.dart b/frontend/app_flowy/lib/plugins/board/presentation/card/card.dartindex c08ece7474..bf1143523a 100644--- a/frontend/app_flowy/lib/plugins/board/presentation/card/card.dart+++ b/frontend/app_flowy/lib/plugins/board/presentation/card/card.dart@@ -21,6 +21,8 @@ class BoardCard extends StatefulWidget {final CardDataController dataController;final BoardCellBuilder cellBuilder;final void Function(BuildContext) openCard;+ final VoidCallback onStartEditing;+ final VoidCallback onEndEditing;const BoardCard({required this.gridId,@@ -30,6 +32,8 @@ class BoardCard extends StatefulWidget {required this.dataController,required this.cellBuilder,required this.openCard,+ required this.onStartEditing,+ required this.onEndEditing,Key? key,}) : super(key: key);@@ -56,6 +60,12 @@ class _BoardCardState extends State<BoardCard> {rowNotifier.isEditing.addListener(() {if (!mounted) return;_cardBloc.add(BoardCardEvent.setIsEditing(rowNotifier.isEditing.value));++ if (rowNotifier.isEditing.value) {+ widget.onStartEditing();+ } else {+ widget.onEndEditing();+ }});popoverController = PopoverController();diff --git a/frontend/app_flowy/packages/appflowy_board/example/lib/multi_board_list_example.dart b/frontend/app_flowy/packages/appflowy_board/example/lib/multi_board_list_example.dartindex 2a256a51c4..ddf764d5ea 100644--- a/frontend/app_flowy/packages/appflowy_board/example/lib/multi_board_list_example.dart+++ b/frontend/app_flowy/packages/appflowy_board/example/lib/multi_board_list_example.dart@@ -78,7 +78,7 @@ class _MultiBoardListExampleState extends State<MultiBoardListExample> {height: 50,margin: config.groupItemPadding,onAddButtonClick: () {- boardController.scrollToBottom(columnData.id, (p0) {});+ boardController.scrollToBottom(columnData.id);},);},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.dartindex 8aaf94e6d6..824e0e4a79 100644--- a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board.dart+++ b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board.dart@@ -13,7 +13,8 @@ import '../rendering/board_overlay.dart';class AppFlowyBoardScrollController {AppFlowyBoardState? _groupState;- void scrollToBottom(String groupId, void Function(BuildContext)? completed) {+ void scrollToBottom(String groupId,+ {void Function(BuildContext)? completed}) {_groupState?.reorderFlexActionMap[groupId]?.scrollToBottom(completed);}}@@ -39,9 +40,6 @@ class AppFlowyBoardConfig {}class AppFlowyBoard extends StatelessWidget {- /// The direction to use as the main axis.- final Axis direction = Axis.vertical;-/// The widget that will be rendered as the background of the board.final Widget? background;@@ -178,7 +176,10 @@ class _AppFlowyBoardContent extends StatefulWidget {this.headerBuilder,required this.phantomController,Key? key,- }) : reorderFlexConfig = const ReorderFlexConfig(),+ }) : reorderFlexConfig = const ReorderFlexConfig(+ direction: Axis.horizontal,+ dragDirection: Axis.horizontal,+ ),super(key: key);@override@@ -206,9 +207,7 @@ class _AppFlowyBoardContentState extends State<_AppFlowyBoardContent> {scrollController: widget.scrollController,onReorder: widget.onReorder,dataSource: widget.dataController,- direction: Axis.horizontal,interceptor: interceptor,- reorderable: true,children: _buildColumns(),);diff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_data.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_data.dartindex 2fd2f1f3a1..1cc7c2e433 100644--- a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_data.dart+++ b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_data.dart@@ -202,6 +202,14 @@ class AppFlowyBoardController extends ChangeNotifiergetGroupController(groupId)?.replaceOrInsertItem(item);}+ void enableGroupDragging(bool isEnable) {+ for (var groupController in _groupControllers.values) {+ groupController.enableDragging(isEnable);+ }++ notifyListeners();+ }+/// Moves the item at [fromGroupIndex] in group with id [fromGroupId] to/// group with id [toGroupId] at [toGroupIndex]@overridediff --git a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_group/group_data.dart b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_group/group_data.dartindex 5223e10e90..d26949e20a 100644--- a/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_group/group_data.dart+++ b/frontend/app_flowy/packages/appflowy_board/lib/src/widgets/board_group/group_data.dart@@ -5,6 +5,8 @@ import 'package:appflowy_board/src/widgets/reorder_flex/reorder_flex.dart';import 'package:equatable/equatable.dart';import 'package:flutter/material.dart';+typedef IsDraggable = bool;+/// A item represents the generic data model of each group card.////// Each item displayed in the group required to implement this class.@@ -155,6 +157,15 @@ class AppFlowyGroupController extends ChangeNotifier with EquatableMixin {-1;}+ void enableDragging(bool isEnable) {+ groupData.draggable = isEnable;++ for (var item in groupData._items) {+ item.draggable = isEnable;+ }+ _notify();+ }+void _notify() {notifyListeners();}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.dartindex 8e1a61be1a..d24c99bfbd 100644--- 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@@ -16,13 +16,13 @@ class FlexDragTargetData extends DragTargetData {@overridefinal int draggingIndex;- final DraggingState _state;+ final DraggingState _draggingState;- Widget? get draggingWidget => _state.draggingWidget;+ Widget? get draggingWidget => _draggingState.draggingWidget;- Size? get feedbackSize => _state.feedbackSize;+ Size? get feedbackSize => _draggingState.feedbackSize;- bool get isDragging => _state.isDragging();+ bool get isDragging => _draggingState.isDragging();final String dragTargetId;@@ -40,8 +40,8 @@ class FlexDragTargetData extends DragTargetData {required this.reorderFlexId,required this.reorderFlexItem,required this.dragTargetIndexKey,- required DraggingState state,- }) : _state = state;+ required DraggingState draggingState,+ }) : _draggingState = draggingState;@overrideString toString() {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.dartindex fde9c3470a..7482eb36e0 100644--- 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,3 +1,4 @@+import 'package:appflowy_board/appflowy_board.dart';import 'package:appflowy_board/src/utils/log.dart';import 'package:flutter/material.dart';import 'package:flutter/scheduler.dart';@@ -78,10 +79,12 @@ class ReorderDragTarget<T extends DragTargetData> extends StatefulWidget {final bool useMoveAnimation;- final bool draggable;+ final IsDraggable draggable;final double draggingOpacity;+ final Axis? dragDirection;+const ReorderDragTarget({Key? key,required this.child,@@ -99,6 +102,7 @@ class ReorderDragTarget<T extends DragTargetData> extends StatefulWidget {this.onLeave,this.draggableTargetBuilder,this.draggingOpacity = 0.3,+ this.dragDirection,}) : super(key: key);@override@@ -115,8 +119,10 @@ class _ReorderDragTargetState<T extends DragTargetData>Widget dragTarget = DragTarget<T>(builder: _buildDraggableWidget,onWillAccept: (dragTargetData) {- assert(dragTargetData != null);- if (dragTargetData == null) return false;+ if (dragTargetData == null) {+ return false;+ }+return widget.onWillAccept(dragTargetData);},onAccept: widget.onAccept,@@ -140,9 +146,6 @@ class _ReorderDragTargetState<T extends DragTargetData>List<T?> acceptedCandidates,List<dynamic> rejectedCandidates,) {- if (!widget.draggable) {- return widget.child;- }Widget feedbackBuilder = Builder(builder: (BuildContext context) {BoxConstraints contentSizeConstraints =BoxConstraints.loose(_draggingFeedbackSize!);@@ -163,7 +166,8 @@ class _ReorderDragTargetState<T extends DragTargetData>widget.deleteAnimationController,) ??Draggable<DragTargetData>(- maxSimultaneousDrags: 1,+ axis: widget.dragDirection,+ maxSimultaneousDrags: widget.draggable ? 1 : 0,data: widget.dragTargetData,ignoringFeedbackSemantics: false,feedback: feedbackBuilder,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.dartindex 69d763804d..2fe79c839f 100644--- 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@@ -1,6 +1,7 @@import 'dart:collection';import 'dart:math';+import 'package:appflowy_board/appflowy_board.dart';import 'package:flutter/material.dart';import 'package:flutter/rendering.dart';import '../../utils/log.dart';@@ -29,6 +30,8 @@ abstract class ReoderFlexDataSource {abstract class ReoderFlexItem {/// [id] is used to identify the item. It must be unique.String get id;++ IsDraggable draggable = true;}/// Cache each dragTarget's key.@@ -73,8 +76,15 @@ class ReorderFlexConfig {final bool useMovePlaceholder;+ /// [direction] How to place the children, default is Axis.vertical+ final Axis direction;++ final Axis? dragDirection;+const ReorderFlexConfig({this.useMoveAnimation = true,+ this.direction = Axis.vertical,+ this.dragDirection,}) : useMovePlaceholder = !useMoveAnimation;}@@ -82,8 +92,6 @@ class ReorderFlex extends StatefulWidget {final ReorderFlexConfig config;final List<Widget> children;- /// [direction] How to place the children, default is Axis.vertical- final Axis direction;final MainAxisAlignment mainAxisAlignment = MainAxisAlignment.start;final ScrollController? scrollController;@@ -108,8 +116,6 @@ class ReorderFlex extends StatefulWidget {final ReorderFlexAction? reorderFlexAction;- final bool reorderable;-ReorderFlex({Key? key,this.scrollController,@@ -117,14 +123,12 @@ class ReorderFlex extends StatefulWidget {required this.children,required this.config,required this.onReorder,- this.reorderable = true,this.dragStateStorage,this.dragTargetKeys,this.onDragStarted,this.onDragEnded,this.interceptor,this.reorderFlexAction,- this.direction = Axis.vertical,}) : assert(children.every((Widget w) => w.key != null),'All child must have a key.'),super(key: key);@@ -146,8 +150,8 @@ class ReorderFlexState extends State<ReorderFlex>/// Whether or not we are currently scrolling this view to show a widget.bool _scrolling = false;- /// [dragState] records the dragging state including dragStartIndex, and phantomIndex, etc.- late DraggingState dragState;+ /// [draggingState] records the dragging state including dragStartIndex, and phantomIndex, etc.+ late DraggingState draggingState;/// [_animation] controls the dragging animationslate DragTargetAnimation _animation;@@ -158,9 +162,9 @@ class ReorderFlexState extends State<ReorderFlex>void initState() {_notifier = ReorderFlexNotifier();final flexId = widget.reorderFlexId;- dragState = widget.dragStateStorage?.readState(flexId) ??+ draggingState = widget.dragStateStorage?.readState(flexId) ??DraggingState(widget.reorderFlexId);- Log.trace('[DragTarget] init dragState: $dragState');+ Log.trace('[DragTarget] init dragState: $draggingState');widget.dragStateStorage?.removeState(flexId);@@ -168,7 +172,7 @@ class ReorderFlexState extends State<ReorderFlex>reorderAnimationDuration: widget.config.reorderAnimationDuration,entranceAnimateStatusChanged: (status) {if (status == AnimationStatus.completed) {- if (dragState.nextIndex == -1) return;+ if (draggingState.nextIndex == -1) return;setState(() => _requestAnimationToNextIndex());}},@@ -225,7 +229,7 @@ class ReorderFlexState extends State<ReorderFlex>indexKey,);- children.add(_wrap(child, i, indexKey));+ children.add(_wrap(child, i, indexKey, item.draggable));// if (widget.config.useMovePlaceholder) {// children.add(DragTargeMovePlaceholder(@@ -256,64 +260,70 @@ class ReorderFlexState extends State<ReorderFlex>/// when the animation finish.if (_animation.entranceController.isCompleted) {- dragState.removePhantom();+ draggingState.removePhantom();- if (!isAcceptingNewTarget && dragState.didDragTargetMoveToNext()) {+ if (!isAcceptingNewTarget && draggingState.didDragTargetMoveToNext()) {return;}- dragState.moveDragTargetToNext();+ draggingState.moveDragTargetToNext();_animation.animateToNext();}}/// [child]: the child will be wrapped with dartTarget/// [childIndex]: the index of the child in a list- Widget _wrap(Widget child, int childIndex, GlobalObjectKey indexKey) {+ Widget _wrap(+ Widget child,+ int childIndex,+ GlobalObjectKey indexKey,+ IsDraggable draggable,+ ) {return Builder(builder: (context) {final ReorderDragTarget dragTarget = _buildDragTarget(context,child,childIndex,indexKey,+ draggable,);int shiftedIndex = childIndex;- if (dragState.isOverlapWithPhantom()) {- shiftedIndex = dragState.calculateShiftedIndex(childIndex);+ if (draggingState.isOverlapWithPhantom()) {+ shiftedIndex = draggingState.calculateShiftedIndex(childIndex);}Log.trace(- 'Rebuild: Group:[${dragState.reorderFlexId}] ${dragState.toString()}, childIndex: $childIndex shiftedIndex: $shiftedIndex');- final currentIndex = dragState.currentIndex;- final dragPhantomIndex = dragState.phantomIndex;+ 'Rebuild: Group:[${draggingState.reorderFlexId}] ${draggingState.toString()}, childIndex: $childIndex shiftedIndex: $shiftedIndex');+ final currentIndex = draggingState.currentIndex;+ final dragPhantomIndex = draggingState.phantomIndex;if (shiftedIndex == currentIndex || childIndex == dragPhantomIndex) {Widget dragSpace;- if (dragState.draggingWidget != null) {- if (dragState.draggingWidget is PhantomWidget) {- dragSpace = dragState.draggingWidget!;+ if (draggingState.draggingWidget != null) {+ if (draggingState.draggingWidget is PhantomWidget) {+ dragSpace = draggingState.draggingWidget!;} else {dragSpace = PhantomWidget(opacity: widget.config.draggingWidgetOpacity,- child: dragState.draggingWidget,+ child: draggingState.draggingWidget,);}} else {- dragSpace = SizedBox.fromSize(size: dragState.dropAreaSize);+ dragSpace = SizedBox.fromSize(size: draggingState.dropAreaSize);}/// Returns the dragTarget it is not start dragging. The size of the/// dragTarget is the same as the the passed in child.///- if (dragState.isNotDragging()) {+ if (draggingState.isNotDragging()) {return _buildDraggingContainer(children: [dragTarget]);}/// Determine the size of the drop area to show under the dragging widget.Size? feedbackSize = Size.zero;if (widget.config.useMoveAnimation) {- feedbackSize = dragState.feedbackSize;+ feedbackSize = draggingState.feedbackSize;}Widget appearSpace = _makeAppearSpace(dragSpace, feedbackSize);@@ -321,7 +331,7 @@ class ReorderFlexState extends State<ReorderFlex>/// When start dragging, the dragTarget, [ReorderDragTarget], will/// return a [IgnorePointerWidget] which size is zero.- if (dragState.isPhantomAboveDragTarget()) {+ if (draggingState.isPhantomAboveDragTarget()) {_notifier.updateDragTargetIndex(currentIndex);if (shiftedIndex == currentIndex && childIndex == dragPhantomIndex) {return _buildDraggingContainer(children: [@@ -343,7 +353,7 @@ class ReorderFlexState extends State<ReorderFlex>}///- if (dragState.isPhantomBelowDragTarget()) {+ if (draggingState.isPhantomBelowDragTarget()) {_notifier.updateDragTargetIndex(currentIndex);if (shiftedIndex == currentIndex && childIndex == dragPhantomIndex) {return _buildDraggingContainer(children: [@@ -364,10 +374,10 @@ class ReorderFlexState extends State<ReorderFlex>}}- assert(!dragState.isOverlapWithPhantom());+ assert(!draggingState.isOverlapWithPhantom());List<Widget> children = [];- if (dragState.isDragTargetMovingDown()) {+ if (draggingState.isDragTargetMovingDown()) {children.addAll([dragTarget, appearSpace]);} else {children.addAll([appearSpace, dragTarget]);@@ -395,15 +405,17 @@ class ReorderFlexState extends State<ReorderFlex>Widget child,int dragTargetIndex,GlobalObjectKey indexKey,+ IsDraggable draggable,) {final reorderFlexItem = widget.dataSource.items[dragTargetIndex];return ReorderDragTarget<FlexDragTargetData>(indexGlobalKey: indexKey,+ draggable: draggable,dragTargetData: FlexDragTargetData(draggingIndex: dragTargetIndex,reorderFlexId: widget.reorderFlexId,reorderFlexItem: reorderFlexItem,- state: dragState,+ draggingState: draggingState,dragTargetId: reorderFlexItem.id,dragTargetIndexKey: indexKey,),@@ -432,11 +444,11 @@ class ReorderFlexState extends State<ReorderFlex>setState(() {if (dragTargetData.reorderFlexId == widget.reorderFlexId) {_onReordered(- dragState.dragStartIndex,- dragState.currentIndex,+ draggingState.dragStartIndex,+ draggingState.currentIndex,);}- dragState.endDragging();+ draggingState.endDragging();widget.onDragEnded?.call();});},@@ -482,8 +494,8 @@ class ReorderFlexState extends State<ReorderFlex>deleteAnimationController: _animation.deleteController,draggableTargetBuilder: widget.interceptor?.draggableTargetBuilder,useMoveAnimation: widget.config.useMoveAnimation,- draggable: widget.reorderable,draggingOpacity: widget.config.draggingWidgetOpacity,+ dragDirection: widget.config.dragDirection,child: child,);}@@ -506,7 +518,7 @@ class ReorderFlexState extends State<ReorderFlex>child,_animation.entranceController,feedbackSize,- widget.direction,+ widget.config.direction,);}@@ -515,7 +527,7 @@ class ReorderFlexState extends State<ReorderFlex>child,_animation.phantomController,feedbackSize,- widget.direction,+ widget.config.direction,);}@@ -525,7 +537,7 @@ class ReorderFlexState extends State<ReorderFlex>Size? feedbackSize,) {setState(() {- dragState.startDragging(draggingWidget, dragIndex, feedbackSize);+ draggingState.startDragging(draggingWidget, dragIndex, feedbackSize);_animation.startDragging();});}@@ -535,34 +547,34 @@ class ReorderFlexState extends State<ReorderFlex>return;}- dragState.setStartDraggingIndex(dragTargetIndex);+ draggingState.setStartDraggingIndex(dragTargetIndex);widget.dragStateStorage?.insertState(widget.reorderFlexId,- dragState,+ draggingState,);}bool handleOnWillAccept(BuildContext context, int dragTargetIndex) {- final dragIndex = dragState.dragStartIndex;+ final dragIndex = draggingState.dragStartIndex;/// The [willAccept] will be true if the dargTarget is the widget that gets/// dragged and it is dragged on top of the other dragTargets.///- bool willAccept =- dragState.dragStartIndex == dragIndex && dragIndex != dragTargetIndex;+ bool willAccept = draggingState.dragStartIndex == dragIndex &&+ dragIndex != dragTargetIndex;setState(() {if (willAccept) {- int shiftedIndex = dragState.calculateShiftedIndex(dragTargetIndex);- dragState.updateNextIndex(shiftedIndex);+ int shiftedIndex = draggingState.calculateShiftedIndex(dragTargetIndex);+ draggingState.updateNextIndex(shiftedIndex);} else {- dragState.updateNextIndex(dragTargetIndex);+ draggingState.updateNextIndex(dragTargetIndex);}_requestAnimationToNextIndex(isAcceptingNewTarget: true);});Log.trace(- '[$ReorderDragTarget] ${widget.reorderFlexId} dragging state: $dragState}');+ '[$ReorderDragTarget] ${widget.reorderFlexId} dragging state: $draggingState}');_scrollTo(context);@@ -587,7 +599,7 @@ class ReorderFlexState extends State<ReorderFlex>return child;} else {return SingleChildScrollView(- scrollDirection: widget.direction,+ scrollDirection: widget.config.direction,controller: _scrollController,child: child,);@@ -595,7 +607,7 @@ class ReorderFlexState extends State<ReorderFlex>}Widget _wrapContainer(List<Widget> children) {- switch (widget.direction) {+ switch (widget.config.direction) {case Axis.horizontal:return Row(crossAxisAlignment: CrossAxisAlignment.start,@@ -613,7 +625,7 @@ class ReorderFlexState extends State<ReorderFlex>}Widget _buildDraggingContainer({required List<Widget> children}) {- switch (widget.direction) {+ switch (widget.config.direction) {case Axis.horizontal:return Row(crossAxisAlignment: CrossAxisAlignment.start,@@ -660,6 +672,7 @@ class ReorderFlexState extends State<ReorderFlex>.ensureVisible(dragTargetRenderObject,alignment: 0.5,+ alignmentPolicy: ScrollPositionAlignmentPolicy.keepVisibleAtStart,duration: const Duration(milliseconds: 120),).then((value) {@@ -683,9 +696,9 @@ class ReorderFlexState extends State<ReorderFlex>// If and only if the current scroll offset falls in-between the offsets// necessary to reveal the selected context at the top or bottom of the// screen, then it is already on-screen.- final double margin = widget.direction == Axis.horizontal- ? dragState.dropAreaSize.width- : dragState.dropAreaSize.height / 2.0;+ final double margin = widget.config.direction == Axis.horizontal+ ? draggingState.dropAreaSize.width+ : draggingState.dropAreaSize.height / 2.0;if (_scrollController.hasClients) {final double scrollOffset = _scrollController.offset;final double topOffset = max(diff --git a/frontend/app_flowy/pubspec.lock b/frontend/app_flowy/pubspec.lockindex a042baadd7..eaa1ad4900 100644--- a/frontend/app_flowy/pubspec.lock+++ b/frontend/app_flowy/pubspec.lock@@ -28,7 +28,7 @@ packages:path: "packages/appflowy_board"relative: truesource: path- version: "0.0.7"+ version: "0.0.8"appflowy_editor:dependency: "direct main"description: