0

add utils to help cleanup whitespaces from contenteditable output; removed forced chat enabling

This commit is contained in:
Ginger Wong 2020-08-26 11:56:01 -07:00
parent 2cffabf0fb
commit b549b21257
3 changed files with 96 additions and 7 deletions

View File

@ -470,7 +470,7 @@ export default class App extends Component {
websocket=${websocket} websocket=${websocket}
username=${username} username=${username}
userAvatarImage=${userAvatarImage} userAvatarImage=${userAvatarImage}
chatEnabled //=${chatEnabled} chatEnabled=${chatEnabled}
/> />
</div> </div>
` `

View File

@ -4,7 +4,7 @@ const html = htm.bind(h);
import { EmojiButton } from 'https://cdn.skypack.dev/@joeattardi/emoji-button'; import { EmojiButton } from 'https://cdn.skypack.dev/@joeattardi/emoji-button';
import ContentEditable from './content-editable.js'; import ContentEditable from './content-editable.js';
import { generatePlaceholderText, getCaretPosition } from '../../utils/chat.js'; import { generatePlaceholderText, getCaretPosition, convertToText, convertOnPaste } from '../../utils/chat.js';
import { getLocalStorage, setLocalStorage } from '../../utils/helpers.js'; import { getLocalStorage, setLocalStorage } from '../../utils/helpers.js';
import { URL_CUSTOM_EMOJIS, KEY_CHAT_FIRST_MESSAGE_SENT } from '../../utils/constants.js'; import { URL_CUSTOM_EMOJIS, KEY_CHAT_FIRST_MESSAGE_SENT } from '../../utils/constants.js';
@ -199,8 +199,7 @@ export default class ChatInput extends Component {
} }
handlePaste(event) { handlePaste(event) {
event.preventDefault(); convertOnPaste(event);
document.execCommand('inserttext', false, event.clipboardData.getData('text/plain'));
} }
handleSubmitChatButton(event) { handleSubmitChatButton(event) {
@ -211,7 +210,7 @@ export default class ChatInput extends Component {
sendMessage() { sendMessage() {
const { handleSendMessage } = this.props; const { handleSendMessage } = this.props;
const { hasSentFirstChatMessage, inputHTML } = this.state; const { hasSentFirstChatMessage, inputHTML } = this.state;
const message = inputHTML.trim(); const message = convertToText(inputHTML);
const newStates = { const newStates = {
inputWarning: '', inputWarning: '',
inputHTML: '', inputHTML: '',

View File

@ -1,4 +1,3 @@
import { addNewlines } from './helpers.js';
import { import {
CHAT_INITIAL_PLACEHOLDER_TEXT, CHAT_INITIAL_PLACEHOLDER_TEXT,
CHAT_PLACEHOLDER_TEXT, CHAT_PLACEHOLDER_TEXT,
@ -20,7 +19,7 @@ export function formatMessageText(message, username) {
formattedText = linkify(formattedText, message); formattedText = linkify(formattedText, message);
formattedText = highlightUsername(formattedText, username); formattedText = highlightUsername(formattedText, username);
return addNewlines(formattedText); return convertToMarkup(formattedText);
} }
function highlightUsername(message, username) { function highlightUsername(message, username) {
@ -188,3 +187,94 @@ export function extraUserNamesFromMessageHistory(messages) {
} }
return list; return list;
} }
// utils from https://gist.github.com/nathansmith/86b5d4b23ed968a92fd4
/*
You would call this after getting an element's
`.innerHTML` value, while the user is typing.
*/
export function convertToText(str = '') {
// Ensure string.
let value = String(str);
// Convert encoding.
value = value.replace(/&nbsp;/gi, ' ');
value = value.replace(/&amp;/gi, '&');
// Replace `<br>`.
value = value.replace(/<br>/gi, '\n');
// Replace `<div>` (from Chrome).
value = value.replace(/<div>/gi, '\n');
// Replace `<p>` (from IE).
value = value.replace(/<p>/gi, '\n');
// Remove extra tags.
value = value.replace(/<(.*?)>/g, '');
// Trim each line.
value = value
.split('\n')
.map((line = '') => {
return line.trim();
})
.join('\n');
// No more than 2x newline, per "paragraph".
value = value.replace(/\n\n+/g, '\n\n');
// Clean up spaces.
value = value.replace(/[ ]+/g, ' ');
value = value.trim();
// Expose string.
return value;
}
/*
You would call this when receiving a plain text
value back from an API, and before inserting the
text into the `contenteditable` area on a page.
*/
export function convertToMarkup(str = '') {
return convertToText(str).replace(/\n/g, '<br>');
}
/*
You would call this when a user pastes from
the clipboard into a `contenteditable` area.
*/
export function convertOnPaste( event = { preventDefault() {} }) {
// Prevent paste.
event.preventDefault();
// Set later.
let value = '';
// Does method exist?
const hasEventClipboard = !!(
event.clipboardData &&
typeof event.clipboardData === 'object' &&
typeof event.clipboardData.getData === 'function'
);
// Get clipboard data?
if (hasEventClipboard) {
value = event.clipboardData.getData('text/plain');
}
// Insert into temp `<textarea>`, read back out.
const textarea = document.createElement('textarea');
textarea.innerHTML = value;
value = textarea.innerText;
// Clean up text.
value = convertToText(value);
// Insert text.
if (typeof document.execCommand === 'function') {
document.execCommand('insertText', false, value);
}
}