+ // The URL placeholder is always placed last, so just look at the
+ // last text in the array to also cover the multi-line case:
+ const urlLineText = lastChange.text[lastChange.text.length - 1];
+
+ if (urlLineText.endsWith(EASYMDE_URL_PLACEHOLDER) && urlLineText !== '[]' + EASYMDE_URL_PLACEHOLDER) {
+ const from = lastChange.from;
+ const to = lastChange.to;
+ const isSelectionMultiline = lastChange.text.length > 1;
+ const baseIndex = isSelectionMultiline ? 0 : from.ch;
+
+ // Everything works fine for the [Ctrl-K] case, but for the
+ // [Button] case, this handler happens before the original
+ // code, thus our change got wiped out.
+ // Add a small delay to handle that case.
+ setTimeout(() => {
+ instance.setSelection(
+ { line: to.line, ch: baseIndex + urlLineText.lastIndexOf('(') + 1 },
+ { line: to.line, ch: baseIndex + urlLineText.lastIndexOf(')') }
+ );
+ }, 25);
+ }
+ }
+ } catch (e) {} // Do nothing (revert to original behavior)
+ });
+ };
+
+ return (
+
+
+
+
+
+
+ {quickAction}
+
+
+ );
+ case 'textarea':
+ return (
-
-
+ {(label || quickAction) && (
+
-
- {quickAction}
-
-
;
- return ReactDOMServer.renderToString(preview);
- },
- }}
- />
- {countInfo}
-
-
-
-
-
- {quickAction}
-
- {!noEmojis && (
-
- {QUICK_EMOJIS.map((emoji) => (
-
)}
- {countInfo}
-
+ {!noEmojis && (
+
+ )}
+ {countInfo}
+
+
+ );
+ default:
+ const inputElement =
;
+ const inner = inputButton ? (
+
+ {inputElement}
+ {inputButton}
+
+ ) : (
+ inputElement
+ );
- input = (
-
+ return (
{(label || errorMessage) && (
-
- );
+ );
}
- }
+ };
return (
-
- {input}
-
+ <>
+ {type && input()}
{helper && {helper}
}
-
+
);
}
}
diff --git a/ui/component/common/icon-custom.jsx b/ui/component/common/icon-custom.jsx
index 75faeeba3..b56e37489 100644
--- a/ui/component/common/icon-custom.jsx
+++ b/ui/component/common/icon-custom.jsx
@@ -2014,4 +2014,12 @@ export const icons = {
),
+ [ICONS.EMOJI]: buildIcon(
+
+
+
+
+
+
+ ),
};
diff --git a/ui/component/common/markdown-preview.jsx b/ui/component/common/markdown-preview.jsx
index 7af303c73..fd876f747 100644
--- a/ui/component/common/markdown-preview.jsx
+++ b/ui/component/common/markdown-preview.jsx
@@ -10,13 +10,18 @@ import remarkFrontMatter from 'remark-frontmatter';
import reactRenderer from 'remark-react';
import MarkdownLink from 'component/markdownLink';
import defaultSchema from 'hast-util-sanitize/lib/github.json';
-import { formatedLinks, inlineLinks } from 'util/remark-lbry';
+import { formattedLinks, inlineLinks } from 'util/remark-lbry';
import { formattedTimestamp, inlineTimestamp } from 'util/remark-timestamp';
+import { formattedEmote, inlineEmote } from 'util/remark-emote';
import ZoomableImage from 'component/zoomableImage';
import { CHANNEL_STAKED_LEVEL_VIDEO_COMMENTS } from 'config';
import Button from 'component/button';
import * as ICONS from 'constants/icons';
import { parse } from 'node-html-parser';
+import OptimizedImage from 'component/optimizedImage';
+
+const RE_EMOTE = /:\+1:|:-1:|:[\w-]+:/;
+
type SimpleTextProps = {
children?: React.Node,
};
@@ -42,6 +47,7 @@ type MarkdownProps = {
className?: string,
parentCommentId?: string,
isMarkdownPost?: boolean,
+ disableTimestamps?: boolean,
stakedLevel?: number,
};
@@ -93,10 +99,15 @@ const SimpleLink = (props: SimpleLinkProps) => {
const SimpleImageLink = (props: ImageLinkProps) => {
const { src, title, alt, helpText } = props;
+
if (!src) {
return null;
}
+ if (title && RE_EMOTE.test(title) && src.includes('static.odycdn.com/emoticons')) {
+ return
;
+ }
+
return (