@alpaca-headless/alpaca-headless-nextjs 1.0.2759 → 1.0.2761

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 (4) hide show
  1. package/dist/cjs/components/Picture.js +34 -39
  2. package/dist/esm/components/Picture.js +35 -40
  3. package/package.json +1 -1
  4. package/types/fieldTypes.d.ts +1 -1
package/dist/cjs/components/Picture.js CHANGED
@@ -34,48 +34,25 @@ const Picture = (_a) => {
34
34
  return;
35
35
  const variants = (_b = field === null || field === void 0 ? void 0 : field.value) === null || _b === void 0 ? void 0 : _b.variants;
36
36
  const img = (_d = (_c = field === null || field === void 0 ? void 0 : field.value) === null || _c === void 0 ? void 0 : _c.variants.find((x) => x.name.toUpperCase() == (defaultVariant === null || defaultVariant === void 0 ? void 0 : defaultVariant.toUpperCase()))) !== null && _d !== void 0 ? _d : (_e = field === null || field === void 0 ? void 0 : field.value) === null || _e === void 0 ? void 0 : _e.variants[0];
37
- const attrs = Object.assign(Object.assign({}, img), otherProps);
37
+ const attrs = Object.assign({ src: img === null || img === void 0 ? void 0 : img.src }, otherProps);
38
+ const video = img === null || img === void 0 ? void 0 : img.videoUrl;
38
39
  if (!(sources === null || sources === void 0 ? void 0 : sources.length)) {
39
40
  return (0, jsx_runtime_1.jsx)("img", Object.assign({}, attrs, { alt: "" }));
40
41
  }
41
42
  else {
42
- return ((0, jsx_runtime_1.jsxs)("picture", { children: [sources === null || sources === void 0 ? void 0 : sources.map((source) => {
43
- const variant = variants === null || variants === void 0 ? void 0 : variants.find((v) => v.name.toLowerCase() == source.variant.toLowerCase());
44
- if (!variant)
45
- return;
46
- let srcSet = (0, mediaProtection_1.hashImageUrl)(variant.src);
47
- if (source.widths && source.widths.length) {
48
- const getScaledImage = (variant, width) => {
49
- if (width > variant.width)
50
- return { src: variant.src, width: 0 };
51
- else
52
- return { src: variant.src + "&mw=" + width, width: width };
53
- };
54
- let scaledImages = source.widths.map((x) => getScaledImage(variant, x));
55
- srcSet = "";
56
- for (let w = 0; w < scaledImages.length; w++) {
57
- if (srcSet.length)
58
- srcSet = srcSet + ", ";
59
- srcSet +=
60
- (0, mediaProtection_1.hashImageUrl)(scaledImages[w].src) +
61
- " " +
62
- source.widths[w] +
63
- "w";
64
- if (scaledImages[w].width === 0)
65
- break;
66
- }
67
- }
68
- else {
69
- if (source.width) {
43
+ return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)("picture", { children: [sources === null || sources === void 0 ? void 0 : sources.map((source) => {
44
+ const variant = variants === null || variants === void 0 ? void 0 : variants.find((v) => v.name.toLowerCase() == source.variant.toLowerCase());
45
+ if (!variant)
46
+ return;
47
+ let srcSet = (0, mediaProtection_1.hashImageUrl)(variant.src);
70
48
  const getScaledImage = (variant, width) => {
71
49
  if (width > variant.width)
72
50
  return { src: variant.src, width: 0 };
73
51
  else
74
- return { src: variant.src + "&mw=" + width, width: width };
52
+ return { src: variant.src + `${variant.src.includes('?') ? '&' : '?'}mw=` + width, width: width };
75
53
  };
76
- srcSet = (0, mediaProtection_1.hashImageUrl)(getScaledImage(variant, source.width).src);
77
- if (source.scales) {
78
- let scaledImages = source.scales.map((x) => { var _a; return getScaledImage(variant, ((_a = source.width) !== null && _a !== void 0 ? _a : 0) * x); });
54
+ if (source.widths && source.widths.length) {
55
+ let scaledImages = source.widths.map((x) => getScaledImage(variant, x));
79
56
  srcSet = "";
80
57
  for (let w = 0; w < scaledImages.length; w++) {
81
58
  if (srcSet.length)
@@ -83,16 +60,34 @@ const Picture = (_a) => {
83
60
  srcSet +=
84
61
  (0, mediaProtection_1.hashImageUrl)(scaledImages[w].src) +
85
62
  " " +
86
- source.scales[w] +
87
- "x";
63
+ source.widths[w] +
64
+ "w";
88
65
  if (scaledImages[w].width === 0)
89
66
  break;
90
67
  }
91
68
  }
92
- }
93
- }
94
- return ((0, jsx_runtime_1.jsx)("source", { srcSet: srcSet, media: source.media }, source.variant + source.media));
95
- }), (0, jsx_runtime_1.jsx)("img", Object.assign({}, attrs, { alt: "" }))] }));
69
+ else {
70
+ if (source.width) {
71
+ srcSet = (0, mediaProtection_1.hashImageUrl)(getScaledImage(variant, source.width).src);
72
+ if (source.scales) {
73
+ let scaledImages = source.scales.map((x) => { var _a; return getScaledImage(variant, ((_a = source.width) !== null && _a !== void 0 ? _a : 0) * x); });
74
+ srcSet = "";
75
+ for (let w = 0; w < scaledImages.length; w++) {
76
+ if (srcSet.length)
77
+ srcSet = srcSet + ", ";
78
+ srcSet +=
79
+ (0, mediaProtection_1.hashImageUrl)(scaledImages[w].src) +
80
+ " " +
81
+ source.scales[w] +
82
+ "x";
83
+ if (scaledImages[w].width === 0)
84
+ break;
85
+ }
86
+ }
87
+ }
88
+ }
89
+ return ((0, jsx_runtime_1.jsx)("source", { srcSet: srcSet, media: source.media }, source.variant + source.media));
90
+ }), (0, jsx_runtime_1.jsx)("img", Object.assign({}, attrs, { alt: "" }))] }), video && (0, jsx_runtime_1.jsx)("video", { src: video })] }));
96
91
  }
