@ndla/ui 4.3.2 → 4.3.3-alpha.12

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.
Files changed (184) hide show
  1. package/README.md +11 -11
  2. package/es/Article/Article.js +3 -7
  3. package/es/Article/ArticleByline.js +4 -4
  4. package/es/Article/ArticleNotions.js +37 -92
  5. package/es/ContentPlaceholder/ContentPlaceholder.js +51 -0
  6. package/es/ContentPlaceholder/index.js +9 -0
  7. package/es/ContentTypeBadge/ContentTypeBadge.js +10 -1
  8. package/es/FactBox/FactBox.js +36 -11
  9. package/es/Filter/FilterButtons.js +18 -17
  10. package/es/Filter/FilterCarousel.js +198 -0
  11. package/es/Masthead/Masthead.js +30 -7
  12. package/es/Masthead/index.js +2 -1
  13. package/es/Masthead/utils.js +11 -0
  14. package/es/MessageBox/MessageBox.js +12 -7
  15. package/es/Notion/ConceptNotion.js +57 -0
  16. package/es/Notion/FigureNotion.js +84 -0
  17. package/es/Notion/Notion.js +122 -48
  18. package/es/Notion/NotionImage.js +47 -0
  19. package/es/Notion/NotionVisualElement.js +38 -0
  20. package/es/Notion/index.js +2 -1
  21. package/es/SearchTypeResult/ActiveFilterContent.js +17 -2
  22. package/es/SearchTypeResult/ActiveFilters.js +64 -50
  23. package/es/SearchTypeResult/PopupFilter.js +28 -125
  24. package/es/SearchTypeResult/ResultNavigation.js +41 -14
  25. package/es/SearchTypeResult/SearchFieldHeader.js +20 -41
  26. package/es/SearchTypeResult/SearchFilterContent.js +61 -0
  27. package/es/SearchTypeResult/SearchHeader.js +51 -28
  28. package/es/SearchTypeResult/SearchItem.js +64 -190
  29. package/es/SearchTypeResult/SearchItemList.js +132 -0
  30. package/es/SearchTypeResult/SearchItems.js +17 -13
  31. package/es/SearchTypeResult/SearchNotionItem.js +13 -13
  32. package/es/SearchTypeResult/SearchNotionsResult.js +16 -21
  33. package/es/SearchTypeResult/SearchTypeHeader.js +43 -26
  34. package/es/SearchTypeResult/SearchTypeResult.js +7 -5
  35. package/es/SearchTypeResult/SearchViewType.js +93 -0
  36. package/es/SearchTypeResult/components/ItemContexts.js +125 -0
  37. package/es/SearchTypeResult/components/ItemResourceHeader.js +87 -0
  38. package/es/SearchTypeResult/components/ItemTopicHeader.js +56 -0
  39. package/es/SearchTypeResult/components/SubjectFilters.js +177 -0
  40. package/es/SearchTypeResult/index.js +2 -1
  41. package/es/all.css +1 -1
  42. package/es/index.js +5 -3
  43. package/es/locale/messages-en.js +20 -5
  44. package/es/locale/messages-nb.js +21 -6
  45. package/es/locale/messages-nn.js +21 -6
  46. package/es/model/ContentType.js +2 -1
  47. package/es/shapes.js +1 -1
  48. package/lib/Article/Article.d.ts +4 -5
  49. package/lib/Article/Article.js +3 -7
  50. package/lib/Article/ArticleByline.js +4 -4
  51. package/lib/Article/ArticleNotions.d.ts +3 -8
  52. package/lib/Article/ArticleNotions.js +41 -90
  53. package/lib/ContentPlaceholder/ContentPlaceholder.d.ts +9 -0
  54. package/lib/ContentPlaceholder/ContentPlaceholder.js +54 -0
  55. package/lib/ContentPlaceholder/index.d.ts +9 -0
  56. package/lib/ContentPlaceholder/index.js +20 -0
  57. package/lib/ContentTypeBadge/ContentTypeBadge.d.ts +1 -0
  58. package/lib/ContentTypeBadge/ContentTypeBadge.js +14 -2
  59. package/lib/FactBox/FactBox.js +41 -8
  60. package/lib/Filter/FilterButtons.d.ts +3 -10
  61. package/lib/Filter/FilterButtons.js +19 -17
  62. package/lib/Filter/FilterCarousel.d.ts +13 -0
  63. package/lib/Filter/FilterCarousel.js +207 -0
  64. package/lib/Masthead/Masthead.d.ts +3 -3
  65. package/lib/Masthead/Masthead.js +37 -7
  66. package/lib/Masthead/index.d.ts +2 -1
  67. package/lib/Masthead/index.js +8 -0
  68. package/lib/Masthead/utils.d.ts +8 -0
  69. package/lib/Masthead/utils.js +20 -0
  70. package/lib/MessageBox/MessageBox.d.ts +2 -1
  71. package/lib/MessageBox/MessageBox.js +12 -7
  72. package/lib/Notion/ConceptNotion.d.ts +25 -0
  73. package/lib/Notion/ConceptNotion.js +79 -0
  74. package/lib/Notion/FigureNotion.d.ts +23 -0
  75. package/lib/Notion/FigureNotion.js +99 -0
  76. package/lib/Notion/Notion.d.ts +24 -11
  77. package/lib/Notion/Notion.js +120 -48
  78. package/lib/Notion/NotionImage.d.ts +15 -0
  79. package/lib/Notion/NotionImage.js +63 -0
  80. package/lib/Notion/NotionVisualElement.d.ts +22 -0
  81. package/lib/Notion/NotionVisualElement.js +51 -0
  82. package/lib/Notion/index.d.ts +1 -0
  83. package/lib/Notion/index.js +8 -0
  84. package/lib/SearchTypeResult/ActiveFilterContent.js +16 -9
  85. package/lib/SearchTypeResult/ActiveFilters.d.ts +2 -1
  86. package/lib/SearchTypeResult/ActiveFilters.js +65 -50
  87. package/lib/SearchTypeResult/PopupFilter.d.ts +13 -19
  88. package/lib/SearchTypeResult/PopupFilter.js +27 -123
  89. package/lib/SearchTypeResult/ResultNavigation.d.ts +2 -2
  90. package/lib/SearchTypeResult/ResultNavigation.js +38 -14
  91. package/lib/SearchTypeResult/SearchFieldHeader.d.ts +3 -8
  92. package/lib/SearchTypeResult/SearchFieldHeader.js +18 -39
  93. package/lib/SearchTypeResult/SearchFilterContent.d.ts +16 -0
  94. package/lib/SearchTypeResult/SearchFilterContent.js +67 -0
  95. package/lib/SearchTypeResult/SearchHeader.d.ts +3 -7
  96. package/lib/SearchTypeResult/SearchHeader.js +59 -30
  97. package/lib/SearchTypeResult/SearchItem.d.ts +8 -12
  98. package/lib/SearchTypeResult/SearchItem.js +64 -187
  99. package/lib/SearchTypeResult/SearchItemList.d.ts +10 -0
  100. package/lib/SearchTypeResult/SearchItemList.js +139 -0
  101. package/lib/SearchTypeResult/SearchItems.d.ts +4 -3
  102. package/lib/SearchTypeResult/SearchItems.js +18 -13
  103. package/lib/SearchTypeResult/SearchNotionItem.js +13 -13
  104. package/lib/SearchTypeResult/SearchNotionsResult.d.ts +2 -4
  105. package/lib/SearchTypeResult/SearchNotionsResult.js +23 -23
  106. package/lib/SearchTypeResult/SearchTypeHeader.d.ts +2 -2
  107. package/lib/SearchTypeResult/SearchTypeHeader.js +40 -25
  108. package/lib/SearchTypeResult/SearchTypeResult.d.ts +7 -6
  109. package/lib/SearchTypeResult/SearchTypeResult.js +7 -5
  110. package/lib/SearchTypeResult/SearchViewType.d.ts +13 -0
  111. package/lib/SearchTypeResult/SearchViewType.js +99 -0
  112. package/lib/SearchTypeResult/components/ItemContexts.d.ts +19 -0
  113. package/lib/SearchTypeResult/components/ItemContexts.js +134 -0
  114. package/lib/SearchTypeResult/components/ItemResourceHeader.d.ts +16 -0
  115. package/lib/SearchTypeResult/components/ItemResourceHeader.js +98 -0
  116. package/lib/SearchTypeResult/components/ItemTopicHeader.d.ts +17 -0
  117. package/lib/SearchTypeResult/components/ItemTopicHeader.js +67 -0
  118. package/lib/SearchTypeResult/components/SubjectFilters.d.ts +32 -0
  119. package/lib/SearchTypeResult/components/SubjectFilters.js +192 -0
  120. package/lib/SearchTypeResult/index.d.ts +2 -1
  121. package/lib/SearchTypeResult/index.js +8 -0
  122. package/lib/all.css +1 -1
  123. package/lib/index.d.ts +4 -2
  124. package/lib/index.js +40 -1
  125. package/lib/locale/messages-en.d.ts +16 -1
  126. package/lib/locale/messages-en.js +20 -5
  127. package/lib/locale/messages-nb.d.ts +15 -0
  128. package/lib/locale/messages-nb.js +21 -6
  129. package/lib/locale/messages-nn.d.ts +16 -1
  130. package/lib/locale/messages-nn.js +21 -6
  131. package/lib/model/ContentType.d.ts +1 -0
  132. package/lib/model/ContentType.js +4 -2
  133. package/lib/shapes.js +1 -1
  134. package/lib/types.d.ts +1 -0
  135. package/package.json +14 -14
  136. package/src/Article/Article.tsx +8 -15
  137. package/src/Article/ArticleByline.tsx +1 -1
  138. package/src/Article/ArticleNotions.tsx +13 -33
  139. package/src/ContentPlaceholder/ContentPlaceholder.tsx +68 -0
  140. package/src/ContentPlaceholder/index.ts +11 -0
  141. package/src/ContentTypeBadge/ContentTypeBadge.tsx +8 -0
  142. package/src/ContentTypeBadge/component.content-type-badge.scss +5 -0
  143. package/src/FactBox/FactBox.tsx +22 -15
  144. package/src/Figure/component.figure.scss +1 -1
  145. package/src/Filter/FilterButtons.tsx +14 -15
  146. package/src/Filter/FilterCarousel.tsx +166 -0
  147. package/src/Masthead/Masthead.tsx +45 -20
  148. package/src/Masthead/component.masthead.scss +3 -62
  149. package/src/Masthead/index.ts +3 -1
  150. package/src/Masthead/utils.ts +12 -0
  151. package/src/MessageBox/MessageBox.tsx +4 -1
  152. package/src/Notion/ConceptNotion.tsx +80 -0
  153. package/src/Notion/FigureNotion.tsx +88 -0
  154. package/src/Notion/Notion.tsx +205 -75
  155. package/src/Notion/NotionImage.tsx +51 -0
  156. package/src/Notion/NotionVisualElement.tsx +50 -0
  157. package/src/Notion/index.ts +1 -0
  158. package/src/SearchTypeResult/ActiveFilterContent.tsx +7 -2
  159. package/src/SearchTypeResult/ActiveFilters.tsx +72 -38
  160. package/src/SearchTypeResult/PopupFilter.tsx +73 -146
  161. package/src/SearchTypeResult/ResultNavigation.tsx +54 -16
  162. package/src/SearchTypeResult/SearchFieldHeader.tsx +15 -40
  163. package/src/SearchTypeResult/SearchFilterContent.tsx +63 -0
  164. package/src/SearchTypeResult/SearchHeader.tsx +31 -31
  165. package/src/SearchTypeResult/SearchItem.tsx +145 -233
  166. package/src/SearchTypeResult/SearchItemList.tsx +167 -0
  167. package/src/SearchTypeResult/SearchItems.tsx +26 -19
  168. package/src/SearchTypeResult/SearchNotionItem.tsx +5 -12
  169. package/src/SearchTypeResult/SearchNotionsResult.tsx +29 -22
  170. package/src/SearchTypeResult/SearchTypeHeader.tsx +51 -33
  171. package/src/SearchTypeResult/SearchTypeResult.tsx +13 -12
  172. package/src/SearchTypeResult/SearchViewType.tsx +109 -0
  173. package/src/SearchTypeResult/components/ItemContexts.tsx +138 -0
  174. package/src/SearchTypeResult/components/ItemResourceHeader.tsx +133 -0
  175. package/src/SearchTypeResult/components/ItemTopicHeader.tsx +95 -0
  176. package/src/SearchTypeResult/components/SubjectFilters.tsx +152 -0
  177. package/src/SearchTypeResult/index.ts +9 -1
  178. package/src/index.ts +5 -1
  179. package/src/locale/messages-en.ts +18 -3
  180. package/src/locale/messages-nb.ts +19 -4
  181. package/src/locale/messages-nn.ts +19 -4
  182. package/src/model/ContentType.ts +1 -0
  183. package/src/shapes.js +1 -0
  184. package/src/types.ts +1 -0
