@ndla/article-converter 10.0.159-alpha.0 → 10.0.160-alpha.0

package/es/plugins/embed/contactBlockEmbedPlugin.mjs

@@ -10,17 +10,11 @@ import { jsx } from "react/jsx-runtime";
 * LICENSE file in the root directory of this source tree.
 *
 */
-function isBackground(background) {
-	return contactBlockBackgrounds.includes(background ?? "");
-}
-const parseBackground = (background) => {
-	if (isBackground(background)) return background;
-};
 const contactBlockEmbedPlugin = (element, _, opts) => {
 	const props = attributesToProps(element.attribs);
 	const embedData = JSON.parse(props["data-json"]);
 	const { name, email, description, background, jobTitle, alt } = embedData.embedData;
-	const parsedBackground = parseBackground(background);
+	const validBackground = contactBlockBackgrounds.find((bg) => bg === background);
 	return /* @__PURE__ */ jsx(ContactBlock, {
 		image: embedData.status === "success" ? embedData.data.image : void 0,
 		embedAlt: alt,
@@ -29,7 +23,7 @@ const contactBlockEmbedPlugin = (element, _, opts) => {
 		jobTitle,
 		name,
 		lang: opts.articleLanguage,
-		backgroundColor: parsedBackground
+		backgroundColor: validBackground
 	});
 };
 

package/es/plugins/embed/contactBlockEmbedPlugin.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"contactBlockEmbedPlugin.mjs","names":["contactBlockEmbedPlugin: PluginType"],"sources":["../../../src/plugins/embed/contactBlockEmbedPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps } from \"html-react-parser\";\nimport { type ContactBlockMetaData } from \"@ndla/types-embed\";\nimport { ContactBlock, contactBlockBackgrounds, type ContactBlockBackground } from \"@ndla/ui\";\nimport { type PluginType } from \"../types\";\n\nexport function isBackground(background?: string): background is ContactBlockBackground {\n  return (contactBlockBackgrounds as readonly string[]).includes(background ?? \"\");\n}\nconst parseBackground = (background: string | undefined): ContactBlockBackground | undefined => {\n  if (isBackground(background)) return background;\n};\n\nexport const contactBlockEmbedPlugin: PluginType = (element, _, opts) => {\n  const props = attributesToProps(element.attribs);\n  const embedData = JSON.parse(props[\"data-json\"] as string) as ContactBlockMetaData;\n  const { name, email, description, background, jobTitle, alt } = embedData.embedData;\n  const parsedBackground = parseBackground(background);\n\n  return (\n    <ContactBlock\n      image={embedData.status === \"success\" ? embedData.data.image : undefined}\n      embedAlt={alt}\n      description={description}\n      email={email}\n      jobTitle={jobTitle}\n      name={name}\n      lang={opts.articleLanguage}\n      backgroundColor={parsedBackground}\n    />\n  );\n};\n"],"mappings":";;;;;;;;;;;;AAaA,SAAgB,aAAa,YAA2D;AACtF,QAAQ,wBAA8C,SAAS,cAAc,GAAG;;AAElF,MAAM,mBAAmB,eAAuE;AAC9F,KAAI,aAAa,WAAW,CAAE,QAAO;;AAGvC,MAAaA,2BAAuC,SAAS,GAAG,SAAS;CACvE,MAAM,QAAQ,kBAAkB,QAAQ,QAAQ;CAChD,MAAM,YAAY,KAAK,MAAM,MAAM,aAAuB;CAC1D,MAAM,EAAE,MAAM,OAAO,aAAa,YAAY,UAAU,QAAQ,UAAU;CAC1E,MAAM,mBAAmB,gBAAgB,WAAW;AAEpD,QACE,oBAAC;EACC,OAAO,UAAU,WAAW,YAAY,UAAU,KAAK,QAAQ;EAC/D,UAAU;EACG;EACN;EACG;EACJ;EACN,MAAM,KAAK;EACX,iBAAiB;GACjB"}
+{"version":3,"file":"contactBlockEmbedPlugin.mjs","names":["contactBlockEmbedPlugin: PluginType"],"sources":["../../../src/plugins/embed/contactBlockEmbedPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps } from \"html-react-parser\";\nimport { type ContactBlockMetaData } from \"@ndla/types-embed\";\nimport { ContactBlock, contactBlockBackgrounds } from \"@ndla/ui\";\nimport { type PluginType } from \"../types\";\n\nexport const contactBlockEmbedPlugin: PluginType = (element, _, opts) => {\n  const props = attributesToProps(element.attribs);\n  const embedData = JSON.parse(props[\"data-json\"] as string) as ContactBlockMetaData;\n  const { name, email, description, background, jobTitle, alt } = embedData.embedData;\n  const validBackground = contactBlockBackgrounds.find((bg) => bg === background);\n\n  return (\n    <ContactBlock\n      image={embedData.status === \"success\" ? embedData.data.image : undefined}\n      embedAlt={alt}\n      description={description}\n      email={email}\n      jobTitle={jobTitle}\n      name={name}\n      lang={opts.articleLanguage}\n      backgroundColor={validBackground}\n    />\n  );\n};\n"],"mappings":";;;;;;;;;;;;AAaA,MAAaA,2BAAuC,SAAS,GAAG,SAAS;CACvE,MAAM,QAAQ,kBAAkB,QAAQ,QAAQ;CAChD,MAAM,YAAY,KAAK,MAAM,MAAM,aAAuB;CAC1D,MAAM,EAAE,MAAM,OAAO,aAAa,YAAY,UAAU,QAAQ,UAAU;CAC1E,MAAM,kBAAkB,wBAAwB,MAAM,OAAO,OAAO,WAAW;AAE/E,QACE,oBAAC;EACC,OAAO,UAAU,WAAW,YAAY,UAAU,KAAK,QAAQ;EAC/D,UAAU;EACG;EACN;EACG;EACJ;EACN,MAAM,KAAK;EACX,iBAAiB;GACjB"}

