Skip to content

Fix LoadMoreProducts button not working as it should #2554

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

Merged
merged 3 commits into from
Jul 14, 2017
Merged

Fix LoadMoreProducts button not working as it should #2554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcaa84c
Apply limit to products publication selector for admin users
Jul 13, 2017
560f1e5
Get correct top level products from publications
Jul 13, 2017
4819e25
Set correct scroll check to load more products
Jul 13, 2017
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
2 changes: 1 addition & 1 deletion imports/plugins/included/product-variant/components/products.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class ProductsComponent extends Component {
render() {
if (this.props.ready()) {
return (
<div>
<div id="container-main">
{this.renderProductGrid()}
{this.renderLoadMoreProductsButton()}
{this.renderSpinner()}
Expand Down
7 changes: 3 additions & 4 deletions imports/plugins/included/product-variant/containers/productsContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,15 @@ import ProductsComponent from "../components/products";
function loadMoreProducts() {
let threshold;
const target = document.querySelectorAll("#productScrollLimitLoader");
let scrollContainer = document.querySelectorAll("#reactionAppContainer");

let scrollContainer = document.querySelectorAll("#container-main");
if (scrollContainer.length === 0) {
scrollContainer = window;
}

if (target.length) {
threshold = scrollContainer[0].scrollTop + scrollContainer[0].offsetHeight - target[0].offsetHeight;
threshold = scrollContainer[0].scrollHeight - scrollContainer[0].scrollTop === scrollContainer[0].clientHeight;

if (target[0].offsetTop <= threshold) {
if (threshold) {
if (!target[0].getAttribute("visible")) {
target[0].setAttribute("productScrollLimit", true);
Session.set("productScrollLimit", Session.get("productScrollLimit") + ITEMS_INCREMENT || 24);
Expand Down
32 changes: 28 additions & 4 deletions server/publications/collections/products.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so
selector.isVisible = {
$in: [true, false, undefined]
};
selector.ancestors = [];

// Get _ids of top-level products
const productIds = Products.find(selector, {
Expand All @@ -253,7 +254,7 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so

// Remove hashtag filter from selector (hashtags are not applied to variants, we need to get variants)
if (productFilters && productFilters.tags) {
newSelector = _.omit(selector, ["hashtags"]);
newSelector = _.omit(selector, ["hashtags", "ancestors"]);

// Re-configure selector to pick either Variants of one of the top-level products, or the top-level products in the filter
_.extend(newSelector, {
Expand All @@ -262,9 +263,32 @@ Meteor.publish("Products", function (productScrollLimit = 24, productFilters, so
ancestors: {
$in: productIds
}
}, {
hashtags: {
$in: productFilters.tags
}, { $and: [
{
hashtags: {
$in: productFilters.tags
}
}, {
_id: {
$in: productIds
}
}
]
}
]
});
} else {
newSelector = _.omit(selector, ["hashtags", "ancestors"]);
_.extend(newSelector, {
$or: [
{
ancestors: {
$in: productIds
}
},
{
_id: {
$in: productIds
}
}
]
Expand Down