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.

chore: allow customize that forces distribute column widths (#7198)

Richard Shiue9a237b5f18fb
diff --git a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_markdown_text.dart b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_markdown_text.dart
index 12c9cc7e68..42518c2381 100644
--- a/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_markdown_text.dart
+++ b/frontend/appflowy_flutter/lib/plugins/ai_chat/presentation/message/ai_markdown_text.dart
@@ -101,6 +101,7 @@ class _AppFlowyEditorMarkdownState extends State<_AppFlowyEditorMarkdown> {
styleCustomizer: styleCustomizer,
// the editor is not editable in the chat
editable: false,
+ alwaysDistributeSimpleTableColumnWidths: true,
);
return IntrinsicHeight(
child: AppFlowyEditor(
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 489ba2e14a..13bebf4d0a 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart
@@ -52,6 +52,7 @@ Map<String, BlockComponentBuilder> buildBlockComponentBuilders({
ShowPlaceholder? showParagraphPlaceholder,
String Function(Node)? placeholderText,
EdgeInsets? customHeadingPadding,
+ bool alwaysDistributeSimpleTableColumnWidths = false,
}) {
final configuration = _buildDefaultConfiguration(context);
final builders = _buildBlockComponentBuilderMap(
@@ -61,6 +62,8 @@ Map<String, BlockComponentBuilder> buildBlockComponentBuilders({
styleCustomizer: styleCustomizer,
showParagraphPlaceholder: showParagraphPlaceholder,
placeholderText: placeholderText,
+ alwaysDistributeSimpleTableColumnWidths:
+ alwaysDistributeSimpleTableColumnWidths,
);
// customize the action builder. actually, we can customize them in their own builder. Put them here just for convenience.
@@ -225,6 +228,7 @@ Map<String, BlockComponentBuilder> _buildBlockComponentBuilderMap(
ShowPlaceholder? showParagraphPlaceholder,
String Function(Node)? placeholderText,
EdgeInsets? customHeadingPadding,
+ bool alwaysDistributeSimpleTableColumnWidths = false,
}) {
final customBlockComponentBuilderMap = {
PageBlockKeys.type: PageBlockComponentBuilder(),
@@ -340,14 +344,17 @@ Map<String, BlockComponentBuilder> _buildBlockComponentBuilderMap(
SimpleTableBlockKeys.type: _buildSimpleTableBlockComponentBuilder(
context,
configuration,
+ alwaysDistributeColumnWidths: alwaysDistributeSimpleTableColumnWidths,
),
SimpleTableRowBlockKeys.type: _buildSimpleTableRowBlockComponentBuilder(
context,
configuration,
+ alwaysDistributeColumnWidths: alwaysDistributeSimpleTableColumnWidths,
),
SimpleTableCellBlockKeys.type: _buildSimpleTableCellBlockComponentBuilder(
context,
configuration,
+ alwaysDistributeColumnWidths: alwaysDistributeSimpleTableColumnWidths,
),
};
@@ -361,8 +368,9 @@ Map<String, BlockComponentBuilder> _buildBlockComponentBuilderMap(
SimpleTableBlockComponentBuilder _buildSimpleTableBlockComponentBuilder(
BuildContext context,
- BlockComponentConfiguration configuration,
-) {
+ BlockComponentConfiguration configuration, {
+ bool alwaysDistributeColumnWidths = false,
+}) {
final copiedConfiguration = configuration.copyWith(
padding: (node) {
final padding = configuration.padding(node);
@@ -378,16 +386,24 @@ SimpleTableBlockComponentBuilder _buildSimpleTableBlockComponentBuilder(
SimpleTableRowBlockComponentBuilder _buildSimpleTableRowBlockComponentBuilder(
BuildContext context,
- BlockComponentConfiguration configuration,
-) {
- return SimpleTableRowBlockComponentBuilder(configuration: configuration);
+ BlockComponentConfiguration configuration, {
+ bool alwaysDistributeColumnWidths = false,
+}) {
+ return SimpleTableRowBlockComponentBuilder(
+ configuration: configuration,
+ alwaysDistributeColumnWidths: alwaysDistributeColumnWidths,
+ );
}
SimpleTableCellBlockComponentBuilder _buildSimpleTableCellBlockComponentBuilder(
BuildContext context,
- BlockComponentConfiguration configuration,
-) {
- return SimpleTableCellBlockComponentBuilder(configuration: configuration);
+ BlockComponentConfiguration configuration, {
+ bool alwaysDistributeColumnWidths = false,
+}) {
+ return SimpleTableCellBlockComponentBuilder(
+ configuration: configuration,
+ alwaysDistributeColumnWidths: alwaysDistributeColumnWidths,
+ );
}
ParagraphBlockComponentBuilder _buildParagraphBlockComponentBuilder(
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_block_component.dart
index 495fb7c922..5d4c3cab52 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_block_component.dart
@@ -143,8 +143,11 @@ Node createSimpleTableBlockNode({
class SimpleTableBlockComponentBuilder extends BlockComponentBuilder {
SimpleTableBlockComponentBuilder({
super.configuration,
+ this.alwaysDistributeColumnWidths = false,
});
+ final bool alwaysDistributeColumnWidths;
+
@override
BlockComponentWidget build(BlockComponentContext blockComponentContext) {
final node = blockComponentContext.node;
@@ -152,6 +155,7 @@ class SimpleTableBlockComponentBuilder extends BlockComponentBuilder {
key: node.key,
node: node,
configuration: configuration,
+ alwaysDistributeColumnWidths: alwaysDistributeColumnWidths,
showActions: showActions(node),
actionBuilder: (context, state) => actionBuilder(
blockComponentContext,
@@ -171,8 +175,11 @@ class SimpleTableBlockWidget extends BlockComponentStatefulWidget {
super.showActions,
super.actionBuilder,
super.configuration = const BlockComponentConfiguration(),
+ required this.alwaysDistributeColumnWidths,
});
+ final bool alwaysDistributeColumnWidths;
+
@override
State<SimpleTableBlockWidget> createState() => _SimpleTableBlockWidgetState();
}
@@ -218,6 +225,7 @@ class _SimpleTableBlockWidgetState extends State<SimpleTableBlockWidget>
Widget child = SimpleTableWidget(
node: node,
simpleTableContext: simpleTableContext,
+ alwaysDistributeColumnWidths: widget.alwaysDistributeColumnWidths,
);
if (UniversalPlatform.isDesktop) {
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_cell_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_cell_block_component.dart
index 2b691da637..376ed90069 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_cell_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_cell_block_component.dart
@@ -29,8 +29,11 @@ Node simpleTableCellBlockNode({
class SimpleTableCellBlockComponentBuilder extends BlockComponentBuilder {
SimpleTableCellBlockComponentBuilder({
super.configuration,
+ this.alwaysDistributeColumnWidths = false,
});
+ final bool alwaysDistributeColumnWidths;
+
@override
BlockComponentWidget build(BlockComponentContext blockComponentContext) {
final node = blockComponentContext.node;
@@ -38,6 +41,7 @@ class SimpleTableCellBlockComponentBuilder extends BlockComponentBuilder {
key: node.key,
node: node,
configuration: configuration,
+ alwaysDistributeColumnWidths: alwaysDistributeColumnWidths,
showActions: showActions(node),
actionBuilder: (context, state) => actionBuilder(
blockComponentContext,
@@ -57,8 +61,11 @@ class SimpleTableCellBlockWidget extends BlockComponentStatefulWidget {
super.showActions,
super.actionBuilder,
super.configuration = const BlockComponentConfiguration(),
+ required this.alwaysDistributeColumnWidths,
});
+ final bool alwaysDistributeColumnWidths;
+
@override
State<SimpleTableCellBlockWidget> createState() =>
SimpleTableCellBlockWidgetState();
@@ -239,7 +246,7 @@ class SimpleTableCellBlockWidgetState extends State<SimpleTableCellBlockWidget>
constraints: const BoxConstraints(
minWidth: SimpleTableConstants.minimumColumnWidth,
),
- width: node.columnWidth,
+ width: widget.alwaysDistributeColumnWidths ? null : node.columnWidth,
child: node.children.isEmpty
? Column(
children: [
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_row_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_row_block_component.dart
index 712df59b82..d61d371e1b 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_row_block_component.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_row_block_component.dart
@@ -21,8 +21,11 @@ Node simpleTableRowBlockNode({
class SimpleTableRowBlockComponentBuilder extends BlockComponentBuilder {
SimpleTableRowBlockComponentBuilder({
super.configuration,
+ this.alwaysDistributeColumnWidths = false,
});
+ final bool alwaysDistributeColumnWidths;
+
@override
BlockComponentWidget build(BlockComponentContext blockComponentContext) {
final node = blockComponentContext.node;
@@ -30,6 +33,7 @@ class SimpleTableRowBlockComponentBuilder extends BlockComponentBuilder {
key: node.key,
node: node,
configuration: configuration,
+ alwaysDistributeColumnWidths: alwaysDistributeColumnWidths,
showActions: showActions(node),
actionBuilder: (context, state) => actionBuilder(
blockComponentContext,
@@ -49,8 +53,11 @@ class SimpleTableRowBlockWidget extends BlockComponentStatefulWidget {
super.showActions,
super.actionBuilder,
super.configuration = const BlockComponentConfiguration(),
+ required this.alwaysDistributeColumnWidths,
});
+ final bool alwaysDistributeColumnWidths;
+
@override
State<SimpleTableRowBlockWidget> createState() =>
_SimpleTableRowBlockWidgetState();
@@ -95,7 +102,10 @@ class _SimpleTableRowBlockWidgetState extends State<SimpleTableRowBlockWidget>
cells.add(const SimpleTableRowDivider());
}
- cells.add(editorState.renderer.build(context, node.children[i]));
+ final child = editorState.renderer.build(context, node.children[i]);
+ cells.add(
+ widget.alwaysDistributeColumnWidths ? Flexible(child: child) : child,
+ );
// border
if (SimpleTableConstants.borderType ==
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/_desktop_simple_table_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/_desktop_simple_table_widget.dart
index 3a3f02b530..187dbaf31d 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/_desktop_simple_table_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/_desktop_simple_table_widget.dart
@@ -13,6 +13,7 @@ class DesktopSimpleTableWidget extends StatefulWidget {
this.enableAddColumnAndRowButton = true,
this.enableHoverEffect = true,
this.isFeedback = false,
+ this.alwaysDistributeColumnWidths = false,
});
/// Refer to [SimpleTableWidget.node].
@@ -36,6 +37,9 @@ class DesktopSimpleTableWidget extends StatefulWidget {
/// Refer to [SimpleTableWidget.isFeedback].
final bool isFeedback;
+ /// Refer to [SimpleTableWidget.alwaysDistributeColumnWidths].
+ final bool alwaysDistributeColumnWidths;
+
@override
State<DesktopSimpleTableWidget> createState() =>
_DesktopSimpleTableWidgetState();
@@ -84,26 +88,34 @@ class _DesktopSimpleTableWidgetState extends State<DesktopSimpleTableWidget> {
Widget _buildDesktopTable() {
// table content
- Widget child = Scrollbar(
- controller: scrollController,
- child: SingleChildScrollView(
+ // IntrinsicHeight is used to make the table size fit the content.
+ Widget child = IntrinsicHeight(
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: _buildRows(),
+ ),
+ );
+
+ if (widget.alwaysDistributeColumnWidths) {
+ child = Padding(
+ padding: SimpleTableConstants.tablePadding,
+ child: child,
+ );
+ } else {
+ child = Scrollbar(
controller: scrollController,
- scrollDirection: Axis.horizontal,
- child: Padding(
- padding: SimpleTableConstants.tablePadding,
- // IntrinsicWidth and IntrinsicHeight are used to make the table size fit the content.
- child: IntrinsicWidth(
- child: IntrinsicHeight(
- child: Column(
- mainAxisSize: MainAxisSize.min,
- crossAxisAlignment: CrossAxisAlignment.start,
- children: _buildRows(),
- ),
- ),
+ child: SingleChildScrollView(
+ controller: scrollController,
+ scrollDirection: Axis.horizontal,
+ child: Padding(
+ padding: SimpleTableConstants.tablePadding,
+ // IntrinsicWidth is used to make the table size fit the content.
+ child: IntrinsicWidth(child: child),
),
),
- ),
- );
+ );
+ }
if (widget.enableHoverEffect) {
child = MouseRegion(
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/_mobile_simple_table_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/_mobile_simple_table_widget.dart
index 9b3ad2d652..bf8720b88a 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/_mobile_simple_table_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/_mobile_simple_table_widget.dart
@@ -13,6 +13,7 @@ class MobileSimpleTableWidget extends StatefulWidget {
this.enableAddColumnAndRowButton = true,
this.enableHoverEffect = true,
this.isFeedback = false,
+ this.alwaysDistributeColumnWidths = false,
});
/// Refer to [SimpleTableWidget.node].
@@ -36,6 +37,9 @@ class MobileSimpleTableWidget extends StatefulWidget {
/// Refer to [SimpleTableWidget.isFeedback].
final bool isFeedback;
+ /// Refer to [SimpleTableWidget.alwaysDistributeColumnWidths].
+ final bool alwaysDistributeColumnWidths;
+
@override
State<MobileSimpleTableWidget> createState() =>
_MobileSimpleTableWidgetState();
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/simple_table_widget.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/simple_table_widget.dart
index 7f79082550..98d1e9f246 100644
--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/simple_table_widget.dart
+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/simple_table/simple_table_widgets/simple_table_widget.dart
@@ -16,6 +16,7 @@ class SimpleTableWidget extends StatefulWidget {
this.enableAddColumnAndRowButton = true,
this.enableHoverEffect = true,
this.isFeedback = false,
+ this.alwaysDistributeColumnWidths = false,
});
/// The node of the table.
@@ -49,6 +50,9 @@ class SimpleTableWidget extends StatefulWidget {
/// Whether the widget is a feedback widget.
final bool isFeedback;
+ /// Whether the columns should ignore their widths and fill available space
+ final bool alwaysDistributeColumnWidths;
+
@override
State<SimpleTableWidget> createState() => _SimpleTableWidgetState();
}
@@ -65,6 +69,7 @@ class _SimpleTableWidgetState extends State<SimpleTableWidget> {
enableAddColumnAndRowButton: widget.enableAddColumnAndRowButton,
enableHoverEffect: widget.enableHoverEffect,
isFeedback: widget.isFeedback,
+ alwaysDistributeColumnWidths: widget.alwaysDistributeColumnWidths,
)
: MobileSimpleTableWidget(
simpleTableContext: widget.simpleTableContext,
@@ -74,6 +79,7 @@ class _SimpleTableWidgetState extends State<SimpleTableWidget> {
enableAddColumnAndRowButton: widget.enableAddColumnAndRowButton,
enableHoverEffect: widget.enableHoverEffect,
isFeedback: widget.isFeedback,
+ alwaysDistributeColumnWidths: widget.alwaysDistributeColumnWidths,
);
}
}