Skip to content

Commit 15ff2ef

Browse files
authored
Fix analysis issues (#966)
* chore: rename Selectable to SelectableMixin * chore: add platforms to pubspec.yaml
1 parent 69e3aed commit 15ff2ef

18 files changed

+38
-32
lines changed

frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/image_node_widget.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:flutter/material.dart';
1111
/// 2. create a class extends [NodeWidgetBuilder]
1212
/// 3. override the function `Widget build(NodeWidgetContext<Node> context)`
1313
/// and return a widget to render. The returned widget should be
14-
/// a StatefulWidget and mixin with [Selectable].
14+
/// a StatefulWidget and mixin with [SelectableMixin].
1515
///
1616
/// 4. override the getter `nodeValidator`
1717
/// to verify the data structure in [Node].
@@ -50,7 +50,8 @@ class ImageNodeWidget extends StatefulWidget {
5050
State<ImageNodeWidget> createState() => _ImageNodeWidgetState();
5151
}
5252

53-
class _ImageNodeWidgetState extends State<ImageNodeWidget> with Selectable {
53+
class _ImageNodeWidgetState extends State<ImageNodeWidget>
54+
with SelectableMixin {
5455
bool isHovered = false;
5556
Node get node => widget.node;
5657
EditorState get editorState => widget.editorState;

frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/network_image_node_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class _NetworkImageNodeWidget extends StatefulWidget {
3131
}
3232

3333
class __NetworkImageNodeWidgetState extends State<_NetworkImageNodeWidget>
34-
with Selectable {
34+
with SelectableMixin {
3535
RenderBox get _renderBox => context.findRenderObject() as RenderBox;
3636

3737
@override

frontend/app_flowy/packages/appflowy_editor/example/lib/plugin/youtube_link_node_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class LinkNodeWidget extends StatefulWidget {
3333
}
3434

3535
class _YouTubeLinkNodeWidgetState extends State<LinkNodeWidget>
36-
with Selectable {
36+
with SelectableMixin {
3737
Node get node => widget.node;
3838
EditorState get editorState => widget.editorState;
3939
String get src => widget.node.attributes['youtube_link'] as String;

frontend/app_flowy/packages/appflowy_editor/lib/src/document/node_iterator.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:appflowy_editor/src/document/node.dart';
22

33
import './state_tree.dart';
4-
import './node.dart';
54

65
/// [NodeIterator] is used to traverse the nodes in visual order.
76
class NodeIterator implements Iterator<Node> {

frontend/app_flowy/packages/appflowy_editor/lib/src/document/text_delta.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'dart:math';
44
import 'package:appflowy_editor/src/document/attributes.dart';
55
import 'package:flutter/foundation.dart';
66
import 'package:flutter/material.dart';
7-
import './attributes.dart';
87

98
// constant number: 2^53 - 1
109
const int _maxInt = 9007199254740991;

frontend/app_flowy/packages/appflowy_editor/lib/src/extensions/node_extensions.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ extension NodeExtensions on Node {
1010
key?.currentContext?.findRenderObject()?.unwrapOrNull<RenderBox>();
1111

1212
BuildContext? get context => key?.currentContext;
13-
Selectable? get selectable => key?.currentState?.unwrapOrNull<Selectable>();
13+
SelectableMixin? get selectable =>
14+
key?.currentState?.unwrapOrNull<SelectableMixin>();
1415

1516
bool inSelection(Selection selection) {
1617
if (selection.start.path <= selection.end.path) {

frontend/app_flowy/packages/appflowy_editor/lib/src/render/image/image_node_widget.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class ImageNodeWidget extends StatefulWidget {
3232
State<ImageNodeWidget> createState() => _ImageNodeWidgetState();
3333
}
3434

35-
class _ImageNodeWidgetState extends State<ImageNodeWidget> with Selectable {
35+
class _ImageNodeWidgetState extends State<ImageNodeWidget>
36+
with SelectableMixin {
3637
final _imageKey = GlobalKey();
3738

3839
double? _imageWidth;

frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/bulleted_list_text.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class BulletedListTextNodeWidget extends StatefulWidget {
4242
// customize
4343

4444
class _BulletedListTextNodeWidgetState extends State<BulletedListTextNodeWidget>
45-
with Selectable, DefaultSelectable {
45+
with SelectableMixin, DefaultSelectable {
4646
@override
4747
final iconKey = GlobalKey();
4848

@@ -51,8 +51,8 @@ class _BulletedListTextNodeWidgetState extends State<BulletedListTextNodeWidget>
5151
final _iconRightPadding = 5.0;
5252

5353
@override
54-
Selectable<StatefulWidget> get forward =>
55-
_richTextKey.currentState as Selectable;
54+
SelectableMixin<StatefulWidget> get forward =>
55+
_richTextKey.currentState as SelectableMixin;
5656

5757
@override
5858
Widget build(BuildContext context) {

frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/checkbox_text.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class CheckboxNodeWidget extends StatefulWidget {
4040
}
4141

4242
class _CheckboxNodeWidgetState extends State<CheckboxNodeWidget>
43-
with Selectable, DefaultSelectable {
43+
with SelectableMixin, DefaultSelectable {
4444
@override
4545
final iconKey = GlobalKey();
4646

@@ -49,8 +49,8 @@ class _CheckboxNodeWidgetState extends State<CheckboxNodeWidget>
4949
final _iconRightPadding = 5.0;
5050

5151
@override
52-
Selectable<StatefulWidget> get forward =>
53-
_richTextKey.currentState as Selectable;
52+
SelectableMixin<StatefulWidget> get forward =>
53+
_richTextKey.currentState as SelectableMixin;
5454

5555
@override
5656
Widget build(BuildContext context) {

frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/default_selectable.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:appflowy_editor/src/render/selection/selectable.dart';
44
import 'package:flutter/material.dart';
55

66
mixin DefaultSelectable {
7-
Selectable get forward;
7+
SelectableMixin get forward;
88

99
GlobalKey? get iconKey;
1010

0 commit comments

Comments
 (0)