imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feat/add-formating-buttons-to-wysiwyg

Browse source
This commit is contained in:
Florian Duros 2022-10-14 09:44:32 +02:00 • committed by GitHub
commit 3ecd67aa80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 1156 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/components/atoms/Icon.tsx
View file

@ -17,13 +17,19 @@ limitations under the License.
import React from "react";
import liveIcon from "../../../res/img/element-icons/live.svg";
import pauseIcon from "../../../res/img/element-icons/pause.svg";
import playIcon from "../../../res/img/element-icons/play.svg";
export enum IconType {
Live,
Pause,
Play,
}
const iconTypeMap = new Map([
[IconType.Live, liveIcon],
[IconType.Pause, pauseIcon],
[IconType.Play, playIcon],
]);
export enum IconColour {

5
src/components/views/messages/MessageEvent.tsx
View file

@ -58,6 +58,10 @@ interface IProps extends Omit<IBodyProps, "onMessageAllowed" | "mediaEventHelper
isSeeingThroughMessageHiddenForModeration?: boolean;
}
interface State {
voiceBroadcastEnabled: boolean;
}
export interface IOperableEventTile {
getEventTileOps(): IEventTileOps;
}
@ -81,7 +85,6 @@ const baseEvTypes = new Map<string, React.ComponentType<Partial<IBodyProps>>>([
[M_POLL_START.altName, MPollBody],
[M_BEACON_INFO.name, MBeaconBody],
[M_BEACON_INFO.altName, MBeaconBody],
[VoiceBroadcastInfoEventType, VoiceBroadcastBody],
]);
export default class MessageEvent extends React.Component<IProps, State> implements IMediaBody, IOperableEventTile {