@ndla/article-converter 9.0.14-alpha.0 → 9.0.16-alpha.0

package/es/plugins/olPlugin.js

@@ -7,17 +7,16 @@
  */
 
 import { attributesToProps, domToReact } from "html-react-parser";
-import { OrderedList } from "@ndla/ui";
+import { OrderedList } from "@ndla/primitives";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const olPlugin = (node, converterOpts, opts) => {
   const props = attributesToProps(node.attribs);
-  const letterClass = node.attribs["data-type"] === "letters" ? "ol-list--roman" : false;
-  const num = node.attribs.start;
-  const numClass = num ? `ol-reset-${num}` : false;
-  const classes = [node.attribs.class ?? false, letterClass, numClass].filter(c => !!c).join(" ");
+  const variantProp = node.attribs["data-type"] === "letters" ? {
+    variant: "letters"
+  } : {};
   return _jsx(OrderedList, {
     ...props,
-    className: classes.length ? classes : undefined,
+    ...variantProp,
     lang: opts.articleLanguage,
     children: domToReact(node.children, converterOpts)
   });

package/es/plugins/ulPlugin.js

@@ -7,7 +7,7 @@
  */
 
 import { attributesToProps, domToReact } from "html-react-parser";
-import { UnOrderedList } from "@ndla/ui";
+import { UnOrderedList } from "@ndla/primitives";
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export const ulPlugin = (node, converterOpts, opts) => {
   const props = attributesToProps(node.attribs);

package/lib/plugins/olPlugin.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.olPlugin = void 0;
 var _htmlReactParser = require("html-react-parser");
-var _ui = require("@ndla/ui");
+var _primitives = require("@ndla/primitives");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
 /**
  * Copyright (c) 2023-present, NDLA.
@@ -17,13 +17,12 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
 
 const olPlugin = (node, converterOpts, opts) => {
   const props = (0, _htmlReactParser.attributesToProps)(node.attribs);
-  const letterClass = node.attribs["data-type"] === "letters" ? "ol-list--roman" : false;
-  const num = node.attribs.start;
-  const numClass = num ? `ol-reset-${num}` : false;
-  const classes = [node.attribs.class ?? false, letterClass, numClass].filter(c => !!c).join(" ");
-  return (0, _jsxRuntime.jsx)(_ui.OrderedList, {
+  const variantProp = node.attribs["data-type"] === "letters" ? {
+    variant: "letters"
+  } : {};
+  return (0, _jsxRuntime.jsx)(_primitives.OrderedList, {
     ...props,
-    className: classes.length ? classes : undefined,
+    ...variantProp,
     lang: opts.articleLanguage,
     children: (0, _htmlReactParser.domToReact)(node.children, converterOpts)
   });

package/lib/plugins/ulPlugin.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ulPlugin = void 0;
 var _htmlReactParser = require("html-react-parser");
-var _ui = require("@ndla/ui");
+var _primitives = require("@ndla/primitives");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
 /**
  * Copyright (c) 2023-present, NDLA.
@@ -17,7 +17,7 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
 
 const ulPlugin = (node, converterOpts, opts) => {
   const props = (0, _htmlReactParser.attributesToProps)(node.attribs);
-  return (0, _jsxRuntime.jsx)(_ui.UnOrderedList, {
+  return (0, _jsxRuntime.jsx)(_primitives.UnOrderedList, {
     ...props,
     className: node.attribs.class,
     lang: opts.articleLanguage,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/article-converter",
-  "version": "9.0.14-alpha.0",
+  "version": "9.0.16-alpha.0",
   "description": "Transforms NDLA articles into extended html versions",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,8 +31,8 @@
     "@ndla/types-embed": "^4.1.8"
   },
   "dependencies": {
-    "@ndla/primitives": "^0.0.18",
-    "@ndla/ui": "^55.0.14-alpha.0",
+    "@ndla/primitives": "^0.0.19",
+    "@ndla/ui": "^55.0.16-alpha.0",
     "html-react-parser": "^5.1.8"
   },
   "peerDependencies": {
@@ -47,5 +47,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6fdfbed9f18bbd725c837fb74de2f093e80d5605"
+  "gitHead": "b05b7016560891b2867811c4420041e6932003cc"
 }

package/src/plugins/olPlugin.tsx

@@ -7,17 +7,14 @@
  */
 
 import { DOMNode, attributesToProps, domToReact } from "html-react-parser";
-import { OrderedList } from "@ndla/ui";
+import { OrderedList } from "@ndla/primitives";
 import { PluginType } from "./types";
 export const olPlugin: PluginType = (node, converterOpts, opts) => {
   const props = attributesToProps(node.attribs);
-  const letterClass = node.attribs["data-type"] === "letters" ? "ol-list--roman" : false;
-  const num = node.attribs.start;
-  const numClass = num ? `ol-reset-${num}` : false;
-  const classes = [node.attribs.class ?? false, letterClass, numClass].filter((c): c is string => !!c).join(" ");
+  const variantProp = node.attribs["data-type"] === "letters" ? ({ variant: "letters" } as const) : {};
 
   return (
-    <OrderedList {...props} className={classes.length ? classes : undefined} lang={opts.articleLanguage}>
+    <OrderedList {...props} {...variantProp} lang={opts.articleLanguage}>
       {domToReact(node.children as DOMNode[], converterOpts)}
     </OrderedList>
   );

package/src/plugins/ulPlugin.tsx

@@ -7,7 +7,7 @@
  */
 
 import { DOMNode, attributesToProps, domToReact } from "html-react-parser";
-import { UnOrderedList } from "@ndla/ui";
+import { UnOrderedList } from "@ndla/primitives";
 import { PluginType } from "./types";
 export const ulPlugin: PluginType = (node, converterOpts, opts) => {
   const props = attributesToProps(node.attribs);