@ndla/image-search 7.0.10 → 7.0.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/ImageMeta.js +2 -2
- package/es/ImageSearch.js +2 -3
- package/es/ImageSearchResult.js +2 -3
- package/es/PreviewImage.js +10 -10
- package/es/util/imageUtil.js +2 -2
- package/lib/ImageMeta.js +2 -2
- package/lib/ImageSearch.js +1 -1
- package/lib/ImageSearchResult.js +1 -1
- package/lib/PreviewImage.js +9 -8
- package/lib/util/imageUtil.js +2 -2
- package/package.json +8 -9
package/es/ImageMeta.js
CHANGED
|
@@ -33,10 +33,10 @@ const ImageMeta = _ref => {
|
|
|
33
33
|
fileSize,
|
|
34
34
|
imageDimensions
|
|
35
35
|
} = _ref;
|
|
36
|
-
const dimensions = imageDimensions ?
|
|
36
|
+
const dimensions = imageDimensions ? " - ".concat(imageDimensions.width, "x").concat(imageDimensions.height, " px") : "";
|
|
37
37
|
return _jsx(StyledDiv, {
|
|
38
38
|
children: _jsx(StyledSpan, {
|
|
39
|
-
children:
|
|
39
|
+
children: "".concat(contentType, " - ").concat(prettyBytes(fileSize)).concat(dimensions)
|
|
40
40
|
})
|
|
41
41
|
});
|
|
42
42
|
};
|
package/es/ImageSearch.js
CHANGED
|
@@ -15,8 +15,7 @@ import { InputContainer, InputV3 } from "@ndla/forms";
|
|
|
15
15
|
import { Search as SearchIcon } from "@ndla/icons/common";
|
|
16
16
|
import { Pager } from "@ndla/pager";
|
|
17
17
|
import ImageSearchResult from "./ImageSearchResult";
|
|
18
|
-
import { jsx as _jsx } from "@emotion/react/jsx-runtime";
|
|
19
|
-
import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
|
|
18
|
+
import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
|
|
20
19
|
const ImageSearchWrapper = /*#__PURE__*/_styled("div", {
|
|
21
20
|
target: "ejbuzb50",
|
|
22
21
|
label: "ImageSearchWrapper"
|
|
@@ -208,7 +207,7 @@ class ImageSearch extends Component {
|
|
|
208
207
|
checkboxLabel: checkboxLabel
|
|
209
208
|
}, image.id))
|
|
210
209
|
}), _jsx(Pager, {
|
|
211
|
-
page: page
|
|
210
|
+
page: page !== null && page !== void 0 ? page : 1,
|
|
212
211
|
pathname: "",
|
|
213
212
|
lastPage: lastPage,
|
|
214
213
|
query: queryObject,
|
package/es/ImageSearchResult.js
CHANGED
|
@@ -11,8 +11,7 @@ function _EMOTION_STRINGIFIED_CSS_ERROR__() { return "You have tried to stringif
|
|
|
11
11
|
import { ButtonV2 } from "@ndla/button";
|
|
12
12
|
import PreviewImage from "./PreviewImage";
|
|
13
13
|
import { getPreviewSrcSets } from "./util/imageUtil";
|
|
14
|
-
import { jsx as _jsx } from "@emotion/react/jsx-runtime";
|
|
15
|
-
import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
|
|
14
|
+
import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
|
|
16
15
|
const StyledButton = /*#__PURE__*/_styled(ButtonV2, {
|
|
17
16
|
target: "e1evho0k0",
|
|
18
17
|
label: "StyledButton"
|
|
@@ -37,7 +36,7 @@ export default function ImageSearchResult(_ref) {
|
|
|
37
36
|
} = _ref;
|
|
38
37
|
const active = selectedImage && selectedImage.id === image.id ? "active" : "";
|
|
39
38
|
return _jsxs("div", {
|
|
40
|
-
className:
|
|
39
|
+
className: "list-item ".concat(active),
|
|
41
40
|
children: [_jsx("div", {
|
|
42
41
|
className: "list-item-inner",
|
|
43
42
|
children: _jsxs(StyledButton, {
|
package/es/PreviewImage.js
CHANGED
|
@@ -15,13 +15,13 @@ import { CheckboxItem, Label } from "@ndla/forms";
|
|
|
15
15
|
import { uuid } from "@ndla/util";
|
|
16
16
|
import ImageMeta from "./ImageMeta";
|
|
17
17
|
import { getSrcSets } from "./util/imageUtil";
|
|
18
|
-
import { jsx as _jsx } from "@emotion/react/jsx-runtime";
|
|
19
|
-
import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
|
|
18
|
+
import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
|
|
20
19
|
const CheckboxWrapper = /*#__PURE__*/_styled("div", {
|
|
21
20
|
target: "e28xng60",
|
|
22
21
|
label: "CheckboxWrapper"
|
|
23
22
|
})("display:flex;gap:", spacing.small, ";align-items:center;" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlByZXZpZXdJbWFnZS50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBNEJrQyIsImZpbGUiOiJQcmV2aWV3SW1hZ2UudHN4Iiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBDb3B5cmlnaHQgKGMpIDIwMTctcHJlc2VudCwgTkRMQS5cbiAqXG4gKiBUaGlzIHNvdXJjZSBjb2RlIGlzIGxpY2Vuc2VkIHVuZGVyIHRoZSBHUEx2MyBsaWNlbnNlIGZvdW5kIGluIHRoZVxuICogTElDRU5TRSBmaWxlIGluIHRoZSByb290IGRpcmVjdG9yeSBvZiB0aGlzIHNvdXJjZSB0cmVlLlxuICpcbiAqL1xuXG5pbXBvcnQgeyB1c2VTdGF0ZSB9IGZyb20gXCJyZWFjdFwiO1xuaW1wb3J0IHsgdXNlVHJhbnNsYXRpb24gfSBmcm9tIFwicmVhY3QtaTE4bmV4dFwiO1xuaW1wb3J0IHN0eWxlZCBmcm9tIFwiQGVtb3Rpb24vc3R5bGVkXCI7XG5pbXBvcnQgeyBCdXR0b25WMiB9IGZyb20gXCJAbmRsYS9idXR0b25cIjtcbmltcG9ydCB7IHNwYWNpbmcgfSBmcm9tIFwiQG5kbGEvY29yZVwiO1xuaW1wb3J0IHsgQ2hlY2tib3hJdGVtLCBMYWJlbCB9IGZyb20gXCJAbmRsYS9mb3Jtc1wiO1xuaW1wb3J0IHsgSUltYWdlTWV0YUluZm9ybWF0aW9uVjMgfSBmcm9tIFwiQG5kbGEvdHlwZXMtYmFja2VuZC9pbWFnZS1hcGlcIjtcbmltcG9ydCB7IHV1aWQgfSBmcm9tIFwiQG5kbGEvdXRpbFwiO1xuXG5pbXBvcnQgSW1hZ2VNZXRhIGZyb20gXCIuL0ltYWdlTWV0YVwiO1xuaW1wb3J0IHsgZ2V0U3JjU2V0cyB9IGZyb20gXCIuL3V0aWwvaW1hZ2VVdGlsXCI7XG5cbmludGVyZmFjZSBQcm9wcyB7XG4gIGltYWdlOiBJSW1hZ2VNZXRhSW5mb3JtYXRpb25WMztcbiAgb25TZWxlY3RJbWFnZTogKGltYWdlOiBJSW1hZ2VNZXRhSW5mb3JtYXRpb25WMywgc2F2ZUFzTWV0YUltYWdlOiBib29sZWFuKSA9PiB2b2lkO1xuICB1c2VJbWFnZVRpdGxlOiBzdHJpbmc7XG4gIHNob3dDaGVja2JveDogYm9vbGVhbjtcbiAgY2hlY2tib3hMYWJlbD86IHN0cmluZztcbn1cblxuY29uc3QgQ2hlY2tib3hXcmFwcGVyID0gc3R5bGVkLmRpdmBcbiAgZGlzcGxheTogZmxleDtcbiAgZ2FwOiAke3NwYWNpbmcuc21hbGx9O1xuICBhbGlnbi1pdGVtczogY2VudGVyO1xuYDtcblxuY29uc3QgUHJldmlld0ltYWdlID0gKHsgaW1hZ2UsIG9uU2VsZWN0SW1hZ2UsIHVzZUltYWdlVGl0bGUsIHNob3dDaGVja2JveCwgY2hlY2tib3hMYWJlbCB9OiBQcm9wcykgPT4ge1xuICBjb25zdCB7IHQgfSA9IHVzZVRyYW5zbGF0aW9uKCk7XG4gIGNvbnN0IFtzYXZlQXNNZXRhSW1hZ2UsIHNldFNhdmVBc01ldGFJbWFnZV0gPSB1c2VTdGF0ZShmYWxzZSk7XG5cbiAgY29uc3QgdGFncyA9IGltYWdlLnRhZ3MudGFncyA/PyBbXTtcbiAgY29uc3QgdGl0bGUgPSBpbWFnZS50aXRsZS50aXRsZSA/PyBcIlwiO1xuICBjb25zdCBhbHRUZXh0ID0gaW1hZ2UuYWx0dGV4dC5hbHR0ZXh0ID8/IFwiXCI7XG4gIGNvbnN0IGNhcHRpb24gPSBpbWFnZS5jYXB0aW9uLmNhcHRpb24gPz8gXCJcIjtcbiAgcmV0dXJuIChcbiAgICA8ZGl2IGNsYXNzTmFtZT1cImltYWdlLXByZXZpZXdcIj5cbiAgICAgIDxkaXYgY2xhc3NOYW1lPVwiaW1hZ2VcIj5cbiAgICAgICAgPGltZ1xuICAgICAgICAgIHJvbGU9XCJwcmVzZW50YXRpb25cIlxuICAgICAgICAgIGFsdD1cInByZXNlbnRhdGlvblwiXG4gICAgICAgICAgc3JjU2V0PXtnZXRTcmNTZXRzKGltYWdlLmltYWdlLmltYWdlVXJsKX1cbiAgICAgICAgICBzaXplcz1cIihtaW4td2lkdGg6IDgwMHB4KSAzNjBweCwgKG1pbi13aWR0aDogNDAwcHgpIDMwMHB4LCAxMDB2d1wiXG4gICAgICAgICAgc3JjPXtpbWFnZS5pbWFnZS5pbWFnZVVybH1cbiAgICAgICAgICBhcmlhLWxhYmVsPXt0aXRsZX1cbiAgICAgICAgLz5cbiAgICAgIDwvZGl2PlxuICAgICAgPGRpdiBjbGFzc05hbWU9XCJpbmZvcm1hdGlvblwiPlxuICAgICAgICA8aDIgY2xhc3NOYW1lPVwidGl0bGVcIj57dGl0bGV9PC9oMj5cbiAgICAgICAge2ltYWdlLmNvcHlyaWdodC5jcmVhdG9ycyAmJiBpbWFnZS5jb3B5cmlnaHQuY3JlYXRvcnMubGVuZ3RoID4gMCA/IChcbiAgICAgICAgICA8ZGl2IGNsYXNzTmFtZT1cImNvcHlyaWdodC1hdXRob3JcIj5cbiAgICAgICAgICAgIDxzcGFuIGNsYXNzTmFtZT1cInRleHRcIj57aW1hZ2UuY29weXJpZ2h0LmNyZWF0b3JzLm1hcCgoY3JlYXRvcikgPT4gY3JlYXRvci5uYW1lKS5qb2luKFwiLCBcIil9PC9zcGFuPlxuICAgICAgICAgIDwvZGl2PlxuICAgICAgICApIDogbnVsbH1cbiAgICAgICAgPGRpdiBjbGFzc05hbWU9XCJpbmZvXCI+XG4gICAgICAgICAgPHNwYW4gY2xhc3NOYW1lPVwidGV4dFwiPntpbWFnZS5jb3B5cmlnaHQubGljZW5zZS5kZXNjcmlwdGlvbn08L3NwYW4+XG4gICAgICAgIDwvZGl2PlxuICAgICAgICA8ZGl2IGNsYXNzTmFtZT1cImluZm9cIj5cbiAgICAgICAgICA8c3BhbiBjbGFzc05hbWU9XCJ0ZXh0XCI+e2Ake3QoXCJpbWFnZS5jYXB0aW9uXCIpfTogJHtjYXB0aW9ufWB9PC9zcGFuPlxuICAgICAgICA8L2Rpdj5cbiAgICAgICAgPGRpdiBjbGFzc05hbWU9XCJpbmZvXCI+XG4gICAgICAgICAgPHNwYW4gY2xhc3NOYW1lPVwidGV4dFwiPntgJHt0KFwiaW1hZ2UuYWx0VGV4dFwiKX06ICR7YWx0VGV4dH1gfTwvc3Bhbj5cbiAgICAgICAgPC9kaXY+XG4gICAgICAgIDxkaXYgY2xhc3NOYW1lPVwiaW5mb1wiPlxuICAgICAgICAgIDxzcGFuIGNsYXNzTmFtZT1cInRleHRcIj57YCR7dChcImltYWdlLm1vZGVsUmVsZWFzZWQubGFiZWxcIil9OiAke3QoXG4gICAgICAgICAgICBcImltYWdlLm1vZGVsUmVsZWFzZWQuXCIgKyBpbWFnZS5tb2RlbFJlbGVhc2UsXG4gICAgICAgICAgKX1gfTwvc3Bhbj5cbiAgICAgICAgPC9kaXY+XG4gICAgICAgIDxJbWFnZU1ldGFcbiAgICAgICAgICBjb250ZW50VHlwZT17aW1hZ2UuaW1hZ2UuY29udGVudFR5cGV9XG4gICAgICAgICAgZmlsZVNpemU9e2ltYWdlLmltYWdlLnNpemV9XG4gICAgICAgICAgaW1hZ2VEaW1lbnNpb25zPXtpbWFnZS5pbWFnZS5kaW1lbnNpb25zfVxuICAgICAgICAvPlxuICAgICAgICA8ZGl2IGNsYXNzTmFtZT1cInRhZ3NcIj5cbiAgICAgICAgICB7dGFncy5tYXAoKHRhZykgPT4gKFxuICAgICAgICAgICAgPHNwYW4ga2V5PXt1dWlkKCl9IGNsYXNzTmFtZT1cInRhZ19pdGVtXCI+e2AjJHt0YWd9YH08L3NwYW4+XG4gICAgICAgICAgKSl9XG4gICAgICAgIDwvZGl2PlxuICAgICAgICA8QnV0dG9uVjIgZGF0YS10ZXN0aWQ9XCJ1c2UtaW1hZ2VcIiBvbkNsaWNrPXsoKSA9PiBvblNlbGVjdEltYWdlKGltYWdlLCBzYXZlQXNNZXRhSW1hZ2UpfT5cbiAgICAgICAgICB7dXNlSW1hZ2VUaXRsZX1cbiAgICAgICAgPC9CdXR0b25WMj5cbiAgICAgICAge3Nob3dDaGVja2JveCAmJiAoXG4gICAgICAgICAgPENoZWNrYm94V3JhcHBlcj5cbiAgICAgICAgICAgIDxDaGVja2JveEl0ZW1cbiAgICAgICAgICAgICAgaWQ9XCJzYXZlQXNNZXRhXCJcbiAgICAgICAgICAgICAgY2hlY2tlZD17c2F2ZUFzTWV0YUltYWdlfVxuICAgICAgICAgICAgICBvbkNoZWNrZWRDaGFuZ2U9eygpID0+IHNldFNhdmVBc01ldGFJbWFnZSgocHJldikgPT4gIXByZXYpfVxuICAgICAgICAgICAgLz5cbiAgICAgICAgICAgIDxMYWJlbCBodG1sRm9yPVwic2F2ZUFzTWV0YVwiIHRleHRTdHlsZT1cImxhYmVsLXNtYWxsXCIgbWFyZ2luPVwibm9uZVwiPlxuICAgICAgICAgICAgICB7Y2hlY2tib3hMYWJlbH1cbiAgICAgICAgICAgIDwvTGFiZWw+XG4gICAgICAgICAgPC9DaGVja2JveFdyYXBwZXI+XG4gICAgICAgICl9XG4gICAgICA8L2Rpdj5cbiAgICAgIDxkaXYgY2xhc3NOYW1lPVwiY2xlYXJcIiAvPlxuICAgIDwvZGl2PlxuICApO1xufTtcblxuZXhwb3J0IGRlZmF1bHQgUHJldmlld0ltYWdlO1xuIl19 */"));
|
|
24
23
|
const PreviewImage = _ref => {
|
|
24
|
+
var _image$tags$tags, _image$title$title, _image$alttext$alttex, _image$caption$captio;
|
|
25
25
|
let {
|
|
26
26
|
image,
|
|
27
27
|
onSelectImage,
|
|
@@ -33,10 +33,10 @@ const PreviewImage = _ref => {
|
|
|
33
33
|
t
|
|
34
34
|
} = useTranslation();
|
|
35
35
|
const [saveAsMetaImage, setSaveAsMetaImage] = useState(false);
|
|
36
|
-
const tags = image.tags.tags
|
|
37
|
-
const title = image.title.title
|
|
38
|
-
const altText = image.alttext.alttext
|
|
39
|
-
const caption = image.caption.caption
|
|
36
|
+
const tags = (_image$tags$tags = image.tags.tags) !== null && _image$tags$tags !== void 0 ? _image$tags$tags : [];
|
|
37
|
+
const title = (_image$title$title = image.title.title) !== null && _image$title$title !== void 0 ? _image$title$title : "";
|
|
38
|
+
const altText = (_image$alttext$alttex = image.alttext.alttext) !== null && _image$alttext$alttex !== void 0 ? _image$alttext$alttex : "";
|
|
39
|
+
const caption = (_image$caption$captio = image.caption.caption) !== null && _image$caption$captio !== void 0 ? _image$caption$captio : "";
|
|
40
40
|
return _jsxs("div", {
|
|
41
41
|
className: "image-preview",
|
|
42
42
|
children: [_jsx("div", {
|
|
@@ -70,19 +70,19 @@ const PreviewImage = _ref => {
|
|
|
70
70
|
className: "info",
|
|
71
71
|
children: _jsx("span", {
|
|
72
72
|
className: "text",
|
|
73
|
-
children:
|
|
73
|
+
children: "".concat(t("image.caption"), ": ").concat(caption)
|
|
74
74
|
})
|
|
75
75
|
}), _jsx("div", {
|
|
76
76
|
className: "info",
|
|
77
77
|
children: _jsx("span", {
|
|
78
78
|
className: "text",
|
|
79
|
-
children:
|
|
79
|
+
children: "".concat(t("image.altText"), ": ").concat(altText)
|
|
80
80
|
})
|
|
81
81
|
}), _jsx("div", {
|
|
82
82
|
className: "info",
|
|
83
83
|
children: _jsx("span", {
|
|
84
84
|
className: "text",
|
|
85
|
-
children:
|
|
85
|
+
children: "".concat(t("image.modelReleased.label"), ": ").concat(t("image.modelReleased." + image.modelRelease))
|
|
86
86
|
})
|
|
87
87
|
}), _jsx(ImageMeta, {
|
|
88
88
|
contentType: image.image.contentType,
|
|
@@ -92,7 +92,7 @@ const PreviewImage = _ref => {
|
|
|
92
92
|
className: "tags",
|
|
93
93
|
children: tags.map(tag => _jsx("span", {
|
|
94
94
|
className: "tag_item",
|
|
95
|
-
children:
|
|
95
|
+
children: "#".concat(tag)
|
|
96
96
|
}, uuid()))
|
|
97
97
|
}), _jsx(ButtonV2, {
|
|
98
98
|
"data-testid": "use-image",
|
package/es/util/imageUtil.js
CHANGED
|
@@ -9,5 +9,5 @@
|
|
|
9
9
|
/* - Source sets for gallery search is retina-display optimized
|
|
10
10
|
- Based on: https://www.smashingmagazine.com/2014/05/responsive-images-done-right-guide-picture-srcset/ */
|
|
11
11
|
|
|
12
|
-
export const getSrcSets = imageUrl => [
|
|
13
|
-
export const getPreviewSrcSets = imageUrl => [
|
|
12
|
+
export const getSrcSets = imageUrl => ["".concat(imageUrl, "?width=1440 1440w"), "".concat(imageUrl, "?width=1120 1120w"), "".concat(imageUrl, "?width=1000 1000w"), "".concat(imageUrl, "?width=960 960w"), "".concat(imageUrl, "?width=800 800w"), "".concat(imageUrl, "?width=640 640w"), "".concat(imageUrl, "?width=480 480w"), "".concat(imageUrl, "?width=320 320w")].join(", ");
|
|
13
|
+
export const getPreviewSrcSets = imageUrl => ["".concat(imageUrl, "?width=480 3x"), "".concat(imageUrl, "?width=320 2x"), "".concat(imageUrl, "?width=160 1x")].join(", ");
|
package/lib/ImageMeta.js
CHANGED
|
@@ -38,10 +38,10 @@ const ImageMeta = _ref => {
|
|
|
38
38
|
fileSize,
|
|
39
39
|
imageDimensions
|
|
40
40
|
} = _ref;
|
|
41
|
-
const dimensions = imageDimensions ?
|
|
41
|
+
const dimensions = imageDimensions ? " - ".concat(imageDimensions.width, "x").concat(imageDimensions.height, " px") : "";
|
|
42
42
|
return (0, _jsxRuntime.jsx)(StyledDiv, {
|
|
43
43
|
children: (0, _jsxRuntime.jsx)(StyledSpan, {
|
|
44
|
-
children:
|
|
44
|
+
children: "".concat(contentType, " - ").concat((0, _prettyBytes.default)(fileSize)).concat(dimensions)
|
|
45
45
|
})
|
|
46
46
|
});
|
|
47
47
|
};
|
package/lib/ImageSearch.js
CHANGED
|
@@ -212,7 +212,7 @@ class ImageSearch extends _react.Component {
|
|
|
212
212
|
checkboxLabel: checkboxLabel
|
|
213
213
|
}, image.id))
|
|
214
214
|
}), (0, _jsxRuntime.jsx)(_pager.Pager, {
|
|
215
|
-
page: page
|
|
215
|
+
page: page !== null && page !== void 0 ? page : 1,
|
|
216
216
|
pathname: "",
|
|
217
217
|
lastPage: lastPage,
|
|
218
218
|
query: queryObject,
|
package/lib/ImageSearchResult.js
CHANGED
|
@@ -41,7 +41,7 @@ function ImageSearchResult(_ref) {
|
|
|
41
41
|
} = _ref;
|
|
42
42
|
const active = selectedImage && selectedImage.id === image.id ? "active" : "";
|
|
43
43
|
return (0, _jsxRuntime.jsxs)("div", {
|
|
44
|
-
className:
|
|
44
|
+
className: "list-item ".concat(active),
|
|
45
45
|
children: [(0, _jsxRuntime.jsx)("div", {
|
|
46
46
|
className: "list-item-inner",
|
|
47
47
|
children: (0, _jsxRuntime.jsxs)(StyledButton, {
|
package/lib/PreviewImage.js
CHANGED
|
@@ -28,6 +28,7 @@ const CheckboxWrapper = /*#__PURE__*/(0, _base.default)("div", {
|
|
|
28
28
|
label: "CheckboxWrapper"
|
|
29
29
|
})("display:flex;gap:", _core.spacing.small, ";align-items:center;" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlByZXZpZXdJbWFnZS50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBNEJrQyIsImZpbGUiOiJQcmV2aWV3SW1hZ2UudHN4Iiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBDb3B5cmlnaHQgKGMpIDIwMTctcHJlc2VudCwgTkRMQS5cbiAqXG4gKiBUaGlzIHNvdXJjZSBjb2RlIGlzIGxpY2Vuc2VkIHVuZGVyIHRoZSBHUEx2MyBsaWNlbnNlIGZvdW5kIGluIHRoZVxuICogTElDRU5TRSBmaWxlIGluIHRoZSByb290IGRpcmVjdG9yeSBvZiB0aGlzIHNvdXJjZSB0cmVlLlxuICpcbiAqL1xuXG5pbXBvcnQgeyB1c2VTdGF0ZSB9IGZyb20gXCJyZWFjdFwiO1xuaW1wb3J0IHsgdXNlVHJhbnNsYXRpb24gfSBmcm9tIFwicmVhY3QtaTE4bmV4dFwiO1xuaW1wb3J0IHN0eWxlZCBmcm9tIFwiQGVtb3Rpb24vc3R5bGVkXCI7XG5pbXBvcnQgeyBCdXR0b25WMiB9IGZyb20gXCJAbmRsYS9idXR0b25cIjtcbmltcG9ydCB7IHNwYWNpbmcgfSBmcm9tIFwiQG5kbGEvY29yZVwiO1xuaW1wb3J0IHsgQ2hlY2tib3hJdGVtLCBMYWJlbCB9IGZyb20gXCJAbmRsYS9mb3Jtc1wiO1xuaW1wb3J0IHsgSUltYWdlTWV0YUluZm9ybWF0aW9uVjMgfSBmcm9tIFwiQG5kbGEvdHlwZXMtYmFja2VuZC9pbWFnZS1hcGlcIjtcbmltcG9ydCB7IHV1aWQgfSBmcm9tIFwiQG5kbGEvdXRpbFwiO1xuXG5pbXBvcnQgSW1hZ2VNZXRhIGZyb20gXCIuL0ltYWdlTWV0YVwiO1xuaW1wb3J0IHsgZ2V0U3JjU2V0cyB9IGZyb20gXCIuL3V0aWwvaW1hZ2VVdGlsXCI7XG5cbmludGVyZmFjZSBQcm9wcyB7XG4gIGltYWdlOiBJSW1hZ2VNZXRhSW5mb3JtYXRpb25WMztcbiAgb25TZWxlY3RJbWFnZTogKGltYWdlOiBJSW1hZ2VNZXRhSW5mb3JtYXRpb25WMywgc2F2ZUFzTWV0YUltYWdlOiBib29sZWFuKSA9PiB2b2lkO1xuICB1c2VJbWFnZVRpdGxlOiBzdHJpbmc7XG4gIHNob3dDaGVja2JveDogYm9vbGVhbjtcbiAgY2hlY2tib3hMYWJlbD86IHN0cmluZztcbn1cblxuY29uc3QgQ2hlY2tib3hXcmFwcGVyID0gc3R5bGVkLmRpdmBcbiAgZGlzcGxheTogZmxleDtcbiAgZ2FwOiAke3NwYWNpbmcuc21hbGx9O1xuICBhbGlnbi1pdGVtczogY2VudGVyO1xuYDtcblxuY29uc3QgUHJldmlld0ltYWdlID0gKHsgaW1hZ2UsIG9uU2VsZWN0SW1hZ2UsIHVzZUltYWdlVGl0bGUsIHNob3dDaGVja2JveCwgY2hlY2tib3hMYWJlbCB9OiBQcm9wcykgPT4ge1xuICBjb25zdCB7IHQgfSA9IHVzZVRyYW5zbGF0aW9uKCk7XG4gIGNvbnN0IFtzYXZlQXNNZXRhSW1hZ2UsIHNldFNhdmVBc01ldGFJbWFnZV0gPSB1c2VTdGF0ZShmYWxzZSk7XG5cbiAgY29uc3QgdGFncyA9IGltYWdlLnRhZ3MudGFncyA/PyBbXTtcbiAgY29uc3QgdGl0bGUgPSBpbWFnZS50aXRsZS50aXRsZSA/PyBcIlwiO1xuICBjb25zdCBhbHRUZXh0ID0gaW1hZ2UuYWx0dGV4dC5hbHR0ZXh0ID8/IFwiXCI7XG4gIGNvbnN0IGNhcHRpb24gPSBpbWFnZS5jYXB0aW9uLmNhcHRpb24gPz8gXCJcIjtcbiAgcmV0dXJuIChcbiAgICA8ZGl2IGNsYXNzTmFtZT1cImltYWdlLXByZXZpZXdcIj5cbiAgICAgIDxkaXYgY2xhc3NOYW1lPVwiaW1hZ2VcIj5cbiAgICAgICAgPGltZ1xuICAgICAgICAgIHJvbGU9XCJwcmVzZW50YXRpb25cIlxuICAgICAgICAgIGFsdD1cInByZXNlbnRhdGlvblwiXG4gICAgICAgICAgc3JjU2V0PXtnZXRTcmNTZXRzKGltYWdlLmltYWdlLmltYWdlVXJsKX1cbiAgICAgICAgICBzaXplcz1cIihtaW4td2lkdGg6IDgwMHB4KSAzNjBweCwgKG1pbi13aWR0aDogNDAwcHgpIDMwMHB4LCAxMDB2d1wiXG4gICAgICAgICAgc3JjPXtpbWFnZS5pbWFnZS5pbWFnZVVybH1cbiAgICAgICAgICBhcmlhLWxhYmVsPXt0aXRsZX1cbiAgICAgICAgLz5cbiAgICAgIDwvZGl2PlxuICAgICAgPGRpdiBjbGFzc05hbWU9XCJpbmZvcm1hdGlvblwiPlxuICAgICAgICA8aDIgY2xhc3NOYW1lPVwidGl0bGVcIj57dGl0bGV9PC9oMj5cbiAgICAgICAge2ltYWdlLmNvcHlyaWdodC5jcmVhdG9ycyAmJiBpbWFnZS5jb3B5cmlnaHQuY3JlYXRvcnMubGVuZ3RoID4gMCA/IChcbiAgICAgICAgICA8ZGl2IGNsYXNzTmFtZT1cImNvcHlyaWdodC1hdXRob3JcIj5cbiAgICAgICAgICAgIDxzcGFuIGNsYXNzTmFtZT1cInRleHRcIj57aW1hZ2UuY29weXJpZ2h0LmNyZWF0b3JzLm1hcCgoY3JlYXRvcikgPT4gY3JlYXRvci5uYW1lKS5qb2luKFwiLCBcIil9PC9zcGFuPlxuICAgICAgICAgIDwvZGl2PlxuICAgICAgICApIDogbnVsbH1cbiAgICAgICAgPGRpdiBjbGFzc05hbWU9XCJpbmZvXCI+XG4gICAgICAgICAgPHNwYW4gY2xhc3NOYW1lPVwidGV4dFwiPntpbWFnZS5jb3B5cmlnaHQubGljZW5zZS5kZXNjcmlwdGlvbn08L3NwYW4+XG4gICAgICAgIDwvZGl2PlxuICAgICAgICA8ZGl2IGNsYXNzTmFtZT1cImluZm9cIj5cbiAgICAgICAgICA8c3BhbiBjbGFzc05hbWU9XCJ0ZXh0XCI+e2Ake3QoXCJpbWFnZS5jYXB0aW9uXCIpfTogJHtjYXB0aW9ufWB9PC9zcGFuPlxuICAgICAgICA8L2Rpdj5cbiAgICAgICAgPGRpdiBjbGFzc05hbWU9XCJpbmZvXCI+XG4gICAgICAgICAgPHNwYW4gY2xhc3NOYW1lPVwidGV4dFwiPntgJHt0KFwiaW1hZ2UuYWx0VGV4dFwiKX06ICR7YWx0VGV4dH1gfTwvc3Bhbj5cbiAgICAgICAgPC9kaXY+XG4gICAgICAgIDxkaXYgY2xhc3NOYW1lPVwiaW5mb1wiPlxuICAgICAgICAgIDxzcGFuIGNsYXNzTmFtZT1cInRleHRcIj57YCR7dChcImltYWdlLm1vZGVsUmVsZWFzZWQubGFiZWxcIil9OiAke3QoXG4gICAgICAgICAgICBcImltYWdlLm1vZGVsUmVsZWFzZWQuXCIgKyBpbWFnZS5tb2RlbFJlbGVhc2UsXG4gICAgICAgICAgKX1gfTwvc3Bhbj5cbiAgICAgICAgPC9kaXY+XG4gICAgICAgIDxJbWFnZU1ldGFcbiAgICAgICAgICBjb250ZW50VHlwZT17aW1hZ2UuaW1hZ2UuY29udGVudFR5cGV9XG4gICAgICAgICAgZmlsZVNpemU9e2ltYWdlLmltYWdlLnNpemV9XG4gICAgICAgICAgaW1hZ2VEaW1lbnNpb25zPXtpbWFnZS5pbWFnZS5kaW1lbnNpb25zfVxuICAgICAgICAvPlxuICAgICAgICA8ZGl2IGNsYXNzTmFtZT1cInRhZ3NcIj5cbiAgICAgICAgICB7dGFncy5tYXAoKHRhZykgPT4gKFxuICAgICAgICAgICAgPHNwYW4ga2V5PXt1dWlkKCl9IGNsYXNzTmFtZT1cInRhZ19pdGVtXCI+e2AjJHt0YWd9YH08L3NwYW4+XG4gICAgICAgICAgKSl9XG4gICAgICAgIDwvZGl2PlxuICAgICAgICA8QnV0dG9uVjIgZGF0YS10ZXN0aWQ9XCJ1c2UtaW1hZ2VcIiBvbkNsaWNrPXsoKSA9PiBvblNlbGVjdEltYWdlKGltYWdlLCBzYXZlQXNNZXRhSW1hZ2UpfT5cbiAgICAgICAgICB7dXNlSW1hZ2VUaXRsZX1cbiAgICAgICAgPC9CdXR0b25WMj5cbiAgICAgICAge3Nob3dDaGVja2JveCAmJiAoXG4gICAgICAgICAgPENoZWNrYm94V3JhcHBlcj5cbiAgICAgICAgICAgIDxDaGVja2JveEl0ZW1cbiAgICAgICAgICAgICAgaWQ9XCJzYXZlQXNNZXRhXCJcbiAgICAgICAgICAgICAgY2hlY2tlZD17c2F2ZUFzTWV0YUltYWdlfVxuICAgICAgICAgICAgICBvbkNoZWNrZWRDaGFuZ2U9eygpID0+IHNldFNhdmVBc01ldGFJbWFnZSgocHJldikgPT4gIXByZXYpfVxuICAgICAgICAgICAgLz5cbiAgICAgICAgICAgIDxMYWJlbCBodG1sRm9yPVwic2F2ZUFzTWV0YVwiIHRleHRTdHlsZT1cImxhYmVsLXNtYWxsXCIgbWFyZ2luPVwibm9uZVwiPlxuICAgICAgICAgICAgICB7Y2hlY2tib3hMYWJlbH1cbiAgICAgICAgICAgIDwvTGFiZWw+XG4gICAgICAgICAgPC9DaGVja2JveFdyYXBwZXI+XG4gICAgICAgICl9XG4gICAgICA8L2Rpdj5cbiAgICAgIDxkaXYgY2xhc3NOYW1lPVwiY2xlYXJcIiAvPlxuICAgIDwvZGl2PlxuICApO1xufTtcblxuZXhwb3J0IGRlZmF1bHQgUHJldmlld0ltYWdlO1xuIl19 */"));
|
|
30
30
|
const PreviewImage = _ref => {
|
|
31
|
+
var _image$tags$tags, _image$title$title, _image$alttext$alttex, _image$caption$captio;
|
|
31
32
|
let {
|
|
32
33
|
image,
|
|
33
34
|
onSelectImage,
|
|
@@ -39,10 +40,10 @@ const PreviewImage = _ref => {
|
|
|
39
40
|
t
|
|
40
41
|
} = (0, _reactI18next.useTranslation)();
|
|
41
42
|
const [saveAsMetaImage, setSaveAsMetaImage] = (0, _react.useState)(false);
|
|
42
|
-
const tags = image.tags.tags
|
|
43
|
-
const title = image.title.title
|
|
44
|
-
const altText = image.alttext.alttext
|
|
45
|
-
const caption = image.caption.caption
|
|
43
|
+
const tags = (_image$tags$tags = image.tags.tags) !== null && _image$tags$tags !== void 0 ? _image$tags$tags : [];
|
|
44
|
+
const title = (_image$title$title = image.title.title) !== null && _image$title$title !== void 0 ? _image$title$title : "";
|
|
45
|
+
const altText = (_image$alttext$alttex = image.alttext.alttext) !== null && _image$alttext$alttex !== void 0 ? _image$alttext$alttex : "";
|
|
46
|
+
const caption = (_image$caption$captio = image.caption.caption) !== null && _image$caption$captio !== void 0 ? _image$caption$captio : "";
|
|
46
47
|
return (0, _jsxRuntime.jsxs)("div", {
|
|
47
48
|
className: "image-preview",
|
|
48
49
|
children: [(0, _jsxRuntime.jsx)("div", {
|
|
@@ -76,19 +77,19 @@ const PreviewImage = _ref => {
|
|
|
76
77
|
className: "info",
|
|
77
78
|
children: (0, _jsxRuntime.jsx)("span", {
|
|
78
79
|
className: "text",
|
|
79
|
-
children:
|
|
80
|
+
children: "".concat(t("image.caption"), ": ").concat(caption)
|
|
80
81
|
})
|
|
81
82
|
}), (0, _jsxRuntime.jsx)("div", {
|
|
82
83
|
className: "info",
|
|
83
84
|
children: (0, _jsxRuntime.jsx)("span", {
|
|
84
85
|
className: "text",
|
|
85
|
-
children:
|
|
86
|
+
children: "".concat(t("image.altText"), ": ").concat(altText)
|
|
86
87
|
})
|
|
87
88
|
}), (0, _jsxRuntime.jsx)("div", {
|
|
88
89
|
className: "info",
|
|
89
90
|
children: (0, _jsxRuntime.jsx)("span", {
|
|
90
91
|
className: "text",
|
|
91
|
-
children:
|
|
92
|
+
children: "".concat(t("image.modelReleased.label"), ": ").concat(t("image.modelReleased." + image.modelRelease))
|
|
92
93
|
})
|
|
93
94
|
}), (0, _jsxRuntime.jsx)(_ImageMeta.default, {
|
|
94
95
|
contentType: image.image.contentType,
|
|
@@ -98,7 +99,7 @@ const PreviewImage = _ref => {
|
|
|
98
99
|
className: "tags",
|
|
99
100
|
children: tags.map(tag => (0, _jsxRuntime.jsx)("span", {
|
|
100
101
|
className: "tag_item",
|
|
101
|
-
children:
|
|
102
|
+
children: "#".concat(tag)
|
|
102
103
|
}, (0, _util.uuid)()))
|
|
103
104
|
}), (0, _jsxRuntime.jsx)(_button.ButtonV2, {
|
|
104
105
|
"data-testid": "use-image",
|
package/lib/util/imageUtil.js
CHANGED
|
@@ -15,7 +15,7 @@ exports.getSrcSets = exports.getPreviewSrcSets = void 0;
|
|
|
15
15
|
/* - Source sets for gallery search is retina-display optimized
|
|
16
16
|
- Based on: https://www.smashingmagazine.com/2014/05/responsive-images-done-right-guide-picture-srcset/ */
|
|
17
17
|
|
|
18
|
-
const getSrcSets = imageUrl => [
|
|
18
|
+
const getSrcSets = imageUrl => ["".concat(imageUrl, "?width=1440 1440w"), "".concat(imageUrl, "?width=1120 1120w"), "".concat(imageUrl, "?width=1000 1000w"), "".concat(imageUrl, "?width=960 960w"), "".concat(imageUrl, "?width=800 800w"), "".concat(imageUrl, "?width=640 640w"), "".concat(imageUrl, "?width=480 480w"), "".concat(imageUrl, "?width=320 320w")].join(", ");
|
|
19
19
|
exports.getSrcSets = getSrcSets;
|
|
20
|
-
const getPreviewSrcSets = imageUrl => [
|
|
20
|
+
const getPreviewSrcSets = imageUrl => ["".concat(imageUrl, "?width=480 3x"), "".concat(imageUrl, "?width=320 2x"), "".concat(imageUrl, "?width=160 1x")].join(", ");
|
|
21
21
|
exports.getPreviewSrcSets = getPreviewSrcSets;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ndla/image-search",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.12",
|
|
4
4
|
"description": "A simple library for searching images from NDLA",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -26,12 +26,12 @@
|
|
|
26
26
|
"es"
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@ndla/button": "^12.0.
|
|
30
|
-
"@ndla/core": "^4.5.
|
|
31
|
-
"@ndla/forms": "^7.
|
|
32
|
-
"@ndla/icons": "^6.1.
|
|
33
|
-
"@ndla/pager": "^3.0.
|
|
34
|
-
"@ndla/ui": "^50.
|
|
29
|
+
"@ndla/button": "^12.0.44",
|
|
30
|
+
"@ndla/core": "^4.5.4",
|
|
31
|
+
"@ndla/forms": "^7.1.1",
|
|
32
|
+
"@ndla/icons": "^6.1.2",
|
|
33
|
+
"@ndla/pager": "^3.0.7",
|
|
34
|
+
"@ndla/ui": "^50.15.0",
|
|
35
35
|
"@ndla/util": "^4.0.4",
|
|
36
36
|
"pretty-bytes": "^5.6.0"
|
|
37
37
|
},
|
|
@@ -42,7 +42,6 @@
|
|
|
42
42
|
"@emotion/react": "^11.10.4",
|
|
43
43
|
"@emotion/styled": "^11.10.4",
|
|
44
44
|
"i18next": ">= 23.0.0",
|
|
45
|
-
"lodash": ">= 4.0.0",
|
|
46
45
|
"react": ">= 16.8.0",
|
|
47
46
|
"react-dom": ">= 16.8.0",
|
|
48
47
|
"react-i18next": ">= 13.0.0",
|
|
@@ -51,5 +50,5 @@
|
|
|
51
50
|
"publishConfig": {
|
|
52
51
|
"access": "public"
|
|
53
52
|
},
|
|
54
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "f6949c46c9b1b0876c2d5e5d5ec4f1b31db1c28b"
|
|
55
54
|
}
|