97
92
  };
98
93
  exports.Picture = Picture;
package/dist/esm/components/Picture.js CHANGED
@@ -9,7 +9,7 @@ var __rest = (this && this.__rest) || function (s, e) {
9
9
  }
10
10
  return t;
11
11
  };
12
- import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
12
+ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
13
13
  import { hashImageUrl } from "../mediaProtection";
14
14
  // const addClassName = (otherAttrs: { [key: string]: unknown }): void => {
15
15
  // if (otherAttrs.class) {
@@ -31,48 +31,25 @@ export const Picture = (_a) => {
31
31
  return;
32
32
  const variants = (_b = field === null || field === void 0 ? void 0 : field.value) === null || _b === void 0 ? void 0 : _b.variants;
33
33
  const img = (_d = (_c = field === null || field === void 0 ? void 0 : field.value) === null || _c === void 0 ? void 0 : _c.variants.find((x) => x.name.toUpperCase() == (defaultVariant === null || defaultVariant === void 0 ? void 0 : defaultVariant.toUpperCase()))) !== null && _d !== void 0 ? _d : (_e = field === null || field === void 0 ? void 0 : field.value) === null || _e === void 0 ? void 0 : _e.variants[0];
34
- const attrs = Object.assign(Object.assign({}, img), otherProps);
34
+ const attrs = Object.assign({ src: img === null || img === void 0 ? void 0 : img.src }, otherProps);
35
+ const video = img === null || img === void 0 ? void 0 : img.videoUrl;
35
36
  if (!(sources === null || sources === void 0 ? void 0 : sources.length)) {
36
37
  return _jsx("img", Object.assign({}, attrs, { alt: "" }));
37
38
  }
38
39
  else {
39
- return (_jsxs("picture", { children: [sources === null || sources === void 0 ? void 0 : sources.map((source) => {
40
- const variant = variants === null || variants === void 0 ? void 0 : variants.find((v) => v.name.toLowerCase() == source.variant.toLowerCase());
41
- if (!variant)
42
- return;
43
- let srcSet = hashImageUrl(variant.src);
44
- if (source.widths && source.widths.length) {
45
- const getScaledImage = (variant, width) => {
46
- if (width > variant.width)
47
- return { src: variant.src, width: 0 };
48
- else
49
- return { src: variant.src + "&mw=" + width, width: width };
50
- };
51
- let scaledImages = source.widths.map((x) => getScaledImage(variant, x));
52
- srcSet = "";
53
- for (let w = 0; w < scaledImages.length; w++) {
54
- if (srcSet.length)
55
- srcSet = srcSet + ", ";
56
- srcSet +=
57
- hashImageUrl(scaledImages[w].src) +
58
- " " +
59
- source.widths[w] +
60
- "w";
61
- if (scaledImages[w].width === 0)
62
- break;
63
- }
64
- }
65
- else {
66
- if (source.width) {
40
+ return (_jsxs(_Fragment, { children: [_jsxs("picture", { children: [sources === null || sources === void 0 ? void 0 : sources.map((source) => {
41
+ const variant = variants === null || variants === void 0 ? void 0 : variants.find((v) => v.name.toLowerCase() == source.variant.toLowerCase());
42
+ if (!variant)
43
+ return;
44
+ let srcSet = hashImageUrl(variant.src);
67
45
  const getScaledImage = (variant, width) => {
68
46
  if (width > variant.width)
69
47
  return { src: variant.src, width: 0 };
70
48
  else
71
- return { src: variant.src + "&mw=" + width, width: width };
49
+ return { src: variant.src + `${variant.src.includes('?') ? '&' : '?'}mw=` + width, width: width };
72
50
  };
73
- srcSet = hashImageUrl(getScaledImage(variant, source.width).src);
74
- if (source.scales) {
75
- let scaledImages = source.scales.map((x) => { var _a; return getScaledImage(variant, ((_a = source.width) !== null && _a !== void 0 ? _a : 0) * x); });
51
+ if (source.widths && source.widths.length) {
52
+ let scaledImages = source.widths.map((x) => getScaledImage(variant, x));
76
53
  srcSet = "";
77
54
  for (let w = 0; w < scaledImages.length; w++) {
78
55
  if (srcSet.length)
@@ -80,15 +57,33 @@ export const Picture = (_a) => {
80
57
  srcSet +=
81
58
  hashImageUrl(scaledImages[w].src) +
82
59
  " " +
83
- source.scales[w] +
84
- "x";
60
+ source.widths[w] +
61
+ "w";
85
62
  if (scaledImages[w].width === 0)
86
63
  break;
87
64
  }
88
65
  }
89
- }
90
- }
91
- return (_jsx("source", { srcSet: srcSet, media: source.media }, source.variant + source.media));
92
- }), _jsx("img", Object.assign({}, attrs, { alt: "" }))] }));
66
+ else {
67
+ if (source.width) {
68
+ srcSet = hashImageUrl(getScaledImage(variant, source.width).src);
69
+ if (source.scales) {
70
+ let scaledImages = source.scales.map((x) => { var _a; return getScaledImage(variant, ((_a = source.width) !== null && _a !== void 0 ? _a : 0) * x); });
71
+ srcSet = "";
72
+ for (let w = 0; w < scaledImages.length; w++) {
73
+ if (srcSet.length)
74
+ srcSet = srcSet + ", ";
75
+ srcSet +=
76
+ hashImageUrl(scaledImages[w].src) +
77
+ " " +
78
+ source.scales[w] +
79
+ "x";
80
+ if (scaledImages[w].width === 0)
81
+ break;
82
+ }
83
+ }
84
+ }
85
+ }
86
+ return (_jsx("source", { srcSet: srcSet, media: source.media }, source.variant + source.media));
87
+ }), _jsx("img", Object.assign({}, attrs, { alt: "" }))] }), video && _jsx("video", { src: video })] }));
93
88
  }
94
89
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alpaca-headless/alpaca-headless-nextjs",
3
- "version": "1.0.2759",
3
+ "version": "1.0.2761",
4
4
  "description": "Alpaca Headless NextJs Integration",
5
5
  "main": "dist/cjs/index.js",
6
6
  "module": "dist/esm/index.js",
package/types/fieldTypes.d.ts CHANGED
@@ -16,7 +16,7 @@ export interface PictureValue {
16
16
  export interface PictureVariant {
17
17
  name: string;
18
18
  src: string;
19
- videoId: string;
19
+ videoUrl: string;
20
20
  width: number;
21
21
  }
22
22
  export interface ImageField {