@ndla/ui 41.0.0 → 41.0.2

package/lib/locale/messages-en.js

@@ -560,7 +560,7 @@ var messages = _objectSpread(_objectSpread({
     },
     concept: {
       heading: 'How to reuse concept content',
-      description: 'You will find guidelines for use of concept content in the asset',
+      description: 'Remember that built-in content might have a different license than the explanation text',
       rules: 'Rules for use of concept:',
       title: 'Title',
       embedlink: {

package/lib/locale/messages-nb.js

@@ -575,7 +575,7 @@ var messages = _objectSpread(_objectSpread({
     },
     concept: {
       heading: 'Slik gjenbruker du forklaringer',
-      description: 'Du finner retningslinjene for bruk av innholdet i forklaring-elementet',
+      description: 'Husk at innebygd innhold i en forklaring kan ha en annen lisens enn selve forklaringsteksten',
       rules: 'Regler for bruk av forklaring:',
       title: 'Tittel',
       embedlink: {

package/lib/locale/messages-nn.js

@@ -581,7 +581,7 @@ var messages = _objectSpread(_objectSpread({
         hasCopiedTitle: 'Innbyggingslenke kopiert'
       },
       heading: 'Slik gjenbruker du forklaringar',
-      description: 'Du finn retningslinjene for bruk av innhaldet i forklaring-elementet',
+      description: 'Husk at innebygd innhald i ei forklaring kan ha ein anna lisens enn sjølve forklaringsteksten',
       rules: 'Reglar for bruk av forklaring:',
       title: 'Tittel'
     },

package/lib/locale/messages-se.js

@@ -575,7 +575,7 @@ var messages = _objectSpread(_objectSpread({
     },
     concept: {
       heading: 'Ná geavahat čilgehusaid ođđasit',
-      description: 'Njuolggadusaid sisdoalu geavaheapmái gávnnat čilgehus-elemeanttas',
+      description: 'Husk at innebygd innhald i ei forklaring kan ha ein anna lisens enn sjølve forklaringsteksten',
       rules: 'Njuolggadusat čilgehusa geavaheapmái:',
       title: 'Tihttel',
       embedlink: {

package/lib/locale/messages-sma.js

@@ -575,7 +575,7 @@ var messages = _objectSpread(_objectSpread({
     },
     concept: {
       heading: 'Slik gjenbruker du forklaringer',
-      description: 'Datne njoelkedassh sisvege-åtnoen bïjre gaavnh buerkiestimmiebiehkesne',
+      description: 'Husk at innebygd innhald i ei forklaring kan ha ein anna lisens enn sjølve forklaringsteksten',
       rules: 'Njoelkedassh guktie buerkiestimmiem nuhtjh:',
       title: 'Tihtele',
       embedlink: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ndla/ui",
-  "version": "41.0.0",
+  "version": "41.0.2",
   "description": "UI component library for NDLA.",
   "license": "GPL-3.0",
   "main": "lib/index.js",
@@ -31,21 +31,21 @@
     "types"
   ],
   "dependencies": {
-    "@ndla/accordion": "^2.2.7",
+    "@ndla/accordion": "^2.2.8",
     "@ndla/article-scripts": "^3.0.18",
-    "@ndla/button": "^10.1.6",
-    "@ndla/carousel": "^3.1.4",
-    "@ndla/core": "^4.1.0",
-    "@ndla/forms": "^4.3.6",
+    "@ndla/button": "^10.1.7",
+    "@ndla/carousel": "^3.1.5",
+    "@ndla/core": "^4.1.1",
+    "@ndla/forms": "^4.3.7",
     "@ndla/hooks": "^2.0.7",
-    "@ndla/icons": "^3.0.2",
+    "@ndla/icons": "^3.0.3",
     "@ndla/licenses": "^7.0.4",
-    "@ndla/modal": "^3.0.4",
-    "@ndla/notion": "^5.0.4",
-    "@ndla/safelink": "^4.1.6",
-    "@ndla/switch": "^1.1.4",
-    "@ndla/tabs": "^3.0.0",
-    "@ndla/tooltip": "^4.1.6",
+    "@ndla/modal": "^3.0.5",
+    "@ndla/notion": "^5.0.5",
+    "@ndla/safelink": "^4.1.7",
+    "@ndla/switch": "^1.1.5",
+    "@ndla/tabs": "^3.0.1",
+    "@ndla/tooltip": "^4.1.7",
     "@ndla/util": "^3.1.13",
     "@radix-ui/react-dropdown-menu": "^2.0.5",
     "@radix-ui/react-popover": "^1.0.6",
@@ -74,8 +74,7 @@
   "devDependencies": {
     "@babel/plugin-proposal-optional-chaining": "^7.11.0",
     "@ndla/types-backend": "^0.2.5",
-    "@ndla/types-embed": "^2.0.3",
-    "@types/reach__dialog": "^0.1.0",
+    "@ndla/types-embed": "^2.0.4",
     "css-loader": "^6.7.3",
     "mini-css-extract-plugin": "^2.7.5",
     "sass-loader": "^13.2.2",
@@ -85,5 +84,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "982a8c9b737182c8c1b4f1105ed128be637d47cb"
+  "gitHead": "1fa31ba26d4b1cc78663fa125892215c37078f94"
 }

package/src/Embed/ImageEmbed.tsx

@@ -125,7 +125,7 @@ const ImageEmbed = ({ embed, previewAlt, heartButton: HeartButton }: Props) => {
       type={imageSizes ? undefined : figureType}
       className={imageSizes ? 'c-figure--right expanded' : ''}
     >
-      <ImageWrapper src={data.image.imageUrl} crop={crop} size={embedData.size}>
+      <ImageWrapper src={embedData.pageUrl || data.image.imageUrl} crop={crop} size={embedData.size}>
         <Image
           focalPoint={focalPoint}
           contentType={data.image.contentType}

package/src/LearningPaths/LearningPathMenu.stories.tsx

@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2023-present, NDLA.
+ *
+ * This source code is licensed under the GPLv3 license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ */
+
+import React from 'react';
+import { Meta, StoryFn } from '@storybook/react';
+import { defaultParameters } from '../../../../stories/defaults';
+import { contentTypes } from '../model/ContentType';
+import LearningPathMenu from './LearningPathMenu';
+const args = {
+  name: 'Læringssti',
+  LearningPathId: 1,
+  lastUpdated: '2023-06-01',
+  copyright: {
+    contributors: [
+      {
+        type: 'originator',
+        name: 'NDLA',
+      },
+    ],
+    license: {
+      license: 'CC-BY-SA-4.0',
+    },
+  },
+  learningPathUrl: 'https://stier.ndla.no',
+  currentIndex: 1,
+  cookies: {},
+  learningsteps: [
+    {
+      id: 1,
+      title: 'Introduksjon',
+      type: contentTypes.LEARNING_PATH,
+    },
+    {
+      id: 2,
+      title: 'Steg 1',
+      type: contentTypes.SUBJECT_MATERIAL,
+    },
+    {
+      id: 3,
+      title: 'Steg 2',
+      type: contentTypes.TASKS_AND_ACTIVITIES,
+    },
+  ],
+  toLearningPathUrl: (pathId: number, stepId: number) => '',
+};
+
+export default {
+  title: 'Sammensatte moduler/Læringssti-meny',
+  component: LearningPathMenu,
+  tags: ['autodocs'],
+  parameters: {
+    ...defaultParameters,
+    layout: 'centered',
+  },
+  args: args,
+} as Meta<typeof LearningPathMenu>;
+
+export const LearningPathMenuStory: StoryFn<typeof LearningPathMenu> = ({ ...args }) => {
+  return <LearningPathMenu {...args} />;
+};
+
+LearningPathMenuStory.args = args;
+LearningPathMenuStory.storyName = 'Læringssti-meny';

package/src/LearningPaths/LearningPathMenuContent.tsx

@@ -139,7 +139,7 @@ const StyledContentType = styled.div`
   position: relative;
   z-index: 1;
   margin-right: ${spacingUnit * 0.75}px;
-  max-height: 36px;
+  max-height: 35px;
 `;
 
 const HiddenSpan = styled.span`

package/src/LearningPaths/LearningPathMenuIntro.tsx

@@ -49,7 +49,7 @@ const StyledMenuIntro = styled.div<StyledMenuIntroProps>`
     padding: 0 0 ${spacing.medium} ${spacing.normal};
   }
   ${mq.range({ from: breakpoints.tablet })} {
-    margin-left: ${spacingUnit + BORDER_WIDTH / 2}px;
+    margin-left: ${spacingUnit + BORDER_WIDTH}px;
     margin-top: ${spacing.normal};
   }
   ${mq.range({ from: breakpoints.tablet, until: breakpoints.desktop })} {

package/src/LicenseByline/LicenseLink.tsx

@@ -33,7 +33,11 @@ const StyledSpan = styled.span`
 
 const LicenseLink = ({ license, asLink = true }: Props) => {
   if (asLink) {
-    return <StyledSafeLink to={license.url}>{license.abbreviation}</StyledSafeLink>;
+    return (
+      <StyledSafeLink to={license.url} rel="license">
+        {license.abbreviation}
+      </StyledSafeLink>
+    );
   } else {
     return <StyledSpan>{license.abbreviation}</StyledSpan>;
   }

package/src/locale/messages-en.ts

@@ -594,7 +594,7 @@ const messages = {
     },
     concept: {
       heading: 'How to reuse concept content',
-      description: 'You will find guidelines for use of concept content in the asset',
+      description: 'Remember that built-in content might have a different license than the explanation text',
       rules: 'Rules for use of concept:',
       title: 'Title',
       embedlink: {

package/src/locale/messages-nb.ts

@@ -608,7 +608,7 @@ const messages = {
     },
     concept: {
       heading: 'Slik gjenbruker du forklaringer',
-      description: 'Du finner retningslinjene for bruk av innholdet i forklaring-elementet',
+      description: 'Husk at innebygd innhold i en forklaring kan ha en annen lisens enn selve forklaringsteksten',
       rules: 'Regler for bruk av forklaring:',
       title: 'Tittel',
       embedlink: {

package/src/locale/messages-nn.ts

@@ -614,7 +614,7 @@ const messages = {
         hasCopiedTitle: 'Innbyggingslenke kopiert',
       },
       heading: 'Slik gjenbruker du forklaringar',
-      description: 'Du finn retningslinjene for bruk av innhaldet i forklaring-elementet',
+      description: 'Husk at innebygd innhald i ei forklaring kan ha ein anna lisens enn sjølve forklaringsteksten',
       rules: 'Reglar for bruk av forklaring:',
       title: 'Tittel',
     },

package/src/locale/messages-se.ts

@@ -609,7 +609,7 @@ const messages = {
     },
     concept: {
       heading: 'Ná geavahat čilgehusaid ođđasit',
-      description: 'Njuolggadusaid sisdoalu geavaheapmái gávnnat čilgehus-elemeanttas',
+      description: 'Husk at innebygd innhald i ei forklaring kan ha ein anna lisens enn sjølve forklaringsteksten',
       rules: 'Njuolggadusat čilgehusa geavaheapmái:',
       title: 'Tihttel',
       embedlink: {

package/src/locale/messages-sma.ts

@@ -611,7 +611,7 @@ const messages = {
     },
     concept: {
       heading: 'Slik gjenbruker du forklaringer',
-      description: 'Datne njoelkedassh sisvege-åtnoen bïjre gaavnh buerkiestimmiebiehkesne',
+      description: 'Husk at innebygd innhald i ei forklaring kan ha ein anna lisens enn sjølve forklaringsteksten',
       rules: 'Njoelkedassh guktie buerkiestimmiem nuhtjh:',
       title: 'Tihtele',
       embedlink: {