feat: public node and index in TextSpanDecoratorForCustomAttributes (#…

…288)
AppFlowy-IO · Jul 5, 2023 · 2ed30f3 · 2ed30f3
1 parent bb3771a
commit 2ed30f3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/lib/src/editor/editor_component/style/editor_style.dart b/lib/src/editor/editor_component/style/editor_style.dart
@@ -328,7 +328,7 @@ class EditorStyle extends ThemeExtension<EditorStyle> {
     textStyleConfiguration: const TextStyleConfiguration(
       text: TextStyle(fontSize: 16, color: Colors.black),
     ),
-    textSpanDecorator: (_, textSpan) => textSpan,
+    textSpanDecorator: (_, __, ___, textSpan) => textSpan,
     selectionColor: const Color.fromARGB(53, 111, 201, 231),
     selectionMenuBackgroundColor: const Color(0xFFFFFFFF),
     selectionMenuItemTextColor: const Color(0xFF333333),

diff --git a/lib/src/render/rich_text/flowy_rich_text.dart b/lib/src/render/rich_text/flowy_rich_text.dart
@@ -19,7 +19,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 
 typedef TextSpanDecoratorForCustomAttributes = InlineSpan Function(
-  TextInsert attributeKey,
+  Node node,
+  int index,
+  TextInsert text,
   TextSpan textSpan,
 );
 
@@ -291,17 +293,22 @@ class _FlowyRichTextState extends State<FlowyRichText> with SelectableMixin {
           );
         }
       }
-      offset += textInsert.length;
       final textSpan = TextSpan(
         text: textInsert.text,
         style: textStyle,
         recognizer: recognizer,
       );
       textSpans.add(
         textSpanDecoratorForCustomAttributes != null
-            ? textSpanDecoratorForCustomAttributes!(textInsert, textSpan)
+            ? textSpanDecoratorForCustomAttributes!(
+                widget.node,
+                offset,
+                textInsert,
+                textSpan,
+              )
             : textSpan,
       );
+      offset += textInsert.length;
     }
     return TextSpan(
       children: textSpans,

diff --git a/test/customer/custom_attribute_for_text_block_test.dart b/test/customer/custom_attribute_for_text_block_test.dart
@@ -29,7 +29,7 @@ class CustomAttributeKeyForTextBlock extends StatelessWidget {
   Widget build(BuildContext context) {
     final editorStyle = EditorStyle.desktop(
       // Example for customizing a new attribute key.
-      textSpanDecorator: (textInsert, textSpan) {
+      textSpanDecorator: (_, __, textInsert, textSpan) {
         final attributes = textInsert.attributes;
         if (attributes == null) {
           return textSpan;