Browse Source

[flutter]: fix bugs

appflowy 3 years ago
parent
commit
955bc3e103

+ 4 - 1
app_flowy/lib/workspace/application/doc/doc_bloc.dart

@@ -58,7 +58,10 @@ class DocBloc extends Bloc<DocEvent, DocState> {
   Future<void> close() async {
   Future<void> close() async {
     await listener.stop();
     await listener.stop();
 
 
-    await _subscription?.cancel();
+    if (_subscription != null) {
+      await _subscription?.cancel();
+    }
+
     docManager.closeDoc();
     docManager.closeDoc();
     return super.close();
     return super.close();
   }
   }

+ 1 - 1
app_flowy/lib/workspace/presentation/stack_page/doc/widget/toolbar/tool_bar.dart

@@ -71,7 +71,7 @@ class EditorToolbar extends StatelessWidget implements PreferredSizeWidget {
         ),
         ),
         FlowyToggleStyleButton(
         FlowyToggleStyleButton(
           attribute: Attribute.italic,
           attribute: Attribute.italic,
-          normalIcon: 'editor/restore',
+          normalIcon: 'editor/italic',
           iconSize: toolbarIconSize,
           iconSize: toolbarIconSize,
           controller: controller,
           controller: controller,
         ),
         ),

+ 1 - 1
rust-lib/flowy-ot/src/core/attributes/attribute.rs

@@ -80,7 +80,7 @@ pub enum AttributeKey {
     Italic,
     Italic,
     #[serde(rename = "underline")]
     #[serde(rename = "underline")]
     Underline,
     Underline,
-    #[serde(rename = "strikethrough")]
+    #[serde(rename = "strike")]
     StrikeThrough,
     StrikeThrough,
     #[serde(rename = "font")]
     #[serde(rename = "font")]
     Font,
     Font,