OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Handle pill onclick 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-07-11 20:02:32 +02:00
parent 5423421240
commit 667abca31f
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/css/views/rooms/_BasicMessageComposer.scss
View File

@ -47,6 +47,7 @@ limitations under the License.
&.mx_BasicMessageComposer_input_shouldShowPillAvatar { &.mx_BasicMessageComposer_input_shouldShowPillAvatar {
span.mx_UserPill, span.mx_RoomPill { span.mx_UserPill, span.mx_RoomPill {
position: relative; position: relative;
cursor: pointer;
// avatar psuedo element // avatar psuedo element
&::before { &::before {

18
src/editor/parts.ts
View File

@ -25,6 +25,10 @@ import AutocompleteWrapperModel, {
UpdateQuery, UpdateQuery,
} from "./autocomplete"; } from "./autocomplete";
import * as Avatar from "../Avatar"; import * as Avatar from "../Avatar";
import defaultDispatcher from "../dispatcher/dispatcher";
import { Action } from "../dispatcher/actions";
import singletonRoomViewStore from "../stores/RoomViewStore";
import { MatrixClientPeg } from "../MatrixClientPeg";
interface ISerializedPart { interface ISerializedPart {
type: Type.Plain | Type.Newline | Type.Command | Type.PillCandidate; type: Type.Plain | Type.Newline | Type.Command | Type.PillCandidate;
@ -74,6 +78,7 @@ interface IPillCandidatePart extends Omit<IBasePart, "type" | "createAutoComplet
interface IPillPart extends Omit<IBasePart, "type" | "resourceId"> { interface IPillPart extends Omit<IBasePart, "type" | "resourceId"> {
type: Type.AtRoomPill | Type.RoomPill | Type.UserPill; type: Type.AtRoomPill | Type.RoomPill | Type.UserPill;
resourceId: string; resourceId: string;
onClick?(): void;
} }
export type Part = IBasePart | IPillCandidatePart | IPillPart; export type Part = IBasePart | IPillCandidatePart | IPillPart;
@ -250,6 +255,7 @@ abstract class PillPart extends BasePart implements IPillPart {
const container = document.createElement("span"); const container = document.createElement("span");
container.setAttribute("spellcheck", "false"); container.setAttribute("spellcheck", "false");
container.setAttribute("contentEditable", "false"); container.setAttribute("contentEditable", "false");
container.onclick = this.onClick;
container.className = this.className; container.className = this.className;
container.appendChild(document.createTextNode(this.text)); container.appendChild(document.createTextNode(this.text));
this.setAvatar(container); this.setAvatar(container);
@ -304,6 +310,8 @@ abstract class PillPart extends BasePart implements IPillPart {
abstract get className(): string; abstract get className(): string;
abstract onClick?(): void;
abstract setAvatar(node: HTMLElement): void; abstract setAvatar(node: HTMLElement): void;
} }
@ -365,6 +373,9 @@ class RoomPillPart extends PillPart {
get className() { get className() {
return "mx_RoomPill mx_Pill"; return "mx_RoomPill mx_Pill";
} }
// FIXME: We do this to shut up the linter, is there a way to do this properly
onClick = undefined;
} }
class AtRoomPillPart extends RoomPillPart { class AtRoomPillPart extends RoomPillPart {
@ -403,6 +414,13 @@ class UserPillPart extends PillPart {
this._setAvatarVars(node, avatarUrl, initialLetter); this._setAvatarVars(node, avatarUrl, initialLetter);
} }
onClick = () => {
defaultDispatcher.dispatch({
action: Action.ViewUser,
member: MatrixClientPeg.get().getRoom(singletonRoomViewStore.getRoomId()).getMember(this.resourceId),
});
};
get type(): IPillPart["type"] { get type(): IPillPart["type"] {
return Type.UserPill; return Type.UserPill;
} }