diff --git a/pkg/interface/src/views/landscape/components/Home/Post/FlatPostFeed.tsx b/pkg/interface/src/views/landscape/components/Home/Post/FlatPostFeed.tsx deleted file mode 100644 index 369e9d579e..0000000000 --- a/pkg/interface/src/views/landscape/components/Home/Post/FlatPostFeed.tsx +++ /dev/null @@ -1,235 +0,0 @@ -import { Box, Col } from '@tlon/indigo-react'; -import { Association, Graph, GraphNode, Group } from '@urbit/api'; -import bigInt from 'big-integer'; -import React from 'react'; -import { withRouter } from 'react-router'; -import GlobalApi from '~/logic/api/global'; -import { resourceFromPath } from '~/logic/lib/group'; -import ArrayVirtualScroller from '~/views/components/ArrayVirtualScroller'; -import PostItem from './PostItem/PostItem'; -import PostInput from './PostInput'; - -const virtualScrollerStyle = { - height: '100%' -}; - -interface PostFeedProps { - graph: Graph; - graphPath: string; - api: GlobalApi; - history: History; - baseUrl: string; - parentNode?: GraphNode; - grandparentNode?: GraphNode; - association: Association; - group: Group; - vip: string; - pendingSize: number; -} - -class PostFeed extends React.Component { - isFetching: boolean; - constructor(props) { - super(props); - - this.isFetching = false; - - this.fetchPosts = this.fetchPosts.bind(this); - this.doNotFetch = this.doNotFetch.bind(this); - } - - renderItem = React.forwardRef(({ index, scrollWindow }, ref) => { - const { - graph, - graphPath, - api, - history, - baseUrl, - parentNode, - grandparentNode, - association, - group, - vip - } = this.props; - const node = graph.get(index); - if (!node) { - return null; - } - - const first = graph.peekLargest()?.[0]; - const post = node?.post; - const nodeIndex = - ( parentNode && - typeof parentNode.post !== 'string' - ) ? parentNode.post.index.split('/').slice(1).map((ind) => { - return bigInt(ind); - }) : []; - - if (parentNode && index.eq(first ?? bigInt.zero)) { - return ( - - - - - - - ); - } else if (index.eq(first ?? bigInt.zero)) { - return ( - - - - - - - ); - } - - return ( - - - - ); - }); - - async fetchPosts(newer) { - const { graph, graphPath, api } = this.props; - const graphResource = resourceFromPath(graphPath); - - if (this.isFetching) { - return false; - } - - this.isFetching = true; - const { ship, name } = graphResource; - const currSize = graph.size; - - if (newer) { - const [index] = graph.peekLargest(); - // TODO: replace this with deep something - await api.graph.getYoungerSiblings( - ship, - name, - 100, - `/${index.toString()}` - ); - } else { - const [index] = graph.peekSmallest(); - await api.graph.getOlderSiblings(ship, name, 100, `/${index.toString()}`); - } - - this.isFetching = false; - return currSize === graph.size; - } - - async doNotFetch(newer) { - return true; - } - - render() { - const { - flatGraph, - pendingSize, - parentNode, - history - } = this.props; - - // TODO: memoize flattening the graph, - // take in a prop on whether to flatten the graph or not - - return ( - - - - ); - } -} - -export default withRouter(PostFeed); diff --git a/pkg/interface/src/views/landscape/components/Home/Post/PostFlatFeed.tsx b/pkg/interface/src/views/landscape/components/Home/Post/PostFlatFeed.tsx index 691b726d85..372f6f1adf 100644 --- a/pkg/interface/src/views/landscape/components/Home/Post/PostFlatFeed.tsx +++ b/pkg/interface/src/views/landscape/components/Home/Post/PostFlatFeed.tsx @@ -87,6 +87,7 @@ class PostFlatFeed extends React.Component { isRelativeTime={true} vip={vip} group={group} + isThread={isThread} /> ); @@ -146,6 +147,7 @@ class PostFlatFeed extends React.Component { isRelativeTime={true} vip={vip} group={group} + isThread={isThread} /> ); diff --git a/pkg/interface/src/views/landscape/components/Home/Post/PostItem/PostItem.tsx b/pkg/interface/src/views/landscape/components/Home/Post/PostItem/PostItem.tsx index 502e7ed365..db6dea5b32 100644 --- a/pkg/interface/src/views/landscape/components/Home/Post/PostItem/PostItem.tsx +++ b/pkg/interface/src/views/landscape/components/Home/Post/PostItem/PostItem.tsx @@ -28,6 +28,7 @@ export interface PostItemProps { node: GraphNode; parentPost?: Post; vip: string; + isThread?: boolean; } interface PostItemState { @@ -100,7 +101,8 @@ class PostItem extends React.Component { vip, group, hovering, - bind + bind, + isThread } = this.props; let indexString = ''; @@ -119,7 +121,7 @@ class PostItem extends React.Component { ref={innerRef} pl={1} pr={1} - mb={3} + mb={isThread && !inReplyMode ? 0 : 3} width="100%" alignItems="center" > @@ -187,6 +189,16 @@ class PostItem extends React.Component { /> ) : null } + { isThread && !inReplyMode ? ( + + + + ) : null } ); }