@ndla/ui 4.1.1 → 4.1.4

package/lib/locale/messages-en.js

@@ -56,7 +56,7 @@ var messages = _objectSpread(_objectSpread({
     embed: 'Embed',
     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, 'Coming'), _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),
+  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),
   searchPage: {
     noHits: 'Your search - {{query}} - did not match any articles. ',
     noHitsShort: 'No results for search: {{query}}',
@@ -298,7 +298,7 @@ var messages = _objectSpread(_objectSpread({
     beta: 'This course is in beta.',
     outdatedSubject: 'This topic is part of a course that is not updated to the current curriculum.',
     newVersion: 'This learning resource is not updated to the current curriculum. You can find an updated version here: ',
-    frontPageBeta: 'Beta versions of subjects are subjects we are still working on. We hope, however, that the learning resources available by now may come in useful already.',
+    frontPageBeta: 'Revised subjects have been revised in accordance with the new curriculum that will be put into effect from August 2022. Beta versions of subjects are subjects we are still working on. We hope, however, that the learning resources available by now may come in useful already.',
     frontPageExpired: 'Expired subjects are not being taught any longer, but it may still be possible to take exams in these subjects.',
     frontPageRevised: 'Revised subjects have been revised in accordance with the new curriculum that will be put into effect from August 2022.'
   },
@@ -568,6 +568,9 @@ var messages = _objectSpread(_objectSpread({
         openFilter: 'Filter',
         closeFilter: 'Close filter',
         heading: 'Filter'
+      },
+      alphabet: {
+        letterFilter: 'Filter content by the letter {{letter}}.'
       }
     },
     relatedLinks: {
@@ -737,7 +740,7 @@ var messages = _objectSpread(_objectSpread({
   },
   frontpageMultidisciplinarySubject: {
     heading: 'Interdisciplinary topics',
-    text: 'The three interdisciplinary subjects in the curriculum are based on current societal challenges that require the involvement and efforts of individuals and the community in the local community, nationally and globally.',
+    text: 'The three interdisciplinary topics in the curriculum are based on current societal challenges that require the involvement and efforts of individuals and the community in the local community, nationally and globally.',
     linkText: 'See cases for multidisciplinary topics',
     publicHealthTopic: 'Public health and life management',
     democracyTopic: 'Democracy and citizenship',
@@ -760,6 +763,10 @@ var messages = _objectSpread(_objectSpread({
   multidisciplinarySubject: {
     subjectsLinksDescription: 'Case in'
   },
+  multibutton: {
+    open: 'Open menu',
+    close: 'Close menu'
+  },
   close: 'Close',
   title: 'Title',
   image: {
@@ -846,7 +853,11 @@ var messages = _objectSpread(_objectSpread({
       accessDenied: 'We are sorry, but this resource is only available to teachers who are logged in with Feide.'
     }
   },
-  checkOutNewFeature: 'New feature'
+  checkOutNewFeature: 'New feature',
+  slateBlockMenu: {
+    open: 'Open menu',
+    close: 'Close menu'
+  }
 });
 
 var _default = messages;

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

@@ -35,6 +35,10 @@ declare const messages: {
         };
     };
     checkOutNewFeature: string;
+    slateBlockMenu: {
+        open: string;
+        close: string;
+    };
     htmlTitles: {
         titleTemplate: string;
         welcomePage: string;
@@ -609,6 +613,9 @@ declare const messages: {
                 closeFilter: string;
                 heading: string;
             };
+            alphabet: {
+                letterFilter: string;
+            };
         };
         relatedLinks: {
             label: string;
@@ -800,6 +807,10 @@ declare const messages: {
     multidisciplinarySubject: {
         subjectsLinksDescription: string;
     };
+    multibutton: {
+        open: string;
+        close: string;
+    };
     close: string;
     title: string;
     image: {

package/lib/locale/messages-nb.js

@@ -298,7 +298,7 @@ var messages = _objectSpread(_objectSpread({
     beta: 'Dette faget er i betaversjon.',
     outdatedSubject: 'Dette emnet hører til et fag som ikke er oppdatert etter gjeldende læreplan.',
     newVersion: 'Denne læringsressursen er ikke oppdatert etter gjeldende læreplan. Du finner en oppdatert versjon her: ',
-    frontPageBeta: 'Betafag er fag under arbeid. Vi håper likevel at læringsressursene i betafaga kan være nyttige allerede nå.',
+    frontPageBeta: 'Kommende fag er tilpassa ny læreplan som gjelder fra høsten 2022. Betafag er fag under arbeid. Vi håper likevel at læringsressursene i betafaga kan være nyttige allerede nå.',
     frontPageExpired: 'Utgåtte fag undervises det ikke i lenger, men det kan fortsatt være mulig å ta eksamen i faga som privatist.',
     frontPageRevised: 'Kommende fag er tilpassa ny læreplan som gjelder fra høsten 2022.'
   },
@@ -568,6 +568,9 @@ var messages = _objectSpread(_objectSpread({
         openFilter: 'Filtrer',
         closeFilter: 'Lukk filter',
         heading: 'Filter'
+      },
+      alphabet: {
+        letterFilter: 'Vis innhald på (bokstaven) {{letter}}.'
       }
     },
     relatedLinks: {
@@ -760,6 +763,10 @@ var messages = _objectSpread(_objectSpread({
   multidisciplinarySubject: {
     subjectsLinksDescription: 'Case innen'
   },
+  multibutton: {
+    open: 'Åpne meny',
+    close: 'Lukk meny'
+  },
   close: 'Lukk',
   title: 'Tittel',
   image: {
@@ -846,7 +853,11 @@ var messages = _objectSpread(_objectSpread({
       accessDenied: 'Vi beklager, men denne ressursen er bare for lærere innlogget med Feide.'
     }
   },
-  checkOutNewFeature: 'Sjekk ut ny funksjonalitet'
+  checkOutNewFeature: 'Sjekk ut ny funksjonalitet',
+  slateBlockMenu: {
+    open: 'Åpne meny',
+    close: 'Lukk meny'
+  }
 });
 
 var _default = messages;

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

@@ -35,6 +35,10 @@ declare const messages: {
         };
     };
     checkOutNewFeature: string;
+    slateBlockMenu: {
+        open: string;
+        close: string;
+    };
     htmlTitles: {
         titleTemplate: string;
         welcomePage: string;
@@ -609,6 +613,9 @@ declare const messages: {
                 closeFilter: string;
                 heading: string;
             };
+            alphabet: {
+                letterFilter: string;
+            };
         };
         relatedLinks: {
             label: string;
@@ -800,6 +807,10 @@ declare const messages: {
     multidisciplinarySubject: {
         subjectsLinksDescription: string;
     };
+    multibutton: {
+        open: string;
+        close: string;
+    };
     close: string;
     title: string;
     image: {

package/lib/locale/messages-nn.js

@@ -298,7 +298,7 @@ var messages = _objectSpread(_objectSpread({
     beta: 'Dette faget er i betaversjon.',
     outdatedSubject: 'Dette emnet høyrer til eit fag som ikkje er oppdatert etter gjeldande læreplan.',
     newVersion: 'Denne læringsressursen er ikkje oppdatert etter gjeldande læreplan. Du finn ein oppdatert versjon her: ',
-    frontPageBeta: 'Betafag er fag under arbeid. Vi håper likevel at læringsressursane i betafaga kan vere nyttige allereie no.',
+    frontPageBeta: 'Kommande fag er tilpassa ny læreplan som gjeld fra hausten 2022. Betafag er fag under arbeid. Vi håper likevel at læringsressursane i betafaga kan vere nyttige allereie no.',
     frontPageExpired: 'Utgåtte fag blir det ikkje undervist i lenger, men det kan framleis vere mogleg å ta eksamen i faget som privatist.',
     frontPageRevised: 'Kommande fag er tilpassa ny læreplan som gjeld frå hausten 2022.'
   },
@@ -568,6 +568,9 @@ var messages = _objectSpread(_objectSpread({
         openFilter: 'Filtrer',
         closeFilter: 'Lukk filter',
         heading: 'Filter'
+      },
+      alphabet: {
+        letterFilter: 'Vis innhold på {{letter}}.'
       }
     },
     relatedLinks: {
@@ -760,6 +763,10 @@ var messages = _objectSpread(_objectSpread({
   multidisciplinarySubject: {
     subjectsLinksDescription: 'Case innan'
   },
+  multibutton: {
+    open: 'Åpne meny',
+    close: 'Lukk meny'
+  },
   close: 'Lukk',
   title: 'Tittel',
   image: {
@@ -846,7 +853,11 @@ var messages = _objectSpread(_objectSpread({
       accessDenied: 'Vi beklagar, men denne ressursen er berre for lærarar innlogga med Feide.'
     }
   },
-  checkOutNewFeature: 'Sjekk ut ny funksjonalitet'
+  checkOutNewFeature: 'Sjekk ut ny funksjonalitet',
+  slateBlockMenu: {
+    open: 'Åpne meny',
+    close: 'Lukk meny'
+  }
 });
 
 var _default = messages;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "4.1.1",
+  "version": "4.1.4",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,40 +31,32 @@
     "types"
   ],
   "dependencies": {
-    "@ndla/button": "^1.1.9",
-    "@ndla/carousel": "^1.1.5",
+    "@ndla/button": "^1.1.10",
+    "@ndla/carousel": "^1.1.6",
     "@ndla/core": "^0.7.3",
     "@ndla/hooks": "^1.0.8",
     "@ndla/icons": "^1.5.0",
-    "@ndla/licenses": "^2.1.0",
-    "@ndla/modal": "^1.1.25",
-    "@ndla/safelink": "^1.0.13",
+    "@ndla/licenses": "^2.1.1",
+    "@ndla/modal": "^1.1.26",
+    "@ndla/safelink": "^1.0.14",
     "@ndla/switch": "^0.0.34",
-    "@ndla/tabs": "^1.0.18",
-    "@ndla/tooltip": "^0.2.51",
+    "@ndla/tabs": "^1.0.19",
+    "@ndla/tooltip": "^0.2.52",
     "@ndla/util": "^2.0.2",
     "@reach/menu-button": "^0.12.1",
     "@reach/slider": "^0.12.1",
-    "@types/hoist-non-react-statics": "^3.3.1",
-    "@types/react-syntax-highlighter": "^13.5.2",
-    "classnames": "2.2.6",
-    "focus-trap": "^4.0.2",
     "focus-trap-react": "^6.0.0",
-    "hoist-non-react-statics": "^3.3.0",
     "html-react-parser": "^0.10.3",
     "i18next-browser-languagedetector": "^6.1.1",
     "intl-format-cache": "^4.3.1",
     "intl-messageformat": "5.4.3",
     "invariant": "^2.2.3",
-    "jump.js": "^1.0.2",
     "lodash": "^4.17.20",
     "react-bem-helper": "1.4.1",
     "react-device-detect": "^2.1.2",
     "react-facebook": "^6.0.15",
-    "react-prop-types": "0.4.0",
     "react-sticky-el": "^2.0.6",
     "react-swipeable": "^6.2.0",
-    "react-syntax-highlighter": "^15.4.4",
     "react-transition-group": "^2.5.3",
     "shave": "^2.5.10"
   },
@@ -82,8 +74,6 @@
     "@types/react-sticky-el": "^1.0.2",
     "@types/react-transition-group": "^4.4.2",
     "css-loader": "^2.1.0",
-    "enzyme": "^3.8.0",
-    "enzyme-adapter-react-16": "^1.9.1",
     "mini-css-extract-plugin": "^0.5.0",
     "sass-loader": "^7.1.0",
     "webpack": "^4.44.1",
@@ -92,5 +82,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "21b02c53640dba75be16857b4b7ba5771d83d55b"
+  "gitHead": "45290b8379a458b8f1cc1bd0f5fe436494c75e1d"
 }

package/src/Frontpage/FrontpageProgramMenu.tsx

@@ -88,7 +88,6 @@ type Props = {
   programItems: ItemProps[];
   subjectCategories: subjectsProps['categories'];
   showBetaCursor?: boolean;
-  messageBox: boolean;
 };
 
 const FrontpageProgramMenu = ({ programItems, subjectCategories, showBetaCursor }: Props) => {

package/src/Masthead/Masthead.tsx

@@ -7,8 +7,6 @@
  */
 
 import React, { ReactNode } from 'react';
-//@ts-ignore
-import classNames from 'classnames';
 import BEMHelper from 'react-bem-helper';
 import { WithTranslation, withTranslation } from 'react-i18next';
 import { DisplayOnPageYOffset } from '../Animation';
@@ -25,11 +23,8 @@ interface MastheadItemProps {
   left?: boolean;
 }
 export const MastheadItem = ({ children, className, left = false, right = false }: MastheadItemProps) => {
-  const itemClassNames = classNames(
-    { [classes('left').className]: left },
-    { [classes('right').className]: right },
-    className,
-  );
+  const itemClassName = left ? 'left' : right ? 'right' : undefined;
+  const itemClassNames = itemClassName ? classes(itemClassName).className : undefined;
 
   return <div className={itemClassNames}>{children}</div>;
 };

package/src/locale/messages-en.ts

@@ -48,7 +48,7 @@ const messages = {
   subjectCategories: {
     [subjectCategories.ACTIVE_SUBJECTS]: 'Active',
     [subjectCategories.ARCHIVE_SUBJECTS]: 'Expired',
-    [subjectCategories.BETA_SUBJECTS]: 'Coming',
+    [subjectCategories.BETA_SUBJECTS]: 'Revised',
     [subjectCategories.COMMON_SUBJECTS]: 'Common core subj.',
     [subjectCategories.PROGRAMME_SUBJECTS]: 'Programme subj. SF',
     [subjectCategories.SPECIALIZED_SUBJECTS]: 'Programme subj. YF',
@@ -328,7 +328,7 @@ const messages = {
     newVersion:
       'This learning resource is not updated to the current curriculum. You can find an updated version here: ',
     frontPageBeta:
-      'Beta versions of subjects are subjects we are still working on. We hope, however, that the learning resources available by now may come in useful already.',
+      'Revised subjects have been revised in accordance with the new curriculum that will be put into effect from August 2022. Beta versions of subjects are subjects we are still working on. We hope, however, that the learning resources available by now may come in useful already.',
     frontPageExpired:
       'Expired subjects are not being taught any longer, but it may still be possible to take exams in these subjects.',
     frontPageRevised:
@@ -601,6 +601,9 @@ const messages = {
         closeFilter: 'Close filter',
         heading: 'Filter',
       },
+      alphabet: {
+        letterFilter: 'Filter content by the letter {{letter}}.',
+      },
     },
     relatedLinks: {
       label: 'Related articles',
@@ -774,7 +777,7 @@ const messages = {
   },
   frontpageMultidisciplinarySubject: {
     heading: 'Interdisciplinary topics',
-    text: 'The three interdisciplinary subjects in the curriculum are based on current societal challenges that require the involvement and efforts of individuals and the community in the local community, nationally and globally.',
+    text: 'The three interdisciplinary topics in the curriculum are based on current societal challenges that require the involvement and efforts of individuals and the community in the local community, nationally and globally.',
     linkText: 'See cases for multidisciplinary topics',
     publicHealthTopic: 'Public health and life management',
     democracyTopic: 'Democracy and citizenship',
@@ -797,6 +800,10 @@ const messages = {
   multidisciplinarySubject: {
     subjectsLinksDescription: 'Case in',
   },
+  multibutton: {
+    open: 'Open menu',
+    close: 'Close menu',
+  },
   close: 'Close',
   title: 'Title',
   image: {
@@ -884,6 +891,10 @@ const messages = {
     },
   },
   checkOutNewFeature: 'New feature',
+  slateBlockMenu: {
+    open: 'Open menu',
+    close: 'Close menu',
+  },
 };
 
 export default messages;

package/src/locale/messages-nb.ts

@@ -327,7 +327,7 @@ const messages = {
     newVersion:
       'Denne læringsressursen er ikke oppdatert etter gjeldende læreplan. Du finner en oppdatert versjon her: ',
     frontPageBeta:
-      'Betafag er fag under arbeid. Vi håper likevel at læringsressursene i betafaga kan være nyttige allerede nå.',
+      'Kommende fag er tilpassa ny læreplan som gjelder fra høsten 2022. Betafag er fag under arbeid. Vi håper likevel at læringsressursene i betafaga kan være nyttige allerede nå.',
     frontPageExpired:
       'Utgåtte fag undervises det ikke i lenger, men det kan fortsatt være mulig å ta eksamen i faga som privatist.',
     frontPageRevised: 'Kommende fag er tilpassa ny læreplan som gjelder fra høsten 2022.',
@@ -599,6 +599,9 @@ const messages = {
         closeFilter: 'Lukk filter',
         heading: 'Filter',
       },
+      alphabet: {
+        letterFilter: 'Vis innhald på (bokstaven) {{letter}}.',
+      },
     },
     relatedLinks: {
       label: 'Tilknyttede artikler',
@@ -795,6 +798,10 @@ const messages = {
   multidisciplinarySubject: {
     subjectsLinksDescription: 'Case innen',
   },
+  multibutton: {
+    open: 'Åpne meny',
+    close: 'Lukk meny',
+  },
   close: 'Lukk',
   title: 'Tittel',
   image: {
@@ -882,6 +889,10 @@ const messages = {
     },
   },
   checkOutNewFeature: 'Sjekk ut ny funksjonalitet',
+  slateBlockMenu: {
+    open: 'Åpne meny',
+    close: 'Lukk meny',
+  },
 };
 
 export default messages;

package/src/locale/messages-nn.ts

@@ -328,7 +328,7 @@ const messages = {
     newVersion:
       'Denne læringsressursen er ikkje oppdatert etter gjeldande læreplan. Du finn ein oppdatert versjon her: ',
     frontPageBeta:
-      'Betafag er fag under arbeid. Vi håper likevel at læringsressursane i betafaga kan vere nyttige allereie no.',
+      'Kommande fag er tilpassa ny læreplan som gjeld fra hausten 2022. Betafag er fag under arbeid. Vi håper likevel at læringsressursane i betafaga kan vere nyttige allereie no.',
     frontPageExpired:
       'Utgåtte fag blir det ikkje undervist i lenger, men det kan framleis vere mogleg å ta eksamen i faget som privatist.',
     frontPageRevised: 'Kommande fag er tilpassa ny læreplan som gjeld frå hausten 2022.',
@@ -600,6 +600,9 @@ const messages = {
         closeFilter: 'Lukk filter',
         heading: 'Filter',
       },
+      alphabet: {
+        letterFilter: 'Vis innhold på {{letter}}.',
+      },
     },
     relatedLinks: {
       label: 'Tilknytta artiklar',
@@ -796,6 +799,10 @@ const messages = {
   multidisciplinarySubject: {
     subjectsLinksDescription: 'Case innan',
   },
+  multibutton: {
+    open: 'Åpne meny',
+    close: 'Lukk meny',
+  },
   close: 'Lukk',
   title: 'Tittel',
   image: {
@@ -883,6 +890,10 @@ const messages = {
     },
   },
   checkOutNewFeature: 'Sjekk ut ny funksjonalitet',
+  slateBlockMenu: {
+    open: 'Åpne meny',
+    close: 'Lukk meny',
+  },
 };
 
 export default messages;