diff --git a/app_flowy/lib/workspace/application/doc/doc_bloc.dart b/app_flowy/lib/workspace/application/doc/doc_bloc.dart index 303f3872d6..19962b33c4 100644 --- a/app_flowy/lib/workspace/application/doc/doc_bloc.dart +++ b/app_flowy/lib/workspace/application/doc/doc_bloc.dart @@ -58,7 +58,10 @@ class DocBloc extends Bloc { Future close() async { await listener.stop(); - await _subscription?.cancel(); + if (_subscription != null) { + await _subscription?.cancel(); + } + docManager.closeDoc(); return super.close(); } diff --git a/app_flowy/lib/workspace/presentation/stack_page/doc/widget/toolbar/tool_bar.dart b/app_flowy/lib/workspace/presentation/stack_page/doc/widget/toolbar/tool_bar.dart index b1c038d40b..88582c3733 100644 --- a/app_flowy/lib/workspace/presentation/stack_page/doc/widget/toolbar/tool_bar.dart +++ b/app_flowy/lib/workspace/presentation/stack_page/doc/widget/toolbar/tool_bar.dart @@ -71,7 +71,7 @@ class EditorToolbar extends StatelessWidget implements PreferredSizeWidget { ), FlowyToggleStyleButton( attribute: Attribute.italic, - normalIcon: 'editor/restore', + normalIcon: 'editor/italic', iconSize: toolbarIconSize, controller: controller, ), diff --git a/rust-lib/flowy-ot/src/core/attributes/attribute.rs b/rust-lib/flowy-ot/src/core/attributes/attribute.rs index 4509031198..38c377de6d 100644 --- a/rust-lib/flowy-ot/src/core/attributes/attribute.rs +++ b/rust-lib/flowy-ot/src/core/attributes/attribute.rs @@ -80,7 +80,7 @@ pub enum AttributeKey { Italic, #[serde(rename = "underline")] Underline, - #[serde(rename = "strikethrough")] + #[serde(rename = "strike")] StrikeThrough, #[serde(rename = "font")] Font,