@ndla/ui 55.0.14-alpha.0 → 55.0.16-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/panda.buildinfo.json +40 -13
- package/dist/styles.css +160 -54
- package/es/Article/ArticleByline.js +81 -48
- package/es/Article/ArticleFootNotes.js +31 -19
- package/es/AudioPlayer/AudioPlayer.js +1 -0
- package/es/Concept/Concept.js +2 -2
- package/es/ContactBlock/ContactBlock.js +17 -17
- package/es/ContentTypeBadge/ContentTypeBadgeNew.js +1 -0
- package/es/Embed/BrightcoveEmbed.js +0 -1
- package/es/Embed/CopyrightEmbed.js +1 -2
- package/es/FrontpageArticle/FrontpageArticle.js +1 -2
- package/es/LicenseByline/EmbedByline.js +143 -33
- package/es/LicenseByline/LicenseLink.js +16 -9
- package/es/LicenseByline/index.js +2 -2
- package/es/index.js +0 -2
- package/es/model/ContentType.js +3 -1
- package/es/styles.css +160 -54
- package/lib/Article/ArticleByline.d.ts +1 -3
- package/lib/Article/ArticleByline.js +84 -51
- package/lib/Article/ArticleFootNotes.js +31 -20
- package/lib/AudioPlayer/AudioPlayer.js +1 -0
- package/lib/Concept/Concept.js +1 -1
- package/lib/ContactBlock/ContactBlock.js +18 -18
- package/lib/ContentTypeBadge/ContentTypeBadgeNew.d.ts +1 -2
- package/lib/ContentTypeBadge/ContentTypeBadgeNew.js +1 -0
- package/lib/Embed/BrightcoveEmbed.js +0 -1
- package/lib/Embed/CopyrightEmbed.js +1 -2
- package/lib/FrontpageArticle/FrontpageArticle.js +1 -2
- package/lib/LicenseByline/EmbedByline.d.ts +2 -4
- package/lib/LicenseByline/EmbedByline.js +145 -35
- package/lib/LicenseByline/LicenseLink.d.ts +2 -2
- package/lib/LicenseByline/LicenseLink.js +16 -9
- package/lib/LicenseByline/index.d.ts +2 -2
- package/lib/LicenseByline/index.js +4 -5
- package/lib/index.d.ts +0 -2
- package/lib/index.js +0 -20
- package/lib/model/ContentType.d.ts +1 -0
- package/lib/model/ContentType.js +4 -2
- package/lib/styles.css +160 -54
- package/package.json +5 -6
- package/src/Article/ArticleByline.tsx +83 -70
- package/src/Article/ArticleFootNotes.tsx +32 -36
- package/src/AudioPlayer/AudioPlayer.tsx +1 -0
- package/src/Concept/Concept.tsx +2 -2
- package/src/ContactBlock/ContactBlock.tsx +1 -1
- package/src/ContentTypeBadge/ContentTypeBadgeNew.tsx +3 -1
- package/src/Embed/BrightcoveEmbed.tsx +1 -1
- package/src/Embed/CopyrightEmbed.tsx +1 -1
- package/src/FrontpageArticle/FrontpageArticle.tsx +1 -1
- package/src/LicenseByline/EmbedByline.stories.tsx +9 -4
- package/src/LicenseByline/EmbedByline.tsx +139 -53
- package/src/LicenseByline/LicenseLink.tsx +15 -15
- package/src/LicenseByline/index.tsx +2 -2
- package/src/index.ts +0 -3
- package/src/model/ContentType.ts +2 -0
- package/es/CreatedBy/CreatedBy.js +0 -73
- package/es/CreatedBy/index.js +0 -10
- package/es/LicenseByline/LicenseDescription.js +0 -63
- package/es/List/OrderedList.js +0 -41
- package/es/List/UnOrderedList.js +0 -28
- package/es/List/index.js +0 -10
- package/lib/CreatedBy/CreatedBy.d.ts +0 -15
- package/lib/CreatedBy/CreatedBy.js +0 -78
- package/lib/CreatedBy/index.d.ts +0 -9
- package/lib/CreatedBy/index.js +0 -16
- package/lib/LicenseByline/LicenseDescription.d.ts +0 -15
- package/lib/LicenseByline/LicenseDescription.js +0 -70
- package/lib/List/OrderedList.d.ts +0 -16
- package/lib/List/OrderedList.js +0 -48
- package/lib/List/UnOrderedList.d.ts +0 -10
- package/lib/List/UnOrderedList.js +0 -35
- package/lib/List/index.d.ts +0 -9
- package/lib/List/index.js +0 -20
- package/src/CreatedBy/CreatedBy.stories.tsx +0 -36
- package/src/CreatedBy/CreatedBy.tsx +0 -63
- package/src/CreatedBy/index.ts +0 -11
- package/src/LicenseByline/LicenseDescription.tsx +0 -100
- package/src/List/OrderedList.stories.tsx +0 -135
- package/src/List/OrderedList.tsx +0 -158
- package/src/List/UnOrderedList.tsx +0 -43
- package/src/List/UnorderedList.stories.tsx +0 -72
- package/src/List/index.ts +0 -10
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _styled from "@emotion/styled/base";
|
|
2
1
|
/**
|
|
3
2
|
* Copyright (c) 2020-present, NDLA.
|
|
4
3
|
*
|
|
@@ -10,26 +9,46 @@ import _styled from "@emotion/styled/base";
|
|
|
10
9
|
import { useCallback, useEffect, useState } from "react";
|
|
11
10
|
import { useTranslation } from "react-i18next";
|
|
12
11
|
import { useLocation } from "react-router-dom";
|
|
13
|
-
import {
|
|
14
|
-
import { breakpoints, colors, fonts, mq, spacing } from "@ndla/core";
|
|
12
|
+
import { ChevronDown } from "@ndla/icons/common";
|
|
15
13
|
import { getLicenseByAbbreviation } from "@ndla/licenses";
|
|
14
|
+
import { AccordionItem, AccordionItemContent, AccordionItemIndicator, AccordionItemTrigger, AccordionRoot, Heading } from "@ndla/primitives";
|
|
15
|
+
import { styled } from "@ndla/styled-system/jsx";
|
|
16
16
|
import ArticleFootNotes from "./ArticleFootNotes";
|
|
17
|
-
import LicenseLink from "../LicenseByline/LicenseLink";
|
|
17
|
+
import { LicenseLink } from "../LicenseByline/LicenseLink";
|
|
18
18
|
import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
|
|
19
|
-
const Wrapper =
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
19
|
+
const Wrapper = styled("div", {
|
|
20
|
+
base: {
|
|
21
|
+
// TODO: Figure out if we want to remove this margin. It's only here to add some gap between the article content and the byline.
|
|
22
|
+
marginBlockStart: "medium",
|
|
23
|
+
paddingBlockStart: "xsmall",
|
|
24
|
+
borderTop: "1px solid",
|
|
25
|
+
borderColor: "stroke.subtle"
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
|
|
29
|
+
// TODO: This is designed with 24px of inline padding. If you do this, most bylines will break into two lines.
|
|
30
|
+
// Should reconsider.
|
|
31
|
+
const TextWrapper = styled("div", {
|
|
32
|
+
base: {
|
|
33
|
+
display: "flex",
|
|
34
|
+
flexDirection: "column-reverse",
|
|
35
|
+
gap: "3xsmall",
|
|
36
|
+
width: "100%",
|
|
37
|
+
justifyContent: "space-between",
|
|
38
|
+
paddingBlock: "xsmall",
|
|
39
|
+
textStyle: "body.medium"
|
|
40
|
+
},
|
|
41
|
+
variants: {
|
|
42
|
+
learningpath: {
|
|
43
|
+
true: {},
|
|
44
|
+
false: {
|
|
45
|
+
tabletWide: {
|
|
46
|
+
flexDirection: "row"
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
});
|
|
33
52
|
const renderContributors = (contributors, t) => {
|
|
34
53
|
const contributorsArray = contributors.map((contributor, index) => {
|
|
35
54
|
if (index < 1) return contributor.name;
|
|
@@ -54,18 +73,17 @@ const getSuppliersText = (suppliers, t) => {
|
|
|
54
73
|
}
|
|
55
74
|
});
|
|
56
75
|
};
|
|
57
|
-
const LicenseWrapper =
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
})("&[data-background-color=\"white\"]{background-color:", colors.background.default, ";}" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ArticleByline.tsx"],"names":[],"mappings":"AAkHuD","file":"ArticleByline.tsx","sourcesContent":["/**\n * Copyright (c) 2020-present, NDLA.\n *\n * This source code is licensed under the GPLv3 license found in the\n * LICENSE file in the root directory of this source tree.\n *\n */\n\nimport { TFunction } from \"i18next\";\nimport { ReactNode, useCallback, useEffect, useState } from \"react\";\nimport { useTranslation } from \"react-i18next\";\nimport { useLocation } from \"react-router-dom\";\nimport styled from \"@emotion/styled\";\nimport { AccordionRoot, AccordionHeader, AccordionContent, AccordionItem } from \"@ndla/accordion\";\nimport { breakpoints, colors, fonts, mq, spacing } from \"@ndla/core\";\nimport { getLicenseByAbbreviation } from \"@ndla/licenses\";\nimport ArticleFootNotes from \"./ArticleFootNotes\";\nimport LicenseLink from \"../LicenseByline/LicenseLink\";\nimport { FootNote } from \"../types\";\n\nconst Wrapper = styled.div`\n  margin-top: ${spacing.normal};\n  padding-top: ${spacing.normal};\n  padding-bottom: ${spacing.xsmall};\n  border-top: 1px solid ${colors.brand.greyLight};\n  ${fonts.sizes(\"16px\", \"24px\")};\n  font-family: ${fonts.sans};\n  color: ${colors.brand.greyDark};\n`;\n\nconst TextWrapper = styled.div`\n  display: flex;\n  justify-content: space-between;\n  width: 100%;\n  padding-bottom: ${spacing.mediumlarge};\n  ${mq.range({ until: breakpoints.tabletWide })} {\n    flex-direction: column;\n    flex-direction: column-reverse;\n    gap: ${spacing.xsmall};\n  }\n  &[data-learning-path=\"true\"] {\n    flex-direction: column;\n    flex-direction: column-reverse;\n    gap: ${spacing.xsmall};\n  }\n`;\n\nconst PrimaryContributorsWrapper = styled.span`\n  margin-left: ${spacing.xxsmall};\n`;\n\ntype AuthorProps = {\n  name: string;\n};\n\ntype SupplierProps = {\n  name: string;\n};\n\ntype AccordionHeaderVariants = \"white\" | \"blue\";\n\ntype Props = {\n  authors?: AuthorProps[];\n  suppliers?: SupplierProps[];\n  published?: string;\n  license?: string;\n  licenseBox?: ReactNode;\n  locale?: string;\n  footnotes?: FootNote[];\n  accordionHeaderVariant?: AccordionHeaderVariants;\n  displayByline?: boolean;\n  bylineType?: \"article\" | \"learningPath\";\n};\n\nconst renderContributors = (contributors: SupplierProps[] | AuthorProps[], t: TFunction) => {\n  const contributorsArray = contributors.map((contributor, index) => {\n    if (index < 1) return contributor.name;\n    const sep = index === contributors.length - 1 ? ` ${t(\"article.conjunction\")} ` : \", \";\n    return `${sep}${contributor.name}`;\n  });\n  return contributorsArray.join(\"\");\n};\n\nconst getSuppliersText = (suppliers: SupplierProps[], t: TFunction) => {\n  if (suppliers.length === 0) {\n    return \"\";\n  }\n  return suppliers.length > 1\n    ? t(\"article.multipleSuppliersLabel\", {\n        names: renderContributors(suppliers, t),\n        interpolation: { escapeValue: false },\n      })\n    : t(\"article.supplierLabel\", {\n        name: renderContributors(suppliers, t),\n        interpolation: { escapeValue: false },\n      });\n};\n\nconst LicenseWrapper = styled.div`\n  display: flex;\n  gap: ${spacing.small};\n  padding-right: ${spacing.xsmall};\n`;\n\nconst StyledAccordionHeader = styled(AccordionHeader)`\n  background-color: ${colors.brand.lightest};\n  ${fonts.sizes(\"16px\", \"29px\")};\n  font-weight: ${fonts.weight.semibold};\n\n  &[data-background-color=\"white\"][data-state=\"closed\"] {\n    background-color: ${colors.background.default};\n  }\n`;\n\nconst StyledAccordionContent = styled(AccordionContent)`\n  &[data-background-color=\"white\"] {\n    background-color: ${colors.background.default};\n  }\n`;\n\nconst refRegexp = /note\\d/;\nconst footnotesAccordionId = \"footnotes\";\n\nconst ArticleByline = ({\n  authors = [],\n  suppliers = [],\n  footnotes,\n  license: licenseString,\n  licenseBox,\n  published,\n  locale,\n  accordionHeaderVariant = \"blue\",\n  displayByline = true,\n  bylineType = \"article\",\n}: Props) => {\n  const { t } = useTranslation();\n  const { pathname } = useLocation();\n  const [openAccordions, setOpenAccordions] = useState<string[]>([]);\n  const accordionItemValue = \"rulesForUse\";\n\n  const onHashChange = useCallback(\n    (e: HashChangeEvent) => {\n      const hash = e.newURL.split(\"#\")[1];\n      if (hash.match(refRegexp) && !openAccordions.includes(footnotesAccordionId)) {\n        setOpenAccordions([...openAccordions, footnotesAccordionId]);\n        const el = document.getElementById(`#${hash}`);\n        el?.click();\n        el?.focus();\n      }\n    },\n    [openAccordions],\n  );\n\n  useEffect(() => {\n    setOpenAccordions((prev) => prev.filter((state) => state !== accordionItemValue));\n  }, [pathname]);\n\n  useEffect(() => {\n    window.addEventListener(\"hashchange\", onHashChange);\n    return () => window.removeEventListener(\"hashchange\", onHashChange);\n  }, [onHashChange]);\n\n  const license = licenseString && getLicenseByAbbreviation(licenseString, locale);\n\n  const showPrimaryContributors = suppliers.length > 0 || authors.length > 0;\n\n  return (\n    <Wrapper>\n      {displayByline && (\n        <TextWrapper data-learning-path={bylineType === \"learningPath\"}>\n          <LicenseWrapper>\n            {license && <LicenseLink license={license} />}\n            {showPrimaryContributors && (\n              <PrimaryContributorsWrapper>\n                {authors.length > 0 &&\n                  `${t(\"article.authorsLabel\", {\n                    names: renderContributors(authors, t),\n                    interpolation: { escapeValue: false },\n                  })}. `}\n                {getSuppliersText(suppliers, t)}\n              </PrimaryContributorsWrapper>\n            )}\n          </LicenseWrapper>\n          <div>\n            {t(`${bylineType}.lastUpdated`)} {published}\n          </div>\n        </TextWrapper>\n      )}\n      <AccordionRoot type=\"multiple\" onValueChange={setOpenAccordions} value={openAccordions}>\n        {licenseBox && (\n          <AccordionItem value={accordionItemValue}>\n            <StyledAccordionHeader headingLevel=\"h2\" data-background-color={accordionHeaderVariant}>\n              {t(\"article.useContent\")}\n            </StyledAccordionHeader>\n            <StyledAccordionContent data-background-color={accordionHeaderVariant}>{licenseBox}</StyledAccordionContent>\n          </AccordionItem>\n        )}\n\n        {!!footnotes?.length && (\n          <AccordionItem value={footnotesAccordionId}>\n            <StyledAccordionHeader headingLevel=\"h2\">{t(\"article.footnotes\")}</StyledAccordionHeader>\n            <StyledAccordionContent forceMount data-background-color={accordionHeaderVariant}>\n              <ArticleFootNotes footNotes={footnotes} />\n            </StyledAccordionContent>\n          </AccordionItem>\n        )}\n      </AccordionRoot>\n    </Wrapper>\n  );\n};\n\nexport default ArticleByline;\n"]} */"));
|
|
76
|
+
const LicenseWrapper = styled("div", {
|
|
77
|
+
base: {
|
|
78
|
+
display: "flex",
|
|
79
|
+
gap: "xsmall"
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
const StyledAccordionRoot = styled(AccordionRoot, {
|
|
83
|
+
base: {
|
|
84
|
+
paddingBlockStart: "xxlarge"
|
|
85
|
+
}
|
|
86
|
+
});
|
|
69
87
|
const refRegexp = /note\d/;
|
|
70
88
|
const footnotesAccordionId = "footnotes";
|
|
71
89
|
const ArticleByline = _ref => {
|
|
@@ -77,7 +95,6 @@ const ArticleByline = _ref => {
|
|
|
77
95
|
licenseBox,
|
|
78
96
|
published,
|
|
79
97
|
locale,
|
|
80
|
-
accordionHeaderVariant = "blue",
|
|
81
98
|
displayByline = true,
|
|
82
99
|
bylineType = "article"
|
|
83
100
|
} = _ref;
|
|
@@ -109,11 +126,11 @@ const ArticleByline = _ref => {
|
|
|
109
126
|
const showPrimaryContributors = suppliers.length > 0 || authors.length > 0;
|
|
110
127
|
return _jsxs(Wrapper, {
|
|
111
128
|
children: [displayByline && _jsxs(TextWrapper, {
|
|
112
|
-
|
|
129
|
+
learningpath: bylineType === "learningPath",
|
|
113
130
|
children: [_jsxs(LicenseWrapper, {
|
|
114
131
|
children: [license && _jsx(LicenseLink, {
|
|
115
132
|
license: license
|
|
116
|
-
}), showPrimaryContributors && _jsxs(
|
|
133
|
+
}), showPrimaryContributors && _jsxs("span", {
|
|
117
134
|
children: [authors.length > 0 && `${t("article.authorsLabel", {
|
|
118
135
|
names: renderContributors(authors, t),
|
|
119
136
|
interpolation: {
|
|
@@ -124,28 +141,44 @@ const ArticleByline = _ref => {
|
|
|
124
141
|
}), _jsxs("div", {
|
|
125
142
|
children: [t(`${bylineType}.lastUpdated`), " ", published]
|
|
126
143
|
})]
|
|
127
|
-
}), _jsxs(
|
|
128
|
-
|
|
129
|
-
onValueChange: setOpenAccordions,
|
|
144
|
+
}), _jsxs(StyledAccordionRoot, {
|
|
145
|
+
multiple: true,
|
|
130
146
|
value: openAccordions,
|
|
147
|
+
onValueChange: details => setOpenAccordions(details.value),
|
|
131
148
|
children: [licenseBox && _jsxs(AccordionItem, {
|
|
132
149
|
value: accordionItemValue,
|
|
133
|
-
children: [
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
150
|
+
children: [_jsxs(AccordionItemTrigger, {
|
|
151
|
+
children: [_jsx(Heading, {
|
|
152
|
+
asChild: true,
|
|
153
|
+
consumeCss: true,
|
|
154
|
+
textStyle: "label.medium",
|
|
155
|
+
fontWeight: "bold",
|
|
156
|
+
children: _jsx("h2", {
|
|
157
|
+
children: t("article.useContent")
|
|
158
|
+
})
|
|
159
|
+
}), _jsx(AccordionItemIndicator, {
|
|
160
|
+
asChild: true,
|
|
161
|
+
children: _jsx(ChevronDown, {})
|
|
162
|
+
})]
|
|
163
|
+
}), _jsx(AccordionItemContent, {
|
|
139
164
|
children: licenseBox
|
|
140
165
|
})]
|
|
141
166
|
}), !!footnotes?.length && _jsxs(AccordionItem, {
|
|
142
167
|
value: footnotesAccordionId,
|
|
143
|
-
children: [
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
168
|
+
children: [_jsxs(AccordionItemTrigger, {
|
|
169
|
+
children: [_jsx(Heading, {
|
|
170
|
+
asChild: true,
|
|
171
|
+
consumeCss: true,
|
|
172
|
+
textStyle: "label.medium",
|
|
173
|
+
fontWeight: "bold",
|
|
174
|
+
children: _jsx("h2", {
|
|
175
|
+
children: t("article.footnotes")
|
|
176
|
+
})
|
|
177
|
+
}), _jsx(AccordionItemIndicator, {
|
|
178
|
+
asChild: true,
|
|
179
|
+
children: _jsx(ChevronDown, {})
|
|
180
|
+
})]
|
|
181
|
+
}), _jsx(AccordionItemContent, {
|
|
149
182
|
children: _jsx(ArticleFootNotes, {
|
|
150
183
|
footNotes: footnotes
|
|
151
184
|
})
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _styled from "@emotion/styled/base";
|
|
2
1
|
/**
|
|
3
2
|
* Copyright (c) 2017-present, NDLA.
|
|
4
3
|
*
|
|
@@ -7,35 +6,48 @@ import _styled from "@emotion/styled/base";
|
|
|
7
6
|
*
|
|
8
7
|
*/
|
|
9
8
|
|
|
10
|
-
import {
|
|
9
|
+
import { Text } from "@ndla/primitives";
|
|
10
|
+
import { styled } from "@ndla/styled-system/jsx";
|
|
11
11
|
import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
|
|
12
12
|
const citeDetailString = description => description ? `${description}. ` : "";
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
const StyledCite = styled("cite", {
|
|
14
|
+
base: {
|
|
15
|
+
display: "flex",
|
|
16
|
+
alignItems: "center",
|
|
17
|
+
gap: "xsmall"
|
|
18
|
+
}
|
|
19
|
+
});
|
|
17
20
|
const FootNote = _ref => {
|
|
18
21
|
let {
|
|
19
22
|
footNote
|
|
20
23
|
} = _ref;
|
|
21
24
|
return _jsx("li", {
|
|
22
|
-
children:
|
|
25
|
+
children: _jsx(Text, {
|
|
23
26
|
id: `note${footNote.ref}`,
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
asChild: true,
|
|
28
|
+
consumeCss: true,
|
|
29
|
+
textStyle: "body.medium",
|
|
30
|
+
children: _jsxs(StyledCite, {
|
|
31
|
+
children: [_jsx("a", {
|
|
32
|
+
href: `#ref${footNote.ref}`,
|
|
33
|
+
target: "_self",
|
|
34
|
+
children: footNote.ref
|
|
35
|
+
}), `«${footNote.title}». ${footNote.authors.join(" ")}. ${citeDetailString(footNote.edition)}${citeDetailString(footNote.publisher)}${footNote.year}. `, footNote.url ? _jsxs("a", {
|
|
36
|
+
href: footNote.url,
|
|
37
|
+
children: [footNote.url, "."]
|
|
38
|
+
}) : null]
|
|
39
|
+
})
|
|
32
40
|
})
|
|
33
41
|
});
|
|
34
42
|
};
|
|
35
|
-
const FootnoteList =
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
43
|
+
const FootnoteList = styled("ol", {
|
|
44
|
+
base: {
|
|
45
|
+
display: "flex",
|
|
46
|
+
flexDirection: "column",
|
|
47
|
+
gap: "medium",
|
|
48
|
+
listStyle: "none"
|
|
49
|
+
}
|
|
50
|
+
});
|
|
39
51
|
const ArticleFootNotes = _ref2 => {
|
|
40
52
|
let {
|
|
41
53
|
footNotes
|
package/es/Concept/Concept.js
CHANGED
|
@@ -10,7 +10,7 @@ import { forwardRef } from "react";
|
|
|
10
10
|
import { Figure } from "@ndla/primitives";
|
|
11
11
|
import { styled } from "@ndla/styled-system/jsx";
|
|
12
12
|
import { BrightcoveEmbed, ExternalEmbed, H5pEmbed, IframeEmbed, ImageEmbed } from "../Embed";
|
|
13
|
-
import {
|
|
13
|
+
import { EmbedByline } from "../LicenseByline/EmbedByline";
|
|
14
14
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
|
|
15
15
|
const StyledFigure = styled(Figure, {
|
|
16
16
|
base: {
|
|
@@ -61,7 +61,7 @@ export const Concept = /*#__PURE__*/forwardRef((_ref, ref) => {
|
|
|
61
61
|
embed: visualElement
|
|
62
62
|
}) : visualElement?.resource === "external" ? _jsx(ExternalEmbed, {
|
|
63
63
|
embed: visualElement
|
|
64
|
-
}) : null, copyright && _jsx(
|
|
64
|
+
}) : null, copyright && _jsx(EmbedByline, {
|
|
65
65
|
copyright: copyright,
|
|
66
66
|
type: "concept"
|
|
67
67
|
})]
|