package/lib/plugins/embed/contactBlockEmbedPlugin.d.ts

@@ -5,7 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-import { type ContactBlockBackground } from "@ndla/ui";
 import { type PluginType } from "../types";
-export declare function isBackground(background?: string): background is ContactBlockBackground;
 export declare const contactBlockEmbedPlugin: PluginType;

package/lib/plugins/embed/contactBlockEmbedPlugin.js

@@ -11,17 +11,11 @@ let react_jsx_runtime = require("react/jsx-runtime");
 * LICENSE file in the root directory of this source tree.
 *
 */
-function isBackground(background) {
-	return __ndla_ui.contactBlockBackgrounds.includes(background ?? "");
-}
-const parseBackground = (background) => {
-	if (isBackground(background)) return background;
-};
 const contactBlockEmbedPlugin = (element, _, opts) => {
 	const props = (0, html_react_parser.attributesToProps)(element.attribs);
 	const embedData = JSON.parse(props["data-json"]);
 	const { name, email, description, background, jobTitle, alt } = embedData.embedData;
-	const parsedBackground = parseBackground(background);
+	const validBackground = __ndla_ui.contactBlockBackgrounds.find((bg) => bg === background);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__ndla_ui.ContactBlock, {
 		image: embedData.status === "success" ? embedData.data.image : void 0,
 		embedAlt: alt,
@@ -30,7 +24,7 @@ const contactBlockEmbedPlugin = (element, _, opts) => {
 		jobTitle,
 		name,
 		lang: opts.articleLanguage,
-		backgroundColor: parsedBackground
+		backgroundColor: validBackground
 	});
 };
 

