mirror of
https://github.com/Qortal/qapp-core.git
synced 2025-07-12 20:31:21 +00:00
optimize render of listitem
This commit is contained in:
parent
5bd68768f9
commit
0933cb33ae
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "qapp-core",
|
||||
"version": "1.0.36",
|
||||
"version": "1.0.37",
|
||||
"description": "Qortal's core React library with global state, UI components, and utilities",
|
||||
"main": "dist/index.js",
|
||||
"module": "dist/index.mjs",
|
||||
|
@ -18,7 +18,7 @@ interface HorizontalPaginatedListProps {
|
||||
defaultLoaderParams?: DefaultLoaderParams;
|
||||
}
|
||||
|
||||
export const HorizontalPaginatedList = ({
|
||||
const MemorizedComponent = ({
|
||||
items,
|
||||
listItem,
|
||||
loaderItem,
|
||||
@ -30,6 +30,7 @@ export const HorizontalPaginatedList = ({
|
||||
disablePagination,
|
||||
defaultLoaderParams
|
||||
}: HorizontalPaginatedListProps) => {
|
||||
|
||||
const lastItemRef= useRef<any>(null)
|
||||
const lastItemRef2= useRef<any>(null)
|
||||
const [columnsPerRow, setColumnsPerRow] = useState<null | number>(null)
|
||||
@ -102,3 +103,7 @@ const displayedItems = disablePagination ? items : items?.length < (displayedLim
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
|
||||
export const HorizontalPaginatedList = React.memo(MemorizedComponent);
|
||||
|
@ -366,6 +366,13 @@ const setResourceCacheExpiryDuration = useCacheStore((s) => s.setResourceCacheEx
|
||||
return listItem(item, index);
|
||||
}, [ listItem]);
|
||||
|
||||
const onLoadLess = useCallback((displayLimit: number)=> {
|
||||
removeFromList(listName, displayLimit)
|
||||
}, [removeFromList])
|
||||
const onLoadMore = useCallback((displayLimit: number)=> {
|
||||
getResourceMoreList(displayLimit)
|
||||
}, [getResourceMoreList])
|
||||
|
||||
return (
|
||||
<div ref={elementRef} style={{
|
||||
width: '100%',
|
||||
@ -417,9 +424,7 @@ const setResourceCacheExpiryDuration = useCacheStore((s) => s.setResourceCacheEx
|
||||
)}
|
||||
{disableVirtualization && direction === "HORIZONTAL" && (
|
||||
<>
|
||||
<HorizontalPaginatedList defaultLoaderParams={defaultLoaderParams} disablePagination={disablePagination} limit={search?.limit || 20} onLoadLess={(displayLimit)=> {
|
||||
removeFromList(listName, displayLimit)
|
||||
}} items={listToDisplay} listItem={renderListItem} onLoadMore={(displayLimit)=> getResourceMoreList(displayLimit)} gap={styles?.gap} minItemWidth={styles?.horizontalStyles?.minItemWidth} loaderItem={loaderItem} />
|
||||
<HorizontalPaginatedList defaultLoaderParams={defaultLoaderParams} disablePagination={disablePagination} limit={search?.limit || 20} onLoadLess={onLoadLess} items={listToDisplay} listItem={renderListItem} onLoadMore={onLoadMore} gap={styles?.gap} minItemWidth={styles?.horizontalStyles?.minItemWidth} loaderItem={loaderItem} />
|
||||
</>
|
||||
|
||||
)}
|
||||
@ -458,7 +463,6 @@ function arePropsEqual(
|
||||
|
||||
export const ResourceListDisplay = React.memo(MemorizedComponent, arePropsEqual);
|
||||
|
||||
|
||||
interface ListItemWrapperProps {
|
||||
item: QortalMetadata;
|
||||
index: number;
|
||||
@ -474,13 +478,27 @@ export const ListItemWrapper: React.FC<ListItemWrapperProps> = ({
|
||||
defaultLoaderParams,
|
||||
renderListItemLoader,
|
||||
}) => {
|
||||
const getResourceCache = useCacheStore((s)=> s.getResourceCache)
|
||||
const resourceKey = `${item.service}-${item.name}-${item.identifier}`;
|
||||
|
||||
const findCachedResource = getResourceCache(
|
||||
`${item.service}-${item.name}-${item.identifier}`,
|
||||
true
|
||||
);
|
||||
if (findCachedResource === null && !renderListItemLoader)
|
||||
const entry = useCacheStore((s) => s.resourceCache[resourceKey]);
|
||||
const [validResource, setValidResource] = useState(entry?.data ?? null);
|
||||
|
||||
useEffect(() => {
|
||||
if (!entry) return setValidResource(null);
|
||||
|
||||
if (entry.expiry > Date.now()) {
|
||||
setValidResource(entry.data);
|
||||
} else {
|
||||
useCacheStore.setState((s) => {
|
||||
const newCache = { ...s.resourceCache };
|
||||
delete newCache[resourceKey];
|
||||
return { resourceCache: newCache };
|
||||
});
|
||||
setValidResource(null);
|
||||
}
|
||||
}, [entry, resourceKey]);
|
||||
|
||||
if (validResource === null && !renderListItemLoader)
|
||||
return (
|
||||
<ItemCardWrapper height={60} isInCart={false}>
|
||||
<ResourceLoader
|
||||
@ -491,7 +509,7 @@ export const ListItemWrapper: React.FC<ListItemWrapperProps> = ({
|
||||
/>
|
||||
</ItemCardWrapper>
|
||||
);
|
||||
if (findCachedResource === false && !renderListItemLoader)
|
||||
if (validResource === false && !renderListItemLoader)
|
||||
return (
|
||||
<ItemCardWrapper height={60} isInCart={false}>
|
||||
<ResourceLoader
|
||||
@ -505,16 +523,16 @@ export const ListItemWrapper: React.FC<ListItemWrapperProps> = ({
|
||||
);
|
||||
if (
|
||||
renderListItemLoader &&
|
||||
(findCachedResource === false || findCachedResource === null)
|
||||
(validResource === false || validResource === null)
|
||||
) {
|
||||
return renderListItemLoader(
|
||||
findCachedResource === null ? "LOADING" : "ERROR"
|
||||
validResource === null ? "LOADING" : "ERROR"
|
||||
);
|
||||
}
|
||||
|
||||
// Example transformation (Modify item if needed)
|
||||
const transformedItem = findCachedResource
|
||||
? findCachedResource
|
||||
const transformedItem = validResource
|
||||
? validResource
|
||||
: { qortalMetadata: item, data: null };
|
||||
|
||||
return <>{render(transformedItem, index)}</>;
|
||||
|
@ -23,7 +23,7 @@ interface VerticalPaginatedListProps {
|
||||
defaultLoaderParams?: DefaultLoaderParams;
|
||||
}
|
||||
|
||||
export const VerticalPaginatedList = ({
|
||||
const MemorizedComponent = ({
|
||||
items,
|
||||
listItem,
|
||||
loaderItem,
|
||||
@ -111,3 +111,5 @@ export const VerticalPaginatedList = ({
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export const VerticalPaginatedList = React.memo(MemorizedComponent);
|
||||
|
Loading…
x
Reference in New Issue
Block a user