@ndla/ui 8.2.3 → 9.0.0

package/lib/index.d.ts

@@ -28,7 +28,7 @@ export { default as Image, ImageLink } from './Image';
 export { makeSrcQueryString } from './Image';
 export { SubjectMaterialHero, TasksAndActivitiesHero, AssessmentResourcesHero, SubjectHero, ExternalLearningResourcesHero, SourceMaterialHero, Hero, NdlaFilmHero, } from './Hero';
 export { Footer, EditorName, FooterText, FooterAuth } from './Footer';
-export { Figure, FigureCaption, FigureLicenseDialog, FigureExpandButton } from './Figure';
+export { Figure, FigureCaption, FigureLicenseDialog, FigureExpandButton, FigureOpenDialogButton } from './Figure';
 export { LanguageSelector } from './LanguageSelector';
 export { LearningPathWrapper, LearningPathContent, LearningPathMenu, LearningPathSticky, LearningPathInformation, LearningPathStickySibling, LearningPathStickyPlaceholder, LearningPathLastStepNavigation, LearningPathMobileStepInfo, LearningPathMobileHeader, } from './LearningPaths';
 export { Translation, TranslationLine, TranslationBox } from './Translation';
@@ -43,7 +43,6 @@ export { default as CreatedBy } from './CreatedBy';
 export { default as Breadcrumblist } from './Breadcrumblist';
 export { MessageBox, MessageBoxTag, MessageBoxType } from './MessageBox';
 export { ResourceBox } from './ResourceBox';
-export { default as CloseButton } from './CloseButton';
 export { default as AudioPlayer, initAudioPlayers } from './AudioPlayer';
 export { NavigationHeading, NavigationBox, NavigationTopicAbout } from './Navigation';
 export { default as Programme } from './Programme';

package/lib/index.js

