@ndla/ui 55.0.12-alpha.0 → 55.0.13-alpha.0

package/lib/ContentLoader/index.js

@@ -29,9 +29,9 @@ const ContentLoader = _ref => {
   } = _ref;
   const idClip = (0, _util.uuid)();
   const idGradient = (0, _util.uuid)();
-  const viewBox = viewBoxProp === undefined ? "0 0 ".concat(width, " ").concat(height) : viewBoxProp;
+  const viewBox = viewBoxProp === undefined ? `0 0 ${width} ${height}` : viewBoxProp;
   return (0, _jsxRuntime.jsxs)("svg", {
-    viewBox: viewBox !== null && viewBox !== void 0 ? viewBox : undefined,
+    viewBox: viewBox ?? undefined,
     version: "1.1",
     preserveAspectRatio: preserveAspectRatio,
     className: className,
@@ -40,9 +40,9 @@ const ContentLoader = _ref => {
     width: typeof width === "string" ? width : undefined,
     children: [(0, _jsxRuntime.jsx)("rect", {
       style: {
-        fill: "url(#".concat(idGradient, ")")
+        fill: `url(#${idGradient})`
       },
-      clipPath: "url(#".concat(idClip, ")"),
+      clipPath: `url(#${idClip})`,
       x: "0",
       y: "0",
       width: width,
@@ -59,7 +59,7 @@ const ContentLoader = _ref => {
           children: (0, _jsxRuntime.jsx)("animate", {
             attributeName: "offset",
             values: "-2; 1",
-            dur: "".concat(speed, "s"),
+            dur: `${speed}s`,
             repeatCount: "indefinite"
           })
         }), (0, _jsxRuntime.jsx)("stop", {
@@ -68,7 +68,7 @@ const ContentLoader = _ref => {
           children: (0, _jsxRuntime.jsx)("animate", {
             attributeName: "offset",
             values: "-1.5; 1.5",
-            dur: "".concat(speed, "s"),
+            dur: `${speed}s`,
             repeatCount: "indefinite"
           })
         }), (0, _jsxRuntime.jsx)("stop", {
@@ -77,7 +77,7 @@ const ContentLoader = _ref => {
           children: (0, _jsxRuntime.jsx)("animate", {
             attributeName: "offset",
             values: "-1; 2",
-            dur: "".concat(speed, "s"),
+            dur: `${speed}s`,
             repeatCount: "indefinite"
           })
         })]

package/lib/CopyParagraphButton/CopyParagraphButton.js

@@ -57,9 +57,9 @@ const CopyParagraphButton = _ref => {
     const {
       location
     } = window;
-    const newHash = "#".concat(sanitizedTitle);
-    const port = location.port ? ":".concat(location.port) : "";
-    const urlToCopy = "".concat(location.protocol, "//").concat(location.hostname).concat(port).concat(location.pathname).concat(location.search).concat(newHash);
+    const newHash = `#${sanitizedTitle}`;
+    const port = location.port ? `:${location.port}` : "";
+    const urlToCopy = `${location.protocol}//${location.hostname}${port}${location.pathname}${location.search}${newHash}`;
     (0, _util.copyTextToClipboard)(urlToCopy);
   }, [sanitizedTitle]);
   const tooltip = hasCopied ? t("article.copyPageLinkCopied") : t("article.copyHeaderLink");
@@ -68,7 +68,7 @@ const CopyParagraphButton = _ref => {
       tooltip: tooltip,
       children: (0, _jsxRuntime.jsx)(IconButton, {
         onClick: onCopyClick,
-        "aria-label": "".concat(tooltip, ": ").concat(copyText),
+        "aria-label": `${tooltip}: ${copyText}`,
         children: (0, _jsxRuntime.jsx)(_common.Link, {})
       })
     }), (0, _jsxRuntime.jsx)("h2", {

package/lib/Embed/AudioEmbed.js

@@ -18,13 +18,9 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
  *
  */
 
-const getFirstNonEmptyLicenseCredits = authors => {
-  var _Object$values$find;
-  return (_Object$values$find = Object.values(authors).find(i => i.length > 0)) !== null && _Object$values$find !== void 0 ? _Object$values$find : [];
-};
+const getFirstNonEmptyLicenseCredits = authors => Object.values(authors).find(i => i.length > 0) ?? [];
 exports.getFirstNonEmptyLicenseCredits = getFirstNonEmptyLicenseCredits;
 const AudioEmbed = _ref => {
-  var _data$podcastMeta, _data$podcastMeta$int, _data$podcastMeta2, _data$manuscript;
   let {
     embed,
     lang
@@ -47,9 +43,9 @@ const AudioEmbed = _ref => {
   }
   const subtitle = data.series ? {
     title: data.series.title.title,
-    url: "/podkast/".concat(data.series.id)
+    url: `/podkast/${data.series.id}`
   } : undefined;
-  const coverPhoto = (_data$podcastMeta = data.podcastMeta) === null || _data$podcastMeta === void 0 ? void 0 : _data$podcastMeta.coverPhoto;
+  const coverPhoto = data.podcastMeta?.coverPhoto;
   const img = coverPhoto && {
     url: coverPhoto.url,
     alt: coverPhoto.altText
@@ -58,10 +54,10 @@ const AudioEmbed = _ref => {
     type: "full",
     lang: lang,
     children: [(0, _jsxRuntime.jsx)(_AudioPlayer.default, {
-      description: (_data$podcastMeta$int = (_data$podcastMeta2 = data.podcastMeta) === null || _data$podcastMeta2 === void 0 ? void 0 : _data$podcastMeta2.introduction) !== null && _data$podcastMeta$int !== void 0 ? _data$podcastMeta$int : "",
+      description: data.podcastMeta?.introduction ?? "",
       img: img,
       src: data.audioFile.url,
-      textVersion: (_data$manuscript = data.manuscript) !== null && _data$manuscript !== void 0 && _data$manuscript.manuscript.length ? (0, _jsxRuntime.jsx)("span", {
+      textVersion: data.manuscript?.manuscript.length ? (0, _jsxRuntime.jsx)("span", {
         dangerouslySetInnerHTML: {
           __html: data.manuscript.manuscript
         }

package/lib/Embed/BrightcoveEmbed.js

@@ -43,13 +43,12 @@ const makeIframeString = function (url, width, height) {
   const strippedWidth = typeof width === "number" ? width : width.replace(/\s*px/, "");
   const strippedHeight = typeof height === "number" ? height : height.replace(/\s*px/, "");
   const urlOrTitle = title || url;
-  return "<iframe title=\"".concat(urlOrTitle, "\" aria-label=\"").concat(urlOrTitle, "\" src=\"").concat(url, "\" width=\"").concat(strippedWidth, "\" height=\"").concat(strippedHeight, "\" allowfullscreen scrolling=\"no\" frameborder=\"0\" loading=\"lazy\"></iframe>");
+  return `<iframe title="${urlOrTitle}" aria-label="${urlOrTitle}" src="${url}" width="${strippedWidth}" height="${strippedHeight}" allowfullscreen scrolling="no" frameborder="0" loading="lazy"></iframe>`;
 };
 exports.makeIframeString = makeIframeString;
 const isNumeric = value => !Number.isNaN(value - Number.parseFloat(value));
 exports.isNumeric = isNumeric;
 const getIframeProps = (data, sources) => {
-  var _source$height, _source$width;
   const {
     account,
     videoid,
@@ -57,13 +56,12 @@ const getIframeProps = (data, sources) => {
   } = data;
   const source = sources.filter(s => s.width && s.height).toSorted((a, b) => a.height - b.height)[0];
   return {
-    src: "https://players.brightcove.net/".concat(account, "/").concat(player, "_default/index.html?videoId=").concat(videoid),
-    height: (_source$height = source === null || source === void 0 ? void 0 : source.height) !== null && _source$height !== void 0 ? _source$height : "480",
-    width: (_source$width = source === null || source === void 0 ? void 0 : source.width) !== null && _source$width !== void 0 ? _source$width : "640"
+    src: `https://players.brightcove.net/${account}/${player}_default/index.html?videoId=${videoid}`,
+    height: source?.height ?? "480",
+    width: source?.width ?? "640"
   };
 };
 const BrightcoveEmbed = _ref => {
-  var _data$link, _data$link2, _ref2, _embedData$alt3, _ref3, _embedData$alt4;
   let {
     embed,
     isConcept,
@@ -77,7 +75,7 @@ const BrightcoveEmbed = _ref => {
   const {
     embedData
   } = embed;
-  const fallbackTitle = "".concat(t("embed.type.video"), ": ").concat(embedData.videoid);
+  const fallbackTitle = `${t("embed.type.video")}: ${embedData.videoid}`;
   const parsedDescription = (0, _react.useMemo)(() => {
     if (embed.embedData.caption || renderContext === "article") {
       return embed.embedData.caption ? (0, _htmlReactParser.default)(embed.embedData.caption) : undefined;
@@ -89,19 +87,18 @@ const BrightcoveEmbed = _ref => {
     const iframe = iframeRef.current;
     if (iframe) {
       const [width, height] = [parseInt(iframe.width), parseInt(iframe.height)];
-      iframe.style.aspectRatio = "".concat(width, "/").concat(height);
+      iframe.style.aspectRatio = `${width}/${height}`;
       iframe.width = "";
       iframe.height = "";
     }
   }, []);
   if (embed.status === "error") {
-    var _embedData$alt, _embedData$alt2;
     return (0, _jsxRuntime.jsx)(_EmbedErrorPlaceholder.default, {
       type: "video",
       children: (0, _jsxRuntime.jsx)(BrightcoveIframe, {
         ref: iframeRef,
-        title: (_embedData$alt = embedData.alt) !== null && _embedData$alt !== void 0 ? _embedData$alt : fallbackTitle,
-        "aria-label": (_embedData$alt2 = embedData.alt) !== null && _embedData$alt2 !== void 0 ? _embedData$alt2 : fallbackTitle,
+        title: embedData.alt ?? fallbackTitle,
+        "aria-label": embedData.alt ?? fallbackTitle,
         frameBorder: "0",
         ...getIframeProps(embedData, []),
         allowFullScreen: true
@@ -111,7 +108,7 @@ const BrightcoveEmbed = _ref => {
   const {
     data
   } = embed;
-  const linkedVideoId = isNumeric((_data$link = data.link) === null || _data$link === void 0 ? void 0 : _data$link.text) ? (_data$link2 = data.link) === null || _data$link2 === void 0 ? void 0 : _data$link2.text : undefined;
+  const linkedVideoId = isNumeric(data.link?.text) ? data.link?.text : undefined;
   const originalVideoProps = getIframeProps(embedData, data.sources);
   const alternativeVideoProps = linkedVideoId ? getIframeProps({
     ...embedData,
@@ -124,8 +121,8 @@ const BrightcoveEmbed = _ref => {
       children: (0, _jsxRuntime.jsx)(BrightcoveIframe, {
         ref: iframeRef,
         className: "original",
-        title: (_ref2 = (_embedData$alt3 = embedData.alt) !== null && _embedData$alt3 !== void 0 ? _embedData$alt3 : data.name) !== null && _ref2 !== void 0 ? _ref2 : fallbackTitle,
-        "aria-label": (_ref3 = (_embedData$alt4 = embedData.alt) !== null && _embedData$alt4 !== void 0 ? _embedData$alt4 : data.name) !== null && _ref3 !== void 0 ? _ref3 : fallbackTitle,
+        title: embedData.alt ?? data.name ?? fallbackTitle,
+        "aria-label": embedData.alt ?? data.name ?? fallbackTitle,
         frameBorder: "0",
         ...(alternativeVideoProps && !showOriginalVideo ? alternativeVideoProps : originalVideoProps),
         allowFullScreen: true
@@ -140,7 +137,7 @@ const BrightcoveEmbed = _ref => {
         shape: "pill",
         size: "small",
         onClick: () => setShowOriginalVideo(p => !p),
-        children: t("figure.button.".concat(!showOriginalVideo ? "original" : "alternative"))
+        children: t(`figure.button.${!showOriginalVideo ? "original" : "alternative"}`)
       })
     })]
   });

package/lib/Embed/CodeEmbed.js

@@ -4,8 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _react = require("react");
+var _reactI18next = require("react-i18next");
+var _action = require("@ndla/icons/action");
+var _editor = require("@ndla/icons/editor");
+var _primitives = require("@ndla/primitives");
+var _jsx2 = require("@ndla/styled-system/jsx");
+var _util = require("@ndla/util");
 var _CodeBlock = require("../CodeBlock");
-var _Figure = require("../Figure");
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
 /**
  * Copyright (c) 2023-present, NDLA.
@@ -15,18 +21,60 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  *
  */
 
+// TODO: We need an error state for this
+
+const StyledFigCaption = (0, _jsx2.styled)("figcaption", {
+  base: {
+    textStyle: "label.large",
+    fontWeight: "bold"
+  }
+});
+const StyledFigure = (0, _jsx2.styled)(_primitives.Figure, {
+  base: {
+    // We apply margin here to allow for the float and size props on figure to work as intended.
+    "& > *:not(:where(:first-child))": {
+      marginBlockStart: "xsmall"
+    }
+  }
+});
+const getTitleFromFormat = format => {
+  const selectedLanguage = _CodeBlock.codeLanguageOptions.find(item => item.format === format);
+  if (selectedLanguage) {
+    return selectedLanguage.title;
+  }
+  return;
+};
 const CodeEmbed = _ref => {
   let {
     embed
   } = _ref;
-  return (0, _jsxRuntime.jsx)(_Figure.Figure, {
-    children: (0, _jsxRuntime.jsx)(_CodeBlock.CodeBlock, {
-      title: embed.embedData.title,
-      code: embed.status === "success" ? embed.data.decodedContent : "",
+  const [isCopied, setIsCopied] = (0, _react.useState)(false);
+  const {
+    t
+  } = (0, _reactI18next.useTranslation)();
+  (0, _react.useEffect)(() => {
+    if (isCopied) {
+      const timer = setInterval(() => setIsCopied(false), 3000);
+      // ensure interval is cleared - also if unmounted
+      return () => {
+        clearTimeout(timer);
+      };
+    }
+  }, [isCopied]);
+  return (0, _jsxRuntime.jsxs)(StyledFigure, {
+    children: [(0, _jsxRuntime.jsx)(StyledFigCaption, {
+      children: embed.embedData.title || getTitleFromFormat(embed.embedData.codeFormat)
+    }), (0, _jsxRuntime.jsx)(_CodeBlock.CodeBlock, {
       highlightedCode: embed.status === "success" ? embed.data.highlightedCode : "",
-      format: embed.embedData.codeFormat,
-      showCopy: true
-    })
+      format: embed.embedData.codeFormat
+    }), (0, _jsxRuntime.jsxs)(_primitives.Button, {
+      variant: "secondary",
+      onClick: () => {
+        (0, _util.copyTextToClipboard)(embed.status === "success" ? embed.data.decodedContent : "");
+        setIsCopied(true);
+      },
+      children: [isCopied ? (0, _jsxRuntime.jsx)(_editor.Done, {}) : (0, _jsxRuntime.jsx)(_action.Copy, {}), isCopied ? t("codeBlock.copiedCode") : t("codeBlock.copyCode")]
+    })]
   });
 };
 var _default = exports.default = CodeEmbed;