dbm 1.0.6 → 1.1.1

package/react/interaction/CommandButton.js

@@ -0,0 +1,97 @@
+import React from "react";
+import Dbm from "../../index.js";
+
+export default class CommandButton extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+
+        this._callback_clickBound = this._callback_click.bind(this);
+    }
+
+    _callback_click(aEvent) {
+        //console.log("_callback_click");
+        //console.log(aEvent);
+
+        let command = this.getPropValue("command");
+
+        command.perform(this, aEvent);
+
+    }
+
+    _performClone(aChild, aProps) {
+		
+		if(aChild instanceof Array) {
+			let returnArray = [];
+			
+			let currentArray = aChild;
+			let currentArrayLength = currentArray.length;
+			for(let i = 0; i < currentArrayLength; i++) {
+				let currentChild = currentArray[i];
+				returnArray.push(this._performClone(currentChild, aProps));
+			}
+			
+			return returnArray;
+		}
+		
+		let newProps = aProps;
+        /*
+        //MENOTE: this is a more generalized version, but we never pass in className in this function
+        if(aChild && aChild.props && aChild.props.className) {
+			newProps = {...aProps};
+            
+			if(aProps.className) {
+				newProps.className = aProps.className + " " + aChild.props.className;
+			} 
+			else {
+				newProps.className = aChild.props.className;
+			}
+		}
+        */
+		
+		
+		let callArray = [aChild, newProps];
+		
+		if(aChild && aChild.props) {
+			let firstChildChildren = aChild.props.children;
+			if(!firstChildChildren) {
+				//MENOTE: do nothing
+			}
+			else if(firstChildChildren instanceof Array) {
+				callArray = callArray.concat(firstChildChildren);
+			}
+			else {
+				callArray.push(firstChildChildren);
+			}
+		}
+		
+		return React.cloneElement.apply(React, callArray);
+	}
+
+    _renderMainElement() {
+
+        let children = Dbm.utils.ArrayFunctions.singleOrArray(this.getPropValue("children"));
+
+        let replacedChildren = [];
+
+        let currentArray = children;
+        let currentArrayLength = currentArray.length;
+        for(let i = 0; i < currentArrayLength; i++) {
+            let currentChild = currentArray[i];
+            if(currentChild) {
+                if(typeof(currentChild) === "string") {
+                    replacedChildren.push(React.createElement("span"), {"onClick": this._callback_clickBound, onKeyDown: function(aEvent) {if(aEvent.key === "Enter") aEvent.target.click()}}, currentChild);
+                }
+                else {
+                    replacedChildren.push(this._performClone(currentChild, {"onClick": this._callback_clickBound, onKeyDown: function(aEvent) {if(aEvent.key === "Enter") aEvent.target.click()}}));
+                }
+            }
+            else {
+                replacedChildren.push(currentChild);
+            }
+        }
+        
+
+        return React.createElement(React.Fragment, {}, replacedChildren);
+    }
+}
+

package/react/interaction/index.js

@@ -0,0 +1,3 @@
+import Dbm from "../../index.js";
+
+export {default as CommandButton} from "./CommandButton.js";

package/react/login/LoginForm.js