@@ -6,10 +6,11 @@
6
6
  *
7
7
  */
8
8
 
9
- import React, { ReactNode } from 'react';
9
+ import React, { ReactNode, useEffect, useRef } from 'react';
10
10
  import BEMHelper from 'react-bem-helper';
11
11
  import { WithTranslation, withTranslation } from 'react-i18next';
12
12
  import { DisplayOnPageYOffset } from '../Animation';
13
+ import { MessageBox, MessageBoxType } from '../MessageBox';
13
14
 
14
15
  const classes = new BEMHelper({
15
16
  name: 'masthead',
@@ -42,37 +43,61 @@ const MastheadInfo = ({ children }: MastheadInfoProps) => (
42
43
  interface Props {
43
44
  children?: ReactNode;
44
45
  fixed?: boolean;
45
- showLoaderWhenNeeded?: boolean;
46
46
  infoContent?: ReactNode;
47
47
  ndlaFilm?: boolean;
48
48
  skipToMainContentId?: string;
49
+ messages?: string[];
49
50
  }
50
51
 
51
52
  export const Masthead = ({
52
53
  children,
53
54
  fixed,
54
55
  infoContent,
55
- showLoaderWhenNeeded = true,
56
56
  ndlaFilm,
57
57
  skipToMainContentId,
58
+ messages,
58
59
  t,
59
- }: Props & WithTranslation) => (
60
- <>
61
- {skipToMainContentId && (
62
- <a tabIndex={0} href={`#${skipToMainContentId}`} {...classes('skip-to-main-content')}>
63
- {t('masthead.skipToContent')}
64
- </a>
65
- )}
66
- <div {...classes('placeholder', { infoContent: !!infoContent })} />
67
- <div {...classes('', { fixed: !!fixed, infoContent: !!infoContent, showLoaderWhenNeeded, ndlaFilm: !!ndlaFilm })}>
68
- {infoContent && (
69
- <DisplayOnPageYOffset yOffsetMin={0} yOffsetMax={90}>
70
- <MastheadInfo>{infoContent}</MastheadInfo>
71
- </DisplayOnPageYOffset>
60
+ }: Props & WithTranslation) => {
61
+ const mastheadRef = useRef<HTMLDivElement>(null);
62
+ const focusHandler = (evt: FocusEvent) => {
63
+ const mastheadHeight = (mastheadRef.current && mastheadRef.current.offsetHeight) || 0;
64
+ const { target } = evt;
65
+ const rect = (target as HTMLElement).getBoundingClientRect();
66
+ // Focused target is hidden behind Masthead
67
+ if (rect.y < mastheadHeight) {
68
+ window.scrollTo(window.scrollX, window.scrollY - (mastheadHeight + 10));
69
+ }
70
+ };
71
+
72
+ useEffect(() => {
73
+ if (fixed) {
74
+ document.addEventListener('focusin', focusHandler);
75
+ return () => {
76
+ document.removeEventListener('focusin', focusHandler);
77
+ };
78
+ }
79
+ }, [fixed]);
80
+
81
+ return (
82
+ <>
83
+ {skipToMainContentId && (
84
+ <a tabIndex={0} href={`#${skipToMainContentId}`} {...classes('skip-to-main-content')}>
85
+ {t('masthead.skipToContent')}
86
+ </a>
72
87
  )}
73
- <div className={`u-1/1 ${classes('content').className}`}>{children}</div>
74
- </div>
75
- </>
76
- );
88
+ <div id="masthead" {...classes('', { fixed: !!fixed, infoContent: !!infoContent, ndlaFilm: !!ndlaFilm })}>
89
+ {messages?.map((message) => (
90
+ <MessageBox type={MessageBoxType.masthead}>{message}</MessageBox>
91
+ ))}
92
+ {infoContent && (
93
+ <DisplayOnPageYOffset yOffsetMin={0} yOffsetMax={90}>
94
+ <MastheadInfo>{infoContent}</MastheadInfo>
95
+ </DisplayOnPageYOffset>
96
+ )}
97
+ <div className={`u-1/1 ${classes('content').className}`}>{children}</div>
98
+ </div>
99
+ </>
100
+ );
101
+ };
77
102
 
78
103
  export default withTranslation()(Masthead);
@@ -16,7 +16,8 @@
16
16
  height: 1px;
17
17
  overflow: hidden;
18
18
  z-index: -999;
19
- &:focus, &:active {
19
+ &:focus,
20
+ &:active {
20
21
  color: #fff;
21
22
  background: $brand-color;
22
23
  left: auto;
@@ -38,64 +39,12 @@
38
39
 
39
40
  &--fixed {
40
41
  top: 0;
41
- left: 0;
42
- right: 0;
43
- position: fixed;
42
+ position: sticky;
44
43
  @media print {
45
44
  position: relative;
46
45
  }
47
46
  }
48
47
 
49
- &--showLoaderWhenNeeded {
50
- &:last-child {
51
- &:after {
52
- content: '';
53
- display: block;
54
- height: 100vh;
55
- width: 100vw;
56
- background-color: #f9f9f9;
57
- }
58
- &:before {
59
- content: '';
60
- position: absolute;
61
- display: block;
62
- height: 100vh;
63
- width: 100vw;
64
- background-position-x: center;
65
- background-position-y: 65px;
66
- background-repeat: no-repeat;
67
- animation-name: pulseAnimation;
68
- animation-duration: 1.6s;
69
- animation-timing-function: ease-in-out;
70
- animation-iteration-count: infinite;
71
- @include mq($until: mobileWide) {
72
- background-size: 280px 609px;
73
- background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSIyODBweCIgaGVpZ2h0PSI2MDlweCIgdmlld0JveD0iMCAwIDI4MCA2MDkiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+R3JvdXA8L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJ0aW55IiBmaWxsPSIjRTZFNkU2IiBmaWxsLXJ1bGU9Im5vbnplcm8iPiAgICAgICAgICAgIDxnIGlkPSJHcm91cCI+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMiIgeD0iMCIgeT0iMjEiIHdpZHRoPSIxNjQuMzA1NTU2IiBoZWlnaHQ9IjMyIj48L3JlY3Q+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMiIgeD0iMCIgeT0iMCIgd2lkdGg9IjQwLjgzMzMzMzMiIGhlaWdodD0iMTYiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSIxODAiIHdpZHRoPSIyODAiIGhlaWdodD0iMjcwIj48L3JlY3Q+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMiIgeD0iMCIgeT0iNzAiIHdpZHRoPSIyODAiIGhlaWdodD0iMjUiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSI5OCIgd2lkdGg9IjI4MCIgaGVpZ2h0PSIyNSI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjEyNSIgd2lkdGg9IjI4MCIgaGVpZ2h0PSIyNSI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjQ4MCIgd2lkdGg9IjI4MCIgaGVpZ2h0PSIxOCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjUwOCIgd2lkdGg9IjI4MCIgaGVpZ2h0PSIxOCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjUzNSIgd2lkdGg9IjI4MCIgaGVpZ2h0PSIxOCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjU2MyIgd2lkdGg9IjI4MCIgaGVpZ2h0PSIxOCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjU5MSIgd2lkdGg9IjE5Mi41IiBoZWlnaHQ9IjE4Ij48L3JlY3Q+ICAgICAgICAgICAgPC9nPiAgICAgICAgPC9nPiAgICA8L2c+PC9zdmc+);
74
- }
75
- @include mq(mobileWide) {
76
- // 475
77
- background-size: 375px 848px;
78
- background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSIzNzVweCIgaGVpZ2h0PSI4NDhweCIgdmlld0JveD0iMCAwIDM3NSA4NDgiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+R3JvdXA8L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJzbWFsbCIgZmlsbD0iI0U2RTZFNiIgZmlsbC1ydWxlPSJub256ZXJvIj4gICAgICAgICAgICA8ZyBpZD0iR3JvdXAiPiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjI3IiB3aWR0aD0iMjIwLjU4ODIzNSIgaGVpZ2h0PSI0MiI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjAiIHdpZHRoPSI1NC4xNDQzODUiIGhlaWdodD0iMjEiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSIyMTUiIHdpZHRoPSIxMTAuMjk0MTE4IiBoZWlnaHQ9IjIxIj48L3JlY3Q+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMiIgeD0iMjY0LjcwNTg4MiIgeT0iMjE1IiB3aWR0aD0iMTEwLjI5NDExOCIgaGVpZ2h0PSIyMSI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjI5MCIgd2lkdGg9IjM3NSIgaGVpZ2h0PSIzNTEiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSI5MSIgd2lkdGg9IjM3NSIgaGVpZ2h0PSIzMiI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjEyNyIgd2lkdGg9IjM3NSIgaGVpZ2h0PSIzMiI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjE2MyIgd2lkdGg9IjM3NSIgaGVpZ2h0PSIzMiI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjY4MCIgd2lkdGg9IjM3NSIgaGVpZ2h0PSIyNCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjcxNiIgd2lkdGg9IjM3NSIgaGVpZ2h0PSIyNCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9Ijc1MiIgd2lkdGg9IjM3NSIgaGVpZ2h0PSIyNCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9Ijc4OCIgd2lkdGg9IjM3NSIgaGVpZ2h0PSIyNCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjgyNCIgd2lkdGg9IjI1Ny42ODcxNjYiIGhlaWdodD0iMjQiPjwvcmVjdD4gICAgICAgICAgICA8L2c+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=);
79
- }
80
- @include mq(tablet) {
81
- // 600
82
- background-position-y: 95px;
83
- background-size: 530px 848px;
84
- background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI1MzBweCIgaGVpZ2h0PSI4NDhweCIgdmlld0JveD0iMCAwIDUzMCA4NDgiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+R3JvdXA8L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJhcnRpY2xlLW1lZGl1bSIgZmlsbD0iI0U2RTZFNiIgZmlsbC1ydWxlPSJub256ZXJvIj4gICAgICAgICAgICA8ZyBpZD0iR3JvdXAiPiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjI3IiB3aWR0aD0iMzExIiBoZWlnaHQ9IjQyIj48L3JlY3Q+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMiIgeD0iMCIgeT0iMCIgd2lkdGg9Ijc3IiBoZWlnaHQ9IjIxIj48L3JlY3Q+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMiIgeD0iMCIgeT0iMjE1IiB3aWR0aD0iMTU2IiBoZWlnaHQ9IjIxIj48L3JlY3Q+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMiIgeD0iMzc0IiB5PSIyMTUiIHdpZHRoPSIxNTYiIGhlaWdodD0iMjEiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSIyOTAiIHdpZHRoPSI1MzAiIGhlaWdodD0iMzUxIj48L3JlY3Q+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMiIgeD0iMCIgeT0iOTEiIHdpZHRoPSI1MzAiIGhlaWdodD0iMzIiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSIxMjciIHdpZHRoPSI1MzAiIGhlaWdodD0iMzIiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSIxNjMiIHdpZHRoPSI1MzAiIGhlaWdodD0iMzIiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSI2ODAiIHdpZHRoPSI1MzAiIGhlaWdodD0iMjQiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSI3MTYiIHdpZHRoPSI1MzAiIGhlaWdodD0iMjQiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSI3NTIiIHdpZHRoPSI1MzAiIGhlaWdodD0iMjQiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSI3ODgiIHdpZHRoPSI1MzAiIGhlaWdodD0iMjQiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSI4MjQiIHdpZHRoPSIzNjMiIGhlaWdodD0iMjQiPjwvcmVjdD4gICAgICAgICAgICA8L2c+ICAgICAgICA8L2c+ICAgIDwvZz48L3N2Zz4=);
85
- }
86
- @include mq(tabletWide) {
87
- // 767
88
- background-size: 624px 848px;
89
- background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48c3ZnIHdpZHRoPSI2MjRweCIgaGVpZ2h0PSI4NDhweCIgdmlld0JveD0iMCAwIDYyNCA4NDgiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+ICAgICAgICA8dGl0bGU+R3JvdXA8L3RpdGxlPiAgICA8ZGVzYz5DcmVhdGVkIHdpdGggU2tldGNoLjwvZGVzYz4gICAgPGRlZnM+PC9kZWZzPiAgICA8ZyBpZD0iUGFnZS0xIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj4gICAgICAgIDxnIGlkPSJhcnRpY2xlLWxhcmdlIiBmaWxsPSIjRTZFNkU2IiBmaWxsLXJ1bGU9Im5vbnplcm8iPiAgICAgICAgICAgIDxnIGlkPSJHcm91cCI+ICAgICAgICAgICAgICAgIDxyZWN0IGlkPSJSZWN0YW5nbGUtMiIgeD0iMCIgeT0iMjciIHdpZHRoPSIzMjYiIGhlaWdodD0iNDIiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSIwIiB3aWR0aD0iODEiIGhlaWdodD0iMjEiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSIyMTUiIHdpZHRoPSIxNjMiIGhlaWdodD0iMjEiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSI0NjEiIHk9IjIxNSIgd2lkdGg9IjE2MyIgaGVpZ2h0PSIyMSI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjI5MCIgd2lkdGg9IjYyNCIgaGVpZ2h0PSIzNTEiPjwvcmVjdD4gICAgICAgICAgICAgICAgPHJlY3QgaWQ9IlJlY3RhbmdsZS0yIiB4PSIwIiB5PSI5MSIgd2lkdGg9IjYyNCIgaGVpZ2h0PSIzMiI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjEyNyIgd2lkdGg9IjYyNCIgaGVpZ2h0PSIzMiI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjE2MyIgd2lkdGg9IjYyNCIgaGVpZ2h0PSIzMiI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjY4MCIgd2lkdGg9IjYyNCIgaGVpZ2h0PSIyNCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjcxNiIgd2lkdGg9IjYyNCIgaGVpZ2h0PSIyNCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9Ijc1MiIgd2lkdGg9IjYyNCIgaGVpZ2h0PSIyNCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9Ijc4OCIgd2lkdGg9IjYyNCIgaGVpZ2h0PSIyNCI+PC9yZWN0PiAgICAgICAgICAgICAgICA8cmVjdCBpZD0iUmVjdGFuZ2xlLTIiIHg9IjAiIHk9IjgyNCIgd2lkdGg9IjM4MC42NCIgaGVpZ2h0PSIyNCI+PC9yZWN0PiAgICAgICAgICAgIDwvZz4gICAgICAgIDwvZz4gICAgPC9nPjwvc3ZnPg==);
90
- }
91
- }
92
- }
93
- &:not(:last-child) ~ div {
94
- animation-name: fadeIn;
95
- animation-duration: 150ms;
96
- }
97
- }
98
-
99
48
  &--ndlaFilm {
100
49
  background: $film-color-light;
101
50
  background-image: linear-gradient(0deg, $film-color-light, $film-color);
@@ -110,14 +59,6 @@
110
59
  }
111
60
  }
