diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7fafa2ae..b009bc98b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,80 +1,80 @@
 ## [7.0.2] - 2023. 5. 13
 
-* Add Japanese, Turkish languages.
-* Fix Intl version.
+- Add Japanese, Turkish languages.
+- Fix Intl version.
 
 ## [7.0.1] - 2023. 5. 11
 
-* Fix SDK version.
+- Fix SDK version.
 
 ## [7.0.0] - 2023. 5. 11
 
-* Compatible with Flutter 3.10.
+- Compatible with Flutter 3.10.
 
 ## [6.0.4] - 2023. 3. 7
 
-* Add Scrollbar properties. https://github.com/bosskmk/pluto_grid/issues/743
+- Add Scrollbar properties. https://github.com/bosskmk/pluto_grid/issues/743
 
 ## [6.0.3] - 2023. 3. 6
 
-* Add locales.(German, French)
-* Fix row group expanded bug. https://github.com/bosskmk/pluto_grid/issues/775
+- Add locales.(German, French)
+- Fix row group expanded bug. https://github.com/bosskmk/pluto_grid/issues/775
 
 ## [6.0.2] - 2023. 2. 2
 
-* Fix filtering bug of number.
+- Fix filtering bug of number.
 
 ## [6.0.1] - 2023. 1. 26
 
-* Fix rendering issue when tapping another cell after editing a cell.
+- Fix rendering issue when tapping another cell after editing a cell.
 
 ## [6.0.0] - 2023. 1. 26
 
-* Updated for flutter 3.7 version.
+- Updated for flutter 3.7 version.
 
 ## [5.4.9] - 2022. 12. 15
 
-* Fix sortIdx bug.
+- Fix sortIdx bug.
 
 ## [5.4.8] - 2022. 12. 10
 
-* Add suppressed auto size of column.
-* Fix china locale.
-* Modify didUpdateWidget.
+- Add suppressed auto size of column.
+- Fix china locale.
+- Modify didUpdateWidget.
 
 ## [5.4.7] - 2022. 12. 2
 
-* Fix sorting bug.  
+- Fix sorting bug.  
   Fixed sorting issue with pagination applied.  
   https://github.com/bosskmk/pluto_grid/issues/668
 
 ## [5.4.6] - 2022. 11. 30
 
-* Fix keepAlive.  
-  Fixed a bug that slowed down when moving horizontally/vertically   
+- Fix keepAlive.  
+  Fixed a bug that slowed down when moving horizontally/vertically  
   with the keyboard direction keys for a long time in succession.
 
 ## [5.4.5] - 2022. 11. 30
 
-* Fix RTL initiation flicker.   
+- Fix RTL initiation flicker.  
   By https://github.com/Milad-Akarie
-* Fix column context menu is triggered after drag (column resizing).  
+- Fix column context menu is triggered after drag (column resizing).  
   By https://github.com/Milad-Akarie
 
 ## [5.4.4] - 2022. 11. 29
 
-* Add hovered scrollbar.
+- Add hovered scrollbar.
   https://pluto.weblaze.dev/scrollbar-and-scroll-behavior
 
 ## [5.4.3] - 2022. 11. 21
 
-* Add iterateRowType to PlutoAggregateColumnFooter.
-* Modify enter key.(Included numpadEnter)
-* Add onToggled to row group delegate.
+- Add iterateRowType to PlutoAggregateColumnFooter.
+- Modify enter key.(Included numpadEnter)
+- Add onToggled to row group delegate.
 
 ## [5.4.2] - 2022. 11. 15
 
-* Add properties of PlutoGridScrollbarConfig.
+- Add properties of PlutoGridScrollbarConfig.
   - onlyDraggingThumb
   - mainAxisMargin
   - crossAxisMargin
@@ -83,416 +83,416 @@
 
 ## [5.4.1] - 2022. 11. 12
 
-* Fix layout size bug.
+- Fix layout size bug.
 
 ## [5.4.0] - 2022. 11. 5
 
-* Add shortcut to PlutoGridConfiguration.  
+- Add shortcut to PlutoGridConfiguration.  
   https://pluto.weblaze.dev/shortcuts
-* Add popupIcon for popup type column.  
+- Add popupIcon for popup type column.  
   You can change the icon that appears on the right of the date, time, or selection type column cell or set it to null to remove it.
 
 ## [5.3.2] - 2022. 11. 2
 
-* Add onColumnsMoved, noRowsWidget.
+- Add onColumnsMoved, noRowsWidget.
 
 ## [5.3.1] - 2022. 10. 30
 
-* Add readOnly, multiSelect modes to PlutoGridMode.
-* Fix Bug showing filter icon when filterOnlyEvent is true.
+- Add readOnly, multiSelect modes to PlutoGridMode.
+- Fix Bug showing filter icon when filterOnlyEvent is true.
 
 ## [5.3.0] - 2022. 10. 22
 
-* Add PlutoLazyPagination, PlutoInfinityScrollRows for server-side pagination.
-* Add tabKeyAction to PlutoGridConfiguration.
+- Add PlutoLazyPagination, PlutoInfinityScrollRows for server-side pagination.
+- Add tabKeyAction to PlutoGridConfiguration.
 
 ## [5.2.1] - 2022. 10. 19
 
-* Add pageSizeToMove to PlutoPagination.
+- Add pageSizeToMove to PlutoPagination.
 
 ## [5.2.0] - 2022. 10. 16
 
-* Add row group.
+- Add row group.
 
 ## [5.1.3] - 2022. 10. 15
 
-* Add norway locale.
+- Add norway locale.
 
 ## [5.1.2] - 2022. 9. 27
 
-* Change PlutoGridStateManager.configuration to not null.
-* Add Currency column.
+- Change PlutoGridStateManager.configuration to not null.
+- Add Currency column.
   https://github.com/bosskmk/pluto_grid/blob/master/demo/lib/screen/feature/currency_type_column_screen.dart
 
 ## [5.1.1] - 2022. 9. 25
 
-* Fix dispose condition of TextEditingController.
+- Fix dispose condition of TextEditingController.
 
 ## [5.1.0] - 2022. 9. 10
 
-* Add Column footer.  
+- Add Column footer.  
   https://weblaze.dev/pluto_grid/build/web/#feature/column-footer
-* Add to be able to set locale for numeric type PlutoColumn.
+- Add to be able to set locale for numeric type PlutoColumn.
 
 ## [5.0.6] - 2022. 9. 5
 
-* Add support for countries that use comma as Decimal separator.
-* Breaking change - Only available for flutter 3.3,   
+- Add support for countries that use comma as Decimal separator.
+- Breaking change - Only available for flutter 3.3,  
   otherwise it'll show this error on console: "Error: No named parameter with the name 'disabledForegroundColor'"
 
 ## [5.0.5] - 2022. 8. 30
 
-* Add columnAscendingIcon, columnDescendingIcon.
-* Modify column menu tap position.
-* Update Persian locale.
-* Fix bug on select mode.
-* Add disabledBorder to PlutoColumnFilter.
+- Add columnAscendingIcon, columnDescendingIcon.
+- Modify column menu tap position.
+- Update Persian locale.
+- Fix bug on select mode.
+- Add disabledBorder to PlutoColumnFilter.
 
 ## [5.0.4] - 2022. 7. 18
 
