@micromag/core 0.3.152 → 0.3.153
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/hooks.js +30 -14
- package/es/index.js +1 -1
- package/lib/hooks.js +30 -14
- package/lib/index.js +1 -1
- package/package.json +2 -2
package/es/hooks.js
CHANGED
|
@@ -1357,25 +1357,41 @@ var useMediasParser = function useMediasParser() {
|
|
|
1357
1357
|
|
|
1358
1358
|
function useMediaThumbnail(media) {
|
|
1359
1359
|
var file = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
|
|
1360
|
+
var thumbnail = useMemo(function () {
|
|
1361
|
+
if (isObject(file)) {
|
|
1362
|
+
return file;
|
|
1363
|
+
}
|
|
1364
|
+
|
|
1365
|
+
var _ref = media || {},
|
|
1366
|
+
_ref$thumbnail_url = _ref.thumbnail_url,
|
|
1367
|
+
defaultThumbnailUrl = _ref$thumbnail_url === void 0 ? null : _ref$thumbnail_url,
|
|
1368
|
+
_ref$files = _ref.files,
|
|
1369
|
+
files = _ref$files === void 0 ? null : _ref$files,
|
|
1370
|
+
_ref$metadata = _ref.metadata,
|
|
1371
|
+
metadata = _ref$metadata === void 0 ? null : _ref$metadata;
|
|
1360
1372
|
|
|
1361
|
-
|
|
1362
|
-
|
|
1363
|
-
|
|
1364
|
-
_ref$files = _ref.files,
|
|
1365
|
-
files = _ref$files === void 0 ? null : _ref$files;
|
|
1373
|
+
var _ref2 = metadata || {},
|
|
1374
|
+
mediaWidth = _ref2.width,
|
|
1375
|
+
mediaHeight = _ref2.height;
|
|
1366
1376
|
|
|
1367
|
-
var thumbnailUrl = useMemo(function () {
|
|
1368
1377
|
var filesArray = getMediaFilesAsArray(files) || [];
|
|
1369
1378
|
|
|
1370
|
-
var
|
|
1371
|
-
var handle =
|
|
1379
|
+
var _ref3 = (file !== null ? filesArray.find(function (_ref4) {
|
|
1380
|
+
var handle = _ref4.handle;
|
|
1372
1381
|
return handle === file;
|
|
1373
|
-
}) || null :
|
|
1374
|
-
url =
|
|
1375
|
-
|
|
1376
|
-
|
|
1377
|
-
|
|
1378
|
-
|
|
1382
|
+
}) || null : null) || {},
|
|
1383
|
+
_ref3$url = _ref3.url,
|
|
1384
|
+
url = _ref3$url === void 0 ? null : _ref3$url;
|
|
1385
|
+
|
|
1386
|
+
return url !== null || defaultThumbnailUrl !== null ? {
|
|
1387
|
+
url: url || defaultThumbnailUrl,
|
|
1388
|
+
metadata: {
|
|
1389
|
+
width: mediaWidth,
|
|
1390
|
+
height: mediaHeight
|
|
1391
|
+
}
|
|
1392
|
+
} : null;
|
|
1393
|
+
}, [media, file]);
|
|
1394
|
+
return thumbnail;
|
|
1379
1395
|
}
|
|
1380
1396
|
|
|
1381
1397
|
function useMediaWaveform(media) {
|
package/es/index.js
CHANGED
|
@@ -1358,7 +1358,7 @@ var MediasParser = /*#__PURE__*/function () {
|
|
|
1358
1358
|
var newValue;
|
|
1359
1359
|
|
|
1360
1360
|
if (patternMatch) {
|
|
1361
|
-
newValue = isObject(value) ? value : medias[value] ||
|
|
1361
|
+
newValue = isObject(value) ? value : medias[value] || value;
|
|
1362
1362
|
} else {
|
|
1363
1363
|
newValue = isObject(value) || isArray(value) ? MediasParser.replacePathsWithMedias(value, medias, patterns, path) : value;
|
|
1364
1364
|
}
|
package/lib/hooks.js
CHANGED
|
@@ -1394,25 +1394,41 @@ var useMediasParser = function useMediasParser() {
|
|
|
1394
1394
|
|
|
1395
1395
|
function useMediaThumbnail(media) {
|
|
1396
1396
|
var file = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
|
|
1397
|
+
var thumbnail = react.useMemo(function () {
|
|
1398
|
+
if (isObject__default["default"](file)) {
|
|
1399
|
+
return file;
|
|
1400
|
+
}
|
|
1401
|
+
|
|
1402
|
+
var _ref = media || {},
|
|
1403
|
+
_ref$thumbnail_url = _ref.thumbnail_url,
|
|
1404
|
+
defaultThumbnailUrl = _ref$thumbnail_url === void 0 ? null : _ref$thumbnail_url,
|
|
1405
|
+
_ref$files = _ref.files,
|
|
1406
|
+
files = _ref$files === void 0 ? null : _ref$files,
|
|
1407
|
+
_ref$metadata = _ref.metadata,
|
|
1408
|
+
metadata = _ref$metadata === void 0 ? null : _ref$metadata;
|
|
1397
1409
|
|
|
1398
|
-
|
|
1399
|
-
|
|
1400
|
-
|
|
1401
|
-
_ref$files = _ref.files,
|
|
1402
|
-
files = _ref$files === void 0 ? null : _ref$files;
|
|
1410
|
+
var _ref2 = metadata || {},
|
|
1411
|
+
mediaWidth = _ref2.width,
|
|
1412
|
+
mediaHeight = _ref2.height;
|
|
1403
1413
|
|
|
1404
|
-
var thumbnailUrl = react.useMemo(function () {
|
|
1405
1414
|
var filesArray = utils.getMediaFilesAsArray(files) || [];
|
|
1406
1415
|
|
|
1407
|
-
var
|
|
1408
|
-
var handle =
|
|
1416
|
+
var _ref3 = (file !== null ? filesArray.find(function (_ref4) {
|
|
1417
|
+
var handle = _ref4.handle;
|
|
1409
1418
|
return handle === file;
|
|
1410
|
-
}) || null :
|
|
1411
|
-
url =
|
|
1412
|
-
|
|
1413
|
-
|
|
1414
|
-
|
|
1415
|
-
|
|
1419
|
+
}) || null : null) || {},
|
|
1420
|
+
_ref3$url = _ref3.url,
|
|
1421
|
+
url = _ref3$url === void 0 ? null : _ref3$url;
|
|
1422
|
+
|
|
1423
|
+
return url !== null || defaultThumbnailUrl !== null ? {
|
|
1424
|
+
url: url || defaultThumbnailUrl,
|
|
1425
|
+
metadata: {
|
|
1426
|
+
width: mediaWidth,
|
|
1427
|
+
height: mediaHeight
|
|
1428
|
+
}
|
|
1429
|
+
} : null;
|
|
1430
|
+
}, [media, file]);
|
|
1431
|
+
return thumbnail;
|
|
1416
1432
|
}
|
|
1417
1433
|
|
|
1418
1434
|
function useMediaWaveform(media) {
|
package/lib/index.js
CHANGED
|
@@ -1385,7 +1385,7 @@ var MediasParser = /*#__PURE__*/function () {
|
|
|
1385
1385
|
var newValue;
|
|
1386
1386
|
|
|
1387
1387
|
if (patternMatch) {
|
|
1388
|
-
newValue = isObject__default["default"](value) ? value : medias[value] ||
|
|
1388
|
+
newValue = isObject__default["default"](value) ? value : medias[value] || value;
|
|
1389
1389
|
} else {
|
|
1390
1390
|
newValue = isObject__default["default"](value) || isArray__default["default"](value) ? MediasParser.replacePathsWithMedias(value, medias, patterns, path) : value;
|
|
1391
1391
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@micromag/core",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.153",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"javascript"
|
|
@@ -132,5 +132,5 @@
|
|
|
132
132
|
"publishConfig": {
|
|
133
133
|
"access": "public"
|
|
134
134
|
},
|
|
135
|
-
"gitHead": "
|
|
135
|
+
"gitHead": "3832de24bc306639b162f9778b3250ce1d05b2aa"
|
|
136
136
|
}
|