ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-21 07:28:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

interface: fix urbit/landscape #749

Browse Source
This commit is contained in:
Logan Allen 2021-05-11 14:47:57 -05:00
parent 03039d9fc2
commit a7a16a528e
3 changed files with 73 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/interface/src/views/landscape/components/Home/GroupFeed.tsx
View File

@ -62,6 +62,7 @@ function GroupFeed(props) {
width="100%"
height="100%"
display="flex"
overflow="hidden"
position="relative"
alignItems="center"
>

75
pkg/interface/src/views/landscape/components/Home/Post/PostFeed.tsx
View File

@ -7,6 +7,7 @@ import GlobalApi from '~/logic/api/global';
import { resourceFromPath } from '~/logic/lib/group';
import VirtualScroller from '~/views/components/VirtualScroller';
import PostItem from './PostItem/PostItem';
import PostInput from './PostInput';
const virtualScrollerStyle = {
height: '100%'
@ -62,7 +63,7 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
typeof parentNode.post !== 'string'
) ? parentNode.post.index.split('/').slice(1).map((ind) => {
return bigInt(ind);
}) : [];
}) : [];
if (parentNode && index.eq(first ?? bigInt.zero)) {
return (
@ -107,24 +108,62 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
/>
</React.Fragment>
);
} else if (index.eq(first ?? bigInt.zero)) {
return (
<Col
width="100%"
alignItems="center"
key={index.toString()}
ref={ref}>
<Col
width="100%"
maxWidth="616px"
pt={3}
pl={2}
pr={2}
mb={3}>
<PostInput
api={api}
group={group}
association={association}
vip={vip}
graphPath={graphPath}
/>
</Col>
<PostItem
node={node}
graphPath={graphPath}
association={association}
api={api}
index={[...nodeIndex, index]}
baseUrl={baseUrl}
history={history}
parentPost={parentNode?.post}
isReply={Boolean(parentNode)}
isRelativeTime={true}
vip={vip}
group={group}
/>
</Col>
);
}
return (
<Box key={index.toString()} ref={ref}>
<PostItem
node={node}
graphPath={graphPath}
association={association}
api={api}
index={[...nodeIndex, index]}
baseUrl={baseUrl}
history={history}
parentPost={parentNode?.post}
isReply={Boolean(parentNode)}
isRelativeTime={true}
vip={vip}
group={group}
/>
<PostItem
node={node}
graphPath={graphPath}
association={association}
api={api}
index={[...nodeIndex, index]}
baseUrl={baseUrl}
history={history}
parentPost={parentNode?.post}
isReply={Boolean(parentNode)}
isRelativeTime={true}
vip={vip}
group={group}
/>
</Box>
);
});
@ -143,6 +182,7 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
if (newer) {
const [index] = graph.peekLargest();
// TODO: replace this with deep something
await api.graph.getYoungerSiblings(
ship,
name,
@ -170,6 +210,9 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
history
} = this.props;
// TODO: memoize flattening the graph,
// take in a prop on whether to flatten the graph or not
return (
<Col width="100%" height="100%" position="relative">
<VirtualScroller
@ -189,4 +232,4 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
}
}
export default withRouter(PostFeed);
export default withRouter(PostFeed);

46
pkg/interface/src/views/landscape/components/Home/Post/PostTimeline.tsx
View File

@ -82,39 +82,19 @@ const PostTimeline = (props: PostTimelineProps): ReactElement => {
}
return (
<>
<Box
width="100%"
maxWidth="616px"
pt={3}
pl={2}
pr={2}
mb={3}
flexDirection="column"
alignItems="center"
>
<PostInput
api={api}
group={group}
association={association}
vip={vip}
graphPath={graphPath}
/>
</Box>
<Box height="calc(100% - 176px)" width="100%" alignItems="center" pl={1}>
<PostFeed
key={graphPath}
graphPath={graphPath}
graph={graph}
pendingSize={pendingSize}
association={association}
group={group}
vip={vip}
api={api}
baseUrl={baseUrl}
/>
</Box>
</>
<Box height="calc(100% - 48px)" width="100%" alignItems="center" pl={1}>
<PostFeed
key={graphPath}
graphPath={graphPath}
graph={graph}
pendingSize={pendingSize}
association={association}
group={group}
vip={vip}
api={api}
baseUrl={baseUrl}
/>
</Box>
);
}