Enable coexistence of horizontal and vertical posts (#37204)

This commit is contained in:
Itoh Shimon authored and GitHub committed 2026-02-06 09:51:22 +00:00
1 parent 7a4945c0d3
commit 96de28dd6f
4 files changed
+103 -5

No files matched your search

@@ -108,11 +108,12 @@ class StatusContent extends PureComponent {
const { status, onCollapsedToggle } = this.props;
if (status.get('collapsed', null) === null && onCollapsedToggle) {
const { collapsible, onClick } = this.props;
const text = node.querySelector(':scope > .status__content__text');
const collapsed =
collapsible
&& onClick
&& node.clientHeight > MAX_HEIGHT
&& (node.clientHeight > MAX_HEIGHT || (text !== null && text.scrollWidth > text.clientWidth))
&& status.get('spoiler_text').length === 0;
onCollapsedToggle(collapsed);
@@ -1,5 +1,8 @@
import { Map as ImmutableMap } from 'immutable';
import type { Meta, StoryObj } from '@storybook/react-vite';
import type { ApiQuoteJSON } from '@/mastodon/api_types/quotes';
import { accountFactoryState, statusFactoryState } from '@/testing/factories';
import type { StatusQuoteManagerProps } from './status_quoted';
@@ -10,9 +13,6 @@ const meta = {
render(args) {
return <StatusQuoteManager {...args} />;
},
args: {
id: '1',
},
parameters: {
state: {
accounts: {
@@ -21,8 +21,40 @@ const meta = {
statuses: {
'1': statusFactoryState({
id: '1',
language: 'en',
text: 'Hello world!',
}),
'2': statusFactoryState({
id: '2',
language: 'en',
text: 'Quote!',
quote: ImmutableMap({
state: 'accepted',
quoted_status: '1',
}) as unknown as ApiQuoteJSON,
}),
'1001': statusFactoryState({
id: '1001',
language: 'mn-Mong',
// meaning: Mongolia
text: 'ᠮᠤᠩᠭᠤᠯ',
}),
'1002': statusFactoryState({
id: '1002',
language: 'mn-Mong',
// meaning: All human beings are born free and equal in dignity and rights.
text: 'ᠬᠦᠮᠦᠨ ᠪᠦᠷ ᠲᠥᠷᠥᠵᠦ ᠮᠡᠨᠳᠡᠯᠡᠬᠦ ᠡᠷᠬᠡ ᠴᠢᠯᠥᠭᠡ ᠲᠡᠢ᠂ ᠠᠳᠠᠯᠢᠬᠠᠨ ᠨᠡᠷ᠎ᠡ ᠲᠥᠷᠥ ᠲᠡᠢ᠂ ᠢᠵᠢᠯ ᠡᠷᠬᠡ ᠲᠡᠢ ᠪᠠᠢᠠᠭ᠃',
}),
'1003': statusFactoryState({
id: '1003',
language: 'mn-Mong',
// meaning: Mongolia
text: 'ᠮᠤᠩᠭᠤᠯ',
quote: ImmutableMap({
state: 'accepted',
quoted_status: '1002',
}) as unknown as ApiQuoteJSON,
}),
},
},
},
@@ -32,4 +64,34 @@ export default meta;
type Story = StoryObj<typeof meta>;
export const Default: Story = {};
export const Default: Story = {
args: {
id: '1',
},
};
export const Quote: Story = {
args: {
id: '2',
},
};
export const TraditionalMongolian: Story = {
args: {
id: '1001',
},
};
export const LongTraditionalMongolian: Story = {
args: {
id: '1002',
},
};
// TODO: fix quoted rotated Mongolian script text
// https://github.com/mastodon/mastodon/pull/37204#issuecomment-3661767226
export const QuotedTraditionalMongolian: Story = {
args: {
id: '1003',
},
};