Skip to content

fix: drag jumps to the right due to the failed merge #1564

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

Merged
merged 1 commit into from
Apr 9, 2019
Merged

Conversation

qili26
Copy link
Contributor

@qili26 qili26 commented Apr 9, 2019

Description

A few sentences describing the overall goals of the pull request's commits.

Please check if the PR fulfills these requirements

What kind of change does this PR introduce? (check one with "x")

[ ] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Other... Please describe:

What is the current behavior? (You can also link to an open issue here)

What is the new behavior?

Does this PR introduce a breaking change? (check one with "x")

[ ] Yes
[ ] No

If this PR contains a breaking change, please describe the impact and migration path for existing applications: ...

Other information:

@qili26
Copy link
Contributor Author

qili26 commented Apr 9, 2019

Due to the release failure, this issue is fixed. Recreate a PR to fix.

#1421

@qili26 qili26 self-assigned this Apr 9, 2019
Copy link
Contributor

@nstepien nstepien left a comment

Choose a reason for hiding this comment

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

Did we forget to merge v5 into v6?

@amanmahajan7
Copy link
Contributor

@MayhemYDG it was a bad merge that we missed
#1425

d9f8634#diff-58d2c424802f17b3bf163a3ae5b4469fR62

@nstepien nstepien merged commit 7033a1b into next Apr 9, 2019
@nstepien nstepien deleted the ql-resize-fix branch April 9, 2019 13:49
@qili26
Copy link
Contributor Author

qili26 commented Apr 9, 2019

thanks guys!

@ggcatu ggcatu mentioned this pull request Apr 23, 2019
11 tasks
keriat pushed a commit to superform-xyz/react-data-grid that referenced this pull request Jan 10, 2024
## [5.1.0](v5.0.4...5.1.0) (2024-01-10)

### Features

* Add DataGridComponentsProvider component and DataGrid.components prop ([adazzle#2754](https://github.com/superform-xyz/react-data-grid/issues/2754)) ([f864291](f864291))
* Add support for flex column width ([adazzle#2839](https://github.com/superform-xyz/react-data-grid/issues/2839)) ([4a136ad](4a136ad))
* expose scroll event ([adazzle#2011](https://github.com/superform-xyz/react-data-grid/issues/2011)) ([7614c8e](7614c8e))
* RTL ([adazzle#2803](https://github.com/superform-xyz/react-data-grid/issues/2803)) ([c0e4a63](c0e4a63))
* semantic release installed and configured ([e71bfe6](e71bfe6))

### Bug Fixes

* drag jumps to the right due to the failed merge ([adazzle#1564](https://github.com/superform-xyz/react-data-grid/issues/1564)) ([7033a1b](7033a1b))
* isSelectedCellEditable row getter idx ([adazzle#1743](https://github.com/superform-xyz/react-data-grid/issues/1743)) ([018f137](018f137))
* package-lock.json added to version control ([df39113](df39113))

### Reverts

* Revert "Dependabot: set versioning-strategy to increase (adazzle#2479)" (adazzle#2511) ([0bedc81](0bedc81))
keriat pushed a commit to superform-xyz/react-data-grid that referenced this pull request Jan 10, 2024
## [5.1.0](v5.0.4...5.1.0) (2024-01-10)

### Features

* Add DataGridComponentsProvider component and DataGrid.components prop ([adazzle#2754](https://github.com/superform-xyz/react-data-grid/issues/2754)) ([f864291](f864291))
* Add support for flex column width ([adazzle#2839](https://github.com/superform-xyz/react-data-grid/issues/2839)) ([4a136ad](4a136ad))
* expose scroll event ([adazzle#2011](https://github.com/superform-xyz/react-data-grid/issues/2011)) ([7614c8e](7614c8e))
* RTL ([adazzle#2803](https://github.com/superform-xyz/react-data-grid/issues/2803)) ([c0e4a63](c0e4a63))
* semantic release installed and configured ([e71bfe6](e71bfe6))

### Bug Fixes

* drag jumps to the right due to the failed merge ([adazzle#1564](https://github.com/superform-xyz/react-data-grid/issues/1564)) ([7033a1b](7033a1b))
* isSelectedCellEditable row getter idx ([adazzle#1743](https://github.com/superform-xyz/react-data-grid/issues/1743)) ([018f137](018f137))
* package-lock.json added to version control ([df39113](df39113))

### Reverts

* Revert "Dependabot: set versioning-strategy to increase (adazzle#2479)" (adazzle#2511) ([0bedc81](0bedc81))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants