works as expected on desktop, mobile needs work

This commit is contained in:
or-else
2023-03-24 13:56:24 -07:00
parent cca97d410e
commit e68ebc8336
12 changed files with 164 additions and 37 deletions
+22 -8
View File
@@ -289,7 +289,9 @@ class MessagesView extends React.Component {
reply: null,
contentToEdit: null,
showGoToLastButton: false,
dragging: false
dragging: false,
pins: [],
selectedPin: 0
};
} else if (nextProps.topic != prevState.topic) {
const topic = nextProps.tinode.getTopic(nextProps.topic);
@@ -308,7 +310,8 @@ class MessagesView extends React.Component {
fetchingMessages: false,
showGoToLastButton: false,
contentToEdit: null,
dragging: false
dragging: false,
selectedPin: 0
};
if (nextProps.forwardMessage) {
@@ -359,12 +362,13 @@ class MessagesView extends React.Component {
peerMessagingDisabled: false
});
}
console.log("getDerivedStateFromProps", nextProps.topic, prevState.topic);
Object.assign(nextState, {
minSeqId: topic.minMsgSeq(),
maxSeqId: topic.maxMsgSeq(),
latestClearId: topic.maxClearId(),
channel: topic.isChannelType(),
pins: topic.aux('pins')
pins: (topic.aux('pins') || []).slice()
});
if (nextProps.callTopic == topic.name && shouldPresentCallPanel(nextProps.callState)) {
@@ -380,7 +384,8 @@ class MessagesView extends React.Component {
title: '',
avatar: null,
peerMessagingDisabled: false,
channel: false
channel: false,
pins: []
});
}
} else {
@@ -736,7 +741,15 @@ class MessagesView extends React.Component {
}
handleAuxUpdate(aux) {
this.setState({pins: aux['pins']});
const pins = (aux['pins'] || []).slice();
let selectedPin = this.state.selectedPin;
if (pins.length > this.state.pins.length) {
// New pins added, show the latest.
selectedPin = 0;
} else if (selectedPin >= pins.length) {
selectedPin = Math.max(0, pins.length - 1);
}
this.setState({pins: pins, selectedPin: selectedPin});
}
handleInfoReceipt(info) {
@@ -1426,7 +1439,7 @@ class MessagesView extends React.Component {
}
const pinnedMessages = [];
(this.state.pins || []).forEach(seq => pinnedMessages.push(topic.findMessage(seq)));
this.state.pins.forEach(seq => pinnedMessages.push(topic.findMessage(seq)));
const messageNodes = [];
let previousFrom = null;
@@ -1505,7 +1518,7 @@ class MessagesView extends React.Component {
uploader={msg._uploader}
userIsWriter={this.state.isWriter}
userIsAdmin={this.state.isAdmin}
pinned={(this.state.pins || []).includes(msg.seq)}
pinned={this.state.pins.includes(msg.seq)}
viewportWidth={this.props.viewportWidth} // Used by `formatter`.
showContextMenu={this.handleShowMessageContextMenu}
onExpandMedia={this.handleExpandMedia}
@@ -1624,7 +1637,8 @@ class MessagesView extends React.Component {
<PinnedMessages
tinode={this.props.tinode}
messages={pinnedMessages}
selected={0}
selected={this.state.selectedPin}
setSelected={index => this.setState({selectedPin: index})}
onSelected={this.handleQuoteClick}
onCancel={this.handleUnpinMessage} />
{groupTopic ?
+47 -4
View File
@@ -9,22 +9,51 @@ class PinnedMessages extends React.PureComponent {
constructor(props) {
super(props);
this.getSelectedIndex = this.getSelectedIndex.bind(this);
this.handleCancel = this.handleCancel.bind(this);
this.handleSelected = this.handleSelected.bind(this);
this.handleMoveNext = this.handleMoveNext.bind(this);
this.handleMovePrev = this.handleMovePrev.bind(this);
}
getSelectedIndex() {
const list = (this.props.messages || []);
return list.length - this.props.selected - 1;
}
handleCancel(e) {
e.preventDefault();
this.props.onCancel(this.props.messages[this.props.selected].seq);
this.props.onCancel(this.props.messages[this.getSelectedIndex()].seq);
}
handleSelected(e) {
e.preventDefault();
this.props.onSelected(this.props.messages[this.props.selected].seq);
this.props.onSelected(this.props.messages[this.getSelectedIndex()].seq);
}
handleMoveNext(e) {
e.preventDefault();
e.stopPropagation();
const idx = Math.max(this.props.selected - 1, 0);
if (idx != this.props.selected) {
console.log("Move selection to ", idx);
this.props.setSelected(idx);
}
}
handleMovePrev(e) {
e.preventDefault();
e.stopPropagation();
const idx = Math.min(this.props.selected + 1, (this.props.messages || []).length - 1);
if (idx != this.props.selected) {
console.log("Move selection to ", idx);
this.props.setSelected(idx);
}
}
render() {
let shown = (this.props.messages || [])[this.props.selected];
const selected = this.getSelectedIndex();
let shown = (this.props.messages || [])[selected];
shown = shown ? Drafty.format(shown.content, previewFormatter, {
formatMessage: this.props.intl.formatMessage.bind(this.props.intl),
authorizeURL: this.props.tinode.authorizeURL.bind(this.props.tinode)
@@ -32,7 +61,7 @@ class PinnedMessages extends React.PureComponent {
const dots = [];
this.props.messages.forEach(_ => {
const cn = dots.length == this.props.selected ? 'adot' : 'dot';
const cn = dots.length == selected ? 'adot' : 'dot';
dots.push(<div key={dots.length} className={cn} />);
});
@@ -43,6 +72,20 @@ class PinnedMessages extends React.PureComponent {
</div>
<div className="pinned-scroll">{dots}</div>
<div className="pinned" onClick={this.handleSelected}>{shown}</div>
{selected > 0 ?
<span className="menuTrigger upper">
<a href="#" onClick={this.handleMovePrev}>
<i className="material-icons">expand_less</i>
</a>
</span>
: null}
{this.props.selected > 0 ?
<span className="menuTrigger lower">
<a href="#" onClick={this.handleMoveNext}>
<i className="material-icons">expand_more</i>
</a>
</span>
: null}
</div>) : null;
}
}