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: remove layout builder in quote block (#7508)

Lucas8d50caa86ef1
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart
index 653bebf902..c22cbb648c 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart
@@ -124,14 +124,14 @@ BlockComponentConfiguration _buildDefaultConfiguration(BuildContext context) {
double padding = 26.0;
// only add indent padding for the top level node to align the children
- if (UniversalPlatform.isMobile && node.path.length == 1) {
- padding += EditorStyleCustomizer.nodeHorizontalPadding;
+ if (UniversalPlatform.isMobile && node.level == 1) {
+ padding += EditorStyleCustomizer.nodeHorizontalPadding - 4;
}
// in the quote block, we reduce the indent padding for the first level block.
// So we have to add more padding for the second level to avoid the drag menu overlay the quote icon.
- if (node.isInQuote && node.level == 2) {
- padding += 24;
+ if (node.isInQuote && node.level == 2 && UniversalPlatform.isDesktop) {
+ padding += 22;
}
return textDirection == TextDirection.ltr
@@ -611,7 +611,12 @@ QuoteBlockComponentBuilder _buildQuoteBlockComponentBuilder(
node: node,
configuration: configuration,
),
- indentPadding: (node, _) => EdgeInsets.zero,
+ indentPadding: (node, textDirection) {
+ if (UniversalPlatform.isMobile) {
+ return configuration.indentPadding(node, textDirection);
+ }
+ return EdgeInsets.zero;
+ },
),
);
}
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart
index 9aa97a20b2..1e8d981c15 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart
@@ -187,10 +187,10 @@ class _CalloutBlockComponentWidgetState
@override
Widget buildComponentWithChildren(BuildContext context) {
- return Stack(
+ Widget child = Stack(
children: [
Positioned.fill(
- left: cachedLeft,
+ left: UniversalPlatform.isMobile ? 0 : cachedLeft,
child: Container(
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(6.0)),
@@ -208,6 +208,15 @@ class _CalloutBlockComponentWidgetState
),
],
);
+
+ if (UniversalPlatform.isMobile) {
+ child = Padding(
+ padding: padding,
+ child: child,
+ );
+ }
+
+ return child;
}
// build the callout block widget
@@ -224,16 +233,17 @@ class _CalloutBlockComponentWidgetState
Widget child = Container(
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(6.0)),
- color: backgroundColor,
+ color: withBackgroundColor ? backgroundColor : null,
),
padding: widget.inlinePadding(widget.node),
width: double.infinity,
alignment: alignment,
child: Row(
mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.start,
textDirection: textDirection,
children: [
- if (UniversalPlatform.isDesktopOrWeb) const HSpace(6.0),
+ const HSpace(6.0),
// the emoji picker button for the note
EmojiPickerButton(
// force to refresh the popover state
@@ -270,11 +280,19 @@ class _CalloutBlockComponentWidgetState
),
);
- child = Padding(
- key: blockComponentKey,
- padding: EdgeInsets.zero,
- child: child,
- );
+ if (UniversalPlatform.isMobile && node.children.isEmpty) {
+ child = Padding(
+ key: blockComponentKey,
+ padding: padding,
+ child: child,
+ );
+ } else {
+ child = Padding(
+ key: blockComponentKey,
+ padding: EdgeInsets.zero,
+ child: child,
+ );
+ }
child = BlockSelectionContainer(
node: node,
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/columns/simple_columns_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/columns/simple_columns_block_component.dart
index f5b0b14400..8408c0f775 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/columns/simple_columns_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/columns/simple_columns_block_component.dart
@@ -162,12 +162,14 @@ class ColumnsBlockComponentState extends State<ColumnsBlockComponent>
children.add(child);
- children.add(
- SimpleColumnBlockWidthResizer(
- columnNode: childNode,
- editorState: editorState,
- ),
- );
+ if (i != length - 1) {
+ children.add(
+ SimpleColumnBlockWidthResizer(
+ columnNode: childNode,
+ editorState: editorState,
+ ),
+ );
+ }
}
return children;
}
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/quote/quote_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/quote/quote_block_component.dart
index 28729e64a6..211a99c1bf 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/quote/quote_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/quote/quote_block_component.dart
@@ -3,6 +3,7 @@ import 'dart:async';
import 'package:appflowy_editor/appflowy_editor.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
+import 'package:universal_platform/universal_platform.dart';
typedef QuoteBlockIconBuilder = Widget Function(
BuildContext context,
@@ -124,7 +125,7 @@ class _QuoteBlockComponentWidgetState extends State<QuoteBlockComponentWidget>
void initState() {
super.initState();
- _observerQuoteBlockChanges();
+ _updateQuoteBlockHeight();
}
@override
@@ -136,18 +137,43 @@ class _QuoteBlockComponentWidgetState extends State<QuoteBlockComponentWidget>
@override
Widget build(BuildContext context) {
- return LayoutBuilder(
- builder: (context, constraints) {
+ return NotificationListener<SizeChangedLayoutNotification>(
+ key: layoutBuilderKey,
+ onNotification: (notification) {
_updateQuoteBlockHeight();
-
- return KeyedSubtree(
- key: layoutBuilderKey,
- child: node.children.isEmpty
- ? buildComponent(context)
- : buildComponentWithChildren(context),
- );
+ return true;
},
+ child: SizeChangedLayoutNotifier(
+ child: node.children.isEmpty
+ ? buildComponent(context)
+ : buildComponentWithChildren(context),
+ ),
+ );
+ }
+
+ @override
+ Widget buildComponentWithChildren(BuildContext context) {
+ final Widget child = Stack(
+ children: [
+ Positioned.fill(
+ left: UniversalPlatform.isMobile ? padding.left : cachedLeft,
+ right: UniversalPlatform.isMobile ? padding.right : 0,
+ child: Container(
+ color: backgroundColor,
+ ),
+ ),
+ NestedListWidget(
+ indentPadding: indentPadding,
+ child: buildComponent(context, withBackgroundColor: false),
+ children: editorState.renderer.buildList(
+ context,
+ widget.node.children,
+ ),
+ ),
+ ],
);
+
+ return child;
}
@override
@@ -204,7 +230,7 @@ class _QuoteBlockComponentWidgetState extends State<QuoteBlockComponentWidget>
);
child = Container(
- color: backgroundColor,
+ color: withBackgroundColor ? backgroundColor : null,
child: Padding(
key: blockComponentKey,
padding: padding,
@@ -218,6 +244,7 @@ class _QuoteBlockComponentWidgetState extends State<QuoteBlockComponentWidget>
listenable: editorState.selectionNotifier,
remoteSelection: editorState.remoteSelections,
blockColor: editorState.editorStyle.selectionColor,
+ selectionAboveBlock: true,
supportTypes: const [
BlockSelectionType.block,
],
@@ -247,24 +274,6 @@ class _QuoteBlockComponentWidgetState extends State<QuoteBlockComponentWidget>
}
});
}
-
- void _observerQuoteBlockChanges() {
- _transactionSubscription = editorState.transactionStream.listen((event) {
- final time = event.$1;
-
- if (time != TransactionTime.before) {
- return;
- }
-
- final transaction = event.$2;
- final operations = transaction.operations;
- for (final operation in operations) {
- if (node.path.isAncestorOf(operation.path)) {
- _updateQuoteBlockHeight();
- }
- }
- });
- }
}
class QuoteIcon extends StatelessWidget {
@@ -287,7 +296,6 @@ class QuoteIcon extends StatelessWidget {
padding: const EdgeInsets.only(right: 6.0),
child: SizedBox(
width: 3 * textScaleFactor,
-
// use overflow box to ensure the container can overflow the height so that the children of the quote block can have the quote
child: OverflowBox(
alignment: Alignment.topCenter,
diff --git a/frontend/appflowy_flutter/macos/Podfile.lock b/frontend/appflowy_flutter/macos/Podfile.lock
index b4a1a3d20d..30ee626f09 100644
--- a/frontend/appflowy_flutter/macos/Podfile.lock
+++ b/frontend/appflowy_flutter/macos/Podfile.lock
@@ -144,34 +144,34 @@ EXTERNAL SOURCES:
:path: Flutter/ephemeral/.symlinks/plugins/window_manager/macos
SPEC CHECKSUMS:
- app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a
- appflowy_backend: 865496343de667fc8c600e04b9fd05234e130cf9
- auto_updater_macos: 3e3462c418fe4e731917eacd8d28eef7af84086d
- bitsdojo_window_macos: 44e3b8fe3dd463820e0321f6256c5b1c16bb6a00
- connectivity_plus: 18d3c32514c886e046de60e9c13895109866c747
- desktop_drop: 69eeff437544aa619c8db7f4481b3a65f7696898
- device_info_plus: ce1b7762849d3ec103d0e0517299f2db7ad60720
- file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d
- flowy_infra_ui: 03301a39ad118771adbf051a664265c61c507f38
+ app_links: 9028728e32c83a0831d9db8cf91c526d16cc5468
+ appflowy_backend: 464aeb3e5c6966a41641a2111e5ead72ce2695f7
+ auto_updater_macos: 3a42f1a06be6981f1a18be37e6e7bf86aa732118
+ bitsdojo_window_macos: 7959fb0ca65a3ccda30095c181ecb856fae48ea9
+ connectivity_plus: e74b9f74717d2d99d45751750e266e55912baeb5
+ desktop_drop: e0b672a7d84c0a6cbc378595e82cdb15f2970a43
+ device_info_plus: a56e6e74dbbd2bb92f2da12c64ddd4f67a749041
+ file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
+ flowy_infra_ui: 8760ff42a789de40bf5007a5f176b454722a341e
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
HotKey: 400beb7caa29054ea8d864c96f5ba7e5b4852277
- hotkey_manager: c32bf0bfe8f934b7bc17ab4ad5c4c142960b023c
- irondash_engine_context: da62996ee25616d2f01bbeb85dc115d813359478
- local_notifier: e9506bc66fc70311e8bc7291fb70f743c081e4ff
- package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
- path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+ hotkey_manager: b443f35f4d772162937aa73fd8995e579f8ac4e2
+ irondash_engine_context: 893c7d96d20ce361d7e996f39d360c4c2f9869ba
+ local_notifier: ebf072651e35ae5e47280ad52e2707375cb2ae4e
+ package_info_plus: f0052d280d17aa382b932f399edf32507174e870
+ path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
- screen_retriever_macos: 776e0fa5d42c6163d2bf772d22478df4b302b161
+ screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f
Sentry: 1fe34e9c2cbba1e347623610d26db121dcb569f1
- sentry_flutter: a39c2a2d67d5e5b9cb0b94a4985c76dd5b3fc737
- share_plus: 1fa619de8392a4398bfaf176d441853922614e89
- shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+ sentry_flutter: e24b397f9a61fa5bbefd8279c3b2242ca86faa90
+ share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc
+ shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
Sparkle: 5f8960a7a119aa7d45dacc0d5837017170bc5675
- sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
- super_native_extensions: 85efee3a7495b46b04befcfc86ed12069264ebf3
- url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
- webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
- window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8
+ sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+ super_native_extensions: c2795d6d9aedf4a79fae25cb6160b71b50549189
+ url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
+ webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c
+ window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c
PODFILE CHECKSUM: 0532f3f001ca3110b8be345d6491fff690e95823