From 3fce5eebf8c407ab54ac98721c2dd04f0b189ec4 Mon Sep 17 00:00:00 2001 From: "Lucas.Xu" Date: Mon, 29 Apr 2024 11:41:09 +0800 Subject: [PATCH] fix: migrate OKRs issues (#5215) * fix: disable color paraser when pasting texts * fix: compile error * fix: register hotkeys in init function * fix: improve settings hotkey * chore: update editor * fix: view title overflow * fix: integration test * chore: improve auto expanding animation * chore: bump version 0.5.6 * chore: enable collab workspace --------- Co-authored-by: Mathias Mogensen --- frontend/Makefile.toml | 2 +- .../document_copy_and_paste_test.dart | 51 +-------- .../presentation/editor_configuration.dart | 16 ++- .../document/presentation/editor_page.dart | 72 +++++++----- .../lib/shared/feature_flags.dart | 6 +- .../home/desktop_home_screen.dart | 7 +- .../workspace/presentation/home/hotkeys.dart | 54 ++++++--- .../menu/sidebar/folder/_section_folder.dart | 14 ++- .../home/menu/sidebar/sidebar_setting.dart | 22 ++-- .../presentation/widgets/view_title_bar.dart | 36 +++--- .../packages/flowy_infra/pubspec.yaml | 2 +- frontend/appflowy_flutter/pubspec.lock | 108 ++++-------------- frontend/appflowy_flutter/pubspec.yaml | 10 +- .../bloc_test/home_test/view_bloc_test.dart | 2 +- 14 files changed, 176 insertions(+), 226 deletions(-) diff --git a/frontend/Makefile.toml b/frontend/Makefile.toml index ab1c6c4443..5c6950e179 100644 --- a/frontend/Makefile.toml +++ b/frontend/Makefile.toml @@ -26,7 +26,7 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true CARGO_MAKE_CRATE_FS_NAME = "dart_ffi" CARGO_MAKE_CRATE_NAME = "dart-ffi" LIB_NAME = "dart_ffi" -APPFLOWY_VERSION = "0.5.5" +APPFLOWY_VERSION = "0.5.6" FLUTTER_DESKTOP_FEATURES = "dart" PRODUCT_NAME = "AppFlowy" MACOSX_DEPLOYMENT_TARGET = "11.0" diff --git a/frontend/appflowy_flutter/integration_test/desktop/document/document_copy_and_paste_test.dart b/frontend/appflowy_flutter/integration_test/desktop/document/document_copy_and_paste_test.dart index 8b479a8548..0ea1391790 100644 --- a/frontend/appflowy_flutter/integration_test/desktop/document/document_copy_and_paste_test.dart +++ b/frontend/appflowy_flutter/integration_test/desktop/document/document_copy_and_paste_test.dart @@ -106,58 +106,13 @@ void main() { expect(node2.type, ParagraphBlockKeys.type); expect(node3.type, ParagraphBlockKeys.type); expect(node1.delta!.toJson(), [ - { - "insert": "void", - "attributes": {"font_color": "0xfffede5d"}, - }, - { - "insert": " ", - "attributes": {"font_color": "0xffff7edb"}, - }, - { - "insert": "main", - "attributes": {"font_color": "0xff36f9f6"}, - }, - { - "insert": "() {", - "attributes": {"font_color": "0xffff7edb"}, - } + {'insert': 'void main() {'}, ]); expect(node2.delta!.toJson(), [ - { - "insert": " ", - "attributes": {"font_color": "0xffff7edb"}, - }, - { - "insert": "runApp", - "attributes": {"font_color": "0xff36f9f6"}, - }, - { - "insert": "(", - "attributes": {"font_color": "0xffff7edb"}, - }, - { - "insert": "const", - "attributes": {"font_color": "0xfffede5d"}, - }, - { - "insert": " ", - "attributes": {"font_color": "0xffff7edb"}, - }, - { - "insert": "MyApp", - "attributes": {"font_color": "0xfffe4450"}, - }, - { - "insert": "());", - "attributes": {"font_color": "0xffff7edb"}, - } + {'insert': " runApp(const MyApp());"}, ]); expect(node3.delta!.toJson(), [ - { - "insert": "}", - "attributes": {"font_color": "0xffff7edb"}, - } + {"insert": "}"}, ]); }); }); diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart index 02f069e172..fb7b9eeed4 100644 --- a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart +++ b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_configuration.dart @@ -1,7 +1,5 @@ -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; - import 'package:appflowy/generated/locale_keys.g.dart'; +import 'package:appflowy/plugins/document/presentation/editor_page.dart'; import 'package:appflowy/plugins/document/presentation/editor_plugins/actions/mobile_block_action_buttons.dart'; import 'package:appflowy/plugins/document/presentation/editor_plugins/code_block/code_block_copy_button.dart'; import 'package:appflowy/plugins/document/presentation/editor_plugins/image/custom_image_block_component.dart'; @@ -11,6 +9,8 @@ import 'package:appflowy_editor/appflowy_editor.dart'; import 'package:appflowy_editor_plugins/appflowy_editor_plugins.dart'; import 'package:easy_localization/easy_localization.dart' hide TextDirection; import 'package:flowy_infra/theme_extension.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; Map getEditorBuilderMap({ required BuildContext context, @@ -104,6 +104,16 @@ Map getEditorBuilderMap({ ), ), TableCellBlockKeys.type: TableCellBlockComponentBuilder( + colorBuilder: (context, node) { + final String colorString = + node.attributes[TableCellBlockKeys.colBackgroundColor] ?? + node.attributes[TableCellBlockKeys.rowBackgroundColor] ?? + ''; + if (colorString.isEmpty) { + return null; + } + return buildEditorCustomizedColor(context, node, colorString); + }, menuBuilder: (node, editorState, position, dir, onBuild, onClose) => TableMenu( node: node, diff --git a/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart b/frontend/appflowy_flutter/lib/plugins/document/presentation/editor_page.dart index d8976d6e54..761e7d42d1 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,5 @@ import 'dart:ui' as ui; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; - import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy/plugins/document/application/document_bloc.dart'; import 'package:appflowy/plugins/document/presentation/editor_configuration.dart'; @@ -29,6 +26,8 @@ import 'package:collection/collection.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flowy_infra/theme_extension.dart'; import 'package:flowy_infra_ui/flowy_infra_ui.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; final codeBlockLocalization = CodeBlockLocalizations( @@ -229,6 +228,8 @@ class _AppFlowyEditorPageState extends State { convertibleBlockTypes.add(ToggleListBlockKeys.type); slashMenuItems = _customSlashMenuItems(); effectiveScrollController = widget.scrollController ?? ScrollController(); + // disable the color parse in the HTML decoder. + DocumentHTMLDecoder.enableColorParse = false; editorScrollController = EditorScrollController( editorState: widget.editorState, @@ -455,33 +456,12 @@ class _AppFlowyEditorPageState extends State { } void _customizeBlockComponentBackgroundColorDecorator() { - blockComponentBackgroundColorDecorator = (Node node, String colorString) { - // the color string is from FlowyTint. - final tintColor = FlowyTint.values.firstWhereOrNull( - (e) => e.id == colorString, - ); - if (tintColor != null) { - return tintColor.color(context); - } - - final themeColor = themeBackgroundColors[colorString]; - if (themeColor != null) { - return themeColor.color(context); - } - - if (colorString == optionActionColorDefaultColor) { - final defaultColor = node.type == CalloutBlockKeys.type - ? AFThemeExtension.of(context).calloutBGColor - : Colors.transparent; - return defaultColor; - } - - if (colorString == tableCellDefaultColor) { - return AFThemeExtension.of(context).tableCellBGColor; - } - - return null; - }; + blockComponentBackgroundColorDecorator = + (Node node, String colorString) => buildEditorCustomizedColor( + context, + node, + colorString, + ); } void _initEditorL10n() => AppFlowyEditorL10n.current = EditorI18n(); @@ -507,6 +487,38 @@ class _AppFlowyEditorPageState extends State { } } +Color? buildEditorCustomizedColor( + BuildContext context, + Node node, + String colorString, +) { + // the color string is from FlowyTint. + final tintColor = FlowyTint.values.firstWhereOrNull( + (e) => e.id == colorString, + ); + if (tintColor != null) { + return tintColor.color(context); + } + + final themeColor = themeBackgroundColors[colorString]; + if (themeColor != null) { + return themeColor.color(context); + } + + if (colorString == optionActionColorDefaultColor) { + final defaultColor = node.type == CalloutBlockKeys.type + ? AFThemeExtension.of(context).calloutBGColor + : Colors.transparent; + return defaultColor; + } + + if (colorString == tableCellDefaultColor) { + return AFThemeExtension.of(context).tableCellBGColor; + } + + return null; +} + bool showInAnyTextType(EditorState editorState) { final selection = editorState.selection; if (selection == null) { diff --git a/frontend/appflowy_flutter/lib/shared/feature_flags.dart b/frontend/appflowy_flutter/lib/shared/feature_flags.dart index c61567cd1b..94b45da631 100644 --- a/frontend/appflowy_flutter/lib/shared/feature_flags.dart +++ b/frontend/appflowy_flutter/lib/shared/feature_flags.dart @@ -85,9 +85,9 @@ enum FeatureFlag { bool get isOn { if ([ - // release this feature in version 0.5.5 - // FeatureFlag.collaborativeWorkspace, - // FeatureFlag.membersSettings, + // release this feature in version 0.5.6 + FeatureFlag.collaborativeWorkspace, + FeatureFlag.membersSettings, // release this feature in version 0.5.4 FeatureFlag.syncDatabase, FeatureFlag.syncDocument, diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart index 813815f016..efc79f0d59 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/desktop_home_screen.dart @@ -1,3 +1,6 @@ +import 'package:flutter/gestures.dart'; +import 'package:flutter/material.dart'; + import 'package:appflowy/plugins/blank/blank.dart'; import 'package:appflowy/startup/plugin/plugin.dart'; import 'package:appflowy/startup/startup.dart'; @@ -23,13 +26,12 @@ import 'package:appflowy_backend/protobuf/flowy-folder/protobuf.dart'; import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart' show UserProfilePB; import 'package:flowy_infra_ui/style_widget/container.dart'; -import 'package:flutter/gestures.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:sized_context/sized_context.dart'; import 'package:styled_widget/styled_widget.dart'; import '../widgets/edit_panel/edit_panel.dart'; + import 'home_layout.dart'; import 'home_stack.dart'; @@ -87,6 +89,7 @@ class DesktopHomeScreen extends StatelessWidget { ), ], child: HomeHotKeys( + userProfile: userProfile, child: Scaffold( floatingActionButton: enableMemoryLeakDetect ? const FloatingActionButton( diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/hotkeys.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/hotkeys.dart index dcaeee61b9..6f120ced1d 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/hotkeys.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/hotkeys.dart @@ -8,6 +8,7 @@ import 'package:appflowy/workspace/application/settings/appearance/appearance_cu import 'package:appflowy/workspace/application/sidebar/rename_view/rename_view_bloc.dart'; import 'package:appflowy/workspace/application/tabs/tabs_bloc.dart'; import 'package:appflowy/workspace/presentation/home/menu/sidebar/sidebar_setting.dart'; +import 'package:appflowy_backend/protobuf/flowy-user/user_profile.pb.dart'; import 'package:hotkey_manager/hotkey_manager.dart'; import 'package:provider/provider.dart'; @@ -33,13 +34,22 @@ class HotKeyItem { hotKeyManager.register(hotKey, keyDownHandler: keyDownHandler); } -class HomeHotKeys extends StatelessWidget { - const HomeHotKeys({required this.child, super.key}); +class HomeHotKeys extends StatefulWidget { + const HomeHotKeys({ + super.key, + required this.userProfile, + required this.child, + }); + final UserProfilePB userProfile; final Widget child; @override - Widget build(BuildContext context) { + State createState() => _HomeHotKeysState(); +} + +class _HomeHotKeysState extends State { + late final items = [ // Collapse sidebar menu HotKeyItem( hotKey: HotKey( @@ -51,7 +61,7 @@ class HomeHotKeys extends StatelessWidget { keyDownHandler: (_) => context .read() .add(const HomeSettingEvent.collapseMenu()), - ).register(); + ), // Toggle theme mode light/dark HotKeyItem( @@ -65,7 +75,7 @@ class HomeHotKeys extends StatelessWidget { ), keyDownHandler: (_) => context.read().toggleThemeMode(), - ).register(); + ), // Close current tab HotKeyItem( @@ -76,7 +86,7 @@ class HomeHotKeys extends StatelessWidget { ), keyDownHandler: (_) => context.read().add(const TabsEvent.closeCurrentTab()), - ).register(); + ), // Go to previous tab HotKeyItem( @@ -86,7 +96,7 @@ class HomeHotKeys extends StatelessWidget { scope: HotKeyScope.inapp, ), keyDownHandler: (_) => _selectTab(context, -1), - ).register(); + ), // Go to next tab HotKeyItem( @@ -96,7 +106,7 @@ class HomeHotKeys extends StatelessWidget { scope: HotKeyScope.inapp, ), keyDownHandler: (_) => _selectTab(context, 1), - ).register(); + ), // Rename current view HotKeyItem( @@ -106,15 +116,33 @@ class HomeHotKeys extends StatelessWidget { ), keyDownHandler: (_) => getIt().add(const RenameViewEvent.open()), - ).register(); + ), - _asyncRegistration(context); + // Open settings dialog + openSettingsHotKey(context, widget.userProfile), + ]; - return child; + @override + void initState() { + super.initState(); + + _registerHotKeys(context); } - Future _asyncRegistration(BuildContext context) async { - (await openSettingsHotKey(context))?.register(); + @override + void didChangeDependencies() { + super.didChangeDependencies(); + + _registerHotKeys(context); + } + + @override + Widget build(BuildContext context) => widget.child; + + void _registerHotKeys(BuildContext context) { + for (final element in items) { + element.register(); + } } void _selectTab(BuildContext context, int change) { diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/_section_folder.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/_section_folder.dart index 1e05a29db2..bde26d3955 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/_section_folder.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/folder/_section_folder.dart @@ -91,9 +91,17 @@ class SectionFolder extends StatelessWidget { } context.read().openPlugin(view); - viewContext.read().add( - const ViewEvent.setIsExpanded(true), - ); + + // Delay to expand the view to prevent the view from being + // expanded when the user is trying to open the view in a new tab + // This will improve the animation performance + Future.delayed(const Duration(milliseconds: 50), () { + if (viewContext.mounted) { + viewContext + .read() + .add(const ViewEvent.setIsExpanded(true)); + } + }); }, onTertiarySelected: (view, viewContext) => context.read().openTab(view), diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_setting.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_setting.dart index 24d4dd312f..b64af1967f 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_setting.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar_setting.dart @@ -1,8 +1,9 @@ +import 'package:flutter/material.dart'; + import 'package:appflowy/generated/flowy_svgs.g.dart'; import 'package:appflowy/generated/locale_keys.g.dart'; import 'package:appflowy/plugins/document/application/document_appearance_cubit.dart'; import 'package:appflowy/startup/startup.dart'; -import 'package:appflowy/user/application/auth/auth_service.dart'; import 'package:appflowy/workspace/presentation/home/hotkeys.dart'; import 'package:appflowy/workspace/presentation/settings/settings_dialog.dart'; import 'package:appflowy_backend/log.dart'; @@ -11,17 +12,16 @@ import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart' import 'package:appflowy_editor/appflowy_editor.dart' hide Log; import 'package:easy_localization/easy_localization.dart'; import 'package:flowy_infra_ui/widget/flowy_tooltip.dart'; -import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:hotkey_manager/hotkey_manager.dart'; final GlobalKey _settingsDialogKey = GlobalKey(); -Future openSettingsHotKey(BuildContext context) async { - final userProfileOrFailure = await getIt().getUser(); - - return userProfileOrFailure.fold( - (userProfile) => HotKeyItem( +HotKeyItem openSettingsHotKey( + BuildContext context, + UserProfilePB userProfile, +) => + HotKeyItem( hotKey: HotKey( KeyCode.comma, scope: HotKeyScope.inapp, @@ -37,13 +37,7 @@ Future openSettingsHotKey(BuildContext context) async { .popUntil((route) => route.isFirst); } }, - ), - (e) { - Log.error('Failed to get user $e'); - return null; - }, - ); -} + ); class UserSettingButton extends StatelessWidget { const UserSettingButton({required this.userProfile, super.key}); diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart index 3a3ccffcd3..ca291a51b4 100644 --- a/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart +++ b/frontend/appflowy_flutter/lib/workspace/presentation/widgets/view_title_bar.dart @@ -1,3 +1,5 @@ +import 'dart:math'; + import 'package:appflowy/plugins/base/emoji/emoji_text.dart'; import 'package:appflowy/startup/tasks/app_window_size_manager.dart'; import 'package:appflowy/workspace/application/tabs/tabs_bloc.dart'; @@ -70,7 +72,7 @@ class _ViewTitleBarState extends State { child: _ViewTitle( key: ValueKey(ancestors.last), view: ancestors.last, - maxTitleWidth: constraints.maxWidth - 50.0, + maxTitleWidth: constraints.maxWidth, onUpdated: () => setState(() => _reloadAncestors()), ), ); @@ -223,23 +225,25 @@ class _ViewTitleState extends State<_ViewTitle> { ); } - final child = Row( - children: [ - EmojiText( - emoji: icon, - fontSize: 18.0, - ), - const HSpace(2.0), - ConstrainedBox( - constraints: BoxConstraints( - maxWidth: widget.maxTitleWidth, + final child = SingleChildScrollView( + child: Row( + children: [ + EmojiText( + emoji: icon, + fontSize: 18.0, ), - child: FlowyText.regular( - name, - overflow: TextOverflow.ellipsis, + const HSpace(2.0), + ConstrainedBox( + constraints: BoxConstraints( + maxWidth: max(0, widget.maxTitleWidth), + ), + child: FlowyText.regular( + name, + overflow: TextOverflow.ellipsis, + ), ), - ), - ], + ], + ), ); if (widget.behavior == _ViewTitleBehavior.uneditable) { diff --git a/frontend/appflowy_flutter/packages/flowy_infra/pubspec.yaml b/frontend/appflowy_flutter/packages/flowy_infra/pubspec.yaml index 6e6322f879..0653aacaa5 100644 --- a/frontend/appflowy_flutter/packages/flowy_infra/pubspec.yaml +++ b/frontend/appflowy_flutter/packages/flowy_infra/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: uuid: ">=2.2.2" bloc: ^8.1.2 freezed_annotation: ^2.1.0 - file_picker: ^6.1.1 + file_picker: ^8.0.2 file: ^7.0.0 dev_dependencies: diff --git a/frontend/appflowy_flutter/pubspec.lock b/frontend/appflowy_flutter/pubspec.lock index 21f9f220ea..7cc1b449ee 100644 --- a/frontend/appflowy_flutter/pubspec.lock +++ b/frontend/appflowy_flutter/pubspec.lock @@ -53,8 +53,8 @@ packages: dependency: "direct main" description: path: "." - ref: bcaa58e8554963083931272afcfc907f15b804cb - resolved-ref: bcaa58e8554963083931272afcfc907f15b804cb + ref: "1d5cdb7" + resolved-ref: "1d5cdb758123aa3d391b62211707b4c14a92f85a" url: "https://github.com/AppFlowy-IO/appflowy-editor.git" source: git version: "2.3.4" @@ -325,10 +325,10 @@ packages: dependency: transitive description: name: cross_file - sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e + sha256: "55d7b444feb71301ef6b8838dbc1ae02e63dd48c8773f3810ff53bb1e2945b32" url: "https://pub.dev" source: hosted - version: "0.3.3+8" + version: "0.3.4+1" crypto: dependency: transitive description: @@ -365,10 +365,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110" + sha256: eead12d1a1ed83d8283ab4c2f3fca23ac4082f29f25f29dff0f758f57d06ec91 url: "https://pub.dev" source: hosted - version: "9.1.2" + version: "10.1.0" device_info_plus_platform_interface: dependency: transitive description: @@ -477,10 +477,10 @@ packages: dependency: transitive description: name: file_picker - sha256: "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6" + sha256: "29c90806ac5f5fb896547720b73b17ee9aed9bba540dc5d91fe29f8c5745b10a" url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "8.0.3" file_selector_linux: dependency: transitive description: @@ -848,10 +848,10 @@ packages: dependency: "direct main" description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.1" http_multi_server: dependency: transitive description: @@ -1237,10 +1237,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79" + sha256: cb44f49b6e690fa766f023d5b22cac6b9affe741dd792b6ac7ad4fabe0d7b097 url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "6.0.0" package_info_plus_platform_interface: dependency: transitive description: @@ -1457,70 +1457,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" - rich_clipboard: - dependency: transitive - description: - name: rich_clipboard - sha256: "48bfc84a0d3eeec5692b3afd0277aa658a7c95d1dbda72bb623188fba6a8e253" - url: "https://pub.dev" - source: hosted - version: "1.0.1" - rich_clipboard_android: - dependency: transitive - description: - name: rich_clipboard_android - sha256: "72725b248d5359a7ad6db2fea5aef921015ba9a00af275cbce3721a4fef20356" - url: "https://pub.dev" - source: hosted - version: "1.0.1" - rich_clipboard_ios: - dependency: transitive - description: - name: rich_clipboard_ios - sha256: "9d6bc037463b1b24cb14ae35ee9d7530bd6b2bdb15b30909fb47a1af01bf3233" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - rich_clipboard_linux: - dependency: transitive - description: - name: rich_clipboard_linux - sha256: "0d0ab273afd60cb7314d01fdf3994fa01be2be79528f448241d9d70ea19b3db9" - url: "https://pub.dev" - source: hosted - version: "1.0.1" - rich_clipboard_macos: - dependency: transitive - description: - name: rich_clipboard_macos - sha256: "1aeb409e267576baaced347549e42dabc59895b10b2e09dabd9f753f469deb3e" - url: "https://pub.dev" - source: hosted - version: "1.0.1" - rich_clipboard_platform_interface: - dependency: transitive - description: - name: rich_clipboard_platform_interface - sha256: a1cbf255719cd4e340d33eca02b619d9ffb9cb571f1905e80b9345d4266e893d - url: "https://pub.dev" - source: hosted - version: "1.0.0" - rich_clipboard_web: - dependency: transitive - description: - name: rich_clipboard_web - sha256: c1dd2b75b8ce83fed0027828900bbfd5c33c0f8ff22efb266931db5aa7acffa0 - url: "https://pub.dev" - source: hosted - version: "1.0.2" - rich_clipboard_windows: - dependency: transitive - description: - name: rich_clipboard_windows - sha256: "633198bcd74642bb03c4a628c7e350ee18bb391cd8c6132152f7c97ab250e901" - url: "https://pub.dev" - source: hosted - version: "1.0.3" run_with_network_images: dependency: "direct dev" description: @@ -1613,10 +1549,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.0" shared_preferences_windows: dependency: transitive description: @@ -1844,10 +1780,10 @@ packages: dependency: transitive description: name: super_native_extensions - sha256: f96db6b137a0b135e43034289bb55ca6447b65225076036e81f97ebb6381ffeb + sha256: "530a2118d032483b192713c68ed7105fe64418f22492165f87ed01f9b01d4965" url: "https://pub.dev" source: hosted - version: "0.8.5" + version: "0.8.12" sync_http: dependency: transitive description: @@ -2028,10 +1964,10 @@ packages: dependency: transitive description: name: url_launcher_web - sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b + sha256: "8d9e750d8c9338601e709cd0885f95825086bd8b642547f26bda435aade95d8a" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.1" url_launcher_windows: dependency: transitive description: @@ -2125,18 +2061,18 @@ packages: dependency: transitive description: name: web - sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" + sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27" url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.5.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" + sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.5" webdriver: dependency: transitive description: diff --git a/frontend/appflowy_flutter/pubspec.yaml b/frontend/appflowy_flutter/pubspec.yaml index 283812ec68..937d3d9369 100644 --- a/frontend/appflowy_flutter/pubspec.yaml +++ b/frontend/appflowy_flutter/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 0.5.5 +version: 0.5.6 environment: flutter: ">=3.19.0" @@ -68,12 +68,12 @@ dependencies: expandable: ^5.0.1 flutter_colorpicker: ^1.0.3 highlight: ^0.7.0 - package_info_plus: ^5.0.1 + package_info_plus: ^6.0.0 url_launcher: ^6.1.11 clipboard: ^0.1.3 connectivity_plus: ^5.0.2 easy_localization: ^3.0.2 - device_info_plus: ^9.0.1 + device_info_plus: ^10.1.0 fluttertoast: ^8.2.2 json_annotation: ^4.8.1 table_calendar: ^3.0.9 @@ -168,7 +168,7 @@ dependency_overrides: appflowy_editor: git: url: https://github.com/AppFlowy-IO/appflowy-editor.git - ref: "bcaa58e8554963083931272afcfc907f15b804cb" + ref: "1d5cdb7" sheet: git: @@ -252,4 +252,4 @@ flutter: - assets/template/ - assets/test/workspaces/markdowns/ - assets/test/workspaces/database/ - # END: EXCLUDE_IN_RELEASE + # END: EXCLUDE_IN_RELEASE \ No newline at end of file diff --git a/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart b/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart index 5d15f27e75..4eaa893ae7 100644 --- a/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart +++ b/frontend/appflowy_flutter/test/bloc_test/home_test/view_bloc_test.dart @@ -113,7 +113,7 @@ void main() { section: ViewSectionPB.Public, ), ); - await blocResponseFuture(); + await blocResponseFuture(millisecond: 400); } expect(viewBloc.state.view.childViews.length, 3);