@ndla/article-converter 4.0.18 → 4.0.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/es/plugins/embed/blogPostEmbedPlugin.js +5 -4
  2. package/es/plugins/embed/campaignBlockPlugin.js +1 -1
  3. package/lib/plugins/embed/blogPostEmbedPlugin.js +5 -4
  4. package/lib/plugins/embed/campaignBlockPlugin.js +1 -1
  5. package/package.json +5 -5
  6. package/src/plugins/embed/blogPostEmbedPlugin.tsx +2 -2
  7. package/src/plugins/embed/campaignBlockPlugin.tsx +1 -1
package/es/plugins/embed/blogPostEmbedPlugin.js CHANGED
@@ -11,7 +11,7 @@ import { BlogPostV2 } from '@ndla/ui';
11
11
  import { jsx as _jsx } from "@emotion/react/jsx-runtime";
12
12
  export var errorSvgSrc = "data:image/svg+xml;charset=UTF-8,%3Csvg fill='%238A8888' height='400' viewBox='0 0 24 12' width='100%25' xmlns='http://www.w3.org/2000/svg' style='background-color: %23EFF0F2'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath transform='scale(0.3) translate(28, 8.5)' d='M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z'/%3E%3C/svg%3E";
13
13
  export var blogPostEmbedPlugin = function blogPostEmbedPlugin(element, _, opts) {
14
- var _data$data$metaImage$, _data$data$metaImage;
14
+ var _data$data$metaImage$, _data$data$metaImage, _data$data$metaImage$2, _data$data$metaImage2;
15
15
  var props = attributesToProps(element.attribs);
16
16
  var data = JSON.parse(props['data-json']);
17
17
  var _data$embedData = data.embedData,
@@ -19,7 +19,8 @@ export var blogPostEmbedPlugin = function blogPostEmbedPlugin(element, _, opts)
19
19
  author = _data$embedData.author,
20
20
  url = _data$embedData.url,
21
21
  size = _data$embedData.size,
22
- language = _data$embedData.language;
22
+ language = _data$embedData.language,
23
+ alt = _data$embedData.alt;
23
24
  return _jsx(BlogPostV2, {
24
25
  title: {
25
26
  title: title,
@@ -30,8 +31,8 @@ export var blogPostEmbedPlugin = function blogPostEmbedPlugin(element, _, opts)
30
31
  size: size,
31
32
  path: opts.path,
32
33
  metaImage: {
33
- alt: '',
34
- url: data.status === 'success' ? (_data$data$metaImage$ = (_data$data$metaImage = data.data.metaImage) === null || _data$data$metaImage === void 0 ? void 0 : _data$data$metaImage.image.imageUrl) !== null && _data$data$metaImage$ !== void 0 ? _data$data$metaImage$ : errorSvgSrc : errorSvgSrc
34
+ alt: alt ? alt : data.status === 'success' ? (_data$data$metaImage$ = (_data$data$metaImage = data.data.metaImage) === null || _data$data$metaImage === void 0 ? void 0 : _data$data$metaImage.alttext.alttext) !== null && _data$data$metaImage$ !== void 0 ? _data$data$metaImage$ : '' : '',
35
+ url: data.status === 'success' ? (_data$data$metaImage$2 = (_data$data$metaImage2 = data.data.metaImage) === null || _data$data$metaImage2 === void 0 ? void 0 : _data$data$metaImage2.image.imageUrl) !== null && _data$data$metaImage$2 !== void 0 ? _data$data$metaImage$2 : errorSvgSrc : errorSvgSrc
35
36
  }
36
37
  });
37
38
  };
package/es/plugins/embed/campaignBlockPlugin.js CHANGED
@@ -30,7 +30,7 @@ export var campaignBlockPlugin = function campaignBlockPlugin(element, _, opts)
30
30
  imageSide: embed.imageSide,
31
31
  image: data.status === 'success' && data.data.image ? {
32
32
  src: data.data.image.image.imageUrl,
33
- alt: data.data.image.alttext.alttext
33
+ alt: embed.alt ? embed.alt : data.data.image.alttext.alttext
34
34
  } : undefined
35
35
  });
36
36
  };
package/lib/plugins/embed/blogPostEmbedPlugin.js CHANGED
@@ -18,7 +18,7 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
18
18
  var errorSvgSrc = "data:image/svg+xml;charset=UTF-8,%3Csvg fill='%238A8888' height='400' viewBox='0 0 24 12' width='100%25' xmlns='http://www.w3.org/2000/svg' style='background-color: %23EFF0F2'%3E%3Cpath d='M0 0h24v24H0V0z' fill='none'/%3E%3Cpath transform='scale(0.3) translate(28, 8.5)' d='M11 15h2v2h-2zm0-8h2v6h-2zm.99-5C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z'/%3E%3C/svg%3E";
19
19
  exports.errorSvgSrc = errorSvgSrc;
