Merge pull request #6069 from matrix-org/t3chguy/fix/17386

Fix room name issues in right panel summary card
This commit is contained in:
Michael Telatynski 2021-05-20 12:08:33 +01:00 committed by GitHub
commit 35710da174
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions

View file

@ -36,6 +36,7 @@ limitations under the License.
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: pre-wrap;
} }
.mx_RoomSummaryCard_avatar { .mx_RoomSummaryCard_avatar {

View file

@ -45,6 +45,7 @@ import {ChevronFace, ContextMenuTooltipButton, useContextMenu} from "../../struc
import WidgetContextMenu from "../context_menus/WidgetContextMenu"; import WidgetContextMenu from "../context_menus/WidgetContextMenu";
import {useRoomMemberCount} from "../../../hooks/useRoomMembers"; import {useRoomMemberCount} from "../../../hooks/useRoomMembers";
import { Container, MAX_PINNED, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore"; import { Container, MAX_PINNED, WidgetLayoutStore } from "../../../stores/widgets/WidgetLayoutStore";
import RoomName from "../elements/RoomName";
interface IProps { interface IProps {
room: Room; room: Room;
@ -249,7 +250,13 @@ const RoomSummaryCard: React.FC<IProps> = ({ room, onClose }) => {
/> />
</div> </div>
<h2 title={room.name}>{ room.name }</h2> <RoomName room={room}>
{ name => (
<h2 title={name}>
{ name }
</h2>
)}
</RoomName>
<div className="mx_RoomSummaryCard_alias" title={alias}> <div className="mx_RoomSummaryCard_alias" title={alias}>
{ alias } { alias }
</div> </div>