Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 7ea55e9

Browse files
committed
Lint fixes
1 parent cb7cd39 commit 7ea55e9

File tree

4 files changed

+46
-41
lines changed

4 files changed

+46
-41
lines changed

src/components/structures/LoggedInView.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -553,8 +553,6 @@ class LoggedInView extends React.Component<IProps, IState> {
553553
PlatformPeg.get()?.navigateForwardBack(false);
554554
handled = true;
555555
break;
556-
case KeyBindingAction.SelectPrevMessage:
557-
handled = true;
558556
}
559557

560558
// Handle labs actions here, as they apply within the same scope

src/components/structures/MessagePanel.tsx

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ import { _t } from "../../languageHandler";
5858
import { getLateEventInfo } from "./grouper/LateEventGrouper";
5959
import { getKeyBindingsManager } from "../../KeyBindingsManager";
6060
import { KeyBindingAction } from "../../accessibility/KeyboardShortcuts";
61-
import { highlightEvent } from "../../utils/EventUtils";
6261

6362
const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
6463
const continuedTypes = [EventType.Sticker, EventType.RoomMessage];
@@ -427,43 +426,43 @@ export default class MessagePanel extends React.Component<IProps, IState> {
427426
*/
428427
public handleScrollKey(ev: React.KeyboardEvent | KeyboardEvent): void {
429428
const navAction = getKeyBindingsManager().getNavigationAction(ev);
430-
switch (navAction) {
431-
case KeyBindingAction.SelectPrevMessage:
432-
case KeyBindingAction.SelectNextMessage:
433-
const events: WrappedEvent[] = this.props.events.map((event) => {
434-
return { event, shouldShow: this.shouldShowEvent(event) };
435-
});
436-
const currentEventId = this.focusedEventId || this.props.highlightedEventId || events[events.length-1]?.event.getId()!;
437-
if ( navAction === KeyBindingAction.SelectPrevMessage ) {
438-
events.reverse();
439-
}
440-
let previousEventId = null;
441-
for (let i = events.length - 1; i >= 0; i--) {
442-
const { event, shouldShow } = events[i];
443-
if (!shouldShow) {
444-
continue;
445-
}
446-
const eventId = event.getId()!;
447-
if ( previousEventId && eventId === currentEventId ) {
448-
console.log('.mx_EventTile[data-event-id="' + previousEventId + '"]');
449-
450-
document.querySelector('.mx_EventTile[data-event-id="' + previousEventId + '"]')?.focus();
451-
this.focusedEventId = previousEventId;
452-
ev.preventDefault();
453-
return;
454-
}
455-
previousEventId = eventId;
429+
if (navAction === KeyBindingAction.SelectPrevMessage || navAction === KeyBindingAction.SelectNextMessage) {
430+
const events: WrappedEvent[] = this.props.events.map((event) => {
431+
return { event, shouldShow: this.shouldShowEvent(event) };
432+
});
433+
const currentEventId =
434+
this.focusedEventId ||
435+
this.props.highlightedEventId ||
436+
(events[events.length - 1] ? events[events.length - 1].event.getId()! : null);
437+
if (navAction === KeyBindingAction.SelectPrevMessage) {
438+
events.reverse();
439+
}
440+
let previousEventId = null;
441+
for (let i = events.length - 1; i >= 0; i--) {
442+
const { event, shouldShow } = events[i];
443+
if (!shouldShow) {
444+
continue;
456445
}
457-
if ( navAction === KeyBindingAction.SelectNextMessage ) {
458-
defaultDispatcher.dispatch(
459-
{
460-
action: Action.FocusSendMessageComposer,
461-
context: TimelineRenderingType.Room,
462-
},
463-
true,
464-
);
446+
const eventId = event.getId()!;
447+
if (previousEventId && eventId === currentEventId) {
448+
console.log('.mx_EventTile[data-event-id="' + previousEventId + '"]');
449+
450+
document.querySelector('.mx_EventTile[data-event-id="' + previousEventId + '"]')?.focus();
451+
this.focusedEventId = previousEventId;
452+
ev.preventDefault();
453+
return;
465454
}
466-
break;
455+
previousEventId = eventId;
456+
}
457+
if (navAction === KeyBindingAction.SelectNextMessage) {
458+
defaultDispatcher.dispatch(
459+
{
460+
action: Action.FocusSendMessageComposer,
461+
context: TimelineRenderingType.Room,
462+
},
463+
true,
464+
);
465+
}
467466
}
468467

469468
this.scrollPanel.current?.handleScrollKey(ev);

src/components/views/rooms/EventTile.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,10 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
12101210
"ref": this.ref,
12111211
"className": classes,
12121212
"aria-live": ariaLive,
1213-
"aria-label": this.props.mxEvent.sender.name + '. ' + (this.props.mxEvent.clearEvent || this.props.mxEvent.event).content.body,
1213+
"aria-label":
1214+
this.props.mxEvent.sender.name +
1215+
". " +
1216+
(this.props.mxEvent.clearEvent || this.props.mxEvent.event).content.body,
12141217
"aria-atomic": true,
12151218
"data-scroll-tokens": scrollToken,
12161219
"data-has-reply": !!replyChain,
@@ -1400,7 +1403,10 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
14001403
"className": classes,
14011404
"tabIndex": -1,
14021405
"aria-live": ariaLive,
1403-
"aria-label": this.props.mxEvent.sender.name + '. ' + (this.props.mxEvent.clearEvent || this.props.mxEvent.event).content.body,
1406+
"aria-label":
1407+
this.props.mxEvent.sender.name +
1408+
". " +
1409+
(this.props.mxEvent.clearEvent || this.props.mxEvent.event).content.body,
14041410
"aria-atomic": "true",
14051411
"data-scroll-tokens": scrollToken,
14061412
"data-layout": this.props.layout,

src/components/views/rooms/SendMessageComposer.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,9 @@ export class SendMessageComposer extends React.Component<ISendMessageComposerPro
311311
const navAction = getKeyBindingsManager().getNavigationAction(event);
312312
switch (navAction) {
313313
case KeyBindingAction.SelectPrevMessage:
314-
(document.querySelector('.mx_EventTile_selected')||document.querySelector('.mx_EventTile_last'))?.focus();
314+
(
315+
document.querySelector(".mx_EventTile_selected") || document.querySelector(".mx_EventTile_last")
316+
)?.focus();
315317
event.preventDefault();
316318
event.stopPropagation();
317319
return;

0 commit comments

Comments
 (0)