package/lib/plugins/embed/contactBlockEmbedPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"contactBlockEmbedPlugin.js","names":["contactBlockBackgrounds","contactBlockEmbedPlugin: PluginType","ContactBlock"],"sources":["../../../src/plugins/embed/contactBlockEmbedPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps } from \"html-react-parser\";\nimport { type ContactBlockMetaData } from \"@ndla/types-embed\";\nimport { ContactBlock, contactBlockBackgrounds, type ContactBlockBackground } from \"@ndla/ui\";\nimport { type PluginType } from \"../types\";\n\nexport function isBackground(background?: string): background is ContactBlockBackground {\n  return (contactBlockBackgrounds as readonly string[]).includes(background ?? \"\");\n}\nconst parseBackground = (background: string | undefined): ContactBlockBackground | undefined => {\n  if (isBackground(background)) return background;\n};\n\nexport const contactBlockEmbedPlugin: PluginType = (element, _, opts) => {\n  const props = attributesToProps(element.attribs);\n  const embedData = JSON.parse(props[\"data-json\"] as string) as ContactBlockMetaData;\n  const { name, email, description, background, jobTitle, alt } = embedData.embedData;\n  const parsedBackground = parseBackground(background);\n\n  return (\n    <ContactBlock\n      image={embedData.status === \"success\" ? embedData.data.image : undefined}\n      embedAlt={alt}\n      description={description}\n      email={email}\n      jobTitle={jobTitle}\n      name={name}\n      lang={opts.articleLanguage}\n      backgroundColor={parsedBackground}\n    />\n  );\n};\n"],"mappings":";;;;;;;;;;;;;AAaA,SAAgB,aAAa,YAA2D;AACtF,QAAQA,kCAA8C,SAAS,cAAc,GAAG;;AAElF,MAAM,mBAAmB,eAAuE;AAC9F,KAAI,aAAa,WAAW,CAAE,QAAO;;AAGvC,MAAaC,2BAAuC,SAAS,GAAG,SAAS;CACvE,MAAM,iDAA0B,QAAQ,QAAQ;CAChD,MAAM,YAAY,KAAK,MAAM,MAAM,aAAuB;CAC1D,MAAM,EAAE,MAAM,OAAO,aAAa,YAAY,UAAU,QAAQ,UAAU;CAC1E,MAAM,mBAAmB,gBAAgB,WAAW;AAEpD,QACE,2CAACC;EACC,OAAO,UAAU,WAAW,YAAY,UAAU,KAAK,QAAQ;EAC/D,UAAU;EACG;EACN;EACG;EACJ;EACN,MAAM,KAAK;EACX,iBAAiB;GACjB"}
+{"version":3,"file":"contactBlockEmbedPlugin.js","names":["contactBlockEmbedPlugin: PluginType","contactBlockBackgrounds","ContactBlock"],"sources":["../../../src/plugins/embed/contactBlockEmbedPlugin.tsx"],"sourcesContent":["/**\n * Copyright (c) 2023-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { attributesToProps } from \"html-react-parser\";\nimport { type ContactBlockMetaData } from \"@ndla/types-embed\";\nimport { ContactBlock, contactBlockBackgrounds } from \"@ndla/ui\";\nimport { type PluginType } from \"../types\";\n\nexport const contactBlockEmbedPlugin: PluginType = (element, _, opts) => {\n  const props = attributesToProps(element.attribs);\n  const embedData = JSON.parse(props[\"data-json\"] as string) as ContactBlockMetaData;\n  const { name, email, description, background, jobTitle, alt } = embedData.embedData;\n  const validBackground = contactBlockBackgrounds.find((bg) => bg === background);\n\n  return (\n    <ContactBlock\n      image={embedData.status === \"success\" ? embedData.data.image : undefined}\n      embedAlt={alt}\n      description={description}\n      email={email}\n      jobTitle={jobTitle}\n      name={name}\n      lang={opts.articleLanguage}\n      backgroundColor={validBackground}\n    />\n  );\n};\n"],"mappings":";;;;;;;;;;;;;AAaA,MAAaA,2BAAuC,SAAS,GAAG,SAAS;CACvE,MAAM,iDAA0B,QAAQ,QAAQ;CAChD,MAAM,YAAY,KAAK,MAAM,MAAM,aAAuB;CAC1D,MAAM,EAAE,MAAM,OAAO,aAAa,YAAY,UAAU,QAAQ,UAAU;CAC1E,MAAM,kBAAkBC,kCAAwB,MAAM,OAAO,OAAO,WAAW;AAE/E,QACE,2CAACC;EACC,OAAO,UAAU,WAAW,YAAY,UAAU,KAAK,QAAQ;EAC/D,UAAU;EACG;EACN;EACG;EACJ;EACN,MAAM,KAAK;EACX,iBAAiB;GACjB"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ndla/article-converter",
   "type": "module",
-  "version": "10.0.159-alpha.0",
+  "version": "10.0.160-alpha.0",
   "description": "Transforms NDLA articles into extended html versions",
   "license": "GPL-3.0",
   "exports": {
@@ -37,7 +37,7 @@
   "dependencies": {
     "@ndla/primitives": "^1.0.109-alpha.0",
     "@ndla/safelink": "^7.0.112-alpha.0",
-    "@ndla/ui": "^56.0.155-alpha.0",
+    "@ndla/ui": "^56.0.156-alpha.0",
     "html-react-parser": "^5.2.8"
   },
   "peerDependencies": {
@@ -50,5 +50,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a4a2fbf2afb8cdcb083a3e3a93bbbae3eee718d6"
+  "gitHead": "5a949912b848631d194d74fec102e8fe5657f194"
 }

package/src/plugins/embed/contactBlockEmbedPlugin.tsx

@@ -8,21 +8,14 @@
 
 import { attributesToProps } from "html-react-parser";
 import { type ContactBlockMetaData } from "@ndla/types-embed";
-import { ContactBlock, contactBlockBackgrounds, type ContactBlockBackground } from "@ndla/ui";
+import { ContactBlock, contactBlockBackgrounds } from "@ndla/ui";
 import { type PluginType } from "../types";
 
-export function isBackground(background?: string): background is ContactBlockBackground {
-  return (contactBlockBackgrounds as readonly string[]).includes(background ?? "");
-}
-const parseBackground = (background: string | undefined): ContactBlockBackground | undefined => {
-  if (isBackground(background)) return background;
-};
-
 export const contactBlockEmbedPlugin: PluginType = (element, _, opts) => {
   const props = attributesToProps(element.attribs);
   const embedData = JSON.parse(props["data-json"] as string) as ContactBlockMetaData;
   const { name, email, description, background, jobTitle, alt } = embedData.embedData;
-  const parsedBackground = parseBackground(background);
+  const validBackground = contactBlockBackgrounds.find((bg) => bg === background);
 
   return (
     <ContactBlock
@@ -33,7 +26,7 @@ export const contactBlockEmbedPlugin: PluginType = (element, _, opts) => {
       jobTitle={jobTitle}
       name={name}
       lang={opts.articleLanguage}
-      backgroundColor={parsedBackground}
+      backgroundColor={validBackground}
     />
   );
 };