Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: flutter analyze

Browse Source
This commit is contained in:
Lucas.Xu 2022-08-18 16:05:26 +08:00
parent eb13a252ac
commit 51f100ca4b
5 changed files with 120 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/app_flowy/packages/appflowy_editor/lib/src/document/path.dart
View File

@ -1,5 +1,3 @@
import 'dart:math';
import 'package:flutter/foundation.dart';
typedef Path = List<int>;

4
frontend/app_flowy/packages/appflowy_editor/lib/src/infra/html_converter.dart
View File

@ -290,10 +290,10 @@ class HTMLToNodesConverter {
List<Node> _handleUnorderedList(html.Element element) {
final result = <Node>[];
element.children.forEach((child) {
for (var child in element.children) {
result.addAll(
_handleListElement(child, {"subtype": StyleKey.bulletedList}));
});
}
return result;
}

41
frontend/app_flowy/packages/appflowy_editor/lib/src/render/rich_text/flowy_rich_text.dart
View File

@ -11,7 +11,6 @@ import 'package:appflowy_editor/src/document/text_delta.dart';
import 'package:appflowy_editor/src/editor_state.dart';
import 'package:appflowy_editor/src/render/rich_text/rich_text_style.dart';
import 'package:appflowy_editor/src/render/selection/selectable.dart';
import 'package:appflowy_editor/src/service/render_plugin_service.dart';
typedef FlowyTextSpanDecorator = TextSpan Function(TextSpan textSpan);
@ -166,26 +165,26 @@ class _FlowyRichTextState extends State<FlowyRichText> with Selectable {
}
// unused now.
Widget _buildRichTextWithChildren(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
_buildSingleRichText(context),
...widget.textNode.children
.map(
(child) => widget.editorState.service.renderPluginService
.buildPluginWidget(
NodeWidgetContext(
context: context,
node: child,
editorState: widget.editorState,
),
),
)
.toList()
],
);
}
// Widget _buildRichTextWithChildren(BuildContext context) {
// return Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: [
// _buildSingleRichText(context),
// ...widget.textNode.children
// .map(
// (child) => widget.editorState.service.renderPluginService
// .buildPluginWidget(
// NodeWidgetContext(
// context: context,
// node: child,
// editorState: widget.editorState,
// ),
// ),
// )
// .toList()
// ],
// );
// }
@override
Offset localToGlobal(Offset offset) {

128
frontend/app_flowy/packages/appflowy_editor/lib/src/render/selection/toolbar_widget.dart
View File

@ -53,7 +53,7 @@ class ToolbarWidget extends StatefulWidget {
}
class _ToolbarWidgetState extends State<ToolbarWidget> with ToolbarMixin {
final GlobalKey _listToolbarKey = GlobalKey();
// final GlobalKey _listToolbarKey = GlobalKey();
final toolbarHeight = 32.0;
final topPadding = 5.0;
@ -117,14 +117,14 @@ class _ToolbarWidgetState extends State<ToolbarWidget> with ToolbarMixin {
);
}
Widget _listToolbar(BuildContext context) {
return _centerToolbarIcon(
'quote',
key: _listToolbarKey,
width: listToolbarWidth,
onTap: () => _onTapListToolbar(context),
);
}
// Widget _listToolbar(BuildContext context) {
// return _centerToolbarIcon(
// 'quote',
// key: _listToolbarKey,
// width: listToolbarWidth,
// onTap: () => _onTapListToolbar(context),
// );
// }
Widget _centerToolbarIcon(String name,
{Key? key, String? tooltipMessage, double? width, VoidCallback? onTap}) {
@ -150,62 +150,62 @@ class _ToolbarWidgetState extends State<ToolbarWidget> with ToolbarMixin {
));
}
void _onTapListToolbar(BuildContext context) {
// TODO: implement more detailed UI.
final items = defaultListToolbarEventNames;
final renderBox =
_listToolbarKey.currentContext?.findRenderObject() as RenderBox;
final offset = renderBox
.localToGlobal(Offset.zero)
.translate(0, toolbarHeight - cornerRadius);
final rect = offset & Size(listToolbarWidth, listToolbarHeight);
// void _onTapListToolbar(BuildContext context) {
// // TODO: implement more detailed UI.
// final items = defaultListToolbarEventNames;
// final renderBox =
// _listToolbarKey.currentContext?.findRenderObject() as RenderBox;
// final offset = renderBox
// .localToGlobal(Offset.zero)
// .translate(0, toolbarHeight - cornerRadius);
// final rect = offset & Size(listToolbarWidth, listToolbarHeight);
_listToolbarOverlay?.remove();
_listToolbarOverlay = OverlayEntry(builder: (context) {
return Positioned.fromRect(
rect: rect,
child: Material(
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(cornerRadius),
bottomRight: Radius.circular(cornerRadius),
),
color: const Color(0xFF333333),
child: SingleChildScrollView(
child: ListView.builder(
itemExtent: toolbarHeight,
padding: const EdgeInsets.only(bottom: 10.0),
shrinkWrap: true,
itemCount: items.length,
itemBuilder: ((context, index) {
return ListTile(
contentPadding: const EdgeInsets.only(
left: 3.0,
right: 3.0,
),
minVerticalPadding: 0.0,
title: FittedBox(
fit: BoxFit.scaleDown,
child: Text(
items[index],
textAlign: TextAlign.center,
style: const TextStyle(
color: Colors.white,
),
),
),
onTap: () {
_onTap(items[index]);
},
);
}),
),
),
),
);
});
// TODO: disable scrolling.
Overlay.of(context)?.insert(_listToolbarOverlay!);
}
// _listToolbarOverlay?.remove();
// _listToolbarOverlay = OverlayEntry(builder: (context) {
// return Positioned.fromRect(
// rect: rect,
// child: Material(
// borderRadius: BorderRadius.only(
// bottomLeft: Radius.circular(cornerRadius),
// bottomRight: Radius.circular(cornerRadius),
// ),
// color: const Color(0xFF333333),
// child: SingleChildScrollView(
// child: ListView.builder(
// itemExtent: toolbarHeight,
// padding: const EdgeInsets.only(bottom: 10.0),
// shrinkWrap: true,
// itemCount: items.length,
// itemBuilder: ((context, index) {
// return ListTile(
// contentPadding: const EdgeInsets.only(
// left: 3.0,
// right: 3.0,
// ),
// minVerticalPadding: 0.0,
// title: FittedBox(
// fit: BoxFit.scaleDown,
// child: Text(
// items[index],
// textAlign: TextAlign.center,
// style: const TextStyle(
// color: Colors.white,
// ),
// ),
// ),
// onTap: () {
// _onTap(items[index]);
// },
// );
// }),
// ),
// ),
// ),
// );
// });
// // TODO: disable scrolling.
// Overlay.of(context)?.insert(_listToolbarOverlay!);
// }
void _onTap(String eventName) {
if (defaultToolbarEventHandlers.containsKey(eventName)) {

69
frontend/app_flowy/packages/appflowy_editor/lib/src/service/selection_service.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:appflowy_editor/src/document/node.dart';
@ -104,7 +103,7 @@ class _FlowySelectionState extends State<FlowySelection>
final List<OverlayEntry> _selectionAreas = [];
final List<OverlayEntry> _cursorAreas = [];
OverlayEntry? _debugOverlay;
// OverlayEntry? _debugOverlay;
/// Pan
Offset? _panStartOffset;
@ -517,38 +516,38 @@ class _FlowySelectionState extends State<FlowySelection>
void _showDebugLayerIfNeeded({Offset? offset}) {
// remove false to show debug overlay.
if (kDebugMode && false) {
_debugOverlay?.remove();
if (offset != null) {
_debugOverlay = OverlayEntry(
builder: (context) => Positioned.fromRect(
rect: Rect.fromPoints(offset, offset.translate(20, 20)),
child: Container(
color: Colors.red.withOpacity(0.2),
),
),
);
Overlay.of(context)?.insert(_debugOverlay!);
} else if (_panStartOffset != null) {
_debugOverlay = OverlayEntry(
builder: (context) => Positioned.fromRect(
rect: Rect.fromPoints(
_panStartOffset?.translate(
0,
-(editorState.service.scrollService!.dy -
_panStartScrollDy!),
) ??
Offset.zero,
offset ?? Offset.zero),
child: Container(
color: Colors.red.withOpacity(0.2),
),
),
);
Overlay.of(context)?.insert(_debugOverlay!);
} else {
_debugOverlay = null;
}
}
// if (kDebugMode && false) {
// _debugOverlay?.remove();
// if (offset != null) {
// _debugOverlay = OverlayEntry(
// builder: (context) => Positioned.fromRect(
// rect: Rect.fromPoints(offset, offset.translate(20, 20)),
// child: Container(
// color: Colors.red.withOpacity(0.2),
// ),
// ),
// );
// Overlay.of(context)?.insert(_debugOverlay!);
// } else if (_panStartOffset != null) {
// _debugOverlay = OverlayEntry(
// builder: (context) => Positioned.fromRect(
// rect: Rect.fromPoints(
// _panStartOffset?.translate(
// 0,
// -(editorState.service.scrollService!.dy -
// _panStartScrollDy!),
// ) ??
// Offset.zero,
// offset ?? Offset.zero),
// child: Container(
// color: Colors.red.withOpacity(0.2),
// ),
// ),
// );
// Overlay.of(context)?.insert(_debugOverlay!);
// } else {
// _debugOverlay = null;
// }
// }
}
}