-* Add properties to PlutoGridPopup, PlutoDualGrid. (properties used in PlutoGrid)
-* Fix a bug where some columns and cells were not displayed when changing the screen size.
-* Remove RepaintBoundary from Column and Cell widgets.
+- Add properties to PlutoGridPopup, PlutoDualGrid. (properties used in PlutoGrid)
+- Fix a bug where some columns and cells were not displayed when changing the screen size.
+- Remove RepaintBoundary from Column and Cell widgets.
 
 ## [5.0.3] - 2022. 7. 16
 
-* Update czech locale.
+- Update czech locale.
 
 ## [5.0.2] - 2022. 7. 15
 
-* Fix menu position.
+- Fix menu position.
 
 ## [5.0.1] - 2022. 7. 13
 
-* Fix a problem that left or right scrolling was a bit out of sync with TextDirection.rtl.
+- Fix a problem that left or right scrolling was a bit out of sync with TextDirection.rtl.
 
 ## [5.0.0] - 2022. 7. 11
 
-* Added middle divider for `PlutoDualGrid`, `PlutoDualPopup` widget.  
+- Added middle divider for `PlutoDualGrid`, `PlutoDualPopup` widget.  
   By adding a divider in the center of the two grids, the position can be changed by dragging and dropping.  
   https://weblaze.dev/pluto_grid/build/web/#feature/dual-mode
-* Add to `PlutoGridEventManager` stream to receive column sort changes.  
+- Add to `PlutoGridEventManager` stream to receive column sort changes.  
   Add `PlutoGrid.onSorted` callback.
-* Added an option to disable column width adjustment while displaying the column right menu.
+- Added an option to disable column width adjustment while displaying the column right menu.
   - Activate both `PlutoColumn.enableContextMenu` and `PlutoColumn.enableDropToResize`
     Tap the column menu to display the context menu. Drag left or right to adjust the column width.
   - Activate only `PlutoColumn.enableContextMenu`
     You cannot adjust the column width by dragging the column menu.
   - Only enable `PlutoColumn.enableDropToResize`
     You cannot call the context menu by tapping the column menu.
-* Hide all column headings.  
+- Hide all column headings.  
   `PlutoGridStateManager.setShowColumnTitle`  
   https://weblaze.dev/pluto_grid/build/web/#development  
   In the link above, you can hide or show the entire column area by clicking the toggle column title button in the top show menu.
-* When the parent widget of `PlutoGrid` is scrolled, in the previous 4.0.0 logic,   
+- When the parent widget of `PlutoGrid` is scrolled, in the previous 4.0.0 logic,  
   the error that the row area disappears when the column is out of the screen area has been fixed.
-* Improve text selection when edit TextCell by @DmitrySboychakov
-* Improve padding for table cells and column titles by @DmitrySboychakov
-* Display a scroll bar when moving the horizontal axis with the keyboard.
-* Changing the way columns are moved by dragging them.  
+- Improve text selection when edit TextCell by @DmitrySboychakov
+- Improve padding for table cells and column titles by @DmitrySboychakov
+- Display a scroll bar when moving the horizontal axis with the keyboard.
+- Changing the way columns are moved by dragging them.  
   Previously, it was changed immediately in the onDragUpdate state.
   Changed in onDragEnd state in the changed version. Change the background color of the column to be moved instead.
   (`PlutoGridStateManager.dragTargetColumnColor`)
-* Modified to pass `PlutoColumn` instead of passing `PlutoColumn.key` when calling `hideColumn`.
-* Add `PlutoGridStateManager.hideColumns(List<PlutoColumn> columns, bool hide)`
-* Changes due to the constraint of a frozen column.
+- Modified to pass `PlutoColumn` instead of passing `PlutoColumn.key` when calling `hideColumn`.
+- Add `PlutoGridStateManager.hideColumns(List<PlutoColumn> columns, bool hide)`
+- Changes due to the constraint of a frozen column.
   - The width of the frozen column cannot be expanded beyond the limit width.
   - When changing a non-frozen column to a frozen column, it cannot be changed if the constraint width is insufficient.
   - If a column with a hidden frozen column state is unhidden in a narrow constraint width, the column frozen state is forcibly changed to `PlutoColumnFrozen.none`.
-  - If the entire grid width is narrowed to less than the constraint width while   
+  - If the entire grid width is narrowed to less than the constraint width while  
     there is a frozen column, the frozen column is permanently changed to `PlutoColumnFrozen.none`, and it does not return to the frozen column again even if the grid width is increased.
-* Change the logic to move by dragging rows.  
+- Change the logic to move by dragging rows.  
   Previous behavior: rows are moved while dragging.  
   Changed behavior: It does not move while dragging, but moves only when you mouse-up or tap-up.
-* Changed logic for scrolling when dragging rows, column or selecting rows or cells.  
+- Changed logic for scrolling when dragging rows, column or selecting rows or cells.  
   `Previous version`: Scrolling continues only when the pointer is moved continuously so that the move event of the mouse (tab) continues to occur  
   `Changed version`: If the move event of the mouse (tab) occurs only once, the scroll event continues in the scroll direction. The scroll animation continues to the end of the scroll direction even if the move event is not triggered by continuously moving the pointer.  
   The scroll animation stops when the pointer enters a grid that does not require scrolling or when a MouseUp(PointerUp) event is fired.
-* Expand Columns to cover the parent Container Width.
-* Support RTL.  
+- Expand Columns to cover the parent Container Width.
+- Support RTL.  
   Changed left and right of `PlutoColumn.frozen` to start and end.  
   `PlutoColumn.textAlign` default value changed from left to start.  
   `PlutoColumn.titleTextAlign` default value changed from left to start.  
   https://weblaze.dev/pluto_grid/build/web/#feature/rtl
-* Change `PlutoGridConfiguration`.  
+- Change `PlutoGridConfiguration`.  
   Settings such as color, size, icon, border, and text style have been moved to `PlutoGridConfiguration.style`.
-* Even/Odd Color.  
+- Even/Odd Color.  
   Add `PlutoGridConfiguration.style.oddRowColor`, `PlutoGridConfiguration.style.evenRowColor`.
-* Set default row color.  
+- Set default row color.  
   Add `PlutoGridConfiguration.style.rowColor`.
-* Customize column menu.  
+- Customize column menu.  
   https://weblaze.dev/pluto_grid/build/web/#feature/column-menu
 
 ## [4.0.1] - 2022. 6. 21
 
-* Fixed visibleFraction error when moving from tab view to another tab.
+- Fixed visibleFraction error when moving from tab view to another tab.
 
 ## [4.0.0] - 2022. 6. 7
 
-* Rendering speed improvements.  
+- Rendering speed improvements.  
   Please check the performance in profile or build mode.  
   Debug mode can be slow if there are many lines.
