Skip to content

Commit a37de3e

Browse files
authored
Merge pull request wix-incubator#10 from iyegoroff/editor_css_typo
fixed typo in editor.html + added defaultProps
2 parents d0d4790 + 0710247 commit a37de3e

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/RichTextEditor.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,13 @@ export default class RichTextEditor extends Component {
2222
customCSS: PropTypes.string,
2323
hiddenTitle: PropTypes.bool,
2424
enableOnChange: PropTypes.bool,
25-
footerHeight: PropTypes.number
25+
footerHeight: PropTypes.number,
26+
contentInset: PropTypes.object
27+
};
28+
29+
static defaultProps = {
30+
contentInset: {},
31+
style: {}
2632
};
2733

2834
constructor(props) {
@@ -647,4 +653,4 @@ const styles = StyleSheet.create({
647653
marginRight: -20,
648654
marginTop: 20
649655
}
650-
});
656+
});

src/editor.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,7 @@
17471747
<!-- ZSSRichTextEditor Editable Content -->
17481748
<div id="zss_editor_title" class="zss_editor_title" contenteditable="true" placeholder="" disableLineBreaks="true"></div>
17491749
<div id="separatorContainer"><hr></div>
1750-
<div id="zss_editor_content" class="zs_editor_content" contenteditable="true" placeholder=""></div>
1750+
<div id="zss_editor_content" class="zss_editor_content" contenteditable="true" placeholder=""></div>
17511751
<div id="zss_editor_footer"></div>
17521752
</body>
1753-
</html>
1753+
</html>

0 commit comments

Comments
 (0)