@ndla/ui 45.0.6 → 45.0.8

package/lib/index.d.ts

@@ -68,6 +68,7 @@ export { default as ResourceGroup } from './ResourceGroup';
 export { default as LayoutItem, OneColumn, PageContainer, Content } from './Layout';
 export { FilmSlideshow, MovieGrid, AboutNdlaFilm, FilmMovieSearch, FilmMovieList, AllMoviesAlphabetically, } from './NDLAFilm';
 export { MediaList, MediaListItem, MediaListItemBody, MediaListItemActions, MediaListItemImage, MediaListItemMeta, } from './MediaList';
+export type { ItemType } from './MediaList';
 export { default as ContentTypeBadge, SubjectMaterialBadge, TasksAndActivitiesBadge, AssessmentResourcesBadge, LearningPathBadge, SubjectBadge, ExternalLearningResourcesBadge, SourceMaterialBadge, } from './ContentTypeBadge';
 export { SubjectChildContent, SubjectContent, SubjectFlexWrapper, SubjectHeader, SubjectNewContent, SubjectSecondaryContent, SubjectSectionTitle, SubjectSidebarWrapper, SubjectSocialContent, SubjectSocialSection, SubjectTopics, SubjectBanner, } from './Subject';
 export { default as CopyParagraphButton, CopyParagraphButtonV2 } from './CopyParagraphButton';

package/lib/locale/messages-en.d.ts

