@ndla/article-converter 2.0.2 → 2.0.4

package/es/plugins/ulPlugin.js

@@ -16,16 +16,13 @@ import { UnOrderedList } from '@ndla/ui';
 import { attributesToProps, domToReact } from 'html-react-parser';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export var ulPlugin = function ulPlugin(node, opts) {
-  if (node.attribs['data-type'] === 'two-column') {
-    var _node$attribs$class;
-    var props = attributesToProps(node.attribs);
-    var classes = [(_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', 'o-list--two-columns'].filter(function (c) {
-      return !!c;
-    }).join(' ');
-    return _jsx(UnOrderedList, _objectSpread(_objectSpread({}, props), {}, {
-      className: classes,
-      children: domToReact(node.children, opts)
-    }));
-  }
-  return null;
+  var _node$attribs$class;
+  var props = attributesToProps(node.attribs);
+  var classes = [(_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', node.attribs['data-type'] === 'two-column' ? 'o-list--two-columns' : ''].filter(function (c) {
+    return !!c;
+  }).join(' ');
+  return _jsx(UnOrderedList, _objectSpread(_objectSpread({}, props), {}, {
+    className: classes,
+    children: domToReact(node.children, opts)
+  }));
 };

package/lib/plugins/ulPlugin.js

@@ -20,17 +20,14 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
                                                                                                                                                                                                                                                                                                                                                                                                *
                                                                                                                                                                                                                                                                                                                                                                                                */
 var ulPlugin = function ulPlugin(node, opts) {
-  if (node.attribs['data-type'] === 'two-column') {
-    var _node$attribs$class;
-    var props = (0, _htmlReactParser.attributesToProps)(node.attribs);
-    var classes = [(_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', 'o-list--two-columns'].filter(function (c) {
-      return !!c;
-    }).join(' ');
-    return (0, _jsxRuntime.jsx)(_ui.UnOrderedList, _objectSpread(_objectSpread({}, props), {}, {
-      className: classes,
-      children: (0, _htmlReactParser.domToReact)(node.children, opts)
-    }));
-  }
-  return null;
+  var _node$attribs$class;
+  var props = (0, _htmlReactParser.attributesToProps)(node.attribs);
+  var classes = [(_node$attribs$class = node.attribs["class"]) !== null && _node$attribs$class !== void 0 ? _node$attribs$class : '', node.attribs['data-type'] === 'two-column' ? 'o-list--two-columns' : ''].filter(function (c) {
+    return !!c;
+  }).join(' ');
+  return (0, _jsxRuntime.jsx)(_ui.UnOrderedList, _objectSpread(_objectSpread({}, props), {}, {
+    className: classes,
+    children: (0, _htmlReactParser.domToReact)(node.children, opts)
+  }));
 };
 exports.ulPlugin = ulPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/article-converter",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Transforms NDLA articles into extended html versions",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@ndla/code": "^2.2.1",
-    "@ndla/ui": "^37.0.2",
+    "@ndla/ui": "^37.0.4",
     "html-react-parser": "^3.0.8",
     "lodash": "^4.17.20"
   },
@@ -44,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7ebc236f35b3cd624f5fec74672ef8213d58adae"
+  "gitHead": "db2b4d8eda31595ec90f1e2fc26972382214cad9"
 }

package/src/plugins/ulPlugin.tsx

@@ -10,15 +10,13 @@ import { UnOrderedList } from '@ndla/ui';
 import { attributesToProps, domToReact } from 'html-react-parser';
 import { PluginType } from './types';
 export const ulPlugin: PluginType = (node, opts) => {
-  if (node.attribs['data-type'] === 'two-column') {
-    const props = attributesToProps(node.attribs);
-    const classes = [node.attribs.class ?? '', 'o-list--two-columns'].filter((c) => !!c).join(' ');
-    return (
-      <UnOrderedList {...props} className={classes}>
-        {domToReact(node.children, opts)}
-      </UnOrderedList>
-    );
-  }
-
-  return null;
+  const props = attributesToProps(node.attribs);
+  const classes = [node.attribs.class ?? '', node.attribs['data-type'] === 'two-column' ? 'o-list--two-columns' : '']
+    .filter((c) => !!c)
+    .join(' ');
+  return (
+    <UnOrderedList {...props} className={classes}>
+      {domToReact(node.children, opts)}
+    </UnOrderedList>
+  );
 };