Twemojify text
Signed-off-by: Ajay Bura <ajbura@gmail.com>
This commit is contained in:
parent
b6485f91ae
commit
b9378118dd
3 changed files with 7 additions and 3 deletions
|
@ -67,7 +67,7 @@ function MenuHeader({ children }) {
|
||||||
}
|
}
|
||||||
|
|
||||||
MenuHeader.propTypes = {
|
MenuHeader.propTypes = {
|
||||||
children: PropTypes.string.isRequired,
|
children: PropTypes.node.isRequired,
|
||||||
};
|
};
|
||||||
|
|
||||||
function MenuItem({
|
function MenuItem({
|
||||||
|
|
|
@ -2,6 +2,8 @@ import React from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import './SidebarAvatar.scss';
|
import './SidebarAvatar.scss';
|
||||||
|
|
||||||
|
import { twemojify } from '../../../util/twemojify';
|
||||||
|
|
||||||
import Avatar from '../../atoms/avatar/Avatar';
|
import Avatar from '../../atoms/avatar/Avatar';
|
||||||
import Text from '../../atoms/text/Text';
|
import Text from '../../atoms/text/Text';
|
||||||
import Tooltip from '../../atoms/tooltip/Tooltip';
|
import Tooltip from '../../atoms/tooltip/Tooltip';
|
||||||
|
@ -16,7 +18,7 @@ const SidebarAvatar = React.forwardRef(({
|
||||||
if (active) activeClass = ' sidebar-avatar--active';
|
if (active) activeClass = ' sidebar-avatar--active';
|
||||||
return (
|
return (
|
||||||
<Tooltip
|
<Tooltip
|
||||||
content={<Text variant="b1">{tooltip}</Text>}
|
content={<Text variant="b1">{twemojify(tooltip)}</Text>}
|
||||||
placement="right"
|
placement="right"
|
||||||
>
|
>
|
||||||
<button
|
<button
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
import React, { useState, useEffect, useRef } from 'react';
|
import React, { useState, useEffect, useRef } from 'react';
|
||||||
import './RoomOptions.scss';
|
import './RoomOptions.scss';
|
||||||
|
|
||||||
|
import { twemojify } from '../../../util/twemojify';
|
||||||
|
|
||||||
import initMatrix from '../../../client/initMatrix';
|
import initMatrix from '../../../client/initMatrix';
|
||||||
import cons from '../../../client/state/cons';
|
import cons from '../../../client/state/cons';
|
||||||
import navigation from '../../../client/state/navigation';
|
import navigation from '../../../client/state/navigation';
|
||||||
|
@ -166,7 +168,7 @@ function RoomOptions() {
|
||||||
maxWidth={298}
|
maxWidth={298}
|
||||||
content={(toggleMenu) => (
|
content={(toggleMenu) => (
|
||||||
<>
|
<>
|
||||||
<MenuHeader>{`Options for ${initMatrix.matrixClient.getRoom(roomId)?.name}`}</MenuHeader>
|
<MenuHeader>{twemojify(`Options for ${initMatrix.matrixClient.getRoom(roomId)?.name}`)}</MenuHeader>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
iconSrc={AddUserIC}
|
iconSrc={AddUserIC}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
|
Loading…
Reference in a new issue