fix: cursor height is inconsistent when the font size is smaller than…

… the default text size (#958) * fix: cursor height is inconsistent when the font size is smaller than the default text size * fix: widget tests
AppFlowy-IO · Nov 1, 2024 · eccb244 · eccb244
1 parent 4081fb7
commit eccb244
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 34 deletions.
diff --git a/lib/src/editor/block_component/rich_text/appflowy_rich_text.dart b/lib/src/editor/block_component/rich_text/appflowy_rich_text.dart
@@ -116,17 +116,12 @@ class _AppFlowyRichTextState extends State<AppFlowyRichText>
 
   @override
   Widget build(BuildContext context) {
-    Widget child = _buildRichText(context);
-
-    final delta = widget.node.delta;
-    if (delta == null || delta.isEmpty) {
-      child = Stack(
-        children: [
-          _buildPlaceholderText(context),
-          _buildRichText(context),
-        ],
-      );
-    }
+    Widget child = Stack(
+      children: [
+        _buildPlaceholderText(context),
+        _buildRichText(context),
+      ],
+    );
 
     if (enableAutoComplete) {
       final autoCompleteText = _buildAutoCompleteRichText();
@@ -184,27 +179,37 @@ class _AppFlowyRichTextState extends State<AppFlowyRichText>
     }
 
     final textPosition = TextPosition(offset: position.offset);
-    var cursorHeight = _renderParagraph?.getFullHeightForCaret(textPosition);
-    var cursorOffset =
-        _renderParagraph?.getOffsetForCaret(textPosition, Rect.zero) ??
+    double? placeholderCursorHeight =
+        _placeholderRenderParagraph?.getFullHeightForCaret(textPosition);
+    Offset? placeholderCursorOffset =
+        _placeholderRenderParagraph?.getOffsetForCaret(
+              textPosition,
+              Rect.zero,
+            ) ??
             Offset.zero;
-    if (delta?.isEmpty == true || cursorHeight == null || cursorHeight == 0) {
-      cursorHeight =
-          _placeholderRenderParagraph?.getFullHeightForCaret(textPosition);
-      cursorOffset = _placeholderRenderParagraph?.getOffsetForCaret(
-            textPosition,
-            Rect.zero,
-          ) ??
-          Offset.zero;
-      if (textDirection() == TextDirection.rtl) {
-        if (widget.placeholderText.trim().isNotEmpty) {
-          cursorOffset = cursorOffset.translate(
-            _placeholderRenderParagraph?.size.width ?? 0,
-            0,
-          );
-        }
+    if (textDirection() == TextDirection.rtl) {
+      if (widget.placeholderText.trim().isNotEmpty) {
+        placeholderCursorOffset = placeholderCursorOffset.translate(
+          _placeholderRenderParagraph?.size.width ?? 0,
+          0,
+        );
       }
     }
+
+    double? cursorHeight =
+        _renderParagraph?.getFullHeightForCaret(textPosition);
+    Offset? cursorOffset =
+        _renderParagraph?.getOffsetForCaret(textPosition, Rect.zero) ??
+            Offset.zero;
+
+    if (placeholderCursorHeight != null) {
+      cursorHeight = max(cursorHeight ?? 0, placeholderCursorHeight);
+    }
+
+    if (delta?.isEmpty == true) {
+      cursorOffset = placeholderCursorOffset;
+    }
+
     if (widget.cursorHeight != null && cursorHeight != null) {
       cursorOffset = Offset(
         cursorOffset.dx,
@@ -340,6 +345,12 @@ class _AppFlowyRichTextState extends State<AppFlowyRichText>
       textSpan = widget.placeholderTextSpanDecorator!(textSpan);
     }
     textSpan = adjustTextSpan(textSpan);
+    final delta = widget.node.delta;
+    if (delta != null && delta.isNotEmpty) {
+      textSpan = textSpan.updateTextStyle(
+        const TextStyle(color: Colors.transparent),
+      );
+    }
     return RichText(
       key: placeholderTextKey,
       textHeightBehavior: TextHeightBehavior(
@@ -351,8 +362,10 @@ class _AppFlowyRichTextState extends State<AppFlowyRichText>
       ),
       text: textSpan,
       textDirection: textDirection(),
-      textScaler:
-          TextScaler.linear(widget.editorState.editorStyle.textScaleFactor),
+      textScaler: TextScaler.linear(
+        widget.editorState.editorStyle.textScaleFactor,
+      ),
+      overflow: TextOverflow.ellipsis,
     );
   }
 

diff --git a/test/new/block_component/table_block_component/table_view_test.dart b/test/new/block_component/table_block_component/table_view_test.dart
@@ -10,9 +10,6 @@ void main() async {
   });
 
   group('table_view.dart', () {
-    // TODO(zoli)
-    // testWidgets('resize column', (tester) async {});
-
     testWidgets('row height changing base on cell height', (tester) async {
       final tableNode = TableNode.fromList([
         ['', ''],