@@ -891,6 +891,7 @@ declare const messages: {
         title: string;
         originator: string;
         rightsholder: string;
+        processed: string;
         source: string;
         published: string;
         info: string;

package/lib/locale/messages-en.js

@@ -601,6 +601,7 @@ var messages = _objectSpread(_objectSpread({
     title: 'Title',
     originator: 'Originator',
     rightsholder: 'Rightsholder',
+    processed: 'The content has been processed',
     source: 'Source',
     published: 'Published',
     info: 'License information'

package/lib/locale/messages-nb.d.ts

@@ -891,6 +891,7 @@ declare const messages: {
         title: string;
         originator: string;
         published: string;
+        processed: string;
         rightsholder: string;
         source: string;
         info: string;

package/lib/locale/messages-nb.js

@@ -599,6 +599,7 @@ var messages = _objectSpread(_objectSpread({
     title: 'Tittel',
     originator: 'Opphaver',
     published: 'Publiseringsdato',
+    processed: 'Innholdet har blitt bearbeidet',
     rightsholder: 'Rettighetshaver',
     source: 'Kilde',
     info: 'Lisensinformasjon'

package/lib/locale/messages-nn.d.ts

@@ -890,6 +890,7 @@ declare const messages: {
         };
         title: string;
         originator: string;
+        processed: string;
         rightsholder: string;
         source: string;
         published: string;

package/lib/locale/messages-nn.js

@@ -598,6 +598,7 @@ var messages = _objectSpread(_objectSpread({
     },
     title: 'Tittel',
     originator: 'Opphavar',
+    processed: 'Innhaldet har vorte omarbeidd',
     rightsholder: 'Rettshavar',
     source: 'Kjelde',
     published: 'Publiseringsdato',

package/lib/locale/messages-se.d.ts

@@ -891,6 +891,7 @@ declare const messages: {
         title: string;
         originator: string;
         published: string;
+        processed: string;
         rightsholder: string;
         source: string;
         info: string;

package/lib/locale/messages-se.js

@@ -599,6 +599,7 @@ var messages = _objectSpread(_objectSpread({
     title: 'Tihttel',
     originator: 'Ásaheaddji',
     published: 'Almmuhanbeaivi',
+    processed: 'Sisdoallu lea rievdaduvvon.',
     rightsholder: 'Vuoigatvuođaguoddi',
     source: 'Gáldu',
     info: 'Lisensinformasjon'

package/lib/locale/messages-sma.d.ts

@@ -891,6 +891,7 @@ declare const messages: {
         title: string;
         originator: string;
         published: string;
+        processed: string;
         rightsholder: string;
         source: string;
         info: string;

package/lib/locale/messages-sma.js

@@ -599,6 +599,7 @@ var messages = _objectSpread(_objectSpread({
     title: 'Tihtele',
     originator: 'Opphaver',
     published: 'Publiseringsdato',
+    processed: 'Innhaldet har vorte omarbeidd',
     rightsholder: 'Rettighetshaver',
     source: 'Gaaltije',
     info: 'Lisensinformasjon'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "45.0.6",
+  "version": "45.0.8",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -40,9 +40,9 @@
     "@ndla/forms": "^4.3.23",
     "@ndla/hooks": "^2.1.0",
     "@ndla/icons": "^4.0.6",
-    "@ndla/licenses": "^7.1.3",
+    "@ndla/licenses": "^7.1.4",
     "@ndla/modal": "^4.0.7",
-    "@ndla/notion": "^5.0.23",
+    "@ndla/notion": "^5.0.24",
     "@ndla/safelink": "^4.1.21",
     "@ndla/select": "^2.4.12",
     "@ndla/switch": "^1.1.12",
@@ -83,5 +83,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "081b7b353f4028c92f7031e77d43a470fd08c764"
+  "gitHead": "4fcf1c6c35e6612269adbe3878fd773d7fdd9cd2"
 }

package/src/CampaignBlock/CampaignBlock.tsx

@@ -97,7 +97,7 @@ const CampaignBlock = ({
   const href = usePossiblyRelativeUrl(url.url, path);
   return (
     <Container className={className} data-type="campaign-block" data-image-side={imageSide}>
-      {image && <StyledImg src={image.src} height={200} width={240} alt="" />}
+      {image && <StyledImg src={image.src} height={200} width={240} alt={image.src} />}
       <TextWrapper>
         <Heading css={headingStyle}>{title.title}</Heading>
         <StyledDescription>{description.text}</StyledDescription>

package/src/Gloss/Gloss.tsx

@@ -31,7 +31,7 @@ export interface Props {
     transcriptions: Transcription;
     examples?: Example[][];
   };
-  audio: {
+  audio?: {
     title: string;
     src?: string;
   };
@@ -124,7 +124,7 @@ const Gloss = ({ title, glossData, audio }: Props) => {
               <TypeSpan aria-label={t('gloss.wordClass')}>{t(`wordClass.${glossData.wordClass}`)}</TypeSpan>
             )}
           </GlossContainer>
-          {audio.src && <SpeechControl src={audio.src} title={audio.title}></SpeechControl>}
+          {audio?.src && <SpeechControl src={audio.src} title={audio.title}></SpeechControl>}
         </Wrapper>
         <span>{title.title}</span>
       </Container>

package/src/LicenseByline/EmbedByline.tsx

@@ -39,27 +39,27 @@ export interface EmbedBylineErrorProps extends BaseProps {
 
 interface ImageProps extends BaseProps {
   type: 'image';
-  copyright: ImageCopyright;
+  copyright: ImageCopyright | undefined;
 }
 
 interface BrightcoveProps extends BaseProps {
   type: 'video';
-  copyright: BrightcoveCopyright;
+  copyright: BrightcoveCopyright | undefined;
 }
 
 interface AudioProps extends BaseProps {
   type: 'audio';
-  copyright: AudioCopyright;
+  copyright: AudioCopyright | undefined;
 }
 
 interface PodcastProps extends BaseProps {
   type: 'podcast';
-  copyright: AudioCopyright;
+  copyright: AudioCopyright | undefined;
 }
 
 interface ConceptProps extends BaseProps {
   type: 'concept';
-  copyright: ConceptCopyright;
+  copyright: ConceptCopyright | undefined;
 }
 
 export type EmbedBylineTypeProps = ImageProps | BrightcoveProps | AudioProps | PodcastProps | ConceptProps;
@@ -158,7 +158,7 @@ const EmbedByline = ({
 
   const { copyright } = props;
 
-  const license = getLicenseByAbbreviation(copyright.license?.license ?? '', i18n.language);
+  const license = copyright ? getLicenseByAbbreviation(copyright.license?.license ?? '', i18n.language) : undefined;
   const authors = getLicenseCredits(copyright);
   const captionAuthors = Object.values(authors).find((i) => i.length > 0) ?? [];
 
@@ -167,7 +167,7 @@ const EmbedByline = ({
       {!!strippedDescription?.length && description && <LicenseDescription description={description} />}
       {visibleAlt ? <StyledSpan>{`Alt: ${visibleAlt}`}</StyledSpan> : null}
       <RightsWrapper data-grid={inGrid}>
-        <LicenseLink license={license} asLink={!!license.url.length} />
+        {license ? <LicenseLink license={license} asLink={!!license.url.length} /> : null}
         <LicenseInformationWrapper>
           <span>
             <b>{t(`embed.type.${type}`)}: </b>

package/src/MediaList/MediaList.tsx

@@ -13,6 +13,7 @@ import {
   isCreativeCommonsLicense,
   metaTypes,
 } from '@ndla/licenses';
+import type { MetaType } from '@ndla/licenses';
 import { LicenseDescription } from '@ndla/notion';
 import BEMHelper from 'react-bem-helper';
 import { uuid } from '@ndla/util';
@@ -182,25 +183,54 @@ export const HandleLink = ({ text, children }: HandleLinkProps) => {
 
 const attributionTypes = [metaTypes.author, metaTypes.copyrightHolder, metaTypes.contributor];
 
+export type ItemType = ItemTypeWithDescription | DescriptionLessItemType;
+
+interface ItemTypeWithDescription {
+  label: string;
+  description: string;
+  metaType: Omit<MetaType, 'otherWithoutDescription'>;
+}
+
+interface DescriptionLessItemType {
+  label: string;
+  metaType: 'otherWithoutDescription';
+}
+
+function isOtherWithoutDescription(item: ItemType): item is DescriptionLessItemType {
+  return item.metaType === metaTypes.otherWithoutDescription;
+}
+
 interface MediaListItemMetaProps {
-  items?: {
-    label: string;
-    description: string;
-    metaType: string;
-  }[];
+  items?: ItemType[];
+}
+
+const ItemText = ({ item }: { item: ItemType }) => {
+  if (isOtherWithoutDescription(item)) {
+    return <>{item.label}</>;
+  }
+
+  return (
+    <>
+      {item.label}: <HandleLink text={item.description}>{item.description}</HandleLink>
+    </>
+  );
+};
+
+function isAttributionItem(item: ItemType): item is ItemTypeWithDescription {
+  if (isOtherWithoutDescription(item)) return false;
+  return attributionTypes.some((type) => type === item.metaType);
 }
 
 export const MediaListItemMeta = ({ items = [] }: MediaListItemMetaProps) => {
-  const attributionItems = items.filter((item) => attributionTypes.some((type) => type === item.metaType));
+  const attributionItems = items.filter(isAttributionItem);
   const attributionMeta = attributionItems.map((item) => `${item.label}: ${item.description}`).join(', ');
 
   return (
-    //@ts-ignore
     // eslint-disable-next-line react/no-unknown-property
     <ul {...cClasses('actions')} property="cc:attributionName" content={attributionMeta}>
       {items.map((item) => (
         <li key={uuid()} className="c-medialist__meta-item">
-          {item.label}: <HandleLink text={item.description}>{item.description}</HandleLink>
+          <ItemText item={item} />
         </li>
       ))}
     </ul>

package/src/MediaList/index.ts

@@ -13,3 +13,5 @@ export {
   MediaListItemImage,
   MediaListItemMeta,
 } from './MediaList';
+
+export type { ItemType } from './MediaList';

package/src/Search/SearchResultSleeve.tsx

@@ -253,28 +253,17 @@ const SearchResultSleeve = ({
           return findPathForKeyboardNavigation(contentRef.current, prevKeyPath, -1);
         });
       } else if (e.code === 'Enter') {
-        e.stopPropagation();
-        e.preventDefault();
         if (keyboardPathNavigation === GO_TO_SUGGESTION) {
-          const anchorTag =
-            searchSuggestionRef && searchSuggestionRef.current && searchSuggestionRef.current.closest('a');
-          if (anchorTag) {
-            anchorTag.click();
-          }
-        } else if (keyboardPathNavigation === GO_TO_SEARCHPAGE || keyboardPathNavigation === undefined) {
-          const anchorTag = searchAllRef && searchAllRef.current && searchAllRef.current.closest('a');
-          if (anchorTag) {
-            anchorTag.click();
-          }
-        } else {
-          if (keyboardPathNavigation instanceof HTMLElement) {
-            const toClick =
-              keyboardPathNavigation &&
-              keyboardPathNavigation.querySelector &&
-              (keyboardPathNavigation.querySelector('a') || keyboardPathNavigation.querySelector('button'));
+          searchSuggestionRef?.current?.closest('a')?.click();
+        } else if (keyboardPathNavigation instanceof HTMLElement) {
+          e.stopPropagation();
+          e.preventDefault();
+          const toClick =
+            keyboardPathNavigation &&
+            keyboardPathNavigation.querySelector &&
+            (keyboardPathNavigation.querySelector('a') || keyboardPathNavigation.querySelector('button'));
 
-            toClick && toClick.click();
-          }
+          toClick && toClick.click();
         }
       } else if (e.code === 'Tab') {
         setKeyNavigation('');

package/src/index.ts

@@ -207,6 +207,8 @@ export {
   MediaListItemMeta,
 } from './MediaList';
 
+export type { ItemType } from './MediaList';
+
 export {
   default as ContentTypeBadge,
   SubjectMaterialBadge,

package/src/locale/messages-en.ts

@@ -631,6 +631,7 @@ const messages = {
     title: 'Title',
     originator: 'Originator',
     rightsholder: 'Rightsholder',
+    processed: 'The content has been processed',
     source: 'Source',
     published: 'Published',
     info: 'License information',

package/src/locale/messages-nb.ts

@@ -630,6 +630,7 @@ const messages = {
     title: 'Tittel',
     originator: 'Opphaver',
     published: 'Publiseringsdato',
+    processed: 'Innholdet har blitt bearbeidet',
     rightsholder: 'Rettighetshaver',
     source: 'Kilde',
     info: 'Lisensinformasjon',

package/src/locale/messages-nn.ts

@@ -629,6 +629,7 @@ const messages = {
     },
     title: 'Tittel',
     originator: 'Opphavar',
+    processed: 'Innhaldet har vorte omarbeidd',
     rightsholder: 'Rettshavar',
     source: 'Kjelde',
     published: 'Publiseringsdato',

package/src/locale/messages-se.ts

@@ -631,6 +631,7 @@ const messages = {
     title: 'Tihttel',
     originator: 'Ásaheaddji',
     published: 'Almmuhanbeaivi',
+    processed: 'Sisdoallu lea rievdaduvvon.',
     rightsholder: 'Vuoigatvuođaguoddi',
     source: 'Gáldu',
     info: 'Lisensinformasjon',

package/src/locale/messages-sma.ts

@@ -634,6 +634,7 @@ const messages = {
     title: 'Tihtele',
     originator: 'Opphaver',
     published: 'Publiseringsdato',
+    processed: 'Innhaldet har vorte omarbeidd',
     rightsholder: 'Rettighetshaver',
     source: 'Gaaltije',
     info: 'Lisensinformasjon',