[Glitch] Always display tab navigation on local/federated timeline even when empty

Port 90b64c006998ec3bae365007781c61e8a79eeeef to glitch-soc

diff --git a/app/javascript/flavours/glitch/components/status_list.js b/app/javascript/flavours/glitch/components/status_list.js
index 5249af76d58462f8e8866abadf58585f4c73a9f0..a7629bd5410bdc4e3197e9702383edb9975d3464 100644 (file)
--- a/app/javascript/flavours/glitch/components/status_list.js
+++ b/app/javascript/flavours/glitch/components/status_list.js
@@ -25,7 +25,7 @@ export default class StatusList extends ImmutablePureComponent {
     prepend: PropTypes.node,
     alwaysPrepend: PropTypes.bool,
     emptyMessage: PropTypes.node,
-    timelineId: PropTypes.string,
+    timelineId: PropTypes.string.isRequired,
   };
 
   static defaultProps = {

diff --git a/app/javascript/flavours/glitch/features/community_timeline/index.js b/app/javascript/flavours/glitch/features/community_timeline/index.js
index dd9b622ee80229fd3cfc8113235e4c7acb00430d..dc52aef88a62fbf5d09ba3466e9824b84c894a80 100644 (file)
--- a/app/javascript/flavours/glitch/features/community_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/community_timeline/index.js
@@ -131,6 +131,7 @@ export default class CommunityTimeline extends React.PureComponent {
 
         <StatusListContainer
           prepend={headline}
+          alwaysPrepend
           trackScroll={!pinned}
           scrollKey={`community_timeline-${columnId}`}
           shouldUpdateScroll={this.shouldUpdateScroll}

diff --git a/app/javascript/flavours/glitch/features/public_timeline/index.js b/app/javascript/flavours/glitch/features/public_timeline/index.js
index 03bcc589c06cae180cdaf25e5392a267abcb6380..345d5efc3fbe5e8a47645ceedfad2759a757dd2b 100644 (file)
--- a/app/javascript/flavours/glitch/features/public_timeline/index.js
+++ b/app/javascript/flavours/glitch/features/public_timeline/index.js
@@ -131,6 +131,7 @@ export default class PublicTimeline extends React.PureComponent {
 
         <StatusListContainer
           prepend={headline}
+          alwaysPrepend
           timelineId={`public${onlyMedia ? ':media' : ''}`}
           onLoadMore={this.handleLoadMore}
           trackScroll={!pinned}