Skip to content

Add support for overriding block element using blockStyleFn #113

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

Open
filipengberg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for overriding block element using blockStyleFn #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc2b78a
Add support for overriding block element using blockStyleFn
Oct 31, 2017
dfd8f25
Fix travis errors
Oct 31, 2017
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
33 changes: 33 additions & 0 deletions packages/draft-js-export-html/src/__tests__/stateToHTML-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,39 @@ describe('stateToHTML', () => {
);
});

it('blockStyleFn should support setting custom element', () => {
let options = {
blockStyleFn: () => ({
element: 'li',
}),
};

let contentState1 = convertFromRaw(
// <h1>Hello <em>world</em>.</h1>
{
entityMap: {},
blocks: [
{
key: 'dn025',
text: 'Hello world.',
type: 'unstyled',
depth: 0,
inlineStyleRanges: [{offset: 6, length: 5, style: 'ITALIC'}],
entityRanges: [],
},
],
}, // eslint-disable-line
);

expect(stateToHTML(contentState1)).toBe(
'<p>Hello <em>world</em>.</p>',
);

expect(stateToHTML(contentState1, options)).toBe(
'<li>Hello <em>world</em>.</li>',
);
});

it('should support custom entity styles', () => {
let options = {
entityStyleFn: (entity) => {
Expand Down
13 changes: 12 additions & 1 deletion packages/draft-js-export-html/src/stateToHTML.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ class MarkupGenerator {

let attrString;
if (this.options.blockStyleFn) {
let {attributes, style} = this.options.blockStyleFn(block) || {};
let {attributes, style, element} = this.options.blockStyleFn(block) || {};
// Normalize `className` -> `class`, etc.
attributes = normalizeAttributes(attributes);
if (style != null) {
Expand All @@ -295,6 +295,9 @@ class MarkupGenerator {
? {style: styleAttr}
: {...attributes, style: styleAttr};
}
if (element != null) {
tags = [element];
}
attrString = stringifyAttrs(attributes);
} else {
attrString = '';
Expand All @@ -307,6 +310,14 @@ class MarkupGenerator {

writeEndTag(block, defaultBlockTag) {
let tags = getTags(block.getType(), defaultBlockTag);

if (this.options.blockStyleFn) {
let {element} = this.options.blockStyleFn(block) || {};
if (element != null) {
tags = [element];
}
}

if (tags.length === 1) {
this.output.push(`</${tags[0]}>\n`);
} else {
Expand Down