Release 1.11.2 (#675)

RocketChat · Jan 12, 2022 · 43b0404 · 43b0404
1 parent 5677a8a
commit 43b0404
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.11.2 - 2022-01-10
+[FIX] IME not working properly #674
+
 ## 1.11.1 - 2021-12-30
 [FIX] Hide Livechat if Omnichannel is disabled #671
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.11.1",
+	"version": "1.11.2",
 	"files": [
 		"/build"
 	],
@@ -91,7 +91,6 @@
 		"css-vars-ponyfill": "^2.3.2",
 		"date-fns": "^2.15.0",
 		"desvg": "^1.0.2",
-		"dompurify": "^2.2.6",
 		"emoji-mart": "^3.0.0",
 		"history": "^5.0.0",
 		"i18nline": "^2.0.1",

diff --git a/src/components/Composer/index.js b/src/components/Composer/index.js
@@ -1,31 +1,8 @@
-import { sanitize } from 'dompurify';
-import mem from 'mem';
 import { h, Component } from 'preact';
 
-import { createClassName } from '../helpers';
+import { createClassName, parse } from '../helpers';
 import styles from './styles.scss';
 
-
-const escapeMap = {
-	'&': '&amp;',
-	'<': '&lt;',
-	'>': '&gt;',
-	'"': '&quot;',
-	'\'': '&#x27;',
-	'`': '&#x60;',
-};
-
-const escapeRegex = new RegExp(`(?:${ Object.keys(escapeMap).join('|') })`, 'g');
-
-const escapeHtml = mem(
-	(string) => string.replace(escapeRegex, (match) => escapeMap[match]),
-);
-
-const parse = (plainText) =>
-	[{ plain: plainText }]
-		.map(({ plain, html }) => (plain ? escapeHtml(plain) : html || ''))
-		.join('');
-
 const findLastTextNode = (node) => {
 	if (node.nodeType === Node.TEXT_NODE) {
 		return node;
@@ -67,7 +44,7 @@ export class Composer extends Component {
 		if (this.state.inputLock) {
 			return;
 		}
-		onChange && onChange(sanitize(this.el.innerText));
+		onChange && onChange(this.el.innerText);
 	}
 
 	handleKeypress = (onSubmit) => (event) => {
@@ -98,6 +75,7 @@ export class Composer extends Component {
 			items.filter((item) => item.kind === 'string' && /^text\/plain/.test(item.type))
 				.map((item) => new Promise((resolve) => item.getAsString(resolve))),
 		);
+
 		texts.forEach((text) => this.pasteText(parse(text)));
 	}
 
@@ -241,16 +219,12 @@ export class Composer extends Component {
 	}
 
 	render = ({ pre, post, value, placeholder, onChange, onSubmit, onUpload, className, style }) => (
-
 		<div className={createClassName(styles, 'composer', { }, [className])} style={style}>
 			{pre}
 			<div
 				ref={this.handleRef}
 				{...(
 					{
-						dangerouslySetInnerHTML: {
-							__html: parse(value),
-						},
 						contentEditable: true,
 						'data-placeholder': placeholder,
 						onInput: this.handleInput(onChange),
@@ -272,10 +246,10 @@ export class Composer extends Component {
 
 
 				className={createClassName(styles, 'composer__input')}
-			/>
+			>{value}</div>
 			{post}
 		</div>
-	)
+	);
 }
 
 export { ComposerAction } from './ComposerAction';

diff --git a/src/components/Messages/MessageText/markdown.js b/src/components/Messages/MessageText/markdown.js
@@ -1,4 +1,3 @@
-import { sanitize } from 'dompurify';
 import MarkdownIt from 'markdown-it';
 
 
@@ -81,4 +80,4 @@ md.use((md) => {
 	});
 });
 
-export const renderMarkdown = (...args) => sanitize(md.render(...args), { ADD_ATTR: ['target', 'rel'] });
+export const renderMarkdown = (...args) => md.render(...args);
diff --git a/src/components/helpers.js b/src/components/helpers.js
@@ -1,4 +1,5 @@
 import parseISO from 'date-fns/parseISO';
+import mem from 'mem';
 import { Component } from 'preact';
 
 import { Livechat, useSsl } from '../api';
@@ -262,3 +263,23 @@ export const resolveDate = (dateInput) => {
 		}
 	}
 };
+
+const escapeMap = {
+	'&': '&amp;',
+	'<': '&lt;',
+	'>': '&gt;',
+	'"': '&quot;',
+	'\'': '&#x27;',
+	'`': '&#x60;',
+};
+
+const escapeRegex = new RegExp(`(?:${ Object.keys(escapeMap).join('|') })`, 'g');
+
+const escapeHtml = mem(
+	(string) => string.replace(escapeRegex, (match) => escapeMap[match]),
+);
+
+export const parse = (plainText) =>
+	[{ plain: plainText }]
+		.map(({ plain, html }) => (plain ? escapeHtml(plain) : html || ''))
+		.join('');
diff --git a/src/routes/Chat/container.js b/src/routes/Chat/container.js
@@ -3,7 +3,7 @@ import { route } from 'preact-router';
 
 import { Livechat } from '../../api';
 import { ModalManager } from '../../components/Modal';
-import { debounce, getAvatarUrl, canRenderMessage, throttle, upsert } from '../../components/helpers';
+import { debounce, getAvatarUrl, canRenderMessage, throttle, upsert, parse } from '../../components/helpers';
 import I18n from '../../i18n';
 import { normalizeQueueAlert } from '../../lib/api';
 import constants from '../../lib/constants';
@@ -116,6 +116,7 @@ export class ChatContainer extends Component {
 		if (msg.trim() === '') {
 			return;
 		}
+		msg = parse(msg);
 
 		await this.grantUser();
 		const { _id: rid } = await this.getRoom();

diff --git a/yarn.lock b/yarn.lock
@@ -5689,11 +5689,6 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-dompurify@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.6.tgz#54945dc5c0b45ce5ae228705777e8e59d7b2edc4"
-  integrity sha512-7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ==
-
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"