Avoid errors when the language is not defined

inlinestyle · Jun 26, 2017 · 819b5c3 · 819b5c3
1 parent 9fdfed0
commit 819b5c3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -28,13 +28,14 @@ exports.default = function (languageDefinitions) {
 
     var language = className.split('-')[1] || '';
     var value = children[0] || '';
-    var props = { language: language, value: value, inline: true };
+    var props = { value: value, inline: true };
 
-    return language ? _react2.default.createElement(_reactLowlight2.default, props) : _react2.default.createElement(
-      'code',
-      null,
-      value
-    );
+    if (Object.keys(languageDefinitions).indexOf(language) > -1) {
+      // Include the language only if it was previously registered
+      props.language = language;
+    }
+
+    return _react2.default.createElement(_reactLowlight2.default, props);
   };
   Code.propTypes = {
     className: _react2.default.PropTypes.string,

diff --git a/src/index.jsx b/src/index.jsx
@@ -11,9 +11,14 @@ export default (languageDefinitions) => {
   const Code = ({ className = '', children }) => {
     const language = className.split('-')[1] || '';
     const value = children[0] || '';
-    const props = { language, value, inline: true };
+    const props = { value, inline: true };
 
-    return language ? <Lowlight {...props} /> : <code>{ value }</code>;
+    if (Object.keys(languageDefinitions).indexOf(language) > -1) {
+      // Include the language only if it was previously registered
+      props.language = language;
+    }
+
+    return <Lowlight {...props} /> ;
   };
   Code.propTypes = {
     className: React.PropTypes.string,