Skip to content

Regression: Announcement bar not showing properly Markdown content #20290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 3 commits into from
Jan 21, 2021
Merged

Regression: Announcement bar not showing properly Markdown content #20290

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56a5ddd
fix announcement instance
Jan 21, 2021
ffd7dc2
style and ux fixes
Jan 21, 2021
9766319
Update Announcement.js
ggazzo Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/ui/client/views/app/room.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { callbacks } from '../../../../callbacks';
import { hasAllPermission, hasRole } from '../../../../authorization';
import { ChatMessages } from '../../lib/chatMessages';
import { fileUpload } from '../../lib/fileUpload';
import { Markdown } from '../../../../markdown/client';
import './room.html';
import { getCommonRoomEvents } from './lib/getCommonRoomEvents';

Expand Down Expand Up @@ -258,8 +257,7 @@ Template.roomOld.helpers({
},

announcement() {
const announcement = Template.instance().state.get('announcement');
return announcement ? Markdown.parse(announcement).replace(/^<p>|<\/p>$/, '') : undefined;
return Template.instance().state.get('announcement');
},

announcementDetails() {
Expand Down
12 changes: 10 additions & 2 deletions client/views/room/Announcement/Announcement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@ import { useSetModal } from '../../../contexts/ModalContext';
import MarkdownText from '../../../components/MarkdownText';

export const Announcement = ({ children, onClickOpen }) => {
const clickable = css`
const announcementBar = css`
background-color: ${ colors.b200 };
color: ${ colors.b600 };
cursor: pointer;
transition: transform 0.2s ease-out;
a{
color: ${ colors.b600 } !important;
text-decoration: underline !important;
}
> * {
flex: auto;
}
Expand All @@ -23,13 +27,17 @@ export const Announcement = ({ children, onClickOpen }) => {
color: ${ colors.b800 };
}`;

return <Box onClick={onClickOpen} height='x40' alignItems='center' display='flex' fontScale='p2' textAlign='center' className={clickable}><Box withTruncatedText w='none'>{children}</Box></Box>;
return <Box onClick={onClickOpen} pi='x24' alignItems='center' display='flex' fontScale='p2' textAlign='center' className={announcementBar}><Box withTruncatedText w='none'>{children}</Box></Box>;
};

export default ({ announcement, announcementDetails }) => {
const setModal = useSetModal();
const closeModal = useMutableCallback(() => setModal());
const handleClick = () => {
if (window.getSelection().toString() !== '') {
return;
}

announcementDetails ? announcementDetails() : setModal(<AnnouncementModal onClose={closeModal}>{announcement}</AnnouncementModal>);
};

Expand Down