Merge remote-tracking branch 'origin/develop' into markup-css

app/soapbox/components/account.tsx

@@ -9,7 +9,6 @@ import { getAcct } from 'soapbox/utils/accounts';
 import { displayFqn } from 'soapbox/utils/state';
 
 import RelativeTimestamp from './relative-timestamp';
-import StopPropagation from './stop-propagation';
 import { Avatar, Emoji, HStack, Icon, IconButton, Stack, Text } from './ui';
 
 import type { Account as AccountEntity } from 'soapbox/types/entities';
@@ -22,6 +21,8 @@ const InstanceFavicon: React.FC<IInstanceFavicon> = ({ account }) => {
   const history = useHistory();
 
   const handleClick: React.MouseEventHandler = (e) => {
+    e.stopPropagation();
+
     const timelineUrl = `/timeline/${account.domain}`;
     if (!(e.ctrlKey || e.metaKey)) {
       history.push(timelineUrl);
@@ -166,7 +167,6 @@ const Account = ({
   const LinkEl: any = withLinkToProfile ? Link : 'div';
 
   return (
-    <StopPropagation>
     <div data-testid='account' className='flex-shrink-0 group block w-full' ref={overflowRef}>
       <HStack alignItems={actionAlignment} justifyContent='between'>
         <HStack alignItems={withAccountNote ? 'top' : 'center'} space={3}>
@@ -174,7 +174,11 @@ const Account = ({
             condition={showProfileHoverCard}
             wrapper={(children) => <HoverRefWrapper className='relative' accountId={account.id} inline>{children}</HoverRefWrapper>}
           >
-              <LinkEl to={`/@${account.acct}`} title={account.acct}>
+            <LinkEl
+              to={`/@${account.acct}`}
+              title={account.acct}
+              onClick={(event: React.MouseEvent) => event.stopPropagation()}
+            >
               <Avatar src={account.avatar} size={avatarSize} />
               {emoji && (
                 <Emoji
@@ -190,7 +194,11 @@ const Account = ({
               condition={showProfileHoverCard}
               wrapper={(children) => <HoverRefWrapper accountId={account.id} inline>{children}</HoverRefWrapper>}
             >
-                <LinkEl to={`/@${account.acct}`} title={account.acct}>
+              <LinkEl
+                to={`/@${account.acct}`}
+                title={account.acct}
+                onClick={(event: React.MouseEvent) => event.stopPropagation()}
+              >
                 <div className='flex items-center space-x-1 flex-grow' style={style}>
                   <Text
                     size='sm'
@@ -217,7 +225,7 @@ const Account = ({
                     <Text tag='span' theme='muted' size='sm'>&middot;</Text>
 
                     {timestampUrl ? (
-                        <Link to={timestampUrl} className='hover:underline'>
+                      <Link to={timestampUrl} className='hover:underline' onClick={(event) => event.stopPropagation()}>
                         <RelativeTimestamp timestamp={timestamp} theme='muted' size='sm' className='whitespace-nowrap' futureDate={futureTimestamp} />
                       </Link>
                     ) : (
@@ -259,7 +267,6 @@ const Account = ({
         </div>
       </HStack>
     </div>
-    </StopPropagation>
   );
 };
 

app/soapbox/components/polls/poll.tsx

@@ -5,7 +5,6 @@ import { openModal } from 'soapbox/actions/modals';
 import { vote } from 'soapbox/actions/polls';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
 
-import StopPropagation from '../stop-propagation';
 import { Stack, Text } from '../ui';
 
 import PollFooter from './poll-footer';
@@ -65,7 +64,8 @@ const Poll: React.FC<IPoll> = ({ id, status }): JSX.Element | null => {
   const showResults = poll.voted || poll.expired;
 
   return (
-    <StopPropagation>
+    // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+    <div onClick={e => e.stopPropagation()}>
       {!showResults && poll.multiple && (
         <Text theme='muted' size='sm'>
           {intl.formatMessage(messages.multiple)}
@@ -93,7 +93,7 @@ const Poll: React.FC<IPoll> = ({ id, status }): JSX.Element | null => {
           selected={selected}
         />
       </Stack>
-    </StopPropagation>
+    </div>
   );
 };
 

app/soapbox/components/quoted-status.tsx

@@ -13,7 +13,6 @@ import OutlineBox from './outline-box';
 import StatusContent from './status-content';
 import StatusReplyMentions from './status-reply-mentions';
 import SensitiveContentOverlay from './statuses/sensitive-content-overlay';
-import StopPropagation from './stop-propagation';
 
 import type { Account as AccountEntity, Status as StatusEntity } from 'soapbox/types/entities';
 
@@ -92,7 +91,6 @@ const QuotedStatus: React.FC<IQuotedStatus> = ({ status, onCancel, compose }) =>
   }
 
   return (
-    <StopPropagation>
     <OutlineBox
       data-testid='quoted-status'
       className={classNames('cursor-pointer', {
@@ -145,7 +143,6 @@ const QuotedStatus: React.FC<IQuotedStatus> = ({ status, onCancel, compose }) =>
         </Stack>
       </Stack>
     </OutlineBox>
-    </StopPropagation>
   );
 };
 

app/soapbox/components/status-action-bar.tsx

@@ -530,8 +530,6 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
         justifyContent={space === 'expand' ? 'between' : undefined}
         space={space === 'compact' ? 2 : undefined}
         grow={space === 'expand'}
-        onMouseUp={e => e.stopPropagation()}
-        onMouseDown={e => e.stopPropagation()}
         onClick={e => e.stopPropagation()}
       >
         <StatusActionButton

app/soapbox/components/status-content.tsx

@@ -12,7 +12,6 @@ import { isRtl } from '../rtl';
 
 import Markup from './markup';
 import Poll from './polls/poll';
-import StopPropagation from './stop-propagation';
 
 import type { Status, Mention } from 'soapbox/types/entities';
 
@@ -25,12 +24,10 @@ interface IReadMoreButton {
 
 /** Button to expand a truncated status (due to too much content) */
 const ReadMoreButton: React.FC<IReadMoreButton> = ({ onClick }) => (
-  <StopPropagation>
   <button className='flex items-center text-gray-900 dark:text-gray-300 border-0 bg-transparent p-0 pt-2 hover:underline active:underline' onClick={onClick}>
     <FormattedMessage id='status.read_more' defaultMessage='Read more' />
     <Icon className='inline-block h-5 w-5' src={require('@tabler/icons/chevron-right.svg')} fixedWidth />
   </button>
-  </StopPropagation>
 );
 
 interface IStatusContent {
@@ -100,10 +97,6 @@ const StatusContent: React.FC<IStatusContent> = ({ status, onClick, collapsable
         link.setAttribute('title', link.href);
         link.addEventListener('click', onLinkClick.bind(link), false);
       }
-
-      // Prevent bubbling
-      link.addEventListener('mouseup', e => e.stopPropagation());
-      link.addEventListener('mousedown', e => e.stopPropagation());
     });
   };
 

app/soapbox/components/status-media.tsx

@@ -2,7 +2,6 @@ import React, { useState } from 'react';
 
 import { openModal } from 'soapbox/actions/modals';
 import AttachmentThumbs from 'soapbox/components/attachment-thumbs';
-import StopPropagation from 'soapbox/components/stop-propagation';
 import PlaceholderCard from 'soapbox/features/placeholder/components/placeholder-card';
 import Card from 'soapbox/features/status/components/card';
 import Bundle from 'soapbox/features/ui/components/bundle';
@@ -176,9 +175,10 @@ const StatusMedia: React.FC<IStatusMedia> = ({
 
   if (media) {
     return (
-      <StopPropagation>
+      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+      <div onClick={e => e.stopPropagation()}>
         {media}
-      </StopPropagation>
+      </div>
     );
   } else {
     return null;

app/soapbox/components/status-reply-mentions.tsx

@@ -5,7 +5,6 @@ import { Link } from 'react-router-dom';
 import { openModal } from 'soapbox/actions/modals';
 import HoverRefWrapper from 'soapbox/components/hover-ref-wrapper';
 import HoverStatusWrapper from 'soapbox/components/hover-status-wrapper';
-import StopPropagation from 'soapbox/components/stop-propagation';
 import { useAppDispatch } from 'soapbox/hooks';
 
 import type { Account, Status } from 'soapbox/types/entities';
@@ -19,6 +18,8 @@ const StatusReplyMentions: React.FC<IStatusReplyMentions> = ({ status, hoverable
   const dispatch = useAppDispatch();
 
   const handleOpenMentionsModal: React.MouseEventHandler<HTMLSpanElement> = (e) => {
+    e.stopPropagation();
+
     const account = status.account as Account;
 
     dispatch(openModal('MENTIONS', {
@@ -49,7 +50,7 @@ const StatusReplyMentions: React.FC<IStatusReplyMentions> = ({ status, hoverable
   // The typical case with a reply-to and a list of mentions.
   const accounts = to.slice(0, 2).map(account => {
     const link = (
-      <Link to={`/@${account.acct}`} className='reply-mentions__account'>@{account.username}</Link>
+      <Link to={`/@${account.acct}`} className='reply-mentions__account' onClick={(e) => e.stopPropagation()}>@{account.username}</Link>
     );
 
     if (hoverable) {
@@ -72,7 +73,6 @@ const StatusReplyMentions: React.FC<IStatusReplyMentions> = ({ status, hoverable
   }
 
   return (
-    <StopPropagation>
     <div className='reply-mentions'>
       <FormattedMessage
         id='reply_mentions.reply.hoverable'
@@ -99,7 +99,6 @@ const StatusReplyMentions: React.FC<IStatusReplyMentions> = ({ status, hoverable
         }}
       />
     </div>
-    </StopPropagation>
   );
 };
 

app/soapbox/components/status.tsx

@@ -235,8 +235,7 @@ const Status: React.FC<IStatus> = (props) => {
     reblogElement = (
       <NavLink
         to={`/@${status.getIn(['account', 'acct'])}`}
-        onClick={e => e.stopPropagation()}
-        onMouseUp={e => e.stopPropagation()}
+        onClick={(event) => event.stopPropagation()}
         className='hidden sm:flex items-center text-gray-700 dark:text-gray-600 text-xs font-medium space-x-1 hover:underline'
       >
         <Icon src={require('@tabler/icons/repeat.svg')} className='text-green-600' />
@@ -259,8 +258,7 @@ const Status: React.FC<IStatus> = (props) => {
       <div className='pb-5 -mt-2 sm:hidden truncate'>
         <NavLink
           to={`/@${status.getIn(['account', 'acct'])}`}
-          onClick={e => e.stopPropagation()}
-          onMouseUp={e => e.stopPropagation()}
+          onClick={(event) => event.stopPropagation()}
           className='flex items-center text-gray-700 dark:text-gray-600 text-xs font-medium space-x-1 hover:underline'
         >
           <Icon src={require('@tabler/icons/repeat.svg')} className='text-green-600' />
@@ -328,7 +326,7 @@ const Status: React.FC<IStatus> = (props) => {
         data-featured={featured ? 'true' : null}
         aria-label={textForScreenReader(intl, actualStatus, rebloggedByText)}
         ref={node}
-        onMouseUp={handleClick}
+        onClick={handleClick}
         role='link'
       >
         {featured && (

app/soapbox/components/statuses/sensitive-content-overlay.tsx

@@ -5,7 +5,6 @@ import { defineMessages, useIntl } from 'react-intl';
 import { useSettings, useSoapboxConfig } from 'soapbox/hooks';
 import { defaultMediaVisibility } from 'soapbox/utils/status';
 
-import StopPropagation from '../stop-propagation';
 import { Button, HStack, Text } from '../ui';
 
 import type { Status as StatusEntity } from 'soapbox/types/entities';
@@ -39,7 +38,9 @@ const SensitiveContentOverlay = React.forwardRef<HTMLDivElement, ISensitiveConte
 
   const [visible, setVisible] = useState<boolean>(defaultMediaVisibility(status, displayMedia));
 
-  const toggleVisibility = () => {
+  const toggleVisibility = (event: React.MouseEvent<HTMLButtonElement>) => {
+    event.stopPropagation();
+
     if (onToggleVisibility) {
       onToggleVisibility();
     } else {
@@ -63,7 +64,6 @@ const SensitiveContentOverlay = React.forwardRef<HTMLDivElement, ISensitiveConte
       data-testid='sensitive-overlay'
     >
       {visible ? (
-        <StopPropagation>
         <Button
           text={intl.formatMessage(messages.hide)}
           icon={require('@tabler/icons/eye-off.svg')}
@@ -71,7 +71,6 @@ const SensitiveContentOverlay = React.forwardRef<HTMLDivElement, ISensitiveConte
           theme='primary'
           size='sm'
         />
-        </StopPropagation>
       ) : (
         <div className='text-center w-3/4 mx-auto space-y-4' ref={ref}>
           <div className='space-y-1'>
@@ -93,11 +92,14 @@ const SensitiveContentOverlay = React.forwardRef<HTMLDivElement, ISensitiveConte
           </div>
 
           <HStack alignItems='center' justifyContent='center' space={2}>
-            <StopPropagation>
             {isUnderReview ? (
               <>
                 {links.get('support') && (
-                    <a href={links.get('support')} target='_blank'>
+                  <a
+                    href={links.get('support')}
+                    target='_blank'
+                    onClick={(event) => event.stopPropagation()}
+                  >
                     <Button
                       type='button'
                       theme='outline'
@@ -120,7 +122,6 @@ const SensitiveContentOverlay = React.forwardRef<HTMLDivElement, ISensitiveConte
             >
               {intl.formatMessage(messages.show)}
             </Button>
-            </StopPropagation>
           </HStack>
         </div>
       )}

app/soapbox/components/stop-propagation.tsx

@@ -1,33 +0,0 @@
-import React from 'react';
-
-interface IStopPropagation {
-  /** Children to render within the bubble. */
-  children: React.ReactNode,
-  /** Whether to prevent mouse events from bubbling. (default: `true`) */
-  enabled?: boolean,
-}
-
-/**
- * Prevent mouse events from bubbling up.
- *
- * Why is this needed? Because `onClick`, `onMouseDown`, and `onMouseUp` are 3 separate events.
- * To prevent a lot of code duplication, this component can stop all mouse events.
- * Plus, placing it in the component tree makes it more readable.
- */
-const StopPropagation: React.FC<IStopPropagation> = ({ children, enabled = true }) => {
-
-  const handler: React.MouseEventHandler<HTMLDivElement> = (e) => {
-    if (enabled) {
-      e.stopPropagation();
-    }
-  };
-
-  return (
-    // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-    <div onClick={handler} onMouseDown={handler} onMouseUp={handler}>
-      {children}
-    </div>
-  );
-};
-
-export default StopPropagation;

app/soapbox/components/translate-button.tsx

@@ -4,7 +4,6 @@ import { FormattedMessage, useIntl } from 'react-intl';
 import { translateStatus, undoStatusTranslation } from 'soapbox/actions/statuses';
 import { useAppDispatch, useAppSelector, useFeatures } from 'soapbox/hooks';
 
-import StopPropagation from './stop-propagation';
 import { Stack } from './ui';
 
 import type { Status } from 'soapbox/types/entities';
@@ -43,21 +42,17 @@ const TranslateButton: React.FC<ITranslateButton> = ({ status }) => {
       <Stack className='text-gray-700 dark:text-gray-600 text-sm' alignItems='start'>
         <FormattedMessage id='status.translated_from_with' defaultMessage='Translated from {lang} using {provider}' values={{ lang: languageName, provider }} />
 
-        <StopPropagation>
         <button className='text-primary-600 dark:text-accent-blue hover:text-primary-700 dark:hover:text-accent-blue hover:underline' onClick={handleTranslate}>
           <FormattedMessage id='status.show_original' defaultMessage='Show original' />
         </button>
-        </StopPropagation>
       </Stack>
     );
   }
 
   return (
-    <StopPropagation>
     <button className='text-primary-600 dark:text-accent-blue hover:text-primary-700 dark:hover:text-accent-blue text-left text-sm hover:underline' onClick={handleTranslate}>
       <FormattedMessage id='status.translate' defaultMessage='Translate' />
     </button>
-    </StopPropagation>
   );
 };
 

app/soapbox/components/ui/button/button.tsx

@@ -8,7 +8,7 @@ import { useButtonStyles } from './useButtonStyles';
 
 import type { ButtonSizes, ButtonThemes } from './useButtonStyles';
 
-interface IButton extends Pick<React.HTMLAttributes<HTMLButtonElement>, 'onClick' | 'onMouseUp'> {
+interface IButton {
   /** Whether this button expands the width of its container. */
   block?: boolean,
   /** Elements inside the <button> */
@@ -19,6 +19,8 @@ interface IButton extends Pick<React.HTMLAttributes<HTMLButtonElement>, 'onClick
   disabled?: boolean,
   /** URL to an SVG icon to render inside the button. */
   icon?: string,
+  /** Action when the button is clicked. */
+  onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void,
   /** A predefined button size. */
   size?: ButtonSizes,
   /** Text inside the button. Takes precedence over `children`. */

app/soapbox/components/ui/hstack/hstack.tsx

@@ -27,7 +27,7 @@ const spaces = {
   8: 'space-x-8',
 };
 
-interface IHStack extends Pick<React.HTMLAttributes<HTMLDivElement>, 'onClick' | 'onMouseUp' | 'onMouseDown'> {
+interface IHStack extends Pick<React.HTMLAttributes<HTMLDivElement>, 'onClick'> {
   /** Vertical alignment of children. */
   alignItems?: keyof typeof alignItemsOptions
   /** Extra class names on the <div> element. */

app/soapbox/features/audio/index.tsx

@@ -449,6 +449,7 @@ const Audio: React.FC<IAudio> = (props) => {
       onMouseLeave={handleMouseLeave}
       tabIndex={0}
       onKeyDown={handleKeyDown}
+      onClick={e => e.stopPropagation()}
     >
       <audio
         src={src}

app/soapbox/features/ui/components/profile-dropdown.tsx

@@ -58,12 +58,7 @@ const ProfileDropdown: React.FC<IProfileDropdown> = ({ account, children }) => {
 
   const renderAccount = (account: AccountEntity) => {
     return (
-      <div className='relative'>
-        {/* HACK: The <Account> component stops click events, so insert this div as something to click. */}
-        <div className='absolute inset-0' />
-
       <Account account={account} showProfileHoverCard={false} withLinkToProfile={false} hideActions />
-      </div>
     );
   };
 

app/soapbox/features/video/index.tsx

@@ -183,6 +183,8 @@ const Video: React.FC<IVideo> = ({
     }
   }, [video.current]);
 
+  const handleClickRoot: React.MouseEventHandler = e => e.stopPropagation();
+
   const handlePlay = () => {
     setPaused(false);
   };
@@ -505,6 +507,7 @@ const Video: React.FC<IVideo> = ({
       ref={player}
       onMouseEnter={handleMouseEnter}
       onMouseLeave={handleMouseLeave}
+      onClick={handleClickRoot}
       onKeyDown={handleKeyDown}
       tabIndex={0}
     >