-* Some state management is applied as a Provider.
-* Added PlutoGridStateManager.initializeRowsAsync static method.   
-  To avoid UI freezing when starting the grid with a large number of rows.    
+- Some state management is applied as a Provider.
+- Added PlutoGridStateManager.initializeRowsAsync static method.  
+  To avoid UI freezing when starting the grid with a large number of rows.  
   [Initialize rows asynchronously](https://weblaze.dev/pluto_grid/build/web/#feature/add-rows-asynchronously)
 
 ## [3.1.2] - 2022. 6. 2
 
-* Fixed the date popup not opening when the value is wrong.
+- Fixed the date popup not opening when the value is wrong.
 
 ## [3.1.1] - 2022. 5. 29
 
-* Improved row deletion speed improvement.
+- Improved row deletion speed improvement.
 
 ## [3.1.0] - 2022. 5. 29
 
-* Improved column width adjustment performance.
-* Updated date, time picker popups.
+- Improved column width adjustment performance.
+- Updated date, time picker popups.
 
 ## [3.0.2] - 2022. 5. 25
 
-* CSV export has been separated into external packages.   
+- CSV export has been separated into external packages.  
   Install the pluto_grid_export package.
 
 ## [3.0.0-1.pre] - 2022. 5. 14
 
-* Updated for flutter 3.0 version.
-* Updated group name display in column filter popup.
-* Fixed by bug due to commit 1d5554d3.
+- Updated for flutter 3.0 version.
+- Updated group name display in column filter popup.
+- Fixed by bug due to commit 1d5554d3.
 
 ## [2.10.3] - 2022. 5. 14
 
-* Fixed by bug due to commit 1d5554d3.
+- Fixed by bug due to commit 1d5554d3.
 
 ## [2.10.2] - 2022. 5. 12
 
-* Fixed bad export CSV encoding when non-Latin1 / US-ASCII characters were present.
+- Fixed bad export CSV encoding when non-Latin1 / US-ASCII characters were present.
 
 ## [2.10.1] - 2022. 5. 11
 
-* Fixed currentColumn null error.
+- Fixed currentColumn null error.
 
 ## [2.10.0] - 2022. 5. 11
 
-* Added export as csv.
-* Added persian locale.
+- Added export as csv.
+- Added persian locale.
 
 ## [2.9.3] - 2022. 3. 16
 
-* Added columnContextIcon, columnResizeIcon.
-* Added backgroundColor to PlutoColumn, PlutoColumnGroup.
+- Added columnContextIcon, columnResizeIcon.
+- Added backgroundColor to PlutoColumn, PlutoColumnGroup.
 
 ## [2.9.2] - 2022. 1. 27
 
-* Fixed locale number format.  
+- Fixed locale number format.  
   The number type number expression according to the locale of intl is applied.
 
 ## [2.9.1] - 2022. 1. 11
 
-* Fixed a bug where `listener` of `keyManager` was not called when `enterKeyAction` was `none`.
+- Fixed a bug where `listener` of `keyManager` was not called when `enterKeyAction` was `none`.
 
 ## [2.9.0] - 2022. 1. 6
 
-* Added expandedColumn of columnGroup.
-* Added row color animation when dragging rows.
-* Changed the default value of enableMoveDownAfterSelecting to false.
-* Changed a minimum flutter version to 2.5.0.
-* Changed to be changed in real time when changing the column width.
-* Removed isShowFrozenColumn method of PlutoGridStateManager.
-* Removed resetKeyPressed, setKeyPressed methods of PlutoGridStateManager.
-* Added F3 key action.
-* Added ESC key action to moving previous cell in column filter widget.
-* Changed pagination logic.
-* Added done button action for mobile.
-* Fixed screen not being able to touch due to scroll range error when resizing the screen.
-* Added insert, remove columns.
-* Added allowFirstDot to PlutoColumnTypeNumber.
+- Added expandedColumn of columnGroup.
+- Added row color animation when dragging rows.
+- Changed the default value of enableMoveDownAfterSelecting to false.
+- Changed a minimum flutter version to 2.5.0.
+- Changed to be changed in real time when changing the column width.
+- Removed isShowFrozenColumn method of PlutoGridStateManager.
+- Removed resetKeyPressed, setKeyPressed methods of PlutoGridStateManager.
+- Added F3 key action.
+- Added ESC key action to moving previous cell in column filter widget.
+- Changed pagination logic.
+- Added done button action for mobile.
+- Fixed screen not being able to touch due to scroll range error when resizing the screen.
+- Added insert, remove columns.
+- Added allowFirstDot to PlutoColumnTypeNumber.
 
 ## [2.8.0] - 2021. 12. 10
 
-* Added column group.
-* Added columnHeight, columnFilterHeight.
-* Changed the default value of enableGridBorderShadow from true to false.
-* Changed interface of toggleSortColumn, sortAscending, sortDescending, sortBySortIdx methods.
+- Added column group.
+- Added columnHeight, columnFilterHeight.
+- Changed the default value of enableGridBorderShadow from true to false.
+- Changed interface of toggleSortColumn, sortAscending, sortDescending, sortBySortIdx methods.
 
 ## [2.7.1] - 2021. 12. 8
 
-* Fixed an error where the row height of the popup did not change when the rowHeight value was changed. 
+- Fixed an error where the row height of the popup did not change when the rowHeight value was changed.
 
 ## [2.7.0] - 2021. 12. 7
 
-* Added to be able to set the left and right padding of the cell.
-* Added option to automatically enter edit state when selecting a cell.
-* Added keyboard move option with left and right arrow keys when reaching the left and right ends of text in edit state.
-* Added titleSpan property to custom text or icon in column title.
-* Removed readOnly property of PlutoColumnType and added to PlutoColumn.
-* Added checkReadOnly callback to dynamically manipulate readOnly property.
-* Added gridPopupBorderRadius property to round the corners of popups used inside the grid.
+- Added to be able to set the left and right padding of the cell.
+- Added option to automatically enter edit state when selecting a cell.
+- Added keyboard move option with left and right arrow keys when reaching the left and right ends of text in edit state.
+- Added titleSpan property to custom text or icon in column title.
+- Removed readOnly property of PlutoColumnType and added to PlutoColumn.
+- Added checkReadOnly callback to dynamically manipulate readOnly property.
+- Added gridPopupBorderRadius property to round the corners of popups used inside the grid.
 
 ## [2.6.1] - 2021. 11. 22
 
-* Fixed so that the onChanged callback is not called when text is entered while the cell is not in the edit state.
+- Fixed so that the onChanged callback is not called when text is entered while the cell is not in the edit state.
 
 ## [2.6.0] - 2021. 11. 19
 
-* Added dynamically row background color.
-* Added optional border radius.
-* Added align column title text.
-* Added to receive the moved row to onRowsMoved callback when a row is moved by dragging, etc.
-* Added shortcuts. (Alt + PageUp or PageDown. Moving a page in the paging state.)
-* Modified so that onSelected callback is called with one tap in PlutoGridMode.select mode.
-* Fixed an error where arrow keys and backspace keys did not work in Desktop.
-* Fixed insert, append, prepend rows bug.
-* Renamed PlutoGridMoveUpdateEvent to PlutoGridScrollUpdateEvent.
+- Added dynamically row background color.
+- Added optional border radius.
+- Added align column title text.
+- Added to receive the moved row to onRowsMoved callback when a row is moved by dragging, etc.
+- Added shortcuts. (Alt + PageUp or PageDown. Moving a page in the paging state.)
+- Modified so that onSelected callback is called with one tap in PlutoGridMode.select mode.
+- Fixed an error where arrow keys and backspace keys did not work in Desktop.
+- Fixed insert, append, prepend rows bug.
+- Renamed PlutoGridMoveUpdateEvent to PlutoGridScrollUpdateEvent.
 
 ## [2.5.0] - 2021. 9. 22
 
-* flutter 2.5 compatible.
-* Added enableGridBorderShadow option to PlutoGridConfiguration.
-* Added enableColumnFilter option to Select column.
+- flutter 2.5 compatible.
+- Added enableGridBorderShadow option to PlutoGridConfiguration.
+- Added enableColumnFilter option to Select column.
 
 ## [2.4.1] - 2021. 8. 1
 
-* Fix pagination bug.
+- Fix pagination bug.
 
 ## [2.4.0] - 2021. 7. 31
 
-* Added pagination. 
-* Added debounce on keyboard input in filter.
+- Added pagination.
+- Added debounce on keyboard input in filter.
 
 ## [2.3.0] - 2021. 7. 7
 
-* Added onDoubleTap, onSecondaryTap cell events.
-* Hide secondary scrollbar.
+- Added onDoubleTap, onSecondaryTap cell events.
+- Hide secondary scrollbar.
 
 ## [2.2.1] - 2021. 6. 26
 
-* Added enableDropToResize option when creating a column. (enables an icon for adjusting the width of a column when there is no context menu)
-* Fix scroll bar drag behavior
+- Added enableDropToResize option when creating a column. (enables an icon for adjusting the width of a column when there is no context menu)
+- Fix scroll bar drag behavior
 
 ## [2.2.0] - 2021. 5. 29
 
-* Add callback to row checks developed by https://github.com/MrCasCode.
+- Add callback to row checks developed by https://github.com/MrCasCode.
 
 ## [2.1.0] - 2021. 5. 19
 
-* flutter 2.2.x compatible
+- flutter 2.2.x compatible
 
 ## [2.0.0] - 2021. 5. 14
 
-* Change scroll physics.
-* Fix a bug when dragging rows. 
-* Stable release.
+- Change scroll physics.
+- Fix a bug when dragging rows.
+- Stable release.
 
 ## [2.0.0-nullsafety.2] - 2021. 5. 1
 
-* Fix errors of tests on null-safety.
-* Fix focus problems on web.
+- Fix errors of tests on null-safety.
+- Fix focus problems on web.
 
 ## [2.0.0-nullsafety.1] - 2021. 4. 15
 
-* Edit dependency.
+- Edit dependency.
 
 ## [2.0.0-nullsafety.0] - 2021. 4. 9
 
-* Null safety version.
-* Fix CupertinoScrollBar error.(In flutter 2.1.0.xxx)
+- Null safety version.
+- Fix CupertinoScrollBar error.(In flutter 2.1.0.xxx)
 
 ## [1.2.0] - 2021. 3. 13
 
-* Add moveRowsByIndex.
-* Fix focusing bug.
-* Apply strong-mode.
-* Allow custom key in row.
+- Add moveRowsByIndex.
+- Fix focusing bug.
+- Apply strong-mode.
+- Allow custom key in row.
 
-* Rename moveRows to moveRowsByOffset.
-* Add moveRowsByIndex.
-* Fix focus.
+- Rename moveRows to moveRowsByOffset.
+- Add moveRowsByIndex.
+- Fix focus.
 
 ## [1.1.1] - 2021. 1. 22
 
-* Changed the return value of FocusNode's onKey callback function from bool to KeyEventResult.
-* Add china locale.
+- Changed the return value of FocusNode's onKey callback function from bool to KeyEventResult.
+- Add china locale.
 
 ## [1.1.0] - 2021. 1. 16
 
-* Add hide columns.
+- Add hide columns.
 
 ## [1.0.0] - 2020. 12. 30
 
-* Class name change. Just like changing PlutoConfiguration to PlutoGridConfiguration, the word Grid was added in the middle.
+- Class name change. Just like changing PlutoConfiguration to PlutoGridConfiguration, the word Grid was added in the middle.
   - PlutoStateManager > PlutoGridStateManager
   - PlutoOnLoadedEvent > PlutoGridOnLoadedEvent
   - Many other classes...
 
 ## [1.0.0-pre.10] - 2020. 12. 21
 
-* Fix sorting error when null value.
+- Fix sorting error when null value.
 
 ## [1.0.0-pre.9] - 2020. 12. 20
 
-* The method of setting the filter has changed. columnFilters in configuration changed to columnFilterConfig.
-* Different default filters can be set for each column.
-* Modified to close the popup if there is no filter to clear when clicking the clear button in the filter popup.
-* Rename DatetimeHelper to DateTimeHelper.
+- The method of setting the filter has changed. columnFilters in configuration changed to columnFilterConfig.
+- Different default filters can be set for each column.
+- Modified to close the popup if there is no filter to clear when clicking the clear button in the filter popup.
+- Rename DatetimeHelper to DateTimeHelper.
 
 ## [1.0.0-pre.8] - 2020. 12. 16
 
-* Add filtering.
-* Rename PlutoSelectingMode.square to PlutoSelectingMode.cell.
-* Remove originalValue property from PlutoCell.
+- Add filtering.
+- Rename PlutoSelectingMode.square to PlutoSelectingMode.cell.
+- Remove originalValue property from PlutoCell.
 
 ## [1.0.0-pre.7] - 2020. 11. 24
 
-* Added to PlutoConfiguration to allow you to set the row height.
+- Added to PlutoConfiguration to allow you to set the row height.
 
 ## [1.0.0-pre.6] - 2020. 11. 23
 
-* Add Czech locale.
-* Rename the Fix column to freeze column.
+- Add Czech locale.
+- Rename the Fix column to freeze column.
 
 ## [1.0.0-pre.5] - 2020. 11. 18
 
-* Add enableEditingMode to PlutoColumn.
+- Add enableEditingMode to PlutoColumn.
 
 ## [1.0.0-pre.4] - 2020. 11. 16
 
-* Enable constant_identifier_names.
+- Enable constant_identifier_names.
   - ex) `PlutoColumnFixed.Left` > `PlutoColumnFixed.left`
   - ex) `PlutoSelectingMode.Row` > `PlutoSelectingMode.row`
   - All existing constants such as enum are changed.
