diff --git a/frontend/app_flowy/lib/startup/home_deps_resolver.dart b/frontend/app_flowy/lib/startup/home_deps_resolver.dart index 54275b95b3..5b91d8a545 100644 --- a/frontend/app_flowy/lib/startup/home_deps_resolver.dart +++ b/frontend/app_flowy/lib/startup/home_deps_resolver.dart @@ -110,6 +110,46 @@ class HomeDepsResolver { ), ); + getIt.registerFactoryParam( + (field, cell) => TextCellBloc( + field: field, + cell: cell, + service: CellService(), + ), + ); + + getIt.registerFactoryParam( + (field, cell) => SelectionCellBloc( + field: field, + cell: cell, + service: CellService(), + ), + ); + + getIt.registerFactoryParam( + (field, cell) => NumberCellBloc( + field: field, + cell: cell, + service: CellService(), + ), + ); + + getIt.registerFactoryParam( + (field, cell) => DateCellBloc( + field: field, + cell: cell, + service: CellService(), + ), + ); + + getIt.registerFactoryParam( + (field, cell) => CheckboxCellBloc( + field: field, + cell: cell, + service: CellService(), + ), + ); + // trash getIt.registerLazySingleton(() => TrashService()); getIt.registerLazySingleton(() => TrashListener()); diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/cell_service.dart b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/cell_service.dart new file mode 100644 index 0000000000..c5098155cb --- /dev/null +++ b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/cell_service.dart @@ -0,0 +1 @@ +class CellService {} diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/checkbox_cell_bloc.dart b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/checkbox_cell_bloc.dart new file mode 100644 index 0000000000..8f0de7fb32 --- /dev/null +++ b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/checkbox_cell_bloc.dart @@ -0,0 +1,46 @@ +import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:freezed_annotation/freezed_annotation.dart'; +import 'dart:async'; +import 'cell_service.dart'; + +part 'checkbox_cell_bloc.freezed.dart'; + +class CheckboxCellBloc extends Bloc { + final Field field; + final Cell? cell; + final CellService service; + + CheckboxCellBloc({ + required this.field, + required this.cell, + required this.service, + }) : super(CheckboxCellState.initial(cell)) { + on( + (event, emit) async { + await event.map( + initial: (_InitialCell value) async {}, + ); + }, + ); + } + + @override + Future close() async { + return super.close(); + } +} + +@freezed +abstract class CheckboxCellEvent with _$CheckboxCellEvent { + const factory CheckboxCellEvent.initial() = _InitialCell; +} + +@freezed +abstract class CheckboxCellState with _$CheckboxCellState { + const factory CheckboxCellState({ + required Cell? cell, + }) = _CheckboxCellState; + + factory CheckboxCellState.initial(Cell? cell) => CheckboxCellState(cell: cell); +} diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/date_cell_bloc.dart b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/date_cell_bloc.dart new file mode 100644 index 0000000000..c8b5e97f2d --- /dev/null +++ b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/date_cell_bloc.dart @@ -0,0 +1,46 @@ +import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:freezed_annotation/freezed_annotation.dart'; +import 'dart:async'; +import 'cell_service.dart'; + +part 'date_cell_bloc.freezed.dart'; + +class DateCellBloc extends Bloc { + final Field field; + final Cell? cell; + final CellService service; + + DateCellBloc({ + required this.field, + required this.cell, + required this.service, + }) : super(DateCellState.initial(cell)) { + on( + (event, emit) async { + await event.map( + initial: (_InitialCell value) async {}, + ); + }, + ); + } + + @override + Future close() async { + return super.close(); + } +} + +@freezed +abstract class DateCellEvent with _$DateCellEvent { + const factory DateCellEvent.initial() = _InitialCell; +} + +@freezed +abstract class DateCellState with _$DateCellState { + const factory DateCellState({ + required Cell? cell, + }) = _DateCellState; + + factory DateCellState.initial(Cell? cell) => DateCellState(cell: cell); +} diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/number_cell_bloc.dart b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/number_cell_bloc.dart new file mode 100644 index 0000000000..b216550a81 --- /dev/null +++ b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/number_cell_bloc.dart @@ -0,0 +1,46 @@ +import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:freezed_annotation/freezed_annotation.dart'; +import 'dart:async'; +import 'cell_service.dart'; + +part 'number_cell_bloc.freezed.dart'; + +class NumberCellBloc extends Bloc { + final Field field; + final Cell? cell; + final CellService service; + + NumberCellBloc({ + required this.field, + required this.cell, + required this.service, + }) : super(NumberCellState.initial(cell)) { + on( + (event, emit) async { + await event.map( + initial: (_InitialCell value) async {}, + ); + }, + ); + } + + @override + Future close() async { + return super.close(); + } +} + +@freezed +abstract class NumberCellEvent with _$NumberCellEvent { + const factory NumberCellEvent.initial() = _InitialCell; +} + +@freezed +abstract class NumberCellState with _$NumberCellState { + const factory NumberCellState({ + required Cell? cell, + }) = _NumberCellState; + + factory NumberCellState.initial(Cell? cell) => NumberCellState(cell: cell); +} diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/selection_cell_bloc.dart b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/selection_cell_bloc.dart new file mode 100644 index 0000000000..5e7a6e8e22 --- /dev/null +++ b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/selection_cell_bloc.dart @@ -0,0 +1,46 @@ +import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:freezed_annotation/freezed_annotation.dart'; +import 'dart:async'; +import 'cell_service.dart'; + +part 'selection_cell_bloc.freezed.dart'; + +class SelectionCellBloc extends Bloc { + final Field field; + final Cell? cell; + final CellService service; + + SelectionCellBloc({ + required this.field, + required this.cell, + required this.service, + }) : super(SelectionCellState.initial(cell)) { + on( + (event, emit) async { + await event.map( + initial: (_InitialCell value) async {}, + ); + }, + ); + } + + @override + Future close() async { + return super.close(); + } +} + +@freezed +abstract class SelectionCellEvent with _$SelectionCellEvent { + const factory SelectionCellEvent.initial() = _InitialCell; +} + +@freezed +abstract class SelectionCellState with _$SelectionCellState { + const factory SelectionCellState({ + required Cell? cell, + }) = _SelectionCellState; + + factory SelectionCellState.initial(Cell? cell) => SelectionCellState(cell: cell); +} diff --git a/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/text_cell_bloc.dart b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/text_cell_bloc.dart new file mode 100644 index 0000000000..cce4ff9224 --- /dev/null +++ b/frontend/app_flowy/lib/workspace/application/grid/cell_bloc/text_cell_bloc.dart @@ -0,0 +1,48 @@ +import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:freezed_annotation/freezed_annotation.dart'; +import 'dart:async'; +import 'cell_service.dart'; + +part 'text_cell_bloc.freezed.dart'; + +class TextCellBloc extends Bloc { + final Field field; + final Cell? cell; + final CellService service; + + TextCellBloc({ + required this.field, + required this.cell, + required this.service, + }) : super(TextCellState.initial(cell?.content ?? "")) { + on( + (event, emit) async { + await event.map( + initial: (_InitialCell value) async {}, + updateText: (_UpdateText value) {}, + ); + }, + ); + } + + @override + Future close() async { + return super.close(); + } +} + +@freezed +abstract class TextCellEvent with _$TextCellEvent { + const factory TextCellEvent.initial() = _InitialCell; + const factory TextCellEvent.updateText(String text) = _UpdateText; +} + +@freezed +abstract class TextCellState with _$TextCellState { + const factory TextCellState({ + required String content, + }) = _TextCellState; + + factory TextCellState.initial(String content) => TextCellState(content: content); +} diff --git a/frontend/app_flowy/lib/workspace/application/grid/column_bloc.dart b/frontend/app_flowy/lib/workspace/application/grid/column_bloc.dart index 844360fa9b..39badc922a 100644 --- a/frontend/app_flowy/lib/workspace/application/grid/column_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/grid/column_bloc.dart @@ -1,7 +1,6 @@ import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; -import 'package:dartz/dartz.dart'; import 'dart:async'; import 'column_service.dart'; import 'data.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/grid/prelude.dart b/frontend/app_flowy/lib/workspace/application/grid/prelude.dart index 3cbe922a58..d28df04c62 100644 --- a/frontend/app_flowy/lib/workspace/application/grid/prelude.dart +++ b/frontend/app_flowy/lib/workspace/application/grid/prelude.dart @@ -5,3 +5,9 @@ export 'grid_service.dart'; export 'data.dart'; export 'column_service.dart'; export 'column_bloc.dart'; +export 'cell_bloc/text_cell_bloc.dart'; +export 'cell_bloc/number_cell_bloc.dart'; +export 'cell_bloc/selection_cell_bloc.dart'; +export 'cell_bloc/date_cell_bloc.dart'; +export 'cell_bloc/checkbox_cell_bloc.dart'; +export 'cell_bloc/cell_service.dart'; diff --git a/frontend/app_flowy/lib/workspace/application/grid/row_bloc.dart b/frontend/app_flowy/lib/workspace/application/grid/row_bloc.dart index 9af22beba9..d2852900d9 100644 --- a/frontend/app_flowy/lib/workspace/application/grid/row_bloc.dart +++ b/frontend/app_flowy/lib/workspace/application/grid/row_bloc.dart @@ -34,7 +34,7 @@ class RowBloc extends Bloc { @freezed abstract class RowEvent with _$RowEvent { - const factory RowEvent.initial(GridRowData data) = _InitialRow; + const factory RowEvent.initial() = _InitialRow; const factory RowEvent.createRow() = _CreateRow; const factory RowEvent.activeRow() = _ActiveRow; const factory RowEvent.disactiveRow() = _DisactiveRow; diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dart index 53e0bf58aa..249d47011b 100644 --- a/frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dart +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/doc/document.dart @@ -141,6 +141,7 @@ class _DocumentLeftBarItemState extends State { @override void dispose() { _controller.dispose(); + _focusNode.removeListener(_handleFocusChanged); _focusNode.dispose(); super.dispose(); } diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/layout/sizes.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/layout/sizes.dart index e669a78217..5f8f94e1a2 100755 --- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/layout/sizes.dart +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/layout/sizes.dart @@ -10,6 +10,7 @@ class GridSize { static double get trailHeaderPadding => 140 * scale; static double get headerContentPadding => 8 * scale; static double get cellContentPadding => 8 * scale; + // static EdgeInsets get headerContentInsets => EdgeInsets.symmetric( horizontal: GridSize.headerContentPadding, diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/cell_builder.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/cell_builder.dart index efe5a0bd3e..754678ef8e 100755 --- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/cell_builder.dart +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/cell_builder.dart @@ -1,17 +1,35 @@ import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; -import 'grid_cell.dart'; +import 'package:flutter/widgets.dart'; +import 'checkbox_cell.dart'; +import 'date_cell.dart'; +import 'number_cell.dart'; +import 'selection_cell.dart'; +import 'text_cell.dart'; -class GridCellBuilder { - static GridCellWidget buildCell(Field? field, Cell? cell) { - if (field == null || cell == null) { - return GridTextCell("123123123"); - } - - switch (field.fieldType) { - case FieldType.RichText: - return GridTextCell(cell.content); - default: - return const BlankCell(); - } +Widget buildGridCell(Field field, Cell? cell) { + switch (field.fieldType) { + case FieldType.Checkbox: + return CheckboxCell(field: field, cell: cell); + case FieldType.DateTime: + return DateCell(field: field, cell: cell); + case FieldType.MultiSelect: + return MultiSelectCell(field: field, cell: cell); + case FieldType.Number: + return NumberCell(field: field, cell: cell); + case FieldType.RichText: + return GridTextCell(field: field, cell: cell); + case FieldType.SingleSelect: + return SingleSelectCell(field: field, cell: cell); + default: + return const BlankCell(); + } +} + +class BlankCell extends StatelessWidget { + const BlankCell({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Container(); } } diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/checkbox_cell.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/checkbox_cell.dart new file mode 100644 index 0000000000..d3d2b57735 --- /dev/null +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/checkbox_cell.dart @@ -0,0 +1,47 @@ +import 'package:app_flowy/startup/startup.dart'; +import 'package:app_flowy/workspace/application/grid/cell_bloc/checkbox_cell_bloc.dart'; +import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class CheckboxCell extends StatefulWidget { + final Field field; + final Cell? cell; + + const CheckboxCell({ + required this.field, + required this.cell, + Key? key, + }) : super(key: key); + + @override + State createState() => _CheckboxCellState(); +} + +class _CheckboxCellState extends State { + late CheckboxCellBloc _cellBloc; + + @override + void initState() { + _cellBloc = getIt(param1: widget.field, param2: widget.cell); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return BlocProvider.value( + value: _cellBloc, + child: BlocBuilder( + builder: (context, state) { + return Container(); + }, + ), + ); + } + + @override + Future dispose() async { + await _cellBloc.close(); + super.dispose(); + } +} diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/date_cell.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/date_cell.dart new file mode 100644 index 0000000000..e1661fdffa --- /dev/null +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/date_cell.dart @@ -0,0 +1,47 @@ +import 'package:app_flowy/startup/startup.dart'; +import 'package:app_flowy/workspace/application/grid/cell_bloc/date_cell_bloc.dart'; +import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; +import 'package:flutter/widgets.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class DateCell extends StatefulWidget { + final Field field; + final Cell? cell; + + const DateCell({ + required this.field, + required this.cell, + Key? key, + }) : super(key: key); + + @override + State createState() => _DateCellState(); +} + +class _DateCellState extends State { + late DateCellBloc _cellBloc; + + @override + void initState() { + _cellBloc = getIt(param1: widget.field, param2: widget.cell); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return BlocProvider.value( + value: _cellBloc, + child: BlocBuilder( + builder: (context, state) { + return Container(); + }, + ), + ); + } + + @override + Future dispose() async { + await _cellBloc.close(); + super.dispose(); + } +} diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/grid_cell.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/grid_cell.dart deleted file mode 100755 index be04555bd4..0000000000 --- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/grid_cell.dart +++ /dev/null @@ -1,80 +0,0 @@ -import 'package:flutter/material.dart'; - -/// The interface of base cell. -abstract class GridCellWidget extends StatelessWidget { - final canSelect = true; - - const GridCellWidget({Key? key}) : super(key: key); -} - -class GridTextCell extends GridCellWidget { - late final TextEditingController _controller; - - GridTextCell(String content, {Key? key}) : super(key: key) { - _controller = TextEditingController(text: content); - } - - @override - Widget build(BuildContext context) { - return TextField( - controller: _controller, - onChanged: (value) {}, - maxLines: 1, - style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500), - decoration: const InputDecoration( - contentPadding: EdgeInsets.zero, - border: InputBorder.none, - isDense: true, - ), - ); - } -} - -class DateCell extends GridCellWidget { - final String content; - const DateCell(this.content, {Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return Text(content); - } -} - -class NumberCell extends GridCellWidget { - final String content; - const NumberCell(this.content, {Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return Text(content); - } -} - -class SingleSelectCell extends GridCellWidget { - final String content; - const SingleSelectCell(this.content, {Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return Text(content); - } -} - -class MultiSelectCell extends GridCellWidget { - final String content; - const MultiSelectCell(this.content, {Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return Text(content); - } -} - -class BlankCell extends GridCellWidget { - const BlankCell({Key? key}) : super(key: key); - - @override - Widget build(BuildContext context) { - return Container(); - } -} diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/grid_row.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/grid_row.dart index dce4b61d4f..c23bf8f533 100755 --- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/grid_row.dart +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/grid_row.dart @@ -22,7 +22,7 @@ class _GridRowWidgetState extends State { @override void initState() { - _rowBloc = getIt(param1: widget.data); + _rowBloc = getIt(param1: widget.data)..add(const RowEvent.initial()); super.initState(); } @@ -54,7 +54,7 @@ class _GridRowWidgetState extends State { @override Future dispose() async { - _rowBloc.close(); + await _rowBloc.close(); super.dispose(); } @@ -69,7 +69,7 @@ class _GridRowWidgetState extends State { final cellData = state.data.cellMap[field.id]; return CellContainer( width: field.width.toDouble(), - child: GridCellBuilder.buildCell(field, cellData), + child: buildGridCell(field, cellData), ); }, ).toList(), diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/number_cell.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/number_cell.dart new file mode 100644 index 0000000000..86b9863019 --- /dev/null +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/number_cell.dart @@ -0,0 +1,47 @@ +import 'package:app_flowy/startup/startup.dart'; +import 'package:app_flowy/workspace/application/grid/cell_bloc/number_cell_bloc.dart'; +import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class NumberCell extends StatefulWidget { + final Field field; + final Cell? cell; + + const NumberCell({ + required this.field, + required this.cell, + Key? key, + }) : super(key: key); + + @override + State createState() => _NumberCellState(); +} + +class _NumberCellState extends State { + late NumberCellBloc _cellBloc; + + @override + void initState() { + _cellBloc = getIt(param1: widget.field, param2: widget.cell); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return BlocProvider.value( + value: _cellBloc, + child: BlocBuilder( + builder: (context, state) { + return Container(); + }, + ), + ); + } + + @override + Future dispose() async { + await _cellBloc.close(); + super.dispose(); + } +} diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/selection_cell.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/selection_cell.dart new file mode 100644 index 0000000000..047cff7475 --- /dev/null +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/selection_cell.dart @@ -0,0 +1,75 @@ +import 'package:app_flowy/startup/startup.dart'; +import 'package:app_flowy/workspace/application/grid/prelude.dart'; +import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; +import 'package:flutter/material.dart'; + +class SingleSelectCell extends StatefulWidget { + final Field field; + final Cell? cell; + + const SingleSelectCell({ + required this.field, + required this.cell, + Key? key, + }) : super(key: key); + + @override + State createState() => _SingleSelectCellState(); +} + +class _SingleSelectCellState extends State { + late SelectionCellBloc _cellBloc; + + @override + void initState() { + _cellBloc = getIt(param1: widget.field, param2: widget.cell); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Container(); + } + + @override + Future dispose() async { + await _cellBloc.close(); + super.dispose(); + } +} + +//---------------------------------------------------------------- +class MultiSelectCell extends StatefulWidget { + final Field field; + final Cell? cell; + + const MultiSelectCell({ + required this.field, + required this.cell, + Key? key, + }) : super(key: key); + + @override + State createState() => _MultiSelectCellState(); +} + +class _MultiSelectCellState extends State { + late SelectionCellBloc _cellBloc; + + @override + void initState() { + _cellBloc = getIt(param1: widget.field, param2: widget.cell); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Container(); + } + + @override + Future dispose() async { + await _cellBloc.close(); + super.dispose(); + } +} diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/text_cell.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/text_cell.dart new file mode 100644 index 0000000000..7661ddc22f --- /dev/null +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/content/text_cell.dart @@ -0,0 +1,70 @@ +import 'package:app_flowy/startup/startup.dart'; +import 'package:app_flowy/workspace/application/grid/cell_bloc/text_cell_bloc.dart'; +import 'package:flowy_sdk/protobuf/flowy-grid-data-model/grid.pb.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +/// The interface of base cell. + +class GridTextCell extends StatefulWidget { + final Field field; + final Cell? cell; + + const GridTextCell({ + required this.field, + required this.cell, + Key? key, + }) : super(key: key); + + @override + State createState() => _GridTextCellState(); +} + +class _GridTextCellState extends State { + late TextEditingController _controller; + final _focusNode = FocusNode(); + late TextCellBloc _cellBloc; + + @override + void initState() { + _cellBloc = getIt(param1: widget.field, param2: widget.cell); + _controller = TextEditingController(text: _cellBloc.state.content); + _focusNode.addListener(_focusChanged); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return BlocProvider.value( + value: _cellBloc, + child: BlocBuilder( + builder: (context, state) { + return TextField( + controller: _controller, + focusNode: _focusNode, + onChanged: (value) {}, + maxLines: 1, + style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w500), + decoration: const InputDecoration( + contentPadding: EdgeInsets.zero, + border: InputBorder.none, + isDense: true, + ), + ); + }, + ), + ); + } + + @override + Future dispose() async { + await _cellBloc.close(); + _focusNode.removeListener(_focusChanged); + _focusNode.dispose(); + super.dispose(); + } + + void _focusChanged() { + _cellBloc.add(TextCellEvent.updateText(_controller.text)); + } +} diff --git a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/header.dart b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/header.dart index d3cf4a5255..83d24535f4 100644 --- a/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/header.dart +++ b/frontend/app_flowy/lib/workspace/presentation/plugins/grid/src/widgets/header/header.dart @@ -43,7 +43,7 @@ class GridHeader extends StatelessWidget { @override Widget build(BuildContext context) { return BlocProvider( - create: (context) => getIt(param1: fields), + create: (context) => getIt(param1: fields)..add(const ColumnEvent.initial()), child: BlocBuilder( builder: (context, state) { final headers = state.fields diff --git a/frontend/rust-lib/flowy-grid/src/event_handler.rs b/frontend/rust-lib/flowy-grid/src/event_handler.rs index eb17b1f35e..087d5c51cd 100644 --- a/frontend/rust-lib/flowy-grid/src/event_handler.rs +++ b/frontend/rust-lib/flowy-grid/src/event_handler.rs @@ -1,6 +1,8 @@ use crate::manager::GridManager; use flowy_error::FlowyError; -use flowy_grid_data_model::entities::{Grid, GridId, QueryFieldPayload, QueryRowPayload, RepeatedField, RepeatedRow}; +use flowy_grid_data_model::entities::{ + Cell, Grid, GridId, QueryFieldPayload, QueryRowPayload, RepeatedField, RepeatedRow, +}; use lib_dispatch::prelude::{data_result, AppData, Data, DataResult}; use std::sync::Arc; @@ -47,3 +49,14 @@ pub(crate) async fn create_row_handler( let _ = editor.create_empty_row().await?; Ok(()) } + +#[tracing::instrument(level = "debug", skip(data, manager), err)] +pub(crate) async fn update_cell_handler( + data: Data, + manager: AppData>, +) -> Result<(), FlowyError> { + let cell: Cell = data.into_inner(); + let editor = manager.get_grid_editor(id.as_ref())?; + let _ = editor.create_empty_row().await?; + Ok(()) +} diff --git a/frontend/rust-lib/flowy-grid/src/event_map.rs b/frontend/rust-lib/flowy-grid/src/event_map.rs index f171e27826..773e632191 100644 --- a/frontend/rust-lib/flowy-grid/src/event_map.rs +++ b/frontend/rust-lib/flowy-grid/src/event_map.rs @@ -11,7 +11,8 @@ pub fn create(grid_manager: Arc) -> Module { .event(GridEvent::GetGridData, get_grid_data_handler) .event(GridEvent::GetRows, get_rows_handler) .event(GridEvent::GetFields, get_fields_handler) - .event(GridEvent::CreateRow, create_row_handler); + .event(GridEvent::CreateRow, create_row_handler) + .event(GridEvent::UpdateCell, update_cell_handler); module } @@ -30,4 +31,7 @@ pub enum GridEvent { #[event(input = "GridId")] CreateRow = 3, + + #[event(input = "Cell")] + UpdateCell = 4, } diff --git a/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs b/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs index 9512e59b26..096735c07d 100644 --- a/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs +++ b/frontend/rust-lib/flowy-grid/src/services/grid_editor.rs @@ -15,6 +15,7 @@ use lib_infra::future::FutureResult; use lib_infra::uuid; use lib_ot::core::PlainTextAttributes; +use dashmap::mapref::one::Ref; use rayon::iter::{IntoParallelIterator, ParallelIterator}; use std::collections::HashMap; use std::sync::Arc; @@ -28,6 +29,7 @@ pub struct ClientGridEditor { kv_persistence: Arc, field_map: DashMap, + cell_map: DashMap, } impl ClientGridEditor { @@ -44,6 +46,7 @@ impl ClientGridEditor { let rev_manager = Arc::new(rev_manager); let field_map = load_all_fields(&grid_pad, &kv_persistence).await?; let grid_pad = Arc::new(RwLock::new(grid_pad)); + let cell_map = DashMap::new(); Ok(Arc::new(Self { grid_id: grid_id.to_owned(), @@ -52,17 +55,20 @@ impl ClientGridEditor { rev_manager, kv_persistence, field_map, + cell_map, })) } pub async fn create_empty_row(&self) -> FlowyResult<()> { let row = RawRow::new(&uuid(), &self.grid_id, vec![]); + self.cell_map.insert(row.id.clone(), row.clone()); self.create_row(row).await?; Ok(()) } async fn create_row(&self, row: RawRow) -> FlowyResult<()> { let _ = self.modify(|grid| Ok(grid.create_row(&row)?)).await?; + self.cell_map.insert(row.id.clone(), row.clone()); let _ = self.kv_persistence.set(row)?; Ok(()) } @@ -73,6 +79,13 @@ impl ClientGridEditor { Ok(()) } + // pub async fn update_row(&self, cell: Cell) -> FlowyResult<()> { + // match self.cell_map.get(&cell.id) { + // None => Err(FlowyError::internal().context(format!("Can't find cell with id: {}", cell.id))), + // Some(raw_cell) => {} + // } + // } + pub async fn create_field(&mut self, field: Field) -> FlowyResult<()> { let _ = self.modify(|grid| Ok(grid.create_field(&field)?)).await?; let _ = self.kv_persistence.set(field)?; @@ -99,6 +112,7 @@ impl ClientGridEditor { tracing::error!("Can't find the field with {}", field_id); return None; } + self.cell_map.insert(raw_cell.id.clone(), raw_cell.clone()); let field = some_field.unwrap(); match stringify_deserialize(raw_cell.data, field.value()) {