mirror of
https://github.com/AppFlowy-IO/AppFlowy.git
synced 2024-08-30 18:12:39 +00:00
Merge branch 'main' into workspace-rename-icon
This commit is contained in:
Zack Fu Zi Xiang
commit
891543653d
@ -1,4 +1,3 @@
|
||||
import 'package:appflowy/workspace/application/settings/appearance/appearance_cubit.dart';
|
||||
import 'package:appflowy_editor/appflowy_editor.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
import 'package:integration_test/integration_test.dart';
|
||||
@ -10,7 +9,7 @@ void main() {
|
||||
|
||||
group('text direction', () {
|
||||
testWidgets(
|
||||
'''no text direction items will be displayed in the default/LTR mode,and three text direction items will be displayed in the RTL mode.''',
|
||||
'''no text direction items will be displayed in the default/LTR mode, and three text direction items will be displayed when toggle is enabled.''',
|
||||
(tester) async {
|
||||
// combine the two tests into one to avoid the time-consuming process of initializing the app
|
||||
await tester.initializeAppFlowy();
|
||||
@ -32,7 +31,7 @@ void main() {
|
||||
'toolbar/text_direction_ltr',
|
||||
'toolbar/text_direction_rtl',
|
||||
];
|
||||
// no text direction items in default/LTR mode
|
||||
// no text direction items by default
|
||||
var button = find.byWidgetPredicate(
|
||||
(widget) =>
|
||||
widget is SVGIconItemWidget &&
|
||||
@ -41,7 +40,7 @@ void main() {
|
||||
expect(button, findsNothing);
|
||||
|
||||
// switch to the RTL mode
|
||||
await tester.switchLayoutDirectionMode(LayoutDirection.rtlLayout);
|
||||
await tester.toggleEnableRTLToolbarItems();
|
||||
|
||||
await tester.editor.tapLineOfEditorAt(0);
|
||||
await tester.editor.updateSelection(selection);
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
import 'package:appflowy/generated/locale_keys.g.dart';
|
||||
import 'package:appflowy/workspace/application/settings/appearance/appearance_cubit.dart';
|
||||
import 'package:appflowy/workspace/application/settings/prelude.dart';
|
||||
import 'package:appflowy/workspace/presentation/home/menu/sidebar/sidebar_user.dart';
|
||||
import 'package:appflowy/workspace/presentation/settings/settings_dialog.dart';
|
||||
import 'package:appflowy/workspace/presentation/settings/widgets/settings_appearance/direction_setting.dart';
|
||||
import 'package:appflowy/workspace/presentation/settings/widgets/settings_menu_element.dart';
|
||||
import 'package:appflowy/workspace/presentation/settings/widgets/settings_user_view.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_test/flutter_test.dart';
|
||||
|
||||
import 'base.dart';
|
||||
@ -76,31 +75,15 @@ extension AppFlowySettings on WidgetTester {
|
||||
await pumpAndSettle();
|
||||
}
|
||||
|
||||
// go to settings page and switch the layout direction
|
||||
Future<void> switchLayoutDirectionMode(
|
||||
LayoutDirection layoutDirection,
|
||||
) async {
|
||||
// go to settings page and toggle enable RTL toolbar items
|
||||
Future<void> toggleEnableRTLToolbarItems() async {
|
||||
await openSettings();
|
||||
await openSettingsPage(SettingsPage.appearance);
|
||||
|
||||
final button = find.byKey(const ValueKey('layout_direction_option_button'));
|
||||
expect(button, findsOneWidget);
|
||||
await tapButton(button);
|
||||
|
||||
switch (layoutDirection) {
|
||||
case LayoutDirection.ltrLayout:
|
||||
final ltrButton = find.text(
|
||||
LocaleKeys.settings_appearance_layoutDirection_ltr.tr(),
|
||||
);
|
||||
await tapButton(ltrButton);
|
||||
break;
|
||||
case LayoutDirection.rtlLayout:
|
||||
final rtlButton = find.text(
|
||||
LocaleKeys.settings_appearance_layoutDirection_rtl.tr(),
|
||||
);
|
||||
await tapButton(rtlButton);
|
||||
break;
|
||||
}
|
||||
final switchButton =
|
||||
find.byKey(EnableRTLToolbarItemsSetting.enableRTLSwitchKey);
|
||||
expect(switchButton, findsOneWidget);
|
||||
await tapButton(switchButton);
|
||||
|
||||
// tap anywhere to close the settings page
|
||||
await tapAt(Offset.zero);
|
||||
|
||||
@ -127,11 +127,13 @@ Future<T?> showMobileBottomSheet<T>(
|
||||
children: [
|
||||
...children,
|
||||
Expanded(
|
||||
child: Scrollbar(
|
||||
child: SingleChildScrollView(
|
||||
controller: scrollController,
|
||||
child: child,
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
|
||||
@ -1,6 +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/mobile/presentation/bottom_sheet/bottom_sheet.dart';
|
||||
import 'package:appflowy/mobile/presentation/widgets/flowy_mobile_quick_action_button.dart';
|
||||
import 'package:appflowy/plugins/database/board/application/board_bloc.dart';
|
||||
import 'package:appflowy/plugins/database/grid/presentation/widgets/header/field_type_extension.dart';
|
||||
import 'package:appflowy_backend/protobuf/flowy-database2/field_entities.pbenum.dart';
|
||||
@ -8,7 +11,6 @@ import 'package:appflowy_backend/protobuf/flowy-database2/group.pb.dart';
|
||||
import 'package:appflowy_board/appflowy_board.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
|
||||
@ -107,16 +109,18 @@ class _GroupCardHeaderState extends State<GroupCardHeader> {
|
||||
splashRadius: 5,
|
||||
onPressed: () => showMobileBottomSheet(
|
||||
context,
|
||||
title: LocaleKeys.board_column_groupActions.tr(),
|
||||
showHeader: true,
|
||||
showCloseButton: true,
|
||||
builder: (_) {
|
||||
return Row(
|
||||
showDragHandle: true,
|
||||
backgroundColor: Theme.of(context).colorScheme.surface,
|
||||
builder: (_) => SeparatedColumn(
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
separatorBuilder: () => const Divider(
|
||||
height: 8.5,
|
||||
thickness: 0.5,
|
||||
),
|
||||
children: [
|
||||
Expanded(
|
||||
child: BottomSheetActionWidget(
|
||||
svg: FlowySvgs.edit_s,
|
||||
MobileQuickActionButton(
|
||||
text: LocaleKeys.board_column_renameColumn.tr(),
|
||||
icon: FlowySvgs.edit_s,
|
||||
onTap: () {
|
||||
context.read<BoardBloc>().add(
|
||||
BoardEvent.startEditingHeader(
|
||||
@ -126,12 +130,9 @@ class _GroupCardHeaderState extends State<GroupCardHeader> {
|
||||
context.pop();
|
||||
},
|
||||
),
|
||||
),
|
||||
const HSpace(8),
|
||||
Expanded(
|
||||
child: BottomSheetActionWidget(
|
||||
svg: FlowySvgs.hide_s,
|
||||
MobileQuickActionButton(
|
||||
text: LocaleKeys.board_column_hideColumn.tr(),
|
||||
icon: FlowySvgs.hide_s,
|
||||
onTap: () {
|
||||
context.read<BoardBloc>().add(
|
||||
BoardEvent.toggleGroupVisibility(
|
||||
@ -143,10 +144,8 @@ class _GroupCardHeaderState extends State<GroupCardHeader> {
|
||||
context.pop();
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
),
|
||||
IconButton(
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:appflowy/env/cloud_env.dart';
|
||||
import 'package:appflowy/generated/locale_keys.g.dart';
|
||||
import 'package:appflowy/mobile/presentation/bottom_sheet/bottom_sheet.dart';
|
||||
@ -5,10 +7,10 @@ import 'package:appflowy/startup/startup.dart';
|
||||
import 'package:appflowy/workspace/application/user/prelude.dart';
|
||||
import 'package:appflowy_backend/protobuf/flowy-user/protobuf.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../widgets/widgets.dart';
|
||||
|
||||
import 'personal_info.dart';
|
||||
|
||||
class PersonalInfoSettingGroup extends StatelessWidget {
|
||||
@ -34,7 +36,7 @@ class PersonalInfoSettingGroup extends StatelessWidget {
|
||||
settingItemList: [
|
||||
MobileSettingItem(
|
||||
name: userName,
|
||||
subtitle: isAuthEnabled
|
||||
subtitle: isAuthEnabled && userProfile.email.isNotEmpty
|
||||
? Text(
|
||||
userProfile.email,
|
||||
style: theme.textTheme.bodyMedium?.copyWith(
|
||||
|
||||
@ -7,16 +7,16 @@ class CalendarSize {
|
||||
static double get headerContainerPadding => 12 * scale;
|
||||
|
||||
static EdgeInsets get contentInsets => EdgeInsets.fromLTRB(
|
||||
GridSize.leadingHeaderPadding,
|
||||
GridSize.horizontalHeaderPadding,
|
||||
CalendarSize.headerContainerPadding,
|
||||
GridSize.leadingHeaderPadding,
|
||||
GridSize.horizontalHeaderPadding,
|
||||
CalendarSize.headerContainerPadding,
|
||||
);
|
||||
|
||||
static EdgeInsets get contentInsetsMobile => EdgeInsets.fromLTRB(
|
||||
GridSize.leadingHeaderPadding / 2,
|
||||
GridSize.horizontalHeaderPadding / 2,
|
||||
0,
|
||||
GridSize.leadingHeaderPadding / 2,
|
||||
GridSize.horizontalHeaderPadding / 2,
|
||||
0,
|
||||
);
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ class GridLayout {
|
||||
.reduce((value, element) => value + element);
|
||||
|
||||
return fieldsWidth +
|
||||
GridSize.leadingHeaderPadding +
|
||||
GridSize.horizontalHeaderPadding +
|
||||
GridSize.trailHeaderPadding;
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,19 +7,14 @@ class GridSize {
|
||||
static double get scrollBarSize => 8 * scale;
|
||||
static double get headerHeight => 40 * scale;
|
||||
static double get footerHeight => 40 * scale;
|
||||
static double get leadingHeaderPadding =>
|
||||
PlatformExtension.isDesktop ? 40 * scale : 20 * scale;
|
||||
static double get horizontalHeaderPadding =>
|
||||
PlatformExtension.isDesktop ? 40 * scale : 16 * scale;
|
||||
static double get trailHeaderPadding => 140 * scale;
|
||||
static double get headerContainerPadding => 0 * scale;
|
||||
static double get cellHPadding => 10 * scale;
|
||||
static double get cellVPadding => 10 * scale;
|
||||
static double get popoverItemHeight => 26 * scale;
|
||||
static double get typeOptionSeparatorHeight => 4 * scale;
|
||||
|
||||
static EdgeInsets get headerContentInsets => EdgeInsets.symmetric(
|
||||
horizontal: GridSize.headerContainerPadding,
|
||||
vertical: GridSize.headerContainerPadding,
|
||||
);
|
||||
static EdgeInsets get cellContentInsets => EdgeInsets.symmetric(
|
||||
horizontal: GridSize.cellHPadding,
|
||||
vertical: GridSize.cellVPadding,
|
||||
@ -36,18 +31,13 @@ class GridSize {
|
||||
const EdgeInsets.symmetric(horizontal: 8, vertical: 2);
|
||||
|
||||
static EdgeInsets get footerContentInsets => EdgeInsets.fromLTRB(
|
||||
GridSize.leadingHeaderPadding,
|
||||
GridSize.headerContainerPadding,
|
||||
PlatformExtension.isMobile
|
||||
? GridSize.leadingHeaderPadding
|
||||
: GridSize.headerContainerPadding,
|
||||
PlatformExtension.isMobile ? 100 : GridSize.headerContainerPadding,
|
||||
GridSize.horizontalHeaderPadding,
|
||||
0,
|
||||
PlatformExtension.isMobile ? GridSize.horizontalHeaderPadding : 0,
|
||||
PlatformExtension.isMobile ? 100 : 0,
|
||||
);
|
||||
|
||||
static EdgeInsets get contentInsets => EdgeInsets.fromLTRB(
|
||||
GridSize.leadingHeaderPadding,
|
||||
GridSize.headerContainerPadding,
|
||||
GridSize.leadingHeaderPadding,
|
||||
GridSize.headerContainerPadding,
|
||||
static EdgeInsets get contentInsets => EdgeInsets.symmetric(
|
||||
horizontal: GridSize.horizontalHeaderPadding,
|
||||
);
|
||||
}
|
||||
|
||||
@ -157,12 +157,14 @@ class _GridPageContentState extends State<GridPageContent> {
|
||||
final _scrollController = GridScrollController(
|
||||
scrollGroupController: LinkedScrollControllerGroup(),
|
||||
);
|
||||
late final ScrollController headerScrollController;
|
||||
late final ScrollController contentScrollController;
|
||||
late final ScrollController reorderableController;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
headerScrollController = _scrollController.linkHorizontalController();
|
||||
contentScrollController = _scrollController.linkHorizontalController();
|
||||
reorderableController = _scrollController.linkHorizontalController();
|
||||
}
|
||||
|
||||
@override
|
||||
@ -196,7 +198,8 @@ class _GridPageContentState extends State<GridPageContent> {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
_GridHeader(
|
||||
headerScrollController: headerScrollController,
|
||||
contentScrollController: contentScrollController,
|
||||
reorderableController: reorderableController,
|
||||
),
|
||||
_GridRows(
|
||||
viewId: widget.view.id,
|
||||
@ -205,8 +208,8 @@ class _GridPageContentState extends State<GridPageContent> {
|
||||
],
|
||||
),
|
||||
Positioned(
|
||||
bottom: 20,
|
||||
right: 20,
|
||||
bottom: 16,
|
||||
right: 16,
|
||||
child: getGridFabs(context),
|
||||
),
|
||||
],
|
||||
@ -216,9 +219,13 @@ class _GridPageContentState extends State<GridPageContent> {
|
||||
}
|
||||
|
||||
class _GridHeader extends StatelessWidget {
|
||||
const _GridHeader({required this.headerScrollController});
|
||||
const _GridHeader({
|
||||
required this.contentScrollController,
|
||||
required this.reorderableController,
|
||||
});
|
||||
|
||||
final ScrollController headerScrollController;
|
||||
final ScrollController contentScrollController;
|
||||
final ScrollController reorderableController;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@ -226,7 +233,8 @@ class _GridHeader extends StatelessWidget {
|
||||
builder: (context, state) {
|
||||
return MobileGridHeader(
|
||||
viewId: state.viewId,
|
||||
anchorScrollController: headerScrollController,
|
||||
contentScrollController: contentScrollController,
|
||||
reorderableController: reorderableController,
|
||||
);
|
||||
},
|
||||
);
|
||||
@ -247,7 +255,7 @@ class _GridRows extends StatelessWidget {
|
||||
return BlocBuilder<GridBloc, GridState>(
|
||||
buildWhen: (previous, current) => previous.fields != current.fields,
|
||||
builder: (context, state) {
|
||||
final double contentWidth = _getContentWidth(state.fields);
|
||||
final double contentWidth = getMobileGridContentWidth(state.fields);
|
||||
return Expanded(
|
||||
child: _WrapScrollView(
|
||||
scrollController: scrollController,
|
||||
@ -277,14 +285,6 @@ class _GridRows extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
|
||||
double _getContentWidth(List<FieldInfo> fields) {
|
||||
final visibleFields = fields.where(
|
||||
(field) =>
|
||||
field.fieldSettings?.visibility != FieldVisibility.AlwaysHidden,
|
||||
);
|
||||
return (visibleFields.length + 1) * 200 + GridSize.leadingHeaderPadding * 2;
|
||||
}
|
||||
|
||||
Widget _renderList(
|
||||
BuildContext context,
|
||||
GridState state,
|
||||
@ -438,3 +438,11 @@ class _AddRowButton extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
double getMobileGridContentWidth(List<FieldInfo> fields) {
|
||||
final visibleFields = fields.where(
|
||||
(field) => field.fieldSettings?.visibility != FieldVisibility.AlwaysHidden,
|
||||
);
|
||||
return (visibleFields.length + 1) * 200 +
|
||||
GridSize.horizontalHeaderPadding * 2;
|
||||
}
|
||||
|
||||
@ -139,7 +139,7 @@ class _GridHeaderState extends State<_GridHeader> {
|
||||
}
|
||||
|
||||
Widget _cellLeading() {
|
||||
return SizedBox(width: GridSize.leadingHeaderPadding);
|
||||
return SizedBox(width: GridSize.horizontalHeaderPadding);
|
||||
}
|
||||
}
|
||||
|
||||
@ -158,7 +158,6 @@ class _CellTrailing extends StatelessWidget {
|
||||
bottom: BorderSide(color: Theme.of(context).dividerColor),
|
||||
),
|
||||
),
|
||||
padding: GridSize.headerContentInsets,
|
||||
child: CreateFieldButton(
|
||||
viewId: viewId,
|
||||
onFieldCreated: (fieldId) => context
|
||||
|
||||
@ -13,17 +13,22 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../layout/sizes.dart';
|
||||
import '../../mobile_grid_page.dart';
|
||||
import 'mobile_field_button.dart';
|
||||
|
||||
const double _kGridHeaderHeight = 50.0;
|
||||
|
||||
class MobileGridHeader extends StatefulWidget {
|
||||
const MobileGridHeader({
|
||||
super.key,
|
||||
required this.viewId,
|
||||
required this.anchorScrollController,
|
||||
required this.contentScrollController,
|
||||
required this.reorderableController,
|
||||
});
|
||||
|
||||
final String viewId;
|
||||
final ScrollController anchorScrollController;
|
||||
final ScrollController contentScrollController;
|
||||
final ScrollController reorderableController;
|
||||
|
||||
@override
|
||||
State<MobileGridHeader> createState() => _MobileGridHeaderState();
|
||||
@ -41,30 +46,46 @@ class _MobileGridHeaderState extends State<MobileGridHeader> {
|
||||
fieldController: fieldController,
|
||||
)..add(const GridHeaderEvent.initial());
|
||||
},
|
||||
child: SingleChildScrollView(
|
||||
child: Stack(
|
||||
children: [
|
||||
BlocBuilder<GridHeaderBloc, GridHeaderState>(
|
||||
builder: (context, state) {
|
||||
return SingleChildScrollView(
|
||||
scrollDirection: Axis.horizontal,
|
||||
controller: widget.anchorScrollController,
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
controller: widget.contentScrollController,
|
||||
child: Stack(
|
||||
children: [
|
||||
HSpace(GridSize.leadingHeaderPadding),
|
||||
Stack(
|
||||
children: [
|
||||
Positioned(top: 0, left: 24, right: 24, child: _divider()),
|
||||
Positioned(bottom: 0, left: 0, right: 0, child: _divider()),
|
||||
Positioned(
|
||||
top: 0,
|
||||
left: GridSize.horizontalHeaderPadding + 24,
|
||||
right: GridSize.horizontalHeaderPadding + 24,
|
||||
child: _divider(),
|
||||
),
|
||||
Positioned(
|
||||
bottom: 0,
|
||||
left: GridSize.horizontalHeaderPadding,
|
||||
right: GridSize.horizontalHeaderPadding,
|
||||
child: _divider(),
|
||||
),
|
||||
SizedBox(
|
||||
height: 50,
|
||||
height: _kGridHeaderHeight,
|
||||
width: getMobileGridContentWidth(state.fields),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
},
|
||||
),
|
||||
SizedBox(
|
||||
height: _kGridHeaderHeight,
|
||||
child: _GridHeader(
|
||||
viewId: widget.viewId,
|
||||
fieldController: fieldController,
|
||||
scrollController: widget.reorderableController,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const HSpace(20),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@ -81,10 +102,12 @@ class _GridHeader extends StatefulWidget {
|
||||
const _GridHeader({
|
||||
required this.viewId,
|
||||
required this.fieldController,
|
||||
required this.scrollController,
|
||||
});
|
||||
|
||||
final String viewId;
|
||||
final FieldController fieldController;
|
||||
final ScrollController scrollController;
|
||||
|
||||
@override
|
||||
State<_GridHeader> createState() => _GridHeaderState();
|
||||
@ -114,13 +137,16 @@ class _GridHeaderState extends State<_GridHeader> {
|
||||
.toList();
|
||||
|
||||
return ReorderableListView.builder(
|
||||
scrollController: ScrollController(),
|
||||
scrollController: widget.scrollController,
|
||||
shrinkWrap: true,
|
||||
scrollDirection: Axis.horizontal,
|
||||
proxyDecorator: (child, index, anim) => Material(
|
||||
color: Colors.transparent,
|
||||
child: child,
|
||||
),
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: GridSize.horizontalHeaderPadding,
|
||||
),
|
||||
header: firstField != null
|
||||
? MobileFieldButton.first(
|
||||
viewId: widget.viewId,
|
||||
|
||||
@ -68,7 +68,7 @@ class _MobileGridRowState extends State<MobileGridRow> {
|
||||
builder: (context, state) {
|
||||
return Row(
|
||||
children: [
|
||||
SizedBox(width: GridSize.leadingHeaderPadding),
|
||||
SizedBox(width: GridSize.horizontalHeaderPadding),
|
||||
Expanded(
|
||||
child: RowContent(
|
||||
fieldController: widget.databaseController.fieldController,
|
||||
@ -163,7 +163,6 @@ class RowContent extends StatelessWidget {
|
||||
Widget _finalCellDecoration(BuildContext context) {
|
||||
return Container(
|
||||
width: 200,
|
||||
padding: GridSize.headerContentInsets,
|
||||
constraints: const BoxConstraints(minHeight: 46),
|
||||
decoration: BoxDecoration(
|
||||
border: Border(
|
||||
|
||||
@ -115,7 +115,7 @@ class _RowLeadingState extends State<_RowLeading> {
|
||||
child: Consumer<RegionStateNotifier>(
|
||||
builder: (context, state, _) {
|
||||
return SizedBox(
|
||||
width: GridSize.leadingHeaderPadding,
|
||||
width: GridSize.horizontalHeaderPadding,
|
||||
child: state.onEnter ? _activeWidget() : null,
|
||||
);
|
||||
},
|
||||
@ -283,7 +283,6 @@ class RowContent extends StatelessWidget {
|
||||
cursor: SystemMouseCursors.basic,
|
||||
child: Container(
|
||||
width: GridSize.trailHeaderPadding,
|
||||
padding: GridSize.headerContentInsets,
|
||||
constraints: const BoxConstraints(minHeight: 46),
|
||||
decoration: BoxDecoration(
|
||||
border: Border(
|
||||
|
||||
@ -57,7 +57,7 @@ class _DatabaseViewSettingContent extends StatelessWidget {
|
||||
builder: (context, state) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: GridSize.leadingHeaderPadding,
|
||||
horizontal: GridSize.horizontalHeaderPadding,
|
||||
),
|
||||
child: DecoratedBox(
|
||||
decoration: BoxDecoration(
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:appflowy/generated/flowy_svgs.g.dart';
|
||||
@ -21,8 +22,11 @@ class TabBarHeader extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return SizedBox(
|
||||
return Container(
|
||||
height: 30,
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: GridSize.horizontalHeaderPadding,
|
||||
),
|
||||
child: Stack(
|
||||
children: [
|
||||
Positioned(
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:appflowy/generated/flowy_svgs.g.dart';
|
||||
import 'package:appflowy/mobile/presentation/bottom_sheet/show_transition_bottom_sheet.dart';
|
||||
import 'package:appflowy/mobile/presentation/database/view/database_view_list.dart';
|
||||
import 'package:appflowy/plugins/base/emoji/emoji_text.dart';
|
||||
import 'package:appflowy/plugins/database/application/tab_bar_bloc.dart';
|
||||
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
|
||||
import 'package:appflowy/plugins/database/widgets/setting/mobile_database_controls.dart';
|
||||
import 'package:appflowy/workspace/application/view/view_bloc.dart';
|
||||
import 'package:appflowy/workspace/application/view/view_ext.dart';
|
||||
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import '../../grid/presentation/grid_page.dart';
|
||||
@ -26,11 +27,14 @@ class _MobileTabBarHeaderState extends State<MobileTabBarHeader> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(top: 14.0),
|
||||
padding: EdgeInsets.only(
|
||||
left: GridSize.horizontalHeaderPadding,
|
||||
top: 14.0,
|
||||
right: GridSize.horizontalHeaderPadding - 5.0,
|
||||
),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
HSpace(GridSize.leadingHeaderPadding),
|
||||
const _DatabaseViewSelectorButton(),
|
||||
const Spacer(),
|
||||
BlocBuilder<DatabaseTabBarBloc, DatabaseTabBarState>(
|
||||
|
||||
@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:appflowy/plugins/database/application/database_controller.dart';
|
||||
import 'package:appflowy/plugins/database/application/tab_bar_bloc.dart';
|
||||
import 'package:appflowy/plugins/database/grid/presentation/layout/sizes.dart';
|
||||
import 'package:appflowy/plugins/database/widgets/share_button.dart';
|
||||
import 'package:appflowy/plugins/util.dart';
|
||||
import 'package:appflowy/startup/plugin/plugin.dart';
|
||||
@ -112,19 +111,9 @@ class _DatabaseTabBarViewState extends State<DatabaseTabBarView> {
|
||||
return const SizedBox.shrink();
|
||||
}
|
||||
|
||||
if (PlatformExtension.isDesktop) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.symmetric(
|
||||
horizontal: GridSize.leadingHeaderPadding,
|
||||
),
|
||||
child: const TabBarHeader(),
|
||||
);
|
||||
} else {
|
||||
return const Padding(
|
||||
padding: EdgeInsets.only(right: 8),
|
||||
child: MobileTabBarHeader(),
|
||||
);
|
||||
}
|
||||
return PlatformExtension.isDesktop
|
||||
? const TabBarHeader()
|
||||
: const MobileTabBarHeader();
|
||||
},
|
||||
);
|
||||
},
|
||||
|
||||
@ -259,7 +259,9 @@ class _AppFlowyEditorPageState extends State<AppFlowyEditorPage> {
|
||||
LayoutDirection.rtlLayout;
|
||||
final textDirection = isRTL ? TextDirection.rtl : TextDirection.ltr;
|
||||
|
||||
_setRTLToolbarItems(isRTL);
|
||||
_setRTLToolbarItems(
|
||||
context.read<AppearanceSettingsCubit>().state.enableRtlToolbarItems,
|
||||
);
|
||||
|
||||
final editor = Directionality(
|
||||
textDirection: textDirection,
|
||||
@ -412,12 +414,12 @@ class _AppFlowyEditorPageState extends State<AppFlowyEditorPage> {
|
||||
);
|
||||
}
|
||||
|
||||
void _setRTLToolbarItems(bool isRTL) {
|
||||
void _setRTLToolbarItems(bool enableRtlToolbarItems) {
|
||||
final textDirectionItemIds = textDirectionItems.map((e) => e.id);
|
||||
// clear all the text direction items
|
||||
toolbarItems.removeWhere((item) => textDirectionItemIds.contains(item.id));
|
||||
// only show the rtl item when the layout direction is ltr.
|
||||
if (isRTL) {
|
||||
if (enableRtlToolbarItems) {
|
||||
toolbarItems.addAll(textDirectionItems);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,10 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_date_block.dart';
|
||||
import 'package:appflowy/plugins/document/presentation/editor_plugins/mention/mention_page_block.dart';
|
||||
import 'package:appflowy/workspace/presentation/widgets/date_picker/widgets/reminder_selector.dart';
|
||||
import 'package:appflowy_editor/appflowy_editor.dart';
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
enum MentionType {
|
||||
|
||||
@ -141,7 +141,7 @@ class EditorMigration {
|
||||
}
|
||||
const backgroundColor = 'backgroundColor';
|
||||
if (attributes.containsKey(backgroundColor)) {
|
||||
attributes[AppFlowyRichTextKeys.highlightColor] =
|
||||
attributes[AppFlowyRichTextKeys.backgroundColor] =
|
||||
attributes[backgroundColor];
|
||||
attributes.remove(backgroundColor);
|
||||
}
|
||||
|
||||
@ -11,6 +11,9 @@ Future<T?> showEditLinkBottomSheet<T>(
|
||||
return showMobileBottomSheet(
|
||||
context,
|
||||
showHeader: false,
|
||||
showCloseButton: false,
|
||||
showDragHandle: true,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
builder: (context) {
|
||||
return MobileBottomSheetEditLinkWidget(
|
||||
text: text,
|
||||
|
||||
@ -71,7 +71,8 @@ class BIUSItems extends StatelessWidget {
|
||||
setState(() {});
|
||||
},
|
||||
icon: icon,
|
||||
isSelected: editorState.isTextDecorationSelected(richTextKey),
|
||||
isSelected: editorState.isTextDecorationSelected(richTextKey) &&
|
||||
editorState.toggledStyle[richTextKey] != false,
|
||||
iconPadding: const EdgeInsets.symmetric(
|
||||
vertical: 14.0,
|
||||
),
|
||||
|
||||
@ -68,7 +68,7 @@ class BlockItems extends StatelessWidget {
|
||||
enableTopRightRadius: false,
|
||||
enableBottomRightRadius: false,
|
||||
onTap: () async {
|
||||
await editorState.convertBlockType(blockType);
|
||||
await _convert(blockType);
|
||||
},
|
||||
backgroundColor: theme.toolbarMenuItemBackgroundColor,
|
||||
icon: icon,
|
||||
@ -196,4 +196,23 @@ class BlockItems extends StatelessWidget {
|
||||
);
|
||||
editorState.service.keyboardService?.closeKeyboard();
|
||||
}
|
||||
|
||||
Future<void> _convert(String blockType) async {
|
||||
await editorState.convertBlockType(
|
||||
blockType,
|
||||
selectionExtraInfo: {
|
||||
selectionExtraInfoDoNotAttachTextService: true,
|
||||
selectionExtraInfoDisableFloatingToolbar: true,
|
||||
},
|
||||
);
|
||||
unawaited(
|
||||
editorState.updateSelectionWithReason(
|
||||
editorState.selection,
|
||||
extraInfo: {
|
||||
selectionExtraInfoDisableFloatingToolbar: true,
|
||||
selectionExtraInfoDoNotAttachTextService: true,
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -20,6 +20,8 @@ class ColorItem extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = ToolbarColorExtension.of(context);
|
||||
final selectedBackgroundColor = _getBackgroundColor(context);
|
||||
|
||||
return MobileToolbarMenuItemWrapper(
|
||||
size: const Size(82, 52),
|
||||
onTap: () async {
|
||||
@ -42,10 +44,11 @@ class ColorItem extends StatelessWidget {
|
||||
);
|
||||
},
|
||||
icon: FlowySvgs.m_aa_color_s,
|
||||
backgroundColor: theme.toolbarMenuItemBackgroundColor,
|
||||
isSelected: false,
|
||||
backgroundColor:
|
||||
selectedBackgroundColor ?? theme.toolbarMenuItemBackgroundColor,
|
||||
selectedBackgroundColor: selectedBackgroundColor,
|
||||
isSelected: selectedBackgroundColor != null,
|
||||
showRightArrow: true,
|
||||
enable: editorState.selection?.isCollapsed == false,
|
||||
iconPadding: const EdgeInsets.only(
|
||||
top: 14.0,
|
||||
bottom: 14.0,
|
||||
@ -53,4 +56,33 @@ class ColorItem extends StatelessWidget {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Color? _getBackgroundColor(BuildContext context) {
|
||||
final selection = editorState.selection;
|
||||
if (selection == null) {
|
||||
return null;
|
||||
}
|
||||
String? backgroundColor =
|
||||
editorState.toggledStyle[AppFlowyRichTextKeys.backgroundColor];
|
||||
if (backgroundColor == null) {
|
||||
if (selection.isCollapsed && selection.startIndex != 0) {
|
||||
backgroundColor = editorState.getDeltaAttributeValueInSelection<String>(
|
||||
AppFlowyRichTextKeys.backgroundColor,
|
||||
selection.copyWith(
|
||||
start: selection.start.copyWith(
|
||||
offset: selection.startIndex - 1,
|
||||
),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
backgroundColor = editorState.getDeltaAttributeValueInSelection<String>(
|
||||
AppFlowyRichTextKeys.backgroundColor,
|
||||
);
|
||||
}
|
||||
}
|
||||
if (backgroundColor != null && int.tryParse(backgroundColor) != null) {
|
||||
return Color(int.parse(backgroundColor));
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -63,16 +63,9 @@ class _TextColorAndBackgroundColorState
|
||||
extends State<_TextColorAndBackgroundColor> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final String? selectedTextColor =
|
||||
widget.editorState.getDeltaAttributeValueInSelection(
|
||||
AppFlowyRichTextKeys.textColor,
|
||||
widget.selection,
|
||||
);
|
||||
final String? selectedTextColor = _getColor(AppFlowyRichTextKeys.textColor);
|
||||
final String? selectedBackgroundColor =
|
||||
widget.editorState.getDeltaAttributeValueInSelection(
|
||||
AppFlowyRichTextKeys.highlightColor,
|
||||
widget.selection,
|
||||
);
|
||||
_getColor(AppFlowyRichTextKeys.backgroundColor);
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
@ -90,6 +83,13 @@ class _TextColorAndBackgroundColorState
|
||||
selectedColor: selectedTextColor?.tryToColor(),
|
||||
onSelectedColor: (textColor) async {
|
||||
final hex = textColor.alpha == 0 ? null : textColor.toHex();
|
||||
final selection = widget.selection;
|
||||
if (selection.isCollapsed) {
|
||||
widget.editorState.updateToggledStyle(
|
||||
AppFlowyRichTextKeys.textColor,
|
||||
hex ?? '',
|
||||
);
|
||||
} else {
|
||||
await widget.editorState.formatDelta(
|
||||
widget.selection,
|
||||
{
|
||||
@ -101,6 +101,7 @@ class _TextColorAndBackgroundColorState
|
||||
selectionExtraInfoDoNotAttachTextService: true,
|
||||
},
|
||||
);
|
||||
}
|
||||
setState(() {});
|
||||
},
|
||||
),
|
||||
@ -119,10 +120,17 @@ class _TextColorAndBackgroundColorState
|
||||
onSelectedColor: (backgroundColor) async {
|
||||
final hex =
|
||||
backgroundColor.alpha == 0 ? null : backgroundColor.toHex();
|
||||
final selection = widget.selection;
|
||||
if (selection.isCollapsed) {
|
||||
widget.editorState.updateToggledStyle(
|
||||
AppFlowyRichTextKeys.backgroundColor,
|
||||
hex ?? '',
|
||||
);
|
||||
} else {
|
||||
await widget.editorState.formatDelta(
|
||||
widget.selection,
|
||||
{
|
||||
AppFlowyRichTextKeys.highlightColor: hex,
|
||||
AppFlowyRichTextKeys.backgroundColor: hex,
|
||||
},
|
||||
selectionExtraInfo: {
|
||||
selectionExtraInfoDisableFloatingToolbar: true,
|
||||
@ -130,12 +138,35 @@ class _TextColorAndBackgroundColorState
|
||||
selectionExtraInfoDoNotAttachTextService: true,
|
||||
},
|
||||
);
|
||||
}
|
||||
setState(() {});
|
||||
},
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
String? _getColor(String key) {
|
||||
final selection = widget.selection;
|
||||
String? color = widget.editorState.toggledStyle[key];
|
||||
if (color == null) {
|
||||
if (selection.isCollapsed && selection.startIndex != 0) {
|
||||
color = widget.editorState.getDeltaAttributeValueInSelection<String>(
|
||||
key,
|
||||
selection.copyWith(
|
||||
start: selection.start.copyWith(
|
||||
offset: selection.startIndex - 1,
|
||||
),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
color = widget.editorState.getDeltaAttributeValueInSelection<String>(
|
||||
key,
|
||||
);
|
||||
}
|
||||
}
|
||||
return color;
|
||||
}
|
||||
}
|
||||
|
||||
class _BackgroundColors extends StatelessWidget {
|
||||
|
||||
@ -1,13 +1,12 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
import 'package:appflowy/mobile/presentation/setting/font/font_picker_screen.dart';
|
||||
import 'package:appflowy/plugins/document/application/document_appearance_cubit.dart';
|
||||
import 'package:appflowy/plugins/document/presentation/editor_plugins/mobile_toolbar_v3/_toolbar_theme.dart';
|
||||
import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.dart';
|
||||
import 'package:appflowy/util/google_font_family_extension.dart';
|
||||
import 'package:appflowy_editor/appflowy_editor.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
@ -23,15 +22,16 @@ class FontFamilyItem extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = ToolbarColorExtension.of(context);
|
||||
final fontFamily = editorState.getDeltaAttributeValueInSelection<String>(
|
||||
AppFlowyRichTextKeys.fontFamily,
|
||||
);
|
||||
final fontFamily = _getCurrentSelectedFontFamilyName();
|
||||
final systemFonFamily =
|
||||
context.read<DocumentAppearanceCubit>().state.fontFamily;
|
||||
return MobileToolbarMenuItemWrapper(
|
||||
size: const Size(144, 52),
|
||||
onTap: () async {
|
||||
final selection = editorState.selection;
|
||||
if (selection == null) {
|
||||
return;
|
||||
}
|
||||
// disable the floating toolbar
|
||||
unawaited(
|
||||
editorState.updateSelectionWithReason(
|
||||
@ -46,12 +46,17 @@ class FontFamilyItem extends StatelessWidget {
|
||||
final newFont = await context
|
||||
.read<GoRouter>()
|
||||
.push<String>(FontPickerScreen.routeName);
|
||||
if (newFont != null && newFont != fontFamily) {
|
||||
|
||||
// if the selection is not collapsed, apply the font to the selection.
|
||||
if (newFont != null && !selection.isCollapsed) {
|
||||
if (newFont != fontFamily) {
|
||||
await editorState.formatDelta(selection, {
|
||||
AppFlowyRichTextKeys.fontFamily:
|
||||
GoogleFonts.getFont(newFont).fontFamily,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// wait for the font picker screen to be dismissed.
|
||||
Future.delayed(const Duration(milliseconds: 250), () {
|
||||
// highlight the selected text again.
|
||||
@ -62,13 +67,20 @@ class FontFamilyItem extends StatelessWidget {
|
||||
selectionExtraInfoDisableMobileToolbarKey: false,
|
||||
},
|
||||
);
|
||||
// if the selection is collapsed, save the font for the next typing.
|
||||
if (newFont != null && selection.isCollapsed) {
|
||||
editorState.updateToggledStyle(
|
||||
AppFlowyRichTextKeys.fontFamily,
|
||||
GoogleFonts.getFont(newFont).fontFamily,
|
||||
);
|
||||
}
|
||||
});
|
||||
},
|
||||
text: (fontFamily ?? systemFonFamily).parseFontFamilyName(),
|
||||
fontFamily: fontFamily ?? systemFonFamily,
|
||||
backgroundColor: theme.toolbarMenuItemBackgroundColor,
|
||||
isSelected: false,
|
||||
enable: editorState.selection?.isCollapsed == false,
|
||||
enable: true,
|
||||
showRightArrow: true,
|
||||
iconPadding: const EdgeInsets.only(
|
||||
top: 14.0,
|
||||
@ -81,4 +93,28 @@ class FontFamilyItem extends StatelessWidget {
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
String? _getCurrentSelectedFontFamilyName() {
|
||||
final toggleFontFamily =
|
||||
editorState.toggledStyle[AppFlowyRichTextKeys.fontFamily];
|
||||
if (toggleFontFamily is String && toggleFontFamily.isNotEmpty) {
|
||||
return toggleFontFamily;
|
||||
}
|
||||
final selection = editorState.selection;
|
||||
if (selection != null &&
|
||||
selection.isCollapsed &&
|
||||
selection.startIndex != 0) {
|
||||
return editorState.getDeltaAttributeValueInSelection<String>(
|
||||
AppFlowyRichTextKeys.fontFamily,
|
||||
selection.copyWith(
|
||||
start: selection.start.copyWith(
|
||||
offset: selection.startIndex - 1,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
return editorState.getDeltaAttributeValueInSelection<String>(
|
||||
AppFlowyRichTextKeys.fontFamily,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,6 +15,7 @@ final aaToolbarItem = AppFlowyMobileToolbarItem(
|
||||
pilotAtExpandedSelection: true,
|
||||
itemBuilder: (context, editorState, service, onMenu, _) {
|
||||
return AppFlowyMobileToolbarIconItem(
|
||||
editorState: editorState,
|
||||
isSelected: () => service.showMenuNotifier.value,
|
||||
keepSelectedStatus: true,
|
||||
icon: FlowySvgs.m_toolbar_aa_s,
|
||||
|
||||
@ -18,6 +18,7 @@ import 'package:go_router/go_router.dart';
|
||||
final addBlockToolbarItem = AppFlowyMobileToolbarItem(
|
||||
itemBuilder: (context, editorState, service, __, onAction) {
|
||||
return AppFlowyMobileToolbarIconItem(
|
||||
editorState: editorState,
|
||||
icon: FlowySvgs.m_toolbar_add_s,
|
||||
onTap: () {
|
||||
final selection = editorState.selection;
|
||||
@ -83,7 +84,7 @@ Future<bool?> showAddBlockMenu(
|
||||
}
|
||||
|
||||
class _AddBlockMenu extends StatelessWidget {
|
||||
_AddBlockMenu({
|
||||
const _AddBlockMenu({
|
||||
required this.selection,
|
||||
required this.editorState,
|
||||
});
|
||||
@ -91,25 +92,47 @@ class _AddBlockMenu extends StatelessWidget {
|
||||
final Selection selection;
|
||||
final EditorState editorState;
|
||||
|
||||
late final List<TypeOptionMenuItemValue<String>> typeOptionMenuItemValue = [
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return TypeOptionMenu<String>(
|
||||
values: buildTypeOptionMenuItemValues(context),
|
||||
scaleFactor: context.scale,
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _insertBlock(Node node) async {
|
||||
AppGlobals.rootNavKey.currentContext?.pop(true);
|
||||
Future.delayed(const Duration(milliseconds: 100), () {
|
||||
editorState.insertBlockAfterCurrentSelection(
|
||||
selection,
|
||||
node,
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
List<TypeOptionMenuItemValue<String>> buildTypeOptionMenuItemValues(
|
||||
BuildContext context,
|
||||
) {
|
||||
final colorMap = _colorMap(context);
|
||||
return [
|
||||
// heading 1 - 3
|
||||
TypeOptionMenuItemValue(
|
||||
value: HeadingBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFBAC9FF),
|
||||
backgroundColor: colorMap[HeadingBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_heading1.tr(),
|
||||
icon: FlowySvgs.m_add_block_h1_s,
|
||||
onTap: (_, __) => _insertBlock(headingNode(level: 1)),
|
||||
),
|
||||
TypeOptionMenuItemValue(
|
||||
value: HeadingBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFBAC9FF),
|
||||
backgroundColor: colorMap[HeadingBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_heading2.tr(),
|
||||
icon: FlowySvgs.m_add_block_h2_s,
|
||||
onTap: (_, __) => _insertBlock(headingNode(level: 2)),
|
||||
),
|
||||
TypeOptionMenuItemValue(
|
||||
value: HeadingBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFBAC9FF),
|
||||
backgroundColor: colorMap[HeadingBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_heading3.tr(),
|
||||
icon: FlowySvgs.m_add_block_h3_s,
|
||||
onTap: (_, __) => _insertBlock(headingNode(level: 3)),
|
||||
@ -118,7 +141,7 @@ class _AddBlockMenu extends StatelessWidget {
|
||||
// paragraph
|
||||
TypeOptionMenuItemValue(
|
||||
value: ParagraphBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFBAC9FF),
|
||||
backgroundColor: colorMap[ParagraphBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_text.tr(),
|
||||
icon: FlowySvgs.m_add_block_paragraph_s,
|
||||
onTap: (_, __) => _insertBlock(paragraphNode()),
|
||||
@ -127,7 +150,7 @@ class _AddBlockMenu extends StatelessWidget {
|
||||
// checkbox
|
||||
TypeOptionMenuItemValue(
|
||||
value: TodoListBlockKeys.type,
|
||||
backgroundColor: const Color(0xFF98F4CD),
|
||||
backgroundColor: colorMap[TodoListBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_checkbox.tr(),
|
||||
icon: FlowySvgs.m_add_block_checkbox_s,
|
||||
onTap: (_, __) => _insertBlock(todoListNode(checked: false)),
|
||||
@ -136,7 +159,7 @@ class _AddBlockMenu extends StatelessWidget {
|
||||
// quote
|
||||
TypeOptionMenuItemValue(
|
||||
value: QuoteBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFFDEDA7),
|
||||
backgroundColor: colorMap[QuoteBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_quote.tr(),
|
||||
icon: FlowySvgs.m_add_block_quote_s,
|
||||
onTap: (_, __) => _insertBlock(quoteNode()),
|
||||
@ -145,21 +168,21 @@ class _AddBlockMenu extends StatelessWidget {
|
||||
// bulleted list, numbered list, toggle list
|
||||
TypeOptionMenuItemValue(
|
||||
value: BulletedListBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFFFB9EF),
|
||||
backgroundColor: colorMap[BulletedListBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_bulletedListShortForm.tr(),
|
||||
icon: FlowySvgs.m_add_block_bulleted_list_s,
|
||||
onTap: (_, __) => _insertBlock(bulletedListNode()),
|
||||
),
|
||||
TypeOptionMenuItemValue(
|
||||
value: NumberedListBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFFFB9EF),
|
||||
backgroundColor: colorMap[NumberedListBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_numberedListShortForm.tr(),
|
||||
icon: FlowySvgs.m_add_block_numbered_list_s,
|
||||
onTap: (_, __) => _insertBlock(numberedListNode()),
|
||||
),
|
||||
TypeOptionMenuItemValue(
|
||||
value: ToggleListBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFFFB9EF),
|
||||
backgroundColor: colorMap[ToggleListBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_toggleListShortForm.tr(),
|
||||
icon: FlowySvgs.m_add_block_toggle_s,
|
||||
onTap: (_, __) => _insertBlock(toggleListBlockNode()),
|
||||
@ -167,8 +190,8 @@ class _AddBlockMenu extends StatelessWidget {
|
||||
|
||||
// image
|
||||
TypeOptionMenuItemValue(
|
||||
value: DividerBlockKeys.type,
|
||||
backgroundColor: const Color(0xFF98F4CD),
|
||||
value: ImageBlockKeys.type,
|
||||
backgroundColor: colorMap[ImageBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_image.tr(),
|
||||
icon: FlowySvgs.m_add_block_image_s,
|
||||
onTap: (_, __) async {
|
||||
@ -183,7 +206,7 @@ class _AddBlockMenu extends StatelessWidget {
|
||||
// date
|
||||
TypeOptionMenuItemValue(
|
||||
value: ParagraphBlockKeys.type,
|
||||
backgroundColor: const Color(0xFF91EAF5),
|
||||
backgroundColor: colorMap['date']!,
|
||||
text: LocaleKeys.editor_date.tr(),
|
||||
icon: FlowySvgs.m_add_block_date_s,
|
||||
onTap: (_, __) => _insertBlock(dateMentionNode()),
|
||||
@ -192,7 +215,7 @@ class _AddBlockMenu extends StatelessWidget {
|
||||
// divider
|
||||
TypeOptionMenuItemValue(
|
||||
value: DividerBlockKeys.type,
|
||||
backgroundColor: const Color(0xFF98F4CD),
|
||||
backgroundColor: colorMap[DividerBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_divider.tr(),
|
||||
icon: FlowySvgs.m_add_block_divider_s,
|
||||
onTap: (_, __) {
|
||||
@ -206,21 +229,21 @@ class _AddBlockMenu extends StatelessWidget {
|
||||
// callout, code, math equation
|
||||
TypeOptionMenuItemValue(
|
||||
value: CalloutBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFCABDFF),
|
||||
backgroundColor: colorMap[CalloutBlockKeys.type]!,
|
||||
text: LocaleKeys.document_plugins_callout.tr(),
|
||||
icon: FlowySvgs.m_add_block_callout_s,
|
||||
onTap: (_, __) => _insertBlock(calloutNode()),
|
||||
),
|
||||
TypeOptionMenuItemValue(
|
||||
value: CodeBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFCABDFF),
|
||||
backgroundColor: colorMap[CodeBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_codeBlockShortForm.tr(),
|
||||
icon: FlowySvgs.m_add_block_code_s,
|
||||
onTap: (_, __) => _insertBlock(codeBlockNode()),
|
||||
),
|
||||
TypeOptionMenuItemValue(
|
||||
value: MathEquationBlockKeys.type,
|
||||
backgroundColor: const Color(0xFFCABDFF),
|
||||
backgroundColor: colorMap[MathEquationBlockKeys.type]!,
|
||||
text: LocaleKeys.editor_mathEquationShortForm.tr(),
|
||||
icon: FlowySvgs.m_add_block_formula_s,
|
||||
onTap: (_, __) {
|
||||
@ -231,23 +254,42 @@ class _AddBlockMenu extends StatelessWidget {
|
||||
},
|
||||
),
|
||||
];
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return TypeOptionMenu<String>(
|
||||
values: typeOptionMenuItemValue,
|
||||
scaleFactor: context.scale,
|
||||
);
|
||||
}
|
||||
|
||||
Future<void> _insertBlock(Node node) async {
|
||||
AppGlobals.rootNavKey.currentContext?.pop(true);
|
||||
Future.delayed(const Duration(milliseconds: 100), () {
|
||||
editorState.insertBlockAfterCurrentSelection(
|
||||
selection,
|
||||
node,
|
||||
);
|
||||
});
|
||||
Map<String, Color> _colorMap(BuildContext context) {
|
||||
final isDarkMode = Theme.of(context).brightness == Brightness.dark;
|
||||
if (isDarkMode) {
|
||||
return {
|
||||
HeadingBlockKeys.type: const Color(0xFF5465A1),
|
||||
ParagraphBlockKeys.type: const Color(0xFF5465A1),
|
||||
TodoListBlockKeys.type: const Color(0xFF4BB299),
|
||||
QuoteBlockKeys.type: const Color(0xFFBAAC74),
|
||||
BulletedListBlockKeys.type: const Color(0xFFA35F94),
|
||||
NumberedListBlockKeys.type: const Color(0xFFA35F94),
|
||||
ToggleListBlockKeys.type: const Color(0xFFA35F94),
|
||||
ImageBlockKeys.type: const Color(0xFFBAAC74),
|
||||
'date': const Color(0xFF40AAB8),
|
||||
DividerBlockKeys.type: const Color(0xFF4BB299),
|
||||
CalloutBlockKeys.type: const Color(0xFF66599B),
|
||||
CodeBlockKeys.type: const Color(0xFF66599B),
|
||||
MathEquationBlockKeys.type: const Color(0xFF66599B),
|
||||
};
|
||||
}
|
||||
return {
|
||||
HeadingBlockKeys.type: const Color(0xFFBECCFF),
|
||||
ParagraphBlockKeys.type: const Color(0xFFBECCFF),
|
||||
TodoListBlockKeys.type: const Color(0xFF98F4CD),
|
||||
QuoteBlockKeys.type: const Color(0xFFFDEDA7),
|
||||
BulletedListBlockKeys.type: const Color(0xFFFFB9EF),
|
||||
NumberedListBlockKeys.type: const Color(0xFFFFB9EF),
|
||||
ToggleListBlockKeys.type: const Color(0xFFFFB9EF),
|
||||
ImageBlockKeys.type: const Color(0xFFFDEDA7),
|
||||
'date': const Color(0xFF91EAF5),
|
||||
DividerBlockKeys.type: const Color(0xFF98F4CD),
|
||||
CalloutBlockKeys.type: const Color(0xFFCABDFF),
|
||||
CodeBlockKeys.type: const Color(0xFFCABDFF),
|
||||
MathEquationBlockKeys.type: const Color(0xFFCABDFF),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -270,6 +270,11 @@ class _MobileToolbarState extends State<_MobileToolbar>
|
||||
widget.editorState.selection = null;
|
||||
}
|
||||
|
||||
// if the menu is shown and the height is not 0, we need to close the menu
|
||||
if (showMenuNotifier.value && height != 0) {
|
||||
closeItemMenu();
|
||||
}
|
||||
|
||||
if (canUpdateCachedKeyboardHeight) {
|
||||
cachedKeyboardHeight.value = height;
|
||||
}
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
import 'dart:async';
|
||||
|
||||
import 'package:appflowy/generated/flowy_svgs.g.dart';
|
||||
import 'package:appflowy/plugins/document/presentation/editor_plugins/mobile_toolbar_v3/_toolbar_theme.dart';
|
||||
import 'package:appflowy/plugins/document/presentation/editor_plugins/mobile_toolbar_v3/appflowy_mobile_toolbar.dart';
|
||||
@ -42,7 +44,9 @@ class AppFlowyMobileToolbarIconItem extends StatefulWidget {
|
||||
this.keepSelectedStatus = false,
|
||||
this.iconBuilder,
|
||||
this.isSelected,
|
||||
this.shouldListenToToggledStyle = false,
|
||||
required this.onTap,
|
||||
required this.editorState,
|
||||
});
|
||||
|
||||
final FlowySvgData? icon;
|
||||
@ -50,6 +54,8 @@ class AppFlowyMobileToolbarIconItem extends StatefulWidget {
|
||||
final VoidCallback onTap;
|
||||
final WidgetBuilder? iconBuilder;
|
||||
final bool Function()? isSelected;
|
||||
final bool shouldListenToToggledStyle;
|
||||
final EditorState editorState;
|
||||
|
||||
@override
|
||||
State<AppFlowyMobileToolbarIconItem> createState() =>
|
||||
@ -59,12 +65,28 @@ class AppFlowyMobileToolbarIconItem extends StatefulWidget {
|
||||
class _AppFlowyMobileToolbarIconItemState
|
||||
extends State<AppFlowyMobileToolbarIconItem> {
|
||||
bool isSelected = false;
|
||||
StreamSubscription? _subscription;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
|
||||
isSelected = widget.isSelected?.call() ?? false;
|
||||
if (widget.shouldListenToToggledStyle) {
|
||||
widget.editorState.toggledStyleNotifier.addListener(_rebuild);
|
||||
_subscription = widget.editorState.transactionStream.listen((_) {
|
||||
_rebuild();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
if (widget.shouldListenToToggledStyle) {
|
||||
widget.editorState.toggledStyleNotifier.removeListener(_rebuild);
|
||||
_subscription?.cancel();
|
||||
}
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
@ -85,15 +107,7 @@ class _AppFlowyMobileToolbarIconItemState
|
||||
behavior: HitTestBehavior.opaque,
|
||||
onTap: () {
|
||||
widget.onTap();
|
||||
if (widget.keepSelectedStatus && widget.isSelected == null) {
|
||||
setState(() {
|
||||
isSelected = !isSelected;
|
||||
});
|
||||
} else {
|
||||
setState(() {
|
||||
isSelected = widget.isSelected?.call() ?? false;
|
||||
});
|
||||
}
|
||||
_rebuild();
|
||||
},
|
||||
child: Container(
|
||||
width: 48,
|
||||
@ -111,4 +125,12 @@ class _AppFlowyMobileToolbarIconItemState
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
void _rebuild() {
|
||||
setState(() {
|
||||
isSelected = (widget.keepSelectedStatus && widget.isSelected == null)
|
||||
? !isSelected
|
||||
: widget.isSelected?.call() ?? false;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,9 +6,13 @@ import 'package:appflowy_editor/appflowy_editor.dart';
|
||||
final boldToolbarItem = AppFlowyMobileToolbarItem(
|
||||
itemBuilder: (context, editorState, _, __, onAction) {
|
||||
return AppFlowyMobileToolbarIconItem(
|
||||
isSelected: () => editorState.isTextDecorationSelected(
|
||||
editorState: editorState,
|
||||
shouldListenToToggledStyle: true,
|
||||
isSelected: () =>
|
||||
editorState.isTextDecorationSelected(
|
||||
AppFlowyRichTextKeys.bold,
|
||||
),
|
||||
) &&
|
||||
editorState.toggledStyle[AppFlowyRichTextKeys.bold] != false,
|
||||
icon: FlowySvgs.m_toolbar_bold_s,
|
||||
onTap: () async => editorState.toggleAttribute(
|
||||
AppFlowyRichTextKeys.bold,
|
||||
@ -23,7 +27,8 @@ final boldToolbarItem = AppFlowyMobileToolbarItem(
|
||||
final italicToolbarItem = AppFlowyMobileToolbarItem(
|
||||
itemBuilder: (context, editorState, _, __, onAction) {
|
||||
return AppFlowyMobileToolbarIconItem(
|
||||
// keepSelectedStatus: true,
|
||||
editorState: editorState,
|
||||
shouldListenToToggledStyle: true,
|
||||
isSelected: () => editorState.isTextDecorationSelected(
|
||||
AppFlowyRichTextKeys.italic,
|
||||
),
|
||||
@ -41,6 +46,8 @@ final italicToolbarItem = AppFlowyMobileToolbarItem(
|
||||
final underlineToolbarItem = AppFlowyMobileToolbarItem(
|
||||
itemBuilder: (context, editorState, _, __, onAction) {
|
||||
return AppFlowyMobileToolbarIconItem(
|
||||
editorState: editorState,
|
||||
shouldListenToToggledStyle: true,
|
||||
isSelected: () => editorState.isTextDecorationSelected(
|
||||
AppFlowyRichTextKeys.underline,
|
||||
),
|
||||
@ -58,6 +65,8 @@ final underlineToolbarItem = AppFlowyMobileToolbarItem(
|
||||
final colorToolbarItem = AppFlowyMobileToolbarItem(
|
||||
itemBuilder: (context, editorState, service, __, onAction) {
|
||||
return AppFlowyMobileToolbarIconItem(
|
||||
editorState: editorState,
|
||||
shouldListenToToggledStyle: true,
|
||||
icon: FlowySvgs.m_toolbar_color_s,
|
||||
onTap: () {
|
||||
service.closeKeyboard();
|
||||
|
||||
@ -6,6 +6,8 @@ final todoListToolbarItem = AppFlowyMobileToolbarItem(
|
||||
itemBuilder: (context, editorState, _, __, onAction) {
|
||||
final isSelected = editorState.isBlockTypeSelected(TodoListBlockKeys.type);
|
||||
return AppFlowyMobileToolbarIconItem(
|
||||
editorState: editorState,
|
||||
shouldListenToToggledStyle: true,
|
||||
keepSelectedStatus: true,
|
||||
isSelected: () => isSelected,
|
||||
icon: FlowySvgs.m_toolbar_checkbox_s,
|
||||
|
||||
@ -4,6 +4,7 @@ import 'package:appflowy/plugins/document/presentation/editor_plugins/plugins.da
|
||||
final moreToolbarItem = AppFlowyMobileToolbarItem(
|
||||
itemBuilder: (context, editorState, _, __, onAction) {
|
||||
return AppFlowyMobileToolbarIconItem(
|
||||
editorState: editorState,
|
||||
icon: FlowySvgs.m_toolbar_more_s,
|
||||
onTap: () {},
|
||||
);
|
||||
|
||||
@ -8,6 +8,7 @@ final undoToolbarItem = AppFlowyMobileToolbarItem(
|
||||
itemBuilder: (context, editorState, _, __, onAction) {
|
||||
final theme = ToolbarColorExtension.of(context);
|
||||
return AppFlowyMobileToolbarIconItem(
|
||||
editorState: editorState,
|
||||
iconBuilder: (context) {
|
||||
final canUndo = editorState.undoManager.undoStack.isNonEmpty;
|
||||
return FlowySvg(
|
||||
@ -26,6 +27,7 @@ final redoToolbarItem = AppFlowyMobileToolbarItem(
|
||||
itemBuilder: (context, editorState, _, __, onAction) {
|
||||
final theme = ToolbarColorExtension.of(context);
|
||||
return AppFlowyMobileToolbarIconItem(
|
||||
editorState: editorState,
|
||||
iconBuilder: (context) {
|
||||
final canRedo = editorState.undoManager.redoStack.isNonEmpty;
|
||||
return FlowySvg(
|
||||
|
||||
@ -11,6 +11,7 @@ class MobileToolbarMenuItemWrapper extends StatelessWidget {
|
||||
this.icon,
|
||||
this.text,
|
||||
this.backgroundColor,
|
||||
this.selectedBackgroundColor,
|
||||
this.enable,
|
||||
this.fontFamily,
|
||||
required this.isSelected,
|
||||
@ -40,6 +41,7 @@ class MobileToolbarMenuItemWrapper extends StatelessWidget {
|
||||
final bool showDownArrow;
|
||||
final bool showRightArrow;
|
||||
final Color? backgroundColor;
|
||||
final Color? selectedBackgroundColor;
|
||||
final EdgeInsets textPadding;
|
||||
|
||||
@override
|
||||
@ -90,7 +92,8 @@ class MobileToolbarMenuItemWrapper extends StatelessWidget {
|
||||
alignment: text != null ? Alignment.centerLeft : Alignment.center,
|
||||
decoration: BoxDecoration(
|
||||
color: isSelected
|
||||
? theme.toolbarMenuItemSelectedBackgroundColor
|
||||
? (selectedBackgroundColor ??
|
||||
theme.toolbarMenuItemSelectedBackgroundColor)
|
||||
: backgroundColor,
|
||||
borderRadius: BorderRadius.only(
|
||||
topLeft: enableTopLeftRadius ? radius : Radius.zero,
|
||||
|
||||
@ -42,6 +42,7 @@ class AppearanceSettingsCubit extends Cubit<AppearanceSettingsState> {
|
||||
appearanceSettings.monospaceFont,
|
||||
appearanceSettings.layoutDirection,
|
||||
appearanceSettings.textDirection,
|
||||
appearanceSettings.enableRtlToolbarItems,
|
||||
appearanceSettings.locale,
|
||||
appearanceSettings.isMenuCollapsed,
|
||||
appearanceSettings.menuOffset,
|
||||
@ -134,6 +135,12 @@ class AppearanceSettingsCubit extends Cubit<AppearanceSettingsState> {
|
||||
emit(state.copyWith(textDirection: textDirection));
|
||||
}
|
||||
|
||||
void setEnableRTLToolbarItems(bool value) {
|
||||
_appearanceSettings.enableRtlToolbarItems = value;
|
||||
_saveAppearanceSettings();
|
||||
emit(state.copyWith(enableRtlToolbarItems: value));
|
||||
}
|
||||
|
||||
/// Update selected font in the user's settings and emit an updated state
|
||||
/// with the font name.
|
||||
void setFontFamily(String fontFamilyName) {
|
||||
@ -365,6 +372,7 @@ class AppearanceSettingsState with _$AppearanceSettingsState {
|
||||
required String monospaceFont,
|
||||
required LayoutDirection layoutDirection,
|
||||
required AppFlowyTextDirection? textDirection,
|
||||
required bool enableRtlToolbarItems,
|
||||
required Locale locale,
|
||||
required bool isMenuCollapsed,
|
||||
required double menuOffset,
|
||||
@ -383,6 +391,7 @@ class AppearanceSettingsState with _$AppearanceSettingsState {
|
||||
String monospaceFont,
|
||||
LayoutDirectionPB layoutDirectionPB,
|
||||
TextDirectionPB? textDirectionPB,
|
||||
bool enableRtlToolbarItems,
|
||||
LocaleSettingsPB localePB,
|
||||
bool isMenuCollapsed,
|
||||
double menuOffset,
|
||||
@ -399,6 +408,7 @@ class AppearanceSettingsState with _$AppearanceSettingsState {
|
||||
monospaceFont: monospaceFont,
|
||||
layoutDirection: LayoutDirection.fromLayoutDirectionPB(layoutDirectionPB),
|
||||
textDirection: AppFlowyTextDirection.fromTextDirectionPB(textDirectionPB),
|
||||
enableRtlToolbarItems: enableRtlToolbarItems,
|
||||
themeMode: _themeModeFromPB(themeModePB),
|
||||
locale: Locale(localePB.languageCode, localePB.countryCode),
|
||||
isMenuCollapsed: isMenuCollapsed,
|
||||
|
||||
@ -1,5 +1,3 @@
|
||||
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';
|
||||
@ -7,6 +5,7 @@ import 'package:appflowy/workspace/application/settings/appearance/appearance_cu
|
||||
import 'package:appflowy_popover/appflowy_popover.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
|
||||
import 'theme_setting_entry_template.dart';
|
||||
@ -26,7 +25,6 @@ class LayoutDirectionSetting extends StatelessWidget {
|
||||
hint: LocaleKeys.settings_appearance_layoutDirection_hint.tr(),
|
||||
trailing: [
|
||||
FlowySettingValueDropDown(
|
||||
key: const ValueKey('layout_direction_option_button'),
|
||||
currentValue: _layoutDirectionLabelText(currentLayoutDirection),
|
||||
popupBuilder: (context) => Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
@ -142,3 +140,34 @@ class TextDirectionSetting extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class EnableRTLToolbarItemsSetting extends StatelessWidget {
|
||||
const EnableRTLToolbarItemsSetting({
|
||||
super.key,
|
||||
});
|
||||
|
||||
static const enableRTLSwitchKey = ValueKey('enable_rtl_toolbar_items_switch');
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return FlowySettingListTile(
|
||||
label: LocaleKeys.settings_appearance_enableRTLToolbarItems.tr(),
|
||||
trailing: [
|
||||
Switch(
|
||||
key: enableRTLSwitchKey,
|
||||
value: context
|
||||
.read<AppearanceSettingsCubit>()
|
||||
.state
|
||||
.enableRtlToolbarItems,
|
||||
splashRadius: 0,
|
||||
activeColor: Theme.of(context).colorScheme.primary,
|
||||
onChanged: (value) {
|
||||
context
|
||||
.read<AppearanceSettingsCubit>()
|
||||
.setEnableRTLToolbarItems(value);
|
||||
},
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -53,6 +53,7 @@ class SettingsAppearanceView extends StatelessWidget {
|
||||
TextDirectionSetting(
|
||||
currentTextDirection: state.textDirection,
|
||||
),
|
||||
const EnableRTLToolbarItemsSetting(),
|
||||
const Divider(),
|
||||
DateFormatSetting(
|
||||
currentFormat: state.dateFormat,
|
||||
|
||||
@ -8,7 +8,6 @@ import 'package:appflowy/workspace/presentation/widgets/more_view_actions/widget
|
||||
import 'package:appflowy/workspace/presentation/widgets/more_view_actions/widgets/font_size_action.dart';
|
||||
import 'package:appflowy/workspace/presentation/widgets/more_view_actions/widgets/view_meta_info.dart';
|
||||
import 'package:appflowy_backend/protobuf/flowy-folder/view.pb.dart';
|
||||
import 'package:appflowy_backend/protobuf/flowy-user/date_time.pbenum.dart';
|
||||
import 'package:appflowy_popover/appflowy_popover.dart';
|
||||
import 'package:easy_localization/easy_localization.dart';
|
||||
import 'package:flowy_infra_ui/flowy_infra_ui.dart';
|
||||
@ -35,13 +34,11 @@ class MoreViewActions extends StatefulWidget {
|
||||
|
||||
class _MoreViewActionsState extends State<MoreViewActions> {
|
||||
late final List<Widget> viewActions;
|
||||
late final UserDateFormatPB dateFormat;
|
||||
final popoverMutex = PopoverMutex();
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
dateFormat = context.read<AppearanceSettingsCubit>().state.dateFormat;
|
||||
viewActions = ViewActionType.values
|
||||
.map(
|
||||
(type) => ViewAction(
|
||||
@ -61,11 +58,15 @@ class _MoreViewActionsState extends State<MoreViewActions> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final appearanceSettings = context.watch<AppearanceSettingsCubit>().state;
|
||||
final dateFormat = appearanceSettings.dateFormat;
|
||||
final timeFormat = appearanceSettings.timeFormat;
|
||||
|
||||
return BlocBuilder<ViewInfoBloc, ViewInfoState>(
|
||||
builder: (context, state) {
|
||||
return AppFlowyPopover(
|
||||
mutex: popoverMutex,
|
||||
constraints: BoxConstraints.loose(const Size(200, 400)),
|
||||
constraints: BoxConstraints.loose(const Size(210, 400)),
|
||||
offset: const Offset(0, 30),
|
||||
popupBuilder: (_) {
|
||||
final actions = [
|
||||
@ -79,6 +80,7 @@ class _MoreViewActionsState extends State<MoreViewActions> {
|
||||
const Divider(height: 4),
|
||||
ViewMetaInfo(
|
||||
dateFormat: dateFormat,
|
||||
timeFormat: timeFormat,
|
||||
documentCounters: state.documentCounters,
|
||||
createdAt: state.createdAt,
|
||||
),
|
||||
|
||||
@ -12,11 +12,13 @@ class ViewMetaInfo extends StatelessWidget {
|
||||
const ViewMetaInfo({
|
||||
super.key,
|
||||
required this.dateFormat,
|
||||
required this.timeFormat,
|
||||
this.documentCounters,
|
||||
this.createdAt,
|
||||
});
|
||||
|
||||
final UserDateFormatPB dateFormat;
|
||||
final UserTimeFormatPB timeFormat;
|
||||
final Counters? documentCounters;
|
||||
final DateTime? createdAt;
|
||||
|
||||
@ -47,8 +49,9 @@ class ViewMetaInfo extends StatelessWidget {
|
||||
if (documentCounters != null) const VSpace(2),
|
||||
FlowyText.regular(
|
||||
LocaleKeys.moreAction_createdAt.tr(
|
||||
args: [dateFormat.formatDate(createdAt!, false)],
|
||||
args: [dateFormat.formatDate(createdAt!, true, timeFormat)],
|
||||
),
|
||||
maxLines: 2,
|
||||
color: Theme.of(context).hintColor,
|
||||
),
|
||||
],
|
||||
|
||||
@ -53,8 +53,8 @@ packages:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
path: "."
|
||||
ref: "9d90053"
|
||||
resolved-ref: "9d9005366ba8383e93029c4f2f006f9ff8d1cb08"
|
||||
ref: d4d35c0
|
||||
resolved-ref: d4d35c0d103a5d1bddf68181fcfaf9f75b0fccb5
|
||||
url: "https://github.com/AppFlowy-IO/appflowy-editor.git"
|
||||
source: git
|
||||
version: "2.3.2"
|
||||
|
||||
@ -167,7 +167,7 @@ dependency_overrides:
|
||||
appflowy_editor:
|
||||
git:
|
||||
url: https://github.com/AppFlowy-IO/appflowy-editor.git
|
||||
ref: "9d90053"
|
||||
ref: "d4d35c0"
|
||||
|
||||
sheet:
|
||||
git:
|
||||
|
||||
@ -106,6 +106,13 @@ export const useFiltersCount = () => {
|
||||
);
|
||||
};
|
||||
|
||||
export function useStaticTypeOption<T>(fieldId: string) {
|
||||
const context = useContext(DatabaseContext);
|
||||
const typeOptions = context.typeOptions;
|
||||
|
||||
return typeOptions[fieldId] as T;
|
||||
}
|
||||
|
||||
export function useTypeOption<T>(fieldId: string) {
|
||||
const context = useContext(DatabaseContext);
|
||||
const typeOptions = useSnapshot(context.typeOptions);
|
||||
|
||||
@ -15,6 +15,7 @@ import ExpandRecordModal from '$app/components/database/components/edit_record/E
|
||||
import { subscribeNotifications } from '$app/application/notification';
|
||||
import { Page } from '$app_reducers/pages/slice';
|
||||
import { getPage } from '$app/application/folder/page.service';
|
||||
import './database.scss';
|
||||
|
||||
interface Props {
|
||||
selectedViewId?: string;
|
||||
|
||||
@ -8,9 +8,11 @@ interface Props {
|
||||
|
||||
export const DatabaseCollection = ({ open }: Props) => {
|
||||
return (
|
||||
<div className={`flex items-center gap-2 px-16 ${!open ? 'hidden' : 'py-3'}`}>
|
||||
<div className={`database-collection w-full px-[64px] ${!open ? 'hidden' : 'py-3'}`}>
|
||||
<div className={'flex w-full items-center gap-2 overflow-x-auto overflow-y-hidden '}>
|
||||
<Sorts />
|
||||
<Filters />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
import React, { FC, useMemo, useState } from 'react';
|
||||
import {
|
||||
Filter as FilterType,
|
||||
Field as FieldData,
|
||||
UndeterminedFilter,
|
||||
TextFilterData,
|
||||
SelectFilterData,
|
||||
NumberFilterData,
|
||||
CheckboxFilterData,
|
||||
ChecklistFilterData,
|
||||
DateFilterData,
|
||||
Field as FieldData,
|
||||
Filter as FilterType,
|
||||
NumberFilterData,
|
||||
SelectFilterData,
|
||||
TextFilterData,
|
||||
UndeterminedFilter,
|
||||
} from '$app/application/database';
|
||||
import { Chip, Popover } from '@mui/material';
|
||||
import { Property } from '$app/components/database/components/property';
|
||||
import { ReactComponent as DropDownSvg } from '$app/assets/dropdown.svg';
|
||||
import TextFilter from './text_filter/TextFilter';
|
||||
import { FieldType } from '@/services/backend';
|
||||
import { CheckboxFilterConditionPB, ChecklistFilterConditionPB, FieldType } from '@/services/backend';
|
||||
import FilterActions from '$app/components/database/components/filter/FilterActions';
|
||||
import { updateFilter } from '$app/application/database/filter/filter_service';
|
||||
import { useViewId } from '$app/hooks';
|
||||
@ -22,6 +22,11 @@ import SelectFilter from './select_filter/SelectFilter';
|
||||
|
||||
import DateFilter from '$app/components/database/components/filter/date_filter/DateFilter';
|
||||
import FilterConditionSelect from '$app/components/database/components/filter/FilterConditionSelect';
|
||||
import TextFilterValue from '$app/components/database/components/filter/text_filter/TextFilterValue';
|
||||
import SelectFilterValue from '$app/components/database/components/filter/select_filter/SelectFilterValue';
|
||||
import NumberFilterValue from '$app/components/database/components/filter/number_filter/NumberFilterValue';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import DateFilterValue from '$app/components/database/components/filter/date_filter/DateFilterValue';
|
||||
|
||||
interface Props {
|
||||
filter: FilterType;
|
||||
@ -57,6 +62,7 @@ const getFilterComponent = (field: FieldData) => {
|
||||
|
||||
function Filter({ filter, field }: Props) {
|
||||
const viewId = useViewId();
|
||||
const { t } = useTranslation();
|
||||
const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
|
||||
const open = Boolean(anchorEl);
|
||||
const handleClick = (e: React.MouseEvent<HTMLElement>) => {
|
||||
@ -70,7 +76,10 @@ function Filter({ filter, field }: Props) {
|
||||
const onDataChange = async (data: UndeterminedFilter['data']) => {
|
||||
const newFilter = {
|
||||
...filter,
|
||||
data,
|
||||
data: {
|
||||
...(filter.data || {}),
|
||||
...data,
|
||||
},
|
||||
} as UndeterminedFilter;
|
||||
|
||||
try {
|
||||
@ -105,14 +114,42 @@ function Filter({ filter, field }: Props) {
|
||||
}
|
||||
}, [field, filter]);
|
||||
|
||||
const conditionValue = useMemo(() => {
|
||||
switch (field.type) {
|
||||
case FieldType.RichText:
|
||||
case FieldType.URL:
|
||||
return <TextFilterValue data={filter.data as TextFilterData} />;
|
||||
case FieldType.SingleSelect:
|
||||
case FieldType.MultiSelect:
|
||||
return <SelectFilterValue data={filter.data as SelectFilterData} fieldId={field.id} />;
|
||||
case FieldType.Number:
|
||||
return <NumberFilterValue data={filter.data as NumberFilterData} />;
|
||||
case FieldType.Checkbox:
|
||||
return (filter.data as CheckboxFilterData).condition === CheckboxFilterConditionPB.IsChecked
|
||||
? t('grid.checkboxFilter.isChecked')
|
||||
: t('grid.checkboxFilter.isUnchecked');
|
||||
case FieldType.Checklist:
|
||||
return (filter.data as ChecklistFilterData).condition === ChecklistFilterConditionPB.IsComplete
|
||||
? t('grid.checklistFilter.isComplete')
|
||||
: t('grid.checklistFilter.isIncomplted');
|
||||
case FieldType.DateTime:
|
||||
case FieldType.LastEditedTime:
|
||||
case FieldType.CreatedTime:
|
||||
return <DateFilterValue data={filter.data as DateFilterData} />;
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
}, [field.id, field.type, filter.data, t]);
|
||||
|
||||
return (
|
||||
<>
|
||||
<Chip
|
||||
clickable
|
||||
variant='outlined'
|
||||
label={
|
||||
<div className={'flex items-center justify-center gap-1'}>
|
||||
<Property field={field} />
|
||||
<div className={'flex items-center justify-between gap-1'}>
|
||||
<Property className={'flex flex-1 items-center'} field={field} />
|
||||
<span className={'max-w-[120px] truncate'}>{conditionValue}</span>
|
||||
<DropDownSvg className={'h-6 w-6'} />
|
||||
</div>
|
||||
}
|
||||
|
||||
@ -29,9 +29,9 @@ function Filters() {
|
||||
};
|
||||
|
||||
return (
|
||||
<div className={'flex items-center justify-center gap-2 text-text-title'}>
|
||||
<div className={'flex flex-1 items-center gap-2 text-text-title'}>
|
||||
{options.map(({ filter, field }) => (field ? <Filter key={filter.id} filter={filter} field={field} /> : null))}
|
||||
<Button size={'small'} onClick={handleClick} color={'inherit'} startIcon={<AddSvg />}>
|
||||
<Button size={'small'} className={'min-w-[100px]'} onClick={handleClick} color={'inherit'} startIcon={<AddSvg />}>
|
||||
{t('grid.settings.addFilter')}
|
||||
</Button>
|
||||
<FilterFieldsMenu
|
||||
|
||||
@ -27,23 +27,19 @@ function DateFilter({ filter, field, onChange }: Props) {
|
||||
const condition = filter.data.condition;
|
||||
const isRange = condition === DateFilterConditionPB.DateWithIn;
|
||||
const timestamp = useMemo(() => {
|
||||
const now = Date.now() / 1000;
|
||||
|
||||
if (isRange) {
|
||||
return filter.data.start ? filter.data.start : now;
|
||||
return filter.data.start;
|
||||
}
|
||||
|
||||
return filter.data.timestamp ? filter.data.timestamp : now;
|
||||
return filter.data.timestamp;
|
||||
}, [filter.data.start, filter.data.timestamp, isRange]);
|
||||
|
||||
const endTimestamp = useMemo(() => {
|
||||
const now = Date.now() / 1000;
|
||||
|
||||
if (isRange) {
|
||||
return filter.data.end ? filter.data.end : now;
|
||||
return filter.data.end;
|
||||
}
|
||||
|
||||
return now;
|
||||
return;
|
||||
}, [filter.data.end, isRange]);
|
||||
|
||||
const timeFormat = useMemo(() => {
|
||||
@ -64,7 +60,7 @@ function DateFilter({ filter, field, onChange }: Props) {
|
||||
onChange({
|
||||
condition,
|
||||
timestamp: date,
|
||||
start: date,
|
||||
start: endDate ? date : undefined,
|
||||
end: endDate,
|
||||
});
|
||||
}}
|
||||
@ -81,7 +77,7 @@ function DateFilter({ filter, field, onChange }: Props) {
|
||||
onChange({
|
||||
condition,
|
||||
timestamp: date,
|
||||
start: date,
|
||||
start: endDate ? date : undefined,
|
||||
end: endDate,
|
||||
});
|
||||
}}
|
||||
|
||||
@ -0,0 +1,52 @@
|
||||
import React, { useMemo } from 'react';
|
||||
import { DateFilterData } from '$app/application/database';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
import { DateFilterConditionPB } from '@/services/backend';
|
||||
|
||||
function DateFilterValue({ data }: { data: DateFilterData }) {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const value = useMemo(() => {
|
||||
if (!data.timestamp) return '';
|
||||
|
||||
let startStr = '';
|
||||
let endStr = '';
|
||||
|
||||
if (data.start) {
|
||||
const end = data.end ?? data.start;
|
||||
const moreThanOneYear = dayjs.unix(end).diff(dayjs.unix(data.start), 'year') > 1;
|
||||
const format = moreThanOneYear ? 'MMM D, YYYY' : 'MMM D';
|
||||
|
||||
startStr = dayjs.unix(data.start).format(format);
|
||||
endStr = dayjs.unix(end).format(format);
|
||||
}
|
||||
|
||||
const timestamp = dayjs.unix(data.timestamp).format('MMM D');
|
||||
|
||||
switch (data.condition) {
|
||||
case DateFilterConditionPB.DateIs:
|
||||
return `: ${timestamp}`;
|
||||
case DateFilterConditionPB.DateBefore:
|
||||
return `: ${t('grid.dateFilter.choicechipPrefix.before')} ${timestamp}`;
|
||||
case DateFilterConditionPB.DateAfter:
|
||||
return `: ${t('grid.dateFilter.choicechipPrefix.after')} ${timestamp}`;
|
||||
case DateFilterConditionPB.DateOnOrBefore:
|
||||
return `: ${t('grid.dateFilter.choicechipPrefix.onOrBefore')} ${timestamp}`;
|
||||
case DateFilterConditionPB.DateOnOrAfter:
|
||||
return `: ${t('grid.dateFilter.choicechipPrefix.onOrAfter')} ${timestamp}`;
|
||||
case DateFilterConditionPB.DateWithIn:
|
||||
return `: ${startStr} - ${endStr}`;
|
||||
case DateFilterConditionPB.DateIsEmpty:
|
||||
return `: ${t('grid.dateFilter.choicechipPrefix.isEmpty')}`;
|
||||
case DateFilterConditionPB.DateIsNotEmpty:
|
||||
return `: ${t('grid.dateFilter.choicechipPrefix.isNotEmpty')}`;
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
}, [data, t]);
|
||||
|
||||
return <>{value}</>;
|
||||
}
|
||||
|
||||
export default DateFilterValue;
|
||||
@ -0,0 +1,39 @@
|
||||
import React, { useMemo } from 'react';
|
||||
import { NumberFilterData } from '$app/application/database';
|
||||
import { NumberFilterConditionPB } from '@/services/backend';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
function NumberFilterValue({ data }: { data: NumberFilterData }) {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const value = useMemo(() => {
|
||||
if (!data.content) {
|
||||
return '';
|
||||
}
|
||||
|
||||
const content = parseInt(data.content);
|
||||
|
||||
switch (data.condition) {
|
||||
case NumberFilterConditionPB.Equal:
|
||||
return `= ${content}`;
|
||||
case NumberFilterConditionPB.NotEqual:
|
||||
return `!= ${content}`;
|
||||
case NumberFilterConditionPB.GreaterThan:
|
||||
return `> ${content}`;
|
||||
case NumberFilterConditionPB.GreaterThanOrEqualTo:
|
||||
return `>= ${content}`;
|
||||
case NumberFilterConditionPB.LessThan:
|
||||
return `< ${content}`;
|
||||
case NumberFilterConditionPB.LessThanOrEqualTo:
|
||||
return `<= ${content}`;
|
||||
case NumberFilterConditionPB.NumberIsEmpty:
|
||||
return t('grid.textFilter.isEmpty');
|
||||
case NumberFilterConditionPB.NumberIsNotEmpty:
|
||||
return t('grid.textFilter.isNotEmpty');
|
||||
}
|
||||
}, [data.condition, data.content, t]);
|
||||
|
||||
return <>{value}</>;
|
||||
}
|
||||
|
||||
export default NumberFilterValue;
|
||||
@ -0,0 +1,38 @@
|
||||
import React, { useMemo } from 'react';
|
||||
import { SelectFilterData, SelectTypeOption } from '$app/application/database';
|
||||
import { useStaticTypeOption } from '$app/components/database';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { SelectOptionConditionPB } from '@/services/backend';
|
||||
|
||||
function SelectFilterValue({ data, fieldId }: { data: SelectFilterData; fieldId: string }) {
|
||||
const typeOption = useStaticTypeOption<SelectTypeOption>(fieldId);
|
||||
const { t } = useTranslation();
|
||||
const value = useMemo(() => {
|
||||
if (!data.optionIds?.length) return '';
|
||||
|
||||
const options = data.optionIds
|
||||
.map((optionId) => {
|
||||
const option = typeOption?.options?.find((option) => option.id === optionId);
|
||||
|
||||
return option?.name;
|
||||
})
|
||||
.join(', ');
|
||||
|
||||
switch (data.condition) {
|
||||
case SelectOptionConditionPB.OptionIs:
|
||||
return `: ${options}`;
|
||||
case SelectOptionConditionPB.OptionIsNot:
|
||||
return `: ${t('grid.textFilter.choicechipPrefix.isNot')} ${options}`;
|
||||
case SelectOptionConditionPB.OptionIsEmpty:
|
||||
return `: ${t('grid.textFilter.choicechipPrefix.isEmpty')}`;
|
||||
case SelectOptionConditionPB.OptionIsNotEmpty:
|
||||
return `: ${t('grid.textFilter.choicechipPrefix.isNotEmpty')}`;
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
}, [data.condition, data.optionIds, t, typeOption?.options]);
|
||||
|
||||
return <>{value}</>;
|
||||
}
|
||||
|
||||
export default SelectFilterValue;
|
||||
@ -0,0 +1,34 @@
|
||||
import { useMemo } from 'react';
|
||||
import { TextFilterData } from '$app/application/database';
|
||||
import { TextFilterConditionPB } from '@/services/backend';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
function TextFilterValue({ data }: { data: TextFilterData }) {
|
||||
const { t } = useTranslation();
|
||||
|
||||
const value = useMemo(() => {
|
||||
if (!data.content) return '';
|
||||
switch (data.condition) {
|
||||
case TextFilterConditionPB.Contains:
|
||||
case TextFilterConditionPB.Is:
|
||||
return `: ${data.content}`;
|
||||
case TextFilterConditionPB.DoesNotContain:
|
||||
case TextFilterConditionPB.IsNot:
|
||||
return `: ${t('grid.textFilter.choicechipPrefix.isNot')} ${data.content}`;
|
||||
case TextFilterConditionPB.StartsWith:
|
||||
return `: ${t('grid.textFilter.choicechipPrefix.startWith')} ${data.content}`;
|
||||
case TextFilterConditionPB.EndsWith:
|
||||
return `: ${t('grid.textFilter.choicechipPrefix.endWith')} ${data.content}`;
|
||||
case TextFilterConditionPB.TextIsEmpty:
|
||||
return `: ${t('grid.textFilter.choicechipPrefix.isEmpty')}`;
|
||||
case TextFilterConditionPB.TextIsNotEmpty:
|
||||
return `: ${t('grid.textFilter.choicechipPrefix.isNotEmpty')}`;
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
}, [t, data]);
|
||||
|
||||
return <>{value}</>;
|
||||
}
|
||||
|
||||
export default TextFilterValue;
|
||||
@ -10,6 +10,7 @@ export interface FieldProps {
|
||||
menuOpened?: boolean;
|
||||
onOpenMenu?: (id: string) => void;
|
||||
onCloseMenu?: (id: string) => void;
|
||||
className?: string;
|
||||
}
|
||||
|
||||
const initialAnchorOrigin: PopoverOrigin = {
|
||||
@ -22,7 +23,7 @@ const initialTransformOrigin: PopoverOrigin = {
|
||||
horizontal: 'left',
|
||||
};
|
||||
|
||||
export const Property: FC<FieldProps> = ({ field, onCloseMenu, menuOpened }) => {
|
||||
export const Property: FC<FieldProps> = ({ field, onCloseMenu, className, menuOpened }) => {
|
||||
const ref = useRef<HTMLDivElement | null>(null);
|
||||
const [anchorPosition, setAnchorPosition] = useState<
|
||||
| {
|
||||
@ -63,7 +64,7 @@ export const Property: FC<FieldProps> = ({ field, onCloseMenu, menuOpened }) =>
|
||||
|
||||
return (
|
||||
<>
|
||||
<div ref={ref} className='flex w-full items-center px-2'>
|
||||
<div ref={ref} className={className ? className : `flex w-full items-center px-2`}>
|
||||
<ProppertyTypeSvg className='mr-1 text-base' type={field.type} />
|
||||
<span className='flex-1 truncate text-left text-xs'>{field.name}</span>
|
||||
</div>
|
||||
|
||||
@ -0,0 +1,6 @@
|
||||
.database-collection {
|
||||
::-webkit-scrollbar {
|
||||
width: 0px;
|
||||
height: 0px;
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
import { ReactEditor } from 'slate-react';
|
||||
import { Editor, Element as SlateElement, NodeEntry, Range, Transforms } from 'slate';
|
||||
import { Editor, Element, Element as SlateElement, NodeEntry, Range, Transforms } from 'slate';
|
||||
import { EditorInlineNodeType, FormulaNode } from '$app/application/document/document.types';
|
||||
import { isMarkActive } from '$app/components/editor/command/mark';
|
||||
|
||||
export function insertFormula(editor: ReactEditor, formula?: string) {
|
||||
if (editor.selection) {
|
||||
@ -80,5 +79,11 @@ export function unwrapFormula(editor: ReactEditor) {
|
||||
}
|
||||
|
||||
export function isFormulaActive(editor: ReactEditor) {
|
||||
return isMarkActive(editor, EditorInlineNodeType.Formula);
|
||||
const [match] = editor.nodes({
|
||||
match: (n) => {
|
||||
return !Editor.isEditor(n) && Element.isElement(n) && n.type === EditorInlineNodeType.Formula;
|
||||
},
|
||||
});
|
||||
|
||||
return Boolean(match);
|
||||
}
|
||||
|
||||
@ -229,6 +229,16 @@ export const CustomEditor = {
|
||||
return !!match;
|
||||
},
|
||||
|
||||
formulaActiveNode(editor: ReactEditor) {
|
||||
const [match] = editor.nodes({
|
||||
match: (n) => {
|
||||
return !Editor.isEditor(n) && Element.isElement(n) && n.type === EditorInlineNodeType.Formula;
|
||||
},
|
||||
});
|
||||
|
||||
return match ? (match as NodeEntry<FormulaNode>) : undefined;
|
||||
},
|
||||
|
||||
isMentionActive(editor: ReactEditor) {
|
||||
const [match] = editor.nodes({
|
||||
match: (n) => {
|
||||
@ -519,6 +529,14 @@ export const CustomEditor = {
|
||||
return editor.isEmpty(textNode);
|
||||
},
|
||||
|
||||
includeInlineBlocks: (editor: ReactEditor) => {
|
||||
const [match] = Editor.nodes(editor, {
|
||||
match: (n) => Element.isElement(n) && editor.isInline(n),
|
||||
});
|
||||
|
||||
return Boolean(match);
|
||||
},
|
||||
|
||||
getNodeTextContent(node: Node): string {
|
||||
if (Element.isElement(node) && node.type === EditorInlineNodeType.Formula) {
|
||||
return (node as FormulaNode).data || '';
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { ReactEditor } from 'slate-react';
|
||||
import { Editor, Text, Range } from 'slate';
|
||||
import { Editor, Text, Range, Element } from 'slate';
|
||||
import { EditorInlineNodeType, EditorMarkFormat } from '$app/application/document/document.types';
|
||||
|
||||
export function toggleMark(
|
||||
@ -33,18 +33,13 @@ export function isMarkActive(editor: ReactEditor, format: EditorMarkFormat | Edi
|
||||
const isExpanded = Range.isExpanded(selection);
|
||||
|
||||
if (isExpanded) {
|
||||
const matches = Array.from(getSelectionNodeEntry(editor) || []);
|
||||
|
||||
return matches.every((match) => {
|
||||
const [node] = match;
|
||||
const texts = getSelectionTexts(editor);
|
||||
|
||||
return texts.every((node) => {
|
||||
const { text, ...attributes } = node;
|
||||
|
||||
if (!text) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return !!(attributes as Record<string, boolean | string>)[format];
|
||||
if (!text) return true;
|
||||
return Boolean((attributes as Record<string, boolean | string>)[format]);
|
||||
});
|
||||
}
|
||||
|
||||
@ -53,10 +48,12 @@ export function isMarkActive(editor: ReactEditor, format: EditorMarkFormat | Edi
|
||||
return marks ? !!marks[format] : false;
|
||||
}
|
||||
|
||||
function getSelectionNodeEntry(editor: ReactEditor) {
|
||||
function getSelectionTexts(editor: ReactEditor) {
|
||||
const selection = editor.selection;
|
||||
|
||||
if (!selection) return null;
|
||||
if (!selection) return [];
|
||||
|
||||
const texts: Text[] = [];
|
||||
|
||||
const isExpanded = Range.isExpanded(selection);
|
||||
|
||||
@ -73,16 +70,25 @@ function getSelectionNodeEntry(editor: ReactEditor) {
|
||||
}
|
||||
}
|
||||
|
||||
return Editor.nodes(editor, {
|
||||
match: Text.isText,
|
||||
Array.from(
|
||||
Editor.nodes(editor, {
|
||||
at: {
|
||||
anchor,
|
||||
focus,
|
||||
},
|
||||
})
|
||||
).forEach((match) => {
|
||||
const node = match[0] as Element;
|
||||
|
||||
if (Text.isText(node)) {
|
||||
texts.push(node);
|
||||
} else if (Editor.isInline(editor, node)) {
|
||||
texts.push(...(node.children as Text[]));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return null;
|
||||
return texts;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -97,13 +103,11 @@ export function getAllMarks(editor: ReactEditor) {
|
||||
const isExpanded = Range.isExpanded(selection);
|
||||
|
||||
if (isExpanded) {
|
||||
const matches = Array.from(getSelectionNodeEntry(editor) || []);
|
||||
const texts = getSelectionTexts(editor);
|
||||
|
||||
const marks: Record<string, string | boolean> = {};
|
||||
|
||||
matches.forEach((match) => {
|
||||
const [node] = match;
|
||||
|
||||
texts.forEach((node) => {
|
||||
Object.entries(node).forEach(([key, value]) => {
|
||||
if (key !== 'text') {
|
||||
marks[key] = value;
|
||||
|
||||
@ -8,7 +8,7 @@ function BulletedListIcon({ block: _, className }: { block: BulletedListNode; cl
|
||||
e.preventDefault();
|
||||
}}
|
||||
contentEditable={false}
|
||||
className={`${className} bulleted-icon flex w-[23px] justify-center pr-1 font-medium`}
|
||||
className={`${className} bulleted-icon flex min-w-[23px] justify-center pr-1 font-medium`}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
@ -36,7 +36,7 @@ function NumberListIcon({ block, className }: { block: NumberedListNode; classNa
|
||||
}}
|
||||
contentEditable={false}
|
||||
data-number={index}
|
||||
className={`${className} numbered-icon flex w-[23px] justify-center pr-1 font-medium`}
|
||||
className={`${className} numbered-icon flex w-[23px] min-w-[23px] justify-center pr-1 font-medium`}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ export const InlineFormula = memo(
|
||||
const { popoverOpen = false, setRange, openPopover, closePopover } = useEditorInlineBlockState('formula');
|
||||
const anchor = useRef<HTMLSpanElement | null>(null);
|
||||
const selected = useSelected();
|
||||
const open = popoverOpen && selected;
|
||||
const open = Boolean(popoverOpen && selected);
|
||||
|
||||
const handleClick = useCallback(
|
||||
(e: MouseEvent<HTMLSpanElement>) => {
|
||||
|
||||
@ -3,7 +3,7 @@ import { MutableRefObject, useCallback, useEffect, useMemo, useRef, useState } f
|
||||
import { getSelectionPosition } from '$app/components/editor/components/tools/selection_toolbar/utils';
|
||||
import debounce from 'lodash-es/debounce';
|
||||
import { CustomEditor } from '$app/components/editor/command';
|
||||
import { BaseRange, Editor, Range as SlateRange } from 'slate';
|
||||
import { BaseRange, Range as SlateRange } from 'slate';
|
||||
import { useDecorateDispatch } from '$app/components/editor/stores/decorate';
|
||||
|
||||
const DELAY = 300;
|
||||
@ -118,9 +118,21 @@ export function useSelectionToolbar(ref: MutableRefObject<HTMLDivElement | null>
|
||||
|
||||
const { selection } = editor;
|
||||
|
||||
if (!isFocusedEditor || !selection || SlateRange.isCollapsed(selection) || Editor.string(editor, selection) === '') {
|
||||
const close = () => {
|
||||
debounceRecalculatePosition.cancel();
|
||||
closeToolbar();
|
||||
};
|
||||
|
||||
if (!isFocusedEditor || !selection || SlateRange.isCollapsed(selection)) {
|
||||
close();
|
||||
return;
|
||||
}
|
||||
|
||||
// There has a bug which the text of selection is empty when the selection include inline blocks
|
||||
const isEmptyText = !CustomEditor.includeInlineBlocks(editor) && editor.string(selection) === '';
|
||||
|
||||
if (isEmptyText) {
|
||||
close();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@ export function Bold() {
|
||||
const { t } = useTranslation();
|
||||
const editor = useSlateStatic();
|
||||
const isActivated = CustomEditor.isMarkActive(editor, EditorMarkFormat.Bold);
|
||||
|
||||
const modifier = useMemo(() => getHotKey(EditorMarkFormat.Bold).modifier, []);
|
||||
const onClick = useCallback(() => {
|
||||
CustomEditor.toggleMark(editor, {
|
||||
|
||||
@ -11,20 +11,28 @@ export function Formula() {
|
||||
const editor = useSlateStatic();
|
||||
const isActivatedMention = CustomEditor.isMentionActive(editor);
|
||||
|
||||
const formulaMatch = CustomEditor.formulaActiveNode(editor);
|
||||
const isActivated = !isActivatedMention && CustomEditor.isFormulaActive(editor);
|
||||
|
||||
const { setRange, openPopover } = useEditorInlineBlockState('formula');
|
||||
const onClick = useCallback(() => {
|
||||
const selection = editor.selection;
|
||||
let selection = editor.selection;
|
||||
|
||||
if (!selection) return;
|
||||
if (formulaMatch) {
|
||||
selection = editor.range(formulaMatch[1]);
|
||||
editor.select(selection);
|
||||
} else {
|
||||
CustomEditor.toggleFormula(editor);
|
||||
}
|
||||
|
||||
requestAnimationFrame(() => {
|
||||
if (!selection) return;
|
||||
|
||||
setRange(selection);
|
||||
openPopover();
|
||||
});
|
||||
}, [editor, setRange, openPopover]);
|
||||
}, [editor, formulaMatch, setRange, openPopover]);
|
||||
|
||||
return (
|
||||
<ActionButton
|
||||
|
||||
@ -4,7 +4,7 @@ import { generateId } from '$app/components/editor/provider/utils/convert';
|
||||
import { YDelta2Delta } from '$app/components/editor/provider/utils/delta';
|
||||
import { YDelta } from '$app/components/editor/provider/types/y_event';
|
||||
import { getInsertTarget, getYTarget } from '$app/components/editor/provider/utils/relation';
|
||||
import { EditorNodeType } from '$app/application/document/document.types';
|
||||
import { EditorInlineNodeType, EditorNodeType } from '$app/application/document/document.types';
|
||||
import { Log } from '$app/utils/log';
|
||||
|
||||
export function YEvents2BlockActions(
|
||||
@ -36,6 +36,30 @@ export function YEvent2BlockActions(
|
||||
const backupTarget = getYTarget(backupDoc, path) as Readonly<Y.XmlText>;
|
||||
const actions = [];
|
||||
|
||||
if ([EditorInlineNodeType.Formula, EditorInlineNodeType.Mention].includes(yXmlText.getAttribute('type'))) {
|
||||
const parentYXmlText = yXmlText.parent as Y.XmlText;
|
||||
const parentDelta = parentYXmlText.toDelta() as YDelta;
|
||||
const index = parentDelta.findIndex((op) => op.insert === yXmlText);
|
||||
const ops = YDelta2Delta(parentDelta);
|
||||
|
||||
const retainIndex = ops.reduce((acc, op, currentIndex) => {
|
||||
if (currentIndex < index) {
|
||||
return acc + (op.insert as string).length ?? 0;
|
||||
}
|
||||
|
||||
return acc;
|
||||
}, 0);
|
||||
|
||||
const newDelta = [
|
||||
{
|
||||
retain: retainIndex,
|
||||
},
|
||||
...delta,
|
||||
];
|
||||
|
||||
actions.push(...generateApplyTextActions(parentYXmlText, newDelta));
|
||||
}
|
||||
|
||||
if (yXmlText.getAttribute('type') === 'text') {
|
||||
actions.push(...textOps2BlockActions(rootId, yXmlText, delta));
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ export function transformToInlineElement(op: Op): Element | null {
|
||||
const attributes = op.attributes;
|
||||
|
||||
if (!attributes) return null;
|
||||
const formula = attributes.formula as string;
|
||||
const { formula, mention, ...attrs } = attributes;
|
||||
|
||||
if (formula) {
|
||||
return {
|
||||
@ -20,23 +20,23 @@ export function transformToInlineElement(op: Op): Element | null {
|
||||
children: [
|
||||
{
|
||||
text: op.insert as string,
|
||||
...attrs,
|
||||
},
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
const matchMention = attributes.mention as Mention;
|
||||
|
||||
if (matchMention) {
|
||||
if (mention) {
|
||||
return {
|
||||
type: EditorInlineNodeType.Mention,
|
||||
children: [
|
||||
{
|
||||
text: op.insert as string,
|
||||
...attrs,
|
||||
},
|
||||
],
|
||||
data: {
|
||||
...matchMention,
|
||||
...(mention as Mention),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { createContext, useCallback, useContext, useMemo } from 'react';
|
||||
import { BaseRange } from 'slate';
|
||||
import { BaseRange, Path } from 'slate';
|
||||
import { proxy, useSnapshot } from 'valtio';
|
||||
|
||||
export interface EditorInlineBlockState {
|
||||
@ -43,8 +43,10 @@ export function useEditorInlineBlockState(key: 'formula') {
|
||||
}, [context, key]);
|
||||
|
||||
const setRange = useCallback(
|
||||
(range: BaseRange) => {
|
||||
context[key].range = range;
|
||||
(at: BaseRange | Path) => {
|
||||
const range = Path.isPath(at) ? { anchor: at, focus: at } : at;
|
||||
|
||||
context[key].range = range as BaseRange;
|
||||
},
|
||||
[context, key]
|
||||
);
|
||||
|
||||
@ -70,12 +70,12 @@
|
||||
"copyLink": "نسخ الرابط"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "حجم الخط",
|
||||
"import": "استيراد",
|
||||
"moreOptions": "المزيد من الخيارات",
|
||||
"small": "صغير",
|
||||
"medium": "متوسط",
|
||||
"large": "كبير"
|
||||
"large": "كبير",
|
||||
"fontSize": "حجم الخط",
|
||||
"import": "استيراد",
|
||||
"moreOptions": "المزيد من الخيارات"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "نص و Markdown",
|
||||
|
||||
@ -69,12 +69,12 @@
|
||||
"copyLink": "Copiar l'enllaç"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Mida de la font",
|
||||
"import": "Importar",
|
||||
"moreOptions": "Més opcions",
|
||||
"small": "petit",
|
||||
"medium": "mitjà",
|
||||
"large": "gran"
|
||||
"large": "gran",
|
||||
"fontSize": "Mida de la font",
|
||||
"import": "Importar",
|
||||
"moreOptions": "Més opcions"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Text i rebaixa",
|
||||
|
||||
@ -69,12 +69,12 @@
|
||||
"copyLink": "Link kopieren"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Schriftgröße",
|
||||
"import": "Importieren",
|
||||
"moreOptions": "Mehr Optionen",
|
||||
"small": "klein",
|
||||
"medium": "mittel",
|
||||
"large": "groß"
|
||||
"large": "groß",
|
||||
"fontSize": "Schriftgröße",
|
||||
"import": "Importieren",
|
||||
"moreOptions": "Mehr Optionen"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Text & Markdown",
|
||||
|
||||
@ -394,7 +394,8 @@
|
||||
"twelveHour": "Twelve hour",
|
||||
"twentyFourHour": "Twenty four hour"
|
||||
},
|
||||
"showNamingDialogWhenCreatingPage": "Show naming dialog when creating a page"
|
||||
"showNamingDialogWhenCreatingPage": "Show naming dialog when creating a page",
|
||||
"enableRTLToolbarItems": "Enable RTL toolbar items"
|
||||
},
|
||||
"files": {
|
||||
"copy": "Copy",
|
||||
@ -550,7 +551,15 @@
|
||||
"onOrAfter": "Is on or after",
|
||||
"between": "Is between",
|
||||
"empty": "Is empty",
|
||||
"notEmpty": "Is not empty"
|
||||
"notEmpty": "Is not empty",
|
||||
"choicechipPrefix": {
|
||||
"before": "Before",
|
||||
"after": "After",
|
||||
"onOrBefore": "On or before",
|
||||
"onOrAfter": "On or after",
|
||||
"isEmpty": "Is empty",
|
||||
"isNotEmpty": "Is not empty"
|
||||
}
|
||||
},
|
||||
"numberFilter": {
|
||||
"equal": "Equals",
|
||||
@ -932,7 +941,6 @@
|
||||
"addToColumnBottomTooltip": "Add a new card at the bottom",
|
||||
"renameColumn": "Rename",
|
||||
"hideColumn": "Hide",
|
||||
"groupActions": "Group Actions",
|
||||
"newGroup": "New Group",
|
||||
"deleteColumn": "Delete",
|
||||
"deleteColumnConfirmation": "This will delete this group and all the cards in it.\nAre you sure you want to continue?"
|
||||
|
||||
@ -72,12 +72,12 @@
|
||||
"copyLink": "Copiar enlace"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Tamaño de fuente",
|
||||
"import": "Importar",
|
||||
"moreOptions": "Mas opciones",
|
||||
"small": "pequeño",
|
||||
"medium": "medio",
|
||||
"large": "grande"
|
||||
"large": "grande",
|
||||
"fontSize": "Tamaño de fuente",
|
||||
"import": "Importar",
|
||||
"moreOptions": "Mas opciones"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Texto y descuento",
|
||||
|
||||
@ -50,12 +50,12 @@
|
||||
"copyLink": "Esteka kopiatu"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Letra tamaina",
|
||||
"import": "Inportatu",
|
||||
"moreOptions": "Aukera gehiago",
|
||||
"small": "txikia",
|
||||
"medium": "ertaina",
|
||||
"large": "handia"
|
||||
"large": "handia",
|
||||
"fontSize": "Letra tamaina",
|
||||
"import": "Inportatu",
|
||||
"moreOptions": "Aukera gehiago"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Testua eta Markdown",
|
||||
@ -159,7 +159,9 @@
|
||||
"editContact": "Kontaktua editatu"
|
||||
},
|
||||
"button": {
|
||||
"ok": "OK",
|
||||
"done": "Eginda",
|
||||
"cancel": "Ezteztatu",
|
||||
"signIn": "Saioa hasi",
|
||||
"signOut": "Saioa itxi",
|
||||
"complete": "Burututa",
|
||||
@ -175,9 +177,7 @@
|
||||
"edit": "Editatu",
|
||||
"delete": "Ezabatu",
|
||||
"duplicate": "Bikoiztu",
|
||||
"putback": "Jarri Atzera",
|
||||
"cancel": "Ezteztatu",
|
||||
"ok": "OK"
|
||||
"putback": "Jarri Atzera"
|
||||
},
|
||||
"label": {
|
||||
"welcome": "Ongi etorri!",
|
||||
|
||||
@ -55,12 +55,12 @@
|
||||
"copyLink": "کپی کردن لینک"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "اندازه قلم",
|
||||
"import": "اضافه کردن",
|
||||
"moreOptions": "گزینه های بیشتر",
|
||||
"small": "کوچک",
|
||||
"medium": "متوسط",
|
||||
"large": "بزرگ"
|
||||
"large": "بزرگ",
|
||||
"fontSize": "اندازه قلم",
|
||||
"import": "اضافه کردن",
|
||||
"moreOptions": "گزینه های بیشتر"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Text & Markdown",
|
||||
@ -175,7 +175,9 @@
|
||||
"editContact": "ویرایش مخاطب"
|
||||
},
|
||||
"button": {
|
||||
"ok": "باشه",
|
||||
"done": "انجام شد",
|
||||
"cancel": "لغو",
|
||||
"signIn": "ورود",
|
||||
"signOut": "خروج",
|
||||
"complete": "کامل شد",
|
||||
@ -191,9 +193,7 @@
|
||||
"edit": "ویرایش",
|
||||
"delete": "حذف کردن",
|
||||
"duplicate": "تکرار کردن",
|
||||
"putback": "بازگشت",
|
||||
"cancel": "لغو",
|
||||
"ok": "باشه"
|
||||
"putback": "بازگشت"
|
||||
},
|
||||
"label": {
|
||||
"welcome": "خوش آمدید!",
|
||||
|
||||
@ -50,12 +50,12 @@
|
||||
"copyLink": "Link másolása"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Betűméret",
|
||||
"import": "Importálás",
|
||||
"moreOptions": "Több lehetőség",
|
||||
"small": "kicsi",
|
||||
"medium": "közepes",
|
||||
"large": "nagy"
|
||||
"large": "nagy",
|
||||
"fontSize": "Betűméret",
|
||||
"import": "Importálás",
|
||||
"moreOptions": "Több lehetőség"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Szöveg & Markdown",
|
||||
@ -163,7 +163,9 @@
|
||||
"editContact": "Kontakt Szerkesztése"
|
||||
},
|
||||
"button": {
|
||||
"ok": "OK",
|
||||
"done": "Kész",
|
||||
"cancel": "Mégse",
|
||||
"signIn": "Bejelentkezés",
|
||||
"signOut": "Kijelentkezés",
|
||||
"complete": "Kész",
|
||||
@ -179,9 +181,7 @@
|
||||
"edit": "Szerkesztés",
|
||||
"delete": "Töröl",
|
||||
"duplicate": "Másolat",
|
||||
"putback": "Visszatesz",
|
||||
"cancel": "Mégse",
|
||||
"ok": "OK"
|
||||
"putback": "Visszatesz"
|
||||
},
|
||||
"label": {
|
||||
"welcome": "Üdvözlünk!",
|
||||
|
||||
@ -72,12 +72,12 @@
|
||||
"copyLink": "Salin tautan"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Ukuran huruf",
|
||||
"import": "Impor",
|
||||
"moreOptions": "Lebih banyak pilihan",
|
||||
"small": "kecil",
|
||||
"medium": "sedang",
|
||||
"large": "besar"
|
||||
"large": "besar",
|
||||
"fontSize": "Ukuran huruf",
|
||||
"import": "Impor",
|
||||
"moreOptions": "Lebih banyak pilihan"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Teks & Markdown",
|
||||
|
||||
@ -59,6 +59,8 @@
|
||||
"failedToLoad": "Qualcosa è andato storto! Impossibile caricare lo spazio di lavoro. Prova a chiudere qualsiasi istanza aperta di AppFlowy e riprova.",
|
||||
"errorActions": {
|
||||
"reportIssue": "Segnala un problema",
|
||||
"reportIssueOnGithub": "Segnalate un problema su Github",
|
||||
"exportLogFiles": "Esporta i file di log",
|
||||
"reachOut": "Contattaci su Discord"
|
||||
}
|
||||
},
|
||||
@ -70,12 +72,16 @@
|
||||
"copyLink": "Copia Link"
|
||||
},
|
||||
"moreAction": {
|
||||
"small": "piccolo",
|
||||
"medium": "medio",
|
||||
"large": "grande",
|
||||
"fontSize": "Dimensione del font",
|
||||
"import": "Importare",
|
||||
"moreOptions": "Più opzioni",
|
||||
"small": "piccolo",
|
||||
"medium": "medio",
|
||||
"large": "grande"
|
||||
"wordCount": "Conteggio parole: {}",
|
||||
"charCount": "Numero di caratteri: {}",
|
||||
"deleteView": "Cancella",
|
||||
"duplicateView": "Duplica"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Testo e markdown",
|
||||
@ -231,7 +237,11 @@
|
||||
"rename": "Rinomina",
|
||||
"helpCenter": "Centro assistenza",
|
||||
"add": "Aggiungi",
|
||||
"yes": "SÌ"
|
||||
"yes": "SÌ",
|
||||
"Done": "Fatto",
|
||||
"Cancel": "Annulla",
|
||||
"remove": "Rimuovi",
|
||||
"dontRemove": "Non rimuovere"
|
||||
},
|
||||
"label": {
|
||||
"welcome": "Benvenuto!",
|
||||
@ -276,7 +286,10 @@
|
||||
"cloudLocal": "Locale",
|
||||
"cloudSupabase": "Supabase",
|
||||
"cloudSupabaseUrl": "URL di Supabase",
|
||||
"cloudSupabaseUrlCanNotBeEmpty": "L'url di supabase non può essere vuoto",
|
||||
"cloudAppFlowy": "AppFlowy Cloud",
|
||||
"cloudAppFlowySelfHost": "AppFlowy Cloud Self-hosted (autogestito)",
|
||||
"appFlowyCloudUrlCanNotBeEmpty": "L'url del cloud non può essere vuoto",
|
||||
"clickToCopy": "Fare clic per copiare",
|
||||
"selfHostStart": "Se non disponi di un server, fai riferimento a",
|
||||
"selfHostContent": "documento",
|
||||
@ -286,6 +299,7 @@
|
||||
"cloudWSURLHint": "Inserisci l'indirizzo websocket del tuo server",
|
||||
"restartApp": "Riavvia",
|
||||
"restartAppTip": "Riavvia l'applicazione affinché le modifiche abbiano effetto. Tieni presente che ciò potrebbe disconnettere il tuo account corrente",
|
||||
"changeServerTip": "Dopo aver modificato il server, è necessario fare clic sul pulsante di riavvio affinché le modifiche abbiano effetto.",
|
||||
"enableEncryptPrompt": "Attiva la crittografia per proteggere i tuoi dati con questo segreto. Conservarlo in modo sicuro; una volta abilitato, non può essere spento. In caso di perdita, i tuoi dati diventano irrecuperabili. Fare clic per copiare",
|
||||
"inputEncryptPrompt": "Inserisci il tuo segreto di crittografia per",
|
||||
"clickToCopySecret": "Fare clic per copiare il segreto",
|
||||
@ -297,6 +311,7 @@
|
||||
"openHistoricalUser": "Fare clic per aprire l'account anonimo",
|
||||
"customPathPrompt": "L'archiviazione della cartella dati di AppFlowy in una cartella sincronizzata sul cloud come Google Drive può comportare rischi. Se si accede o si modifica il database all'interno di questa cartella da più posizioni contemporaneamente, potrebbero verificarsi conflitti di sincronizzazione e potenziale danneggiamento dei dati",
|
||||
"importAppFlowyData": "Importa dati dalla cartella AppFlowy esterna",
|
||||
"importingAppFlowyDataTip": "L'importazione dei dati è in corso. Non chiudere l'applicazione",
|
||||
"importAppFlowyDataDescription": "Copia i dati da una cartella dati AppFlowy esterna e importali nella cartella dati AppFlowy corrente",
|
||||
"importSuccess": "Importazione della cartella dati AppFlowy riuscita",
|
||||
"importFailed": "L'importazione della cartella dati di AppFlowy non è riuscita",
|
||||
@ -441,10 +456,12 @@
|
||||
"joinDiscord": "Unisciti a noi su Discord",
|
||||
"privacyPolicy": "Politica sulla riservatezza",
|
||||
"userAgreement": "Accordo per gli utenti",
|
||||
"termsAndConditions": "Termini e Condizioni",
|
||||
"userprofileError": "Impossibile caricare il profilo utente",
|
||||
"userprofileErrorDescription": "Prova a disconnetterti e ad accedere nuovamente per verificare se il problema persiste.",
|
||||
"selectLayout": "Seleziona disposizione",
|
||||
"selectStartingDay": "Seleziona il giorno di inizio"
|
||||
"selectStartingDay": "Seleziona il giorno di inizio",
|
||||
"version": "Versione"
|
||||
}
|
||||
},
|
||||
"grid": {
|
||||
@ -466,14 +483,14 @@
|
||||
"typeAValue": "Digita un valore...",
|
||||
"layout": "Disposizione",
|
||||
"databaseLayout": "Disposizione",
|
||||
"viewList": "Viste del database",
|
||||
"editView": "Modifica vista",
|
||||
"boardSettings": "Impostazioni della bacheca",
|
||||
"calendarSettings": "Impostazioni del calendario",
|
||||
"createView": "Nuova vista",
|
||||
"duplicateView": "Duplica vista",
|
||||
"deleteView": "Elimina vista",
|
||||
"numberOfVisibleFields": "{} mostrato",
|
||||
"viewList": "Viste del database"
|
||||
"numberOfVisibleFields": "{} mostrato"
|
||||
},
|
||||
"textFilter": {
|
||||
"contains": "Contiene",
|
||||
@ -525,6 +542,16 @@
|
||||
"empty": "È vuoto",
|
||||
"notEmpty": "Non è vuoto"
|
||||
},
|
||||
"numberFilter": {
|
||||
"equal": "Uguale",
|
||||
"notEqual": "Non è uguale",
|
||||
"lessThan": "È meno di",
|
||||
"greaterThan": "È maggiore di",
|
||||
"lessThanOrEqualTo": "È inferiore o uguale a",
|
||||
"greaterThanOrEqualTo": "È maggiore o uguale a",
|
||||
"isEmpty": "È vuoto",
|
||||
"isNotEmpty": "Non è vuoto"
|
||||
},
|
||||
"field": {
|
||||
"hide": "Nascondere",
|
||||
"show": "Mostra",
|
||||
@ -556,6 +583,7 @@
|
||||
"timeFormatTwelveHour": "12 ore",
|
||||
"timeFormatTwentyFourHour": "24 ore",
|
||||
"clearDate": "Pulisci data",
|
||||
"dateTime": "Data e ora",
|
||||
"failedToLoadDate": "Impossibile caricare il valore della data",
|
||||
"selectTime": "Seleziona l'ora",
|
||||
"selectDate": "Seleziona la data",
|
||||
@ -569,7 +597,9 @@
|
||||
"newProperty": "Nuova proprietà",
|
||||
"deleteFieldPromptMessage": "Sei sicuro? Questa proprietà verrà eliminata",
|
||||
"newColumn": "Nuova colonna",
|
||||
"format": "Formato"
|
||||
"format": "Formato",
|
||||
"reminderOnDateTooltip": "Questa cella ha un promemoria programmato",
|
||||
"optionAlreadyExist": "L'opzione esiste già"
|
||||
},
|
||||
"rowPage": {
|
||||
"newField": "Aggiungi un nuovo campo",
|
||||
@ -588,6 +618,7 @@
|
||||
"sort": {
|
||||
"ascending": "Ascendente",
|
||||
"descending": "Discendente",
|
||||
"cannotFindCreatableField": "Impossibile trovare un campo adatto per l'ordinamento",
|
||||
"deleteAllSorts": "Elimina tutti gli ordinamenti",
|
||||
"addSort": "Aggiungi ordinamento",
|
||||
"deleteSort": "Elimina ordinamento"
|
||||
@ -636,7 +667,16 @@
|
||||
"showComplete": "Mostra tutte le attività"
|
||||
},
|
||||
"menuName": "Griglia",
|
||||
"referencedGridPrefix": "Vista di"
|
||||
"referencedGridPrefix": "Vista di",
|
||||
"calculate": "Calcolare",
|
||||
"calculationTypeLabel": {
|
||||
"average": "Media",
|
||||
"max": "Massimo",
|
||||
"median": "Medio",
|
||||
"min": "Minimo",
|
||||
"sum": "Somma"
|
||||
},
|
||||
"removeSorting": "Si desidera rimuovere l'ordinamento?"
|
||||
},
|
||||
"document": {
|
||||
"menuName": "Documento",
|
||||
@ -742,13 +782,16 @@
|
||||
},
|
||||
"image": {
|
||||
"copiedToPasteBoard": "Il link dell'immagine è stato copiato negli appunti",
|
||||
"addAnImage": "Aggiungi un'immagine"
|
||||
"addAnImage": "Aggiungi un'immagine",
|
||||
"imageUploadFailed": "Caricamento dell'immagine non riuscito"
|
||||
},
|
||||
"urlPreview": {
|
||||
"copiedToPasteBoard": "Il link è stato copiato negli appunti"
|
||||
"copiedToPasteBoard": "Il link è stato copiato negli appunti",
|
||||
"convertToLink": "Convertire in link da incorporare"
|
||||
},
|
||||
"outline": {
|
||||
"addHeadingToCreateOutline": "Aggiungi intestazioni per creare un sommario."
|
||||
"addHeadingToCreateOutline": "Aggiungi intestazioni per creare un sommario.",
|
||||
"noMatchHeadings": "Non sono stati trovati titoli corrispondenti."
|
||||
},
|
||||
"table": {
|
||||
"addAfter": "Aggiungi dopo",
|
||||
@ -771,7 +814,9 @@
|
||||
"toContinue": "continuare",
|
||||
"newDatabase": "Nuova banca dati",
|
||||
"linkToDatabase": "Collegamento alla banca dati"
|
||||
}
|
||||
},
|
||||
"date": "Data",
|
||||
"emoji": "Emoji"
|
||||
},
|
||||
"textBlock": {
|
||||
"placeholder": "Digita '/' per i comandi"
|
||||
@ -817,7 +862,10 @@
|
||||
"saveImageToGallery": "Salva immagine",
|
||||
"failedToAddImageToGallery": "Impossibile aggiungere l'immagine alla galleria",
|
||||
"successToAddImageToGallery": "Immagine aggiunta alla galleria con successo",
|
||||
"unableToLoadImage": "Impossibile caricare l'immagine"
|
||||
"unableToLoadImage": "Impossibile caricare l'immagine",
|
||||
"maximumImageSize": "La dimensione massima supportata per il caricamento delle immagini è di 10 MB",
|
||||
"uploadImageErrorImageSizeTooBig": "Le dimensioni dell'immagine devono essere inferiori a 10 MB",
|
||||
"imageIsUploading": "L'immagine si sta caricando"
|
||||
},
|
||||
"codeBlock": {
|
||||
"language": {
|
||||
@ -844,7 +892,9 @@
|
||||
"page": {
|
||||
"label": "Collegamento alla pagina",
|
||||
"tooltip": "Fare clic per aprire la pagina"
|
||||
}
|
||||
},
|
||||
"deleted": "Eliminato",
|
||||
"deletedContent": "Questo contenuto non esiste o è stato cancellato"
|
||||
},
|
||||
"toolbar": {
|
||||
"resetToDefaultFont": "Ripristina alle condizioni predefinite"
|
||||
@ -876,6 +926,7 @@
|
||||
"cardDuplicated": "La carta è stata duplicata",
|
||||
"cardDeleted": "La carta è stata eliminata",
|
||||
"showOnCard": "Mostra sui dettagli della carta",
|
||||
"setting": "Impostazioni",
|
||||
"propertyName": "Nome della proprietà",
|
||||
"menuName": "Bacheca",
|
||||
"showUngrouped": "Mostra elementi non raggruppati",
|
||||
@ -902,16 +953,21 @@
|
||||
"previousMonth": "Il mese scorso",
|
||||
"nextMonth": "Il prossimo mese"
|
||||
},
|
||||
"mobileEventScreen": {
|
||||
"emptyTitle": "Non ci sono ancora eventi",
|
||||
"emptyBody": "Premere il pulsante più per creare un evento in questo giorno."
|
||||
},
|
||||
"settings": {
|
||||
"showWeekNumbers": "Mostra i numeri della settimana",
|
||||
"showWeekends": "Mostra i fine settimana",
|
||||
"firstDayOfWeek": "Inizia la settimana",
|
||||
"layoutDateField": "Layout calendario per",
|
||||
"changeLayoutDateField": "Modifica del campo di layout",
|
||||
"noDateTitle": "Nessuna data",
|
||||
"noDateHint": "Gli eventi non programmati verranno visualizzati qui",
|
||||
"unscheduledEventsTitle": "Eventi non programmati",
|
||||
"clickToAdd": "Fare clic per aggiungere al calendario",
|
||||
"name": "Disposizione del calendario",
|
||||
"noDateHint": "Gli eventi non programmati verranno visualizzati qui"
|
||||
"name": "Disposizione del calendario"
|
||||
},
|
||||
"referencedCalendarPrefix": "Vista di",
|
||||
"quickJumpYear": "Salta a"
|
||||
@ -983,9 +1039,14 @@
|
||||
},
|
||||
"inlineActions": {
|
||||
"noResults": "Nessun risultato",
|
||||
"pageReference": "Riferimento della pagina",
|
||||
"docReference": "Riferimento al documento",
|
||||
"calReference": "Calendario di riferimento",
|
||||
"gridReference": "Riferimento griglia",
|
||||
"date": "Data",
|
||||
"reminder": {
|
||||
"groupTitle": "Promemoria"
|
||||
"groupTitle": "Promemoria",
|
||||
"shortKeyword": "ricordare"
|
||||
}
|
||||
},
|
||||
"datePicker": {
|
||||
@ -994,7 +1055,23 @@
|
||||
"includeTime": "Includere l'orario",
|
||||
"isRange": "Data di fine",
|
||||
"timeFormat": "Formato orario",
|
||||
"clearDate": "Rimuovi data"
|
||||
"clearDate": "Rimuovi data",
|
||||
"reminderLabel": "Promemoria",
|
||||
"selectReminder": "Seleziona il promemoria",
|
||||
"reminderOptions": {
|
||||
"atTimeOfEvent": "Ora dell'evento",
|
||||
"fiveMinsBefore": "5 minuti prima",
|
||||
"tenMinsBefore": "10 minuti prima",
|
||||
"fifteenMinsBefore": "15 minuti prima",
|
||||
"thirtyMinsBefore": "30 minuti prima",
|
||||
"oneHourBefore": "1 ora prima",
|
||||
"twoHoursBefore": "2 hours before",
|
||||
"onDayOfEvent": "Il giorno dell'evento",
|
||||
"oneDayBefore": "1 giorno prima",
|
||||
"twoDaysBefore": "2 giorni prima",
|
||||
"oneWeekBefore": "1 settimana prima",
|
||||
"custom": "Personalizzato"
|
||||
}
|
||||
},
|
||||
"relativeDates": {
|
||||
"yesterday": "Ieri",
|
||||
@ -1010,6 +1087,7 @@
|
||||
"emptyTitle": "Tutto a posto!",
|
||||
"emptyBody": "Nessuna notifica o azione in sospeso. Goditi la calma.",
|
||||
"tabs": {
|
||||
"inbox": "Posta in arrivo",
|
||||
"upcoming": "Prossimamente"
|
||||
},
|
||||
"actions": {
|
||||
@ -1057,6 +1135,7 @@
|
||||
"highlight": "Evidenzia",
|
||||
"color": "Colore",
|
||||
"image": "Immagine",
|
||||
"date": "Data",
|
||||
"italic": "Corsivo",
|
||||
"link": "Link",
|
||||
"numberedList": "Elenco numerato",
|
||||
@ -1158,7 +1237,10 @@
|
||||
"colClear": "Rimuovi contenuto",
|
||||
"rowClear": "Rimuovi contenuto",
|
||||
"slashPlaceHolder": "Digita \"/\" per inserire un blocco o inizia a digitare",
|
||||
"typeSomething": "Scrivi qualcosa..."
|
||||
"typeSomething": "Scrivi qualcosa...",
|
||||
"quoteListShortForm": "Citazione",
|
||||
"mathEquationShortForm": "Formula",
|
||||
"codeBlockShortForm": "Codice"
|
||||
},
|
||||
"favorite": {
|
||||
"noFavorite": "Nessuna pagina preferita",
|
||||
@ -1182,5 +1264,6 @@
|
||||
"date": "Data",
|
||||
"addField": "Aggiungi campo",
|
||||
"userIcon": "Icona utente"
|
||||
}
|
||||
},
|
||||
"noLogFiles": "Non ci sono file di log"
|
||||
}
|
||||
|
||||
@ -63,12 +63,12 @@
|
||||
"copyLink": "リンクをコピー"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "フォントサイズ",
|
||||
"import": "取り込む",
|
||||
"moreOptions": "より多くのオプション",
|
||||
"small": "小さい",
|
||||
"medium": "中くらい",
|
||||
"large": "大きい"
|
||||
"large": "大きい",
|
||||
"fontSize": "フォントサイズ",
|
||||
"import": "取り込む",
|
||||
"moreOptions": "より多くのオプション"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "テキストとマークダウン",
|
||||
|
||||
@ -50,12 +50,12 @@
|
||||
"copyLink": "링크 복사"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "글꼴 크기",
|
||||
"import": "수입",
|
||||
"moreOptions": "추가 옵션",
|
||||
"small": "작은",
|
||||
"medium": "중간",
|
||||
"large": "크기가 큰"
|
||||
"large": "크기가 큰",
|
||||
"fontSize": "글꼴 크기",
|
||||
"import": "수입",
|
||||
"moreOptions": "추가 옵션"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "텍스트 및 마크다운",
|
||||
@ -159,7 +159,9 @@
|
||||
"editContact": "연락처 편집"
|
||||
},
|
||||
"button": {
|
||||
"ok": "확인",
|
||||
"done": "완료",
|
||||
"cancel": "취소",
|
||||
"signIn": "로그인",
|
||||
"signOut": "로그아웃",
|
||||
"complete": "완료",
|
||||
@ -175,9 +177,7 @@
|
||||
"edit": "편집하다",
|
||||
"delete": "삭제",
|
||||
"duplicate": "복제하다",
|
||||
"putback": "다시 집어 넣어",
|
||||
"cancel": "취소",
|
||||
"ok": "확인"
|
||||
"putback": "다시 집어 넣어"
|
||||
},
|
||||
"label": {
|
||||
"welcome": "환영합니다!",
|
||||
|
||||
@ -70,12 +70,12 @@
|
||||
"copyLink": "Skopiuj link"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Rozmiar czcionki",
|
||||
"import": "Import",
|
||||
"moreOptions": "Więcej opcji",
|
||||
"small": "mały",
|
||||
"medium": "średni",
|
||||
"large": "duży"
|
||||
"large": "duży",
|
||||
"fontSize": "Rozmiar czcionki",
|
||||
"import": "Import",
|
||||
"moreOptions": "Więcej opcji"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Tekst i Markdown",
|
||||
|
||||
@ -72,12 +72,12 @@
|
||||
"copyLink": "Copiar link"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Tamanho da fonte",
|
||||
"import": "Importar",
|
||||
"moreOptions": "Mais opções",
|
||||
"small": "pequeno",
|
||||
"medium": "médio",
|
||||
"large": "grande"
|
||||
"large": "grande",
|
||||
"fontSize": "Tamanho da fonte",
|
||||
"import": "Importar",
|
||||
"moreOptions": "Mais opções"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Texto e Remarcação",
|
||||
|
||||
@ -70,12 +70,12 @@
|
||||
"copyLink": "Copiar o link"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Tamanho da fonte",
|
||||
"import": "Importar",
|
||||
"moreOptions": "Mais opções",
|
||||
"small": "pequeno",
|
||||
"medium": "médio",
|
||||
"large": "grande"
|
||||
"large": "grande",
|
||||
"fontSize": "Tamanho da fonte",
|
||||
"import": "Importar",
|
||||
"moreOptions": "Mais opções"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Texto e Remarcação",
|
||||
@ -194,7 +194,9 @@
|
||||
"editContact": "Editar um conctato"
|
||||
},
|
||||
"button": {
|
||||
"ok": "OK",
|
||||
"done": "Feito",
|
||||
"cancel": "Cancelar",
|
||||
"signIn": "Entrar",
|
||||
"signOut": "Sair",
|
||||
"complete": "Completar",
|
||||
@ -210,9 +212,7 @@
|
||||
"edit": "Editar",
|
||||
"delete": "Excluir",
|
||||
"duplicate": "Duplicado",
|
||||
"putback": "Por de volta",
|
||||
"cancel": "Cancelar",
|
||||
"ok": "OK"
|
||||
"putback": "Por de volta"
|
||||
},
|
||||
"label": {
|
||||
"welcome": "Bem vindo!",
|
||||
|
||||
@ -70,12 +70,12 @@
|
||||
"copyLink": "Скопировать ссылку"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Размер шрифта",
|
||||
"import": "Импорт",
|
||||
"moreOptions": "Дополнительные опции",
|
||||
"small": "маленький",
|
||||
"medium": "средний",
|
||||
"large": "большой"
|
||||
"large": "большой",
|
||||
"fontSize": "Размер шрифта",
|
||||
"import": "Импорт",
|
||||
"moreOptions": "Дополнительные опции"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Текст и Markdown",
|
||||
|
||||
@ -69,12 +69,12 @@
|
||||
"copyLink": "Bağlantıyı kopyala"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Yazı boyutu",
|
||||
"import": "İçe aktar",
|
||||
"moreOptions": "Diğer seçenekler",
|
||||
"small": "Küçük",
|
||||
"medium": "Orta",
|
||||
"large": "Büyük"
|
||||
"large": "Büyük",
|
||||
"fontSize": "Yazı boyutu",
|
||||
"import": "İçe aktar",
|
||||
"moreOptions": "Diğer seçenekler"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Metin ve Markdown",
|
||||
|
||||
@ -72,12 +72,12 @@
|
||||
"copyLink": "Sao chép đường dẫn"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "Cỡ chữ",
|
||||
"import": "Import",
|
||||
"moreOptions": "Lựa chọn khác",
|
||||
"small": "nhỏ",
|
||||
"medium": "trung bình",
|
||||
"large": "lớn"
|
||||
"large": "lớn",
|
||||
"fontSize": "Cỡ chữ",
|
||||
"import": "Import",
|
||||
"moreOptions": "Lựa chọn khác"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "Văn bản & Markdown",
|
||||
|
||||
@ -74,12 +74,12 @@
|
||||
"copyLink": "复制链接"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "字体大小",
|
||||
"import": "导入",
|
||||
"moreOptions": "更多选项",
|
||||
"small": "小",
|
||||
"medium": "中",
|
||||
"large": "大"
|
||||
"large": "大",
|
||||
"fontSize": "字体大小",
|
||||
"import": "导入",
|
||||
"moreOptions": "更多选项"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "文本和Markdown",
|
||||
|
||||
@ -73,12 +73,12 @@
|
||||
"copyLink": "複製連結"
|
||||
},
|
||||
"moreAction": {
|
||||
"fontSize": "字型大小",
|
||||
"import": "匯入",
|
||||
"moreOptions": "更多選項",
|
||||
"small": "小",
|
||||
"medium": "中",
|
||||
"large": "大"
|
||||
"large": "大",
|
||||
"fontSize": "字型大小",
|
||||
"import": "匯入",
|
||||
"moreOptions": "更多選項"
|
||||
},
|
||||
"importPanel": {
|
||||
"textAndMarkdown": "文字 & Markdown",
|
||||
|
||||
@ -73,6 +73,7 @@ impl TypeOptionTransform for RichTextTypeOption {
|
||||
|| transformed_field_type.is_multi_select()
|
||||
|| transformed_field_type.is_number()
|
||||
|| transformed_field_type.is_url()
|
||||
|| transformed_field_type.is_checklist()
|
||||
{
|
||||
Some(StrCellData::from(stringify_cell_data(
|
||||
cell,
|
||||
|
||||
@ -206,7 +206,7 @@ async fn grid_switch_from_multi_select_to_text_test() {
|
||||
// Test when switching the current field from Checkbox to Text test
|
||||
// input:
|
||||
// check -> "Yes"
|
||||
// unchecked -> ""
|
||||
// unchecked -> "No"
|
||||
#[tokio::test]
|
||||
async fn grid_switch_from_checkbox_to_text_test() {
|
||||
let mut test = DatabaseFieldTest::new().await;
|
||||
@ -290,3 +290,24 @@ async fn grid_switch_from_number_to_text_test() {
|
||||
|
||||
test.run_scripts(scripts).await;
|
||||
}
|
||||
|
||||
/// Test when switching the current field from Checklist to Text test
|
||||
#[tokio::test]
|
||||
async fn grid_switch_from_checklist_to_text_test() {
|
||||
let mut test = DatabaseFieldTest::new().await;
|
||||
let field_rev = test.get_first_field(FieldType::Checklist);
|
||||
|
||||
let scripts = vec![
|
||||
SwitchToField {
|
||||
field_id: field_rev.id.clone(),
|
||||
new_field_type: FieldType::RichText,
|
||||
},
|
||||
AssertCellContent {
|
||||
field_id: field_rev.id.clone(),
|
||||
row_index: 0,
|
||||
from_field_type: FieldType::Checklist,
|
||||
expected_content: "First thing".to_string(),
|
||||
},
|
||||
];
|
||||
test.run_scripts(scripts).await;
|
||||
}
|
||||
|
||||
@ -68,6 +68,10 @@ pub struct AppearanceSettingsPB {
|
||||
#[pb(index = 12)]
|
||||
#[serde(default)]
|
||||
pub document_setting: DocumentSettingsPB,
|
||||
|
||||
#[pb(index = 13)]
|
||||
#[serde(default)]
|
||||
pub enable_rtl_toolbar_items: bool,
|
||||
}
|
||||
|
||||
const DEFAULT_RESET_VALUE: fn() -> bool = || APPEARANCE_RESET_AS_DEFAULT;
|
||||
@ -129,6 +133,7 @@ pub const APPEARANCE_DEFAULT_MONOSPACE_FONT: &str = "SF Mono";
|
||||
const APPEARANCE_RESET_AS_DEFAULT: bool = true;
|
||||
const APPEARANCE_DEFAULT_IS_MENU_COLLAPSED: bool = false;
|
||||
const APPEARANCE_DEFAULT_MENU_OFFSET: f64 = 0.0;
|
||||
const APPEARANCE_DEFAULT_ENABLE_RTL_TOOLBAR_ITEMS: bool = false;
|
||||
|
||||
impl std::default::Default for AppearanceSettingsPB {
|
||||
fn default() -> Self {
|
||||
@ -144,6 +149,7 @@ impl std::default::Default for AppearanceSettingsPB {
|
||||
menu_offset: APPEARANCE_DEFAULT_MENU_OFFSET,
|
||||
layout_direction: LayoutDirectionPB::default(),
|
||||
text_direction: TextDirectionPB::default(),
|
||||
enable_rtl_toolbar_items: APPEARANCE_DEFAULT_ENABLE_RTL_TOOLBAR_ITEMS,
|
||||
document_setting: DocumentSettingsPB::default(),
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user