Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
chore: resolve conflicts.
Lucas.Xuec83a686023a
diff --cc frontend/app_flowy/packages/flowy_editor/.vscode/launch.jsonindex 0000000000,0000000000..f27c363a13new file mode 100644--- /dev/null+++ b/frontend/app_flowy/packages/flowy_editor/.vscode/launch.json@@@ -1,0 -1,0 +1,45 @@@++{++ // Use IntelliSense to learn about possible attributes.++ // Hover to view descriptions of existing attributes.++ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387++ "version": "0.2.0",++ "configurations": [++ {++ "name": "example",++ "cwd": "example",++ "request": "launch",++ "type": "dart"++ },++ {++ "name": "example (profile mode)",++ "cwd": "example",++ "request": "launch",++ "type": "dart",++ "flutterMode": "profile"++ },++ {++ "name": "example (release mode)",++ "cwd": "example",++ "request": "launch",++ "type": "dart",++ "flutterMode": "release"++ },++ {++ "name": "flowy_editor",++ "request": "launch",++ "type": "dart"++ },++ {++ "name": "flowy_editor (profile mode)",++ "request": "launch",++ "type": "dart",++ "flutterMode": "profile"++ },++ {++ "name": "flowy_editor (release mode)",++ "request": "launch",++ "type": "dart",++ "flutterMode": "release"++ },++ ]++}diff --cc frontend/app_flowy/packages/flowy_editor/lib/render/rich_text/default_selectable.dartindex fe8ba39730,0000000000..21cc5108f3mode 100644,000000..100644--- a/frontend/app_flowy/packages/flowy_editor/lib/render/rich_text/default_selectable.dart+++ b/frontend/app_flowy/packages/flowy_editor/lib/render/rich_text/default_selectable.dart@@@ -1,28 -1,0 +1,33 @@@+import 'package:flowy_editor/document/position.dart';+import 'package:flowy_editor/document/selection.dart';+import 'package:flowy_editor/render/selection/selectable.dart';+import 'package:flutter/material.dart';++mixin DefaultSelectable {+ Selectable get forward;++ Offset get baseOffset;++ Position getPositionInOffset(Offset start) =>+ forward.getPositionInOffset(start);++ Rect getCursorRectInPosition(Position position) =>+ forward.getCursorRectInPosition(position).shift(baseOffset);++ List<Rect> getRectsInSelection(Selection selection) => forward+ .getRectsInSelection(selection)+ .map((rect) => rect.shift(baseOffset))+ .toList(growable: false);++ Selection getSelectionInRange(Offset start, Offset end) =>+ forward.getSelectionInRange(start, end);+++ Offset localToGlobal(Offset offset) => forward.localToGlobal(offset);++++ Selection? getWorldBoundaryInOffset(Offset offset) =>++ forward.getWorldBoundaryInOffset(offset);+++ Position start() => forward.start();++ Position end() => forward.end();+}diff --cc frontend/app_flowy/packages/flowy_editor/lib/render/rich_text/flowy_rich_text.dartindex 89ebce3026,122b65991e..d0f96372c3--- a/frontend/app_flowy/packages/flowy_editor/lib/render/rich_text/flowy_rich_text.dart+++ b/frontend/app_flowy/packages/flowy_editor/lib/render/rich_text/flowy_rich_text.dart@@@ -89,9 -105,19 +89,19 @@@ class _FlowyRichTextState extends StatePosition getPositionInOffset(Offset start) {final offset = _renderParagraph.globalToLocal(start);final baseOffset = _renderParagraph.getPositionForOffset(offset).offset;- return Position(path: _textNode.path, offset: baseOffset);+ return Position(path: widget.textNode.path, offset: baseOffset);}+ @override+ Selection? getWorldBoundaryInOffset(Offset offset) {+ final localOffset = _renderParagraph.globalToLocal(offset);+ final textPosition = _renderParagraph.getPositionForOffset(localOffset);+ final textRange = _renderParagraph.getWordBoundary(textPosition);- final start = Position(path: _textNode.path, offset: textRange.start);- final end = Position(path: _textNode.path, offset: textRange.end);++ final start = Position(path: widget.textNode.path, offset: textRange.start);++ final end = Position(path: widget.textNode.path, offset: textRange.end);+ return Selection(start: start, end: end);+ }+@overrideList<Rect> getRectsInSelection(Selection selection) {assert(pathEquals(selection.start.path, selection.end.path) &&@@@ -155,8 -175,118 +165,13 @@@);}- Widget _buildSingleRichText(BuildContext context) {- return SizedBox(- width:- MediaQuery.of(context).size.width - 20, // FIXME: use the const value- child: RichText(key: _textKey, text: _decorateTextSpanWithGlobalStyle),- );- }-- Widget _buildTodoListRichText(BuildContext context) {- final name = _textNode.attributes.todo ? 'check' : 'uncheck';- return Row(- crossAxisAlignment: CrossAxisAlignment.start,- children: [- GestureDetector(- child: FlowySvg(- key: _decorationKey,- name: name,- ),- onTap: () => TransactionBuilder(_editorState)- ..updateNode(_textNode, {- 'todo': !_textNode.attributes.todo,- })- ..commit(),- ),- _buildRichText(context),- ],- );- }-- Widget _buildBulletedListRichText(BuildContext context) {- return Row(- crossAxisAlignment: CrossAxisAlignment.center,- children: [- FlowySvg(- key: _decorationKey,- name: 'point',- ),- _buildRichText(context),- ],- );- }-- Widget _buildNumberListRichText(BuildContext context) {- return Row(- crossAxisAlignment: CrossAxisAlignment.center,- children: [- FlowySvg(- key: _decorationKey,- number: _textNode.attributes.number,- ),- _buildRichText(context),- ],- );- }-- Widget _buildQuotedRichText(BuildContext context) {- return Row(- crossAxisAlignment: CrossAxisAlignment.start,- children: [- FlowySvg(- key: _decorationKey,- name: 'quote',- ),- _buildRichText(context),- ],- );- }-- Widget _buildHeadingRichText(BuildContext context) {- // TODO: customize- return Column(- children: [- const Padding(padding: EdgeInsets.only(top: 5)),- _buildRichText(context),- const Padding(padding: EdgeInsets.only(top: 5)),- ],- );- }-- Rect frontWidgetRect() {- // FIXME: find a more elegant way to solve this situation.- final renderBox = _decorationKey.currentContext- ?.findRenderObject()- ?.unwrapOrNull<RenderBox>();- if (renderBox != null) {- return renderBox.localToGlobal(Offset.zero) & renderBox.size;- }- return Rect.zero;- }-++ @override+ Offset localToGlobal(Offset offset) {+ return _renderParagraph.localToGlobal(offset);+ }+- TextSpan get _decorateTextSpanWithGlobalStyle => TextSpan(- children: _textSpan.children- ?.whereType<TextSpan>()- .map(- (span) => TextSpan(- text: span.text,- style: span.style?.copyWith(- fontSize: _textNode.attributes.fontSize,- color: _textNode.attributes.quoteColor,- ),- recognizer: span.recognizer,- ),- )- .toList(),- );-TextSpan get _textSpan => TextSpan(- children: _textNode.delta.operations+ children: widget.textNode.delta.operations.whereType<TextInsert>().map((insert) => RichTextStyle(attributes: insert.attributes ?? {},diff --cc frontend/app_flowy/packages/flowy_editor/lib/render/rich_text/quoted_text.dartindex 773fd0debe,0000000000..b4ee999ce8mode 100644,000000..100644--- a/frontend/app_flowy/packages/flowy_editor/lib/render/rich_text/quoted_text.dart+++ b/frontend/app_flowy/packages/flowy_editor/lib/render/rich_text/quoted_text.dart@@@ -1,73 -1,0 +1,72 @@@+import 'package:flowy_editor/document/node.dart';+import 'package:flowy_editor/editor_state.dart';+import 'package:flowy_editor/infra/flowy_svg.dart';+import 'package:flowy_editor/render/node_widget_builder.dart';+import 'package:flowy_editor/render/rich_text/default_selectable.dart';+import 'package:flowy_editor/render/rich_text/flowy_rich_text.dart';- import 'package:flowy_editor/render/rich_text/rich_text_style.dart';+import 'package:flowy_editor/render/selection/selectable.dart';+import 'package:flutter/material.dart';++class QuotedTextNodeWidgetBuilder extends NodeWidgetBuilder {+ QuotedTextNodeWidgetBuilder.create({+ required super.editorState,+ required super.node,+ required super.key,+ }) : super.create();++ @override+ Widget build(BuildContext context) {+ return QuotedTextNodeWidget(+ key: key,+ textNode: node as TextNode,+ editorState: editorState,+ );+ }+}++class QuotedTextNodeWidget extends StatefulWidget {+ const QuotedTextNodeWidget({+ Key? key,+ required this.textNode,+ required this.editorState,+ }) : super(key: key);++ final TextNode textNode;+ final EditorState editorState;++ @override+ State<QuotedTextNodeWidget> createState() => _QuotedTextNodeWidgetState();+}++// customize++class _QuotedTextNodeWidgetState extends State<QuotedTextNodeWidget>+ with Selectable, DefaultSelectable {+ final _richTextKey = GlobalKey(debugLabel: 'quoted_text');+ final leftPadding = 20.0;++ @override+ Selectable<StatefulWidget> get forward =>+ _richTextKey.currentState as Selectable;++ @override+ Offset get baseOffset {+ return Offset(leftPadding, 0);+ }++ @override+ Widget build(BuildContext context) {+ return Row(+ children: [+ const FlowySvg(+ name: 'quote',+ ),+ FlowyRichText(+ key: _richTextKey,+ textNode: widget.textNode,+ editorState: widget.editorState,+ ),+ ],+ );+ }+}diff --cc frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dartindex 878fac28b4,43b77baeaf..975677d508--- a/frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dart+++ b/frontend/app_flowy/packages/flowy_editor/lib/service/selection_service.dart@@@ -171,8 -250,13 +250,14 @@@ class _FlowySelectionState extends Stat);}++ @override+ List<Rect> rects() {+ return _rects;+ }+@overridevoid updateSelection(Selection selection) {+ _rects.clear();_clearSelection();// cursor