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
feat: imporve the functionality of pasting from html
Lucas.Xue226eaad4557
diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dartindex 6c76ed3952..2d58daef5a 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart@@ -1,8 +1,8 @@import 'package:appflowy/plugins/document/application/doc_bloc.dart';+import 'package:appflowy/plugins/document/presentation/editor_plugins/inline_page/inline_page_reference.dart';import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';import 'package:appflowy/plugins/document/presentation/editor_style.dart';import 'package:appflowy/workspace/application/settings/shortcuts/settings_shortcuts_service.dart';-import 'package:appflowy/plugins/document/presentation/editor_plugins/inline_page/inline_page_reference.dart';import 'package:appflowy_editor/appflowy_editor.dart';import 'package:collection/collection.dart';import 'package:flowy_infra/theme_extension.dart';diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dartindex aab9402917..1b2cffb842 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/callout/callout_block_component.dart@@ -3,6 +3,7 @@ import 'package:flowy_infra/theme_extension.dart';import 'package:flowy_infra_ui/flowy_infra_ui.dart';import 'package:flutter/material.dart';import 'package:provider/provider.dart';+import '../base/emoji_picker_button.dart';// defining the keys of the callout block's attributes for easy access@@ -138,7 +139,7 @@ class _CalloutBlockComponentWidgetStateColor get backgroundColor {final colorString =node.attributes[CalloutBlockKeys.backgroundColor] as String;- return colorString.toColor();+ return colorString.toColor() ?? Colors.transparent;}// get the emoji of the note block from the node's attributes or default to '📌'diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/outline/outline_block_component.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/outline/outline_block_component.dartindex 90aeb1b006..73add3c6d0 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/outline/outline_block_component.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_plugins/outline/outline_block_component.dart@@ -1,8 +1,8 @@import 'dart:async';import 'package:appflowy/generated/locale_keys.g.dart';-import 'package:easy_localization/easy_localization.dart';import 'package:appflowy_editor/appflowy_editor.dart';+import 'package:easy_localization/easy_localization.dart';import 'package:flowy_infra_ui/style_widget/hover.dart';import 'package:flutter/material.dart';import 'package:provider/provider.dart';@@ -84,7 +84,7 @@ class _OutlineBlockWidgetState extends State<OutlineBlockWidget>if (colorString == null) {return Colors.transparent;}- return colorString.toColor();+ return colorString.toColor() ?? Colors.transparent;}late EditorState editorState = context.read<EditorState>();diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_style.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_style.dartindex a190b52b63..02f86c8835 100644--- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_style.dart+++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_style.dart@@ -32,7 +32,6 @@ class EditorStyleCustomizer {final fontFamily = context.read<DocumentAppearanceCubit>().state.fontFamily;return EditorStyle.desktop(padding: padding,- backgroundColor: theme.colorScheme.surface,cursorColor: theme.colorScheme.primary,textStyleConfiguration: TextStyleConfiguration(text: baseTextStyle(fontFamily).copyWith(@@ -76,7 +75,6 @@ class EditorStyleCustomizer {return EditorStyle.desktop(padding: padding,- backgroundColor: theme.colorScheme.surface,cursorColor: theme.colorScheme.primary,textStyleConfiguration: TextStyleConfiguration(text: baseTextStyle(fontFamily).copyWith(diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lockindex 933b28a8f5..1857ce52df 100644--- a/frontend/appflowy_flutter/pubspec.lock+++ b/frontend/appflowy_flutter/pubspec.lock@@ -53,8 +53,8 @@ packages:dependency: "direct main"description:path: "."- ref: e5a10c4- resolved-ref: e5a10c4b4da10ae2faab8fd9a040633f66e3763b+ ref: "56474e8b"+ resolved-ref: "56474e8bd9f08be7090495c255eea20a694ab1f3"url: "https://github.com/AppFlowy-IO/appflowy-editor.git"source: gitversion: "1.2.3"diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yamlindex fec9a75a2b..d64f88b174 100644--- a/frontend/appflowy_flutter/pubspec.yaml+++ b/frontend/appflowy_flutter/pubspec.yaml@@ -48,7 +48,7 @@ dependencies:appflowy_editor:git:url: https://github.com/AppFlowy-IO/appflowy-editor.git- ref: e5a10c4+ ref: 56474e8bappflowy_popover:path: packages/appflowy_popover