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

chore: Sync with upstream #2

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e83cfe6
Fix touch events being lost by listening to event.target on mobile
Aug 21, 2019
eb9a56c
fix: fix issue with item not properly animating forward to the next row
alexcheuk Apr 29, 2020
91dc1b0
chore(deps): bump markdown-to-jsx from 6.9.1 to 6.11.4
dependabot[bot] Sep 4, 2020
fa752bb
fix: check event cancelable before preventDefault
leibowitz Oct 23, 2020
1aa0e73
Update SortableContainerProps
aswathpp97 Nov 22, 2020
0669f47
chore(deps): bump ini from 1.3.5 to 1.3.7
dependabot[bot] Dec 11, 2020
60a8d69
Add react v17 to the peer deps.
pleunv Jan 25, 2021
8d0ee26
chore(deps): bump elliptic from 6.4.1 to 6.5.4
dependabot[bot] Mar 9, 2021
d3dad44
Use new React context (#624)
lindskogen Mar 19, 2021
0d2ef54
Update README.md (#721)
rubencodes Mar 19, 2021
92b5d48
Merge pull request #755 from aswathpp97/fix/no-disable-auto-scroll-key
clauderic Mar 19, 2021
6c72ec2
Merge pull request #752 from leibowitz/fix-prevent-default
clauderic Mar 19, 2021
0049d0d
Merge pull request #586 from clauderic/fix-mobile-listener-node-issue
clauderic Mar 19, 2021
888647f
Merge pull request #768 from pleunv/patch-1
clauderic Mar 19, 2021
b4237bb
Merge pull request #777 from clauderic/dependabot/npm_and_yarn/ellipt…
clauderic Mar 19, 2021
97b2674
Merge pull request #761 from clauderic/dependabot/npm_and_yarn/ini-1.3.7
clauderic Mar 19, 2021
541e572
Merge pull request #733 from clauderic/dependabot/npm_and_yarn/markdo…
clauderic Mar 19, 2021
9543dc0
chore(deps): bump bl from 1.2.2 to 1.2.3
dependabot[bot] Mar 19, 2021
f330e3d
Merge pull request #780 from clauderic/dependabot/npm_and_yarn/bl-1.2.3
clauderic Mar 19, 2021
524ea41
chore(deps): bump yargs-parser from 5.0.0 to 5.0.1
dependabot[bot] Mar 19, 2021
2f07bf3
Update React minimum version to 16.3.0
Mar 19, 2021
b11b65e
chore(release): 2.0.0
Mar 19, 2021
f77d193
Merge pull request #691 from alexcheuk/master
clauderic Mar 19, 2021
26fafd6
Upgrade @babel/runtime
Mar 19, 2021
7e7e4d3
Merge pull request #781 from clauderic/dependabot/npm_and_yarn/yargs-…
clauderic Mar 21, 2021
d200090
Add notice for new consumers
clauderic Mar 21, 2021
f36f86a
chore(deps): bump y18n from 3.2.1 to 3.2.2
dependabot[bot] Mar 30, 2021
d94ba3c
Merge pull request #784 from clauderic/dependabot/npm_and_yarn/y18n-3…
clauderic Mar 30, 2021
2be570e
chore(deps): bump ssri from 6.0.1 to 6.0.2
dependabot[bot] Apr 19, 2021
6121a2f
Merge pull request #786 from clauderic/dependabot/npm_and_yarn/ssri-6…
clauderic Apr 27, 2021
21e11c2
Merge branch 'master' of github.com:clauderic/react-sortable-hoc into…
Apr 28, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: fix issue with item not properly animating forward to the next row
  • Loading branch information
alexcheuk committed Apr 29, 2020
commit eb9a56c6dcc01cc7a770d7d2f43da9483a7912de
2 changes: 1 addition & 1 deletion src/SortableContainer/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ export default function sortableContainer(
translate.x = this.width + this.marginOffset.x;
if (
edgeOffset.left + translate.x >
this.containerBoundingRect.width - offset.width
this.containerBoundingRect.width - offset.width * 2
) {
// If it moves passed the right bounds, then animate it to the first position of the next row.
// We just use the offset of the next node to calculate where to move, because that node's original position
Expand Down