@@ -66,6 +66,7 @@ var _exportNames = {
   FigureCaption: true,
   FigureLicenseDialog: true,
   FigureExpandButton: true,
+  FigureOpenDialogButton: true,
   LanguageSelector: true,
   LearningPathWrapper: true,
   LearningPathContent: true,
@@ -93,7 +94,6 @@ var _exportNames = {
   MessageBoxTag: true,
   MessageBoxType: true,
   ResourceBox: true,
-  CloseButton: true,
   AudioPlayer: true,
   initAudioPlayers: true,
   NavigationHeading: true,
@@ -535,6 +535,12 @@ Object.defineProperty(exports, "FigureExpandButton", {
     return _Figure.FigureExpandButton;
   }
 });
+Object.defineProperty(exports, "FigureOpenDialogButton", {
+  enumerable: true,
+  get: function get() {
+    return _Figure.FigureOpenDialogButton;
+  }
+});
 Object.defineProperty(exports, "LanguageSelector", {
   enumerable: true,
   get: function get() {
@@ -697,12 +703,6 @@ Object.defineProperty(exports, "ResourceBox", {
     return _ResourceBox.ResourceBox;
   }
 });
-Object.defineProperty(exports, "CloseButton", {
-  enumerable: true,
-  get: function get() {
-    return _CloseButton["default"];
-  }
-});
 Object.defineProperty(exports, "AudioPlayer", {
   enumerable: true,
   get: function get() {
@@ -1267,8 +1267,6 @@ var _MessageBox = require("./MessageBox");
 
 var _ResourceBox = require("./ResourceBox");
 
-var _CloseButton = _interopRequireDefault(require("./CloseButton"));
-
 var _AudioPlayer = _interopRequireWildcard(require("./AudioPlayer"));
 
 var _Navigation = require("./Navigation");

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-export declare const contentTypes: typeof import("../model/ContentType"), subjectCategories: typeof import("../model/SubjectCategories");
+export declare const contentTypes: typeof import("../model/ContentType"), subjectCategories: typeof import("../model/SubjectCategories"), subjectTypes: typeof import("../model/SubjectTypes");
 declare const messages: {
     filterButtons: {
         removeAllFilters: string;
@@ -81,6 +81,10 @@ declare const messages: {
         programme: string;
         specialized: string;
     };
+    subjectTypes: {
+        subject: string;
+        resourceCollection: string;
+    };
     searchPage: {
         noHits: string;
         noHitsShort: string;

package/lib/locale/messages-en.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.subjectCategories = exports.contentTypes = void 0;
+exports["default"] = exports.subjectTypes = exports.subjectCategories = exports.contentTypes = void 0;
 
 var _licenses = require("@ndla/licenses");
 
 var _model = _interopRequireDefault(require("../model"));
 
-var _subjectCategories, _contentTypeResultsSh, _contentTypeResultsSh2, _contentTypeResultsNo;
+var _subjectCategories, _subjectTypes, _contentTypeResultsSh, _contentTypeResultsSh2, _contentTypeResultsNo;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -20,7 +20,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var contentTypes = _model["default"].contentTypes,
-    subjectCategories = _model["default"].subjectCategories;
+    subjectCategories = _model["default"].subjectCategories,
+    subjectTypes = _model["default"].subjectTypes;
+exports.subjectTypes = subjectTypes;
 exports.subjectCategories = subjectCategories;
 exports.contentTypes = contentTypes;
 var titleTemplate = ' - NDLA';
@@ -57,6 +59,7 @@ var messages = _objectSpread(_objectSpread({
     notSupported: 'It did not work to auto-insert the content. You can copy the source code and add it to your content.'
   },
   subjectCategories: (_subjectCategories = {}, _defineProperty(_subjectCategories, subjectCategories.ACTIVE_SUBJECTS, 'Active'), _defineProperty(_subjectCategories, subjectCategories.ARCHIVE_SUBJECTS, 'Expired'), _defineProperty(_subjectCategories, subjectCategories.BETA_SUBJECTS, 'Revised'), _defineProperty(_subjectCategories, subjectCategories.COMMON_SUBJECTS, 'Common core subj.'), _defineProperty(_subjectCategories, subjectCategories.PROGRAMME_SUBJECTS, 'Programme subj. SF'), _defineProperty(_subjectCategories, subjectCategories.SPECIALIZED_SUBJECTS, 'Programme subj. YF'), _subjectCategories),
+  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.SUBJECT, 'Subject'), _defineProperty(_subjectTypes, subjectTypes.RESOURCE_COLLECTION, 'Resource collection'), _subjectTypes),
   searchPage: {
     noHits: 'Your search - {{query}} - did not match any articles. ',
     noHitsShort: 'No results for search: {{query}}',
@@ -377,7 +380,7 @@ var messages = _objectSpread(_objectSpread({
       images: 'Images',
       audio: 'Audio',
       video: 'Video',
-      h5p: 'H5P',
+      h5p: 'h5p',
       files: 'Files',
       embedlink: 'Embedded link',
       other: 'Other content',

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-export declare const contentTypes: typeof import("../model/ContentType"), subjectCategories: typeof import("../model/SubjectCategories");
+export declare const contentTypes: typeof import("../model/ContentType"), subjectCategories: typeof import("../model/SubjectCategories"), subjectTypes: typeof import("../model/SubjectTypes");
 declare const messages: {
     filterButtons: {
         removeAllFilters: string;
@@ -81,6 +81,10 @@ declare const messages: {
         programme: string;
         specialized: string;
     };
+    subjectTypes: {
+        subject: string;
+        resourceCollection: string;
+    };
     searchPage: {
         noHits: string;
         noHitsShort: string;

package/lib/locale/messages-nb.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.subjectCategories = exports.contentTypes = void 0;
+exports["default"] = exports.subjectTypes = exports.subjectCategories = exports.contentTypes = void 0;
 
 var _licenses = require("@ndla/licenses");
 
 var _model = _interopRequireDefault(require("../model"));
 
-var _subjectCategories, _contentTypeResultsSh, _contentTypeResultsSh2, _contentTypeResultsNo;
+var _subjectCategories, _subjectTypes, _contentTypeResultsSh, _contentTypeResultsSh2, _contentTypeResultsNo;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -20,7 +20,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var contentTypes = _model["default"].contentTypes,
-    subjectCategories = _model["default"].subjectCategories;
+    subjectCategories = _model["default"].subjectCategories,
+    subjectTypes = _model["default"].subjectTypes;
+exports.subjectTypes = subjectTypes;
 exports.subjectCategories = subjectCategories;
 exports.contentTypes = contentTypes;
 var titleTemplate = ' - NDLA';
@@ -57,6 +59,7 @@ var messages = _objectSpread(_objectSpread({
     notSupported: 'Det fungerte ikke å sette inn innholdet automatisk. Kopier kildekoden under for å sette inn på din side.'
   },
   subjectCategories: (_subjectCategories = {}, _defineProperty(_subjectCategories, subjectCategories.ACTIVE_SUBJECTS, 'Aktive'), _defineProperty(_subjectCategories, subjectCategories.ARCHIVE_SUBJECTS, 'Utgåtte'), _defineProperty(_subjectCategories, subjectCategories.BETA_SUBJECTS, 'Kommende'), _defineProperty(_subjectCategories, subjectCategories.COMMON_SUBJECTS, 'Fellesfag'), _defineProperty(_subjectCategories, subjectCategories.PROGRAMME_SUBJECTS, 'Programfag SF'), _defineProperty(_subjectCategories, subjectCategories.SPECIALIZED_SUBJECTS, 'Yrkesfag'), _subjectCategories),
+  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.SUBJECT, 'Fag'), _defineProperty(_subjectTypes, subjectTypes.RESOURCE_COLLECTION, 'Ressurssamling'), _subjectTypes),
   searchPage: {
     noHits: 'Ingen artikler samsvarte med søket ditt på: {{query}}',
     noHitsShort: 'Ingen treff på søk: {{query}}',
@@ -392,7 +395,7 @@ var messages = _objectSpread(_objectSpread({
       images: 'Bilder',
       audio: 'Lyd',
       video: 'Video',
-      h5p: 'H5P',
+      h5p: 'h5p',
       files: 'Filer',
       embedlink: 'Innbyggingslenke',
       concept: 'Forklaringer',

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-export declare const contentTypes: typeof import("../model/ContentType"), subjectCategories: typeof import("../model/SubjectCategories");
+export declare const contentTypes: typeof import("../model/ContentType"), subjectCategories: typeof import("../model/SubjectCategories"), subjectTypes: typeof import("../model/SubjectTypes");
 declare const messages: {
     filterButtons: {
         removeAllFilters: string;
@@ -81,6 +81,10 @@ declare const messages: {
         programme: string;
         specialized: string;
     };
+    subjectTypes: {
+        subject: string;
+        resourceCollection: string;
+    };
     searchPage: {
         noHits: string;
         noHitsShort: string;

package/lib/locale/messages-nn.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.subjectCategories = exports.contentTypes = void 0;
+exports["default"] = exports.subjectTypes = exports.subjectCategories = exports.contentTypes = void 0;
 
 var _licenses = require("@ndla/licenses");
 
 var _model = _interopRequireDefault(require("../model"));
 
-var _subjectCategories, _contentTypeResultsSh, _contentTypeResultsSh2, _contentTypeResultsNo;
+var _subjectCategories, _subjectTypes, _contentTypeResultsSh, _contentTypeResultsSh2, _contentTypeResultsNo;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -20,7 +20,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var contentTypes = _model["default"].contentTypes,
-    subjectCategories = _model["default"].subjectCategories;
+    subjectCategories = _model["default"].subjectCategories,
+    subjectTypes = _model["default"].subjectTypes;
+exports.subjectTypes = subjectTypes;
 exports.subjectCategories = subjectCategories;
 exports.contentTypes = contentTypes;
 var titleTemplate = ' - NDLA';
@@ -57,6 +59,7 @@ var messages = _objectSpread(_objectSpread({
     notSupported: 'Det fungerte ikkje å setje inn innhaldet automatisk. Kopier kjeldekoden under for å setje han inn på sida di.'
   },
   subjectCategories: (_subjectCategories = {}, _defineProperty(_subjectCategories, subjectCategories.ACTIVE_SUBJECTS, 'Aktive'), _defineProperty(_subjectCategories, subjectCategories.ARCHIVE_SUBJECTS, 'Utgåtte'), _defineProperty(_subjectCategories, subjectCategories.BETA_SUBJECTS, 'Kommande'), _defineProperty(_subjectCategories, subjectCategories.COMMON_SUBJECTS, 'Fellesfag'), _defineProperty(_subjectCategories, subjectCategories.PROGRAMME_SUBJECTS, 'Programfag SF'), _defineProperty(_subjectCategories, subjectCategories.SPECIALIZED_SUBJECTS, 'Yrkesfag'), _subjectCategories),
+  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.SUBJECT, 'Fag'), _defineProperty(_subjectTypes, subjectTypes.RESOURCE_COLLECTION, 'Ressurssamling'), _subjectTypes),
   searchPage: {
     noHits: 'Ingen artiklar samsvarte med søket ditt på: {{query}}',
     noHitsShort: 'Ingen treff på søk: {{query}}',
@@ -392,7 +395,7 @@ var messages = _objectSpread(_objectSpread({
       images: 'Bilete',
       audio: 'Lyd',
       video: 'Video',
-      h5p: 'H5P',
+      h5p: 'h5p',
       files: 'Filer',
       embedlink: 'Innbyggingslenke',
       other: 'Anna innhald',

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-export declare const contentTypes: typeof import("../model/ContentType"), subjectCategories: typeof import("../model/SubjectCategories");
+export declare const contentTypes: typeof import("../model/ContentType"), subjectCategories: typeof import("../model/SubjectCategories"), subjectTypes: typeof import("../model/SubjectTypes");
 declare const messages: {
     filterButtons: {
         removeAllFilters: string;
@@ -81,6 +81,10 @@ declare const messages: {
         programme: string;
         specialized: string;
     };
+    subjectTypes: {
+        subject: string;
+        resourceCollection: string;
+    };
     searchPage: {
         noHits: string;
         noHitsShort: string;

package/lib/locale/messages-se.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.subjectCategories = exports.contentTypes = void 0;
+exports["default"] = exports.subjectTypes = exports.subjectCategories = exports.contentTypes = void 0;
 
 var _licenses = require("@ndla/licenses");
 
 var _model = _interopRequireDefault(require("../model"));
 
-var _subjectCategories, _contentTypeResultsSh, _contentTypeResultsSh2, _contentTypeResultsNo;
+var _subjectCategories, _subjectTypes, _contentTypeResultsSh, _contentTypeResultsSh2, _contentTypeResultsNo;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -20,7 +20,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var contentTypes = _model["default"].contentTypes,
-    subjectCategories = _model["default"].subjectCategories;
+    subjectCategories = _model["default"].subjectCategories,
+    subjectTypes = _model["default"].subjectTypes;
+exports.subjectTypes = subjectTypes;
 exports.subjectCategories = subjectCategories;
 exports.contentTypes = contentTypes;
 var titleTemplate = ' - NDLA';
@@ -57,6 +59,7 @@ var messages = _objectSpread(_objectSpread({
     notSupported: 'Det fungerte ikke å sette inn innholdet automatisk. Kopier kildekoden under for å sette inn på din side.'
   },
   subjectCategories: (_subjectCategories = {}, _defineProperty(_subjectCategories, subjectCategories.ACTIVE_SUBJECTS, 'Aktive'), _defineProperty(_subjectCategories, subjectCategories.ARCHIVE_SUBJECTS, 'Utgåtte'), _defineProperty(_subjectCategories, subjectCategories.BETA_SUBJECTS, 'Kommende'), _defineProperty(_subjectCategories, subjectCategories.COMMON_SUBJECTS, 'Fellesfag'), _defineProperty(_subjectCategories, subjectCategories.PROGRAMME_SUBJECTS, 'Programfag SF'), _defineProperty(_subjectCategories, subjectCategories.SPECIALIZED_SUBJECTS, 'Yrkesfag'), _subjectCategories),
+  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.SUBJECT, 'Fag'), _defineProperty(_subjectTypes, subjectTypes.RESOURCE_COLLECTION, 'Ressurssamling'), _subjectTypes),
   searchPage: {
     noHits: 'Ingen artikler samsvarte med søket ditt på: {{query}}',
     noHitsShort: 'Ingen treff på søk: {{query}}',

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-export declare const contentTypes: typeof import("../model/ContentType"), subjectCategories: typeof import("../model/SubjectCategories");
+export declare const contentTypes: typeof import("../model/ContentType"), subjectCategories: typeof import("../model/SubjectCategories"), subjectTypes: typeof import("../model/SubjectTypes");
 declare const messages: {
     filterButtons: {
         removeAllFilters: string;
@@ -81,6 +81,10 @@ declare const messages: {
         programme: string;
         specialized: string;
     };
+    subjectTypes: {
+        subject: string;
+        resourceCollection: string;
+    };
     searchPage: {
         noHits: string;
         noHitsShort: string;

package/lib/locale/messages-sma.js

@@ -3,13 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = exports.subjectCategories = exports.contentTypes = void 0;
+exports["default"] = exports.subjectTypes = exports.subjectCategories = exports.contentTypes = void 0;
 
 var _licenses = require("@ndla/licenses");
 
 var _model = _interopRequireDefault(require("../model"));
 
-var _subjectCategories, _contentTypeResultsSh, _contentTypeResultsSh2, _contentTypeResultsNo;
+var _subjectCategories, _subjectTypes, _contentTypeResultsSh, _contentTypeResultsSh2, _contentTypeResultsNo;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -20,7 +20,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var contentTypes = _model["default"].contentTypes,
-    subjectCategories = _model["default"].subjectCategories;
+    subjectCategories = _model["default"].subjectCategories,
+    subjectTypes = _model["default"].subjectTypes;
+exports.subjectTypes = subjectTypes;
 exports.subjectCategories = subjectCategories;
 exports.contentTypes = contentTypes;
 var titleTemplate = ' - NDLA';
@@ -57,6 +59,7 @@ var messages = _objectSpread(_objectSpread({
     notSupported: 'Det fungerte ikke å sette inn innholdet automatisk. Kopier kildekoden under for å sette inn på din side.'
   },
   subjectCategories: (_subjectCategories = {}, _defineProperty(_subjectCategories, subjectCategories.ACTIVE_SUBJECTS, 'Aktive'), _defineProperty(_subjectCategories, subjectCategories.ARCHIVE_SUBJECTS, 'Utgåtte'), _defineProperty(_subjectCategories, subjectCategories.BETA_SUBJECTS, 'Kommende'), _defineProperty(_subjectCategories, subjectCategories.COMMON_SUBJECTS, 'Fellesfag'), _defineProperty(_subjectCategories, subjectCategories.PROGRAMME_SUBJECTS, 'Programfag SF'), _defineProperty(_subjectCategories, subjectCategories.SPECIALIZED_SUBJECTS, 'Yrkesfag'), _subjectCategories),
+  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.SUBJECT, 'Fag'), _defineProperty(_subjectTypes, subjectTypes.RESOURCE_COLLECTION, 'Ressurssamling'), _subjectTypes),
   searchPage: {
     noHits: 'Ingen artikler samsvarte med søket ditt på: {{query}}',
     noHitsShort: 'Ingen treff på søk: {{query}}',

package/lib/{CloseButton/CloseButton.d.ts → model/SubjectTypes.d.ts}

@@ -5,6 +5,5 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
-import { ButtonHTMLAttributes } from 'react';
-export declare const CloseButton: (props: ButtonHTMLAttributes<HTMLButtonElement>) => JSX.Element;
-export default CloseButton;
+export declare const SUBJECT = "subject";
+export declare const RESOURCE_COLLECTION = "resourceCollection";

package/lib/model/SubjectTypes.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.RESOURCE_COLLECTION = exports.SUBJECT = void 0;
+
+/**
+ * Copyright (c) 2022-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+var SUBJECT = 'subject';
+exports.SUBJECT = SUBJECT;
+var RESOURCE_COLLECTION = 'resourceCollection';
+exports.RESOURCE_COLLECTION = RESOURCE_COLLECTION;

package/lib/model/index.d.ts

@@ -7,8 +7,10 @@
  */
 import * as contentTypes from './ContentType';
 import * as subjectCategories from './SubjectCategories';
+import * as subjectTypes from './SubjectTypes';
 declare const model: {
     contentTypes: typeof contentTypes;
     subjectCategories: typeof subjectCategories;
+    subjectTypes: typeof subjectTypes;
 };
 export default model;

package/lib/model/index.js

@@ -11,6 +11,8 @@ var contentTypes = _interopRequireWildcard(require("./ContentType"));
 
 var subjectCategories = _interopRequireWildcard(require("./SubjectCategories"));
 
+var subjectTypes = _interopRequireWildcard(require("./SubjectTypes"));
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (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; }
@@ -24,7 +26,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
  */
 var model = {
   contentTypes: contentTypes,
-  subjectCategories: subjectCategories
+  subjectCategories: subjectCategories,
+  subjectTypes: subjectTypes
 };
 var _default = model;
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "8.2.3",
+  "version": "9.0.0",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,16 +31,16 @@
     "types"
   ],
   "dependencies": {
-    "@ndla/button": "^2.1.5",
-    "@ndla/carousel": "^1.2.5",
+    "@ndla/button": "^2.2.0",
+    "@ndla/carousel": "^1.2.6",
     "@ndla/core": "^2.1.1",
     "@ndla/hooks": "^1.1.3",
-    "@ndla/icons": "^1.6.1",
-    "@ndla/licenses": "^4.0.5",
-    "@ndla/modal": "^1.2.5",
-    "@ndla/safelink": "^1.1.6",
+    "@ndla/icons": "^1.7.0",
+    "@ndla/licenses": "^4.1.0",
+    "@ndla/modal": "^1.2.6",
+    "@ndla/safelink": "^1.1.7",
     "@ndla/switch": "^0.1.5",
-    "@ndla/tabs": "^1.1.3",
+    "@ndla/tabs": "^1.1.4",
     "@ndla/tooltip": "^0.3.5",
     "@ndla/util": "^2.0.5",
     "@reach/menu-button": "^0.16.2",
@@ -80,5 +80,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cad80f3c7f0d81b01bacf0599885670d63c7e0a4"
+  "gitHead": "76c237a1e2d807c08054f066bbf5b274010c0e02"
 }

package/src/Article/ArticleNotions.tsx

@@ -159,9 +159,10 @@ type ArticleNotionsProps = {
   notions: ConceptNotionType[];
   relatedContent?: NotionRelatedContent[];
   buttonOffsetRight: number;
+  type?: 'image' | 'video' | 'h5p' | 'iframe' | 'external';
 };
 
-export const ArticleNotions = ({ notions, relatedContent = [], buttonOffsetRight }: ArticleNotionsProps) => {
+export const ArticleNotions = ({ notions, relatedContent = [], buttonOffsetRight, type }: ArticleNotionsProps) => {
   const { t } = useTranslation();
   const leftOffset = `${buttonOffsetRight - 32}px`;
   return (
@@ -188,7 +189,7 @@ export const ArticleNotions = ({ notions, relatedContent = [], buttonOffsetRight
               </ModalHeadingContainer>
               <NotionsContainer>
                 {notions.map((notion) => (
-                  <ConceptNotion key={notion.id} concept={notion} />
+                  <ConceptNotion key={notion.id} concept={notion} type={type} />
                 ))}
               </NotionsContainer>
               {relatedContent.length > 0 && (

package/src/Figure/Figure.tsx

@@ -35,57 +35,64 @@ export const FigureCaption = ({
   link,
   hideFigcaption,
   hasLinkedVideo,
+  hideIconsAndAuthors,
 }: FigureCaptionProps) => {
   const { t } = useTranslation();
+
   return (
-    <figcaption {...classes('caption', hideFigcaption ? 'hidden-caption' : undefined)}>
-      {caption ? <div {...classes('info')}>{parseMarkdown(caption)}</div> : null}
-      <footer {...classes('byline')}>
-        <div {...classes('byline-licenselist')}>
-          <LicenseByline licenseRights={licenseRights} locale={locale} marginRight>
-            <div {...classes('byline-author-buttons')}>
-              <span {...classes('byline-authors')}>{authors?.map((author) => author.name).join(', ')}</span>
-              <div>
-                <Button
-                  borderShape="rounded"
-                  outline
-                  size="small"
-                  type="button"
-                  data-dialog-trigger-id={id}
-                  data-dialog-source-id={figureId}>
-                  {reuseLabel}
-                </Button>
-                {hasLinkedVideo && (
+    <>
+      <figcaption {...classes('caption', hideFigcaption ? 'hidden-caption' : undefined)}>
+        {caption ? <div {...classes('info')}>{parseMarkdown(caption)}</div> : null}
+        <footer {...classes('byline')}>
+          <div {...classes('byline-licenselist')}>
+            <LicenseByline licenseRights={hideIconsAndAuthors ? [] : licenseRights} locale={locale} marginRight>
+              <div {...classes('byline-author-buttons', hideIconsAndAuthors ? 'no-siblings' : undefined)}>
+                {!hideIconsAndAuthors && (
+                  <span {...classes('byline-authors')}>{authors?.map((author) => author.name).join(', ')}</span>
+                )}
+                <div>
                   <Button
                     borderShape="rounded"
                     outline
                     size="small"
                     type="button"
-                    {...classes('toggleAlternativeVideo')}>
-                    <span className="original">{t('figure.button.alternative')}</span>
-                    <span className="alternative hidden">{t('figure.button.original')}</span>
+                    data-dialog-trigger-id={id}
+                    data-dialog-source-id={figureId}>
+                    {reuseLabel}
                   </Button>
-                )}
+                  {hasLinkedVideo && (
+                    <Button
+                      borderShape="rounded"
+                      outline
+                      size="small"
+                      type="button"
+                      {...classes('toggleAlternativeVideo')}>
+                      <span className="original">{t('figure.button.alternative')}</span>
+                      <span className="alternative hidden">{t('figure.button.original')}</span>
+                    </Button>
+                  )}
+                </div>
+                {children}
+              </div>
+            </LicenseByline>
+
+            {link && (
+              <div {...classes('link-wrapper')}>
+                <SafeLink
+                  to={link.url}
+                  {...classes('link')}
+                  target={link.external ? '_blank' : undefined}
+                  rel={link.external ? 'noopener noreferrer' : undefined}>
+                  <span {...classes('link-text')}>{link.text}</span>
+                  <LinkIcon />
+                </SafeLink>
+                {link.description && <p {...classes('link-description')}>{link.description}</p>}
               </div>
-              {children}
-            </div>
-          </LicenseByline>
-          {link && (
-            <div {...classes('link-wrapper')}>
-              <SafeLink
-                to={link.url}
-                {...classes('link')}
-                target={link.external ? '_blank' : undefined}
-                rel={link.external ? 'noopener noreferrer' : undefined}>
-                <span {...classes('link-text')}>{link.text}</span>
-                <LinkIcon />
-              </SafeLink>
-              {link.description && <p {...classes('link-description')}>{link.description}</p>}
-            </div>
-          )}
-        </div>
-      </footer>
-    </figcaption>
+            )}
+          </div>
+        </footer>
+      </figcaption>
+    </>
   );
 };
 
@@ -116,6 +123,7 @@ interface FigureCaptionProps {
   locale?: string;
   hideFigcaption?: boolean;
   hasLinkedVideo?: boolean;
+  hideIconsAndAuthors?: boolean;
 }
 
 const Figure = ({ children, type = 'full', resizeIframe, ...rest }: Props) => {

package/src/Figure/FigureExpandButton.tsx

@@ -15,13 +15,13 @@ export function FigureExpandButton({ messages, typeClass }: Props) {
     <button
       className="c-figure__fullscreen-btn"
       type="button"
-      data-figure-button
-      data-classtype={typeClass}
       data-aria={messages.zoomImageButtonLabel}
       data-ariaexpanded={messages.zoomOutImageButtonLabel}
-      aria-label={messages.zoomImageButtonLabel}>
-      <ArrowCollapse className="expanded-icon" />
+      aria-label={messages.zoomImageButtonLabel}
+      data-figure-button
+      data-classtype={typeClass}>
       <ExpandTwoArrows className="contracted-icon" />
+      <ArrowCollapse className="expanded-icon" />
     </button>
   );
 }