diff --git a/app/soapbox/components/polls/poll-footer.tsx b/app/soapbox/components/polls/poll-footer.tsx index 617860d94..693b28db1 100644 --- a/app/soapbox/components/polls/poll-footer.tsx +++ b/app/soapbox/components/polls/poll-footer.tsx @@ -53,7 +53,7 @@ const PollFooter: React.FC = ({ poll, showResults, selected }): JSX )} - + {poll.pleroma.get('non_anonymous') && ( <> diff --git a/app/soapbox/components/status-action-bar.tsx b/app/soapbox/components/status-action-bar.tsx index c07bf818d..5bce513a5 100644 --- a/app/soapbox/components/status-action-bar.tsx +++ b/app/soapbox/components/status-action-bar.tsx @@ -301,12 +301,12 @@ const StatusActionBar: React.FC = ({ }; const handleCopy: React.EventHandler = (e) => { - const { url } = status; + const { uri } = status; const textarea = document.createElement('textarea'); e.stopPropagation(); - textarea.textContent = url; + textarea.textContent = uri; textarea.style.position = 'fixed'; document.body.appendChild(textarea); diff --git a/app/soapbox/components/ui/hstack/hstack.tsx b/app/soapbox/components/ui/hstack/hstack.tsx index 3eef11055..f959cdd51 100644 --- a/app/soapbox/components/ui/hstack/hstack.tsx +++ b/app/soapbox/components/ui/hstack/hstack.tsx @@ -42,11 +42,13 @@ interface IHStack { grow?: boolean, /** Extra CSS styles for the
*/ style?: React.CSSProperties + /** Whether to let the flexbox wrap onto multiple lines. */ + wrap?: boolean, } /** Horizontal row of child elements. */ const HStack = forwardRef((props, ref) => { - const { space, alignItems, grow, justifyContent, className, ...filteredProps } = props; + const { space, alignItems, grow, justifyContent, wrap, className, ...filteredProps } = props; return (
((props, ref) => { // @ts-ignore [spaces[space]]: typeof space !== 'undefined', 'flex-grow': grow, + 'flex-wrap': wrap, }, className)} /> ); diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx index b8fed9255..f484be4cb 100644 --- a/app/soapbox/features/status/components/detailed-status.tsx +++ b/app/soapbox/features/status/components/detailed-status.tsx @@ -99,7 +99,7 @@ const DetailedStatus: React.FC = ({ {quote} - + diff --git a/webpack/production.js b/webpack/production.js index 9bd16e045..e1d833abc 100644 --- a/webpack/production.js +++ b/webpack/production.js @@ -113,6 +113,7 @@ module.exports = merge(sharedConfig, { '/objects', '/ostatus_subscribe', '/pghero', + '/phoenix', '/pleroma', '/proxy', '/relay',