Skip to content

do not prepend if already reloading #130

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.

Sign up for GitHub

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

Open
kyrasteen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

do not prepend if already reloading #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72383bd
only prepend if not already reloading
Jun 15, 2018
0711256
updated spec to account for default transitionDuration before asserti…
Jun 19, 2018
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
4 changes: 3 additions & 1 deletion lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@ var MasonryComponent = createReactClass({
}

if (diff.prepended.length > 0) {
this.masonry.prepended(diff.prepended);
if (!reloadItems) {
this.masonry.prepended(diff.prepended);
}

if (this.props.enableResizableChildren) {
diff.prepended.forEach(this.listenToElementResize, this);
Expand Down
16 changes: 10 additions & 6 deletions spec/react-masonry-component-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ describe('React Masonry Component', function() {
}
};

it('should correctly layout new elements when completely replacing child items [transitionDuration empty]', function() {
it('should correctly layout new elements when completely replacing child items [transitionDuration empty]', function(/*done*/) {
let wrapperContext;
class Wrapper extends React.Component {
constructor() {
Expand Down Expand Up @@ -326,12 +326,16 @@ describe('React Masonry Component', function() {
}

wrapperContext.setState({items: childrenElements.slice().reverse()});
const secondElements = div.querySelectorAll('.item');

for (let i = 0; i < secondElements.length; i++) {
expect(secondElements[i].style.left).toEqual(secondPositions[i].left + 'px');
expect(secondElements[i].style.top).toEqual(secondPositions[i].top + 'px');
}
setTimeout(() => {
const secondElements = div.querySelectorAll('.item');

for (let i = 0; i < secondElements.length; i++) {
expect(secondElements[i].style.left).toEqual(secondPositions[i].left + 'px');
expect(secondElements[i].style.top).toEqual(secondPositions[i].top + 'px');
}
// done();
Copy link
Copy Markdown
Author

@kyrasteen kyrasteen Jun 19, 2018

Choose a reason for hiding this comment

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

@eiriklv - I updated this test to account for masonry's default transitionDuration. I will look into it further, but there seems to be a timing issue when the done callback is utilized here (test fails).

}, 400 );
});

it('should correctly layout new elements when completely replacing child items [transitionDuration zero]', function() {
Expand Down