-* Add a loading indicator.
+- Add a loading indicator.
 
 ## [1.0.0-pre.3] - 2020. 11. 13
 
-* Fix bug, scrolling and row movement errors with createHeader present.
-* Modified to move based on half the size of the cell or row.
-* Update scrollbar status when moving with a keyboard.
-* To disable dragging of rows while columns are be sorted.
-* Add visualizations for dragging rows.
-* Modified so that onPointerMove event occurs only in drag state.
-* Applying scrolling up or down the grid when dragging a row.
+- Fix bug, scrolling and row movement errors with createHeader present.
+- Modified to move based on half the size of the cell or row.
+- Update scrollbar status when moving with a keyboard.
+- To disable dragging of rows while columns are be sorted.
+- Add visualizations for dragging rows.
+- Modified so that onPointerMove event occurs only in drag state.
+- Applying scrolling up or down the grid when dragging a row.
 
 ## [1.0.0-pre.2] - 2020. 11. 09
 
-* Add insertRows to PlutoStateManager.
-* Remove setCurrentRowIdx, clearCurrentRowIdx, updateCurrentRowIdx from PlutoStateManager.
-* Change the parameter of setCurrentSelectingPosition in PlutoStateManager.
-* Add draggable scrollbar.
+- Add insertRows to PlutoStateManager.
+- Remove setCurrentRowIdx, clearCurrentRowIdx, updateCurrentRowIdx from PlutoStateManager.
+- Change the parameter of setCurrentSelectingPosition in PlutoStateManager.
+- Add draggable scrollbar.
 
 ## [1.0.0-pre.1] - 2020. 11. 05
 
 ##### Breaking changes:
 
