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

Visme master #827

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
82a3c80
Add files via upload
oleghind Feb 4, 2020
c0784dd
Add files via upload
oleghind Feb 4, 2020
d1736ff
bug/VISME-2771-image-icon-transparent-image-during-dragging-with-reac…
wj42ftns Feb 25, 2021
4e00144
Merge pull request #1 from wj42ftns/bug/VISME-2771-image-icon-transpa…
oleghind Feb 25, 2021
31441ad
Add files via upload
oleghind Mar 4, 2021
b362fe2
Update .gitignore
oleghind Mar 4, 2021
d7cc319
fix transform scale issue
Rustamhabibullin Jan 25, 2022
4632e4e
Merge pull request #2 from Rustamhabibullin/patch-1
oleghind Jan 25, 2022
f96bb31
fix different height drag issue
Rustamhabibullin Jan 27, 2022
135c54e
Merge pull request #4 from Rustamhabibullin/patch-3
oleghind Jan 27, 2022
3465153
Merge pull request #5 from hindsite/master
oleghind Jan 27, 2022
012653e
VISME-fix-drag-sort-scale-issue-new-build
Rustamhabibullin Jan 28, 2022
e415b47
resolve conflicts
Rustamhabibullin Jan 28, 2022
4f7bcb7
Merge pull request #7 from hindsite/VISME-fix-drag-sort-scale-issue
Rustamhabibullin Jan 28, 2022
5d175af
Revert "VISME-fix-drag-sort-scale-issue-new-build"
Rustamhabibullin Jan 28, 2022
3754cab
Merge pull request #10 from hindsite/revert-7-VISME-fix-drag-sort-sca…
Rustamhabibullin Jan 28, 2022
a8fe08e
chore(release): 1.12.0
Rustamhabibullin Jan 28, 2022
3d0553e
chore(release): 1.12.1
Rustamhabibullin Jan 28, 2022
84ec279
VISME-fix-drag-sort-scale-issue
Rustamhabibullin Jan 28, 2022
120c21b
resolve conflicts
Rustamhabibullin Jan 28, 2022
e05544e
Merge pull request #11 from hindsite/VISME-fix-drag-sort-scale-issue
Rustamhabibullin Jan 28, 2022
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
8 changes: 3 additions & 5 deletions src/SortableContainer/index.js
Original file line number Diff line number Diff line change
@@ -640,8 +640,8 @@ export default function sortableContainer(
for (let i = 0, len = nodes.length; i < len; i++) {
const {node} = nodes[i];
const {index} = node.sortableInfo;
const width = node.offsetWidth;
const height = node.offsetHeight;
const width = node.getBoundingClientRect().width;
const height = node.getBoundingClientRect().height;
const offset = {
height: this.height > height ? height / 2 : this.height / 2,
width: this.width > width ? width / 2 : this.width / 2,
@@ -793,9 +793,7 @@ export default function sortableContainer(
} else if (this.axis.y) {
if (
mustShiftBackward ||
(index > this.index &&
sortingOffset.top + windowScrollDelta.top + offset.height >=
edgeOffset.top)
(index > this.index && sortingOffset.top + windowScrollDelta.top + this.boundingClientRect.height >= edgeOffset.top + offset.height)
) {
translate.y = -(this.height + this.marginOffset.y);
this.newIndex = index;