112
61
 
113
- &__placeholder {
114
- min-height: $masthead-height;
115
- width: 100%;
116
- @media print {
117
- min-height: revert;
118
- }
119
- }
120
-
121
62
  &__content {
122
63
  justify-content: center;
123
64
  align-items: center;
@@ -8,6 +8,8 @@
8
8
 
9
9
  import Masthead, { MastheadItem } from './Masthead';
10
10
 
11
- export { MastheadItem };
11
+ import { getMastheadHeight } from './utils';
12
+
13
+ export { MastheadItem, getMastheadHeight };
12
14
 
13
15
  export default Masthead;
@@ -0,0 +1,12 @@
1
+ /**
2
+ * Copyright (c) 2022-present, NDLA.
3
+ *
4
+ * This source code is licensed under the GPLv3 license found in the
5
+ * LICENSE file in the root directory of this source tree.
6
+ *
7
+ */
8
+
9
+ export const getMastheadHeight = (): number | undefined => {
10
+ const masthead = document.getElementById('masthead');
11
+ return masthead?.getBoundingClientRect().height;
12
+ };
@@ -18,6 +18,7 @@ export enum MessageBoxType {
18
18
  ghost = 'ghost',
19
19
  fullpage = 'fullpage',
20
20
  medium = 'medium',
21
+ masthead = 'masthead',
21
22
  }
22
23
  type WrapperProps = {
23
24
  boxType?: MessageBoxType;
@@ -51,7 +52,9 @@ const StyleByType = (type: WrapperProps['boxType']) => {
51
52
  styles.backgroundColor = 'transparent';
52
53
  styles.border = '1px solid #D1D6DB';
53
54
  styles.color = '#444444';
54
-
55
+ break;
56
+ case 'masthead':
57
+ styles.display = 'none';
55
58
  break;
56
59
  }
57
60
  return styles;
@@ -0,0 +1,80 @@
1
+ /**
2
+ * Copyright (c) 2022-present, NDLA.
3
+ *
4
+ * This source code is licensed under the GPLv3 license found in the
5
+ * LICENSE file in the root directory of this source tree. *
6
+ */
7
+
8
+ import React, { useEffect } from 'react';
9
+ //@ts-ignore
10
+ import { initArticleScripts } from '@ndla/article-scripts';
11
+ import { Notion } from '.';
12
+ import { NotionImage } from './NotionImage';
13
+ import NotionVisualElement, { NotionVisualElementType } from './NotionVisualElement';
14
+ import FigureNotion from './FigureNotion';
15
+ import { Copyright } from '../types';
16
+
17
+ export interface ConceptNotionType {
18
+ id: number;
19
+ copyright?: Partial<Copyright>;
20
+ title: string;
21
+ text: string;
22
+ subjectNames?: string[];
23
+ visualElement?: NotionVisualElementType;
24
+ image?: {
25
+ src: string;
26
+ alt: string;
27
+ };
28
+ }
29
+ interface Props {
30
+ concept: ConceptNotionType;
31
+ }
32
+
33
+ const ConceptNotion = ({ concept }: Props) => {
34
+ const notionId = `notion-${concept.id}`;
35
+ const figureId = `notion-figure-${concept.id}`;
36
+ const visualElementId = `visual-element-${concept.id}`;
37
+
38
+ useEffect(() => {
39
+ initArticleScripts();
40
+ }, []);
41
+ return (
42
+ <FigureNotion
43
+ id={figureId}
44
+ figureId={visualElementId}
45
+ copyright={concept.copyright}
46
+ title={concept.title}
47
+ licenseString={concept.copyright?.license?.license ?? ''}
48
+ type="concept">
49
+ <Notion
50
+ id={notionId}
51
+ title={concept.title}
52
+ text={concept.text}
53
+ labels={concept.subjectNames ?? []}
54
+ imageElement={
55
+ concept.visualElement?.resource === 'image' && concept.visualElement.image ? (
56
+ <NotionImage
57
+ id={visualElementId}
58
+ src={concept.visualElement.image.src}
59
+ alt={concept.visualElement.image.alt ?? ''}
60
+ imageCopyright={concept.visualElement.copyright}
61
+ />
62
+ ) : undefined
63
+ }
64
+ visualElement={
65
+ concept.visualElement && concept.visualElement.resource !== 'image' && concept.visualElement.url
66
+ ? {
67
+ type: concept.visualElement.resource === 'brightcove' ? 'video' : 'other',
68
+ metaImage: concept.image && {
69
+ url: concept.image.src,
70
+ alt: concept.image.alt,
71
+ },
72
+ element: <NotionVisualElement visualElement={concept.visualElement} />,
73
+ }
74
+ : undefined
75
+ }></Notion>
76
+ </FigureNotion>
77
+ );
78
+ };
79
+
80
+ export default ConceptNotion;
@@ -0,0 +1,88 @@
1
+ /**
2
+ * Copyright (c) 2022-present, NDLA.
3
+ *
4
+ * This source code is licensed under the GPLv3 license found in the
5
+ * LICENSE file in the root directory of this source tree. *
6
+ */
7
+
8
+ import Button from '@ndla/button';
9
+ import { getGroupedContributorDescriptionList, getLicenseByAbbreviation } from '@ndla/licenses';
10
+ import React, { ReactNode } from 'react';
11
+ import { useTranslation } from 'react-i18next';
12
+ import { Figure, FigureCaption, FigureLicenseDialog } from '..';
13
+ import { Copyright } from '../types';
14
+
15
+ interface Props {
16
+ resizeIframe?: boolean;
17
+ figureId: string;
18
+ children: ReactNode | ((params: { typeClass: string }) => ReactNode);
19
+ id: string;
20
+ title: string;
21
+ copyright?: Partial<Copyright>;
22
+ licenseString: string;
23
+ type: 'video' | 'h5p' | 'image' | 'concept';
24
+ hideFigCaption?: boolean;
25
+ }
26
+
27
+ const FigureNotion = ({
28
+ resizeIframe,
29
+ figureId,
30
+ children,
31
+ id,
32
+ copyright,
33
+ licenseString,
34
+ title,
35
+ type,
36
+ hideFigCaption,
37
+ }: Props) => {
38
+ const { t, i18n } = useTranslation();
39
+ const license = getLicenseByAbbreviation(licenseString, i18n.language);
40
+ const { creators, processors, rightsholders } = copyright ?? {};
41
+ const contributors = getGroupedContributorDescriptionList(
42
+ {
43
+ creators: creators ?? [],
44
+ processors: processors ?? [],
45
+ rightsholders: rightsholders ?? [],
46
+ },
47
+ i18n.language,
48
+ ).map((i) => ({ name: i.description, type: i.label }));
49
+
50
+ return (
51
+ <Figure resizeIframe={resizeIframe} id={figureId} type={'full-column'}>
52
+ {({ typeClass }) => (
53
+ <>
54
+ {typeof children === 'function' ? children({ typeClass }) : children}
55
+ {copyright?.license?.license && (
56
+ <FigureCaption
57
+ hideFigcaption={hideFigCaption}
58
+ figureId={figureId}
59
+ id={id}
60
+ caption={title}
61
+ reuseLabel={t(`${type}.reuse`)}
62
+ authors={contributors}
63
+ licenseRights={license.rights}>
64
+ <FigureLicenseDialog
65
+ id={id}
66
+ authors={contributors}
67
+ locale={i18n.language}
68
+ title={title}
69
+ origin={copyright?.origin}
70
+ license={license}
71
+ messages={{
72
+ close: t('close'),
73
+ rulesForUse: t('license.concept.rules'),
74
+ source: t('source'),
75
+ learnAboutLicenses: t('license.learnMore'),
76
+ title: t('title'),
77
+ }}>
78
+ {type === 'image' && <Button outline>{t('license.copyTitle')}</Button>}
79
+ </FigureLicenseDialog>
80
+ </FigureCaption>
81
+ )}
82
+ </>
83
+ )}
84
+ </Figure>
85
+ );
86
+ };
87
+
88
+ export default FigureNotion;