@ndla/ui 36.0.2 → 37.0.1

package/lib/index.d.ts

@@ -96,6 +96,9 @@ export { TreeStructure } from './TreeStructure';
 export type { TreeStructureProps } from './TreeStructure';
 export { SearchField, SearchResultList, SearchResultItem, ActiveFilters, ToggleSearchButton } from './Search';
 export { default as LetterFilter } from './LetterFilter';
+export { OrderedList, UnOrderedList } from './List';
 export { BlogPostV2 } from './BlogPost';
-export { KeyPerformanceIndicator } from './KeyPerformanceIndicator';
+export { KeyFigure } from './KeyFigure';
 export { default as ContactBlock } from './ContactBlock';
+export type { HeartButtonType } from './Embed';
+export { CampaignBlock } from './CampaignBlock';

package/lib/index.js

@@ -178,6 +178,12 @@ Object.defineProperty(exports, "BrightcoveEmbed", {
     return _Embed.BrightcoveEmbed;
   }
 });
+Object.defineProperty(exports, "CampaignBlock", {
+  enumerable: true,
+  get: function get() {
+    return _CampaignBlock.CampaignBlock;
+  }
+});
 Object.defineProperty(exports, "CompetenceGoalTab", {
   enumerable: true,
   get: function get() {
@@ -592,10 +598,10 @@ Object.defineProperty(exports, "InfoWidget", {
     return _InfoWidget["default"];
   }
 });
-Object.defineProperty(exports, "KeyPerformanceIndicator", {
+Object.defineProperty(exports, "KeyFigure", {
   enumerable: true,
   get: function get() {
-    return _KeyPerformanceIndicator.KeyPerformanceIndicator;
+    return _KeyFigure.KeyFigure;
   }
 });
 Object.defineProperty(exports, "LanguageSelector", {
@@ -832,6 +838,12 @@ Object.defineProperty(exports, "OneColumn", {
     return _Layout.OneColumn;
   }
 });
+Object.defineProperty(exports, "OrderedList", {
+  enumerable: true,
+  get: function get() {
+    return _List.OrderedList;
+  }
+});
 Object.defineProperty(exports, "PageContainer", {
   enumerable: true,
   get: function get() {
@@ -1174,6 +1186,12 @@ Object.defineProperty(exports, "TreeStructure", {
     return _TreeStructure.TreeStructure;
   }
 });
+Object.defineProperty(exports, "UnOrderedList", {
+  enumerable: true,
+  get: function get() {
+    return _List.UnOrderedList;
+  }
+});
 Object.defineProperty(exports, "UnknownEmbed", {
   enumerable: true,
   get: function get() {
@@ -1354,9 +1372,11 @@ var _InfoBlock = require("./InfoBlock");
 var _TreeStructure = require("./TreeStructure");
 var _Search = require("./Search");
 var _LetterFilter = _interopRequireDefault(require("./LetterFilter"));
+var _List = require("./List");
 var _BlogPost = require("./BlogPost");
-var _KeyPerformanceIndicator = require("./KeyPerformanceIndicator");
+var _KeyFigure = require("./KeyFigure");
 var _ContactBlock = _interopRequireDefault(require("./ContactBlock"));
+var _CampaignBlock = require("./CampaignBlock");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }

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

@@ -269,12 +269,15 @@ declare const messages: {
         conceptListError: string;
         linkError: string;
         unsupported: string;
+        embedError: string;
         type: {
             image: string;
             video: string;
             audio: string;
             podcast: string;
             concept: string;
+            h5p: string;
+            external: string;
         };
     };
     common: {
@@ -1236,6 +1239,7 @@ declare const messages: {
             close: string;
         };
         readMoreDescriptionLabel: string;
+        readLessDescriptionLabel: string;
     };
     h5p: {
         reuse: string;

package/lib/locale/messages-en.js

@@ -967,7 +967,8 @@ var messages = _objectSpread(_objectSpread({
       heading: 'Text version',
       close: 'Close text version'
     },
-    readMoreDescriptionLabel: 'show more'
+    readMoreDescriptionLabel: 'show more',
+    readLessDescriptionLabel: 'show less'
   },
   h5p: {
     reuse: 'Use H5P',
@@ -1257,12 +1258,15 @@ var messages = _objectSpread(_objectSpread({
     conceptListError: 'Failed to show concept list',
     linkError: 'Failed to show link.',
     unsupported: "Embed {{type}} not supported.",
+    embedError: "An error occurred while loading the {{type}}. Try reloading the page.",
     type: {
       image: 'Image',
       video: 'Video',
       audio: 'Audio',
       podcast: 'Podcast',
-      concept: 'Concept'
+      concept: 'Concept',
+      h5p: 'H5P',
+      external: 'External resource'
     }
   }
 });

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

@@ -269,12 +269,15 @@ declare const messages: {
         conceptListError: string;
         linkError: string;
         unsupported: string;
+        embedError: string;
         type: {
             image: string;
             video: string;
             audio: string;
             podcast: string;
             concept: string;
+            h5p: string;
+            external: string;
         };
     };
     common: {
@@ -1236,6 +1239,7 @@ declare const messages: {
             close: string;
         };
         readMoreDescriptionLabel: string;
+        readLessDescriptionLabel: string;
     };
     h5p: {
         reuse: string;

package/lib/locale/messages-nb.js

@@ -967,7 +967,8 @@ var messages = _objectSpread(_objectSpread({
       heading: 'Tekstversjon',
       close: 'Lukk tekstversjon'
     },
-    readMoreDescriptionLabel: 'vis mer'
+    readMoreDescriptionLabel: 'vis mer',
+    readLessDescriptionLabel: 'vis mindre'
   },
   h5p: {
     reuse: 'Bruk H5P',
@@ -1257,12 +1258,15 @@ var messages = _objectSpread(_objectSpread({
     conceptListError: 'Klarte ikke å vise forklaringsliste',
     linkError: 'Klarte ikke å vise lenke.',
     unsupported: "Embed {{type}} er ikke st\xF8ttet.",
+    embedError: "Beklager, en feil oppstod ved lasting av {{type}}. Pr\xF8v \xE5 laste inn siden p\xE5 nytt.",
     type: {
       image: 'Bilde',
       video: 'Video',
       audio: 'Lyd',
       podcast: 'Podkast',
-      concept: 'Forklaring'
+      concept: 'Forklaring',
+      h5p: 'H5P',
+      external: 'Ekstern ressurs'
     }
   }
 });

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

@@ -269,12 +269,15 @@ declare const messages: {
         conceptListError: string;
         linkError: string;
         unsupported: string;
+        embedError: string;
         type: {
             image: string;
             video: string;
             audio: string;
             podcast: string;
             concept: string;
+            h5p: string;
+            external: string;
         };
     };
     common: {
@@ -1236,6 +1239,7 @@ declare const messages: {
             close: string;
         };
         readMoreDescriptionLabel: string;
+        readLessDescriptionLabel: string;
     };
     h5p: {
         reuse: string;

package/lib/locale/messages-nn.js

@@ -967,7 +967,8 @@ var messages = _objectSpread(_objectSpread({
       heading: 'Tekstversjon',
       close: 'Lukk tekstversjon'
     },
-    readMoreDescriptionLabel: 'vis meir'
+    readMoreDescriptionLabel: 'vis meir',
+    readLessDescriptionLabel: 'vis mindre'
   },
   h5p: {
     reuse: 'Bruk H5P',
@@ -1257,12 +1258,15 @@ var messages = _objectSpread(_objectSpread({
     conceptListError: 'Klarte ikkje å vise forklaringsliste',
     linkError: 'Klarte ikkje å vise lenke.',
     unsupported: "Embed {{type}} er ikkje st\xF8tta.",
+    embedError: "Orsak, ein feil oppstod ved lasting av {{type}}. Pr\xF8v \xE5 laste inn sida p\xE5 nytt.",
     type: {
       image: 'Bilde',
       video: 'Video',
       audio: 'Lyd',
       podcast: 'Podkast',
-      concept: 'Forklaring'
+      concept: 'Forklaring',
+      h5p: 'H5P',
+      external: 'Ekstern ressurs'
     }
   }
 });

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

@@ -269,12 +269,15 @@ declare const messages: {
         conceptListError: string;
         linkError: string;
         unsupported: string;
+        embedError: string;
         type: {
             image: string;
             video: string;
             audio: string;
             podcast: string;
             concept: string;
+            h5p: string;
+            external: string;
         };
     };
     common: {
@@ -1236,6 +1239,7 @@ declare const messages: {
             close: string;
         };
         readMoreDescriptionLabel: string;
+        readLessDescriptionLabel: string;
     };
     h5p: {
         reuse: string;

package/lib/locale/messages-se.js

@@ -967,7 +967,8 @@ var messages = _objectSpread(_objectSpread({
       heading: 'Teakstavearšuvdna',
       close: 'Govčča teakstavearšuvnna'
     },
-    readMoreDescriptionLabel: 'Čájet eanet'
+    readMoreDescriptionLabel: 'Čájet eanet',
+    readLessDescriptionLabel: 'vis mindre'
   },
   h5p: {
     reuse: 'Geavat H5P',
@@ -1257,12 +1258,15 @@ var messages = _objectSpread(_objectSpread({
     conceptListError: 'Ii sáhttán čájehit čilgehuslisttu',
     linkError: 'Ii sáhttán čájehit liŋkka.',
     unsupported: "Embed {{type}} ii dorjojuvvo.",
+    embedError: "Orsak, ein feil oppstod ved lasting av {{type}}. Pr\xF8v \xE5 laste inn sida p\xE5 nytt.",
     type: {
       image: 'Bilde',
       video: 'Video',
       audio: 'Lyd',
       podcast: 'Podkast',
-      concept: 'Forklaring'
+      concept: 'Forklaring',
+      h5p: 'H5P',
+      external: 'Ekstern ressurs'
     }
   }
 });

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

@@ -269,12 +269,15 @@ declare const messages: {
         conceptListError: string;
         linkError: string;
         unsupported: string;
+        embedError: string;
         type: {
             image: string;
             video: string;
             audio: string;
             podcast: string;
             concept: string;
+            h5p: string;
+            external: string;
         };
     };
     common: {
@@ -1236,6 +1239,7 @@ declare const messages: {
             close: string;
         };
         readMoreDescriptionLabel: string;
+        readLessDescriptionLabel: string;
     };
     h5p: {
         reuse: string;

package/lib/locale/messages-sma.js

@@ -967,7 +967,8 @@ var messages = _objectSpread(_objectSpread({
       heading: 'Teeksteversjovne',
       close: 'Dahph teeksteversjovnem'
     },
-    readMoreDescriptionLabel: 'vis mer'
+    readMoreDescriptionLabel: 'vis mer',
+    readLessDescriptionLabel: 'vis mindre'
   },
   h5p: {
     reuse: 'Bruk H5P',
@@ -1257,12 +1258,15 @@ var messages = _objectSpread(_objectSpread({
     conceptListError: 'Klarte ikkje å vise forklaringsliste',
     linkError: 'Klarte ikkje å vise lenke.',
     unsupported: "Embed {{type}} er ikkje st\xF8tta.",
+    embedError: "Orsak, ein feil oppstod ved lasting av {{type}}. Pr\xF8v \xE5 laste inn sida p\xE5 nytt.",
     type: {
       image: 'Bilde',
       video: 'Video',
       audio: 'Lyd',
       podcast: 'Podkast',
-      concept: 'Forklaring'
+      concept: 'Forklaring',
+      h5p: 'H5P',
+      external: 'Ekstern ressurs'
     }
   }
 });

package/lib/model/ContentType.d.ts

@@ -33,3 +33,4 @@ export declare const RESOURCE_TYPE_EXTERNAL_LEARNING_RESOURCES = "urn:resourcety
 export declare const RESOURCE_TYPE_SOURCE_MATERIAL = "urn:resourcetype:SourceMaterial";
 export declare const ListOfContentTypes: string[];
 export declare const contentTypeMapping: Record<string, string>;
+export declare const resourceTypeMapping: Record<string, string>;

package/lib/model/ContentType.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.contentTypes = exports.contentTypeMapping = exports.TOPIC = exports.TASKS_AND_ACTIVITIES = exports.SUBJECT_MATERIAL = exports.SUBJECT = exports.SOURCE_MATERIAL = exports.RESOURCE_TYPE_TASKS_AND_ACTIVITIES = exports.RESOURCE_TYPE_SUBJECT_MATERIAL = exports.RESOURCE_TYPE_SOURCE_MATERIAL = exports.RESOURCE_TYPE_LEARNING_PATH = exports.RESOURCE_TYPE_EXTERNAL_LEARNING_RESOURCES = exports.RESOURCE_TYPE_ASSESSMENT_RESOURCES = exports.MULTIDISCIPLINARY_TOPIC = exports.ListOfContentTypes = exports.LEARNING_PATH = exports.EXTERNAL_LEARNING_RESOURCES = exports.ASSESSMENT_RESOURCES = void 0;
+exports.resourceTypeMapping = exports.contentTypes = exports.contentTypeMapping = exports.TOPIC = exports.TASKS_AND_ACTIVITIES = exports.SUBJECT_MATERIAL = exports.SUBJECT = exports.SOURCE_MATERIAL = exports.RESOURCE_TYPE_TASKS_AND_ACTIVITIES = exports.RESOURCE_TYPE_SUBJECT_MATERIAL = exports.RESOURCE_TYPE_SOURCE_MATERIAL = exports.RESOURCE_TYPE_LEARNING_PATH = exports.RESOURCE_TYPE_EXTERNAL_LEARNING_RESOURCES = exports.RESOURCE_TYPE_ASSESSMENT_RESOURCES = exports.MULTIDISCIPLINARY_TOPIC = exports.ListOfContentTypes = exports.LEARNING_PATH = exports.EXTERNAL_LEARNING_RESOURCES = exports.ASSESSMENT_RESOURCES = void 0;
 var _contentTypeMapping;
 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); }
 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; }
@@ -62,4 +62,11 @@ exports.RESOURCE_TYPE_SOURCE_MATERIAL = RESOURCE_TYPE_SOURCE_MATERIAL;
 var ListOfContentTypes = ['SUBJECT_MATERIAL', 'TASKS_AND_ACTIVITIES', 'ASSESSMENT_RESOURCES', 'SUBJECT', 'EXTERNAL_LEARNING_RESOURCES', 'SOURCE_MATERIAL', 'LEARNING_PATH', 'TOPIC', 'MULTIDISIPLINARY_TOPIC'];
 exports.ListOfContentTypes = ListOfContentTypes;
 var contentTypeMapping = (_contentTypeMapping = {}, _defineProperty(_contentTypeMapping, RESOURCE_TYPE_LEARNING_PATH, LEARNING_PATH), _defineProperty(_contentTypeMapping, RESOURCE_TYPE_SUBJECT_MATERIAL, SUBJECT_MATERIAL), _defineProperty(_contentTypeMapping, RESOURCE_TYPE_TASKS_AND_ACTIVITIES, TASKS_AND_ACTIVITIES), _defineProperty(_contentTypeMapping, RESOURCE_TYPE_ASSESSMENT_RESOURCES, ASSESSMENT_RESOURCES), _defineProperty(_contentTypeMapping, RESOURCE_TYPE_EXTERNAL_LEARNING_RESOURCES, EXTERNAL_LEARNING_RESOURCES), _defineProperty(_contentTypeMapping, RESOURCE_TYPE_SOURCE_MATERIAL, SOURCE_MATERIAL), _defineProperty(_contentTypeMapping, "default", SUBJECT_MATERIAL), _contentTypeMapping);
-exports.contentTypeMapping = contentTypeMapping;
+exports.contentTypeMapping = contentTypeMapping;
+var resourceTypeMapping = {
+  image: 'image',
+  video: 'video',
+  concept: 'concept',
+  audio: 'audio'
+};
+exports.resourceTypeMapping = resourceTypeMapping;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "36.0.2",
+  "version": "37.0.1",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,22 +31,22 @@
     "types"
   ],
   "dependencies": {
+    "@ndla/accordion": "^2.2.0",
     "@ndla/article-scripts": "^3.0.17",
-    "@ndla/button": "^10.0.13",
-    "@ndla/carousel": "^3.0.14",
-    "@ndla/core": "^3.1.3",
-    "@ndla/forms": "^4.2.22",
+    "@ndla/button": "^10.1.0",
+    "@ndla/carousel": "^3.1.0",
+    "@ndla/core": "^4.0.0",
+    "@ndla/forms": "^4.3.0",
     "@ndla/hooks": "^2.0.4",
-    "@ndla/icons": "^2.2.13",
+    "@ndla/icons": "^2.3.0",
     "@ndla/licenses": "^7.0.4",
-    "@ndla/modal": "^2.2.17",
-    "@ndla/notion": "^4.2.19",
-    "@ndla/safelink": "^4.0.23",
-    "@ndla/switch": "^1.0.9",
-    "@ndla/tabs": "^2.1.20",
-    "@ndla/tooltip": "^4.0.21",
+    "@ndla/modal": "^2.3.0",
+    "@ndla/notion": "^4.3.0",
+    "@ndla/safelink": "^4.1.0",
+    "@ndla/switch": "^1.1.0",
+    "@ndla/tabs": "^2.2.0",
+    "@ndla/tooltip": "^4.1.0",
     "@ndla/util": "^3.1.12",
-    "@radix-ui/react-accordion": "1.1.0",
     "@radix-ui/react-dropdown-menu": "2.0.2",
     "@radix-ui/react-popover": "^1.0.3",
     "@reach/menu-button": "^0.16.2",
@@ -75,7 +75,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.11.0",
     "@ndla/types-backend": "^0.2.5",
-    "@ndla/types-embed": "^1.1.1",
+    "@ndla/types-embed": "^2.0.1",
     "@types/reach__dialog": "^0.1.0",
     "css-loader": "^6.7.3",
     "mini-css-extract-plugin": "^2.7.5",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "486edbc7b92bc8fc182669cec1c259438215e3cc"
+  "gitHead": "38258e7be60bc71be478fe407775f43bfa505d7b"
 }

package/src/Article/Article.tsx

@@ -16,7 +16,6 @@ import { useIntersectionObserver } from '@ndla/hooks';
 import { resizeObserver } from '@ndla/util';
 import { spacing, spacingUnit, mq, breakpoints } from '@ndla/core';
 import { Article as ArticleType, Locale } from '../types';
-import ArticleFootNotes from './ArticleFootNotes';
 import ArticleContent from './ArticleContent';
 import ArticleByline from './ArticleByline';
 import LayoutItem from '../Layout';
@@ -126,14 +125,12 @@ type Props = {
   contentTransformed?: boolean;
   locale: Locale;
   messageBoxLinks?: [];
-  copyText?: string;
   competenceGoals?:
     | ((inp: { Dialog: ComponentType; dialogProps: { isOpen: boolean; onClose: () => void } }) => ReactNode)
     | ReactNode
     | null;
   id: string;
   renderMarkdown: (text: string) => string;
-  printUrl?: string;
   notions?: { list: ConceptNotionType[]; related: NotionRelatedContent[] };
   accessMessage?: string;
 };
@@ -165,11 +162,9 @@ export const Article = ({
   id,
   locale,
   notions,
-  printUrl,
   renderMarkdown,
   accessMessage,
   heartButton,
-  copyText,
   contentTransformed,
 }: Props) => {
   const articleRef = useRef<HTMLDivElement>(null);
@@ -241,15 +236,13 @@ export const Article = ({
         </LayoutItem>
 
         <LayoutItem layout="center">
-          {footNotes && footNotes.length > 0 && <ArticleFootNotes footNotes={footNotes} />}
           <ArticleByline
-            copySourceReference={copyText}
+            footnotes={footNotes}
             authors={authors}
             suppliers={rightsholders}
             published={published}
             license={licenseObj?.license ?? ''}
             licenseBox={licenseBox}
-            printUrl={printUrl}
           />
         </LayoutItem>
         <LayoutItem layout="extend">{children}</LayoutItem>