@@ -87,7 +87,7 @@ export default class LoginForm extends Dbm.react.BaseObject {
 
     _renderMainElement() {
 
-        return this._createMainElement("div", {}, 
+        return this._createMainElement("div", {className: "content-narrow"}, 
             React.createElement("div", {className: "body-text"},
                 React.createElement("div", {"className": ""},
                     React.createElement("label", {className: "standard-field-label"},

package/react/source/index.js

@@ -1 +1,15 @@
-export {default as ContextVariableSource} from "./ContextVariableSource.js";
+import Dbm from "../../index.js";
+
+export {default as ContextVariableSource} from "./ContextVariableSource.js";
+
+export let contextVariable = function(aPath) {
+    let newSource = new Dbm.react.source.ContextVariableSource();
+    newSource.item.path = aPath;
+
+    return newSource;
+}
+
+export let blockData = function(aPath) {
+    //METODO: check if blockdata is a source
+    return contextVariable("blockData." + aPath);
+}

package/react/text/Link.js

@@ -0,0 +1,18 @@
+import Dbm from "../../index.js";
+
+export default class Link extends Dbm.react.BaseObject {
+    _construct() {
+        super._construct();
+    }
+
+    _renderMainElement() {
+
+        let url = this.getPropValue("href");
+        let prefix = this.getPropValue("prefix");
+        if(prefix) {
+            url = prefix + url;
+        }
+
+        return this._createMainElement("a", {href: url}, this.getPropValue("children"));
+    }
+}

package/react/text/index.js

@@ -3,6 +3,7 @@ import {createElement} from "react";
 
 export {default as Text} from "./Text.js";
 export {default as HtmlText} from "./HtmlText.js";
+export {default as Link} from "./Link.js";
 
 export let text = function(aText) {
     if(typeof(aText) === "string") {

package/site/SiteDataLoader.js

@@ -16,7 +16,7 @@ export default class SiteDataLoader extends Dbm.core.BaseObject {
     }
 
 	_loadUrl() {
-		console.log("_loadUrl");
+		//console.log("_loadUrl");
 
 		let url = this.item.url;
 		if(url != null) {

package/tracking/Controller.js

@@ -44,7 +44,7 @@ export default class Controller extends Dbm.core.BaseObject {
 	}
 
     start() {
-        console.log("start");
+        //console.log("start");
         this.item.active = true;
 
         return this;

package/utils/ArrayFunctions.js

@@ -1,9 +1,135 @@
-export let range = function(aStartValue, aEndValue, aStep = 1) {
+import Dbm from "../index.js";
+
+export const range = function(aStartValue, aEndValue, aStepValue = 1, aIncludeEndValue = true) {
+		
+    let returnArray = new Array();
+    
+    let loopCompare;
+     
+    if(aStepValue > 0) {
+        if(aIncludeEndValue) {
+            loopCompare = function(aIndex, aLimit) {
+                return aIndex <= aLimit;
+            };
+        }
+        else {
+            loopCompare = function(aIndex, aLimit) {
+                return aIndex < aLimit;
+            };
+        }
+    }
+    else {
+        if(aIncludeEndValue) {
+            loopCompare = function(aIndex, aLimit) {
+                return aIndex >= aLimit;
+            };
+        }
+        else {
+            loopCompare = function(aIndex, aLimit) {
+                return aIndex > aLimit;
+            };
+        }
+    }
+    
+    for(let i = aStartValue; loopCompare(i, aEndValue); i += aStepValue) {
+        returnArray.push(i);
+    }
+    
+    return returnArray;
+}
+
+export const removeDuplicates = function(aArray) {
     let returnArray = [];
+		
+    let currentArray = aArray;
+    let currentArrayLength = currentArray.length;
+    for(let i = 0; i < currentArrayLength; i++) {
+        let currentValue = currentArray[i];
+        if(returnArray.indexOf(currentValue) === -1) {
+            returnArray.push(currentValue);
+        }
+    }
+    
+    return returnArray;
+}
+
+export const singleOrArray = function(aData) {
+    if(aData === null || aData === undefined) {
+        return [];
+    }
+    else if(aData instanceof Array) {
+        return aData;
+    }
+    
+    return [aData];
+}
 
+export const removeValues = function(aArray, aRemoveValues) {
+    let returnArray = new Array();
+    
+    let currentArray = aArray;
+    let currentArrayLength = currentArray.length;
+    for(let i = 0; i < currentArrayLength; i++) {
+        let currentValue = currentArray[i];
+        if(aRemoveValues.indexOf(currentValue) === -1) {
+            returnArray.push(currentValue);
+        }
+    }
+    
     return returnArray;
 }
 
-export let removeDuplicates = function(aArray) {
+export const trimArray = function(aArray, aMode = 3) {
+		
+    if(aMode > 0) {
+        //METODO: use mode
+        if(aArray) {
+            let currentArray = aArray;
+            let currentArrayLength = currentArray.length;
+            for(let i = 0; i < currentArrayLength; i++) {
+                let currentString = currentArray[i];
+                
+                if(typeof(currentString) === "string") {
+                    currentArray[i] = currentString.trim();
+                }
+            }
+        }
+    }
+    
     return aArray;
+}
+
+export const arrayOrSeparatedString = function(aData, aSeparator = ",", aTrim = 3) {
+    if(aData === null || aData === undefined) {
+        return [];
+    }
+    else if(aData instanceof Array) {
+        return aData;
+    }
+    else if(typeof(aData) === "string") {
+        if(aData === "") {
+            return [];
+        }
+        return trimArray(aData.split(aSeparator));
+    }
+    
+    console.error(aData + " is not array or string.");
+    return [];
+}
+
+export const filterByField = function(aArray, aField, aValue) {
+    let returnArray = [];
+
+    let currentArray = aArray;
+    let currentArrayLength = currentArray.length;
+    for(let i = 0; i < currentArrayLength; i++) {
+        let currentItem = aArray[i];
+        let currentValue = Dbm.objectPath(aArray[i], aField);
+        console.log(currentValue, aValue);
+        if(currentValue === aValue) {
+            returnArray.push(currentItem);
+        }
+    }
+
+    return returnArray;
 }

package/utils/UrlFunctions.js

@@ -0,0 +1,77 @@
+export let createScaledImageUrl = function(aImageData, aWantedWidth) {
+    if(!aImageData || !aImageData["url"]) {
+        return null;
+    }
+
+    let url = aImageData["url"];
+    if(url.substring(url.length-4).toLowerCase() === ".svg") {
+        return url;
+    }
+
+    if(aImageData["resizeUrl"]) {
+        let scaleToWidth = Math.min(
+            Math.round(window.devicePixelRatio*aWantedWidth),
+            Math.max(
+                100,
+                100*Math.round(window.devicePixelRatio*window.innerWidth/100)
+            )
+        );
+        url = aImageData["resizeUrl"].split("{scale}").join("width=" + scaleToWidth);
+    }
+
+    return url;
+}
+
+export let createCoverScaledImageUrl = function(aImageData, aWantedWidth, aWantedHeight) {
+    if(!aImageData || !aImageData["url"]) {
+        return null;
+    }
+
+    let url = aImageData["url"];
+    if(url.substring(url.length-4).toLowerCase() === ".svg") {
+        return url;
+    }
+
+    if(aImageData["resizeUrl"]) {
+        let scaleToWidth = Math.min(
+            Math.round(window.devicePixelRatio*aWantedWidth),
+            Math.max(
+                100,
+                100*Math.round(window.devicePixelRatio*window.innerWidth/100)
+            )
+        );
+
+        let scaleToHeight = Math.round(aWantedHeight*scaleToWidth/aWantedWidth);
+
+        url = aImageData["resizeUrl"].split("{scale}").join("width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=cover");
+    }
+
+    return url;
+}
+
+export let createContainScaledImageUrl = function(aImageData, aWantedWidth, aWantedHeight) {
+    if(!aImageData || !aImageData["url"]) {
+        return null;
+    }
+
+    let url = aImageData["url"];
+    if(url.substring(url.length-4).toLowerCase() === ".svg") {
+        return url;
+    }
+
+    if(aImageData["resizeUrl"]) {
+        let scaleToWidth = Math.min(
+            Math.round(window.devicePixelRatio*aWantedWidth),
+            Math.max(
+                100,
+                100*Math.round(window.devicePixelRatio*window.innerWidth/100)
+            )
+        );
+
+        let scaleToHeight = Math.round(aWantedHeight*scaleToWidth/aWantedWidth);
+
+        url = aImageData["resizeUrl"].split("{scale}").join("width=" + scaleToWidth + ",height=" + scaleToHeight + ",fit=contain");
+    }
+
+    return url;
+}

package/utils/index.js

@@ -1,3 +1,4 @@
 export * as ArrayFunctions from "./ArrayFunctions.js";
 export * as NumberFunctions from "./NumberFunctions.js";
-export * as StringFunctions from "./StringFunctions.js";
+export * as StringFunctions from "./StringFunctions.js";
+export * as UrlFunctions from "./UrlFunctions.js";

package/react/admin/EditorBlockName.js

@@ -1,19 +0,0 @@
-import React from "react";
-import Dbm from "../../index.js";
-
-export default class EditorBlockName extends Dbm.react.BaseObject {
-    _construct() {
-        super._construct();
-    }
-
-    _renderMainElement() {
-
-        let textSource = new Dbm.react.source.ContextVariableSource();
-        textSource.item.path = "moduleData.editorData.name";
-
-        return React.createElement("div", {"className": "editor-block-box editor-block-box-padding text-align-center"},
-            Dbm.react.text.text(textSource),
-        );
-    }
-}
-