From 34a1da8450573483a1f8e3ac7b416eb8479f368d Mon Sep 17 00:00:00 2001 From: "Lucas.Xu" Date: Fri, 22 Jul 2022 09:44:20 +0800 Subject: [PATCH] chore: delete unused code --- .../example/lib/plugin/image_node_widget.dart | 14 +----- .../lib/plugin/selected_text_node_widget.dart | 37 +-------------- .../flowy_editor/lib/editor_state.dart | 17 +++---- .../packages/flowy_editor/lib/keyboard.dart | 45 ------------------- .../lib/render/render_plugins.dart | 1 - .../flowy_editor/lib/render/selectable.dart | 4 -- .../lib/render/selection_overlay.dart | 0 7 files changed, 7 insertions(+), 111 deletions(-) delete mode 100644 frontend/app_flowy/packages/flowy_editor/lib/keyboard.dart delete mode 100644 frontend/app_flowy/packages/flowy_editor/lib/render/selection_overlay.dart diff --git a/frontend/app_flowy/packages/flowy_editor/example/lib/plugin/image_node_widget.dart b/frontend/app_flowy/packages/flowy_editor/example/lib/plugin/image_node_widget.dart index f1719db744..b235f8f481 100644 --- a/frontend/app_flowy/packages/flowy_editor/example/lib/plugin/image_node_widget.dart +++ b/frontend/app_flowy/packages/flowy_editor/example/lib/plugin/image_node_widget.dart @@ -33,8 +33,7 @@ class _ImageNodeWidget extends StatefulWidget { State<_ImageNodeWidget> createState() => __ImageNodeWidgetState(); } -class __ImageNodeWidgetState extends State<_ImageNodeWidget> - with Selectable, KeyboardEventsRespondable { +class __ImageNodeWidgetState extends State<_ImageNodeWidget> with Selectable { Node get node => widget.node; EditorState get editorState => widget.editorState; String get src => widget.node.attributes['image_src'] as String; @@ -62,17 +61,6 @@ class __ImageNodeWidgetState extends State<_ImageNodeWidget> return null; } - @override - KeyEventResult onKeyDown(RawKeyEvent event) { - if (event.logicalKey == LogicalKeyboardKey.backspace) { - TransactionBuilder(editorState) - ..deleteNode(node) - ..commit(); - return KeyEventResult.handled; - } - return KeyEventResult.ignored; - } - @override Widget build(BuildContext context) { return _build(context); diff --git a/frontend/app_flowy/packages/flowy_editor/example/lib/plugin/selected_text_node_widget.dart b/frontend/app_flowy/packages/flowy_editor/example/lib/plugin/selected_text_node_widget.dart index 356a21e4f2..7ce7162b07 100644 --- a/frontend/app_flowy/packages/flowy_editor/example/lib/plugin/selected_text_node_widget.dart +++ b/frontend/app_flowy/packages/flowy_editor/example/lib/plugin/selected_text_node_widget.dart @@ -4,7 +4,6 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import 'package:flutter/services.dart'; import 'package:url_launcher/url_launcher_string.dart'; class SelectedTextNodeBuilder extends NodeWidgetBuilder { @@ -20,7 +19,6 @@ class SelectedTextNodeBuilder extends NodeWidgetBuilder { @override Widget build(BuildContext buildContext) { - print('key -> $key'); return _SelectedTextNodeWidget( key: key, node: node, @@ -45,7 +43,7 @@ class _SelectedTextNodeWidget extends StatefulWidget { } class _SelectedTextNodeWidgetState extends State<_SelectedTextNodeWidget> - with Selectable, KeyboardEventsRespondable { + with Selectable { TextNode get node => widget.node as TextNode; EditorState get editorState => widget.editorState; @@ -99,39 +97,6 @@ class _SelectedTextNodeWidgetState extends State<_SelectedTextNodeWidget> return _textSelection; } - @override - KeyEventResult onKeyDown(RawKeyEvent event) { - if (event.logicalKey == LogicalKeyboardKey.backspace) { - final textSelection = _textSelection; - // TODO: just handle upforward delete. - if (textSelection != null) { - if (textSelection.isCollapsed) { - print(node.toRawString()); - print('is empty ${node.toRawString().isEmpty}'); - if (textSelection.baseOffset == 0 && node.toRawString().isEmpty) { - TransactionBuilder(editorState) - ..deleteNode(node) - ..commit(); - } else { - TransactionBuilder(editorState) - ..deleteText(node, textSelection.start - 1, 1) - ..commit(); - // final rect = _computeCursorRect(textSelection.baseOffset - 1); - // editorState.tapOffset = rect.center; - // editorState.updateCursor(); - } - } else { - TransactionBuilder(editorState) - ..deleteText(node, textSelection.start, - textSelection.baseOffset - textSelection.extentOffset) - ..commit(); - } - } - return KeyEventResult.handled; - } - return KeyEventResult.ignored; - } - @override Widget build(BuildContext context) { print('text rebuild $this'); diff --git a/frontend/app_flowy/packages/flowy_editor/lib/editor_state.dart b/frontend/app_flowy/packages/flowy_editor/lib/editor_state.dart index ea9b5bfee1..ed917403b6 100644 --- a/frontend/app_flowy/packages/flowy_editor/lib/editor_state.dart +++ b/frontend/app_flowy/packages/flowy_editor/lib/editor_state.dart @@ -1,9 +1,5 @@ -import 'dart:collection'; - import 'package:flowy_editor/document/node.dart'; -import 'package:flowy_editor/keyboard.dart'; import 'package:flowy_editor/operation/operation.dart'; -import 'package:flowy_editor/render/selectable.dart'; import 'package:flutter/material.dart'; import './document/state_tree.dart'; @@ -26,14 +22,11 @@ class EditorState { /// TODO: move to a better place. Widget build(BuildContext context) { - return Keyboard( - editorState: this, - child: renderPlugins.buildWidget( - context: NodeWidgetContext( - buildContext: context, - node: document.root, - editorState: this, - ), + return renderPlugins.buildWidget( + context: NodeWidgetContext( + buildContext: context, + node: document.root, + editorState: this, ), ); } diff --git a/frontend/app_flowy/packages/flowy_editor/lib/keyboard.dart b/frontend/app_flowy/packages/flowy_editor/lib/keyboard.dart deleted file mode 100644 index 4cb39ce31e..0000000000 --- a/frontend/app_flowy/packages/flowy_editor/lib/keyboard.dart +++ /dev/null @@ -1,45 +0,0 @@ -import '../render/selectable.dart'; -import 'editor_state.dart'; - -import 'package:flutter/services.dart'; -import 'package:flutter/material.dart'; - -class Keyboard extends StatelessWidget { - final Widget child; - final focusNode = FocusNode(); - final EditorState editorState; - - Keyboard({ - Key? key, - required this.child, - required this.editorState, - }) : super(key: key); - - @override - Widget build(BuildContext context) { - return Focus( - focusNode: focusNode, - autofocus: true, - onKey: _onKey, - child: child, - ); - } - - KeyEventResult _onKey(FocusNode node, RawKeyEvent event) { - // if (event is! RawKeyDownEvent) { - // return KeyEventResult.ignored; - // } - // List result = []; - // for (final node in editorState.selectedNodes) { - // if (node.key != null && - // node.key?.currentState is KeyboardEventsRespondable) { - // final respondable = node.key!.currentState as KeyboardEventsRespondable; - // result.add(respondable.onKeyDown(event)); - // } - // } - // if (result.contains(KeyEventResult.handled)) { - // return KeyEventResult.handled; - // } - return KeyEventResult.ignored; - } -} diff --git a/frontend/app_flowy/packages/flowy_editor/lib/render/render_plugins.dart b/frontend/app_flowy/packages/flowy_editor/lib/render/render_plugins.dart index 5d62c7b246..efe5865d64 100644 --- a/frontend/app_flowy/packages/flowy_editor/lib/render/render_plugins.dart +++ b/frontend/app_flowy/packages/flowy_editor/lib/render/render_plugins.dart @@ -51,7 +51,6 @@ class RenderPlugins { _nodeWidgetBuilders.removeWhere((key, _) => key == name); } - @protected Widget buildWidget({ required NodeWidgetContext context, bool withSubtype = true, diff --git a/frontend/app_flowy/packages/flowy_editor/lib/render/selectable.dart b/frontend/app_flowy/packages/flowy_editor/lib/render/selectable.dart index 8d1951996d..3631da106f 100644 --- a/frontend/app_flowy/packages/flowy_editor/lib/render/selectable.dart +++ b/frontend/app_flowy/packages/flowy_editor/lib/render/selectable.dart @@ -12,7 +12,3 @@ mixin Selectable on State { /// For [TextNode] only. TextSelection? getTextSelection(); } - -mixin KeyboardEventsRespondable on State { - KeyEventResult onKeyDown(RawKeyEvent event); -} diff --git a/frontend/app_flowy/packages/flowy_editor/lib/render/selection_overlay.dart b/frontend/app_flowy/packages/flowy_editor/lib/render/selection_overlay.dart deleted file mode 100644 index e69de29bb2..0000000000