keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

enable back keyboard navigation on message list

Browse Source
pull/1387/head
Audric Ackermann 5 years ago
parent 141e497af7
commit 857bea50ea
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4
8 changed files with 52 additions and 98 deletions
Show Stats Download Patch File Download Diff File

2
js/models/conversations.js
Unescape Escape View File

@ -35,7 +35,6 @@
const {
Conversation,
Contact,
Errors,
Message,
PhoneNumber,
} = window.Signal.Types;
@ -2215,7 +2214,6 @@
}
},
hasMember(number) {
return _.contains(this.get('members'), number);
},

1
js/views/conversation_view.js
Unescape Escape View File

@ -365,7 +365,6 @@
this.unload('windows closed');
});
this.$('.send-message').focus(this.focusBottomBar.bind(this));
this.$('.send-message').blur(this.unfocusBottomBar.bind(this));

2
stylesheets/_modules.scss
Unescape Escape View File

@ -129,8 +129,6 @@
border-radius: 16px;
overflow: hidden;
background-color: $color-white;
}
.module-message__attachment-container--with-content-below {

6
stylesheets/_session.scss
Unescape Escape View File

@ -1337,11 +1337,9 @@ input {
.session-scroll-button {
animation: fadein $session-fadein-duration;
position: sticky;
text-align: -webkit-right;
bottom: 15px;
right: 25px;
position: fixed;
z-index: 2;
right: 60px;
.session-icon-button {
display: flex;

4
stylesheets/themes.scss
Unescape Escape View File

@ -9,7 +9,9 @@ $accentDarkTheme: #00f782;
$borderLightTheme: #f1f1f1; // search for references on ts TODO: make this exposed on ts
$borderDarkTheme: rgba($white, 0.06);
$borderAvatarColor: unquote('#00000059'); // search for references on ts TODO: make this exposed on ts
$borderAvatarColor: unquote(
'#00000059'
); // search for references on ts TODO: make this exposed on ts
$themes: (
light: (

8
ts/components/session/conversation/SessionCompositionBox.tsx
Unescape Escape View File

@ -497,7 +497,11 @@ export class SessionCompositionBox extends React.Component<Props, State> {
'attachments'
);
const linkPreviews = stagedLinkPreview && [_.pick(stagedLinkPreview, 'url', 'image', 'title')] || [];
const linkPreviews =
(stagedLinkPreview && [
_.pick(stagedLinkPreview, 'url', 'image', 'title'),
]) ||
[];
try {
const attachments = await this.getFiles();
@ -510,7 +514,6 @@ export class SessionCompositionBox extends React.Component<Props, State> {
{}
);
// Message sending sucess
this.props.onMessageSuccess();
@ -526,7 +529,6 @@ export class SessionCompositionBox extends React.Component<Props, State> {
stagedLinkPreview: undefined,
ignoredLink: undefined,
});
}
} catch (e) {
// Message sending failed

81
ts/components/session/conversation/SessionConversation.tsx
Unescape Escape View File

@ -395,9 +395,10 @@ export class SessionConversation extends React.Component<Props, State> {
messages.push({ ...messageModels[i], firstMessageOfSeries });
previousSender = messageModels[i].authorPhoneNumber;
}
const previousTopMessage = this.state.messages[0]?.id;
const newTopMessage = messages[0]?.id;
const oldLen = this.state.messages.length;
const newLen = messages.length;
const previousTopMessage = this.state.messages[oldLen - 1]?.id;
const newTopMessage = messages[newLen - 1]?.id;
this.setState({ messages, messageFetchTimestamp: timestamp });
@ -843,43 +844,43 @@ export class SessionConversation extends React.Component<Props, State> {
// ~~~~~~~~~~~ KEYBOARD NAVIGATION ~~~~~~~~~~~~
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
private onKeyDown(event: any) {
// const messageContainer = this.messageContainerRef.current;
// if (!messageContainer) {
// return;
// }
// const selectionMode = !!this.state.selectedMessages.length;
// const recordingMode = this.state.showRecordingView;
// const pageHeight = messageContainer.clientHeight;
// const arrowScrollPx = 50;
// const pageScrollPx = pageHeight * 0.8;
// if (event.key === 'Escape') {
// // EXIT MEDIA VIEW
// if (recordingMode) {
// // EXIT RECORDING VIEW
// }
// // EXIT WHAT ELSE?
// }
// switch (event.key) {
// case 'Escape':
// if (selectionMode) {
// this.resetSelection();
// }
// break;
// // Scrolling
// case 'ArrowUp':
// messageContainer.scrollBy(0, -arrowScrollPx);
// break;
// case 'ArrowDown':
// messageContainer.scrollBy(0, arrowScrollPx);
// break;
// case 'PageUp':
// messageContainer.scrollBy(0, -pageScrollPx);
// break;
// case 'PageDown':
// messageContainer.scrollBy(0, pageScrollPx);
// break;
// default:
// }
const messageContainer = this.messageContainerRef.current;
if (!messageContainer) {
return;
}
const selectionMode = !!this.state.selectedMessages.length;
const recordingMode = this.state.showRecordingView;
const pageHeight = messageContainer.clientHeight;
const arrowScrollPx = 50;
const pageScrollPx = pageHeight * 0.8;
if (event.key === 'Escape') {
// EXIT MEDIA VIEW
if (recordingMode) {
// EXIT RECORDING VIEW
}
// EXIT WHAT ELSE?
}
switch (event.key) {
case 'Escape':
if (selectionMode) {
this.resetSelection();
}
break;
// Scrolling
case 'ArrowUp':
messageContainer.scrollBy(0, -arrowScrollPx);
break;
case 'ArrowDown':
messageContainer.scrollBy(0, arrowScrollPx);
break;
case 'PageUp':
messageContainer.scrollBy(0, -pageScrollPx);
break;
case 'PageDown':
messageContainer.scrollBy(0, pageScrollPx);
break;
default:
}
}
private clearAttachments() {

46
ts/components/session/conversation/SessionConversationMessagesList.tsx
Unescape Escape View File

@ -208,7 +208,7 @@ export class SessionConversationMessagesList extends React.Component<
}
if (isScrolledToBottom) {
unread = messages[messages.length - 1];
unread = messages[0];
} else {
unread = this.findNewestVisibleUnread();
}
@ -385,48 +385,4 @@ export class SessionConversationMessagesList extends React.Component<
public resetSelection() {
this.props.resetSelection();
}
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// ~~~~~~~~~~~ KEYBOARD NAVIGATION ~~~~~~~~~~~~
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
private onKeyDown(event: any) {
//FIXME Audric
// const messageContainer = this.messageContainerRef.current;
// if (!messageContainer) {
// return;
// }
// const selectionMode = !!this.props.selectedMessages.length;
// const recordingMode = this.props.showRecordingView;
// const pageHeight = messageContainer.clientHeight;
// const arrowScrollPx = 50;
// const pageScrollPx = pageHeight * 0.8;
// if (event.key === 'Escape') {
// // EXIT MEDIA VIEW
// if (recordingMode) {
// // EXIT RECORDING VIEW
// }
// // EXIT WHAT ELSE?
// }
// switch (event.key) {
// case 'Escape':
// if (selectionMode) {
// this.resetSelection();
// }
// break;
// // Scrolling
// case 'ArrowUp':
// messageContainer.scrollBy(0, -arrowScrollPx);
// break;
// case 'ArrowDown':
// messageContainer.scrollBy(0, arrowScrollPx);
// break;
// case 'PageUp':
// messageContainer.scrollBy(0, -pageScrollPx);
// break;
// case 'PageDown':
// messageContainer.scrollBy(0, pageScrollPx);
// break;
// default:
// }
}
}

Write Preview
Loading…
Cancel
Save