Skip to content

Commit 8445446

Browse files
committed
fix: #508 auto format number
1 parent 546b1d2 commit 8445446

File tree

22 files changed

+813
-682
lines changed

22 files changed

+813
-682
lines changed

frontend/app_flowy/lib/workspace/application/grid/cell/number_cell_bloc.dart

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'package:flowy_sdk/log.dart';
12
import 'package:flutter_bloc/flutter_bloc.dart';
23
import 'package:freezed_annotation/freezed_annotation.dart';
34
import 'dart:async';
@@ -14,25 +15,23 @@ class NumberCellBloc extends Bloc<NumberCellEvent, NumberCellState> {
1415
}) : super(NumberCellState.initial(cellContext)) {
1516
on<NumberCellEvent>(
1617
(event, emit) async {
17-
await event.map(
18-
initial: (_Initial value) async {
18+
await event.when(
19+
initial: () async {
1920
_startListening();
2021
},
21-
didReceiveCellUpdate: (_DidReceiveCellUpdate value) {
22-
emit(state.copyWith(content: value.cellContent ?? ""));
22+
didReceiveCellUpdate: (cellContent) {
23+
emit(state.copyWith(content: cellContent ?? ""));
2324
},
24-
updateCell: (_UpdateCell value) async {
25-
await _updateCellValue(value, emit);
25+
updateCell: (text) async {
26+
cellContext.saveCellData(text, resultCallback: (result) {
27+
result.fold(() => null, (err) => Log.error(err));
28+
});
2629
},
2730
);
2831
},
2932
);
3033
}
3134

32-
Future<void> _updateCellValue(_UpdateCell value, Emitter<NumberCellState> emit) async {
33-
cellContext.saveCellData(value.text);
34-
}
35-
3635
@override
3736
Future<void> close() async {
3837
if (_onCellChangedFn != null) {

frontend/app_flowy/lib/workspace/application/grid/field/type_option/number_bloc.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:app_flowy/workspace/application/grid/field/type_option/type_option_service.dart';
2+
import 'package:flowy_sdk/protobuf/flowy-grid/format.pbenum.dart';
23
import 'package:flowy_sdk/protobuf/flowy-grid/number_type_option.pb.dart';
34
import 'package:flutter_bloc/flutter_bloc.dart';
45
import 'package:freezed_annotation/freezed_annotation.dart';

frontend/app_flowy/lib/workspace/application/grid/field/type_option/number_format_bloc.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:flowy_sdk/protobuf/flowy-grid/number_type_option.pb.dart';
1+
import 'package:flowy_sdk/protobuf/flowy-grid/format.pbenum.dart';
22
import 'package:flutter_bloc/flutter_bloc.dart';
33
import 'package:freezed_annotation/freezed_annotation.dart';
44
import 'dart:async';

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/number_cell.dart

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,7 @@ class _NumberCellState extends State<NumberCell> {
8787
_delayOperation?.cancel();
8888
_delayOperation = Timer(const Duration(milliseconds: 300), () {
8989
if (_cellBloc.isClosed == false && _controller.text != _cellBloc.state.content) {
90-
final number = num.tryParse(_controller.text);
91-
if (number != null) {
92-
_cellBloc.add(NumberCellEvent.updateCell(_controller.text));
93-
} else {
94-
_controller.text = "";
95-
}
90+
_cellBloc.add(NumberCellEvent.updateCell(_controller.text));
9691
}
9792
});
9893
}

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/cell/select_option_cell/extension.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flowy_infra/theme.dart';
22
import 'package:flowy_infra_ui/style_widget/hover.dart';
33
import 'package:flowy_infra_ui/style_widget/text.dart';
4-
import 'package:flowy_infra_ui/widget/spacing.dart';
54
import 'package:flowy_sdk/protobuf/flowy-grid/selection_type_option.pb.dart';
65
import 'package:flutter/material.dart';
76
import 'package:easy_localization/easy_localization.dart';

frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/type_option/number.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import 'package:flowy_infra_ui/flowy_infra_ui.dart';
99
import 'package:flowy_infra_ui/style_widget/button.dart';
1010
import 'package:flowy_infra_ui/style_widget/text.dart';
1111
import 'package:flowy_infra_ui/widget/spacing.dart';
12-
import 'package:flowy_sdk/protobuf/flowy-grid/number_type_option.pb.dart';
12+
import 'package:flowy_sdk/protobuf/flowy-grid/format.pbenum.dart';
1313
import 'package:flutter/material.dart';
1414
import 'package:flutter_bloc/flutter_bloc.dart';
1515
import 'package:easy_localization/easy_localization.dart' hide NumberFormat;

frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-grid/format.pb.dart

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-grid/format.pbenum.dart

Lines changed: 94 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-grid/format.pbjson.dart

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/app_flowy/packages/flowy_sdk/lib/protobuf/flowy-grid/format.pbserver.dart

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)