Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve Cell navigation Performance #1123

Merged
merged 135 commits into from
May 24, 2018
Merged

Improve Cell navigation Performance #1123

merged 135 commits into from
May 24, 2018

Conversation

malonecj
Copy link
Contributor

@malonecj malonecj commented Feb 12, 2018

Description

This is an attempt to see if its possible to perform cell navigation with keyboard at 60FPS.
Rather than the Cell component being responsible for displaying a selected style, a new SelectionMask component which sits at Canvas level, is responsible for displaying the selected cell.

Results

The proof of concept was successful, showing that every frame is rendered at over 60FPS.
image

c11e914ad04e41a1aa3f0000bfe7b0bd

Tasks

  • Automated benchmark test using Puppeteer
  • SelectionMask component
  • Dynamic calculation of mask dimensions based on idx, rowIdx of cell
  • Connect function to wrap any component, connecting it to a single store and trigger set state, if certain conditions are met
  • Cell editing
    • Move enableCellSelect check to interaction layer
    • Move onCheckCellIsEditable check to interaction layer
  • Scrolling with keyboard - now that selected cells do not automatically focus, the grid no longer scrolls with keyboard (rudimentary proof of concept for scroll down working)
    • Fix cell navigation mode
    • Fix horizontal scrolling
  • Frozen columns
  • Migrate cell drag down to Interaction Layer
  • Migrate copy/paste behavior to Interaction Layer
  • Migrate React Data Grid component keyboard behavior to Interaction Layer
    • Fix tab behavior
  • Add test coverage for new components
  • Fix Existing Unit Tests
  • Delete OverflowCell/Row components
  • Ensure refs work with container components
  • Ensure CellRenderer and RowRenderer works with container components
  • Ensure connecting grid/cell to the store does not affect cell rendering performance
  • State management
    • Decide if redux should be used instead
    • Remove singleton store/listeners
  • Fix Cell Actions- Fixed using pointer events
  • Fix Grid Events
  • Fix Column Events
  • Fix ContextMenu.
  • Fix Filter Row focus
  • Decide zIndex strategies

Bugs

  • Cell double click editing does not work
  • Clicking on a cell scrolls the canvas to the top
  • Fix SelectedCell position in the grouping example
    image
  • Fix zIndex for filters
    image

rowIdx: 0,
idx: 0
},
copied: null,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cell selection/copy/drag logic is moved to the InteractionMasks component

@@ -21,11 +21,12 @@
<link rel="stylesheet" href="assets/css/examples.css">
<link rel="stylesheet" href="assets/css/react-context-menu.css">

<script src="https://cdnjs.cloudflare.com/ajax/libs/core-js/2.5.5/core.min.js"></script>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