-* PlutoGrid.popup has been deleted.  
+- PlutoGrid.popup has been deleted.  
   PlutoGrid.popup() has been removed.  
   Just clear the popup and create it with PlutoGrid().
-* The column property enableDraggable has been changed to enableColumnDrag.
+- The column property enableDraggable has been changed to enableColumnDrag.
 
-##### Improvements: 
+##### Improvements:
 
-* Column properties have been added.
+- Column properties have been added.
   - enableRowDrag : If set to true, an icon is create in the cell of the column, and the row can be moved by dragging it.
   - enableRowChecked : If set to true, a check box is create in the cell of the column.
   - renderer : You can change the displayed cell.
@@ -500,120 +500,120 @@
 
 ## [0.1.21] - 2020. 11. 01
 
-* Add display property for the dual grid.
-* Add shortcuts. (home, end, pageUp, pageDown)
+- Add display property for the dual grid.
+- Add shortcuts. (home, end, pageUp, pageDown)
 
 ## [0.1.20] - 2020. 10. 28
 
-* Add textAlign to column property.(PlutoColumnTextAlign.Left, or Right) [#49](https://github.com/bosskmk/pluto_grid/issues/49)
+- Add textAlign to column property.(PlutoColumnTextAlign.Left, or Right) [#49](https://github.com/bosskmk/pluto_grid/issues/49)
 
 ## [0.1.19] - 2020. 10. 23
 
-* Add enableMoveDownAfterSelecting, enterKeyAction in PlutoConfiguration.
-* Add currentSelectingPositionList in PlutoStateManager.
+- Add enableMoveDownAfterSelecting, enterKeyAction in PlutoConfiguration.
+- Add currentSelectingPositionList in PlutoStateManager.
 
 ## [0.1.18] - 2020. 10. 16
 
-* Add valueFormatter for display of the cell value.
+- Add valueFormatter for display of the cell value.
 
 ## [0.1.17] - 2020. 10. 4
 
-* Cell selection problem. [#35](https://github.com/bosskmk/pluto_grid/issues/35)
-* Modified so that AutoSize of column operates according to default TextStyle.
+- Cell selection problem. [#35](https://github.com/bosskmk/pluto_grid/issues/35)
+- Modified so that AutoSize of column operates according to default TextStyle.
 
 ## [0.1.16] - 2020. 10. 2
 
-* Fixed column problem when adjusting column width.
-* When the date is MM/dd/yyyy, the initial value of the pop-up is incorrect.
-* When startDate, endDate are present, the initial value of the popup is not filled or scrolling fails.
-* When the date is MM/dd/yyyy, misalignment error.
-* Modify to operate the sorting criteria in the order of items in the Select Type Column.
+- Fixed column problem when adjusting column width.
+- When the date is MM/dd/yyyy, the initial value of the pop-up is incorrect.
+- When startDate, endDate are present, the initial value of the popup is not filled or scrolling fails.
+- When the date is MM/dd/yyyy, misalignment error.
+- Modify to operate the sorting criteria in the order of items in the Select Type Column.
 
 ## [0.1.15] - 2020. 09. 28
 
-* Modified so that the Grid does not force focus and works properly according to the situation in which focus get received or taken away.
+- Modified so that the Grid does not force focus and works properly according to the situation in which focus get received or taken away.
 
 ## [0.1.14] - 2020. 09. 27
 
-* Fixed cell movement error.
+- Fixed cell movement error.
 
 ## [0.1.13] - 2020. 09. 26
 
-* Change the column icon.
-* Fix a bug that the previous data wasn't created when moving up in the date selection popup.
-* enable/disable border of the between columns.
-* Add a configuration. (Dark mode or custom setting)
-* Fix a bug that the newly added fixed column doesn't scroll correctly.
-* Ignore to move cell when pressing shift + arrow left or right, in edit mode.
+- Change the column icon.
+- Fix a bug that the previous data wasn't created when moving up in the date selection popup.
+- enable/disable border of the between columns.
+- Add a configuration. (Dark mode or custom setting)
+- Fix a bug that the newly added fixed column doesn't scroll correctly.
+- Ignore to move cell when pressing shift + arrow left or right, in edit mode.
 
 ## [0.1.12] - 2020. 9. 23
 
-* Select all - Control(Meta on MacOs) + A.
+- Select all - Control(Meta on MacOs) + A.
 
 ## [0.1.11] - 2020. 9. 21
 
-* Add Selecting mode for row.
-* Removing rows by selecting cells.
+- Add Selecting mode for row.
+- Removing rows by selecting cells.
 
 ## [0.1.10] - 2020. 9. 17
 
-* Add removing row.
-* Add example for adding and removing row.
+- Add removing row.
+- Add example for adding and removing row.
 
 ## [0.1.9] - 2020. 9. 17
 
-* Add None Selecting mode for states that do not require multi-selection.
-* Add selecting-mode for selecting date range.
-* Difference in Enter key in TextField when using RawKeyboardListener overlapping.  [https://github.com/flutter/flutter/issues/65170](https://github.com/flutter/flutter/issues/65170)
+- Add None Selecting mode for states that do not require multi-selection.
+- Add selecting-mode for selecting date range.
+- Difference in Enter key in TextField when using HardwareKeyboardListener overlapping. [https://github.com/flutter/flutter/issues/65170](https://github.com/flutter/flutter/issues/65170)
 
 ## [0.1.8] - 2020. 9. 3
 
-* BugFix : RawKeyEvent's logicalKey.keyLabel return value changed from null to "".
+- BugFix : RawKeyEvent's logicalKey.keyLabel return value changed from null to "".
 
 ## [0.1.7] - 2020. 9. 3
 
-* Change the way to move between grids in dual grid mode. When moving the arrow keys, the focus moves when reaching the left and right ends.
-* Update Demo.
+- Change the way to move between grids in dual grid mode. When moving the arrow keys, the focus moves when reaching the left and right ends.
+- Update Demo.
 
 ## [0.1.6] - 2020. 9. 2
 
-* Change datetime column type to date.
-* Fix selecting cell bug.
-* Add dual mode grid.
-* Add time type column.
-* Update Demo.
+- Change datetime column type to date.
+- Fix selecting cell bug.
+- Add dual mode grid.
+- Add time type column.
+- Update Demo.
 
 ## [0.1.5] - 2020. 8. 31
 
-* Change UI for datetime popup.
+- Change UI for datetime popup.
 
 ## [0.1.4] - 2020. 8. 29
 
-* fixed column bug. [#1](https://github.com/bosskmk/pluto_grid/issues/1)
+- fixed column bug. [#1](https://github.com/bosskmk/pluto_grid/issues/1)
 
 ## [0.1.3] - 2020. 8. 28
 
-* Multi-selection is canceled when clicking the current cell in the multi-selection state.
-* Even when the cell is in the modified state, long tab to enter the multi-select mode.
-* Added column type for date.(datetime will be soon)
+- Multi-selection is canceled when clicking the current cell in the multi-selection state.
+- Even when the cell is in the modified state, long tab to enter the multi-select mode.
+- Added column type for date.(datetime will be soon)
 
 ## [0.1.2] - 2020. 8. 27
 
-* Fix bug : Error not working properly according to fixed columns when selecting multiple cells.
-* Multi selection with KeyBoard : Multi selection with Shift and arrow keys.
+- Fix bug : Error not working properly according to fixed columns when selecting multiple cells.
+- Multi selection with KeyBoard : Multi selection with Shift and arrow keys.
 
 ## [0.1.1] - 2020. 8. 26
 
-* Column type : Add number type cell.
+- Column type : Add number type cell.
 
 ## [0.1.0] - 2020. 8. 26
 
-* Column fixation : Columns can be fixed to the left or right of the grid.
-* Column shift : Change the order of the columns by dragging the column title.
-* Column sort : Sort the list by clicking on the column heading.
-* Column width : Change the column width by dragging the icon to the right of the column title.
-* Column action : Click the icon to the right of the column title, you can control the column with the column action menu.
-* Multi selection : By long tapping or clicking and moving.
-* Copy & paste : Ctrl(macos : Meta) + C or V.
-* Select Row Popup : Same as the grid, a selection popup that can be used when selecting an item from a list.
-* Keyboard support : Arrow keys, Enter(Shift + Enter), Tab(Shift +Tab), Esc...
+- Column fixation : Columns can be fixed to the left or right of the grid.
+- Column shift : Change the order of the columns by dragging the column title.
+- Column sort : Sort the list by clicking on the column heading.
+- Column width : Change the column width by dragging the icon to the right of the column title.
+- Column action : Click the icon to the right of the column title, you can control the column with the column action menu.
+- Multi selection : By long tapping or clicking and moving.
+- Copy & paste : Ctrl(macos : Meta) + C or V.
+- Select Row Popup : Same as the grid, a selection popup that can be used when selecting an item from a list.
+- Keyboard support : Arrow keys, Enter(Shift + Enter), Tab(Shift +Tab), Esc...
diff --git a/demo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux b/demo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux
index e433ea04f..360f40249 120000
--- a/demo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux
+++ b/demo/linux/flutter/ephemeral/.plugin_symlinks/url_launcher_linux
@@ -1 +1 @@
-C:/Users/manek/AppData/Local/Pub/Cache/hosted/pub.dev/url_launcher_linux-3.0.2/
\ No newline at end of file
+/Users/drofreddyjuniordiomande/.pub-cache/hosted/pub.dev/url_launcher_linux-3.1.0/
\ No newline at end of file
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 87755ebe2..01584f9fa 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -3,7 +3,7 @@ description: A new Flutter project.
 
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
 # The following defines the version and build number for your application.
 # A version number is three numbers separated by dots, like 1.2.43
@@ -18,7 +18,9 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
+  # sdk: ">=2.17.0 <3.0.0"
+  sdk: ">=3.1.3 <4.0.0"
+  # flutter: ">=3.10.0"
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -32,7 +34,6 @@ dependencies:
   pluto_grid:
     path: ../
 
-
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
@@ -53,7 +54,6 @@ dev_dependencies:
 
 # The following section is specific to Flutter.
 flutter:
-
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in
   # the material Icons class.
diff --git a/lib/src/helper/pluto_key_manager_event.dart b/lib/src/helper/pluto_key_manager_event.dart
index 91267675c..d1372136b 100644
--- a/lib/src/helper/pluto_key_manager_event.dart
+++ b/lib/src/helper/pluto_key_manager_event.dart
@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
 
 class PlutoKeyManagerEvent {
   FocusNode focusNode;
-  RawKeyEvent event;
+  KeyEvent event;
 
   PlutoKeyManagerEvent({
     required this.focusNode,
@@ -94,15 +94,17 @@ class PlutoKeyManagerEvent {
   }
 
   bool get isShiftPressed {
-    return event.isShiftPressed;
+    return event.logicalKey.keyId == LogicalKeyboardKey.shift.keyId;
   }
 
   bool get isCtrlPressed {
-    return event.isMetaPressed || event.isControlPressed;
+    return event.logicalKey.keyId == LogicalKeyboardKey.meta.keyId ||
+        event.logicalKey.keyId == LogicalKeyboardKey.control.keyId;
   }
 
   bool get isAltPressed {
-    return event.isAltPressed;
+    return event.logicalKey.keyId ==
+        LogicalKeyboardKey.alt.keyId; // event.isAltPressed;
   }
 
   bool get isModifierPressed {
diff --git a/lib/src/manager/pluto_grid_key_manager.dart b/lib/src/manager/pluto_grid_key_manager.dart
index ba952c790..52a6a2e79 100644
--- a/lib/src/manager/pluto_grid_key_manager.dart
+++ b/lib/src/manager/pluto_grid_key_manager.dart
@@ -79,7 +79,7 @@ class PlutoGridKeyManager {
     if (stateManager.configuration.shortcut.handle(
       keyEvent: keyEvent,
       stateManager: stateManager,
-      state: RawKeyboard.instance,
+      state: HardwareKeyboard.instance,
     )) {
       return;
     }
diff --git a/lib/src/manager/shortcut/pluto_grid_shortcut.dart b/lib/src/manager/shortcut/pluto_grid_shortcut.dart
index 57907ab4d..a4511413f 100644
--- a/lib/src/manager/shortcut/pluto_grid_shortcut.dart
+++ b/lib/src/manager/shortcut/pluto_grid_shortcut.dart
@@ -27,7 +27,7 @@ class PlutoGridShortcut {
   bool handle({
     required PlutoKeyManagerEvent keyEvent,
     required PlutoGridStateManager stateManager,
-    required RawKeyboard state,
+    required HardwareKeyboard state,
   }) {
     for (final action in actions.entries) {
       if (action.key.accepts(keyEvent.event, state)) {
diff --git a/lib/src/manager/shortcut/pluto_grid_shortcut_action.dart b/lib/src/manager/shortcut/pluto_grid_shortcut_action.dart
index 26110d358..92b93121f 100644
--- a/lib/src/manager/shortcut/pluto_grid_shortcut_action.dart
+++ b/lib/src/manager/shortcut/pluto_grid_shortcut_action.dart
@@ -250,7 +250,7 @@ class PlutoGridActionDefaultTab extends PlutoGridShortcutAction {
 
     final saveIsEditing = stateManager.isEditing;
 
-    keyEvent.event.isShiftPressed
+    keyEvent.event.logicalKey.keyId == LogicalKeyboardKey.shift.keyId
         ? _moveCellPrevious(stateManager)
         : _moveCellNext(stateManager);
 
@@ -408,7 +408,7 @@ class PlutoGridActionDefaultEnterKey extends PlutoGridShortcutAction {
     }
 
     if (enterKeyAction.isEditingAndMoveDown) {
-      if (keyEvent.event.isShiftPressed) {
+      if (keyEvent.event.logicalKey.keyId == LogicalKeyboardKey.shift.keyId) {
         stateManager.moveCurrentCell(
           PlutoMoveDirection.up,
           notify: false,
@@ -420,7 +420,7 @@ class PlutoGridActionDefaultEnterKey extends PlutoGridShortcutAction {
         );
       }
     } else if (enterKeyAction.isEditingAndMoveRight) {
-      if (keyEvent.event.isShiftPressed) {
+      if (keyEvent.event.logicalKey.keyId == LogicalKeyboardKey.shift.keyId) {
         stateManager.moveCurrentCell(
           PlutoMoveDirection.left,
           force: true,
diff --git a/lib/src/pluto_grid.dart b/lib/src/pluto_grid.dart
index 54d8e96ee..af5bbf916 100644
--- a/lib/src/pluto_grid.dart
+++ b/lib/src/pluto_grid.dart
@@ -593,7 +593,7 @@ class PlutoGridState extends PlutoStateWithChange<PlutoGrid> {
     }
   }
 
-  KeyEventResult _handleGridFocusOnKey(FocusNode focusNode, RawKeyEvent event) {
+  KeyEventResult _handleGridFocusOnKey(FocusNode focusNode, KeyEvent event) {
     if (_keyManager.eventResult.isSkip == false) {
       _keyManager.subject.add(PlutoKeyManagerEvent(
         focusNode: focusNode,
@@ -608,7 +608,7 @@ class PlutoGridState extends PlutoStateWithChange<PlutoGrid> {
   Widget build(BuildContext context) {
     return FocusScope(
       onFocusChange: _stateManager.setKeepFocus,
-      onKey: _handleGridFocusOnKey,
+      onKeyEvent: _handleGridFocusOnKey,
       child: _GridContainer(
         stateManager: _stateManager,
         child: LayoutBuilder(
diff --git a/lib/src/ui/cells/popup_cell.dart b/lib/src/ui/cells/popup_cell.dart
index e2e6149da..add9e380b 100644
--- a/lib/src/ui/cells/popup_cell.dart
+++ b/lib/src/ui/cells/popup_cell.dart
@@ -62,7 +62,7 @@ mixin PopupCellState<T extends PopupCell> on State<T>
       ..text =
           widget.column.formattedValueForDisplayInEditing(widget.cell.value);
 
-    textFocus = FocusNode(onKey: _handleKeyboardFocusOnKey);
+    textFocus = FocusNode(onKeyEvent: _handleKeyboardFocusOnKey);
   }
 
   @override
@@ -175,7 +175,7 @@ mixin PopupCellState<T extends PopupCell> on State<T>
     }
   }
 
-  KeyEventResult _handleKeyboardFocusOnKey(FocusNode node, RawKeyEvent event) {
+  KeyEventResult _handleKeyboardFocusOnKey(FocusNode node, KeyEvent event) {
     var keyManager = PlutoKeyManagerEvent(
       focusNode: node,
       event: event,
diff --git a/lib/src/ui/cells/text_cell.dart b/lib/src/ui/cells/text_cell.dart
index b007e4f35..87834461d 100644
--- a/lib/src/ui/cells/text_cell.dart
+++ b/lib/src/ui/cells/text_cell.dart
@@ -52,7 +52,7 @@ mixin TextCellState<T extends TextCell> on State<T> implements TextFieldProps {
   void initState() {
     super.initState();
 
-    cellFocus = FocusNode(onKey: _handleOnKey);
+    cellFocus = FocusNode(onKeyEvent: _handleOnKey);
 
     widget.stateManager.setTextEditingController(_textController);
 
@@ -172,7 +172,7 @@ mixin TextCellState<T extends TextCell> on State<T> implements TextFieldProps {
     });
   }
 
-  KeyEventResult _handleOnKey(FocusNode node, RawKeyEvent event) {
+  KeyEventResult _handleOnKey(FocusNode node, KeyEvent event) {
     var keyManager = PlutoKeyManagerEvent(
       focusNode: node,
       event: event,
diff --git a/lib/src/ui/columns/pluto_column_filter.dart b/lib/src/ui/columns/pluto_column_filter.dart
index da1749122..486785ece 100644
--- a/lib/src/ui/columns/pluto_column_filter.dart
+++ b/lib/src/ui/columns/pluto_column_filter.dart
@@ -83,7 +83,7 @@ class PlutoColumnFilterState extends PlutoStateWithChange<PlutoColumnFilter> {
   initState() {
     super.initState();
 
-    _focusNode = FocusNode(onKey: _handleOnKey);
+    _focusNode = FocusNode(onKeyEvent: _handleOnKey);
 
     widget.column.setFilterFocusNode(_focusNode);
 
@@ -145,7 +145,7 @@ class PlutoColumnFilterState extends PlutoStateWithChange<PlutoColumnFilter> {
     stateManager.notifyListeners();
   }
 
-  KeyEventResult _handleOnKey(FocusNode node, RawKeyEvent event) {
+  KeyEventResult _handleOnKey(FocusNode node, KeyEvent event) {
     var keyManager = PlutoKeyManagerEvent(
       focusNode: node,
       event: event,
diff --git a/packages/pluto_grid_export/example/ios/Flutter/Debug.xcconfig b/packages/pluto_grid_export/example/ios/Flutter/Debug.xcconfig
index 592ceee85..ec97fc6f3 100644
--- a/packages/pluto_grid_export/example/ios/Flutter/Debug.xcconfig
+++ b/packages/pluto_grid_export/example/ios/Flutter/Debug.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/packages/pluto_grid_export/example/ios/Flutter/Release.xcconfig b/packages/pluto_grid_export/example/ios/Flutter/Release.xcconfig
index 592ceee85..c4855bfe2 100644
--- a/packages/pluto_grid_export/example/ios/Flutter/Release.xcconfig
+++ b/packages/pluto_grid_export/example/ios/Flutter/Release.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/packages/pluto_grid_export/example/ios/Podfile b/packages/pluto_grid_export/example/ios/Podfile
new file mode 100644
index 000000000..fdcc671eb
--- /dev/null
+++ b/packages/pluto_grid_export/example/ios/Podfile
@@ -0,0 +1,44 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '11.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+  end
+end
diff --git a/packages/pluto_grid_export/example/macos/Flutter/Flutter-Debug.xcconfig b/packages/pluto_grid_export/example/macos/Flutter/Flutter-Debug.xcconfig
index c2efd0b60..4b81f9b2d 100644
--- a/packages/pluto_grid_export/example/macos/Flutter/Flutter-Debug.xcconfig
+++ b/packages/pluto_grid_export/example/macos/Flutter/Flutter-Debug.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/packages/pluto_grid_export/example/macos/Flutter/Flutter-Release.xcconfig b/packages/pluto_grid_export/example/macos/Flutter/Flutter-Release.xcconfig
index c2efd0b60..5caa9d157 100644
--- a/packages/pluto_grid_export/example/macos/Flutter/Flutter-Release.xcconfig
+++ b/packages/pluto_grid_export/example/macos/Flutter/Flutter-Release.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"
diff --git a/packages/pluto_grid_export/example/macos/Flutter/GeneratedPluginRegistrant.swift b/packages/pluto_grid_export/example/macos/Flutter/GeneratedPluginRegistrant.swift
index 416ef8457..9c4efdd9c 100644
--- a/packages/pluto_grid_export/example/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/packages/pluto_grid_export/example/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,7 @@ import FlutterMacOS
 import Foundation
 
 import file_saver
-import path_provider_macos
+import path_provider_foundation
 import printing
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
diff --git a/packages/pluto_grid_export/example/macos/Podfile b/packages/pluto_grid_export/example/macos/Podfile
new file mode 100644
index 000000000..c795730db
--- /dev/null
+++ b/packages/pluto_grid_export/example/macos/Podfile
@@ -0,0 +1,43 @@
+platform :osx, '10.14'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_macos_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_macos_build_settings(target)
+  end
+end
diff --git a/pubspec.yaml b/pubspec.yaml
index 9ff0f667c..1cb3e4b28 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,12 +1,14 @@
 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: 7.0.2
+version: 7.0.3
 homepage: https://pluto.weblaze.dev
 repository: https://github.com/bosskmk/pluto_grid
 
 environment:
-  sdk: ">=2.17.0 <3.0.0"
-  flutter: ">=2.5.0"
+  sdk: ">=3.3.0-91.0.dev <4.0.0"
+  flutter: ">=1.17.0"
+  # sdk: ">=3.1.3 <4.0.0"
+  # flutter: ">=3.10.0"
 
 dependencies:
   flutter:
@@ -22,4 +24,4 @@ dev_dependencies:
     sdk: flutter
   mockito: ^5.4.0
   build_runner: ^2.4.2
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.0
diff --git a/test/mock/shared_mocks.mocks.dart b/test/mock/shared_mocks.mocks.dart
index e52394865..40c486348 100644
--- a/test/mock/shared_mocks.mocks.dart
+++ b/test/mock/shared_mocks.mocks.dart
@@ -4557,7 +4557,7 @@ class MockFocusNode extends _i1.Mock implements _i3.FocusNode {
           [context],
           {
             #onKeyEvent: onKeyEvent,
-            #onKey: onKey,
+            #onKeyEvent: onKey,
           },
         ),
         returnValue: _FakeFocusAttachment_32(
@@ -4567,7 +4567,7 @@ class MockFocusNode extends _i1.Mock implements _i3.FocusNode {
             [context],
             {
               #onKeyEvent: onKeyEvent,
-              #onKey: onKey,
+              #onKeyEvent: onKey,
             },
           ),
         ),
@@ -4578,7 +4578,7 @@ class MockFocusNode extends _i1.Mock implements _i3.FocusNode {
             [context],
             {
               #onKeyEvent: onKeyEvent,
-              #onKey: onKey,
+              #onKeyEvent: onKey,
             },
           ),
         ),
diff --git a/test/src/helper/pluto_key_manager_event_test.dart b/test/src/helper/pluto_key_manager_event_test.dart
index f0907a12d..b83925c95 100644
--- a/test/src/helper/pluto_key_manager_event_test.dart
+++ b/test/src/helper/pluto_key_manager_event_test.dart
@@ -8,7 +8,7 @@ void main() {
 
   late PlutoKeyManagerEvent? keyManagerEvent;
 
-  KeyEventResult callback(FocusNode node, RawKeyEvent event) {
+  KeyEventResult callback(FocusNode node, KeyEvent event) {
     keyManagerEvent = PlutoKeyManagerEvent(
       focusNode: node,
       event: event,
@@ -28,12 +28,12 @@ void main() {
 
   Future<void> buildWidget({
     required WidgetTester tester,
-    required KeyEventResult Function(FocusNode, RawKeyEvent) callback,
+    required KeyEventResult Function(FocusNode, KeyEvent) callback,
   }) async {
     await tester.pumpWidget(MaterialApp(
       home: FocusScope(
         autofocus: true,
-        onKey: callback,
+        onKeyEvent: callback,
         child: Focus(
           focusNode: focusNode,
           child: const SizedBox(width: 100, height: 100),
@@ -62,7 +62,7 @@ void main() {
     (tester) async {
       late PlutoKeyManagerEvent keyManagerEvent;
 
-      KeyEventResult callback(FocusNode node, RawKeyEvent event) {
+      KeyEventResult callback(FocusNode node, KeyEvent event) {
         keyManagerEvent = PlutoKeyManagerEvent(
           focusNode: node,
           event: event,
diff --git a/test/src/manager/pluto_grid_key_manager_test.dart b/test/src/manager/pluto_grid_key_manager_test.dart
index 57634f5e1..7e88553cd 100644
--- a/test/src/manager/pluto_grid_key_manager_test.dart
+++ b/test/src/manager/pluto_grid_key_manager_test.dart
@@ -46,8 +46,8 @@ void main() {
       await tester.pumpWidget(
         MaterialApp(
           home: Material(
-            child: RawKeyboardListener(
-              onKey: (event) {
+            child: KeyboardListener(
+              onKeyEvent: (event) {
                 keyManager.subject.add(PlutoKeyManagerEvent(
                   focusNode: FocusNode(),
                   event: event,
@@ -98,8 +98,8 @@ void main() {
       await tester.pumpWidget(
         MaterialApp(
           home: Material(
-            child: RawKeyboardListener(
-              onKey: (event) {
+            child: KeyboardListener(
+              onKeyEvent: (event) {
                 keyManager.subject.add(PlutoKeyManagerEvent(
                   focusNode: FocusNode(),
                   event: event,
@@ -150,8 +150,8 @@ void main() {
       await tester.pumpWidget(
         MaterialApp(
           home: Material(
-            child: RawKeyboardListener(
-              onKey: (event) {
+            child: KeyboardListener(
+              onKeyEvent: (event) {
                 keyManager.subject.add(PlutoKeyManagerEvent(
                   focusNode: FocusNode(),
                   event: event,
@@ -204,8 +204,8 @@ void main() {
       await tester.pumpWidget(
         MaterialApp(
           home: Material(
-            child: RawKeyboardListener(
-              onKey: (event) {
+            child: KeyboardListener(
+              onKeyEvent: (event) {
                 keyManager.subject.add(PlutoKeyManagerEvent(
                   focusNode: FocusNode(),
                   event: event,
@@ -258,8 +258,8 @@ void main() {
       await tester.pumpWidget(
         MaterialApp(
           home: Material(
-            child: RawKeyboardListener(
-              onKey: (event) {
+            child: KeyboardListener(
+              onKeyEvent: (event) {
                 keyManager.subject.add(PlutoKeyManagerEvent(
                   focusNode: FocusNode(),
                   event: event,
@@ -311,8 +311,8 @@ void main() {
       await tester.pumpWidget(
         MaterialApp(
           home: Material(
-            child: RawKeyboardListener(
-              onKey: (event) {
+            child: KeyboardListener(
+              onKeyEvent: (event) {
                 keyManager.subject.add(PlutoKeyManagerEvent(
                   focusNode: FocusNode(),
                   event: event,
@@ -440,8 +440,8 @@ void main() {
       await tester.pumpWidget(
         MaterialApp(
           home: Material(
-            child: RawKeyboardListener(
-              onKey: (event) {
+            child: KeyboardListener(
+              onKeyEvent: (event) {
                 keyManager.subject.add(PlutoKeyManagerEvent(
                   focusNode: FocusNode(),
                   event: event,