mirror of
https://github.com/AppFlowy-IO/AppFlowy.git
synced 2024-08-30 18:12:39 +00:00
feat: arrow up and down
This commit is contained in:
parent
e74f5e84dc
commit
53b982e7c9
@ -63,6 +63,11 @@ class __ImageNodeWidgetState extends State<_ImageNodeWidget> with Selectable {
|
||||
throw UnimplementedError();
|
||||
}
|
||||
|
||||
@override
|
||||
Offset localToGlobal(Offset offset) {
|
||||
throw UnimplementedError();
|
||||
}
|
||||
|
||||
@override
|
||||
Rect getCursorRectInPosition(Position position) {
|
||||
// TODO: implement getCursorRectInPosition
|
||||
|
@ -70,6 +70,11 @@ class _SelectedTextNodeWidgetState extends State<_SelectedTextNodeWidget>
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Offset localToGlobal(Offset offset) {
|
||||
return _renderParagraph.localToGlobal(offset);
|
||||
}
|
||||
|
||||
@override
|
||||
List<Rect> getRectsInSelection(Selection selection) {
|
||||
assert(pathEquals(selection.start.path, selection.end.path));
|
||||
|
@ -17,10 +17,10 @@ class CursorWidget extends StatefulWidget {
|
||||
final LayerLink layerLink;
|
||||
|
||||
@override
|
||||
State<CursorWidget> createState() => _CursorWidgetState();
|
||||
State<CursorWidget> createState() => CursorWidgetState();
|
||||
}
|
||||
|
||||
class _CursorWidgetState extends State<CursorWidget> {
|
||||
class CursorWidgetState extends State<CursorWidget> {
|
||||
bool showCursor = true;
|
||||
late Timer timer;
|
||||
|
||||
@ -28,7 +28,17 @@ class _CursorWidgetState extends State<CursorWidget> {
|
||||
void initState() {
|
||||
super.initState();
|
||||
|
||||
timer = Timer.periodic(
|
||||
timer = _initTimer();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
timer.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
Timer _initTimer() {
|
||||
return Timer.periodic(
|
||||
Duration(milliseconds: (widget.blinkingInterval * 1000).toInt()),
|
||||
(timer) {
|
||||
setState(() {
|
||||
@ -37,10 +47,13 @@ class _CursorWidgetState extends State<CursorWidget> {
|
||||
});
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
/// force the cursor widget to show for a while
|
||||
show() {
|
||||
setState(() {
|
||||
showCursor = true;
|
||||
});
|
||||
timer.cancel();
|
||||
super.dispose();
|
||||
timer = _initTimer();
|
||||
}
|
||||
|
||||
@override
|
||||
|
@ -23,6 +23,8 @@ mixin Selectable<T extends StatefulWidget> on State<T> {
|
||||
Position getPositionInOffset(Offset start);
|
||||
Rect getCursorRectInPosition(Position position);
|
||||
|
||||
Offset localToGlobal(Offset offset);
|
||||
|
||||
Position start();
|
||||
Position end();
|
||||
|
||||
|
@ -2,6 +2,7 @@ import 'package:flowy_editor/document/node.dart';
|
||||
import 'package:flowy_editor/document/position.dart';
|
||||
import 'package:flowy_editor/service/keyboard_service.dart';
|
||||
import 'package:flowy_editor/document/selection.dart';
|
||||
import 'package:flowy_editor/extensions/node_extensions.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
@ -26,7 +27,6 @@ FlowyKeyEventHandler arrowKeysHandler = (editorState, event) {
|
||||
}
|
||||
|
||||
if (event.logicalKey == LogicalKeyboardKey.arrowLeft) {
|
||||
// turn left
|
||||
if (currentSelection.isCollapsed) {
|
||||
final end = currentSelection.end;
|
||||
final offset = end.offset;
|
||||
@ -67,6 +67,26 @@ FlowyKeyEventHandler arrowKeysHandler = (editorState, event) {
|
||||
editorState.updateCursorSelection(currentSelection.collapse());
|
||||
}
|
||||
return KeyEventResult.handled;
|
||||
} else if (event.logicalKey == LogicalKeyboardKey.arrowUp) {
|
||||
final rects = editorState.service.selectionService.rects();
|
||||
if (rects.isEmpty) {
|
||||
return KeyEventResult.handled;
|
||||
}
|
||||
final first = rects.first;
|
||||
final firstOffset = Offset(first.left, first.top);
|
||||
final hitOffset = firstOffset - Offset(0, first.height * 0.5);
|
||||
editorState.service.selectionService.hit(hitOffset);
|
||||
return KeyEventResult.handled;
|
||||
} else if (event.logicalKey == LogicalKeyboardKey.arrowDown) {
|
||||
final rects = editorState.service.selectionService.rects();
|
||||
if (rects.isEmpty) {
|
||||
return KeyEventResult.handled;
|
||||
}
|
||||
final first = rects.last;
|
||||
final firstOffset = Offset(first.right, first.bottom);
|
||||
final hitOffset = firstOffset + Offset(0, first.height * 0.5);
|
||||
editorState.service.selectionService.hit(hitOffset);
|
||||
return KeyEventResult.handled;
|
||||
}
|
||||
|
||||
return KeyEventResult.ignored;
|
||||
|
@ -1,6 +1,7 @@
|
||||
import 'package:flowy_editor/document/node.dart';
|
||||
import 'package:flowy_editor/document/position.dart';
|
||||
import 'package:flowy_editor/document/selection.dart';
|
||||
import 'package:flowy_editor/render/selection/selectable.dart';
|
||||
import 'package:flowy_editor/render/selection/cursor_widget.dart';
|
||||
import 'package:flowy_editor/render/selection/flowy_selection_widget.dart';
|
||||
import 'package:flowy_editor/extensions/object_extensions.dart';
|
||||
@ -26,6 +27,10 @@ mixin FlowySelectionService<T extends StatefulWidget> on State<T> {
|
||||
///
|
||||
void clearSelection();
|
||||
|
||||
List<Rect> rects();
|
||||
|
||||
hit(Offset? offset);
|
||||
|
||||
///
|
||||
List<Node> getNodesInSelection(Selection selection);
|
||||
|
||||
@ -108,6 +113,8 @@ class _FlowySelectionState extends State<FlowySelection>
|
||||
/// Tap
|
||||
Offset? tapOffset;
|
||||
|
||||
final List<Rect> _rects = [];
|
||||
|
||||
EditorState get editorState => widget.editorState;
|
||||
|
||||
@override
|
||||
@ -144,8 +151,13 @@ class _FlowySelectionState extends State<FlowySelection>
|
||||
);
|
||||
}
|
||||
|
||||
List<Rect> rects() {
|
||||
return _rects;
|
||||
}
|
||||
|
||||
@override
|
||||
void updateSelection(Selection selection) {
|
||||
_rects.clear();
|
||||
_clearSelection();
|
||||
|
||||
// cursor
|
||||
@ -245,18 +257,29 @@ class _FlowySelectionState extends State<FlowySelection>
|
||||
|
||||
tapOffset = details.globalPosition;
|
||||
|
||||
final nodes = getNodesInRange(tapOffset!);
|
||||
if (nodes.isNotEmpty) {
|
||||
assert(nodes.length == 1);
|
||||
final selectable = nodes.first.selectable;
|
||||
if (selectable != null) {
|
||||
final position = selectable.getPositionInOffset(tapOffset!);
|
||||
final selection = Selection.collapsed(position);
|
||||
editorState.updateCursorSelection(selection);
|
||||
}
|
||||
} else {
|
||||
hit(tapOffset);
|
||||
}
|
||||
|
||||
@override
|
||||
hit(Offset? offset) {
|
||||
if (offset == null) {
|
||||
editorState.updateCursorSelection(null);
|
||||
return;
|
||||
}
|
||||
final nodes = getNodesInRange(offset);
|
||||
if (nodes.isEmpty) {
|
||||
editorState.updateCursorSelection(null);
|
||||
return;
|
||||
}
|
||||
assert(nodes.length == 1);
|
||||
final selectable = nodes.first.selectable;
|
||||
if (selectable == null) {
|
||||
editorState.updateCursorSelection(null);
|
||||
return;
|
||||
}
|
||||
final position = selectable.getPositionInOffset(offset);
|
||||
final selection = Selection.collapsed(position);
|
||||
editorState.updateCursorSelection(selection);
|
||||
}
|
||||
|
||||
void _onPanStart(DragStartDetails details) {
|
||||
@ -353,6 +376,7 @@ class _FlowySelectionState extends State<FlowySelection>
|
||||
final rects = selectable.getRectsInSelection(newSelection);
|
||||
|
||||
for (final rect in rects) {
|
||||
_rects.add(_transformRectToGlobal(selectable, rect));
|
||||
final overlay = OverlayEntry(
|
||||
builder: ((context) => SelectionWidget(
|
||||
color: widget.selectionColor,
|
||||
@ -367,6 +391,11 @@ class _FlowySelectionState extends State<FlowySelection>
|
||||
Overlay.of(context)?.insertAll(_selectionOverlays);
|
||||
}
|
||||
|
||||
Rect _transformRectToGlobal(Selectable selectable, Rect r) {
|
||||
final Offset topLeft = selectable.localToGlobal(Offset(r.left, r.top));
|
||||
return Rect.fromLTWH(topLeft.dx, topLeft.dy, r.width, r.height);
|
||||
}
|
||||
|
||||
void _updateCursor(Position position) {
|
||||
final node = editorState.document.root.childAtPath(position.path);
|
||||
|
||||
@ -380,6 +409,7 @@ class _FlowySelectionState extends State<FlowySelection>
|
||||
final selectable = node.selectable;
|
||||
final rect = selectable?.getCursorRectInPosition(position);
|
||||
if (rect != null) {
|
||||
_rects.add(_transformRectToGlobal(selectable!, rect));
|
||||
final cursor = OverlayEntry(
|
||||
builder: ((context) => CursorWidget(
|
||||
key: _cursorKey,
|
||||
@ -390,9 +420,15 @@ class _FlowySelectionState extends State<FlowySelection>
|
||||
);
|
||||
_cursorOverlays.add(cursor);
|
||||
Overlay.of(context)?.insertAll(_cursorOverlays);
|
||||
_forceShowCursor();
|
||||
}
|
||||
}
|
||||
|
||||
_forceShowCursor() {
|
||||
final currentState = _cursorKey.currentState as CursorWidgetState?;
|
||||
currentState?.show();
|
||||
}
|
||||
|
||||
List<Node> _selectedNodesInSelection(Node node, Selection selection) {
|
||||
List<Node> result = [];
|
||||
if (node.parent != null) {
|
||||
|
Loading…
Reference in New Issue
Block a user