Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: more board fixes (#3821)

Browse Source 
* fix: null check value

* refactor: remove unnecessary blocbuilder

* fix: missing checkbox icon at top of board column
This commit is contained in:
Richard Shiue 2023-10-29 12:51:34 +08:00 committed by GitHub
parent b9a25f449f
commit 18bd91936c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/appflowy_flutter/lib/plugins/database_view/board/application/board_bloc.dart
View File

@ -235,11 +235,13 @@ class BoardBloc extends Bloc<BoardEvent, BoardState> {
if (isClosed || !layoutSettings.hasBoard()) { if (isClosed || !layoutSettings.hasBoard()) {
return; return;
} }
if (layoutSettings.board.hideUngroupedColumn) { if (ungroupedGroup != null) {
boardController.removeGroup(ungroupedGroup!.fieldId); if (layoutSettings.board.hideUngroupedColumn) {
} else if (ungroupedGroup != null) { boardController.removeGroup(ungroupedGroup!.fieldId);
final newGroup = initializeGroupData(ungroupedGroup!); } else {
boardController.addGroup(newGroup); final newGroup = initializeGroupData(ungroupedGroup!);
boardController.addGroup(newGroup);
}
} }
add(BoardEvent.didUpdateLayoutSettings(layoutSettings.board)); add(BoardEvent.didUpdateLayoutSettings(layoutSettings.board));
}, },

125
frontend/appflowy_flutter/lib/plugins/database_view/board/presentation/widgets/board_column_header.dart
View File

@ -62,77 +62,74 @@ class _BoardColumnHeaderState extends State<BoardColumnHeader> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
final boardCustomData = widget.groupData.customData as GroupData; final boardCustomData = widget.groupData.customData as GroupData;
return BlocProvider<BoardBloc>.value( return BlocBuilder<BoardBloc, BoardState>(
value: context.read<BoardBloc>(), builder: (context, state) {
child: BlocBuilder<BoardBloc, BoardState>( if (state.isEditingHeader) {
builder: (context, state) { WidgetsBinding.instance.addPostFrameCallback((_) {
if (state.isEditingHeader) { _focusNode.requestFocus();
WidgetsBinding.instance.addPostFrameCallback((_) { });
_focusNode.requestFocus(); }
});
}
Widget title = Expanded( Widget title = Expanded(
child: FlowyText.medium( child: FlowyText.medium(
widget.groupData.headerData.groupName, widget.groupData.headerData.groupName,
fontSize: 14, fontSize: 14,
overflow: TextOverflow.clip, overflow: TextOverflow.clip,
), ),
); );
if (!boardCustomData.group.isDefault && if (!boardCustomData.group.isDefault &&
boardCustomData.fieldType.canEditHeader) { boardCustomData.fieldType.canEditHeader) {
title = Flexible( title = Flexible(
fit: FlexFit.tight, fit: FlexFit.tight,
child: FlowyTooltip( child: FlowyTooltip(
message: LocaleKeys.board_column_renameGroupTooltip.tr(), message: LocaleKeys.board_column_renameGroupTooltip.tr(),
child: FlowyHover( child: FlowyHover(
style: HoverStyle( style: HoverStyle(
hoverColor: Colors.transparent, hoverColor: Colors.transparent,
foregroundColorOnHover: foregroundColorOnHover:
AFThemeExtension.of(context).textColor, AFThemeExtension.of(context).textColor,
), ),
child: GestureDetector( child: GestureDetector(
onTap: () => context.read<BoardBloc>().add( onTap: () => context.read<BoardBloc>().add(
BoardEvent.startEditingHeader( BoardEvent.startEditingHeader(
widget.groupData.id, widget.groupData.id,
),
), ),
child: FlowyText.medium( ),
widget.groupData.headerData.groupName, child: FlowyText.medium(
fontSize: 14, widget.groupData.headerData.groupName,
overflow: TextOverflow.clip, fontSize: 14,
), overflow: TextOverflow.clip,
), ),
), ),
), ),
);
}
if (state.isEditingHeader &&
state.editingHeaderId == widget.groupData.id) {
title = _buildTextField(context);
}
return AppFlowyGroupHeader(
title: title,
icon: _buildHeaderIcon(boardCustomData),
addIcon: SizedBox(
height: 20,
width: 20,
child: FlowySvg(
FlowySvgs.add_s,
color: Theme.of(context).iconTheme.color,
),
), ),
onAddButtonClick: () => context
.read<BoardBloc>()
.add(BoardEvent.createHeaderRow(widget.groupData.id)),
height: 50,
margin: widget.margin ?? EdgeInsets.zero,
); );
}, }
),
if (state.isEditingHeader &&
state.editingHeaderId == widget.groupData.id) {
title = _buildTextField(context);
}
return AppFlowyGroupHeader(
title: title,
icon: _buildHeaderIcon(boardCustomData),
addIcon: SizedBox(
height: 20,
width: 20,
child: FlowySvg(
FlowySvgs.add_s,
color: Theme.of(context).iconTheme.color,
),
),
onAddButtonClick: () => context
.read<BoardBloc>()
.add(BoardEvent.createHeaderRow(widget.groupData.id)),
height: 50,
margin: widget.margin ?? EdgeInsets.zero,
);
},
); );
} }
@ -224,5 +221,5 @@ Widget? _buildHeaderIcon(GroupData customData) {
); );
} }
return null; return widget;
} }