nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2025-02-18 18:02:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

FInally fix catalog

Browse Source
This commit is contained in:
Bill 2021-07-27 20:01:37 -04:00
parent 98a169f406
commit ddea5be9bc
4 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/views/catalog/CatalogView.tsx
View File

@ -8,9 +8,9 @@ import { NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, Nitro
import { LocalizeText } from '../../utils/LocalizeText';
import { CatalogMessageHandler } from './CatalogMessageHandler';
import { CatalogMode, CatalogViewProps } from './CatalogView.types';
import { GetCatalogPageTree } from './common/CatalogUtilities';
import { BuildCatalogPageTree } from './common/CatalogUtilities';
import { CatalogContextProvider } from './context/CatalogContext';
import { CatalogActions, CatalogReducer, initialCatalog } from './reducers/CatalogReducer';
import { CatalogReducer, initialCatalog } from './reducers/CatalogReducer';
import { CatalogNavigationView } from './views/navigation/CatalogNavigationView';
import { CatalogPageView } from './views/page/CatalogPageView';
@ -21,7 +21,8 @@ export const CatalogView: FC<CatalogViewProps> = props =>
const [ pendingPageId, setPendingPageId ] = useState(-1);
const [ pendingTree, setPendingTree ] = useState<ICatalogPageData[]>(null);
const [ catalogState, dispatchCatalogState ] = useReducer(CatalogReducer, initialCatalog);
const { root = null, currentTab = null, pageParser = null, activeOffer = null, searchResult = null} = catalogState;
const [ currentTab, setCurrentTab ] = useState<ICatalogPageData>(null);
const { root = null, pageParser = null, activeOffer = null, searchResult = null} = catalogState;
const onCatalogEvent = useCallback((event: CatalogEvent) =>
{
@ -44,27 +45,6 @@ export const CatalogView: FC<CatalogViewProps> = props =>
useUiEvent(CatalogEvent.TOGGLE_CATALOG, onCatalogEvent);
useUiEvent(CatalogEvent.CATALOG_RESET, onCatalogEvent);
const setCurrentTab = useCallback((page: ICatalogPageData) =>
{
dispatchCatalogState({
type: CatalogActions.SET_CATALOG_CURRENT_TAB,
payload: {
currentTab: page
}
});
}, [ dispatchCatalogState ]);
const buildCatalogPageTree = useCallback((page: ICatalogPageData, targetPageId: number) =>
{
const pageTree: ICatalogPageData[] = [];
GetCatalogPageTree(page, targetPageId, pageTree);
if(pageTree.length) pageTree.reverse();
return pageTree;
}, []);
const linkReceived = useCallback((url: string) =>
{
const parts = url.split('/');
@ -106,6 +86,8 @@ export const CatalogView: FC<CatalogViewProps> = props =>
{
SendMessageHook(new CatalogModeComposer(CatalogMode.MODE_NORMAL));
SendMessageHook(new CatalogRequestGiftConfigurationComposer());
return;
}
if(catalogState.root)
@ -119,14 +101,32 @@ export const CatalogView: FC<CatalogViewProps> = props =>
if(pendingPageId > -1)
{
const tree = buildCatalogPageTree(catalogState.root, pendingPageId);
const tree = BuildCatalogPageTree(catalogState.root, pendingPageId);
setCurrentTab(tree.shift());
setPendingPageId(-1);
setPendingTree(tree);
}
else
{
setCurrentTab(prevValue =>
{
if(catalogState.root.children.length)
{
if(prevValue)
{
if(catalogState.root.children.indexOf(prevValue) >= 0) return prevValue;
}
}, [ isVisible, pendingPageId, catalogState.root, buildCatalogPageTree, setCurrentTab ]);
return ((catalogState.root.children.length && catalogState.root.children[0]) || null);
}
return null;
});
}
}
}, [ isVisible, pendingPageId, catalogState.root, setCurrentTab ]);
useEffect(() =>
{
@ -151,6 +151,7 @@ export const CatalogView: FC<CatalogViewProps> = props =>
}, []);
const currentNavigationPage = ((searchResult && searchResult.page) || currentTab);
const navigationHidden = (pageParser && pageParser.frontPageItems.length);
return (
<CatalogContextProvider value={ { catalogState, dispatchCatalogState } }>
@ -170,7 +171,7 @@ export const CatalogView: FC<CatalogViewProps> = props =>
</NitroCardTabsView>
<NitroCardContentView>
<div className="row h-100">
{ (!pageParser || (pageParser && !pageParser.frontPageItems.length)) &&
{ currentNavigationPage && !navigationHidden &&
<div className="col-3 d-flex flex-column h-100">
<CatalogNavigationView page={ currentNavigationPage } pendingTree={ pendingTree } setPendingTree={ setPendingTree } />
</div> }

11
src/views/catalog/common/CatalogUtilities.ts
View File

@ -166,3 +166,14 @@ export function GetCatalogPageTree(page: ICatalogPageData, targetPageId: number,
}
}
}
export function BuildCatalogPageTree(page: ICatalogPageData, targetPageId: number)
{
const pageTree: ICatalogPageData[] = [];
GetCatalogPageTree(page, targetPageId, pageTree);
if(pageTree.length) pageTree.reverse();
return pageTree;
}

10
src/views/catalog/views/navigation/item/CatalogNavigationItemView.tsx
View File

@ -43,18 +43,12 @@ export const CatalogNavigationItemView: FC<CatalogNavigationItemViewProps> = pro
if(page !== pendingTree[0]) return;
if(pendingTree.length > 1)
{
const newTree = [ ...pendingTree ];
newTree.shift();
setPendingTree(newTree);
}
else
{
setPendingTree(null);
}
if(newTree.length) setPendingTree(newTree);
else setPendingTree(null);
select(page, true);
}, [ page, pendingTree, setPendingTree, select ]);

18
src/views/catalog/views/navigation/set/CatalogNavigationSetView.tsx
View File

@ -10,20 +10,20 @@ export const CatalogNavigationSetView: FC<CatalogNavigationSetViewProps> = props
useEffect(() =>
{
if(!isFirstSet || !page || (page.pageId === -1) || pendingTree) return;
if(!page || (page.pageId === -1) || !isFirstSet || pendingTree) return;
if(page && page.children.length)
if(page.children.length)
{
const child = page.children[0];
if(activeChild)
{
if(page.children.indexOf(activeChild) === -1) setActiveChild(null);
//if(child) setActiveChild(child);
return;
}
}, [ page, isFirstSet, pendingTree ]);
useEffect(() =>
{
console.log('activeChild', activeChild, page);
}, [ page, activeChild ]);
setActiveChild(page.children[0]);
}
}, [ page, isFirstSet, activeChild, pendingTree ]);
return (
<div className="row row-cols-1 g-0 catalog-navigation-set-container w-100">