feat: move the indent padding calculation

AppFlowy-IO · Jul 19, 2023 · 5054f69 · 5054f69
1 parent 92c60d8
commit 5054f69
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 56 deletions.
diff --git a/lib/src/editor/block_component/base_component/text_direction_mixin.dart b/lib/src/editor/block_component/base_component/text_direction_mixin.dart
@@ -18,7 +18,7 @@ mixin BlockComponentTextDirectionMixin {
   TextDirection calculateTextDirection({
     TextDirection? defaultTextDirection,
   }) {
-    defaultTextDirection = defaultTextDirection ?? TextDirection.ltr;
+    defaultTextDirection ??= TextDirection.ltr;
 
     final direction = calculateNodeDirection(
       node: node,
@@ -50,12 +50,12 @@ mixin BlockComponentTextDirectionMixin {
 // If the textDirection attribute is not set we will use defaultTextDirection.
 // If the textDirection is ltr or rtl we will apply that.
 // If the textDirection is auto we go by these priorities:
-// 1. Determine the direction by first charachter with strong directionality
+// 1. Determine the direction by first character with strong directionality
 // 2. lastDirection which is the node last determined direction
 // 3. previous line direction
 // 4. defaultTextDirection
 // We will move from first priority when for example the node text is empty or
-// it only has charachters without strong directionality e.g. '@'.
+// it only has characters without strong directionality e.g. '@'.
 TextDirection calculateNodeDirection({
   required Node node,
   required TextDirection defaultTextDirection,

diff --git a/...c/editor/block_component/bulleted_list_block_component/bulleted_list_block_component.dart b/...c/editor/block_component/bulleted_list_block_component/bulleted_list_block_component.dart
@@ -108,19 +108,6 @@ class _BulletedListBlockComponentWidgetState
   @override
   Node get node => widget.node;
 
-  @override
-  EdgeInsets get indentPadding {
-    TextDirection direction =
-        Directionality.maybeOf(context) ?? TextDirection.ltr;
-    if (node.children.isNotEmpty) {
-      direction = calculateNodeDirection(
-        node: node.children.first,
-        defaultTextDirection: direction,
-      );
-    }
-    return configuration.indentPadding(node, direction);
-  }
-
   @override
   Widget buildComponent(BuildContext context) {
     final textDirection = calculateTextDirection(

diff --git a/...c/editor/block_component/numbered_list_block_component/numbered_list_block_component.dart b/...c/editor/block_component/numbered_list_block_component/numbered_list_block_component.dart
@@ -113,19 +113,6 @@ class _NumberedListBlockComponentWidgetState
   @override
   Node get node => widget.node;
 
-  @override
-  EdgeInsets get indentPadding {
-    TextDirection direction =
-        Directionality.maybeOf(context) ?? TextDirection.ltr;
-    if (node.children.isNotEmpty) {
-      direction = calculateNodeDirection(
-        node: node.children.first,
-        defaultTextDirection: direction,
-      );
-    }
-    return configuration.indentPadding(node, direction);
-  }
-
   @override
   Widget buildComponent(BuildContext context) {
     final textDirection = calculateTextDirection(

diff --git a/lib/src/editor/block_component/text_block_component/text_block_component.dart b/lib/src/editor/block_component/text_block_component/text_block_component.dart
@@ -101,19 +101,6 @@ class _TextBlockComponentWidgetState extends State<TextBlockComponentWidget>
   @override
   Node get node => widget.node;
 
-  @override
-  EdgeInsets get indentPadding {
-    TextDirection direction =
-        Directionality.maybeOf(context) ?? TextDirection.ltr;
-    if (node.children.isNotEmpty) {
-      direction = calculateNodeDirection(
-        node: node.children.first,
-        defaultTextDirection: direction,
-      );
-    }
-    return configuration.indentPadding(node, direction);
-  }
-
   @override
   Widget buildComponent(BuildContext context) {
     final textDirection = calculateTextDirection(

diff --git a/lib/src/editor/block_component/todo_list_block_component/todo_list_block_component.dart b/lib/src/editor/block_component/todo_list_block_component/todo_list_block_component.dart
@@ -122,19 +122,6 @@ class _TodoListBlockComponentWidgetState
   @override
   Node get node => widget.node;
 
-  @override
-  EdgeInsets get indentPadding {
-    TextDirection direction =
-        Directionality.maybeOf(context) ?? TextDirection.ltr;
-    if (node.children.isNotEmpty) {
-      direction = calculateNodeDirection(
-        node: node.children.first,
-        defaultTextDirection: direction,
-      );
-    }
-    return configuration.indentPadding(node, direction);
-  }
-
   bool get checked => widget.node.attributes[TodoListBlockKeys.checked];
 
   @override

diff --git a/lib/src/editor/editor_component/service/renderer/block_component_widget.dart b/lib/src/editor/editor_component/service/renderer/block_component_widget.dart
@@ -71,7 +71,19 @@ mixin NestedBlockComponentStatefulWidgetMixin<
     on State<T>, BlockComponentBackgroundColorMixin {
   late final editorState = Provider.of<EditorState>(context, listen: false);
 
-  EdgeInsets get indentPadding;
+  BlockComponentConfiguration get configuration;
+
+  EdgeInsets get indentPadding {
+    TextDirection direction =
+        Directionality.maybeOf(context) ?? TextDirection.ltr;
+    if (node.children.isNotEmpty) {
+      direction = calculateNodeDirection(
+        node: node.children.first,
+        defaultTextDirection: direction,
+      );
+    }
+    return configuration.indentPadding(node, direction);
+  }
 
   double? cachedLeft;