forked from Weaverse/pilot
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request Weaverse#229 from Weaverse/dev
Dev
- Loading branch information
Showing
7 changed files
with
178 additions
and
136 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 0 additions & 57 deletions
57
app/sections/collection-filters/products-loaded-on-scroll.tsx
This file was deleted.
Oops, something went wrong.
115 changes: 115 additions & 0 deletions
115
app/sections/collection-filters/products-pagination.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| import { useLoaderData, useNavigate } from "@remix-run/react"; | ||
| import { Pagination } from "@shopify/hydrogen"; | ||
| import clsx from "clsx"; | ||
| import { useEffect } from "react"; | ||
| import { useInView } from "react-intersection-observer"; | ||
| import type { CollectionDetailsQuery } from "storefrontapi.generated"; | ||
| import Link from "~/components/link"; | ||
| import { getImageLoadingPriority } from "~/lib/const"; | ||
| import { ProductCard } from "~/modules/product-card"; | ||
|
|
||
| export function ProductsPagination({ | ||
| gridSizeDesktop, | ||
| gridSizeMobile, | ||
| loadPrevText, | ||
| loadMoreText, | ||
| }: { | ||
| gridSizeDesktop: number; | ||
| gridSizeMobile: number; | ||
| loadPrevText: string; | ||
| loadMoreText: string; | ||
| }) { | ||
| let { collection } = useLoaderData< | ||
| CollectionDetailsQuery & { | ||
| collections: Array<{ handle: string; title: string }>; | ||
| } | ||
| >(); | ||
| let { ref, inView } = useInView(); | ||
|
|
||
| return ( | ||
| <Pagination connection={collection.products}> | ||
| {({ | ||
| nodes, | ||
| isLoading, | ||
| nextPageUrl, | ||
| previousPageUrl, | ||
| hasNextPage, | ||
| hasPreviousPage, | ||
| state, | ||
| }) => ( | ||
| <div | ||
| className="flex w-full flex-col gap-8 items-center" | ||
| style={ | ||
| { | ||
| "--cols-mobile": `repeat(${gridSizeMobile || 1}, minmax(0, 1fr))`, | ||
| "--cols-desktop": `repeat(${gridSizeDesktop || 3}, minmax(0, 1fr))`, | ||
| } as React.CSSProperties | ||
| } | ||
| > | ||
| {hasPreviousPage && ( | ||
| <Link to={previousPageUrl} variant="outline" className="mx-auto"> | ||
| {isLoading ? "Loading..." : loadPrevText} | ||
| </Link> | ||
| )} | ||
| <ProductsLoadedOnScroll | ||
| nodes={nodes} | ||
| inView={inView} | ||
| nextPageUrl={nextPageUrl} | ||
| hasNextPage={hasNextPage} | ||
| state={state} | ||
| /> | ||
| {hasNextPage && ( | ||
| <Link | ||
| ref={ref} | ||
| to={nextPageUrl} | ||
| variant="outline" | ||
| className="mx-auto" | ||
| > | ||
| {isLoading ? "Loading..." : loadMoreText} | ||
| </Link> | ||
| )} | ||
| </div> | ||
| )} | ||
| </Pagination> | ||
| ); | ||
| } | ||
|
|
||
| interface ProductsLoadedOnScrollProps { | ||
| nodes: any; | ||
| inView: boolean; | ||
| nextPageUrl: string; | ||
| hasNextPage: boolean; | ||
| state: any; | ||
| } | ||
|
|
||
| function ProductsLoadedOnScroll(props: ProductsLoadedOnScrollProps) { | ||
| let { nodes, inView, nextPageUrl, hasNextPage, state } = props; | ||
| let navigate = useNavigate(); | ||
|
|
||
| useEffect(() => { | ||
| if (inView && hasNextPage) { | ||
| navigate(nextPageUrl, { | ||
| replace: true, | ||
| preventScrollReset: true, | ||
| state, | ||
| }); | ||
| } | ||
| }, [inView, navigate, state, nextPageUrl, hasNextPage]); | ||
|
|
||
| return ( | ||
| <div | ||
| className={clsx([ | ||
| "w-full gap-x-1.5 gap-y-8 lg:gap-y-10", | ||
| "grid grid-cols-[--cols-mobile] lg:grid-cols-[--cols-desktop]", | ||
| ])} | ||
| > | ||
| {nodes.map((product: any, i: number) => ( | ||
| <ProductCard | ||
| key={product.id} | ||
| product={product} | ||
| loading={getImageLoadingPriority(i)} | ||
| /> | ||
| ))} | ||
| </div> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.