@ndla/ui 30.0.5 → 30.0.7

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

@@ -102,6 +102,7 @@ declare const messages: {
         detailView: string;
         shortView: string;
         myPage: {
+            imageAlt: string;
             confirmDeleteAccount: string;
             confirmDeleteAccountButton: string;
             myPage: string;
@@ -278,6 +279,7 @@ declare const messages: {
         resourceCollection: string;
     };
     subjectTypes: {
+        betaSubject: string;
         subject: string;
         resourceCollection: string;
     };

package/lib/locale/messages-nb.js

@@ -119,7 +119,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, subjectTypes.RESOURCE_COLLECTION, 'Andre ressurser'), _subjectCategories),
-  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.SUBJECT, 'Fag'), _defineProperty(_subjectTypes, subjectTypes.RESOURCE_COLLECTION, 'Ressurssamling'), _subjectTypes),
+  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.BETA_SUBJECT, 'Betafag'), _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}}',
@@ -1031,6 +1031,7 @@ var messages = _objectSpread(_objectSpread({
     detailView: 'Detaljert listevisning',
     shortView: 'Kort visning',
     myPage: {
+      imageAlt: 'Halvnært bilde av jente som holder et nettbrett i hendene. Oppå nettbrettet ligger det ei samling fargeprøver i ulike former og farger. Grafikk.',
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
       myPage: 'Min side',

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

@@ -102,6 +102,7 @@ declare const messages: {
         detailView: string;
         shortView: string;
         myPage: {
+            imageAlt: string;
             confirmDeleteAccount: string;
             confirmDeleteAccountButton: string;
             myPage: string;
@@ -278,6 +279,7 @@ declare const messages: {
         resourceCollection: string;
     };
     subjectTypes: {
+        betaSubject: string;
         subject: string;
         resourceCollection: string;
     };

package/lib/locale/messages-nn.js

@@ -119,7 +119,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, subjectTypes.RESOURCE_COLLECTION, 'Andre ressursar'), _subjectCategories),
-  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.SUBJECT, 'Fag'), _defineProperty(_subjectTypes, subjectTypes.RESOURCE_COLLECTION, 'Ressurssamling'), _subjectTypes),
+  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.BETA_SUBJECT, 'Betafag'), _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}}',
@@ -1031,6 +1031,7 @@ var messages = _objectSpread(_objectSpread({
     detailView: 'Detaljert listevisning',
     shortView: 'Kortvisning',
     myPage: {
+      imageAlt: 'Halvnært bilete av jente som held eit nettbrett i hendene. Oppå nettbrettet ligg det ei samling fargeprøver i ulike former og fargar. Grafikk.',
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
       myPage: 'Mi side',
@@ -1076,7 +1077,7 @@ var messages = _objectSpread(_objectSpread({
       }
     },
     resource: {
-      add: 'Legg til mappe/tag',
+      add: 'Legg til mappe/emneknagg',
       remove: 'Fjern',
       removeTitle: 'Fjern ressurs',
       confirmRemove: 'Er du sikker på at du ønsker å fjerne ressursen frå denne mappa?',

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

@@ -102,6 +102,7 @@ declare const messages: {
         detailView: string;
         shortView: string;
         myPage: {
+            imageAlt: string;
             confirmDeleteAccount: string;
             confirmDeleteAccountButton: string;
             myPage: string;
@@ -278,6 +279,7 @@ declare const messages: {
         resourceCollection: string;
     };
     subjectTypes: {
+        betaSubject: string;
         subject: string;
         resourceCollection: string;
     };

package/lib/locale/messages-se.js

@@ -119,7 +119,7 @@ var messages = _objectSpread(_objectSpread({
     notSupported: 'Ii lean vejolaš bidjat sisdoalu sisa automáhtalaččat. Kopiere gáldokoda vulobealde ja bija iežat siidui.'
   },
   subjectCategories: (_subjectCategories = {}, _defineProperty(_subjectCategories, subjectCategories.ACTIVE_SUBJECTS, 'Doaimmas'), _defineProperty(_subjectCategories, subjectCategories.ARCHIVE_SUBJECTS, 'Ii doaimmas šat'), _defineProperty(_subjectCategories, subjectCategories.BETA_SUBJECTS, 'Boahttevaš'), _defineProperty(_subjectCategories, subjectTypes.RESOURCE_COLLECTION, 'Eará resurssat'), _subjectCategories),
-  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.SUBJECT, 'Fága'), _defineProperty(_subjectTypes, subjectTypes.RESOURCE_COLLECTION, 'Resursačoakkáldat'), _subjectTypes),
+  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.BETA_SUBJECT, 'Betafága'), _defineProperty(_subjectTypes, subjectTypes.SUBJECT, 'Fága'), _defineProperty(_subjectTypes, subjectTypes.RESOURCE_COLLECTION, 'Resursačoakkáldat'), _subjectTypes),
   searchPage: {
     noHits: 'Ii oktage artihkal heiven du ohcamii: {{query}}',
     noHitsShort: 'Du ohcamii ii lean deaivva: {{query}}',
@@ -1031,6 +1031,7 @@ var messages = _objectSpread(_objectSpread({
     detailView: 'Bienalaš oppalašlistu',
     shortView: 'Oanehis listu',
     myPage: {
+      imageAlt: 'Halvnært bilde av jente som holder et nettbrett i hendene. Oppå nettbrettet ligger det ei samling fargeprøver i ulike former og farger. Grafikk.',
       confirmDeleteAccount: 'Leat go sihkar ahte dáhtut sihkkut kontu?',
       confirmDeleteAccountButton: 'Sihko kontu',
       myPage: 'Mu siidu',

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

@@ -102,6 +102,7 @@ declare const messages: {
         detailView: string;
         shortView: string;
         myPage: {
+            imageAlt: string;
             confirmDeleteAccount: string;
             confirmDeleteAccountButton: string;
             myPage: string;
@@ -278,6 +279,7 @@ declare const messages: {
         resourceCollection: string;
     };
     subjectTypes: {
+        betaSubject: string;
         subject: string;
         resourceCollection: string;
     };

package/lib/locale/messages-sma.js

@@ -119,7 +119,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, subjectTypes.RESOURCE_COLLECTION, 'Andre ressurser'), _subjectCategories),
-  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.SUBJECT, 'Fag'), _defineProperty(_subjectTypes, subjectTypes.RESOURCE_COLLECTION, 'Ressurssamling'), _subjectTypes),
+  subjectTypes: (_subjectTypes = {}, _defineProperty(_subjectTypes, subjectTypes.BETA_SUBJECT, 'Betafag'), _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}}',
@@ -1031,6 +1031,7 @@ var messages = _objectSpread(_objectSpread({
     detailView: 'Detaljert listevisning',
     shortView: 'Kort visning',
     myPage: {
+      imageAlt: 'Halvnært bilde av jente som holder et nettbrett i hendene. Oppå nettbrettet ligger det ei samling fargeprøver i ulike former og farger. Grafikk.',
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
       myPage: 'Min side',

package/lib/model/SubjectTypes.d.ts

@@ -5,5 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  *
  */
+export declare const BETA_SUBJECT = "betaSubject";
 export declare const SUBJECT = "subject";
 export declare const RESOURCE_COLLECTION = "resourceCollection";

package/lib/model/SubjectTypes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RESOURCE_COLLECTION = exports.SUBJECT = void 0;
+exports.RESOURCE_COLLECTION = exports.SUBJECT = exports.BETA_SUBJECT = void 0;
 
 /**
  * Copyright (c) 2022-present, NDLA.
@@ -12,6 +12,8 @@ exports.RESOURCE_COLLECTION = exports.SUBJECT = void 0;
  * LICENSE file in the root directory of this source tree.
  *
  */
+var BETA_SUBJECT = 'betaSubject';
+exports.BETA_SUBJECT = BETA_SUBJECT;
 var SUBJECT = 'subject';
 exports.SUBJECT = SUBJECT;
 var RESOURCE_COLLECTION = 'resourceCollection';

package/lib/utils/createUniversalPortal.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createUniversalPortal = createUniversalPortal;
 
+var _jsxRuntime = require("@emotion/react/jsx-runtime");
+
 var _react = _interopRequireDefault(require("react"));
 
 var _reactDom = _interopRequireDefault(require("react-dom"));
 
-var _react2 = require("@emotion/react");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 /**
@@ -27,9 +27,10 @@ function canUseDOM() {
 
 function createUniversalPortal(children, selector) {
   if (!canUseDOM()) {
-    return (0, _react2.jsx)("div", {
-      "data-react-universal-portal": true
-    }, children);
+    return (0, _jsxRuntime.jsx)("div", {
+      "data-react-universal-portal": true,
+      children: children
+    });
   }
 
   return /*#__PURE__*/_reactDom["default"].createPortal(children, document.querySelector(selector));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "30.0.5",
+  "version": "30.0.7",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,22 +31,22 @@
     "types"
   ],
   "dependencies": {
-    "@ndla/article-scripts": "^3.0.6",
-    "@ndla/button": "^4.0.4",
-    "@ndla/carousel": "^2.0.4",
+    "@ndla/article-scripts": "^3.0.7",
+    "@ndla/button": "^4.0.5",
+    "@ndla/carousel": "^2.0.5",
     "@ndla/core": "^3.0.0",
-    "@ndla/forms": "^4.0.4",
-    "@ndla/hooks": "^1.1.10",
-    "@ndla/icons": "^2.0.4",
-    "@ndla/licenses": "^6.0.4",
-    "@ndla/modal": "^2.0.4",
-    "@ndla/notion": "^4.0.4",
-    "@ndla/safelink": "^3.0.4",
+    "@ndla/forms": "^4.0.5",
+    "@ndla/hooks": "^1.1.11",
+    "@ndla/icons": "^2.0.5",
+    "@ndla/licenses": "^6.0.5",
+    "@ndla/modal": "^2.0.5",
+    "@ndla/notion": "^4.0.5",
+    "@ndla/safelink": "^3.0.5",
     "@ndla/switch": "^1.0.0",
-    "@ndla/tabs": "^2.0.4",
-    "@ndla/tooltip": "^3.0.0",
+    "@ndla/tabs": "^2.0.5",
+    "@ndla/tooltip": "^3.0.1",
     "@ndla/types-learningpath-api": "^0.0.13",
-    "@ndla/util": "^3.1.4",
+    "@ndla/util": "^3.1.5",
     "@reach/menu-button": "^0.16.2",
     "@reach/slider": "^0.16.0",
     "focus-trap-react": "^8.9.2",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "153f67893ba72297587e17144b71c92150b6eeeb"
+  "gitHead": "6651947fc0ddd857cffd4c7139c2e7ac91b44d58"
 }

package/src/AudioPlayer/Controls.tsx

@@ -410,7 +410,7 @@ const Controls = ({ src, title }: Props) => {
   };
 
   return (
-    <>
+    <div>
       <audio ref={audioRef} src={src} title={title} preload="metadata" />
       <ControlsWrapper>
         <PlayButton type="button" onClick={togglePlay} title="play" aria-label="play">
@@ -514,7 +514,7 @@ const Controls = ({ src, title }: Props) => {
           </Menu>
         </VolumeWrapper>
       </ControlsWrapper>
-    </>
+    </div>
   );
 };
 

package/src/AudioPlayer/SpeechControl.tsx

@@ -51,12 +51,12 @@ const SpeechControl = ({ src, title }: Props) => {
     }
   };
   return (
-    <>
+    <div>
       <audio ref={audioRef} src={src} title={title} preload="metadata" />
       <SpeechPlayButton type="button" onClick={togglePlay}>
         <VolumeUp role="img" aria-label="play" title="play" />
       </SpeechPlayButton>
-    </>
+    </div>
   );
 };
 

package/src/Frontpage/FrontpageAllSubjects.tsx

@@ -6,7 +6,6 @@ import SafeLink from '@ndla/safelink';
 import { colors, fonts, mq, breakpoints } from '@ndla/core';
 import { MessageBox } from '../Messages';
 import { ToggleItem } from '../Filter';
-import constants from '../model';
 
 const StyledWrapper = styled.nav`
   margin: 32px 0 0;
@@ -84,6 +83,7 @@ type categoryProps = {
   type?: string;
   name?: string;
   visible?: boolean;
+  message?: string;
   subjects: subjectProps[];
 };
 
@@ -198,20 +198,21 @@ const FrontpageAllSubjects = ({
         title: category.name || t(`subjectCategories.${category.type}`),
         content: (
           <>
-            {/* Should be persistent til fall 2022 */}
-            {(category.name === t('subjectCategories.beta') ||
-              category.type === constants.subjectCategories.BETA_SUBJECTS) && (
+            {category.message && (
+              <MessageBoxWrapper>
+                <MessageBox>{category.message}</MessageBox>
+              </MessageBoxWrapper>
+            )}
+            {category.name === t('subjectCategories.beta') && (
               <MessageBoxWrapper>
                 <MessageBox>{t('messageBoxInfo.frontPageBeta')}</MessageBox>
               </MessageBoxWrapper>
             )}
-            {(category.name === t('subjectCategories.archive') ||
-              category.type === constants.subjectCategories.ARCHIVE_SUBJECTS) && (
+            {category.name === t('subjectCategories.archive') && (
               <MessageBoxWrapper>
                 <MessageBox>{t('messageBoxInfo.frontPageExpired')}</MessageBox>
               </MessageBoxWrapper>
             )}
-
             {renderList(category.subjects, onNavigate, onToggleSubject, subjectViewType, selectedSubjects)}
           </>
         ),

package/src/TagSelector/Control.tsx

@@ -19,6 +19,7 @@ const StyledTagSelectorControl = styled.div`
   align-items: center;
   margin: ${spacing.xxsmall};
 
+  overflow: auto;
   overflow: overlay;
   ${utils.scrollbar}
 `;

package/src/TagSelector/MenuList.tsx

@@ -13,6 +13,7 @@ import { MenuListProps } from 'react-select';
 import { TagType } from './types';
 
 export const StyledMenuList = styled.div`
+  overflow: auto;
   overflow: overlay;
   ${utils.scrollbar}
   display: flex;

package/src/TreeStructure/TreeStructure.tsx

@@ -61,6 +61,7 @@ const ScrollableDiv = styled.div<ScrollableDivProps>`
   ${({ type }) =>
     type === 'picker' &&
     css`
+      overflow: auto;
       overflow: overlay;
       ${utils.scrollbar}
     `}

package/src/locale/messages-en.ts

@@ -113,6 +113,7 @@ const messages = {
     [subjectTypes.RESOURCE_COLLECTION]: 'Other resources',
   },
   subjectTypes: {
+    [subjectTypes.BETA_SUBJECT]: 'Betafag',
     [subjectTypes.SUBJECT]: 'Subject',
     [subjectTypes.RESOURCE_COLLECTION]: 'Resource collection',
   },
@@ -1071,6 +1072,8 @@ const messages = {
     detailView: 'Detailed listview',
     shortView: 'Card view',
     myPage: {
+      imageAlt:
+        'Medium close-up of girl holding a tablet. On top of the tablet there are colour samples in different shapes and colours. Graphic image.',
       confirmDeleteAccount: 'Are you sure you want to delete your account?',
       confirmDeleteAccountButton: 'Delete account',
       myPage: 'My page',

package/src/locale/messages-nb.ts

@@ -113,6 +113,7 @@ const messages = {
     [subjectTypes.RESOURCE_COLLECTION]: 'Andre ressurser',
   },
   subjectTypes: {
+    [subjectTypes.BETA_SUBJECT]: 'Betafag',
     [subjectTypes.SUBJECT]: 'Fag',
     [subjectTypes.RESOURCE_COLLECTION]: 'Ressurssamling',
   },
@@ -1068,6 +1069,7 @@ const messages = {
     detailView: 'Detaljert listevisning',
     shortView: 'Kort visning',
     myPage: {
+      imageAlt: 'Halvnært bilde av jente som holder et nettbrett i hendene. Oppå nettbrettet ligger det ei samling fargeprøver i ulike former og farger. Grafikk.',
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
       myPage: 'Min side',

package/src/locale/messages-nn.ts

@@ -113,6 +113,7 @@ const messages = {
     [subjectTypes.RESOURCE_COLLECTION]: 'Andre ressursar',
   },
   subjectTypes: {
+    [subjectTypes.BETA_SUBJECT]: 'Betafag',
     [subjectTypes.SUBJECT]: 'Fag',
     [subjectTypes.RESOURCE_COLLECTION]: 'Ressurssamling',
   },
@@ -1069,6 +1070,8 @@ const messages = {
     detailView: 'Detaljert listevisning',
     shortView: 'Kortvisning',
     myPage: {
+      imageAlt:
+        'Halvnært bilete av jente som held eit nettbrett i hendene. Oppå nettbrettet ligg det ei samling fargeprøver i ulike former og fargar. Grafikk.',
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
       myPage: 'Mi side',
@@ -1111,7 +1114,7 @@ const messages = {
       },
     },
     resource: {
-      add: 'Legg til mappe/tag',
+      add: 'Legg til mappe/emneknagg',
       remove: 'Fjern',
       removeTitle: 'Fjern ressurs',
       confirmRemove: 'Er du sikker på at du ønsker å fjerne ressursen frå denne mappa?',

package/src/locale/messages-se.ts

@@ -113,6 +113,7 @@ const messages = {
     [subjectTypes.RESOURCE_COLLECTION]: 'Eará resurssat',
   },
   subjectTypes: {
+    [subjectTypes.BETA_SUBJECT]: 'Betafága',
     [subjectTypes.SUBJECT]: 'Fága',
     [subjectTypes.RESOURCE_COLLECTION]: 'Resursačoakkáldat',
   },
@@ -1070,6 +1071,8 @@ const messages = {
     shortView: 'Oanehis listu',
 
     myPage: {
+      imageAlt:
+        'Halvnært bilde av jente som holder et nettbrett i hendene. Oppå nettbrettet ligger det ei samling fargeprøver i ulike former og farger. Grafikk.',
       confirmDeleteAccount: 'Leat go sihkar ahte dáhtut sihkkut kontu?',
       confirmDeleteAccountButton: 'Sihko kontu',
       myPage: 'Mu siidu',

package/src/locale/messages-sma.ts

@@ -113,6 +113,7 @@ const messages = {
     [subjectTypes.RESOURCE_COLLECTION]: 'Andre ressurser',
   },
   subjectTypes: {
+    [subjectTypes.BETA_SUBJECT]: 'Betafag',
     [subjectTypes.SUBJECT]: 'Fag',
     [subjectTypes.RESOURCE_COLLECTION]: 'Ressurssamling',
   },
@@ -1070,6 +1071,8 @@ const messages = {
     detailView: 'Detaljert listevisning',
     shortView: 'Kort visning',
     myPage: {
+      imageAlt:
+        'Halvnært bilde av jente som holder et nettbrett i hendene. Oppå nettbrettet ligger det ei samling fargeprøver i ulike former og farger. Grafikk.',
       confirmDeleteAccount: 'Er du sikker på at du vil slette kontoen?',
       confirmDeleteAccountButton: 'Slett konto',
       myPage: 'Min side',

package/src/model/SubjectTypes.ts

@@ -6,5 +6,6 @@
  *
  */
 
+export const BETA_SUBJECT = 'betaSubject';
 export const SUBJECT = 'subject';
 export const RESOURCE_COLLECTION = 'resourceCollection';