Skip to content

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.

fix: optimize cover title position offset calculation (#7568)

Lucasa89dd87c162e
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_shortcuts.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_shortcuts.dart
index 482364bbb5..842f3f59fd 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_shortcuts.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_shortcuts.dart
@@ -32,7 +32,8 @@ CharacterShortcutEventHandler _insertNewLineHandler = (editorState) async {
await editorState.deleteSelection(selection);
if (HardwareKeyboard.instance.isShiftPressed) {
- await editorState.insertNewLine();
+ // ignore the shift+enter event, fallback to the default behavior
+ return false;
} else if (node.children.isEmpty) {
// insert a new paragraph within the callout block
final path = node.path.child(0);
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart
index 7cfd28395a..16605367ca 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/header/document_cover_widget.dart
@@ -188,52 +188,65 @@ class _DocumentCoverWidgetState extends State<DocumentCoverWidget> {
onChangeCover: (type, details) =>
_saveIconOrCover(cover: (type, details)),
),
- _buildCoverIcon(
- context,
- constraints,
- offset,
- ),
+ _buildAlignedCoverIcon(context),
],
),
- Padding(
- padding: EdgeInsets.fromLTRB(offset, 0, offset, 12),
- child: Visibility(
- visible: offset != 0,
- child: MouseRegion(
- onEnter: (event) => isCoverTitleHovered.value = true,
- onExit: (event) => isCoverTitleHovered.value = false,
- child: CoverTitle(
- view: widget.view,
- ),
- ),
- ),
- ),
+ _buildAlignedTitle(context),
],
);
},
);
}
- Widget _buildCoverIcon(
- BuildContext context,
- BoxConstraints constraints,
- double offset,
- ) {
- if (!hasIcon || offset == 0) {
+ Widget _buildAlignedTitle(BuildContext context) {
+ return Center(
+ child: Container(
+ constraints: BoxConstraints(
+ maxWidth: widget.editorState.editorStyle.maxWidth ?? double.infinity,
+ ),
+ padding: widget.editorState.editorStyle.padding +
+ const EdgeInsets.symmetric(horizontal: 44),
+ child: MouseRegion(
+ onEnter: (event) => isCoverTitleHovered.value = true,
+ onExit: (event) => isCoverTitleHovered.value = false,
+ child: CoverTitle(
+ view: widget.view,
+ ),
+ ),
+ ),
+ );
+ }
+
+ Widget _buildAlignedCoverIcon(BuildContext context) {
+ if (!hasIcon) {
return const SizedBox.shrink();
}
return Positioned(
- // if hasCover, there shouldn't be icons present so the icon can
- // be closer to the bottom.
- left: offset,
bottom: hasCover ? kToolbarHeight - kIconHeight / 2 : kToolbarHeight,
- child: DocumentIcon(
- editorState: widget.editorState,
- node: widget.node,
- icon: viewIcon,
- documentId: view.id,
- onChangeIcon: (icon) => _saveIconOrCover(icon: icon),
+ left: 0,
+ right: 0,
+ child: Center(
+ child: Container(
+ constraints: BoxConstraints(
+ maxWidth:
+ widget.editorState.editorStyle.maxWidth ?? double.infinity,
+ ),
+ padding: widget.editorState.editorStyle.padding +
+ const EdgeInsets.symmetric(horizontal: 44),
+ child: Row(
+ children: [
+ DocumentIcon(
+ editorState: widget.editorState,
+ node: widget.node,
+ icon: viewIcon,
+ documentId: view.id,
+ onChangeIcon: (icon) => _saveIconOrCover(icon: icon),
+ ),
+ Spacer(),
+ ],
+ ),
+ ),
),
);
}
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/quote/quote_block_shortcuts.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/quote/quote_block_shortcuts.dart
index 914aa7163c..47c6549923 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/quote/quote_block_shortcuts.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/quote/quote_block_shortcuts.dart
@@ -30,8 +30,8 @@ CharacterShortcutEventHandler _insertNewLineHandler = (editorState) async {
await editorState.deleteSelection(selection);
if (HardwareKeyboard.instance.isShiftPressed) {
- await editorState.insertNewLine();
- return true;
+ // ignore the shift+enter event, fallback to the default behavior
+ return false;
} else if (node.children.isEmpty &&
selection.endIndex == node.delta?.length) {
// insert a new paragraph within the callout block