Skip to content

Commit

Permalink
Update 6.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bosskmk committed Jan 26, 2023
1 parent 11b693d commit 006d751
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 21 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [6.0.0] - 2023. 1. 26

* Updated for flutter 3.7 version.

## [5.4.9] - 2022. 12. 15

* Fix sortIdx bug.
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## PlutoGrid for flutter - v5.4.9
## PlutoGrid for flutter - v6.0.0

[![Awesome Flutter](https://img.shields.io/badge/Awesome-Flutter-blue.svg)](https://github.com/Solido/awesome-flutter)
[![codecov](https://codecov.io/gh/bosskmk/pluto_grid/branch/master/graph/badge.svg)](https://codecov.io/gh/bosskmk/pluto_grid)
Expand Down Expand Up @@ -173,6 +173,7 @@ Widget build(BuildContext context) {

| Flutter | PlutoGrid |
|-----------------|-----------------------|
| 3.7.0 or higher | 6.0.0 or higher |
| 3.3.0 or higher | 5.0.6 or higher |
| 3.0.0 or higher | 3.0.0-0.pre or higher |
| 2.5.0 or higher | 2.5.0 or higher |
Expand Down
5 changes: 4 additions & 1 deletion demo/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,11 @@ class MyApp extends StatelessWidget {
theme: ThemeData(
primaryColor: PlutoGridExampleColors.primaryColor,
fontFamily: 'OpenSans',
backgroundColor: PlutoGridExampleColors.backgroundColor,
scaffoldBackgroundColor: PlutoGridExampleColors.backgroundColor,
colorScheme: const ColorScheme.light(
primary: PlutoGridExampleColors.primaryColor,
background: PlutoGridExampleColors.backgroundColor,
),
),
);
}
Expand Down
1 change: 1 addition & 0 deletions demo/linux/flutter/ephemeral/.plugin_symlinks/printing
2 changes: 1 addition & 1 deletion lib/src/helper/show_column_menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Future<T?>? showColumnMenu<T>({
Color backgroundColor = Colors.white,
}) {
final RenderBox overlay =
Overlay.of(context)!.context.findRenderObject() as RenderBox;
Overlay.of(context).context.findRenderObject() as RenderBox;

return showMenu<T>(
context: context,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/manager/state/focus_state.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ mixin FocusState implements IPlutoGridState {

@override
void setKeepFocus(bool flag, {bool notify = true}) {
if (keepFocus == flag) {
if (keepFocus == flag && keepFocus == hasFocus) {
return;
}

Expand Down
16 changes: 9 additions & 7 deletions lib/src/ui/columns/pluto_column_title.dart
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,15 @@ class PlutoColumnTitleState extends PlutoStateWithChange<PlutoColumnTitle> {
),
);

stateManager.columnMenuDelegate.onSelected(
context: context,
stateManager: stateManager,
column: widget.column,
mounted: mounted,
selected: selected,
);
if (context.mounted) {
stateManager.columnMenuDelegate.onSelected(
context: context,
stateManager: stateManager,
column: widget.column,
mounted: mounted,
selected: selected,
);
}
}

void _handleOnPointDown(PointerDownEvent event) {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/ui/miscellaneous/pluto_state_with_change.dart
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ mixin PlutoStateWithKeepAlive<T extends StatefulWidget>
}

void _releaseKeepAlive() {
_keepAliveHandle!.release();
_keepAliveHandle!.dispose();
_keepAliveHandle = null;
}
}
5 changes: 4 additions & 1 deletion lib/src/ui/miscellaneous/pluto_visibility_layout.dart
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,10 @@ class _NullElement extends Element {
bool get debugDoingBuild => throw UnimplementedError();

@override
void performRebuild() => throw UnimplementedError();
void performRebuild() {
super.performRebuild();
throw UnimplementedError();
}
}

class _NullWidget extends Widget {
Expand Down
10 changes: 5 additions & 5 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: pluto_grid
description: PlutoGrid is a dataGrid that can be controlled by the keyboard on desktop and web. Of course, it works well on Android and IOS. (DataGrid, DataTable, Data Grid, Data Table, Sticky)
version: 5.4.9
version: 6.0.0
homepage: https://pluto.weblaze.dev
repository: https://github.com/bosskmk/pluto_grid

Expand All @@ -11,13 +11,13 @@ environment:
dependencies:
flutter:
sdk: flutter
intl: ^0.17.0
rxdart: ^0.27.5
collection: ^1.16.0
intl: ^0.18.0
rxdart: ^0.27.7
collection: ^1.17.0

dev_dependencies:
flutter_test:
sdk: flutter
mockito: ^5.3.2
build_runner: ^2.3.2
build_runner: ^2.3.3
flutter_lints: ^2.0.1
3 changes: 0 additions & 3 deletions test/scenario/paginate_rows/infinity_scroll_rows_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,6 @@ void main() {

expect(stateManager.refRows.length, 40);

await tester.tap(find.text('column0 value 19'));
await tester.pumpAndSettle();

await tester.sendKeyEvent(LogicalKeyboardKey.pageDown);
await tester.pumpAndSettle();

Expand Down
1 change: 1 addition & 0 deletions test/src/pluto_grid_date_picker_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ void main() {

expect(find.text(currentMonthYear), findsOneWidget);

await tester.tap(find.text('2'));
await tester.tap(find.text('1'));

await tester.pump();
Expand Down

0 comments on commit 006d751

Please sign in to comment.