@ndla/article-converter 10.0.38-alpha.0 → 10.0.40-alpha.0

package/es/plugins/blockquotePlugin.js

@@ -7,12 +7,20 @@
  */
 
 import { attributesToProps, domToReact } from "html-react-parser";
-import { BlockQuote } from "@ndla/primitives";
+import { ContentTypeBlockQuote } from "@ndla/ui";
 import { jsx as _jsx } from "react/jsx-runtime";
-export const blockquotePlugin = (node, opts) => {
-  const props = attributesToProps(node.attribs);
-  return /*#__PURE__*/_jsx(BlockQuote, {
+export const blockquotePlugin = (node, opts, _ref) => {
+  let {
+    contentType
+  } = _ref;
+  const {
+    "data-variant": variant,
+    ...props
+  } = attributesToProps(node.attribs);
+  return /*#__PURE__*/_jsx(ContentTypeBlockQuote, {
     ...props,
+    variant: variant,
+    contentType: contentType,
     children: domToReact(node.children, opts)
   });
 };

package/es/plugins/divPlugin.js

@@ -7,12 +7,21 @@
  */
 
 import { domToReact, attributesToProps } from "html-react-parser";
-import { FramedContent } from "@ndla/primitives";
-import { FileListEmbed, RelatedArticleList, Grid, GridParallaxItem } from "@ndla/ui";
+import { FileListEmbed, RelatedArticleList, Grid, GridParallaxItem, ContentTypeFramedContent } from "@ndla/ui";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-export const divPlugin = (node, opts) => {
+export const divPlugin = (node, opts, _ref) => {
+  let {
+    contentType
+  } = _ref;
   if (node.attribs["data-type"] === "framed-content" || node.attribs.class === "c-bodybox") {
-    return /*#__PURE__*/_jsx(FramedContent, {
+    const {
+      "data-variant": variant,
+      ...props
+    } = attributesToProps(node.attribs);
+    return /*#__PURE__*/_jsx(ContentTypeFramedContent, {
+      contentType: contentType,
+      variant: variant,
+      ...props,
       children: domToReact(node.children, opts)
     });
   }

package/lib/plugins/blockquotePlugin.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.blockquotePlugin = void 0;
 var _htmlReactParser = require("html-react-parser");
-var _primitives = require("@ndla/primitives");
+var _ui = require("@ndla/ui");
 var _jsxRuntime = require("react/jsx-runtime");
 /**
  * Copyright (c) 2024-present, NDLA.
@@ -15,10 +15,18 @@ var _jsxRuntime = require("react/jsx-runtime");
  *
  */
 
-const blockquotePlugin = (node, opts) => {
-  const props = (0, _htmlReactParser.attributesToProps)(node.attribs);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_primitives.BlockQuote, {
+const blockquotePlugin = (node, opts, _ref) => {
+  let {
+    contentType
+  } = _ref;
+  const {
+    "data-variant": variant,
+    ...props
+  } = (0, _htmlReactParser.attributesToProps)(node.attribs);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ui.ContentTypeBlockQuote, {
     ...props,
+    variant: variant,
+    contentType: contentType,
     children: (0, _htmlReactParser.domToReact)(node.children, opts)
   });
 };

package/lib/plugins/divPlugin.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.divPlugin = void 0;
 var _htmlReactParser = require("html-react-parser");
-var _primitives = require("@ndla/primitives");
 var _ui = require("@ndla/ui");
 var _jsxRuntime = require("react/jsx-runtime");
 /**
@@ -16,9 +15,19 @@ var _jsxRuntime = require("react/jsx-runtime");
  *
  */
 
-const divPlugin = (node, opts) => {
+const divPlugin = (node, opts, _ref) => {
+  let {
+    contentType
+  } = _ref;
   if (node.attribs["data-type"] === "framed-content" || node.attribs.class === "c-bodybox") {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_primitives.FramedContent, {
+    const {
+      "data-variant": variant,
+      ...props
+    } = (0, _htmlReactParser.attributesToProps)(node.attribs);
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ui.ContentTypeFramedContent, {
+      contentType: contentType,
+      variant: variant,
+      ...props,
       children: (0, _htmlReactParser.domToReact)(node.children, opts)
     });
   }

package/lib/plugins/types.d.ts

@@ -7,7 +7,7 @@
  */
 /// <reference types="react" />
 import { Element, HTMLReactParserOptions } from "html-react-parser";
-import { RenderContext, CanonicalUrlFuncs } from "@ndla/ui";
+import { RenderContext, CanonicalUrlFuncs, ContentType } from "@ndla/ui";
 export interface TransformOptions {
     isOembed?: boolean;
     subject?: string;
@@ -17,5 +17,6 @@ export interface TransformOptions {
     articleLanguage?: string;
     canonicalUrls?: CanonicalUrlFuncs;
     renderContext?: RenderContext;
+    contentType?: ContentType;
 }
 export type PluginType = (element: Element, options: HTMLReactParserOptions, metaData: TransformOptions) => JSX.Element | undefined | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/article-converter",
-  "version": "10.0.38-alpha.0",
+  "version": "10.0.40-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": "^5.0.3-alpha.0"
   },
   "dependencies": {
-    "@ndla/primitives": "^1.0.33-alpha.0",
-    "@ndla/ui": "^56.0.36-alpha.0",
+    "@ndla/primitives": "^1.0.34-alpha.0",
+    "@ndla/ui": "^56.0.37-alpha.0",
     "html-react-parser": "^5.1.8"
   },
   "peerDependencies": {
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "183d252ef9c40520099fadd2ee6a48e46eb1c71e"
+  "gitHead": "fc25549110f961f71c8f06bad8a217f0272ffb9b"
 }

package/src/plugins/blockquotePlugin.tsx

@@ -7,10 +7,18 @@
  */
 
 import { DOMNode, attributesToProps, domToReact } from "html-react-parser";
-import { BlockQuote } from "@ndla/primitives";
+import { ContentTypeBlockQuote, ContentTypeBlockQuoteVariant } from "@ndla/ui";
 import { PluginType } from "./types";
 
-export const blockquotePlugin: PluginType = (node, opts) => {
-  const props = attributesToProps(node.attribs);
-  return <BlockQuote {...props}>{domToReact(node.children as DOMNode[], opts)}</BlockQuote>;
+export const blockquotePlugin: PluginType = (node, opts, { contentType }) => {
+  const { "data-variant": variant, ...props } = attributesToProps(node.attribs);
+  return (
+    <ContentTypeBlockQuote
+      {...props}
+      variant={variant as ContentTypeBlockQuoteVariant | undefined}
+      contentType={contentType}
+    >
+      {domToReact(node.children as DOMNode[], opts)}
+    </ContentTypeBlockQuote>
+  );
 };

package/src/plugins/divPlugin.tsx

@@ -7,13 +7,29 @@
  */
 
 import { domToReact, attributesToProps, Element, DOMNode } from "html-react-parser";
-import { FramedContent } from "@ndla/primitives";
-import { FileListEmbed, RelatedArticleList, Grid, GridType, GridParallaxItem } from "@ndla/ui";
+import {
+  FileListEmbed,
+  RelatedArticleList,
+  Grid,
+  GridType,
+  GridParallaxItem,
+  ContentTypeFramedContent,
+  ContentTypeFramedContentVariant,
+} from "@ndla/ui";
 import { PluginType } from "./types";
 
-export const divPlugin: PluginType = (node, opts) => {
+export const divPlugin: PluginType = (node, opts, { contentType }) => {
   if (node.attribs["data-type"] === "framed-content" || node.attribs.class === "c-bodybox") {
-    return <FramedContent>{domToReact(node.children as DOMNode[], opts)}</FramedContent>;
+    const { "data-variant": variant, ...props } = attributesToProps(node.attribs);
+    return (
+      <ContentTypeFramedContent
+        contentType={contentType}
+        variant={variant as ContentTypeFramedContentVariant | undefined}
+        {...props}
+      >
+        {domToReact(node.children as DOMNode[], opts)}
+      </ContentTypeFramedContent>
+    );
   }
   if (node.attribs["data-type"] === "related-content" && node.children.length) {
     const props = attributesToProps(node.attribs);

package/src/plugins/types.ts

@@ -7,7 +7,7 @@
  */
 
 import { Element, HTMLReactParserOptions } from "html-react-parser";
-import { RenderContext, CanonicalUrlFuncs } from "@ndla/ui";
+import { RenderContext, CanonicalUrlFuncs, ContentType } from "@ndla/ui";
 
 export interface TransformOptions {
   isOembed?: boolean;
@@ -18,6 +18,7 @@ export interface TransformOptions {
   articleLanguage?: string;
   canonicalUrls?: CanonicalUrlFuncs;
   renderContext?: RenderContext;
+  contentType?: ContentType;
 }
 
 export type PluginType = (