gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Change: スマホから公開範囲などの選択肢を表示するときのデザインを調整 (#508)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-01-26 13:43:40 +09:00 • committed by GitHub
parent c75a3721a1
commit 3762dd6249
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 74 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/javascript/mastodon/features/compose/components/circle_dropdown.jsx
View file

@ -148,11 +148,21 @@ class CircleDropdown extends PureComponent {
};
handleToggle = () => {
if (this.state.open && this.activeElement) {
this.activeElement.focus({ preventScroll: true });
if (this.props.isUserTouching && this.props.isUserTouching()) {
if (this.state.open) {
this.props.onModalClose();
} else {
this.props.onModalOpen({
actions: this.options.map(option => ({ ...option, active: option.value === this.props.circleId })),
onClick: this.handleModalActionClick,
});
}
} else {
if (this.state.open && this.activeElement) {
this.activeElement.focus({ preventScroll: true });
}
this.setState({ open: !this.state.open });
}
this.setState({ open: !this.state.open });
};
handleModalActionClick = (e) => {

18
app/javascript/mastodon/features/compose/components/expiration_dropdown.jsx
View file

@ -142,11 +142,21 @@ class ExpirationDropdown extends PureComponent {
};
handleToggle = () => {
if (this.state.open && this.activeElement) {
this.activeElement.focus({ preventScroll: true });
if (this.props.isUserTouching && this.props.isUserTouching()) {
if (this.state.open) {
this.props.onModalClose();
} else {
this.props.onModalOpen({
actions: this.options.map(option => ({ ...option, active: false })),
onClick: this.handleModalActionClick,
});
}
} else {
if (this.state.open && this.activeElement) {
this.activeElement.focus({ preventScroll: true });
}
this.setState({ open: !this.state.open });
}
this.setState({ open: !this.state.open });
};
handleModalActionClick = (e) => {

25
app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
View file

@ -188,11 +188,30 @@ class PrivacyDropdown extends PureComponent {
};
handleToggle = () => {
if (this.state.open && this.activeElement) {
this.activeElement.focus({ preventScroll: true });
if (this.props.isUserTouching && this.props.isUserTouching()) {
if (this.state.open) {
this.props.onModalClose();
} else {
this.props.onModalOpen({
actions: this.options.map(option => ({ ...option, active: option.value === this.props.value })),
onClick: this.handleModalActionClick,
});
}
} else {
if (this.state.open && this.activeElement) {
this.activeElement.focus({ preventScroll: true });
}
this.setState({ open: !this.state.open });
}
};
this.setState({ open: !this.state.open });
handleModalActionClick = (e) => {
e.preventDefault();
const { value } = this.options[e.currentTarget.getAttribute('data-index')];
this.props.onModalClose();
this.props.onChange(value);
};
handleKeyDown = e => {

25
app/javascript/mastodon/features/compose/components/searchability_dropdown.jsx
View file

@ -165,11 +165,30 @@ class SearchabilityDropdown extends PureComponent {
};
handleToggle = () => {
if (this.state.open && this.activeElement) {
this.activeElement.focus({ preventScroll: true });
if (this.props.isUserTouching && this.props.isUserTouching()) {
if (this.state.open) {
this.props.onModalClose();
} else {
this.props.onModalOpen({
actions: this.options.map(option => ({ ...option, active: option.value === this.props.value })),
onClick: this.handleModalActionClick,
});
}
} else {
if (this.state.open && this.activeElement) {
this.activeElement.focus({ preventScroll: true });
}
this.setState({ open: !this.state.open });
}
};
this.setState({ open: !this.state.open });
handleModalActionClick = (e) => {
e.preventDefault();
const { value } = this.options[e.currentTarget.getAttribute('data-index')];
this.props.onModalClose();
this.props.onChange(value);
};
handleKeyDown = e => {