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

Fix: 参照付き投稿の詳細画面のキーボード操作不具合・規定のスクロール量不具合 (#409)

Browse source 
* Fix: 参照付き投稿の詳細画面のキーボード操作不具合・規定のスクロール量不具合

* Fix test
This commit is contained in:
KMY（雪あすか） 2024-01-03 22:09:51 +09:00 • committed by GitHub
parent 7e7918202e
commit 47489783bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/javascript/mastodon/features/status/index.jsx
View file

@ -580,35 +580,45 @@ class Status extends ImmutablePureComponent {
}; };
handleMoveUp = id => { handleMoveUp = id => {
const { status, ancestorsIds, descendantsIds } = this.props; const { status, ancestorsIds, descendantsIds, referenceIds } = this.props;
if (id === status.get('id')) { if (id === status.get('id')) {
this._selectChild(ancestorsIds.size - 1, true); this._selectChild(ancestorsIds.size + referenceIds.size - 1, true);
} else { } else {
let index = ancestorsIds.indexOf(id); let index = ancestorsIds.indexOf(id);
if (index === -1) { if (index === -1) {
index = descendantsIds.indexOf(id); index = descendantsIds.indexOf(id);
this._selectChild(ancestorsIds.size + index, true); if (index === -1) {
index = referenceIds.indexOf(id);
this._selectChild(index - 1, true);
} else {
this._selectChild(ancestorsIds.size + referenceIds.size + index, true);
}
} else { } else {
this._selectChild(index - 1, true); this._selectChild(referenceIds.size + index - 1, true);
} }
} }
}; };
handleMoveDown = id => { handleMoveDown = id => {
const { status, ancestorsIds, descendantsIds } = this.props; const { status, ancestorsIds, descendantsIds, referenceIds } = this.props;
if (id === status.get('id')) { if (id === status.get('id')) {
this._selectChild(ancestorsIds.size + 1, false); this._selectChild(ancestorsIds.size + referenceIds.size + 1, false);
} else { } else {
let index = ancestorsIds.indexOf(id); let index = ancestorsIds.indexOf(id);
if (index === -1) { if (index === -1) {
index = descendantsIds.indexOf(id); index = descendantsIds.indexOf(id);
this._selectChild(ancestorsIds.size + index + 2, false); if (index === -1) {
index = referenceIds.indexOf(id);
this._selectChild(index + 1, false);
} else {
this._selectChild(ancestorsIds.size + referenceIds.size + index + 2, false);
}
} else { } else {
this._selectChild(index + 1, false); this._selectChild(referenceIds.size + index + 1, false);
} }
} }
}; };
@ -669,9 +679,9 @@ class Status extends ImmutablePureComponent {
} }
componentDidUpdate (prevProps) { componentDidUpdate (prevProps) {
const { status, ancestorsIds } = this.props; const { status, ancestorsIds, referenceIds } = this.props;
if (status && (ancestorsIds.size > prevProps.ancestorsIds.size || prevProps.status?.get('id') !== status.get('id'))) { if (status && (ancestorsIds.size + referenceIds.size > prevProps.ancestorsIds.size + prevProps.referenceIds.size || prevProps.status?.get('id') !== status.get('id'))) {
this._scrollStatusIntoView(); this._scrollStatusIntoView();
} }
} }