ScrollableList: replace margins with padding

app/soapbox/components/scrollable_list.tsx

@@ -6,10 +6,26 @@ import PullToRefresh from 'soapbox/components/pull-to-refresh';
 
 import { Spinner, Text } from './ui';
 
+type Context = {
+  itemClassName?: string,
+  listClassName?: string,
+}
+
+type VComponent = {
+  context?: Context,
+}
+
+// NOTE: It's crucial to space lists with **padding** instead of margin!
+// Pass an `itemClassName` like `pb-3`, NOT a `space-y-3` className
+// https://virtuoso.dev/troubleshooting#list-does-not-scroll-to-the-bottom--items-jump-around
+const Item: React.FC<VComponent> = ({ context, ...rest }) => (
+  <div className={context?.itemClassName} {...rest} />
+);
+
 // Ensure the className winds up here
-const List = React.forwardRef((props: any, ref: React.ForwardedRef<HTMLDivElement>) => {
+const List = React.forwardRef<HTMLDivElement, VComponent>((props, ref) => {
   const { context, ...rest } = props;
-  return <div ref={ref} className={context.listClassName} {...rest} />;
+  return <div ref={ref} className={context?.listClassName} {...rest} />;
 });
 
 interface IScrollableList {
@@ -28,6 +44,7 @@ interface IScrollableList {
   placeholderCount?: number,
   onRefresh?: () => Promise<any>,
   className?: string,
+  itemClassName?: string,
 }
 
 /** Legacy ScrollableList with Virtuoso for backwards-compatibility */
@@ -43,6 +60,7 @@ const ScrollableList: React.FC<IScrollableList> = ({
   onScrollToTop,
   onLoadMore,
   className,
+  itemClassName,
   hasMore,
   placeholderComponent: Placeholder,
   placeholderCount = 0,
@@ -101,12 +119,14 @@ const ScrollableList: React.FC<IScrollableList> = ({
         itemContent={renderItem}
         context={{
           listClassName: className,
+          itemClassName,
         }}
         components={{
           Header: () => prepend,
           ScrollSeekPlaceholder: Placeholder as any,
           EmptyPlaceholder: () => renderEmpty(),
           List,
+          Item,
         }}
       />
     </PullToRefresh>

app/soapbox/components/status_list.js

@@ -1,3 +1,4 @@
+import classNames from 'classnames';
 import { debounce } from 'lodash';
 import PropTypes from 'prop-types';
 import React from 'react';
@@ -222,7 +223,12 @@ export default class StatusList extends ImmutablePureComponent {
         placeholderComponent={PlaceholderStatus}
         placeholderCount={20}
         ref={this.setRef}
-        className={divideType === 'border' ? 'divide-y divide-solid divide-gray-200 dark:divide-gray-800' : 'sm:space-y-3 divide-y divide-solid divide-gray-200 dark:divide-gray-800 sm:divide-none'}
+        className={classNames('divide-y divide-solid divide-gray-200 dark:divide-slate-700', {
+          'sm:divide-none': divideType !== 'border',
+        })}
+        itemClassName={classNames({
+          'sm:pb-3': divideType !== 'border',
+        })}
         {...other}
       >
         {this.renderScrollableContent()}

app/soapbox/features/admin/user_index.js

@@ -116,7 +116,8 @@ class UserIndex extends ImmutablePureComponent {
           showLoading={showLoading}
           onLoadMore={this.handleLoadMore}
           emptyMessage={intl.formatMessage(messages.empty)}
-          className='mt-4 space-y-4'
+          className='mt-4'
+          itemClassName='pb-4'
         >
           {accountIds.map(id =>
             <AccountContainer key={id} id={id} withDate />,

app/soapbox/features/blocks/index.tsx

@@ -45,7 +45,7 @@ const Blocks: React.FC = () => {
         onLoadMore={() => handleLoadMore(dispatch)}
         hasMore={hasMore}
         emptyMessage={emptyMessage}
-        className='space-y-4'
+        itemClassName='pb-4'
       >
         {accountIds.map((id: string) =>
           <AccountContainer key={id} id={id} />,
@@ -55,4 +55,4 @@ const Blocks: React.FC = () => {
   );
 };
 
-export default Blocks;
+export default Blocks;

app/soapbox/features/followers/index.js

@@ -125,7 +125,7 @@ class Followers extends ImmutablePureComponent {
           diffCount={diffCount}
           onLoadMore={this.handleLoadMore}
           emptyMessage={<FormattedMessage id='account.followers.empty' defaultMessage='No one follows this user yet.' />}
-          className='space-y-4'
+          itemClassName='pb-4'
         >
           {accountIds.map(id =>
             <AccountContainer key={id} id={id} withNote={false} />,

app/soapbox/features/following/index.js

@@ -125,7 +125,7 @@ class Following extends ImmutablePureComponent {
           diffCount={diffCount}
           onLoadMore={this.handleLoadMore}
           emptyMessage={<FormattedMessage id='account.follows.empty' defaultMessage="This user doesn't follow anyone yet." />}
-          className='space-y-4'
+          itemClassName='pb-4'
         >
           {accountIds.map(id =>
             <AccountContainer key={id} id={id} withNote={false} />,

app/soapbox/features/mutes/index.tsx

@@ -45,7 +45,7 @@ const Mutes: React.FC = () => {
         onLoadMore={() => handleLoadMore(dispatch)}
         hasMore={hasMore}
         emptyMessage={emptyMessage}
-        className='space-y-4'
+        itemClassName='pb-4'
       >
         {accountIds.map((id: string) =>
           <AccountContainer key={id} id={id} />,

app/soapbox/features/ui/components/birthdays_modal.tsx

@@ -28,7 +28,7 @@ const BirthdaysModal = ({ onClose }: IBirthdaysModal) => {
       <ScrollableList
         scrollKey='reblogs'
         emptyMessage={emptyMessage}
-        className='space-y-3'
+        itemClassName='pb-3'
       >
         {accountIds.map(id =>
           <Account key={id} accountId={id} />,

app/soapbox/features/ui/components/favourites_modal.js

@@ -54,7 +54,7 @@ class FavouritesModal extends React.PureComponent {
         <ScrollableList
           scrollKey='favourites'
           emptyMessage={emptyMessage}
-          className='space-y-3'
+          itemClassName='pb-3'
         >
           {accountIds.map(id =>
             <AccountContainer key={id} id={id} />,

app/soapbox/features/ui/components/mentions_modal.js

@@ -61,7 +61,7 @@ class MentionsModal extends React.PureComponent {
       body = (
         <ScrollableList
           scrollKey='mentions'
-          className='space-y-3'
+          itemClassName='pb-3'
         >
           {accountIds.map(id =>
             <AccountContainer key={id} id={id} withNote={false} />,

app/soapbox/features/ui/components/reactions_modal.tsx

@@ -87,7 +87,7 @@ const ReactionsModal: React.FC<IReactionsModal> = ({ onClose, statusId, ...props
       <ScrollableList
         scrollKey='reactions'
         emptyMessage={emptyMessage}
-        className='space-y-3'
+        itemClassName='pb-3'
       >
         {accounts.map((account) =>
           <AccountContainer key={`${account.id}-${account.reaction}`} id={account.id} /* reaction={account.reaction} */ />,

app/soapbox/features/ui/components/reblogs_modal.js

@@ -72,7 +72,7 @@ class ReblogsModal extends React.PureComponent {
         <ScrollableList
           scrollKey='reblogs'
           emptyMessage={emptyMessage}
-          className='space-y-3'
+          itemClassName='pb-3'
         >
           {accountIds.map(id =>
             <AccountContainer key={id} id={id} />,