moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into chat-composer

This commit is contained in:
Alex Gleason 2023-02-02 15:19:54 -06:00
parent b9474e61de fc1a547a2e
commit 6b1882d7a9
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
6 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Chats: improved display of media attachments. - Chats: improved display of media attachments.
- ServiceWorker: switch to a network-first strategy. The "An update is available!" prompt goes away. - ServiceWorker: switch to a network-first strategy. The "An update is available!" prompt goes away.
- Posts: increased font size of focused status in threads. - Posts: increased font size of focused status in threads.
- Posts: let "mute conversation" be clicked from any feed, not just noficiations.
### Fixed ### Fixed
- Chats: media attachments rendering at the wrong size and/or causing the chat to scroll on load. - Chats: media attachments rendering at the wrong size and/or causing the chat to scroll on load.

17
app/soapbox/components/status-action-bar.tsx
View File

@ -98,7 +98,6 @@ const messages = defineMessages({
interface IStatusActionBar { interface IStatusActionBar {
status: Status, status: Status,
withDismiss?: boolean,
withLabels?: boolean, withLabels?: boolean,
expandable?: boolean, expandable?: boolean,
space?: 'expand' | 'compact', space?: 'expand' | 'compact',
@ -106,7 +105,6 @@ interface IStatusActionBar {
const StatusActionBar: React.FC<IStatusActionBar> = ({ const StatusActionBar: React.FC<IStatusActionBar> = ({
status, status,
withDismiss = false,
withLabels = false, withLabels = false,
expandable = true, expandable = true,
space = 'compact', space = 'compact',
@ -387,14 +385,13 @@ const StatusActionBar: React.FC<IStatusActionBar> = ({
menu.push(null); menu.push(null);
if (ownAccount || withDismiss) { menu.push({
menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation),
text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: handleConversationMuteClick,
action: handleConversationMuteClick, icon: mutingConversation ? require('@tabler/icons/bell.svg') : require('@tabler/icons/bell-off.svg'),
icon: mutingConversation ? require('@tabler/icons/bell.svg') : require('@tabler/icons/bell-off.svg'), });
});
menu.push(null); menu.push(null);
}
if (ownAccount) { if (ownAccount) {
if (publicStatus) { if (publicStatus) {

4
app/soapbox/components/status.tsx
View File

@ -53,7 +53,6 @@ export interface IStatus {
hoverable?: boolean, hoverable?: boolean,
variant?: 'default' | 'rounded', variant?: 'default' | 'rounded',
showGroup?: boolean, showGroup?: boolean,
withDismiss?: boolean,
accountAction?: React.ReactElement, accountAction?: React.ReactElement,
} }
@ -74,7 +73,6 @@ const Status: React.FC<IStatus> = (props) => {
hideActionBar, hideActionBar,
variant = 'rounded', variant = 'rounded',
showGroup = true, showGroup = true,
withDismiss,
} = props; } = props;
const intl = useIntl(); const intl = useIntl();
@ -421,7 +419,7 @@ const Status: React.FC<IStatus> = (props) => {
{(!hideActionBar && !isUnderReview) && ( {(!hideActionBar && !isUnderReview) && (
<div className='pt-4'> <div className='pt-4'>
<StatusActionBar status={actualStatus} withDismiss={withDismiss} /> <StatusActionBar status={actualStatus} />
</div> </div>
)} )}
</div> </div>

1
app/soapbox/features/notifications/components/notification.tsx
View File

@ -325,7 +325,6 @@ const Notification: React.FC<INotificaton> = (props) => {
return status && typeof status === 'object' ? ( return status && typeof status === 'object' ? (
<StatusContainer <StatusContainer
id={status.id} id={status.id}
withDismiss
hidden={hidden} hidden={hidden}
onMoveDown={handleMoveDown} onMoveDown={handleMoveDown}
onMoveUp={handleMoveUp} onMoveUp={handleMoveUp}

2
package.json
View File

@ -167,7 +167,7 @@
"react-swipeable-views": "^0.14.0", "react-swipeable-views": "^0.14.0",
"react-textarea-autosize": "^8.3.4", "react-textarea-autosize": "^8.3.4",
"react-toggle": "^4.1.2", "react-toggle": "^4.1.2",
"react-virtuoso": "^4.0.6", "react-virtuoso": "^4.0.8",
"redux": "^4.1.1", "redux": "^4.1.1",
"redux-immutable": "^4.0.0", "redux-immutable": "^4.0.0",
"redux-thunk": "^2.2.0", "redux-thunk": "^2.2.0",

8
yarn.lock
View File

@ -9704,10 +9704,10 @@ react-transition-group@^2.2.1:
prop-types "^15.6.2" prop-types "^15.6.2"
react-lifecycles-compat "^3.0.4" react-lifecycles-compat "^3.0.4"
react-virtuoso@^4.0.6: react-virtuoso@^4.0.8:
version "4.0.6" version "4.0.8"
resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-4.0.6.tgz#5ee8a72bf0b57d31063cef6343b26e6cde5529e3" resolved "https://registry.yarnpkg.com/react-virtuoso/-/react-virtuoso-4.0.8.tgz#6543573e5b2da8cd5808bd687655cf24d7930dfe"
integrity sha512-TJ4fyTbre0uTpXE0AXaMG2BOX9PgKfDC7wLhnSmDvBU0WoEUrIAcNJACLJvqyWZMDAuEv3v+b4OyK6jiSkFL9Q== integrity sha512-ne9QzKajqwDT13t2nt5uktuFkyBTjRsJCdF06gdwcPVP6lrWt/VE5tkKf2OVtMqfethR8/FHuAYDOLyT5YtddQ==
react@^18.0.0: react@^18.0.0:
version "18.2.0" version "18.2.0"