Skip to content

[EuiMarkdownFormat] Removed emoticon support and extra rendered <div> #5176

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
merged 7 commits into from
Sep 14, 2021
Merged

[EuiMarkdownFormat] Removed emoticon support and extra rendered <div> #5176

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1d1a12
[EuiMarkdownFormat] Remove `emoticon` support specifically
Sep 13, 2021
a3eb57a
[EuiMarkdownFormat] Fixed extra bottom margins by removing extra rend…
Sep 13, 2021
f4f80d3
cl
Sep 13, 2021
edc5bc0
Revert "cl"
Sep 13, 2021
24b30b3
Actually just CL 🤦‍♀️
Sep 13, 2021
3fbfcc9
Update src-docs/src/views/markdown_editor/markdown_format.js
cchaos Sep 13, 2021
628226f
Merge branch 'elastic:master' into fixes/markdown_margin_emoji
cchaos Sep 14, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## [`master`](https://github.com/elastic/eui/tree/master)

- Added optional line numbers to `EuiCodeBlock` ([#4993](https://github.com/elastic/eui/pull/4993))
- Removed `emoticon` support and removed rendered `<div>` from `EuiMarkdownFormat` ([#5176](https://github.com/elastic/eui/pull/5176))

## [`37.7.0`](https://github.com/elastic/eui/tree/v37.7.0)

Expand Down
2 changes: 1 addition & 1 deletion src-docs/src/views/markdown_editor/markdown_format.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { EuiMarkdownFormat } from '../../../../src';

const markdownContent = `Beyond Remark's base syntax, **EuiMarkdownFormat** bundles these abilities by default:

\`:smile:\` we support emojis :smile:!
\`:smile:\` we support emojis :smile:! But not :)

\`!{tooltip[anchor text](Tooltip content)}\` syntax can render !{tooltip[tooltips like this](I am Jack's helpful tooltip content)}

Expand Down
2 changes: 1 addition & 1 deletion src/components/markdown_editor/plugins/markdown_default_plugins/parsing_plugins.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { markdownLinkValidator } from '../markdown_link_validator';
export const getDefaultEuiMarkdownParsingPlugins = (): PluggableList => [
[markdown, {}],
[highlight, {}],
[emoji, { emoticon: true }],
[emoji, { emoticon: false }],
[MarkdownTooltip.parser, {}],
[MarkdownCheckbox.parser, {}],
[markdownLinkValidator, {}],
Expand Down
5 changes: 3 additions & 2 deletions src/components/markdown_editor/plugins/markdown_default_plugins/processing_plugins.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Side Public License, v 1.
*/

import React, { createElement } from 'react';
import React, { Fragment, createElement } from 'react';
// Importing seemingly unused types from `unified` because the definitions
// are exported for two versions of TypeScript (3.4, 4.0) and implicit
// imports during eui.d.ts generation default to the incorrect version (3.4).
Expand Down Expand Up @@ -60,7 +60,8 @@ export const getDefaultEuiMarkdownProcessingPlugins = (): [
[
rehype2react,
{
createElement: createElement,
createElement,
Fragment,
components: {
a: EuiLink,
code: (props: any) =>
Expand Down