@ndla/article-converter 3.0.5 → 4.0.1

package/es/plugins/embed/campaignBlockPlugin.js

@@ -27,13 +27,10 @@ export var campaignBlockPlugin = function campaignBlockPlugin(element, _, opts)
       text: embed.urlText
     },
     path: opts.path,
-    imageAfter: data.status === 'success' && data.data.imageAfter ? {
-      src: data.data.imageAfter.image.imageUrl,
-      alt: data.data.imageAfter.alttext.alttext
-    } : undefined,
-    imageBefore: data.status === 'success' && data.data.imageBefore ? {
-      src: data.data.imageBefore.image.imageUrl,
-      alt: data.data.imageBefore.alttext.alttext
+    imageSide: embed.imageSide,
+    image: data.status === 'success' && data.data.image ? {
+      src: data.data.image.image.imageUrl,
+      alt: data.data.image.alttext.alttext
     } : undefined
   });
 };

package/es/plugins/mathPlugin.js

@@ -1,3 +1,12 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _excluded = ["data-math"];
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 /**
  * Copyright (c) 2023-present, NDLA.
  *
@@ -9,10 +18,13 @@
 import { attributesToProps } from 'html-react-parser';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 export var mathPlugin = function mathPlugin(node) {
-  var props = attributesToProps(node.attribs);
-  return _jsx("span", {
+  var _attributesToProps = attributesToProps(node.attribs),
+    mathContent = _attributesToProps['data-math'],
+    props = _objectWithoutProperties(_attributesToProps, _excluded);
+  // @ts-ignore
+  return _jsx("math", _objectSpread(_objectSpread({}, props), {}, {
     dangerouslySetInnerHTML: {
-      __html: "<math display=\"block\">".concat(props['data-math'], "</math>")
+      __html: mathContent
     }
-  });
+  }));
 };

package/lib/plugins/embed/campaignBlockPlugin.js

@@ -33,13 +33,10 @@ var campaignBlockPlugin = function campaignBlockPlugin(element, _, opts) {
       text: embed.urlText
     },
     path: opts.path,
-    imageAfter: data.status === 'success' && data.data.imageAfter ? {
-      src: data.data.imageAfter.image.imageUrl,
-      alt: data.data.imageAfter.alttext.alttext
-    } : undefined,
-    imageBefore: data.status === 'success' && data.data.imageBefore ? {
-      src: data.data.imageBefore.image.imageUrl,
-      alt: data.data.imageBefore.alttext.alttext
+    imageSide: embed.imageSide,
+    image: data.status === 'success' && data.data.image ? {
+      src: data.data.image.image.imageUrl,
+      alt: data.data.image.alttext.alttext
     } : undefined
   });
 };

package/lib/plugins/mathPlugin.js

@@ -1,11 +1,13 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.mathPlugin = void 0;
 var _htmlReactParser = require("html-react-parser");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
+var _excluded = ["data-math"];
 /**
  * Copyright (c) 2023-present, NDLA.
  *
@@ -13,13 +15,22 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  * LICENSE file in the root directory of this source tree.
  *
  */
-
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var mathPlugin = function mathPlugin(node) {
-  var props = (0, _htmlReactParser.attributesToProps)(node.attribs);
-  return (0, _jsxRuntime.jsx)("span", {
+  var _attributesToProps = (0, _htmlReactParser.attributesToProps)(node.attribs),
+    mathContent = _attributesToProps['data-math'],
+    props = _objectWithoutProperties(_attributesToProps, _excluded);
+  // @ts-ignore
+  return (0, _jsxRuntime.jsx)("math", _objectSpread(_objectSpread({}, props), {}, {
     dangerouslySetInnerHTML: {
-      __html: "<math display=\"block\">".concat(props['data-math'], "</math>")
+      __html: mathContent
     }
-  });
+  }));
 };
 exports.mathPlugin = mathPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/article-converter",
-  "version": "3.0.5",
+  "version": "4.0.1",
   "description": "Transforms NDLA articles into extended html versions",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -27,11 +27,11 @@
     "src"
   ],
   "devDependencies": {
-    "@ndla/types-embed": "^3.0.0"
+    "@ndla/types-embed": "^4.0.0"
   },
   "dependencies": {
-    "@ndla/code": "^2.2.27",
-    "@ndla/ui": "^44.0.24",
+    "@ndla/code": "^3.0.1",
+    "@ndla/ui": "^45.0.0",
     "html-react-parser": "^3.0.8",
     "lodash": "^4.17.20"
   },
@@ -44,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "be3d061e056efdba7047017a37ca87fa8fe57bef"
+  "gitHead": "fc43953be9f27384442135e913f55ca6b2ef9629"
 }

package/src/plugins/embed/campaignBlockPlugin.tsx

@@ -21,14 +21,10 @@ export const campaignBlockPlugin: PluginType = (element, _, opts) => {
       description={{ text: embed.description, language: embed.descriptionLanguage }}
       url={{ url: embed.url, text: embed.urlText }}
       path={opts.path}
-      imageAfter={
-        data.status === 'success' && data.data.imageAfter
-          ? { src: data.data.imageAfter.image.imageUrl, alt: data.data.imageAfter.alttext.alttext }
-          : undefined
-      }
-      imageBefore={
-        data.status === 'success' && data.data.imageBefore
-          ? { src: data.data.imageBefore.image.imageUrl, alt: data.data.imageBefore.alttext.alttext }
+      imageSide={embed.imageSide}
+      image={
+        data.status === 'success' && data.data.image
+          ? { src: data.data.image.image.imageUrl, alt: data.data.image.alttext.alttext }
           : undefined
       }
     />

package/src/plugins/mathPlugin.tsx

@@ -9,6 +9,7 @@
 import { attributesToProps } from 'html-react-parser';
 import { PluginType } from './types';
 export const mathPlugin: PluginType = (node) => {
-  const props = attributesToProps(node.attribs);
-  return <span dangerouslySetInnerHTML={{ __html: `<math display="block">${props['data-math']}</math>` }} />;
+  const { 'data-math': mathContent, ...props } = attributesToProps(node.attribs);
+  // @ts-ignore
+  return <math {...props} dangerouslySetInnerHTML={{ __html: mathContent }} />;
 };