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: smart edit bugs (#1911)

Browse Source
This commit is contained in:
Lucas.Xu 2023-03-02 19:34:08 +08:00 committed by GitHub
parent a1a5675875
commit fd41459a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/appflowy_flutter/lib/plugins/document/document_page.dart
View File

@ -177,7 +177,9 @@ class _AppFlowyEditorPageState extends State<_AppFlowyEditorPage> {
]
],
toolbarItems: [
smartEditItem,
if (openAIKey != null && openAIKey!.isNotEmpty) ...[
smartEditItem,
]
],
themeData: theme.copyWith(extensions: [
...theme.extensions.values,

75
frontend/appflowy_flutter/lib/plugins/document/presentation/plugins/openai/widgets/smart_edit_toolbar_item.dart
View File

@ -42,11 +42,13 @@ class _SmartEditWidgetState extends State<_SmartEditWidget> {
.toList(),
buildChild: (controller) {
return FlowyIconButton(
hoverColor: Colors.transparent,
tooltipText: 'Smart Edit',
preferBelow: false,
icon: const Icon(
Icons.edit,
size: 14,
Icons.lightbulb_outline,
size: 13,
color: Colors.white,
),
onPressed: () {
controller.show();
@ -55,39 +57,44 @@ class _SmartEditWidgetState extends State<_SmartEditWidget> {
},
onSelected: (action, controller) {
controller.close();
final selection =
widget.editorState.service.selectionService.currentSelection.value;
if (selection == null) {
return;
}
final textNodes = widget
.editorState.service.selectionService.currentSelectedNodes
.whereType<TextNode>()
.toList(growable: false);
final input = widget.editorState.getTextInSelection(
textNodes.normalized,
selection.normalized,
);
final transaction = widget.editorState.transaction;
transaction.insertNode(
selection.normalized.end.path.next,
Node(
type: kSmartEditType,
attributes: {
kSmartEditInstructionType: action.inner.toInstruction,
kSmartEditInputType: input,
},
),
);
widget.editorState.apply(
transaction,
options: const ApplyOptions(
recordUndo: false,
recordRedo: false,
),
withUpdateCursor: false,
);
_insertSmartEditNode(action);
},
);
}
Future<void> _insertSmartEditNode(
SmartEditActionWrapper actionWrapper) async {
final selection =
widget.editorState.service.selectionService.currentSelection.value;
if (selection == null) {
return;
}
final textNodes = widget
.editorState.service.selectionService.currentSelectedNodes
.whereType<TextNode>()
.toList(growable: false);
final input = widget.editorState.getTextInSelection(
textNodes.normalized,
selection.normalized,
);
final transaction = widget.editorState.transaction;
transaction.insertNode(
selection.normalized.end.path.next,
Node(
type: kSmartEditType,
attributes: {
kSmartEditInstructionType: actionWrapper.inner.toInstruction,
kSmartEditInputType: input,
},
),
);
return widget.editorState.apply(
transaction,
options: const ApplyOptions(
recordUndo: false,
recordRedo: false,
),
withUpdateCursor: false,
);
}
}

12
frontend/appflowy_flutter/packages/appflowy_editor/lib/src/commands/command_extension.dart
View File

@ -59,12 +59,18 @@ extension CommandExtension on EditorState {
List<String> res = [];
if (!selection.isCollapsed) {
for (var i = 0; i < textNodes.length; i++) {
final plainText = textNodes[i].toPlainText();
if (i == 0) {
res.add(textNodes[i].toPlainText().substring(selection.startIndex));
res.add(
plainText.substring(
selection.startIndex,
plainText.length,
),
);
} else if (i == textNodes.length - 1) {
res.add(textNodes[i].toPlainText().substring(0, selection.endIndex));
res.add(plainText.substring(0, selection.endIndex));
} else {
res.add(textNodes[i].toPlainText());
res.add(plainText);
}
}
}