dbm 1.1.2 → 1.1.3

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 (8) hide show
  1. package/package.json +1 -1
  2. package/react/admin/EditPage.js +1 -1
  3. package/react/admin/editor/fields/ImageField.js +4 -3
  4. package/react/image/CoverScaledImage.js +5 -0
  5. package/react/image/Image.js +10 -1
  6. package/react/image/WidthScaledImage.js +5 -0
  7. package/site/BrowserUpdater.js +21 -3
  8. package/utils/UrlFunctions.js +25 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dbm",
3
- "version": "1.1.2",
3
+ "version": "1.1.3",
4
4
  "main": "index.js",
5
5
  "type": "module",
6
6
  "scripts": {},
package/react/admin/EditPage.js CHANGED
@@ -107,7 +107,7 @@ export default class EditPage extends Dbm.react.BaseObject {
107
107
  React.createElement("div", {className: "spacing micro"}),
108
108
  React.createElement("div", {className: "flex-row justify-between"},
109
109
  React.createElement("div", {className: "flex-row-item"},
110
- React.createElement("div", {onClick: () => {this._generateSeoSummary()}}, "Generate"),
110
+ React.createElement("div", {onClick: () => {this._generateSeoSummary()}, className: "action-button action-button-padding"}, "Generate"),
111
111
  ),
112
112
  React.createElement("div", {className: "flex-row-item"},
113
113
  Dbm.react.text.text(this.item.properties.descriptionLength),
package/react/admin/editor/fields/ImageField.js CHANGED
@@ -35,7 +35,7 @@ export default class ImageField extends Dbm.react.BaseObject {
35
35
  React.createElement("div", {},
36
36
  React.createElement(Dbm.react.area.HasData, {check: Dbm.react.source.contextVariable("moduleData.editorData.data." + fieldName + ".id"), checkType: "invert/default"},
37
37
  React.createElement(Dbm.react.interaction.CommandButton, {command: Dbm.commands.callFunction(this._addToLibrary.bind(this))},
38
- React.createElement("div", {},
38
+ React.createElement("div", {className: "action-button action-button-padding"},
39
39
  "Add to library"
40
40
  )
41
41
  )
@@ -43,17 +43,18 @@ export default class ImageField extends Dbm.react.BaseObject {
43
43
  ),
44
44
  React.createElement(Dbm.react.area.HasData, {check: Dbm.react.source.contextVariable("moduleData.editorData.data." + fieldName + ".id")},
45
45
  React.createElement(Dbm.react.form.FormField, {value: this.item.properties.altText, className: "standard-field standard-field-padding full-width"}),
46
+ React.createElement("div", {className: "spacing micro"}),
46
47
  React.createElement("div", {className: "flex-row small-item-spacing"},
47
48
  React.createElement("div", {className: "flex-row-item"},
48
49
  React.createElement(Dbm.react.interaction.CommandButton, {command: Dbm.commands.callFunction(this._generateAltText.bind(this))},
49
- React.createElement("div", {},
50
+ React.createElement("div", {className: "action-button action-button-padding"},
50
51
  "Generate"
51
52
  )
52
53
  )
53
54
  ),
54
55
  React.createElement("div", {className: "flex-row-item"},
55
56
  React.createElement(Dbm.react.interaction.CommandButton, {command: Dbm.commands.callFunction(this._saveAltTextToLibrary.bind(this))},
56
- React.createElement("div", {},
57
+ React.createElement("div", {className: "action-button action-button-padding"},
57
58
  "Save to library"
58
59
  )
59
60
  )
package/react/image/CoverScaledImage.js CHANGED
@@ -21,6 +21,11 @@ export default class CoverScaledImage extends Dbm.react.BaseObject {
21
21
 
22
22
  let newProps = this._copyProps({src: url});
23
23
 
24
+ let altText = Dbm.objectPath(image, "altText");
25
+ if(altText) {
26
+ newProps["alt"] = altText;
27
+ }
28
+
24
29
  let elementType = this.getPropValue("elementType");
25
30
  if(elementType) {
26
31
  newProps["elementType"] = elementType;
package/react/image/Image.js CHANGED
@@ -11,6 +11,7 @@ export default class Image extends Dbm.react.BaseObject {
11
11
  let isDiv = (elementType !== "img");
12
12
  if(isDiv) {
13
13
  delete aProps["src"];
14
+ delete aProps["alt"];
14
15
  }
15
16
  }
16
17
 
@@ -26,7 +27,15 @@ export default class Image extends Dbm.react.BaseObject {
26
27
  };
27
28
  let className = "image";
28
29
 
29
- return this._createMainElement("div", {style: imageStyle, className: className}, this.getPropValue("children"));
30
+ let props = {style: imageStyle, className: className};
31
+
32
+ let altText = this.getPropValue("alt");
33
+ if(altText) {
34
+ props["role"] = "img";
35
+ props["aria-label"] = altText;
36
+ }
37
+
38
+ return this._createMainElement("div", props, this.getPropValue("children"));
30
39
  }
31
40
  else {
32
41
  let className = "image";
package/react/image/WidthScaledImage.js CHANGED
@@ -19,6 +19,11 @@ export default class WidthScaledImage extends Dbm.react.BaseObject {
19
19
 
20
20
  let newProps = this._copyProps({src: url});
21
21
 
22
+ let altText = Dbm.objectPath(image, "altText");
23
+ if(altText) {
24
+ newProps["alt"] = altText;
25
+ }
26
+
22
27
  let elementType = this.getPropValue("elementType");
23
28
  if(elementType) {
24
29
  newProps["elementType"] = elementType;
package/site/BrowserUpdater.js CHANGED
@@ -29,11 +29,29 @@ export default class BrowserUpdater extends Dbm.core.BaseObject {
29
29
 
30
30
  let title = Dbm.objectPath(this.item.pageData, "page.title") + this.item.titleSuffix;
31
31
  document.title = title;
32
- document.querySelector('meta[property="og:title"]').setAttribute("content", title);
32
+ {
33
+ let element = document.querySelector('meta[property="og:title"]');
34
+ if(element) {
35
+ element.setAttribute("content", title);
36
+ }
37
+ }
38
+
33
39
 
34
40
  let description = Dbm.objectPath(this.item.pageData, "page.meta/description");
35
- document.querySelector('meta[name="description"]').setAttribute("content", description);
36
- document.querySelector('meta[property="og:description"]').setAttribute("content", description);
41
+ {
42
+ let element = document.querySelector('meta[name="description"]');
43
+ if(element) {
44
+ element.setAttribute("content", description);
45
+ }
46
+ }
47
+
48
+ {
49
+ let element = document.querySelector('meta[property="og:description"]');
50
+ if(element) {
51
+ element.setAttribute("content", description);
52
+ }
53
+ }
54
+
37
55
 
38
56
  //METODO: set canonical
39
57
 
package/utils/UrlFunctions.js CHANGED
@@ -16,7 +16,15 @@ export let createScaledImageUrl = function(aImageData, aWantedWidth) {
16
16
  100*Math.round(window.devicePixelRatio*window.innerWidth/100)
17
17
  )
18
18
  );
19
- url = aImageData["resizeUrl"].split("{scale}").join("width=" + scaleToWidth);
19
+
20
+ let scaleString = "width=" + scaleToWidth;
21
+
22
+ let format = "webp";
23
+ if(format) {
24
+ scaleString += ",format=" + format;
25
+ }
26
+
27
+ url = aImageData["resizeUrl"].split("{scale}").join(scaleString);
20
28
  }
21
29
 
22
30
  return url;
@@ -43,7 +51,14 @@ export let createCoverScaledImageUrl = function(aImageData, aWantedWidth, aWante
43
51
 
44
52
  let scaleToHeight = Math.round(aWantedHeight*scaleToWidth/aWantedWidth);
45
53
 
46
- url = aImageData["resizeUrl"].split("{scale}").join("width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=cover");
54
+ let scaleString = "width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=cover";
55
+
56
+ let format = "webp";
57
+ if(format) {
58
+ scaleString += ",format=" + format;
59
+ }
60
+
61
+ url = aImageData["resizeUrl"].split("{scale}").join(scaleString);
47
62
  }
48
63
 
49
64
  return url;
@@ -60,7 +75,14 @@ export const getContainScaledImageUrl = function(aUrl, aWantedWidth, aWantedHeig
60
75
 
61
76
  let scaleToHeight = Math.round(aWantedHeight*scaleToWidth/aWantedWidth);
62
77
 
63
- return aUrl.split("{scale}").join("width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=contain");
78
+ let scaleString = "width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=contain";
79
+
80
+ let format = "webp";
81
+ if(format) {
82
+ scaleString += ",format=" + format;
83
+ }
84
+
85
+ return aUrl.split("{scale}").join(scaleString);
64
86
  }
65
87
 
66
88
  export let createContainScaledImageUrl = function(aImageData, aWantedWidth, aWantedHeight) {