20
20
  var blogPostEmbedPlugin = function blogPostEmbedPlugin(element, _, opts) {
21
- var _data$data$metaImage$, _data$data$metaImage;
21
+ var _data$data$metaImage$, _data$data$metaImage, _data$data$metaImage$2, _data$data$metaImage2;
22
22
  var props = (0, _htmlReactParser.attributesToProps)(element.attribs);
23
23
  var data = JSON.parse(props['data-json']);
24
24
  var _data$embedData = data.embedData,
@@ -26,7 +26,8 @@ var blogPostEmbedPlugin = function blogPostEmbedPlugin(element, _, opts) {
26
26
  author = _data$embedData.author,
27
27
  url = _data$embedData.url,
28
28
  size = _data$embedData.size,
29
- language = _data$embedData.language;
29
+ language = _data$embedData.language,
30
+ alt = _data$embedData.alt;
30
31
  return (0, _jsxRuntime.jsx)(_ui.BlogPostV2, {
31
32
  title: {
32
33
  title: title,
@@ -37,8 +38,8 @@ var blogPostEmbedPlugin = function blogPostEmbedPlugin(element, _, opts) {
37
38
  size: size,
38
39
  path: opts.path,
39
40
  metaImage: {
40
- alt: '',
41
- url: data.status === 'success' ? (_data$data$metaImage$ = (_data$data$metaImage = data.data.metaImage) === null || _data$data$metaImage === void 0 ? void 0 : _data$data$metaImage.image.imageUrl) !== null && _data$data$metaImage$ !== void 0 ? _data$data$metaImage$ : errorSvgSrc : errorSvgSrc
41
+ alt: alt ? alt : data.status === 'success' ? (_data$data$metaImage$ = (_data$data$metaImage = data.data.metaImage) === null || _data$data$metaImage === void 0 ? void 0 : _data$data$metaImage.alttext.alttext) !== null && _data$data$metaImage$ !== void 0 ? _data$data$metaImage$ : '' : '',
42
+ url: data.status === 'success' ? (_data$data$metaImage$2 = (_data$data$metaImage2 = data.data.metaImage) === null || _data$data$metaImage2 === void 0 ? void 0 : _data$data$metaImage2.image.imageUrl) !== null && _data$data$metaImage$2 !== void 0 ? _data$data$metaImage$2 : errorSvgSrc : errorSvgSrc
42
43
  }
43
44
  });
44
45
  };
package/lib/plugins/embed/campaignBlockPlugin.js CHANGED
@@ -36,7 +36,7 @@ var campaignBlockPlugin = function campaignBlockPlugin(element, _, opts) {
36
36
  imageSide: embed.imageSide,
37
37
  image: data.status === 'success' && data.data.image ? {
38
38
  src: data.data.image.image.imageUrl,
39
- alt: data.data.image.alttext.alttext
39
+ alt: embed.alt ? embed.alt : data.data.image.alttext.alttext
40
40
  } : undefined
41
41
  });
42
42
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ndla/article-converter",
3
- "version": "4.0.18",
3
+ "version": "4.0.20",
4
4
  "description": "Transforms NDLA articles into extended html versions",
5
5
  "license": "GPL-3.0",
6
6
  "main": "lib/index.js",
@@ -27,11 +27,11 @@
27
27
  "src"
28
28
  ],
29
29
  "devDependencies": {
30
- "@ndla/types-embed": "^4.0.2"
30
+ "@ndla/types-embed": "^4.0.3"
31
31
  },
32
32
  "dependencies": {
33
- "@ndla/code": "^4.0.4",
34
- "@ndla/ui": "^45.0.17",
33
+ "@ndla/code": "^4.0.6",
34
+ "@ndla/ui": "^46.0.1",
35
35
  "html-react-parser": "^3.0.8",
36
36
  "lodash": "^4.17.20"
37
37
  },
@@ -44,5 +44,5 @@
44
44
  "publishConfig": {
45
45
  "access": "public"
46
46
  },
47
- "gitHead": "edb7568d78a1f7a0795669c8a96dbb8ca299fe4c"
47
+ "gitHead": "20b3005ca76e8857ef750373d836ecbd00fecc18"
48
48
  }
package/src/plugins/embed/blogPostEmbedPlugin.tsx CHANGED
@@ -16,7 +16,7 @@ export const errorSvgSrc = `data:image/svg+xml;charset=UTF-8,%3Csvg fill='%238A8
16
16
  export const blogPostEmbedPlugin: PluginType = (element, _, opts) => {
17
17
  const props = attributesToProps(element.attribs);
18
18
  const data = JSON.parse(props['data-json']) as BlogPostMetaData;
19
- const { title, author, url, size, language } = data.embedData;
19
+ const { title, author, url, size, language, alt } = data.embedData;
20
20
  return (
21
21
  <BlogPostV2
22
22
  title={{ title, language }}
@@ -25,7 +25,7 @@ export const blogPostEmbedPlugin: PluginType = (element, _, opts) => {
25
25
  size={size}
26
26
  path={opts.path}
27
27
  metaImage={{
28
- alt: '',
28
+ alt: alt ? alt : data.status === 'success' ? data.data.metaImage?.alttext.alttext ?? '' : '',
29
29
  url: data.status === 'success' ? data.data.metaImage?.image.imageUrl ?? errorSvgSrc : errorSvgSrc,
30
30
  }}
31
31
  />
package/src/plugins/embed/campaignBlockPlugin.tsx CHANGED
@@ -24,7 +24,7 @@ export const campaignBlockPlugin: PluginType = (element, _, opts) => {
24
24
  imageSide={embed.imageSide}
25
25
  image={
26
26
  data.status === 'success' && data.data.image
27
- ? { src: data.data.image.image.imageUrl, alt: data.data.image.alttext.alttext }
27
+ ? { src: data.data.image.image.imageUrl, alt: embed.alt ? embed.alt : data.data.image.alttext.alttext }
28
28
  : undefined
29
29
  }
30
30
  />