1
0
Fork 0
mirror of https://github.com/muerwre/vault-frontend.git synced 2025-04-25 04:46:40 +07:00

refactored flow layout

This commit is contained in:
Fedor Katurov 2020-04-18 13:54:18 +07:00
parent 756c82c8aa
commit 02885b89d5
4 changed files with 150 additions and 78 deletions

View file

@ -1,39 +1,37 @@
import React, { FC, useEffect, useCallback } from "react";
import { connect } from "react-redux";
import { FlowGrid } from "~/components/flow/FlowGrid";
import { selectFlow } from "~/redux/flow/selectors";
import * as NODE_ACTIONS from "~/redux/node/actions";
import * as FLOW_ACTIONS from "~/redux/flow/actions";
import pick from "ramda/es/pick";
import { selectUser } from "~/redux/auth/selectors";
import React, { FC, useEffect, useCallback } from 'react';
import { connect } from 'react-redux';
import { FlowGrid } from '~/components/flow/FlowGrid';
import { selectFlow } from '~/redux/flow/selectors';
import * as NODE_ACTIONS from '~/redux/node/actions';
import * as FLOW_ACTIONS from '~/redux/flow/actions';
import pick from 'ramda/es/pick';
import { selectUser } from '~/redux/auth/selectors';
import { FlowHero } from '~/components/flow/FlowHero';
import { FlowRecent } from '~/components/flow/FlowRecent';
import styles from './styles.scss';
const mapStateToProps = state => ({
flow: pick(
["nodes", "heroes", "recent", "updated", "is_loading"],
selectFlow(state)
),
user: pick(["role", "id"], selectUser(state))
flow: pick(['nodes', 'heroes', 'recent', 'updated', 'is_loading'], selectFlow(state)),
user: pick(['role', 'id'], selectUser(state)),
});
const mapDispatchToProps = {
nodeGotoNode: NODE_ACTIONS.nodeGotoNode,
flowSetCellView: FLOW_ACTIONS.flowSetCellView,
flowGetMore: FLOW_ACTIONS.flowGetMore
flowGetMore: FLOW_ACTIONS.flowGetMore,
};
type IProps = ReturnType<typeof mapStateToProps> &
typeof mapDispatchToProps & {};
type IProps = ReturnType<typeof mapStateToProps> & typeof mapDispatchToProps & {};
const FlowLayoutUnconnected: FC<IProps> = ({
flow: { nodes, heroes, recent, updated, is_loading },
user,
nodeGotoNode,
flowSetCellView,
flowGetMore
flowGetMore,
}) => {
const loadMore = useCallback(() => {
const pos =
window.scrollY + window.innerHeight - document.body.scrollHeight;
const pos = window.scrollY + window.innerHeight - document.body.scrollHeight;
if (is_loading || pos < -600) return;
@ -41,27 +39,31 @@ const FlowLayoutUnconnected: FC<IProps> = ({
}, [flowGetMore, is_loading]);
useEffect(() => {
window.addEventListener("scroll", loadMore);
window.addEventListener('scroll', loadMore);
return () => window.removeEventListener("scroll", loadMore);
return () => window.removeEventListener('scroll', loadMore);
}, [loadMore]);
return (
<FlowGrid
nodes={nodes}
heroes={heroes}
recent={recent}
updated={updated}
onSelect={nodeGotoNode}
user={user}
onChangeCellView={flowSetCellView}
/>
<div className={styles.grid}>
<div className={styles.hero}>
<FlowHero heroes={heroes} />
</div>
<div className={styles.stamp}>
<FlowRecent recent={recent} updated={updated} />
</div>
<FlowGrid
nodes={nodes}
onSelect={nodeGotoNode}
user={user}
onChangeCellView={flowSetCellView}
/>
</div>
);
};
const FlowLayout = connect(
mapStateToProps,
mapDispatchToProps
)(FlowLayoutUnconnected);
const FlowLayout = connect(mapStateToProps, mapDispatchToProps)(FlowLayoutUnconnected);
export { FlowLayout, FlowLayoutUnconnected };