Add KeyboardActions & TextCursorAnimation.

Author: ilopX

patterns/state/manipulator_state/states/_/paint_style.dart

@@ -74,13 +74,18 @@ class PaintStyle {
     TextShape selectedShape,
     Canvas canvas,
   ) {
-    canvas.drawRect(
-      Rect.fromLTWH(
-          cursor.xCoordinate,
-          selectedShape.y + (selectedShape.height - selectedShape.userHeight),
-          1.5,
-          selectedShape.userHeight),
-      Paint()..color = Colors.white,
+    canvas.drawLine(
+      Offset(
+        cursor.xCoordinate,
+        selectedShape.y + (selectedShape.height - selectedShape.userHeight) + 2,
+      ),
+      Offset(
+        cursor.xCoordinate,
+        selectedShape.y + (selectedShape.height) - 2,
+      ),
+      Paint()
+        ..strokeWidth = 2.2
+        ..color = Colors.white,
     );
   }
 

patterns/state/manipulator_state/states/selections/text/keyboard_actions.dart

@@ -0,0 +1,31 @@
+import 'package:flutter/services.dart';
+
+class KeyboardActions {
+  final Map<PhysicalKeyboardKey, void Function()> actions;
+  final void Function(String) inputCharAction;
+
+  KeyboardActions({
+    required this.actions,
+    required this.inputCharAction,
+  });
+
+  void keyDown(KeyEvent keyEvent) {
+    final isNotKeyDown =
+        !(keyEvent is KeyDownEvent || keyEvent is KeyRepeatEvent);
+
+    if (isNotKeyDown) {
+      return;
+    }
+
+    final foundEvent = actions[keyEvent.physicalKey];
+
+    if (foundEvent != null) {
+      foundEvent.call();
+      return;
+    }
+
+    if (keyEvent.character != null) {
+      inputCharAction.call(keyEvent.character!);
+    }
+  }
+}

patterns/state/manipulator_state/states/selections/text/text_cursor.dart

@@ -11,15 +11,15 @@ class TextCursor {
     x = x - _shape.x;
 
     final pos = _shape.paragraph.getPositionForOffset(Offset(x, _shape.y));
+
     _charIndex = pos.offset;
+    _xPosition = _shape.x;
 
     final range = _shape.paragraph.getBoxesForRange(
       pos.offset - 1,
       pos.offset,
     );
 
-    _xPosition = _shape.x;
-
     if (range.isNotEmpty) {
       _xPosition += range.first.right;
     }

patterns/state/manipulator_state/states/selections/text/text_cursor_animation.dart

@@ -0,0 +1,30 @@
+import 'dart:async';
+
+class TextCursorAnimation {
+  final Duration speed;
+  final void Function() onBlink;
+
+  TextCursorAnimation({
+    required this.speed,
+    required this.onBlink,
+  }) {
+    _timer = Timer.periodic(speed, (_) {
+      _isShowCursor = !_isShowCursor;
+      onBlink.call();
+    });
+  }
+
+  bool get isVisible => _isShowCursor;
+
+  void touch() {
+    _isShowCursor = true;
+    onBlink.call();
+  }
+
+  void dispose() {
+    _timer.cancel();
+  }
+
+  bool _isShowCursor = true;
+  late Timer _timer;
+}

patterns/state/manipulator_state/states/selections/text_change_state.dart

@@ -1,69 +1,64 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 
 import '../../shapes/text_shape.dart';
 import 'selection_state.dart';
+import 'text/keyboard_actions.dart';
 import 'text/text_cursor.dart';
+import 'text/text_cursor_animation.dart';
 
 class TextChangeState extends SelectionState<TextShape> {
   TextChangeState({
     required Offset startPointer,
     required super.selectedShape,
-  })  : _startPointer = startPointer,
-        _textCursor = TextCursor(selectedShape);
+  }) : _startPointer = startPointer;
 
   @override
   void init() {
-    _textCursor.changePosition(_startPointer.dx);
-    context.cursor = SystemMouseCursors.text;
-
-    _cursorAnimateTimer = Timer.periodic(Duration(milliseconds: 500), (_) {
-      _isShowCursor = !_isShowCursor;
-      context.update();
-    });
+    _textCursor = TextCursor(selectedShape)..changePosition(_startPointer.dx);
+
+    _keyboardActions = KeyboardActions(
+      actions: {
+        PhysicalKeyboardKey.backspace: _textCursor.backspace,
+        PhysicalKeyboardKey.arrowLeft: _textCursor.moveLeft,
+        PhysicalKeyboardKey.arrowRight: _textCursor.moveRight,
+      },
+      inputCharAction: _textCursor.inputText,
+    );
+
+    _animationCursor = TextCursorAnimation(
+      speed: Duration(milliseconds: 400),
+      onBlink: context.update,
+    );
 
+    context.cursor = SystemMouseCursors.text;
     context.update();
   }
 
   @override
   void mouseDown(double x, double y) {
     if (selectedShape.rect.contains(Offset(x, y))) {
       _textCursor.changePosition(x);
-      _isShowCursor = true;
-      context.update();
+      _animationCursor.touch();
       return;
     }
 
-    _cursorAnimateTimer.cancel();
+    _animationCursor.dispose();
     super.mouseDown(x, y);
   }
 
   @override
   void keyDown(KeyEvent keyEvent) {
-    if (keyEvent is KeyDownEvent || keyEvent is KeyRepeatEvent) {
-      if (keyEvent.physicalKey == PhysicalKeyboardKey.backspace) {
-        _textCursor.backspace();
-      } else if (keyEvent.physicalKey == PhysicalKeyboardKey.arrowLeft) {
-        _textCursor.moveLeft();
-      } else if (keyEvent.physicalKey == PhysicalKeyboardKey.arrowRight) {
-        _textCursor.moveRight();
-      } else if (keyEvent.character != null) {
-        _textCursor.inputText(keyEvent.character!);
-      }
-
-      _isShowCursor = true;
-      context.update();
-    }
+    _keyboardActions.keyDown(keyEvent);
+    _animationCursor.touch();
   }
 
   @override
   void paint(Canvas canvas) {
     context.paintStyle.paintSelectedText(selectedShape, canvas);
     super.paint(canvas);
 
-    if (_isShowCursor) {
+    if (_animationCursor.isVisible) {
       context.paintStyle.paintTextCursor(_textCursor, selectedShape, canvas);
     }
   }
@@ -86,7 +81,7 @@ class TextChangeState extends SelectionState<TextShape> {
   }
 
   final Offset _startPointer;
-  final TextCursor _textCursor;
-  bool _isShowCursor = true;
-  late Timer _cursorAnimateTimer;
+  late final TextCursor _textCursor;
+  late final KeyboardActions _keyboardActions;
+  late final TextCursorAnimation _animationCursor;
 }