2019-06-27 01:59:27 +02:00
|
|
|
import { connect } from 'react-redux';
|
2021-07-15 16:43:28 +02:00
|
|
|
import {
|
2021-11-10 16:30:58 +01:00
|
|
|
selectStakedLevelForChannelUri,
|
2021-07-15 16:43:28 +02:00
|
|
|
makeSelectClaimForUri,
|
2021-11-12 16:59:11 +01:00
|
|
|
selectThumbnailForUri,
|
2021-11-08 07:27:14 +01:00
|
|
|
selectHasChannels,
|
2022-02-09 16:27:11 +01:00
|
|
|
selectMyClaimIdsRaw,
|
2022-03-09 19:05:37 +01:00
|
|
|
selectOdyseeMembershipForUri,
|
2021-10-17 10:36:14 +02:00
|
|
|
} from 'redux/selectors/claims';
|
2021-07-15 16:43:28 +02:00
|
|
|
import { doCommentUpdate, doCommentList } from 'redux/actions/comments';
|
2021-03-03 19:50:16 +01:00
|
|
|
import { makeSelectChannelIsMuted } from 'redux/selectors/blocked';
|
2020-09-11 19:51:31 +02:00
|
|
|
import { doToast } from 'redux/actions/notifications';
|
2022-02-09 16:27:11 +01:00
|
|
|
import { doClearPlayingUri } from 'redux/actions/content';
|
2021-08-04 17:01:31 +02:00
|
|
|
import {
|
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
|
|
|
selectFetchedCommentAncestors,
|
2021-10-06 20:40:40 +02:00
|
|
|
selectOthersReactsForComment,
|
2021-08-04 17:01:31 +02:00
|
|
|
makeSelectTotalReplyPagesForParentId,
|
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
|
|
|
selectIsFetchingCommentsForParentId,
|
|
|
|
selectRepliesForParentId,
|
2021-08-04 17:01:31 +02:00
|
|
|
} from 'redux/selectors/comments';
|
2021-07-20 08:38:29 +02:00
|
|
|
import { selectActiveChannelClaim } from 'redux/selectors/app';
|
2021-03-02 11:12:54 +01:00
|
|
|
import { selectPlayingUri } from 'redux/selectors/content';
|
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
|
|
|
import { selectUserVerifiedEmail } from 'redux/selectors/user';
|
2020-09-11 19:51:31 +02:00
|
|
|
import Comment from './view';
|
2019-06-27 01:59:27 +02:00
|
|
|
|
2021-07-15 16:43:28 +02:00
|
|
|
const select = (state, props) => {
|
2022-02-09 16:27:11 +01:00
|
|
|
const { comment, uri } = props;
|
2022-02-14 06:14:23 +01:00
|
|
|
const { comment_id, channel_url } = comment || {};
|
2022-02-09 16:27:11 +01:00
|
|
|
|
2021-07-20 08:38:29 +02:00
|
|
|
const activeChannelClaim = selectActiveChannelClaim(state);
|
|
|
|
const activeChannelId = activeChannelClaim && activeChannelClaim.claim_id;
|
2022-02-09 16:27:11 +01:00
|
|
|
const reactionKey = activeChannelId ? `${comment_id}:${activeChannelId}` : comment_id;
|
2021-07-15 16:43:28 +02:00
|
|
|
|
|
|
|
return {
|
2022-02-09 16:27:11 +01:00
|
|
|
myChannelIds: selectMyClaimIdsRaw(state),
|
|
|
|
claim: makeSelectClaimForUri(uri)(state),
|
2022-02-14 06:14:23 +01:00
|
|
|
thumbnail: channel_url && selectThumbnailForUri(state, channel_url),
|
|
|
|
channelIsBlocked: channel_url && makeSelectChannelIsMuted(channel_url)(state),
|
2022-03-09 19:05:37 +01:00
|
|
|
commentingEnabled: Boolean(selectUserVerifiedEmail(state)),
|
2021-10-06 20:40:40 +02:00
|
|
|
othersReacts: selectOthersReactsForComment(state, reactionKey),
|
2021-07-20 08:38:29 +02:00
|
|
|
activeChannelClaim,
|
2021-11-08 07:27:14 +01:00
|
|
|
hasChannels: selectHasChannels(state),
|
2021-07-15 16:43:28 +02:00
|
|
|
playingUri: selectPlayingUri(state),
|
2022-02-14 06:14:23 +01:00
|
|
|
stakedLevel: selectStakedLevelForChannelUri(state, channel_url),
|
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
|
|
|
linkedCommentAncestors: selectFetchedCommentAncestors(state),
|
2022-02-09 16:27:11 +01:00
|
|
|
totalReplyPages: makeSelectTotalReplyPagesForParentId(comment_id)(state),
|
2022-03-09 19:05:37 +01:00
|
|
|
selectOdyseeMembershipForUri: channel_url && selectOdyseeMembershipForUri(state, channel_url),
|
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
|
|
|
repliesFetching: selectIsFetchingCommentsForParentId(state, comment_id),
|
|
|
|
fetchedReplies: selectRepliesForParentId(state, comment_id),
|
2021-07-15 16:43:28 +02:00
|
|
|
};
|
|
|
|
};
|
2019-10-23 09:04:40 +02:00
|
|
|
|
2022-02-09 16:27:11 +01:00
|
|
|
const perform = {
|
|
|
|
doClearPlayingUri,
|
2022-02-09 21:36:36 +01:00
|
|
|
updateComment: doCommentUpdate,
|
2022-02-09 16:27:11 +01:00
|
|
|
fetchReplies: doCommentList,
|
|
|
|
doToast,
|
|
|
|
};
|
2019-10-23 09:04:40 +02:00
|
|
|
|
2020-01-30 02:02:21 +01:00
|
|
|
export default connect(select, perform)(Comment);
|