@ndla/ui 3.3.7 → 3.3.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.
- package/es/Article/Article.js +23 -1
- package/es/Article/ArticleNotions.js +80 -32
- package/es/Breadcrumb/Breadcrumb.js +2 -1
- package/es/Breadcrumblist/Breadcrumblist.js +14 -10
- package/es/CloseButton/CloseButton.js +62 -0
- package/es/CloseButton/index.js +9 -0
- package/es/Frontpage/FrontpageAllSubjects.js +7 -7
- package/es/Frontpage/FrontpageProgramMenu.js +10 -10
- package/es/MediaList/MediaList.js +22 -73
- package/es/MessageBox/MessageBox.js +146 -78
- package/es/MessageBox/MessageBoxTag.js +37 -0
- package/es/MessageBox/index.js +3 -1
- package/es/NDLAFilm/FilmSlideshow.js +214 -247
- package/es/NDLAFilm/NavigationArrow.js +13 -60
- package/es/NDLAFilm/SlideshowIndicator.js +16 -63
- package/es/NDLAFilm/interfaces.js +0 -0
- package/es/Programme/Programme.js +15 -8
- package/es/SearchTypeResult/SearchFieldHeader.js +5 -5
- package/es/SearchTypeResult/SearchHeader.js +9 -9
- package/es/SearchTypeResult/SearchItem.js +19 -19
- package/es/SearchTypeResult/SearchNotionItem.js +12 -12
- package/es/SearchTypeResult/SearchNotionsResult.js +9 -14
- package/es/Spinner/Spinner.js +3 -3
- package/es/index.js +2 -1
- package/es/locale/messages-en.js +10 -0
- package/es/locale/messages-nb.js +10 -0
- package/es/locale/messages-nn.js +10 -0
- package/lib/Article/Article.d.ts +3 -1
- package/lib/Article/Article.js +25 -3
- package/lib/Article/ArticleNotions.js +79 -30
- package/lib/Breadcrumb/Breadcrumb.js +2 -1
- package/lib/Breadcrumblist/Breadcrumblist.d.ts +2 -1
- package/lib/Breadcrumblist/Breadcrumblist.js +15 -10
- package/lib/CloseButton/CloseButton.d.ts +6 -0
- package/lib/CloseButton/CloseButton.js +69 -0
- package/lib/CloseButton/index.d.ts +9 -0
- package/lib/CloseButton/index.js +15 -0
- package/lib/Frontpage/FrontpageAllSubjects.d.ts +1 -1
- package/lib/Frontpage/FrontpageAllSubjects.js +7 -7
- package/lib/Frontpage/FrontpageProgramMenu.js +10 -10
- package/lib/MediaList/MediaList.d.ts +48 -0
- package/lib/MediaList/MediaList.js +24 -78
- package/lib/MediaList/index.d.ts +8 -0
- package/lib/MessageBox/MessageBox.d.ts +22 -6
- package/lib/MessageBox/MessageBox.js +146 -77
- package/lib/MessageBox/MessageBoxTag.d.ts +12 -0
- package/lib/MessageBox/MessageBoxTag.js +44 -0
- package/lib/MessageBox/index.d.ts +3 -1
- package/lib/MessageBox/index.js +22 -2
- package/lib/NDLAFilm/FilmSlideshow.d.ts +16 -0
- package/lib/NDLAFilm/FilmSlideshow.js +214 -248
- package/lib/NDLAFilm/NavigationArrow.d.ts +15 -0
- package/lib/NDLAFilm/NavigationArrow.js +20 -65
- package/lib/NDLAFilm/SlideshowIndicator.d.ts +15 -0
- package/lib/NDLAFilm/SlideshowIndicator.js +16 -69
- package/lib/NDLAFilm/interfaces.d.ts +10 -0
- package/lib/NDLAFilm/interfaces.js +1 -0
- package/lib/NDLAFilm/shapes.d.ts +15 -0
- package/lib/Programme/Programme.d.ts +2 -1
- package/lib/Programme/Programme.js +18 -9
- package/lib/SearchTypeResult/SearchFieldHeader.d.ts +3 -3
- package/lib/SearchTypeResult/SearchFieldHeader.js +5 -5
- package/lib/SearchTypeResult/SearchHeader.d.ts +3 -3
- package/lib/SearchTypeResult/SearchHeader.js +9 -9
- package/lib/SearchTypeResult/SearchItem.d.ts +2 -3
- package/lib/SearchTypeResult/SearchItem.js +19 -19
- package/lib/SearchTypeResult/SearchNotionItem.d.ts +1 -1
- package/lib/SearchTypeResult/SearchNotionItem.js +12 -12
- package/lib/SearchTypeResult/SearchNotionsResult.js +8 -13
- package/lib/SearchTypeResult/index.d.ts +1 -0
- package/lib/Spinner/Spinner.d.ts +3 -3
- package/lib/Spinner/Spinner.js +2 -2
- package/lib/index.d.ts +2 -1
- package/lib/index.js +23 -0
- package/lib/locale/messages-en.d.ts +10 -0
- package/lib/locale/messages-en.js +10 -0
- package/lib/locale/messages-nb.d.ts +10 -0
- package/lib/locale/messages-nb.js +10 -0
- package/lib/locale/messages-nn.d.ts +10 -0
- package/lib/locale/messages-nn.js +10 -0
- package/package.json +10 -10
- package/src/Article/Article.tsx +17 -0
- package/src/Article/ArticleNotions.tsx +10 -7
- package/src/Breadcrumb/Breadcrumb.tsx +1 -1
- package/src/Breadcrumblist/Breadcrumblist.tsx +5 -3
- package/src/CloseButton/CloseButton.tsx +40 -0
- package/src/CloseButton/index.ts +11 -0
- package/src/Frontpage/FrontpageAllSubjects.tsx +2 -2
- package/src/Frontpage/FrontpageProgramMenu.tsx +1 -0
- package/src/MediaList/MediaList.tsx +158 -0
- package/src/MediaList/{index.js → index.ts} +0 -0
- package/src/MessageBox/MessageBox.tsx +117 -96
- package/src/MessageBox/MessageBoxTag.tsx +35 -0
- package/src/MessageBox/index.ts +3 -1
- package/src/NDLAFilm/FilmSlideshow.tsx +265 -0
- package/src/NDLAFilm/NavigationArrow.tsx +42 -0
- package/src/NDLAFilm/SlideshowIndicator.tsx +40 -0
- package/src/NDLAFilm/interfaces.ts +10 -0
- package/src/NDLAFilm/{shapes.js → shapes.ts} +0 -0
- package/src/Programme/Programme.tsx +7 -3
- package/src/SearchTypeResult/SearchFieldHeader.tsx +3 -3
- package/src/SearchTypeResult/SearchHeader.tsx +3 -3
- package/src/SearchTypeResult/SearchItem.tsx +4 -5
- package/src/SearchTypeResult/SearchNotionItem.tsx +1 -2
- package/src/SearchTypeResult/SearchNotionsResult.tsx +3 -8
- package/src/SearchTypeResult/index.ts +2 -0
- package/src/Spinner/Spinner.tsx +9 -5
- package/src/index.ts +2 -1
- package/src/locale/messages-en.ts +14 -0
- package/src/locale/messages-nb.ts +14 -0
- package/src/locale/messages-nn.ts +14 -0
- package/src/MediaList/MediaList.jsx +0 -182
- package/src/NDLAFilm/FilmSlideshow.jsx +0 -277
- package/src/NDLAFilm/NavigationArrow.jsx +0 -46
- package/src/NDLAFilm/SlideshowIndicator.jsx +0 -43
|
@@ -11,7 +11,7 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
11
11
|
|
|
12
12
|
var _core = require("@ndla/core");
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _modal = require("@ndla/modal");
|
|
15
15
|
|
|
16
16
|
var _reactI18next = require("react-i18next");
|
|
17
17
|
|
|
@@ -30,23 +30,19 @@ var Wrapper = (0, _styledBase["default"])("div", {
|
|
|
30
30
|
from: _core.breakpoints.tablet
|
|
31
31
|
}), "{padding:", _core.spacing.medium, ";box-shadow:0 0 20px rgba(0,0,0,0.24);border-radius:5px;margin:", _core.spacing.large, " 0;}", _core.mq.range({
|
|
32
32
|
from: _core.breakpoints.desktop
|
|
33
|
-
}), "{padding:", _core.spacing.medium, " 66px;}" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
33
|
+
}), "{padding:", _core.spacing.medium, " 66px;}" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNlYXJjaE5vdGlvbnNSZXN1bHQudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWlCMEIiLCJmaWxlIjoiU2VhcmNoTm90aW9uc1Jlc3VsdC50c3giLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIENvcHlyaWdodCAoYykgMjAyMC1wcmVzZW50LCBORExBLlxuICpcbiAqIFRoaXMgc291cmNlIGNvZGUgaXMgbGljZW5zZWQgdW5kZXIgdGhlIEdQTHYzIGxpY2Vuc2UgZm91bmQgaW4gdGhlXG4gKiBMSUNFTlNFIGZpbGUgaW4gdGhlIHJvb3QgZGlyZWN0b3J5IG9mIHRoaXMgc291cmNlIHRyZWUuXG4gKlxuICovXG5cbmltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5pbXBvcnQgeyBmb250cywgbXEsIGJyZWFrcG9pbnRzLCBzcGFjaW5nIH0gZnJvbSAnQG5kbGEvY29yZSc7XG4vLyBAdHMtaWdub3JlXG5pbXBvcnQgeyBNb2RhbENsb3NlQnV0dG9uIH0gZnJvbSAnQG5kbGEvbW9kYWwnO1xuLy8gQHRzLWlnbm9yZVxuaW1wb3J0IHsgd2l0aFRyYW5zbGF0aW9uLCBXaXRoVHJhbnNsYXRpb24gfSBmcm9tICdyZWFjdC1pMThuZXh0JztcbmltcG9ydCBTZWFyY2hOb3Rpb25JdGVtLCB7IFNlYXJjaE5vdGlvbkl0ZW1Qcm9wcyB9IGZyb20gJy4vU2VhcmNoTm90aW9uSXRlbSc7XG5cbmNvbnN0IFdyYXBwZXIgPSBzdHlsZWQuZGl2YFxuICBkaXNwbGF5OiBmbGV4O1xuICBmbGV4LWRpcmVjdGlvbjogY29sdW1uO1xuICBwYWRkaW5nOiAke3NwYWNpbmcubWVkaXVtfSAwO1xuICAke21xLnJhbmdlKHsgZnJvbTogYnJlYWtwb2ludHMudGFibGV0IH0pfSB7XG4gICAgcGFkZGluZzogJHtzcGFjaW5nLm1lZGl1bX07XG4gICAgYm94LXNoYWRvdzogMCAwIDIwcHggcmdiYSgwLCAwLCAwLCAwLjI0KTtcbiAgICBib3JkZXItcmFkaXVzOiA1cHg7XG4gICAgbWFyZ2luOiAke3NwYWNpbmcubGFyZ2V9IDA7XG4gIH1cbiAgJHttcS5yYW5nZSh7IGZyb206IGJyZWFrcG9pbnRzLmRlc2t0b3AgfSl9IHtcbiAgICBwYWRkaW5nOiAke3NwYWNpbmcubWVkaXVtfSA2NnB4O1xuICB9XG5gO1xuXG5jb25zdCBIZWFkaW5nV3JhcHBlciA9IHN0eWxlZC5kaXZgXG4gIGRpc3BsYXk6IGZsZXg7XG4gIGp1c3RpZnktY29udGVudDogc3BhY2UtYmV0d2VlbjtcbiAgYWxpZ24taXRlbXM6IGNlbnRlcjtcbiAgbWFyZ2luLWJvdHRvbTogJHtzcGFjaW5nLnNtYWxsfTtcbmA7XG5jb25zdCBIZWFkaW5nID0gc3R5bGVkLmgyYFxuICBtYXJnaW46IDA7XG4gICR7Zm9udHMuc2l6ZXMoJzIwcHgnLCAnNDVweCcpfTtcbiAgdGV4dC10cmFuc2Zvcm06IHVwcGVyY2FzZTtcbmA7XG5cbmNvbnN0IEhlYWRpbmdDb3VudCA9IHN0eWxlZC5zcGFuYFxuICBmb250LXdlaWdodDogNDAwO1xuICBtYXJnaW4tbGVmdDogJHtzcGFjaW5nLnNtYWxsfTtcbiAgdGV4dC10cmFuc2Zvcm06IGxvd2VyY2FzZTtcbmA7XG5cbnR5cGUgUHJvcHMgPSB7XG4gIGl0ZW1zOiBTZWFyY2hOb3Rpb25JdGVtUHJvcHNbXTtcbiAgdG90YWxDb3VudDogbnVtYmVyO1xuICBvblJlbW92ZTogKCkgPT4gdm9pZDtcbiAgcmVuZGVyTWFya2Rvd246ICh0ZXh0OiBSZWFjdC5SZWFjdE5vZGUpID0+IHN0cmluZztcbn07XG5cbmNvbnN0IFNlYXJjaE5vdGlvbnNSZXN1bHQgPSAoeyBpdGVtcywgdG90YWxDb3VudCwgb25SZW1vdmUsIHJlbmRlck1hcmtkb3duLCB0IH06IFByb3BzICYgV2l0aFRyYW5zbGF0aW9uKSA9PiAoXG4gIDxXcmFwcGVyPlxuICAgIDxIZWFkaW5nV3JhcHBlcj5cbiAgICAgIDxIZWFkaW5nPlxuICAgICAgICB7dChgc2VhcmNoUGFnZS5yZXN1bHRUeXBlLm5vdGlvbnNIZWFkaW5nYCl9XG4gICAgICAgIDxIZWFkaW5nQ291bnQ+e3QoYHNlYXJjaFBhZ2UucmVzdWx0VHlwZS5oaXRzYCwgeyBjb3VudDogdG90YWxDb3VudCB9KX08L0hlYWRpbmdDb3VudD5cbiAgICAgIDwvSGVhZGluZz5cbiAgICAgIDxNb2RhbENsb3NlQnV0dG9uIG9uQ2xpY2s9e29uUmVtb3ZlfSAvPlxuICAgIDwvSGVhZGluZ1dyYXBwZXI+XG4gICAge2l0ZW1zLm1hcCgoaXRlbSkgPT4gKFxuICAgICAgPFNlYXJjaE5vdGlvbkl0ZW0ga2V5PXtpdGVtLmlkfSB7Li4uaXRlbX0gcmVuZGVyTWFya2Rvd249e3JlbmRlck1hcmtkb3dufSAvPlxuICAgICkpfVxuICA8L1dyYXBwZXI+XG4pO1xuXG5leHBvcnQgZGVmYXVsdCB3aXRoVHJhbnNsYXRpb24oKShTZWFyY2hOb3Rpb25zUmVzdWx0KTtcbiJdfQ== */"));
|
|
34
34
|
var HeadingWrapper = (0, _styledBase["default"])("div", {
|
|
35
35
|
target: "e1g2z5qn1",
|
|
36
36
|
label: "HeadingWrapper"
|
|
37
|
-
})("display:flex;justify-content:space-between;align-items:center;margin-bottom:", _core.spacing.small, ";" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
37
|
+
})("display:flex;justify-content:space-between;align-items:center;margin-bottom:", _core.spacing.small, ";" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNlYXJjaE5vdGlvbnNSZXN1bHQudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWdDaUMiLCJmaWxlIjoiU2VhcmNoTm90aW9uc1Jlc3VsdC50c3giLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIENvcHlyaWdodCAoYykgMjAyMC1wcmVzZW50LCBORExBLlxuICpcbiAqIFRoaXMgc291cmNlIGNvZGUgaXMgbGljZW5zZWQgdW5kZXIgdGhlIEdQTHYzIGxpY2Vuc2UgZm91bmQgaW4gdGhlXG4gKiBMSUNFTlNFIGZpbGUgaW4gdGhlIHJvb3QgZGlyZWN0b3J5IG9mIHRoaXMgc291cmNlIHRyZWUuXG4gKlxuICovXG5cbmltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5pbXBvcnQgeyBmb250cywgbXEsIGJyZWFrcG9pbnRzLCBzcGFjaW5nIH0gZnJvbSAnQG5kbGEvY29yZSc7XG4vLyBAdHMtaWdub3JlXG5pbXBvcnQgeyBNb2RhbENsb3NlQnV0dG9uIH0gZnJvbSAnQG5kbGEvbW9kYWwnO1xuLy8gQHRzLWlnbm9yZVxuaW1wb3J0IHsgd2l0aFRyYW5zbGF0aW9uLCBXaXRoVHJhbnNsYXRpb24gfSBmcm9tICdyZWFjdC1pMThuZXh0JztcbmltcG9ydCBTZWFyY2hOb3Rpb25JdGVtLCB7IFNlYXJjaE5vdGlvbkl0ZW1Qcm9wcyB9IGZyb20gJy4vU2VhcmNoTm90aW9uSXRlbSc7XG5cbmNvbnN0IFdyYXBwZXIgPSBzdHlsZWQuZGl2YFxuICBkaXNwbGF5OiBmbGV4O1xuICBmbGV4LWRpcmVjdGlvbjogY29sdW1uO1xuICBwYWRkaW5nOiAke3NwYWNpbmcubWVkaXVtfSAwO1xuICAke21xLnJhbmdlKHsgZnJvbTogYnJlYWtwb2ludHMudGFibGV0IH0pfSB7XG4gICAgcGFkZGluZzogJHtzcGFjaW5nLm1lZGl1bX07XG4gICAgYm94LXNoYWRvdzogMCAwIDIwcHggcmdiYSgwLCAwLCAwLCAwLjI0KTtcbiAgICBib3JkZXItcmFkaXVzOiA1cHg7XG4gICAgbWFyZ2luOiAke3NwYWNpbmcubGFyZ2V9IDA7XG4gIH1cbiAgJHttcS5yYW5nZSh7IGZyb206IGJyZWFrcG9pbnRzLmRlc2t0b3AgfSl9IHtcbiAgICBwYWRkaW5nOiAke3NwYWNpbmcubWVkaXVtfSA2NnB4O1xuICB9XG5gO1xuXG5jb25zdCBIZWFkaW5nV3JhcHBlciA9IHN0eWxlZC5kaXZgXG4gIGRpc3BsYXk6IGZsZXg7XG4gIGp1c3RpZnktY29udGVudDogc3BhY2UtYmV0d2VlbjtcbiAgYWxpZ24taXRlbXM6IGNlbnRlcjtcbiAgbWFyZ2luLWJvdHRvbTogJHtzcGFjaW5nLnNtYWxsfTtcbmA7XG5jb25zdCBIZWFkaW5nID0gc3R5bGVkLmgyYFxuICBtYXJnaW46IDA7XG4gICR7Zm9udHMuc2l6ZXMoJzIwcHgnLCAnNDVweCcpfTtcbiAgdGV4dC10cmFuc2Zvcm06IHVwcGVyY2FzZTtcbmA7XG5cbmNvbnN0IEhlYWRpbmdDb3VudCA9IHN0eWxlZC5zcGFuYFxuICBmb250LXdlaWdodDogNDAwO1xuICBtYXJnaW4tbGVmdDogJHtzcGFjaW5nLnNtYWxsfTtcbiAgdGV4dC10cmFuc2Zvcm06IGxvd2VyY2FzZTtcbmA7XG5cbnR5cGUgUHJvcHMgPSB7XG4gIGl0ZW1zOiBTZWFyY2hOb3Rpb25JdGVtUHJvcHNbXTtcbiAgdG90YWxDb3VudDogbnVtYmVyO1xuICBvblJlbW92ZTogKCkgPT4gdm9pZDtcbiAgcmVuZGVyTWFya2Rvd246ICh0ZXh0OiBSZWFjdC5SZWFjdE5vZGUpID0+IHN0cmluZztcbn07XG5cbmNvbnN0IFNlYXJjaE5vdGlvbnNSZXN1bHQgPSAoeyBpdGVtcywgdG90YWxDb3VudCwgb25SZW1vdmUsIHJlbmRlck1hcmtkb3duLCB0IH06IFByb3BzICYgV2l0aFRyYW5zbGF0aW9uKSA9PiAoXG4gIDxXcmFwcGVyPlxuICAgIDxIZWFkaW5nV3JhcHBlcj5cbiAgICAgIDxIZWFkaW5nPlxuICAgICAgICB7dChgc2VhcmNoUGFnZS5yZXN1bHRUeXBlLm5vdGlvbnNIZWFkaW5nYCl9XG4gICAgICAgIDxIZWFkaW5nQ291bnQ+e3QoYHNlYXJjaFBhZ2UucmVzdWx0VHlwZS5oaXRzYCwgeyBjb3VudDogdG90YWxDb3VudCB9KX08L0hlYWRpbmdDb3VudD5cbiAgICAgIDwvSGVhZGluZz5cbiAgICAgIDxNb2RhbENsb3NlQnV0dG9uIG9uQ2xpY2s9e29uUmVtb3ZlfSAvPlxuICAgIDwvSGVhZGluZ1dyYXBwZXI+XG4gICAge2l0ZW1zLm1hcCgoaXRlbSkgPT4gKFxuICAgICAgPFNlYXJjaE5vdGlvbkl0ZW0ga2V5PXtpdGVtLmlkfSB7Li4uaXRlbX0gcmVuZGVyTWFya2Rvd249e3JlbmRlck1hcmtkb3dufSAvPlxuICAgICkpfVxuICA8L1dyYXBwZXI+XG4pO1xuXG5leHBvcnQgZGVmYXVsdCB3aXRoVHJhbnNsYXRpb24oKShTZWFyY2hOb3Rpb25zUmVzdWx0KTtcbiJdfQ== */"));
|
|
38
38
|
var Heading = (0, _styledBase["default"])("h2", {
|
|
39
39
|
target: "e1g2z5qn2",
|
|
40
40
|
label: "Heading"
|
|
41
|
-
})("margin:0;", _core.fonts.sizes('20px', '45px'), ";text-transform:uppercase;" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
41
|
+
})("margin:0;", _core.fonts.sizes('20px', '45px'), ";text-transform:uppercase;" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNlYXJjaE5vdGlvbnNSZXN1bHQudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXNDeUIiLCJmaWxlIjoiU2VhcmNoTm90aW9uc1Jlc3VsdC50c3giLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIENvcHlyaWdodCAoYykgMjAyMC1wcmVzZW50LCBORExBLlxuICpcbiAqIFRoaXMgc291cmNlIGNvZGUgaXMgbGljZW5zZWQgdW5kZXIgdGhlIEdQTHYzIGxpY2Vuc2UgZm91bmQgaW4gdGhlXG4gKiBMSUNFTlNFIGZpbGUgaW4gdGhlIHJvb3QgZGlyZWN0b3J5IG9mIHRoaXMgc291cmNlIHRyZWUuXG4gKlxuICovXG5cbmltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5pbXBvcnQgeyBmb250cywgbXEsIGJyZWFrcG9pbnRzLCBzcGFjaW5nIH0gZnJvbSAnQG5kbGEvY29yZSc7XG4vLyBAdHMtaWdub3JlXG5pbXBvcnQgeyBNb2RhbENsb3NlQnV0dG9uIH0gZnJvbSAnQG5kbGEvbW9kYWwnO1xuLy8gQHRzLWlnbm9yZVxuaW1wb3J0IHsgd2l0aFRyYW5zbGF0aW9uLCBXaXRoVHJhbnNsYXRpb24gfSBmcm9tICdyZWFjdC1pMThuZXh0JztcbmltcG9ydCBTZWFyY2hOb3Rpb25JdGVtLCB7IFNlYXJjaE5vdGlvbkl0ZW1Qcm9wcyB9IGZyb20gJy4vU2VhcmNoTm90aW9uSXRlbSc7XG5cbmNvbnN0IFdyYXBwZXIgPSBzdHlsZWQuZGl2YFxuICBkaXNwbGF5OiBmbGV4O1xuICBmbGV4LWRpcmVjdGlvbjogY29sdW1uO1xuICBwYWRkaW5nOiAke3NwYWNpbmcubWVkaXVtfSAwO1xuICAke21xLnJhbmdlKHsgZnJvbTogYnJlYWtwb2ludHMudGFibGV0IH0pfSB7XG4gICAgcGFkZGluZzogJHtzcGFjaW5nLm1lZGl1bX07XG4gICAgYm94LXNoYWRvdzogMCAwIDIwcHggcmdiYSgwLCAwLCAwLCAwLjI0KTtcbiAgICBib3JkZXItcmFkaXVzOiA1cHg7XG4gICAgbWFyZ2luOiAke3NwYWNpbmcubGFyZ2V9IDA7XG4gIH1cbiAgJHttcS5yYW5nZSh7IGZyb206IGJyZWFrcG9pbnRzLmRlc2t0b3AgfSl9IHtcbiAgICBwYWRkaW5nOiAke3NwYWNpbmcubWVkaXVtfSA2NnB4O1xuICB9XG5gO1xuXG5jb25zdCBIZWFkaW5nV3JhcHBlciA9IHN0eWxlZC5kaXZgXG4gIGRpc3BsYXk6IGZsZXg7XG4gIGp1c3RpZnktY29udGVudDogc3BhY2UtYmV0d2VlbjtcbiAgYWxpZ24taXRlbXM6IGNlbnRlcjtcbiAgbWFyZ2luLWJvdHRvbTogJHtzcGFjaW5nLnNtYWxsfTtcbmA7XG5jb25zdCBIZWFkaW5nID0gc3R5bGVkLmgyYFxuICBtYXJnaW46IDA7XG4gICR7Zm9udHMuc2l6ZXMoJzIwcHgnLCAnNDVweCcpfTtcbiAgdGV4dC10cmFuc2Zvcm06IHVwcGVyY2FzZTtcbmA7XG5cbmNvbnN0IEhlYWRpbmdDb3VudCA9IHN0eWxlZC5zcGFuYFxuICBmb250LXdlaWdodDogNDAwO1xuICBtYXJnaW4tbGVmdDogJHtzcGFjaW5nLnNtYWxsfTtcbiAgdGV4dC10cmFuc2Zvcm06IGxvd2VyY2FzZTtcbmA7XG5cbnR5cGUgUHJvcHMgPSB7XG4gIGl0ZW1zOiBTZWFyY2hOb3Rpb25JdGVtUHJvcHNbXTtcbiAgdG90YWxDb3VudDogbnVtYmVyO1xuICBvblJlbW92ZTogKCkgPT4gdm9pZDtcbiAgcmVuZGVyTWFya2Rvd246ICh0ZXh0OiBSZWFjdC5SZWFjdE5vZGUpID0+IHN0cmluZztcbn07XG5cbmNvbnN0IFNlYXJjaE5vdGlvbnNSZXN1bHQgPSAoeyBpdGVtcywgdG90YWxDb3VudCwgb25SZW1vdmUsIHJlbmRlck1hcmtkb3duLCB0IH06IFByb3BzICYgV2l0aFRyYW5zbGF0aW9uKSA9PiAoXG4gIDxXcmFwcGVyPlxuICAgIDxIZWFkaW5nV3JhcHBlcj5cbiAgICAgIDxIZWFkaW5nPlxuICAgICAgICB7dChgc2VhcmNoUGFnZS5yZXN1bHRUeXBlLm5vdGlvbnNIZWFkaW5nYCl9XG4gICAgICAgIDxIZWFkaW5nQ291bnQ+e3QoYHNlYXJjaFBhZ2UucmVzdWx0VHlwZS5oaXRzYCwgeyBjb3VudDogdG90YWxDb3VudCB9KX08L0hlYWRpbmdDb3VudD5cbiAgICAgIDwvSGVhZGluZz5cbiAgICAgIDxNb2RhbENsb3NlQnV0dG9uIG9uQ2xpY2s9e29uUmVtb3ZlfSAvPlxuICAgIDwvSGVhZGluZ1dyYXBwZXI+XG4gICAge2l0ZW1zLm1hcCgoaXRlbSkgPT4gKFxuICAgICAgPFNlYXJjaE5vdGlvbkl0ZW0ga2V5PXtpdGVtLmlkfSB7Li4uaXRlbX0gcmVuZGVyTWFya2Rvd249e3JlbmRlck1hcmtkb3dufSAvPlxuICAgICkpfVxuICA8L1dyYXBwZXI+XG4pO1xuXG5leHBvcnQgZGVmYXVsdCB3aXRoVHJhbnNsYXRpb24oKShTZWFyY2hOb3Rpb25zUmVzdWx0KTtcbiJdfQ== */"));
|
|
42
42
|
var HeadingCount = (0, _styledBase["default"])("span", {
|
|
43
43
|
target: "e1g2z5qn3",
|
|
44
44
|
label: "HeadingCount"
|
|
45
|
-
})("font-weight:400;margin-left:", _core.spacing.small, ";text-transform:lowercase;" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
46
|
-
var ButtonRemoveText = (0, _styledBase["default"])("span", {
|
|
47
|
-
target: "e1g2z5qn4",
|
|
48
|
-
label: "ButtonRemoveText"
|
|
49
|
-
})(_core.fonts.sizes('18px', '22px'), ";" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNlYXJjaE5vdGlvbnNSZXN1bHQudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWlEb0MiLCJmaWxlIjoiU2VhcmNoTm90aW9uc1Jlc3VsdC50c3giLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIENvcHlyaWdodCAoYykgMjAyMC1wcmVzZW50LCBORExBLlxuICpcbiAqIFRoaXMgc291cmNlIGNvZGUgaXMgbGljZW5zZWQgdW5kZXIgdGhlIEdQTHYzIGxpY2Vuc2UgZm91bmQgaW4gdGhlXG4gKiBMSUNFTlNFIGZpbGUgaW4gdGhlIHJvb3QgZGlyZWN0b3J5IG9mIHRoaXMgc291cmNlIHRyZWUuXG4gKlxuICovXG5cbmltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5pbXBvcnQgeyBmb250cywgbXEsIGJyZWFrcG9pbnRzLCBzcGFjaW5nIH0gZnJvbSAnQG5kbGEvY29yZSc7XG4vLyBAdHMtaWdub3JlXG5pbXBvcnQgQnV0dG9uIGZyb20gJ0BuZGxhL2J1dHRvbic7XG5pbXBvcnQgeyB3aXRoVHJhbnNsYXRpb24sIFdpdGhUcmFuc2xhdGlvbiB9IGZyb20gJ3JlYWN0LWkxOG5leHQnO1xuaW1wb3J0IFNlYXJjaE5vdGlvbkl0ZW0sIHsgU2VhcmNoTm90aW9uSXRlbVByb3BzIH0gZnJvbSAnLi9TZWFyY2hOb3Rpb25JdGVtJztcblxuY29uc3QgV3JhcHBlciA9IHN0eWxlZC5kaXZgXG4gIGRpc3BsYXk6IGZsZXg7XG4gIGZsZXgtZGlyZWN0aW9uOiBjb2x1bW47XG4gIHBhZGRpbmc6ICR7c3BhY2luZy5tZWRpdW19IDA7XG4gICR7bXEucmFuZ2UoeyBmcm9tOiBicmVha3BvaW50cy50YWJsZXQgfSl9IHtcbiAgICBwYWRkaW5nOiAke3NwYWNpbmcubWVkaXVtfTtcbiAgICBib3gtc2hhZG93OiAwIDAgMjBweCByZ2JhKDAsIDAsIDAsIDAuMjQpO1xuICAgIGJvcmRlci1yYWRpdXM6IDVweDtcbiAgICBtYXJnaW46ICR7c3BhY2luZy5sYXJnZX0gMDtcbiAgfVxuICAke21xLnJhbmdlKHsgZnJvbTogYnJlYWtwb2ludHMuZGVza3RvcCB9KX0ge1xuICAgIHBhZGRpbmc6ICR7c3BhY2luZy5tZWRpdW19IDY2cHg7XG4gIH1cbmA7XG5cbmNvbnN0IEhlYWRpbmdXcmFwcGVyID0gc3R5bGVkLmRpdmBcbiAgZGlzcGxheTogZmxleDtcbiAganVzdGlmeS1jb250ZW50OiBzcGFjZS1iZXR3ZWVuO1xuICBhbGlnbi1pdGVtczogY2VudGVyO1xuICBtYXJnaW4tYm90dG9tOiAke3NwYWNpbmcuc21hbGx9O1xuYDtcbmNvbnN0IEhlYWRpbmcgPSBzdHlsZWQuaDJgXG4gIG1hcmdpbjogMDtcbiAgJHtmb250cy5zaXplcygnMjBweCcsICc0NXB4Jyl9O1xuICB0ZXh0LXRyYW5zZm9ybTogdXBwZXJjYXNlO1xuYDtcblxuY29uc3QgSGVhZGluZ0NvdW50ID0gc3R5bGVkLnNwYW5gXG4gIGZvbnQtd2VpZ2h0OiA0MDA7XG4gIG1hcmdpbi1sZWZ0OiAke3NwYWNpbmcuc21hbGx9O1xuICB0ZXh0LXRyYW5zZm9ybTogbG93ZXJjYXNlO1xuYDtcblxuY29uc3QgQnV0dG9uUmVtb3ZlVGV4dCA9IHN0eWxlZC5zcGFuYFxuICAke2ZvbnRzLnNpemVzKCcxOHB4JywgJzIycHgnKX07XG5gO1xuXG50eXBlIFByb3BzID0ge1xuICBpdGVtczogU2VhcmNoTm90aW9uSXRlbVByb3BzW107XG4gIHRvdGFsQ291bnQ6IG51bWJlcjtcbiAgb25SZW1vdmU6ICgpID0+IHZvaWQ7XG4gIHJlbmRlck1hcmtkb3duOiAodGV4dDogUmVhY3QuUmVhY3ROb2RlKSA9PiBzdHJpbmc7XG59O1xuXG5jb25zdCBTZWFyY2hOb3Rpb25zUmVzdWx0ID0gKHsgaXRlbXMsIHRvdGFsQ291bnQsIG9uUmVtb3ZlLCByZW5kZXJNYXJrZG93biwgdCB9OiBQcm9wcyAmIFdpdGhUcmFuc2xhdGlvbikgPT4gKFxuICA8V3JhcHBlcj5cbiAgICA8SGVhZGluZ1dyYXBwZXI+XG4gICAgICA8SGVhZGluZz5cbiAgICAgICAge3QoYHNlYXJjaFBhZ2UucmVzdWx0VHlwZS5ub3Rpb25zSGVhZGluZ2ApfVxuICAgICAgICA8SGVhZGluZ0NvdW50Pnt0KGBzZWFyY2hQYWdlLnJlc3VsdFR5cGUuaGl0c2AsIHsgY291bnQ6IHRvdGFsQ291bnQgfSl9PC9IZWFkaW5nQ291bnQ+XG4gICAgICA8L0hlYWRpbmc+XG4gICAgICA8QnV0dG9uIG9uQ2xpY2s9e29uUmVtb3ZlfSBsaW5rPlxuICAgICAgICA8QnV0dG9uUmVtb3ZlVGV4dD57dChgc2VhcmNoUGFnZS5yZXN1bHRUeXBlLm5vdGlvbnNSZW1vdmVgKX08L0J1dHRvblJlbW92ZVRleHQ+XG4gICAgICA8L0J1dHRvbj5cbiAgICA8L0hlYWRpbmdXcmFwcGVyPlxuICAgIHtpdGVtcy5tYXAoKGl0ZW0pID0+IChcbiAgICAgIDxTZWFyY2hOb3Rpb25JdGVtIGtleT17aXRlbS5pZH0gey4uLml0ZW19IHJlbmRlck1hcmtkb3duPXtyZW5kZXJNYXJrZG93bn0gLz5cbiAgICApKX1cbiAgPC9XcmFwcGVyPlxuKTtcblxuZXhwb3J0IGRlZmF1bHQgd2l0aFRyYW5zbGF0aW9uKCkoU2VhcmNoTm90aW9uc1Jlc3VsdCk7XG4iXX0= */"));
|
|
45
|
+
})("font-weight:400;margin-left:", _core.spacing.small, ";text-transform:lowercase;" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNlYXJjaE5vdGlvbnNSZXN1bHQudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQTRDZ0MiLCJmaWxlIjoiU2VhcmNoTm90aW9uc1Jlc3VsdC50c3giLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIENvcHlyaWdodCAoYykgMjAyMC1wcmVzZW50LCBORExBLlxuICpcbiAqIFRoaXMgc291cmNlIGNvZGUgaXMgbGljZW5zZWQgdW5kZXIgdGhlIEdQTHYzIGxpY2Vuc2UgZm91bmQgaW4gdGhlXG4gKiBMSUNFTlNFIGZpbGUgaW4gdGhlIHJvb3QgZGlyZWN0b3J5IG9mIHRoaXMgc291cmNlIHRyZWUuXG4gKlxuICovXG5cbmltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5pbXBvcnQgeyBmb250cywgbXEsIGJyZWFrcG9pbnRzLCBzcGFjaW5nIH0gZnJvbSAnQG5kbGEvY29yZSc7XG4vLyBAdHMtaWdub3JlXG5pbXBvcnQgeyBNb2RhbENsb3NlQnV0dG9uIH0gZnJvbSAnQG5kbGEvbW9kYWwnO1xuLy8gQHRzLWlnbm9yZVxuaW1wb3J0IHsgd2l0aFRyYW5zbGF0aW9uLCBXaXRoVHJhbnNsYXRpb24gfSBmcm9tICdyZWFjdC1pMThuZXh0JztcbmltcG9ydCBTZWFyY2hOb3Rpb25JdGVtLCB7IFNlYXJjaE5vdGlvbkl0ZW1Qcm9wcyB9IGZyb20gJy4vU2VhcmNoTm90aW9uSXRlbSc7XG5cbmNvbnN0IFdyYXBwZXIgPSBzdHlsZWQuZGl2YFxuICBkaXNwbGF5OiBmbGV4O1xuICBmbGV4LWRpcmVjdGlvbjogY29sdW1uO1xuICBwYWRkaW5nOiAke3NwYWNpbmcubWVkaXVtfSAwO1xuICAke21xLnJhbmdlKHsgZnJvbTogYnJlYWtwb2ludHMudGFibGV0IH0pfSB7XG4gICAgcGFkZGluZzogJHtzcGFjaW5nLm1lZGl1bX07XG4gICAgYm94LXNoYWRvdzogMCAwIDIwcHggcmdiYSgwLCAwLCAwLCAwLjI0KTtcbiAgICBib3JkZXItcmFkaXVzOiA1cHg7XG4gICAgbWFyZ2luOiAke3NwYWNpbmcubGFyZ2V9IDA7XG4gIH1cbiAgJHttcS5yYW5nZSh7IGZyb206IGJyZWFrcG9pbnRzLmRlc2t0b3AgfSl9IHtcbiAgICBwYWRkaW5nOiAke3NwYWNpbmcubWVkaXVtfSA2NnB4O1xuICB9XG5gO1xuXG5jb25zdCBIZWFkaW5nV3JhcHBlciA9IHN0eWxlZC5kaXZgXG4gIGRpc3BsYXk6IGZsZXg7XG4gIGp1c3RpZnktY29udGVudDogc3BhY2UtYmV0d2VlbjtcbiAgYWxpZ24taXRlbXM6IGNlbnRlcjtcbiAgbWFyZ2luLWJvdHRvbTogJHtzcGFjaW5nLnNtYWxsfTtcbmA7XG5jb25zdCBIZWFkaW5nID0gc3R5bGVkLmgyYFxuICBtYXJnaW46IDA7XG4gICR7Zm9udHMuc2l6ZXMoJzIwcHgnLCAnNDVweCcpfTtcbiAgdGV4dC10cmFuc2Zvcm06IHVwcGVyY2FzZTtcbmA7XG5cbmNvbnN0IEhlYWRpbmdDb3VudCA9IHN0eWxlZC5zcGFuYFxuICBmb250LXdlaWdodDogNDAwO1xuICBtYXJnaW4tbGVmdDogJHtzcGFjaW5nLnNtYWxsfTtcbiAgdGV4dC10cmFuc2Zvcm06IGxvd2VyY2FzZTtcbmA7XG5cbnR5cGUgUHJvcHMgPSB7XG4gIGl0ZW1zOiBTZWFyY2hOb3Rpb25JdGVtUHJvcHNbXTtcbiAgdG90YWxDb3VudDogbnVtYmVyO1xuICBvblJlbW92ZTogKCkgPT4gdm9pZDtcbiAgcmVuZGVyTWFya2Rvd246ICh0ZXh0OiBSZWFjdC5SZWFjdE5vZGUpID0+IHN0cmluZztcbn07XG5cbmNvbnN0IFNlYXJjaE5vdGlvbnNSZXN1bHQgPSAoeyBpdGVtcywgdG90YWxDb3VudCwgb25SZW1vdmUsIHJlbmRlck1hcmtkb3duLCB0IH06IFByb3BzICYgV2l0aFRyYW5zbGF0aW9uKSA9PiAoXG4gIDxXcmFwcGVyPlxuICAgIDxIZWFkaW5nV3JhcHBlcj5cbiAgICAgIDxIZWFkaW5nPlxuICAgICAgICB7dChgc2VhcmNoUGFnZS5yZXN1bHRUeXBlLm5vdGlvbnNIZWFkaW5nYCl9XG4gICAgICAgIDxIZWFkaW5nQ291bnQ+e3QoYHNlYXJjaFBhZ2UucmVzdWx0VHlwZS5oaXRzYCwgeyBjb3VudDogdG90YWxDb3VudCB9KX08L0hlYWRpbmdDb3VudD5cbiAgICAgIDwvSGVhZGluZz5cbiAgICAgIDxNb2RhbENsb3NlQnV0dG9uIG9uQ2xpY2s9e29uUmVtb3ZlfSAvPlxuICAgIDwvSGVhZGluZ1dyYXBwZXI+XG4gICAge2l0ZW1zLm1hcCgoaXRlbSkgPT4gKFxuICAgICAgPFNlYXJjaE5vdGlvbkl0ZW0ga2V5PXtpdGVtLmlkfSB7Li4uaXRlbX0gcmVuZGVyTWFya2Rvd249e3JlbmRlck1hcmtkb3dufSAvPlxuICAgICkpfVxuICA8L1dyYXBwZXI+XG4pO1xuXG5leHBvcnQgZGVmYXVsdCB3aXRoVHJhbnNsYXRpb24oKShTZWFyY2hOb3Rpb25zUmVzdWx0KTtcbiJdfQ== */"));
|
|
50
46
|
|
|
51
47
|
var SearchNotionsResult = function SearchNotionsResult(_ref) {
|
|
52
48
|
var items = _ref.items,
|
|
@@ -56,10 +52,9 @@ var SearchNotionsResult = function SearchNotionsResult(_ref) {
|
|
|
56
52
|
t = _ref.t;
|
|
57
53
|
return (0, _core2.jsx)(Wrapper, null, (0, _core2.jsx)(HeadingWrapper, null, (0, _core2.jsx)(Heading, null, t("searchPage.resultType.notionsHeading"), (0, _core2.jsx)(HeadingCount, null, t("searchPage.resultType.hits", {
|
|
58
54
|
count: totalCount
|
|
59
|
-
}))), (0, _core2.jsx)(
|
|
60
|
-
onClick: onRemove
|
|
61
|
-
|
|
62
|
-
}, (0, _core2.jsx)(ButtonRemoveText, null, t("searchPage.resultType.notionsRemove")))), items.map(function (item) {
|
|
55
|
+
}))), (0, _core2.jsx)(_modal.ModalCloseButton, {
|
|
56
|
+
onClick: onRemove
|
|
57
|
+
})), items.map(function (item) {
|
|
63
58
|
return (0, _core2.jsx)(_SearchNotionItem["default"], _extends({
|
|
64
59
|
key: item.id
|
|
65
60
|
}, item, {
|
|
@@ -10,4 +10,5 @@ import SearchHeader from './SearchHeader';
|
|
|
10
10
|
import SearchFieldHeader from './SearchFieldHeader';
|
|
11
11
|
import SearchNotionsResult from './SearchNotionsResult';
|
|
12
12
|
import SearchSubjectResult from './SearchSubjectResult';
|
|
13
|
+
export type { ContentType } from './SearchTypeResult';
|
|
13
14
|
export { SearchTypeResult, SearchHeader, SearchFieldHeader, SearchNotionsResult, SearchSubjectResult };
|
package/lib/Spinner/Spinner.d.ts
CHANGED
|
@@ -7,9 +7,9 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { SpacingNames } from '@ndla/core';
|
|
9
9
|
interface Props {
|
|
10
|
-
size
|
|
11
|
-
margin
|
|
12
|
-
inverted
|
|
10
|
+
size?: SpacingNames;
|
|
11
|
+
margin?: string;
|
|
12
|
+
inverted?: boolean;
|
|
13
13
|
}
|
|
14
14
|
declare const Spinner: ({ size, margin, inverted }: Partial<Props>) => JSX.Element;
|
|
15
15
|
export default Spinner;
|
package/lib/Spinner/Spinner.js
CHANGED
|
@@ -33,9 +33,9 @@ var SpinnerDiv = ( /*#__PURE__*/0, _styledBase["default"])('div', {
|
|
|
33
33
|
return _core.spacing[props.size];
|
|
34
34
|
}, ";width:", function (props) {
|
|
35
35
|
return _core.spacing[props.size];
|
|
36
|
-
}, ";
|
|
36
|
+
}, ";margin:", function (props) {
|
|
37
37
|
return props.margin;
|
|
38
|
-
}, ";@keyframes spinnerAnimation{0%{transform:rotate(0deg);}100%{transform:rotate(360deg);}}" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,
|
|
38
|
+
}, ";display:block;@keyframes spinnerAnimation{0%{transform:rotate(0deg);}100%{transform:rotate(360deg);}}" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNwaW5uZXIudHN4Il0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQXNCNkMiLCJmaWxlIjoiU3Bpbm5lci50c3giLCJzb3VyY2VzQ29udGVudCI6WyIvKipcbiAqIENvcHlyaWdodCAoYykgMjAxOC1wcmVzZW50LCBORExBLlxuICpcbiAqIFRoaXMgc291cmNlIGNvZGUgaXMgbGljZW5zZWQgdW5kZXIgdGhlIEdQTHYzIGxpY2Vuc2UgZm91bmQgaW4gdGhlXG4gKiBMSUNFTlNFIGZpbGUgaW4gdGhlIHJvb3QgZGlyZWN0b3J5IG9mIHRoaXMgc291cmNlIHRyZWUuXG4gKlxuICovXG5cbmltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5pbXBvcnQgeyBjb2xvcnMsIHNwYWNpbmcsIFNwYWNpbmdOYW1lcyB9IGZyb20gJ0BuZGxhL2NvcmUnO1xuXG5pbnRlcmZhY2UgUHJvcHMge1xuICBzaXplPzogU3BhY2luZ05hbWVzO1xuICBtYXJnaW4/OiBzdHJpbmc7XG4gIGludmVydGVkPzogYm9vbGVhbjtcbn1cblxuaW50ZXJmYWNlIFN0eWxlZFByb3BzIGV4dGVuZHMgUHJvcHMge1xuICBzaXplOiBTcGFjaW5nTmFtZXM7XG59XG5cbmNvbnN0IFNwaW5uZXJEaXYgPSBzdHlsZWQoJ2RpdicpPFN0eWxlZFByb3BzPmBcbiAgYm9yZGVyOiBjYWxjKCR7KHByb3BzKSA9PiBzcGFjaW5nW3Byb3BzLnNpemVdfSAvIDYuNSkgc29saWQgcmdiYSgwLCAwLCAwLCAwLjEpO1xuICBib3JkZXItYm90dG9tLWNvbG9yOiAkeyhwcm9wcykgPT4gKHByb3BzLmludmVydGVkID8gJyNmZmYnIDogY29sb3JzLmJyYW5kLnByaW1hcnkpfTtcbiAgYm9yZGVyLXJhZGl1czogNTAlO1xuICBhbmltYXRpb246IHNwaW5uZXJBbmltYXRpb24gMC43cyBsaW5lYXIgaW5maW5pdGU7XG4gIGhlaWdodDogJHsocHJvcHMpID0+IHNwYWNpbmdbcHJvcHMuc2l6ZV19O1xuICB3aWR0aDogJHsocHJvcHMpID0+IHNwYWNpbmdbcHJvcHMuc2l6ZV19O1xuICBtYXJnaW46ICR7KHByb3BzKSA9PiBwcm9wcy5tYXJnaW59O1xuICBkaXNwbGF5OiBibG9jaztcbiAgQGtleWZyYW1lcyBzcGlubmVyQW5pbWF0aW9uIHtcbiAgICAwJSB7XG4gICAgICB0cmFuc2Zvcm06IHJvdGF0ZSgwZGVnKTtcbiAgICB9XG4gICAgMTAwJSB7XG4gICAgICB0cmFuc2Zvcm06IHJvdGF0ZSgzNjBkZWcpO1xuICAgIH1cbiAgfVxuYDtcblxuY29uc3QgU3Bpbm5lciA9ICh7IHNpemUgPSAnbGFyZ2UnLCBtYXJnaW4gPSBgJHtzcGFjaW5nLm5vcm1hbH0gYXV0b2AsIGludmVydGVkIH06IFBhcnRpYWw8UHJvcHM+KSA9PiAoXG4gIDxTcGlubmVyRGl2IHNpemU9e3NpemV9IG1hcmdpbj17bWFyZ2lufSBpbnZlcnRlZD17ISFpbnZlcnRlZH0gLz5cbik7XG5cbmV4cG9ydCBkZWZhdWx0IFNwaW5uZXI7XG4iXX0= */"));
|
|
39
39
|
|
|
40
40
|
var Spinner = function Spinner(_ref) {
|
|
41
41
|
var _ref$size = _ref.size,
|
package/lib/index.d.ts
CHANGED
|
@@ -41,7 +41,8 @@ export { default as MastheadAuthModal } from './Masthead/MastheadAuthModal';
|
|
|
41
41
|
export { default as AuthModal } from './User';
|
|
42
42
|
export { default as CreatedBy } from './CreatedBy';
|
|
43
43
|
export { default as Breadcrumblist } from './Breadcrumblist';
|
|
44
|
-
export { MessageBox } from './MessageBox';
|
|
44
|
+
export { MessageBox, MessageBoxTag, MessageBoxType } from './MessageBox';
|
|
45
|
+
export { CloseButton } from './CloseButton';
|
|
45
46
|
export { default as AudioPlayer, initAudioPlayers } from './AudioPlayer';
|
|
46
47
|
export { NavigationHeading, NavigationBox, NavigationTopicAbout } from './Navigation';
|
|
47
48
|
export { default as Programme } from './Programme';
|
package/lib/index.js
CHANGED
|
@@ -88,6 +88,9 @@ var _exportNames = {
|
|
|
88
88
|
CreatedBy: true,
|
|
89
89
|
Breadcrumblist: true,
|
|
90
90
|
MessageBox: true,
|
|
91
|
+
MessageBoxTag: true,
|
|
92
|
+
MessageBoxType: true,
|
|
93
|
+
CloseButton: true,
|
|
91
94
|
AudioPlayer: true,
|
|
92
95
|
initAudioPlayers: true,
|
|
93
96
|
NavigationHeading: true,
|
|
@@ -635,6 +638,24 @@ Object.defineProperty(exports, "MessageBox", {
|
|
|
635
638
|
return _MessageBox.MessageBox;
|
|
636
639
|
}
|
|
637
640
|
});
|
|
641
|
+
Object.defineProperty(exports, "MessageBoxTag", {
|
|
642
|
+
enumerable: true,
|
|
643
|
+
get: function get() {
|
|
644
|
+
return _MessageBox.MessageBoxTag;
|
|
645
|
+
}
|
|
646
|
+
});
|
|
647
|
+
Object.defineProperty(exports, "MessageBoxType", {
|
|
648
|
+
enumerable: true,
|
|
649
|
+
get: function get() {
|
|
650
|
+
return _MessageBox.MessageBoxType;
|
|
651
|
+
}
|
|
652
|
+
});
|
|
653
|
+
Object.defineProperty(exports, "CloseButton", {
|
|
654
|
+
enumerable: true,
|
|
655
|
+
get: function get() {
|
|
656
|
+
return _CloseButton.CloseButton;
|
|
657
|
+
}
|
|
658
|
+
});
|
|
638
659
|
Object.defineProperty(exports, "AudioPlayer", {
|
|
639
660
|
enumerable: true,
|
|
640
661
|
get: function get() {
|
|
@@ -1041,6 +1062,8 @@ var _Breadcrumblist = _interopRequireDefault(require("./Breadcrumblist"));
|
|
|
1041
1062
|
|
|
1042
1063
|
var _MessageBox = require("./MessageBox");
|
|
1043
1064
|
|
|
1065
|
+
var _CloseButton = require("./CloseButton");
|
|
1066
|
+
|
|
1044
1067
|
var _AudioPlayer = _interopRequireWildcard(require("./AudioPlayer"));
|
|
1045
1068
|
|
|
1046
1069
|
var _Navigation = require("./Navigation");
|
|
@@ -329,6 +329,16 @@ declare const messages: {
|
|
|
329
329
|
h5p: string;
|
|
330
330
|
};
|
|
331
331
|
};
|
|
332
|
+
messageBoxInfo: {
|
|
333
|
+
outdatedCoursePlan: string;
|
|
334
|
+
updateBrowser: string;
|
|
335
|
+
noContent: string;
|
|
336
|
+
feide: string;
|
|
337
|
+
resources: string;
|
|
338
|
+
beta: string;
|
|
339
|
+
outdatedSubject: string;
|
|
340
|
+
newVersion: string;
|
|
341
|
+
};
|
|
332
342
|
article: {
|
|
333
343
|
edition: string;
|
|
334
344
|
publisher: string;
|
|
@@ -289,6 +289,16 @@ var messages = _objectSpread(_objectSpread({
|
|
|
289
289
|
h5p: 'Interactive'
|
|
290
290
|
}
|
|
291
291
|
},
|
|
292
|
+
messageBoxInfo: {
|
|
293
|
+
outdatedCoursePlan: 'This course is not updated to the current curriculum. Follow this link to find the updated version of the course: ',
|
|
294
|
+
updateBrowser: 'Your browser is outdated. Update it, or find a safe and updated browser on https://browsehappy.com.',
|
|
295
|
+
noContent: 'We are sorry, but we do not yet offer any program courses.',
|
|
296
|
+
feide: 'This resource is accessible only to teachers who are logged in with Feide.',
|
|
297
|
+
resources: 'This is not a complete course produced by NDLA, but a collection of resources we hope you will find useful.',
|
|
298
|
+
beta: 'This course is in beta.',
|
|
299
|
+
outdatedSubject: 'This topic is part of a course that is not updated to the current curriculum.',
|
|
300
|
+
newVersion: 'This learning resource is not updated to the current curriculum. You can find an updated version here: '
|
|
301
|
+
},
|
|
292
302
|
article: {
|
|
293
303
|
edition: 'Edition',
|
|
294
304
|
publisher: 'Publisher',
|
|
@@ -329,6 +329,16 @@ declare const messages: {
|
|
|
329
329
|
h5p: string;
|
|
330
330
|
};
|
|
331
331
|
};
|
|
332
|
+
messageBoxInfo: {
|
|
333
|
+
outdatedCoursePlan: string;
|
|
334
|
+
updateBrowser: string;
|
|
335
|
+
noContent: string;
|
|
336
|
+
feide: string;
|
|
337
|
+
resources: string;
|
|
338
|
+
beta: string;
|
|
339
|
+
outdatedSubject: string;
|
|
340
|
+
newVersion: string;
|
|
341
|
+
};
|
|
332
342
|
article: {
|
|
333
343
|
lastUpdated: string;
|
|
334
344
|
edition: string;
|
|
@@ -289,6 +289,16 @@ var messages = _objectSpread(_objectSpread({
|
|
|
289
289
|
h5p: 'Interaktiv'
|
|
290
290
|
}
|
|
291
291
|
},
|
|
292
|
+
messageBoxInfo: {
|
|
293
|
+
outdatedCoursePlan: 'Dette faget følger en utgått læreplan. Gå til faget som er oppdatert etter gjeldende læreplan:',
|
|
294
|
+
updateBrowser: 'Nettleseren din er utdatert. Oppdater den, eller finn en trygg og oppdatert nettleser på https://browsehappy.com.',
|
|
295
|
+
noContent: 'Vi har dessverre ikke noen programfag ennå.',
|
|
296
|
+
feide: 'Denne ressursen er bare tilgjengelig for lærere som er pålogget med Feide.',
|
|
297
|
+
resources: 'Dette er ikke et komplett læremiddel produsert av NDLA, men ei ressurssamling som vi håper kan være nyttig for deg.',
|
|
298
|
+
beta: 'Dette faget er i betaversjon.',
|
|
299
|
+
outdatedSubject: 'Dette emnet hører til et fag som ikke er oppdatert etter gjeldende læreplan.',
|
|
300
|
+
newVersion: 'Denne læringsressursen er ikke oppdatert etter gjeldende læreplan. Du finner en oppdatert versjon her: '
|
|
301
|
+
},
|
|
292
302
|
article: {
|
|
293
303
|
lastUpdated: 'Sist oppdatert',
|
|
294
304
|
edition: 'Utgave',
|
|
@@ -329,6 +329,16 @@ declare const messages: {
|
|
|
329
329
|
h5p: string;
|
|
330
330
|
};
|
|
331
331
|
};
|
|
332
|
+
messageBoxInfo: {
|
|
333
|
+
outdatedCoursePlan: string;
|
|
334
|
+
updateBrowser: string;
|
|
335
|
+
noContent: string;
|
|
336
|
+
feide: string;
|
|
337
|
+
resources: string;
|
|
338
|
+
beta: string;
|
|
339
|
+
outdatedSubject: string;
|
|
340
|
+
newVersion: string;
|
|
341
|
+
};
|
|
332
342
|
article: {
|
|
333
343
|
lastUpdated: string;
|
|
334
344
|
edition: string;
|
|
@@ -289,6 +289,16 @@ var messages = _objectSpread(_objectSpread({
|
|
|
289
289
|
h5p: 'Interaktiv'
|
|
290
290
|
}
|
|
291
291
|
},
|
|
292
|
+
messageBoxInfo: {
|
|
293
|
+
outdatedCoursePlan: 'Dette faget følgjer ein utgått læreplan. Gå til faget som er oppdatert etter gjeldande læreplan: ',
|
|
294
|
+
updateBrowser: 'Nettlesaren din er utdatert. Oppdater han, eller finn ein trygg og oppdatert nettlesar på https://browsehappy.com. ',
|
|
295
|
+
noContent: 'Vi har dessverre ikkje nokon programfag enno.',
|
|
296
|
+
feide: 'Denne ressursen er berre tilgjengeleg for lærarar som er pålogga med Feide.',
|
|
297
|
+
resources: 'Dette er ikkje eit komplett læremiddel produsert av NDLA, men ei ressurssamling som vi håper kan vere nyttig for deg.',
|
|
298
|
+
beta: 'Dette faget er i betaversjon.',
|
|
299
|
+
outdatedSubject: 'Dette emnet høyrer til eit fag som ikkje er oppdatert etter gjeldande læreplan.',
|
|
300
|
+
newVersion: 'Denne læringsressursen er ikkje oppdatert etter gjeldande læreplan. Du finn ein oppdatert versjon her: '
|
|
301
|
+
},
|
|
292
302
|
article: {
|
|
293
303
|
lastUpdated: 'Sist oppdatert',
|
|
294
304
|
edition: 'Utgåve',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ndla/ui",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.12",
|
|
4
4
|
"description": "UI component library for NDLA.",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -31,16 +31,16 @@
|
|
|
31
31
|
"types"
|
|
32
32
|
],
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@ndla/button": "^1.1.
|
|
35
|
-
"@ndla/carousel": "^1.
|
|
34
|
+
"@ndla/button": "^1.1.4",
|
|
35
|
+
"@ndla/carousel": "^1.1.2",
|
|
36
36
|
"@ndla/core": "^0.7.2",
|
|
37
37
|
"@ndla/hooks": "^1.0.7",
|
|
38
|
-
"@ndla/icons": "^1.
|
|
39
|
-
"@ndla/licenses": "^1.1.
|
|
40
|
-
"@ndla/modal": "^1.1.
|
|
41
|
-
"@ndla/safelink": "^1.0.
|
|
38
|
+
"@ndla/icons": "^1.4.1",
|
|
39
|
+
"@ndla/licenses": "^1.1.6",
|
|
40
|
+
"@ndla/modal": "^1.1.18",
|
|
41
|
+
"@ndla/safelink": "^1.0.9",
|
|
42
42
|
"@ndla/switch": "^0.0.32",
|
|
43
|
-
"@ndla/tabs": "^1.0.
|
|
43
|
+
"@ndla/tabs": "^1.0.15",
|
|
44
44
|
"@ndla/tooltip": "^0.2.49",
|
|
45
45
|
"@ndla/util": "^2.0.1",
|
|
46
46
|
"@reach/menu-button": "^0.12.1",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"react-facebook": "^6.0.15",
|
|
64
64
|
"react-prop-types": "0.4.0",
|
|
65
65
|
"react-sticky-el": "^2.0.6",
|
|
66
|
-
"react-swipeable": "^
|
|
66
|
+
"react-swipeable": "^6.2.0",
|
|
67
67
|
"react-syntax-highlighter": "^15.4.4",
|
|
68
68
|
"react-transition-group": "^2.5.3",
|
|
69
69
|
"shave": "^2.5.10"
|
|
@@ -92,5 +92,5 @@
|
|
|
92
92
|
"publishConfig": {
|
|
93
93
|
"access": "public"
|
|
94
94
|
},
|
|
95
|
-
"gitHead": "
|
|
95
|
+
"gitHead": "ff7194a882009a1b4faddafdad34a949d4426ffb"
|
|
96
96
|
}
|
package/src/Article/Article.tsx
CHANGED
|
@@ -10,6 +10,7 @@ import React, { ComponentType, ReactNode, useEffect, useRef, useState } from 're
|
|
|
10
10
|
import BEMHelper from 'react-bem-helper';
|
|
11
11
|
import isString from 'lodash/isString';
|
|
12
12
|
import parse from 'html-react-parser';
|
|
13
|
+
import styled from '@emotion/styled';
|
|
13
14
|
|
|
14
15
|
import { useIntersectionObserver } from '@ndla/hooks';
|
|
15
16
|
import { resizeObserver } from '@ndla/util';
|
|
@@ -22,6 +23,7 @@ import ArticleHeaderWrapper from './ArticleHeaderWrapper';
|
|
|
22
23
|
import ArticleNotions, { NotionRelatedContent } from './ArticleNotions';
|
|
23
24
|
import { NotionProps } from '../Notion/Notion';
|
|
24
25
|
import ArticleAccessMessage from './ArticleAccessMessage';
|
|
26
|
+
import MessageBox from '../MessageBox/MessageBox';
|
|
25
27
|
|
|
26
28
|
const classes = new BEMHelper({
|
|
27
29
|
name: 'article',
|
|
@@ -89,7 +91,11 @@ export const ArticleIntroduction = ({
|
|
|
89
91
|
|
|
90
92
|
type Messages = {
|
|
91
93
|
label: string;
|
|
94
|
+
messageBox?: string;
|
|
92
95
|
};
|
|
96
|
+
const MSGboxWrapper = styled.div`
|
|
97
|
+
margin-bottom: 50px;
|
|
98
|
+
`;
|
|
93
99
|
|
|
94
100
|
type Props = {
|
|
95
101
|
article: ArticleType;
|
|
@@ -99,6 +105,7 @@ type Props = {
|
|
|
99
105
|
children: ReactNode;
|
|
100
106
|
messages: Messages;
|
|
101
107
|
locale: Locale;
|
|
108
|
+
messageBoxLinks?: [];
|
|
102
109
|
competenceGoals?:
|
|
103
110
|
| ((inp: { Dialog: ComponentType; dialogProps: { isOpen: boolean; onClose: () => void } }) => ReactNode)
|
|
104
111
|
| null;
|
|
@@ -129,6 +136,7 @@ export const Article = ({
|
|
|
129
136
|
licenseBox,
|
|
130
137
|
modifier,
|
|
131
138
|
messages,
|
|
139
|
+
messageBoxLinks,
|
|
132
140
|
children,
|
|
133
141
|
competenceGoals,
|
|
134
142
|
competenceGoalTypes,
|
|
@@ -186,6 +194,14 @@ export const Article = ({
|
|
|
186
194
|
<ArticleWrapper modifier={modifier} id={id} ref={articleRef}>
|
|
187
195
|
<LayoutItem layout="center">
|
|
188
196
|
{accessMessage && <ArticleAccessMessage message={accessMessage} />}
|
|
197
|
+
|
|
198
|
+
{messages.messageBox && (
|
|
199
|
+
<MSGboxWrapper>
|
|
200
|
+
<MessageBox links={messageBoxLinks} onClose>
|
|
201
|
+
{messages.messageBox}
|
|
202
|
+
</MessageBox>
|
|
203
|
+
</MSGboxWrapper>
|
|
204
|
+
)}
|
|
189
205
|
<ArticleHeaderWrapper competenceGoals={competenceGoals} competenceGoalTypes={competenceGoalTypes}>
|
|
190
206
|
<ArticleTitle icon={icon} label={messages.label}>
|
|
191
207
|
{title}
|
|
@@ -208,6 +224,7 @@ export const Article = ({
|
|
|
208
224
|
)}
|
|
209
225
|
{getArticleContent(content, locale)}
|
|
210
226
|
</LayoutItem>
|
|
227
|
+
|
|
211
228
|
<LayoutItem layout="center">
|
|
212
229
|
{footNotes && footNotes.length > 0 && <ArticleFootNotes footNotes={footNotes} />}
|
|
213
230
|
<ArticleByline
|
|
@@ -12,8 +12,8 @@ import { useTranslation } from 'react-i18next';
|
|
|
12
12
|
|
|
13
13
|
// @ts-ignore
|
|
14
14
|
import Modal, { ModalHeader, ModalCloseButton, ModalBody } from '@ndla/modal';
|
|
15
|
-
import { mq, breakpoints
|
|
16
|
-
import { Explanation
|
|
15
|
+
import { mq, breakpoints } from '@ndla/core';
|
|
16
|
+
import { Explanation } from '@ndla/icons/common';
|
|
17
17
|
import { Locale } from '../types';
|
|
18
18
|
import { Notion } from '../Notion';
|
|
19
19
|
import { NotionProps } from '../Notion/Notion';
|
|
@@ -25,6 +25,7 @@ const ArticleNotionsContainer = styled.div`
|
|
|
25
25
|
margin-bottom: 0;
|
|
26
26
|
}
|
|
27
27
|
`;
|
|
28
|
+
/* Stored for later
|
|
28
29
|
|
|
29
30
|
const NotionsTrigger = styled.div`
|
|
30
31
|
padding: 0 16px;
|
|
@@ -33,7 +34,7 @@ const NotionsTrigger = styled.div`
|
|
|
33
34
|
background-color: ${colors.brand.greyLighter};
|
|
34
35
|
border-radius: 4px;
|
|
35
36
|
cursor: pointer;
|
|
36
|
-
|
|
37
|
+
|
|
37
38
|
${mq.range({ from: breakpoints.tablet })} {
|
|
38
39
|
position: fixed;
|
|
39
40
|
border: none;
|
|
@@ -81,7 +82,7 @@ const NotionsTrigger = styled.div`
|
|
|
81
82
|
}
|
|
82
83
|
}
|
|
83
84
|
`;
|
|
84
|
-
|
|
85
|
+
*/
|
|
85
86
|
const ModalHeadingContainer = styled.div`
|
|
86
87
|
display: flex;
|
|
87
88
|
align-items: center;
|
|
@@ -176,17 +177,19 @@ export const ArticleNotions = ({
|
|
|
176
177
|
buttonOffsetRight,
|
|
177
178
|
}: ArticleNotionsProps) => {
|
|
178
179
|
const { t } = useTranslation();
|
|
179
|
-
const leftOffset = `${buttonOffsetRight - 32}px`;
|
|
180
|
+
//const leftOffset = `${buttonOffsetRight - 32}px`;
|
|
180
181
|
return (
|
|
181
182
|
<ArticleNotionsContainer>
|
|
182
183
|
<Modal
|
|
183
|
-
|
|
184
|
+
/* Stored for later
|
|
185
|
+
|
|
186
|
+
activateButton={
|
|
184
187
|
<NotionsTrigger role="button" aria-label={t('article.notionsPrompt')} style={{ left: leftOffset }}>
|
|
185
188
|
<NotionFlip />
|
|
186
189
|
<Explanation />
|
|
187
190
|
<span>{t('article.notionsPrompt')}</span>
|
|
188
191
|
</NotionsTrigger>
|
|
189
|
-
}
|
|
192
|
+
} */
|
|
190
193
|
size="large"
|
|
191
194
|
backgroundColor="white">
|
|
192
195
|
{(onClose: () => void) => (
|
|
@@ -43,7 +43,7 @@ const Breadcrumb: React.FunctionComponent<Props & WithTranslation> = ({ children
|
|
|
43
43
|
isCurrent={i === items.length - 1}
|
|
44
44
|
to={item.to}
|
|
45
45
|
name={item.name}>
|
|
46
|
-
{i === 0 ? <Home className="c-icon--20" /> : item.name}
|
|
46
|
+
{i === 0 ? <Home className="c-icon--20" title={item.name} /> : item.name}
|
|
47
47
|
</BreadcrumbItem>
|
|
48
48
|
))}
|
|
49
49
|
</ol>
|
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
import React, { useEffect, useState } from 'react';
|
|
10
10
|
import styled from '@emotion/styled';
|
|
11
11
|
import { mq, breakpoints, colors } from '@ndla/core';
|
|
12
|
-
|
|
13
12
|
import {
|
|
14
13
|
School as SchoolIcon,
|
|
15
14
|
MenuBook as MenuBookIcon,
|
|
@@ -20,6 +19,7 @@ import {
|
|
|
20
19
|
} from '@ndla/icons/action';
|
|
21
20
|
import SafeLink from '@ndla/safelink';
|
|
22
21
|
import { useTranslation } from 'react-i18next';
|
|
22
|
+
import MessageBoxTag from '../MessageBox/MessageBoxTag';
|
|
23
23
|
|
|
24
24
|
type WrapperProps = {
|
|
25
25
|
startOffset?: number;
|
|
@@ -51,7 +51,6 @@ const Wrapper = styled.div<WrapperProps>`
|
|
|
51
51
|
${(props) =>
|
|
52
52
|
props.startOffset &&
|
|
53
53
|
`
|
|
54
|
-
position: absolute;
|
|
55
54
|
top: calc(${props.startOffset}px + 85px);
|
|
56
55
|
`}
|
|
57
56
|
}
|
|
@@ -87,7 +86,7 @@ const Heading = styled.div<InvertItProps>`
|
|
|
87
86
|
font-size: 12px;
|
|
88
87
|
line-height: 15px;
|
|
89
88
|
text-transform: uppercase;
|
|
90
|
-
padding: 0 0
|
|
89
|
+
padding: 0 0 10px 10px;
|
|
91
90
|
${(props) =>
|
|
92
91
|
props.invertedStyle &&
|
|
93
92
|
`
|
|
@@ -214,6 +213,7 @@ type BreadCrumbProps = {
|
|
|
214
213
|
leftAlign?: boolean;
|
|
215
214
|
hideOnNarrow?: boolean;
|
|
216
215
|
onNav?: (e: React.MouseEvent<HTMLElement>, item: BreadcrumbItemProps) => void;
|
|
216
|
+
messageBoxTagMessage?: string;
|
|
217
217
|
};
|
|
218
218
|
|
|
219
219
|
const Breadcrumblist = ({
|
|
@@ -225,6 +225,7 @@ const Breadcrumblist = ({
|
|
|
225
225
|
leftAlign,
|
|
226
226
|
hideOnNarrow,
|
|
227
227
|
onNav,
|
|
228
|
+
messageBoxTagMessage,
|
|
228
229
|
}: BreadCrumbProps) => {
|
|
229
230
|
const { t } = useTranslation();
|
|
230
231
|
const [wrapperOffset, setWrapperOffset] = useState(startOffset);
|
|
@@ -274,6 +275,7 @@ const Breadcrumblist = ({
|
|
|
274
275
|
{items.length > 0 && (
|
|
275
276
|
<>
|
|
276
277
|
<Heading invertedStyle={invertedStyle}>{t('breadcrumb.youAreHere')}</Heading>
|
|
278
|
+
{messageBoxTagMessage && <MessageBoxTag tagMessage={messageBoxTagMessage} />}
|
|
277
279
|
<List data-testid="breadcrumb-list">
|
|
278
280
|
{items.map((item: BreadcrumbItemProps) => {
|
|
279
281
|
const { id, label, url, typename, icon, isCurrent = false } = item;
|
|
@@ -0,0 +1,40 @@
|
|
|
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 from 'react';
|
|
9
|
+
import styled from '@emotion/styled';
|
|
10
|
+
import { Cross } from '@ndla/icons/action';
|
|
11
|
+
import { useTranslation } from 'react-i18next';
|
|
12
|
+
const CloseButtonWrapper = styled.div`
|
|
13
|
+
position: relative;
|
|
14
|
+
top: 1px;
|
|
15
|
+
right: 1px;
|
|
16
|
+
`;
|
|
17
|
+
|
|
18
|
+
const CloseBut = styled.button`
|
|
19
|
+
background-color: transparent;
|
|
20
|
+
border: none;
|
|
21
|
+
display: flex;
|
|
22
|
+
`;
|
|
23
|
+
|
|
24
|
+
type Props = {
|
|
25
|
+
onClick: () => void;
|
|
26
|
+
color: string;
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
export const CloseButton = ({ onClick, color }: Props) => {
|
|
30
|
+
const { t } = useTranslation();
|
|
31
|
+
return (
|
|
32
|
+
<CloseButtonWrapper aria-label={t('lukk')}>
|
|
33
|
+
<CloseBut onClick={onClick}>
|
|
34
|
+
<Cross style={{ width: '24px', height: '24px', color: color }} />
|
|
35
|
+
</CloseBut>
|
|
36
|
+
</CloseButtonWrapper>
|
|
37
|
+
);
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
export default CloseButton;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright (c) 2019-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
|
+
import CloseButton from './CloseButton';
|
|
10
|
+
|
|
11
|
+
export { CloseButton };
|
|
@@ -73,7 +73,7 @@ const StyledLetterSpacing = styled.span`
|
|
|
73
73
|
type subjectProps = {
|
|
74
74
|
name: string;
|
|
75
75
|
url?: string;
|
|
76
|
-
path
|
|
76
|
+
path?: string;
|
|
77
77
|
id?: string;
|
|
78
78
|
};
|
|
79
79
|
type categoryProps = {
|
|
@@ -160,7 +160,7 @@ const renderList = (
|
|
|
160
160
|
onNavigate();
|
|
161
161
|
}
|
|
162
162
|
}}
|
|
163
|
-
to={subject.url || subject.path}>
|
|
163
|
+
to={subject.url || subject.path || ''}>
|
|
164
164
|
{subject.name}
|
|
165
165
|
</SafeLink>
|
|
166
166
|
<StyledSpacingElement />
|
|
@@ -120,6 +120,7 @@ const FrontpageProgramMenu = ({ programItems, subjectCategories, showBetaCursor
|
|
|
120
120
|
<Button onClick={() => toggleSubjects(true)} lighter={!showSubjects} size="medium" borderShape="rounded">
|
|
121
121
|
<StyledMenuItem>{t('frontpageMenu.allsubjects')}</StyledMenuItem>
|
|
122
122
|
</Button>
|
|
123
|
+
|
|
123
124
|
{showBetaCursor && (
|
|
124
125
|
<CursorPlaceholder>
|
|
125
126
|
<CursorWrapper>
|