const { scrollToRowIndex } = this.props;
if (prevProps.scrollToRowIndex !== scrollToRowIndex && scrollToRowIndex !== 0) {
this.scrollToRow(scrollToRowIndex);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes #1084

if (this.canvas) {
this.canvas.scrollTop = scrollTop;
this.canvas.scrollLeft = scrollLeft;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Grid is automatically scrolled to the top when a cell is clicked, this is a workaround for that

// canvas.scrollLeft = scrollLeft;
// this.viewport.canvas.setScrollLeft(scrollLeft);
// }
// };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if I should delete it or not

if (this.props.onColumnResize) {
this.props.onColumnResize(index, width);
}
};

onKeyDown = (e: SyntheticKeyboardEvent) => {
if (isCtrlKeyHeldDown(e)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the selection logic is moved to the InteractionMasks component

@@ -0,0 +1,28 @@
class EventBus {
Copy link
Contributor

@amanmahajan7 amanmahajan7 May 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cell component uses event bus to interact with the InteractionMasks component. The idea is to remove the local state from the ReactDataGrid component so that the whole tree is not rendered on every keystroke.

  • Click Cell
  • Fire SelectCell event
  • InteractionMasks is subscribed to the event and handles the selection logic

Copy link
Contributor

@diogofcunha diogofcunha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't do any deep dive on the code but the general idea looks fine to me.

@@ -67,7 +72,8 @@ RowGroup.propTypes = {
isExpanded: PropTypes.bool.isRequired,
treeDepth: PropTypes.number.isRequired,
name: PropTypes.string.isRequired,
renderer: PropTypes.func
renderer: PropTypes.func,
eventBus: PropTypes.isRequired
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this valid? what's the shape of event bus?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this should be an object or an object with { dispatch, subscribe } methods but I am just using object for now

@amanmahajan7 amanmahajan7 merged commit 1c273ed into next May 24, 2018
@amanmahajan7 amanmahajan7 deleted the cm-cell-perf-mask branch May 24, 2018 15:11
@malonecj malonecj mentioned this pull request Aug 10, 2018
10 tasks
malonecj added a commit that referenced this pull request Sep 19, 2018
* Allow for optional SimpleCellFormatter.value prop (#948)

* Improve Cell navigation Performance (#1123)

* Move cell selection responsibilty to SelectionMask component

* Selection Mask working at 60fps

* Tests for InteractionMask navigation

* Editor Container in interaction Layer

* commit package-lock.json

* Editing Working

* smooth scrolling with keyboard navigation

* Adjust visible start/end calculations after scroll

* Vertical cell Scrolling with keyboard working

* generic move command

* Vertical scrolling navigation with keyboard working

* Code cleanup
- Remove extra ref
- Format JSX

* Update react to the stable version
Delete/Ignore package-lock.json

* Remove deprecated babel plugins

* Export individual constants instead of exporting a default object

* Remove react dependency from react-data-grid
Delete package.json for now

* Remove ReactDOM reference and use refs instead

* More code cleanup
- Fix formatting
- Remove extra spread operator

* Add innerRef to fix scrolling
Remove unused methods

* Remove GridWrapper and GridContainer as it breaks instance methods

* Remove unused CellExpander component

* - Remove singleton store
- Add basic implementation for store/reducer/dispatch
- Remove CellContainer to prevent rerendering of each cell on selection change

* Delete unused files
Cleanup event handlers

* Move copy paste functionality to the Interaction mask component
Check if cell is editable

* Remove flow types

* Remove flow types

* Remove unused variables

* Move copy/paste logic to the interaction layer

* Horizontal scroll using keyboard
Temporarily disable animation

* Rename folder to containers

* Fix cell navigation mode

* Do not prevent event bubling to show context menu

* Add pointer events to fix cell actions

* Fix Filter Row focus

* Dynamically connect cell to support custom renderers

* Fox committing changes
Disable cell container component as it degraded performance

* Migrate cell drag down to Interaction Layer

* Remove react-motion

* Add CellMask to highlight copied cell

* Add drag mask to highlight dragged cells

* Cleanup render method

* Add eventbus to communicate with InteractionMask component
Delete state and containers

* Move EventTypes to contants folder

* Fix clicking on a cell scrolls the canvas to the top

* Fix  cell double click to edit

* Fix tests InteractionMasks

* Fix issue with press enter not committing

* Keep InteractionMask focus logic in central place

* Fix canvas tests

* Fix Canvas tests

* Remove redundant Cell tests

* Fix Cell tests and remove redundant ones

* Fix clicking on a cell scrolls the canvas to the left
Remove componentWillMount

* Add a new DragEnter method
Some code cleanup

* Delete redundant displayStart and displayEnd states

* Prevent navigation in FF on drag

* Fix Grid.js and remove redundant tests

* Move tab behaviour from ReactDataGrid to InteractionMask

* Clean up initial tests for tab behavior in InteractionMasks

* Fix typo and event name

* Use CellNavigationMode constant

* Ignore invalid drag items

* Use a single div instead of multiple divs for drag mask

* Fix SelectionMask zIndex for locked columns

* Delete OverflowCell and OverflowRow components

* Remove unused props and methods

* Clean up props

* Fix scrolling when scrollToRowIndex is set

* Reorder props for clarity

* Commented unused props and methods

* Fix ESLint errors

* Dispatch SCROLL_TO_COLUMN event to scroll Canvas from ReactDataGrid

* Trigger onCellSelected, onCellDeSelected events when cell selection is changed
Fix openCellEditor instance method

* Fix openCellEditor instance method

* Specify required PropTypes

* Fix closing tags

* Enable auto focus on grid

* Fix last row check

* Implement tab behavior for InteractionMasks

* Fix PropTypes warnings
Remove unused state

* Fix Cell PropTypes

* Fix rowData in EditorContainer

* Fix null reference error for drag copy

* Check onCheckCellIsEditable for editing

* Fix some broken unit tests

* Removed redundant and fixed remaining tests

* Fix context menu

* Fix RowsContainer unit tests

* Disable duplicate tests

* Fix example home page fonts

* Install latest node version

* Simplify appveyor script after node upgrade

* Fix lint errors

* Fix failing IE 11 test

* IE compatible version of Array.keys

* packages/rdg-test-utils/index.js

* Delete unused test-utils project

* install gulp gloablly in order to post to coveralls

* Use node 6 on appveyor

* Delete obsolete scroll utils

* Add unit tests for CellMask

* Add unit tests for CopyMask

* Add unit tests for DragMask

* Remove fdescribe

* Add unit tests for DragHandle

* Add unit tests for EventBus

* Format code and object initialization cleanup

* Add unit test for copy operation

* Use conditional rendering instead of returning null

* Add unit tests for Drag functionaity

* Add unit tests for the SelectionMask component

* Add unit tests for CanvasUtils

* Add unit tests for context menu

* Add test to check if Canvas renders the InteractionMasks component

* Delete commented code

* Handle scrolling when selected cell hits the top/bottom boundary when the cellNavigationMode is changeRow

* Fix tab behavior

* Fix cell selection mask for grouped rows

* Add back IE support

* Add polyfills for Set and Map to make the examples work in IE10

* Remove unused variable

* Fix zIndex for filters

* Fix scrolling when editor is closed

* Deleted commented code

* Fix eslint errors

* Delete obsolete tests
Remove commented code

* Fix Typo

* Move the drag enter logic to Row component

* Uncomment code

* Fix event bus prop type

* Define ref callback as a bound method on the class

* Remove private getSelectedValue method

* Fix Cell component export and columns count (#1227)

* Fix cell export

* Fix columns count

* update file names (#1245)

* Rectangular selection range support (on top of 'next') (#1210)

* Allow selection of ranges (with mouse & keyboard)

Parent components of ReactDataGrid can subscribe to (start, update, end) events about
selection ranges. An example page demonstrates this.

* Minor InteractionMasks refactoring based on comments on PR #1210

* Update ReactDataGrid API to group cell range event handlers under cellRangeSelection prop

* Refactor single and multi-cell range selection masks into components

* Revert "Refactor single and multi-cell range selection masks into components"

This reverts commit 8ea34d7.

* Scrolling improvements (#1254)

* Effiecient windowing example

* Remove use of refs to setScrollLeft. Renamed row/col visible boundary property names

* Calculate overscan columns based on scroll direction

* Render overscan columns and rows based on scroll direction

* Set height of grid

* Improved overscan row/col calcualtion

* Send isScrolling prop to formatters to improve perf of complex formatters

* Pass isScrolling prop to HeaderCell and Formatter

* Pass isScrolling prop to HeaderCell and Formatter 2

* Set pointer-events to none when scrolling

* reset setScrollLeft functionality to enable frozen columns

* Ensure set scroll left on frozen columns when scrolling in vertical direction

* Fix context menu

* zindex styles for locked cells

* Render overscan columns when row scrolling has complete

* Show correct SelectionMask position for locked cells

* is scrolling example

* Do not deep compare dependentValues check

* Ensure rowOverscanEndIdx within bounds

* Ensure frozen cells are mounted in correct fixed position if canvas has been scrolled

* Move InteractionMasks styles to a separate file

* Cherry pick set cell ref commit

* Base SelectionMask top and left off rendered cells to handle dynamic row heights

* Take scroll left into account when open editor container

* Catchup with next branch

* Re-add lost canvas.js file

* Fix lint errors

* Fix some build errors

* Remove references to deleted RowsContainer file

* Fix typo

* Fix InteractionMaks test

* Fix some tests

* Fix failing tests

* Handle dynamic row heights in SelectionMask

* Remove unnecessary packages

* Viewport scroll calculations

* Address pull request comments

* use let instead of const in checkScroll function

* Remove unneeded  id from Row component

* Chang logic around getRenderedColumns

* Address more PR comments

* Tests for Viewport Utils

* Fix lint errors and remove console rule from lintrc

* Tests for getScrollDirection

* Tests for getRowOverscanStartIdx

* getRowOverscanEndIdx tests

* Tests for getColOverscanEndIdx

* Tidy up syntax in example31-isScrolling

* Ensure locked columns are shifted to start of column metrics array

* Test for rendering the correct cells

* Fix lint errors

* Rename all fixed/locked/frozen columns to frozen

* Fix tests after npm update

* Fix IE test

* Fixed new warnings in tests

* Fix failing test

* Update version to 5.0.0-alpha1

* Ensure render all visible columns if scrolled to the right and using frozen columns

* Version bump

* Change test expectation

* Fix test

* Ensure last column is rendered when grid scrolled and using frozen columns

* Minor version bump

* Handle viewport scroll state when no columns present

* 5.0.0-alpha8

* Fallback for getSelectedRowTop if no access to row ref

* Fix some bugs around cell selection for RowGroups

* Fix failing test

* Pass row prop to formatters

* Fix failing test and version bump

* Fix lint error

* Re-add deprecated onRowUpdatedMethod - to be removed in v6

* Address some more PR comments

* Air BNB browser shims for Enzyme testing

* Remove unused functions

* prop deprecation warnings

* onDragHandleDoubleClick deprecation warning

* Publish next branch on commit to next

* Get selected row columns if applicable

* Fix failing tests

* Update npmrc token

* Fix some zIndex issues around frozen cells and editors

*  Remove ReactDataGrid dependency from addons bundle (#1272)

* Fix some zIndex issues around frozen cells and editors

* Remove rdg dependency from addons package

* Fix object assign

* Adress PR comments

* Fix tests

* Fix lint error

* add ref to draggable header cell

* Adress PR comments

* Pass renderBase row and correct ref to custom row renderer

* Change editor container to be fixed position

* Add missing rdg-editor-container class on EditorContainer (#1275)

* Ensure row refs reference an RDG Row component

* Show all columns unless scrolling vertically

* isFrozen column check

* Render edtior container without taking scrollLeft into account if column is frozen

* Set CellMask position to be fixed when scrolling horizontally and frozen column is selected

* Unit tests and refactoring (#1279)

Added unit tests for editor position relating to frozen columns. And refactored spec file, updating legacy code

* Upgrade to RDG 5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants