2019-05-17 20:21:07 +02:00
|
|
|
import { connect } from 'react-redux';
|
2022-03-11 05:11:01 +01:00
|
|
|
import {
|
|
|
|
selectClaimForUri,
|
2022-03-09 19:05:37 +01:00
|
|
|
selectClaimIsMine,
|
|
|
|
selectFetchingMyChannels,
|
|
|
|
selectClaimsByUri,
|
|
|
|
} from 'redux/selectors/claims';
|
2020-09-30 20:46:17 +02:00
|
|
|
import {
|
2021-10-11 08:02:17 +02:00
|
|
|
selectTopLevelCommentsForUri,
|
2021-07-15 16:43:28 +02:00
|
|
|
makeSelectTopLevelTotalPagesForUri,
|
2020-09-30 20:46:17 +02:00
|
|
|
selectIsFetchingComments,
|
2021-10-01 09:49:37 +02:00
|
|
|
selectIsFetchingCommentsById,
|
2021-07-15 18:13:01 +02:00
|
|
|
selectIsFetchingReacts,
|
2022-03-11 05:11:01 +01:00
|
|
|
selectTotalCommentsCountForUri,
|
2021-10-06 20:40:40 +02:00
|
|
|
selectOthersReacts,
|
|
|
|
selectMyReacts,
|
2021-11-09 16:32:16 +01:00
|
|
|
selectCommentIdsForUri,
|
2021-07-29 16:53:36 +02:00
|
|
|
selectSettingsByChannelId,
|
2021-10-11 08:02:17 +02:00
|
|
|
selectPinnedCommentsForUri,
|
Re-design comment threads (#1489)
* Redesign threadline and fetching state
- threadline goes right below channel avatar, mimicking reddits implementation, has a increase effect on hover and is slimmer, creating more space for comments on screen
- fetching state now replaces show/hide button, also mimicking reddit, and now says that it is loading, instead of a blank spinner, and also improves space a bit
* Redesign comment threads
- Allow for infinite comment chains
- Can go back and forth between the pages
- Can go back to all comments or to the first comment in the chain
- Some other improvements, which include:
- add title on non-drawer comment sections (couldn't see amount of comments)
- fix Expandable component (would begin expanded and collapse after the effect runs, which looked bad and shifted the layout, now each comments greater than the set length begins collapsed)
- used constants for consistency
* Fix replying to last thread comment
* Fix buttons condition (only on fetched comment to avoid deleted case)
* Fix auto-scroll
* Bring back instant feedback for Show More replies
* Improve thread back links
- Now going back to all comments links the top-level comment for easier navigation
- Going back to ~ previous ~ now goes back into the chain instead of topmost level
* Clear timeouts due to unrelated issue
* Fix deep thread linked comment case and more scroll improvements
* More minor changes
* Flow
* Fix commentList tile style
* Fix long channel names overflowing on small screens
* More scroll changes
* Fix threadline
* Revert "Fix long channel names overflowing on small screens"
This reverts commit e4d2dc7da5861ed8136a60f3352e41a690cd4d33.
* Fix replies fetch
* Revert "Fix replies fetch"
This reverts commit ec70054675a604a7a5f3764ba07c36bf7b0f49c8.
* Cleanup and make smooth
* Always use linked comment on threads
* Cleanup
* Higlight thread comment
* Fix comment body styles
2022-05-16 12:22:13 +02:00
|
|
|
selectCommentForCommentId,
|
|
|
|
selectCommentAncestorsForId,
|
2020-09-30 20:46:17 +02:00
|
|
|
} from 'redux/selectors/comments';
|
2022-05-06 10:06:15 +02:00
|
|
|
import { doCommentReset, doCommentList, doCommentById, doCommentReactList } from 'redux/actions/comments';
|
2021-07-20 08:38:29 +02:00
|
|
|
import { selectActiveChannelClaim } from 'redux/selectors/app';
|
2022-02-09 16:27:11 +01:00
|
|
|
import { getChannelIdFromClaim } from 'util/claim';
|
2022-03-09 19:05:37 +01:00
|
|
|
import { doFetchUserMemberships } from 'redux/actions/user';
|
2020-10-20 19:10:02 +02:00
|
|
|
import CommentsList from './view';
|
2019-05-17 20:21:07 +02:00
|
|
|
|
2021-07-15 16:43:28 +02:00
|
|
|
const select = (state, props) => {
|
Re-design comment threads (#1489)
* Redesign threadline and fetching state
- threadline goes right below channel avatar, mimicking reddits implementation, has a increase effect on hover and is slimmer, creating more space for comments on screen
- fetching state now replaces show/hide button, also mimicking reddit, and now says that it is loading, instead of a blank spinner, and also improves space a bit
* Redesign comment threads
- Allow for infinite comment chains
- Can go back and forth between the pages
- Can go back to all comments or to the first comment in the chain
- Some other improvements, which include:
- add title on non-drawer comment sections (couldn't see amount of comments)
- fix Expandable component (would begin expanded and collapse after the effect runs, which looked bad and shifted the layout, now each comments greater than the set length begins collapsed)
- used constants for consistency
* Fix replying to last thread comment
* Fix buttons condition (only on fetched comment to avoid deleted case)
* Fix auto-scroll
* Bring back instant feedback for Show More replies
* Improve thread back links
- Now going back to all comments links the top-level comment for easier navigation
- Going back to ~ previous ~ now goes back into the chain instead of topmost level
* Clear timeouts due to unrelated issue
* Fix deep thread linked comment case and more scroll improvements
* More minor changes
* Flow
* Fix commentList tile style
* Fix long channel names overflowing on small screens
* More scroll changes
* Fix threadline
* Revert "Fix long channel names overflowing on small screens"
This reverts commit e4d2dc7da5861ed8136a60f3352e41a690cd4d33.
* Fix replies fetch
* Revert "Fix replies fetch"
This reverts commit ec70054675a604a7a5f3764ba07c36bf7b0f49c8.
* Cleanup and make smooth
* Always use linked comment on threads
* Cleanup
* Higlight thread comment
* Fix comment body styles
2022-05-16 12:22:13 +02:00
|
|
|
const { uri, threadCommentId, linkedCommentId } = props;
|
2022-02-09 16:27:11 +01:00
|
|
|
|
|
|
|
const claim = selectClaimForUri(state, uri);
|
2021-07-20 08:38:29 +02:00
|
|
|
const activeChannelClaim = selectActiveChannelClaim(state);
|
Re-design comment threads (#1489)
* Redesign threadline and fetching state
- threadline goes right below channel avatar, mimicking reddits implementation, has a increase effect on hover and is slimmer, creating more space for comments on screen
- fetching state now replaces show/hide button, also mimicking reddit, and now says that it is loading, instead of a blank spinner, and also improves space a bit
* Redesign comment threads
- Allow for infinite comment chains
- Can go back and forth between the pages
- Can go back to all comments or to the first comment in the chain
- Some other improvements, which include:
- add title on non-drawer comment sections (couldn't see amount of comments)
- fix Expandable component (would begin expanded and collapse after the effect runs, which looked bad and shifted the layout, now each comments greater than the set length begins collapsed)
- used constants for consistency
* Fix replying to last thread comment
* Fix buttons condition (only on fetched comment to avoid deleted case)
* Fix auto-scroll
* Bring back instant feedback for Show More replies
* Improve thread back links
- Now going back to all comments links the top-level comment for easier navigation
- Going back to ~ previous ~ now goes back into the chain instead of topmost level
* Clear timeouts due to unrelated issue
* Fix deep thread linked comment case and more scroll improvements
* More minor changes
* Flow
* Fix commentList tile style
* Fix long channel names overflowing on small screens
* More scroll changes
* Fix threadline
* Revert "Fix long channel names overflowing on small screens"
This reverts commit e4d2dc7da5861ed8136a60f3352e41a690cd4d33.
* Fix replies fetch
* Revert "Fix replies fetch"
This reverts commit ec70054675a604a7a5f3764ba07c36bf7b0f49c8.
* Cleanup and make smooth
* Always use linked comment on threads
* Cleanup
* Higlight thread comment
* Fix comment body styles
2022-05-16 12:22:13 +02:00
|
|
|
const threadComment = selectCommentForCommentId(state, threadCommentId);
|
2021-10-13 22:28:19 +02:00
|
|
|
|
2021-07-15 16:43:28 +02:00
|
|
|
return {
|
Re-design comment threads (#1489)
* Redesign threadline and fetching state
- threadline goes right below channel avatar, mimicking reddits implementation, has a increase effect on hover and is slimmer, creating more space for comments on screen
- fetching state now replaces show/hide button, also mimicking reddit, and now says that it is loading, instead of a blank spinner, and also improves space a bit
* Redesign comment threads
- Allow for infinite comment chains
- Can go back and forth between the pages
- Can go back to all comments or to the first comment in the chain
- Some other improvements, which include:
- add title on non-drawer comment sections (couldn't see amount of comments)
- fix Expandable component (would begin expanded and collapse after the effect runs, which looked bad and shifted the layout, now each comments greater than the set length begins collapsed)
- used constants for consistency
* Fix replying to last thread comment
* Fix buttons condition (only on fetched comment to avoid deleted case)
* Fix auto-scroll
* Bring back instant feedback for Show More replies
* Improve thread back links
- Now going back to all comments links the top-level comment for easier navigation
- Going back to ~ previous ~ now goes back into the chain instead of topmost level
* Clear timeouts due to unrelated issue
* Fix deep thread linked comment case and more scroll improvements
* More minor changes
* Flow
* Fix commentList tile style
* Fix long channel names overflowing on small screens
* More scroll changes
* Fix threadline
* Revert "Fix long channel names overflowing on small screens"
This reverts commit e4d2dc7da5861ed8136a60f3352e41a690cd4d33.
* Fix replies fetch
* Revert "Fix replies fetch"
This reverts commit ec70054675a604a7a5f3764ba07c36bf7b0f49c8.
* Cleanup and make smooth
* Always use linked comment on threads
* Cleanup
* Higlight thread comment
* Fix comment body styles
2022-05-16 12:22:13 +02:00
|
|
|
topLevelComments: threadComment ? [threadComment] : selectTopLevelCommentsForUri(state, uri),
|
|
|
|
threadComment,
|
2022-02-09 16:27:11 +01:00
|
|
|
allCommentIds: selectCommentIdsForUri(state, uri),
|
|
|
|
pinnedComments: selectPinnedCommentsForUri(state, uri),
|
|
|
|
topLevelTotalPages: makeSelectTopLevelTotalPagesForUri(uri)(state),
|
2022-03-11 05:11:01 +01:00
|
|
|
totalComments: selectTotalCommentsCountForUri(state, uri),
|
2022-02-09 16:27:11 +01:00
|
|
|
claimId: claim && claim.claim_id,
|
2022-03-02 13:10:52 +01:00
|
|
|
channelId: getChannelIdFromClaim(claim),
|
2021-11-11 05:48:10 +01:00
|
|
|
claimIsMine: selectClaimIsMine(state, claim),
|
2021-07-15 16:43:28 +02:00
|
|
|
isFetchingComments: selectIsFetchingComments(state),
|
2021-10-01 09:49:37 +02:00
|
|
|
isFetchingCommentsById: selectIsFetchingCommentsById(state),
|
2021-07-15 18:13:01 +02:00
|
|
|
isFetchingReacts: selectIsFetchingReacts(state),
|
2021-07-15 16:43:28 +02:00
|
|
|
fetchingChannels: selectFetchingMyChannels(state),
|
2021-07-29 16:53:36 +02:00
|
|
|
settingsByChannelId: selectSettingsByChannelId(state),
|
2021-10-06 20:40:40 +02:00
|
|
|
myReactsByCommentId: selectMyReacts(state),
|
|
|
|
othersReactsById: selectOthersReacts(state),
|
2021-07-20 08:38:29 +02:00
|
|
|
activeChannelId: activeChannelClaim && activeChannelClaim.claim_id,
|
2022-03-09 19:05:37 +01:00
|
|
|
claimsByUri: selectClaimsByUri(state),
|
Re-design comment threads (#1489)
* Redesign threadline and fetching state
- threadline goes right below channel avatar, mimicking reddits implementation, has a increase effect on hover and is slimmer, creating more space for comments on screen
- fetching state now replaces show/hide button, also mimicking reddit, and now says that it is loading, instead of a blank spinner, and also improves space a bit
* Redesign comment threads
- Allow for infinite comment chains
- Can go back and forth between the pages
- Can go back to all comments or to the first comment in the chain
- Some other improvements, which include:
- add title on non-drawer comment sections (couldn't see amount of comments)
- fix Expandable component (would begin expanded and collapse after the effect runs, which looked bad and shifted the layout, now each comments greater than the set length begins collapsed)
- used constants for consistency
* Fix replying to last thread comment
* Fix buttons condition (only on fetched comment to avoid deleted case)
* Fix auto-scroll
* Bring back instant feedback for Show More replies
* Improve thread back links
- Now going back to all comments links the top-level comment for easier navigation
- Going back to ~ previous ~ now goes back into the chain instead of topmost level
* Clear timeouts due to unrelated issue
* Fix deep thread linked comment case and more scroll improvements
* More minor changes
* Flow
* Fix commentList tile style
* Fix long channel names overflowing on small screens
* More scroll changes
* Fix threadline
* Revert "Fix long channel names overflowing on small screens"
This reverts commit e4d2dc7da5861ed8136a60f3352e41a690cd4d33.
* Fix replies fetch
* Revert "Fix replies fetch"
This reverts commit ec70054675a604a7a5f3764ba07c36bf7b0f49c8.
* Cleanup and make smooth
* Always use linked comment on threads
* Cleanup
* Higlight thread comment
* Fix comment body styles
2022-05-16 12:22:13 +02:00
|
|
|
threadCommentAncestors: selectCommentAncestorsForId(state, threadCommentId),
|
|
|
|
linkedCommentAncestors: selectCommentAncestorsForId(state, linkedCommentId),
|
2021-07-15 16:43:28 +02:00
|
|
|
};
|
|
|
|
};
|
2019-05-17 20:21:07 +02:00
|
|
|
|
2022-02-09 16:27:11 +01:00
|
|
|
const perform = {
|
|
|
|
fetchTopLevelComments: doCommentList,
|
|
|
|
fetchComment: doCommentById,
|
|
|
|
fetchReacts: doCommentReactList,
|
|
|
|
resetComments: doCommentReset,
|
2022-03-09 19:05:37 +01:00
|
|
|
doFetchUserMemberships,
|
2022-02-09 16:27:11 +01:00
|
|
|
};
|
2019-06-27 01:59:27 +02:00
|
|
|
|
2020-01-30 02:02:21 +01:00
|
|
|
export default connect(select, perform)(CommentsList);
|