Skip to content

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.

fix: 0.8.1 launch review issues (#7186)

Lucas6173022a1536
diff --git a/frontend/appflowy_flutter/integration_test/desktop/command_palette/folder_search_test.dart b/frontend/appflowy_flutter/integration_test/desktop/command_palette/folder_search_test.dart
index 80c907b9e9..f84310c188 100644
--- a/frontend/appflowy_flutter/integration_test/desktop/command_palette/folder_search_test.dart
+++ b/frontend/appflowy_flutter/integration_test/desktop/command_palette/folder_search_test.dart
@@ -1,6 +1,9 @@
+import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/workspace/presentation/command_palette/command_palette.dart';
import 'package:appflowy/workspace/presentation/command_palette/widgets/search_field.dart';
import 'package:appflowy/workspace/presentation/command_palette/widgets/search_result_tile.dart';
+import 'package:appflowy_editor/appflowy_editor.dart';
+import 'package:easy_localization/easy_localization.dart';
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
@@ -49,5 +52,44 @@ void main() {
.widget(find.byType(SearchResultTile).first) as SearchResultTile;
expect(firstDocumentWidget.result.data, firstDocument);
});
+
+ testWidgets('select the content in document and search', (tester) async {
+ const firstDocument = ''; // empty document
+
+ await tester.initializeAppFlowy();
+ await tester.tapAnonymousSignInButton();
+
+ await tester.createNewPageWithNameUnderParent(name: firstDocument);
+ await tester.editor.updateSelection(
+ Selection(
+ start: Position(
+ path: [0],
+ ),
+ end: Position(
+ path: [0],
+ offset: 10,
+ ),
+ ),
+ );
+ await tester.pumpAndSettle();
+
+ expect(
+ find.byType(FloatingToolbar),
+ findsOneWidget,
+ );
+
+ await tester.toggleCommandPalette();
+ expect(find.byType(CommandPaletteModal), findsOneWidget);
+
+ expect(
+ find.text(LocaleKeys.menuAppHeader_defaultNewPageName.tr()),
+ findsOneWidget,
+ );
+
+ expect(
+ find.text(firstDocument),
+ findsOneWidget,
+ );
+ });
});
}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_view_tile.dart b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_view_tile.dart
index c4bc5aa845..deb401ea5c 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_view_tile.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/recent_view_tile.dart
@@ -1,12 +1,11 @@
-import 'package:appflowy/workspace/application/view/view_ext.dart';
-import 'package:flutter/material.dart';
-
import 'package:appflowy/startup/startup.dart';
import 'package:appflowy/workspace/application/action_navigation/action_navigation_bloc.dart';
import 'package:appflowy/workspace/application/action_navigation/navigation_action.dart';
+import 'package:appflowy/workspace/application/view/view_ext.dart';
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flowy_infra_ui/widget/spacing.dart';
+import 'package:flutter/material.dart';
class RecentViewTile extends StatelessWidget {
const RecentViewTile({
@@ -28,7 +27,10 @@ class RecentViewTile extends StatelessWidget {
children: [
icon,
const HSpace(6),
- FlowyText(view.nameOrDefault),
+ FlowyText(
+ view.nameOrDefault,
+ overflow: TextOverflow.ellipsis,
+ ),
],
),
focusColor: Theme.of(context).colorScheme.primary.withOpacity(0.1),
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_result_tile.dart b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_result_tile.dart
index 0edcde3664..1db18b77fb 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_result_tile.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/command_palette/widgets/search_result_tile.dart
@@ -1,8 +1,6 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/startup/startup.dart';
+import 'package:appflowy/util/string_extension.dart';
import 'package:appflowy/workspace/application/action_navigation/action_navigation_bloc.dart';
import 'package:appflowy/workspace/application/action_navigation/navigation_action.dart';
import 'package:appflowy/workspace/application/command_palette/search_result_ext.dart';
@@ -12,6 +10,8 @@ import 'package:flowy_infra/theme_extension.dart';
import 'package:flowy_infra_ui/style_widget/hover.dart';
import 'package:flowy_infra_ui/style_widget/text.dart';
import 'package:flowy_infra_ui/widget/spacing.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
class SearchResultTile extends StatefulWidget {
const SearchResultTile({
@@ -42,6 +42,9 @@ class _SearchResultTileState extends State<SearchResultTile> {
@override
Widget build(BuildContext context) {
+ final title = widget.result.data.orDefault(
+ LocaleKeys.menuAppHeader_defaultNewPageName.tr(),
+ );
final icon = widget.result.getIcon();
final cleanedPreview = _cleanPreview(widget.result.preview);
@@ -89,6 +92,7 @@ class _SearchResultTileState extends State<SearchResultTile> {
children: [
Row(
children: [
+ // page icon
if (icon != null) ...[
SizedBox(width: 24, child: icon),
const HSpace(6),
@@ -97,6 +101,7 @@ class _SearchResultTileState extends State<SearchResultTile> {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
+ // if the result is trashed, show a hint
if (widget.isTrashed) ...[
FlowyText(
LocaleKeys.commandPalette_fromTrashHint.tr(),
@@ -106,8 +111,9 @@ class _SearchResultTileState extends State<SearchResultTile> {
fontSize: 10,
),
],
+ // page title
FlowyText(
- widget.result.data,
+ title,
overflow: TextOverflow.ellipsis,
),
],
@@ -115,6 +121,7 @@ class _SearchResultTileState extends State<SearchResultTile> {
),
],
),
+ // content preview
if (cleanedPreview.isNotEmpty) ...[
const VSpace(4),
_DocumentPreview(preview: cleanedPreview),
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart
index f9af95ad73..6906dc8b73 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/home/menu/sidebar/sidebar.dart
@@ -4,6 +4,7 @@ import 'dart:io';
import 'package:appflowy/generated/flowy_svgs.g.dart';
import 'package:appflowy/generated/locale_keys.g.dart';
import 'package:appflowy/plugins/blank/blank.dart';
+import 'package:appflowy/plugins/document/presentation/editor_notification.dart';
import 'package:appflowy/shared/feature_flags.dart';
import 'package:appflowy/shared/loading.dart';
import 'package:appflowy/startup/startup.dart';
@@ -469,7 +470,11 @@ class _SidebarSearchButton extends StatelessWidget {
],
),
child: FlowyButton(
- onTap: () => CommandPalette.of(context).toggle(),
+ onTap: () {
+ // exit editing mode when doing search to avoid the toolbar showing up
+ EditorNotification.exitEditing().post();
+ CommandPalette.of(context).toggle();
+ },
leftIcon: const FlowySvg(FlowySvgs.search_s),
iconPadding: 12.0,
margin: const EdgeInsets.only(left: 8.0),
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_item.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_item.dart
index d075deabb0..2ac7814de4 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_item.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/pages/sites/domain/domain_item.dart
@@ -146,28 +146,30 @@ class _HomePageButton extends StatelessWidget {
return Row(
mainAxisSize: MainAxisSize.min,
children: [
- AppFlowyPopover(
- direction: PopoverDirection.bottomWithCenterAligned,
- constraints: const BoxConstraints(
- maxWidth: 260,
- maxHeight: 345,
- ),
- margin: const EdgeInsets.symmetric(
- horizontal: 14.0,
- vertical: 12.0,
+ Flexible(
+ child: AppFlowyPopover(
+ direction: PopoverDirection.bottomWithCenterAligned,
+ constraints: const BoxConstraints(
+ maxWidth: 260,
+ maxHeight: 345,
+ ),
+ margin: const EdgeInsets.symmetric(
+ horizontal: 14.0,
+ vertical: 12.0,
+ ),
+ popupBuilder: (_) {
+ final bloc = context.read<SettingsSitesBloc>();
+ return BlocProvider.value(
+ value: bloc,
+ child: SelectHomePageMenu(
+ userProfile: bloc.user,
+ workspaceId: bloc.workspaceId,
+ onSelected: (view) {},
+ ),
+ );
+ },
+ child: child,
),
- popupBuilder: (_) {
- final bloc = context.read<SettingsSitesBloc>();
- return BlocProvider.value(
- value: bloc,
- child: SelectHomePageMenu(
- userProfile: bloc.user,
- workspaceId: bloc.workspaceId,
- onSelected: (view) {},
- ),
- );
- },
- child: child,
),
if (homePageView != null)
FlowyTooltip(
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart
index 760f358ee2..84ba87144b 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/settings_dialog.dart
@@ -23,6 +23,7 @@ import 'package:appflowy/workspace/presentation/settings/widgets/feature_flags/f
import 'package:appflowy/workspace/presentation/settings/widgets/members/workspace_member_page.dart';
import 'package:appflowy/workspace/presentation/settings/widgets/settings_menu.dart';
import 'package:appflowy/workspace/presentation/settings/widgets/settings_notifications_view.dart';
+import 'package:appflowy/workspace/presentation/settings/widgets/web_url_hint_widget.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy_backend/log.dart';
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
@@ -306,6 +307,7 @@ class _SelfHostSettingsState extends State<_SelfHostSettings> {
textController: webUrlTextController,
title: LocaleKeys.settings_menu_webURL.tr(),
hintText: LocaleKeys.settings_menu_webURLHint.tr(),
+ hintBuilder: (context) => const WebUrlHintWidget(),
onSave: (url) => _saveUrl(
cloudUrl: cloudUrlTextController.text,
webUrl: url,
@@ -544,6 +546,7 @@ class _SelfHostUrlField extends StatelessWidget {
required this.hintText,
required this.onSave,
this.textFieldKey,
+ this.hintBuilder,
});
final TextEditingController textController;
@@ -551,6 +554,7 @@ class _SelfHostUrlField extends StatelessWidget {
final String hintText;
final ValueChanged<String> onSave;
final Key? textFieldKey;
+ final WidgetBuilder? hintBuilder;
@override
Widget build(BuildContext context) {
@@ -558,7 +562,7 @@ class _SelfHostUrlField extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
- FlowyText(title),
+ _buildHintWidget(context),
const VSpace(6.0),
SizedBox(
height: 36,
@@ -577,4 +581,16 @@ class _SelfHostUrlField extends StatelessWidget {
],
);
}
+
+ Widget _buildHintWidget(BuildContext context) {
+ return Row(
+ children: [
+ FlowyText(
+ title,
+ overflow: TextOverflow.ellipsis,
+ ),
+ hintBuilder?.call(context) ?? const SizedBox.shrink(),
+ ],
+ );
+ }
}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart
index 81d38dfe40..645c3daa65 100644
--- a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/setting_appflowy_cloud.dart
@@ -6,6 +6,7 @@ import 'package:appflowy/plugins/shared/share/constants.dart';
import 'package:appflowy/workspace/application/settings/appflowy_cloud_setting_bloc.dart';
import 'package:appflowy/workspace/application/settings/appflowy_cloud_urls_bloc.dart';
import 'package:appflowy/workspace/presentation/settings/widgets/_restart_app_button.dart';
+import 'package:appflowy/workspace/presentation/settings/widgets/web_url_hint_widget.dart';
import 'package:appflowy/workspace/presentation/widgets/dialogs.dart';
import 'package:appflowy/workspace/presentation/widgets/toggle/toggle.dart';
import 'package:appflowy_backend/dispatch/dispatch.dart';
@@ -153,6 +154,7 @@ class CustomAppFlowyCloudView extends StatelessWidget {
create: (context) => AppFlowyCloudSettingBloc(setting)
..add(const AppFlowyCloudSettingEvent.initial()),
child: Column(
+ mainAxisSize: MainAxisSize.min,
children: children,
),
);
@@ -178,8 +180,10 @@ class AppFlowyCloudURLs extends StatelessWidget {
child: BlocBuilder<AppFlowyCloudURLsBloc, AppFlowyCloudURLsState>(
builder: (context, state) {
return Column(
+ mainAxisSize: MainAxisSize.min,
children: [
const AppFlowySelfHostTip(),
+ const VSpace(12),
CloudURLInput(
title: LocaleKeys.settings_menu_cloudURL.tr(),
url: state.config.base_url,
@@ -197,6 +201,7 @@ class AppFlowyCloudURLs extends StatelessWidget {
title: LocaleKeys.settings_menu_webURL.tr(),
url: state.config.base_web_domain,
hint: LocaleKeys.settings_menu_webURLHint.tr(),
+ hintBuilder: (context) => const WebUrlHintWidget(),
onChanged: (text) {
context.read<AppFlowyCloudURLsBloc>().add(
AppFlowyCloudURLsEvent.updateBaseWebDomain(
@@ -205,7 +210,7 @@ class AppFlowyCloudURLs extends StatelessWidget {
);
},
),
- const VSpace(8),
+ const VSpace(12),
RestartButton(
onClick: () {
NavigatorAlertDialog(
@@ -274,12 +279,14 @@ class CloudURLInput extends StatefulWidget {
required this.url,
required this.hint,
required this.onChanged,
+ this.hintBuilder,
});
final String title;
final String url;
final String hint;
- final Function(String) onChanged;
+ final ValueChanged<String> onChanged;
+ final WidgetBuilder? hintBuilder;
@override
CloudURLInputState createState() => CloudURLInputState();
@@ -302,27 +309,55 @@ class CloudURLInputState extends State<CloudURLInput> {
@override
Widget build(BuildContext context) {
- return TextField(
- controller: _controller,
- style: const TextStyle(fontSize: 12.0),
- decoration: InputDecoration(
- contentPadding: const EdgeInsets.symmetric(vertical: 6),
- labelText: widget.title,
- labelStyle: Theme.of(context)
- .textTheme
- .titleMedium!
- .copyWith(fontWeight: FontWeight.w400, fontSize: 16),
- enabledBorder: UnderlineInputBorder(
- borderSide:
- BorderSide(color: AFThemeExtension.of(context).onBackground),
- ),
- focusedBorder: UnderlineInputBorder(
- borderSide: BorderSide(color: Theme.of(context).colorScheme.primary),
+ return Column(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ _buildHint(context),
+ SizedBox(
+ height: 28,
+ child: TextField(
+ controller: _controller,
+ style: Theme.of(context).textTheme.titleMedium!.copyWith(
+ fontSize: 14,
+ fontWeight: FontWeight.w400,
+ ),
+ decoration: InputDecoration(
+ enabledBorder: UnderlineInputBorder(
+ borderSide: BorderSide(
+ color: AFThemeExtension.of(context).onBackground,
+ ),
+ ),
+ focusedBorder: UnderlineInputBorder(
+ borderSide: BorderSide(
+ color: Theme.of(context).colorScheme.primary,
+ ),
+ ),
+ hintText: widget.hint,
+ errorText: context.read<AppFlowyCloudURLsBloc>().state.urlError,
+ ),
+ onChanged: widget.onChanged,
+ ),
),
- hintText: widget.hint,
- errorText: context.read<AppFlowyCloudURLsBloc>().state.urlError,
+ ],
+ );
+ }
+
+ Widget _buildHint(BuildContext context) {
+ final children = <Widget>[
+ FlowyText(
+ widget.title,
+ fontSize: 12,
),
- onChanged: widget.onChanged,
+ ];
+
+ if (widget.hintBuilder != null) {
+ children.add(widget.hintBuilder!(context));
+ }
+
+ return Row(
+ mainAxisSize: MainAxisSize.min,
+ children: children,
);
}
}
diff --git a/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/web_url_hint_widget.dart b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/web_url_hint_widget.dart
new file mode 100644
index 0000000000..ecf3cc7ef7
--- /dev/null
+++ b/frontend/appflowy_flutter/lib/workspace/presentation/settings/widgets/web_url_hint_widget.dart
@@ -0,0 +1,34 @@
+import 'package:appflowy/core/helpers/url_launcher.dart';
+import 'package:appflowy/generated/flowy_svgs.g.dart';
+import 'package:appflowy/generated/locale_keys.g.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flowy_infra_ui/style_widget/icon_button.dart';
+import 'package:flowy_infra_ui/widget/flowy_tooltip.dart';
+import 'package:flutter/material.dart';
+
+class WebUrlHintWidget extends StatelessWidget {
+ const WebUrlHintWidget({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ return Padding(
+ padding: const EdgeInsets.only(left: 2),
+ child: FlowyTooltip(
+ message: LocaleKeys.workspace_learnMore.tr(),
+ preferBelow: false,
+ child: FlowyIconButton(
+ width: 24,
+ height: 24,
+ icon: const FlowySvg(
+ FlowySvgs.information_s,
+ ),
+ onPressed: () {
+ afLaunchUrlString(
+ 'https://appflowy.com/docs/self-host-appflowy-run-appflowy-web',
+ );
+ },
+ ),
+ ),
+ );
+ }
+}
diff --git a/frontend/resources/translations/en.json b/frontend/resources/translations/en.json
index 0648d3442c..ffe5504f63 100644
--- a/frontend/resources/translations/en.json
+++ b/frontend/resources/translations/en.json
@@ -2567,7 +2567,7 @@
"image": "Image"
},
"commandPalette": {
- "placeholder": "Type to search...",
+ "placeholder": "Search or ask a question...",
"bestMatches": "Best matches",
"recentHistory": "Recent history",
"navigateHint": "to navigate",