From 8294053a5773fe58d407e8262f5ad532961dfaf2 Mon Sep 17 00:00:00 2001 From: BFlat Date: Mon, 25 Dec 2023 21:49:16 +0700 Subject: [PATCH] reset masonry grid on filter/sort selection change --- .../v2/view/pages/explore/tabs/MediaTab.tsx | 127 +++++++------- .../v2/view/pages/explore/tabs/WeightsTab.tsx | 153 +++++++++-------- .../profile_view/tabs/BookmarksTab.tsx | 36 +++- .../profile/profile_view/tabs/MediaTab.tsx | 119 +++++++++----- .../profile/profile_view/tabs/WeightsTab.tsx | 155 ++++++++++-------- 5 files changed, 345 insertions(+), 245 deletions(-) diff --git a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx index 8bd7d48d38..ebebe45737 100644 --- a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/MediaTab.tsx @@ -18,6 +18,7 @@ import InfiniteScroll from "react-infinite-scroll-component"; export default function MediaTab() { const gridContainerRef = useRef(null); const [isLoading] = useState(false); + const [showMasonryGrid, setShowMasonryGrid] = useState(true); const [list, listSet] = useState([]); const media = useLazyLists({ @@ -25,15 +26,21 @@ export default function MediaTab() { list, listSet, requestList: true, - // isInfiniteScroll: true, }); - // Fetch more data for infinite scroll - // const fetchMoreData = useCallback(() => { - // if (media.page < media.pageCount) { - // media.pageChange(media.page + 1); - // } - // }, [media]); + const resetMasonryGrid = () => { + setShowMasonryGrid(false); + setTimeout(() => setShowMasonryGrid(true), 10); + }; + + const handleSortOrFilterChange = (event: any) => { + if (media.onChange) { + media.onChange(event); + } + + // Reset Masonry Grid + resetMasonryGrid(); + }; const filterOptions = [ { value: "all", label: "All Media" }, @@ -57,7 +64,7 @@ export default function MediaTab() { icon: faArrowDownWideShort, options: sortOptions, name: "sort", - onChange: media.onChange, + onChange: handleSortOrFilterChange, value: media.sort, }} /> @@ -66,7 +73,7 @@ export default function MediaTab() { icon: faFilter, options: filterOptions, name: "filter", - onChange: media.onChange, + onChange: handleSortOrFilterChange, value: media.filter, }} /> @@ -96,56 +103,58 @@ export default function MediaTab() { } className="overflow-hidden" > - console.log("Layout complete!")} - > - {media.list.map((data: any, index: number) => { - let card; - switch (data.media_type) { - case "audio": - card = ( - - ); - break; - case "image": - card = ( - - ); - break; - case "video": - card = ( - - ); - break; - default: - card =
Unsupported media type
; - } - return ( -
- {card} -
- ); - })} -
+ {showMasonryGrid && ( + console.log("Layout complete!")} + > + {media.list.map((data: any, index: number) => { + let card; + switch (data.media_type) { + case "audio": + card = ( + + ); + break; + case "image": + card = ( + + ); + break; + case "video": + card = ( + + ); + break; + default: + card =
Unsupported media type
; + } + return ( +
+ {card} +
+ ); + })} +
+ )} )} diff --git a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx index d9a8fe290c..f2d97775bc 100644 --- a/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/explore/tabs/WeightsTab.tsx @@ -19,6 +19,7 @@ import { useLazyLists } from "hooks"; export default function WeightsTab() { const gridContainerRef = useRef(null); const [isLoading] = useState(false); + const [showMasonryGrid, setShowMasonryGrid] = useState(true); const [list, listSet] = useState([]); const weights = useLazyLists({ @@ -28,6 +29,20 @@ export default function WeightsTab() { requestList: true, }); + const resetMasonryGrid = () => { + setShowMasonryGrid(false); + setTimeout(() => setShowMasonryGrid(true), 10); + }; + + const handleSortOrFilterChange = (event: any) => { + if (weights.onChange) { + weights.onChange(event); + } + + // Reset Masonry Grid + resetMasonryGrid(); + }; + const filterOptions = [ { value: "all", label: "All Weights" }, { value: "tts", label: "Text to Speech" }, @@ -68,7 +83,7 @@ export default function WeightsTab() { icon: faArrowDownWideShort, options: sortOptions, name: "sort", - onChange: weights.onChange, + onChange: handleSortOrFilterChange, value: weights.sort, }} /> @@ -77,7 +92,7 @@ export default function WeightsTab() { icon: faFilter, options: filterOptions, name: "filter", - onChange: weights.onChange, + onChange: handleSortOrFilterChange, value: weights.filter, }} /> @@ -128,72 +143,74 @@ export default function WeightsTab() { } className="overflow-hidden" > - console.log("Layout complete!")} - > - {weights.list.map((data: any, index: number) => { - let card; - switch (data.weights_category) { - case WeightCategory.TTS: - card = ( - - ); - break; - case WeightCategory.VC: - card = ( - - ); - break; - case WeightCategory.ZS: - card = ( - - ); - break; - case WeightCategory.SD: - card = ( - - ); - break; - case WeightCategory.VOCODER: - card = <>; - break; - default: - card =
Unsupported weight type
; - } - return ( -
- {card} -
- ); - })} -
+ {showMasonryGrid && ( + console.log("Layout complete!")} + > + {weights.list.map((data: any, index: number) => { + let card; + switch (data.weights_category) { + case WeightCategory.TTS: + card = ( + + ); + break; + case WeightCategory.VC: + card = ( + + ); + break; + case WeightCategory.ZS: + card = ( + + ); + break; + case WeightCategory.SD: + card = ( + + ); + break; + case WeightCategory.VOCODER: + card = <>; + break; + default: + card =
Unsupported weight type
; + } + return ( +
+ {card} +
+ ); + })} +
+ )} )} diff --git a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/BookmarksTab.tsx b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/BookmarksTab.tsx index ba20ec9e76..2eccc11d62 100644 --- a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/BookmarksTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/BookmarksTab.tsx @@ -5,7 +5,10 @@ import ImageCard from "components/common/Card/ImageCard"; import VideoCard from "components/common/Card/VideoCard"; import SkeletonCard from "components/common/Card/SkeletonCard"; import Select from "components/common/Select"; -import { faArrowDownWideShort, faFilter } from "@fortawesome/pro-solid-svg-icons"; +import { + faArrowDownWideShort, + faFilter, +} from "@fortawesome/pro-solid-svg-icons"; import Pagination from "components/common/Pagination"; import { useListContent } from "hooks"; @@ -15,9 +18,16 @@ export default function BookmarksTab({ username }: { username: string }) { const gridContainerRef = useRef(null); const [isLoading] = useState(false); const [selectedFilter, setSelectedFilter] = useState("all"); - + // const [showMasonryGrid, setShowMasonryGrid] = useState(true); const [list, listSet] = useState([]); - const bookmarks = useListContent({ debug: "bookmarks tab", fetcher: GetBookmarksByUser, list, listSet, requestList: true, urlParam: username }); + const bookmarks = useListContent({ + debug: "bookmarks tab", + fetcher: GetBookmarksByUser, + list, + listSet, + requestList: true, + urlParam: username, + }); const handlePageClick = (selectedItem: { selected: number }) => { bookmarks.pageChange(selectedItem.selected); @@ -26,9 +36,23 @@ export default function BookmarksTab({ username }: { username: string }) { const paginationProps = { onPageChange: handlePageClick, pageCount: bookmarks.pageCount, - currentPage: bookmarks.page + currentPage: bookmarks.page, }; + // const resetMasonryGrid = () => { + // setShowMasonryGrid(false); + // setTimeout(() => setShowMasonryGrid(true), 10); + // }; + + // const handleSortOrFilterChange = (event: any) => { + // if (weights.onChange) { + // weights.onChange(event); + // } + + // // Reset Masonry Grid + // resetMasonryGrid(); + // }; + const filterOptions = [ { value: "all", label: "All Weights" }, { value: "tts", label: "Text to Speech" }, @@ -106,7 +130,7 @@ export default function BookmarksTab({ username }: { username: string }) { /> )} - + {isLoading ? (
@@ -145,7 +169,7 @@ export default function BookmarksTab({ username }: { username: string }) { )}
- +
); diff --git a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/MediaTab.tsx b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/MediaTab.tsx index 018b99aef6..74ca1a350d 100644 --- a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/MediaTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/MediaTab.tsx @@ -4,7 +4,10 @@ import AudioCard from "components/common/Card/AudioCard"; import ImageCard from "components/common/Card/ImageCard"; import VideoCard from "components/common/Card/VideoCard"; import { TempSelect } from "components/common"; -import { faArrowDownWideShort, faFilter } from "@fortawesome/pro-solid-svg-icons"; +import { + faArrowDownWideShort, + faFilter, +} from "@fortawesome/pro-solid-svg-icons"; import AudioPlayerProvider from "components/common/AudioPlayer/AudioPlayerContext"; import SkeletonCard from "components/common/Card/SkeletonCard"; import Pagination from "components/common/Pagination"; @@ -16,6 +19,7 @@ import { useListContent } from "hooks"; export default function MediaTab({ username }: { username: string }) { const gridContainerRef = useRef(null); const [isLoading] = useState(false); + const [showMasonryGrid, setShowMasonryGrid] = useState(true); const [list, listSet] = useState([]); const media = useListContent({ @@ -25,7 +29,7 @@ export default function MediaTab({ username }: { username: string }) { listSet, // pagePreset: 1, requestList: true, - urlParam: username + urlParam: username, }); const handlePageClick = (selectedItem: { selected: number }) => { @@ -35,7 +39,21 @@ export default function MediaTab({ username }: { username: string }) { const paginationProps = { onPageChange: handlePageClick, pageCount: media.pageCount, - currentPage: media.page + currentPage: media.page, + }; + + const resetMasonryGrid = () => { + setShowMasonryGrid(false); + setTimeout(() => setShowMasonryGrid(true), 10); + }; + + const handleSortOrFilterChange = (event: any) => { + if (media.onChange) { + media.onChange(event); + } + + // Reset Masonry Grid + resetMasonryGrid(); }; const filterOptions = [ @@ -55,22 +73,26 @@ export default function MediaTab({ username }: { username: string }) { <>
- - + +
- +
{isLoading ? ( @@ -80,37 +102,44 @@ export default function MediaTab({ username }: { username: string }) { ))}
) : ( - console.log("Layout complete!")} - > - {media.list.map((data: MediaFile, index: number) => { - let card; - switch (data.media_type) { - case "audio": - card = ; - break; - case "image": - card = ; - break; - case "video": - card = ; - break; - default: - card =
Unsupported media type
; - } - return ( -
- {card} -
- ); - })} -
+ <> + {showMasonryGrid && ( + console.log("Layout complete!")} + > + {media.list.map((data: MediaFile, index: number) => { + let card; + switch (data.media_type) { + case "audio": + card = ; + break; + case "image": + card = ; + break; + case "video": + card = ; + break; + default: + card =
Unsupported media type
; + } + return ( +
+ {card} +
+ ); + })} +
+ )} + )}
- +
); diff --git a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/WeightsTab.tsx b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/WeightsTab.tsx index f25bd73e3b..3ffbfd3bba 100644 --- a/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/WeightsTab.tsx +++ b/packages/fakeyou.com/src/v2/view/pages/profile/profile_view/tabs/WeightsTab.tsx @@ -28,7 +28,7 @@ export default function WeightsTab({ username }: { username: string }) { const [sd, sdSet] = useState("all"); const [tts, ttsSet] = useState("all"); const [vc, vcSet] = useState("all"); - + const [showMasonryGrid, setShowMasonryGrid] = useState(true); const addSetters = { sdSet, ttsSet, vcSet }; const [list, listSet] = useState([]); @@ -83,6 +83,20 @@ export default function WeightsTab({ username }: { username: string }) { currentPage: weights.page, }; + const resetMasonryGrid = () => { + setShowMasonryGrid(false); + setTimeout(() => setShowMasonryGrid(true), 10); + }; + + const handleSortOrFilterChange = (event: any) => { + if (weights.onChange) { + weights.onChange(event); + } + + // Reset Masonry Grid + resetMasonryGrid(); + }; + return ( <>
@@ -92,7 +106,7 @@ export default function WeightsTab({ username }: { username: string }) { icon: faArrowDownWideShort, options: sortOptions, name: "sort", - onChange: weights.onChange, + onChange: handleSortOrFilterChange, value: weights.sort, }} /> @@ -101,7 +115,7 @@ export default function WeightsTab({ username }: { username: string }) { icon: faFilter, options: filterOptions, name: "filter", - onChange: weights.onChange, + onChange: handleSortOrFilterChange, value: weights.filter, }} /> @@ -110,7 +124,7 @@ export default function WeightsTab({ username }: { username: string }) { {...{ options: modelTtsOptions, name: "tts", - onChange: weights.onChange, + onChange: handleSortOrFilterChange, value: tts, }} /> @@ -120,7 +134,7 @@ export default function WeightsTab({ username }: { username: string }) { {...{ options: modelSdOptions, name: "sd", - onChange: weights.onChange, + onChange: handleSortOrFilterChange, value: sd, }} /> @@ -130,7 +144,7 @@ export default function WeightsTab({ username }: { username: string }) { {...{ options: modelVcOptions, name: "vc", - onChange: weights.onChange, + onChange: handleSortOrFilterChange, value: vc, }} /> @@ -145,69 +159,76 @@ export default function WeightsTab({ username }: { username: string }) { ))}
) : ( - console.log("Layout complete!")} - > - {weights.list.map((data: any, index: number) => { - let card; - switch (data.weights_category) { - case WeightCategory.TTS: - card = ( - + {showMasonryGrid && ( + console.log("Layout complete!")} + > + {weights.list.map((data: any, index: number) => { + let card; + switch (data.weights_category) { + case WeightCategory.TTS: + card = ( + + ); + break; + case WeightCategory.VC: + card = ( + + ); + break; + case WeightCategory.ZS: + card = ( + + ); + break; + case WeightCategory.SD: + card = ( + + ); + break; + case WeightCategory.VOCODER: + card = <>; + break; + default: + card =
Unsupported weight type
; + } + return ( +
+ className="col-12 col-sm-6 col-xl-4 grid-item" + > + {card} +
); - break; - case WeightCategory.VC: - card = ( - - ); - break; - case WeightCategory.ZS: - card = ( - - ); - break; - case WeightCategory.SD: - card = ( - - ); - break; - case WeightCategory.VOCODER: - card = <>; - break; - default: - card =
Unsupported weight type
; - } - return ( -
- {card} -
- ); - })} -
+ })} +
+ )} + )}