mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Add panel for pinned messages.
Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
parent
774c3dbd38
commit
5daa16ab53
106
src/components/views/rooms/PinnedEventsPanel.js
Normal file
106
src/components/views/rooms/PinnedEventsPanel.js
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2017 Travis Ralston
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
var React = require('react');
|
||||||
|
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
|
||||||
|
var sdk = require('matrix-react-sdk');
|
||||||
|
var AccessibleButton = require('matrix-react-sdk/lib/components/views/elements/AccessibleButton');
|
||||||
|
import { _t } from "matrix-react-sdk/lib/languageHandler";
|
||||||
|
import { EventTimeline } from "matrix-js-sdk";
|
||||||
|
|
||||||
|
module.exports = React.createClass({
|
||||||
|
displayName: 'PinnedEventsPanel',
|
||||||
|
propTypes: {
|
||||||
|
// The Room from the js-sdk we're going to show pinned events for
|
||||||
|
room: React.PropTypes.object.isRequired,
|
||||||
|
|
||||||
|
onCancelClick: React.PropTypes.func,
|
||||||
|
},
|
||||||
|
|
||||||
|
getInitialState: function() {
|
||||||
|
return {
|
||||||
|
loading: true,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
componentDidMount: function() {
|
||||||
|
const pinnedEvents = this.props.room.currentState.getStateEvents("m.room.pinned_events", "");
|
||||||
|
if (!pinnedEvents || !pinnedEvents.getContent().pinned) {
|
||||||
|
this.setState({ loading: false, pinned: [] });
|
||||||
|
} else {
|
||||||
|
const promises = [];
|
||||||
|
const cli = MatrixClientPeg.get();
|
||||||
|
|
||||||
|
pinnedEvents.getContent().pinned.map(eventId => {
|
||||||
|
promises.push(cli.getEventTimeline(this.props.room.getUnfilteredTimelineSet(), eventId, 0).then(timeline => {
|
||||||
|
return {eventId, timeline};
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
|
||||||
|
Promise.all(promises).then(contexts => {
|
||||||
|
this.setState({ loading: false, pinned: contexts });
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_getPinnedTiles: function() {
|
||||||
|
const MessageEvent = sdk.getComponent("views.messages.MessageEvent");
|
||||||
|
const MemberAvatar = sdk.getComponent("views.avatars.MemberAvatar");
|
||||||
|
|
||||||
|
if (this.state.pinned.length == 0) {
|
||||||
|
return <div>No pinned messages.</div>;
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.state.pinned.map(pinnedEvent => {
|
||||||
|
const event = pinnedEvent.timeline.getEvents().find(e => e.getId() === pinnedEvent.eventId);
|
||||||
|
const sender = this.props.room.getMember(event.getSender());
|
||||||
|
const avatarSize = 40;
|
||||||
|
|
||||||
|
// Don't show non-messages. Technically users can pin state/custom events, but we won't
|
||||||
|
// support those events.
|
||||||
|
if (event.getType() !== "m.room.message") return '';
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div key={"pinnedEvent_" + pinnedEvent.eventId} className="mx_PinnedEventsPanel_pinnedEvent">
|
||||||
|
<MemberAvatar member={sender} width={avatarSize} height={avatarSize} />
|
||||||
|
<span className="mx_PinnedEventsPanel_sender">
|
||||||
|
{sender.name}
|
||||||
|
</span>
|
||||||
|
<MessageEvent mxEvent={event} className="mx_PinnedEventsPanel_body" />
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
render: function() {
|
||||||
|
let tiles = <div>Loading...</div>;
|
||||||
|
if (this.state && !this.state.loading) {
|
||||||
|
tiles = this._getPinnedTiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="mx_PinnedEventsPanel">
|
||||||
|
<div className="mx_PinnedEventsPanel_body">
|
||||||
|
<AccessibleButton className="mx_PinnedEventsPanel_cancel" onClick={this.props.onCancelClick}><img src="img/cancel.svg" width="18" height="18" /></AccessibleButton>
|
||||||
|
<h3 className="mx_PinnedEventsPanel_header">{_t("Pinned Messages")}</h3>
|
||||||
|
{ tiles }
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
@ -88,4 +88,5 @@
|
|||||||
@import "./vector-web/views/rooms/_RoomDropTarget.scss";
|
@import "./vector-web/views/rooms/_RoomDropTarget.scss";
|
||||||
@import "./vector-web/views/rooms/_RoomTooltip.scss";
|
@import "./vector-web/views/rooms/_RoomTooltip.scss";
|
||||||
@import "./vector-web/views/rooms/_SearchBar.scss";
|
@import "./vector-web/views/rooms/_SearchBar.scss";
|
||||||
|
@import "./vector-web/views/rooms/_PinnedEventsPanel.scss";
|
||||||
@import "./vector-web/views/settings/_Notifications.scss";
|
@import "./vector-web/views/settings/_Notifications.scss";
|
||||||
|
@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2017 Travis Ralston
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
.mx_PinnedEventsPanel {
|
||||||
|
border-top: 1px solid $primary-hairline-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventsPanel_body {
|
||||||
|
max-height: 300px;
|
||||||
|
overflow-y: scroll;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventsPanel_header {
|
||||||
|
margin: 0;
|
||||||
|
padding-top: 8px;
|
||||||
|
padding-bottom: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventsPanel_pinnedEvent {
|
||||||
|
min-height: 40px;
|
||||||
|
margin-bottom: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
width: 100%;
|
||||||
|
border-radius: 5px; // for the hover
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventsPanel_pinnedEvent:hover {
|
||||||
|
background-color: $event-selected-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventsPanel_pinnedEvent .mx_PinnedEventsPanel_sender {
|
||||||
|
color: #868686;
|
||||||
|
font-size: 0.8em;
|
||||||
|
vertical-align: top;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventsPanel_pinnedEvent .mx_EventTile_content {
|
||||||
|
margin-left: 50px;
|
||||||
|
position: relative;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventsPanel_pinnedEvent .mx_BaseAvatar {
|
||||||
|
float: left;
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_PinnedEventsPanel_cancel {
|
||||||
|
margin: 12px;
|
||||||
|
float: right;
|
||||||
|
display: inline-block;
|
||||||
|
}
|
7
src/skins/vector/img/icons-pin.svg
Normal file
7
src/skins/vector/img/icons-pin.svg
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<svg width="16px" height="16px" viewbox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<g transform="scale(0.03125)">
|
||||||
|
<path id="svg_2" fill="none" stroke="#76cfa6" stroke-width="40" stroke-linecap="round" stroke-linejoin="round" d="m315.802,402.338c12.73,-33.537 13.503,-69.629 3.623,-102.697l93.245,-103.107l7.831,7.831c10.411,10.409 27.283,10.409 37.691,0c10.41,-10.408 10.41,-27.281 0.001,-37.69l-112.869,-112.867c-10.407,-10.409 -27.279,-10.41 -37.689,-0.001c-10.408,10.41 -10.409,27.283 0.001,37.693l7.833,7.833l-103.107,93.243c-33.069,-9.878 -69.163,-9.107 -102.697,3.626c-4.7,1.785 -8.001,5.646 -9.059,10.604c-1.175,5.473 0.627,11.402 4.697,15.472l184.42,184.421c4.069,4.07 10,5.871 15.472,4.695c4.959,-1.055 8.82,-4.357 10.607,-9.056z"/>
|
||||||
|
<polyline id="svg_3" fill="none" stroke="#76cfa6" stroke-width="40" stroke-linecap="round" stroke-linejoin="round" points=" 180.951,297.927 46,466 215.319,332.295 "/>
|
||||||
|
<!--<line id="svg_4" fill="none" stroke="#76cfa6" stroke-width="40" stroke-linecap="round" stroke-linejoin="round" y2="219.549" y1="138.166" x2="255.531" x1="336.915"/>-->
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 1.1 KiB |
Loading…
Reference in New Issue
Block a user