[Glitch] Prepend account header even when status list is empty
Partially port 90b64c0069
			
			
This commit is contained in:
		
							parent
							
								
									c78c80f807
								
							
						
					
					
						commit
						2fe0cb1623
					
				| 
						 | 
					@ -27,6 +27,7 @@ export default class ScrollableList extends PureComponent {
 | 
				
			||||||
    showLoading: PropTypes.bool,
 | 
					    showLoading: PropTypes.bool,
 | 
				
			||||||
    hasMore: PropTypes.bool,
 | 
					    hasMore: PropTypes.bool,
 | 
				
			||||||
    prepend: PropTypes.node,
 | 
					    prepend: PropTypes.node,
 | 
				
			||||||
 | 
					    alwaysPrepend: PropTypes.bool,
 | 
				
			||||||
    emptyMessage: PropTypes.node,
 | 
					    emptyMessage: PropTypes.node,
 | 
				
			||||||
    children: PropTypes.node,
 | 
					    children: PropTypes.node,
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
| 
						 | 
					@ -159,7 +160,7 @@ export default class ScrollableList extends PureComponent {
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  render () {
 | 
					  render () {
 | 
				
			||||||
    const { children, scrollKey, trackScroll, shouldUpdateScroll, showLoading, isLoading, hasMore, prepend, emptyMessage, onLoadMore } = this.props;
 | 
					    const { children, scrollKey, trackScroll, shouldUpdateScroll, showLoading, isLoading, hasMore, prepend, alwaysPrepend, emptyMessage, onLoadMore } = this.props;
 | 
				
			||||||
    const { fullscreen } = this.state;
 | 
					    const { fullscreen } = this.state;
 | 
				
			||||||
    const childrenCount = React.Children.count(children);
 | 
					    const childrenCount = React.Children.count(children);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -203,9 +204,13 @@ export default class ScrollableList extends PureComponent {
 | 
				
			||||||
      );
 | 
					      );
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
      scrollableArea = (
 | 
					      scrollableArea = (
 | 
				
			||||||
        <div className='empty-column-indicator' ref={this.setRef}>
 | 
					        <div className={classNames('scrollable', { fullscreen })} ref={this.setRef} style={{ flex: '1 1 auto', display: 'flex', flexDirection: 'column' }}>
 | 
				
			||||||
 | 
					          {alwaysPrepend && prepend}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          <div className='empty-column-indicator'>
 | 
				
			||||||
            {emptyMessage}
 | 
					            {emptyMessage}
 | 
				
			||||||
          </div>
 | 
					          </div>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
      );
 | 
					      );
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,6 +23,7 @@ export default class StatusList extends ImmutablePureComponent {
 | 
				
			||||||
    isPartial: PropTypes.bool,
 | 
					    isPartial: PropTypes.bool,
 | 
				
			||||||
    hasMore: PropTypes.bool,
 | 
					    hasMore: PropTypes.bool,
 | 
				
			||||||
    prepend: PropTypes.node,
 | 
					    prepend: PropTypes.node,
 | 
				
			||||||
 | 
					    alwaysPrepend: PropTypes.bool,
 | 
				
			||||||
    emptyMessage: PropTypes.node,
 | 
					    emptyMessage: PropTypes.node,
 | 
				
			||||||
    timelineId: PropTypes.string,
 | 
					    timelineId: PropTypes.string,
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue