@pageboard/html 0.10.19 → 0.10.21

package/elements/form.js

@@ -66,6 +66,7 @@ exports.api_form = {
 	group: 'block form',
 	menu: "form",
 	required: ["action"],
+	expressions: true,
 	$lock: {
 		'data.action.parameters': 'webmaster'
 	},
@@ -131,7 +132,8 @@ exports.api_form = {
 			properties: {
 				parameters: {
 					title: 'Parameters',
-					type: "object"
+					type: "object",
+					nullable: true
 				}
 			},
 			nullable: true
@@ -142,7 +144,8 @@ exports.api_form = {
 			properties: {
 				parameters: {
 					title: 'Parameters',
-					type: "object"
+					type: "object",
+					nullable: true
 				}
 			},
 			nullable: true
@@ -153,7 +156,8 @@ exports.api_form = {
 			properties: {
 				parameters: {
 					title: 'Parameters',
-					type: "object"
+					type: "object",
+					nullable: true
 				}
 			},
 			nullable: true

package/elements/grid.js

@@ -19,7 +19,7 @@ exports.grid = {
 			title: 'Responsive',
 			anyOf: [{
 				title: 'No',
-				const: null
+				type: 'null'
 			}, {
 				title: 'Stackable',
 				const: 'stackable'

package/elements/image.js

@@ -132,7 +132,7 @@ exports.image = {
 		class="[display.fit|or:none] [display.horizontal|or:] [display.vertical|or:]"
 		alt="[alt]"
 		data-src="[url|or:[$element.resources.empty]]"
-		data-crop="[crop.x];[crop.y];[crop.width];[crop.height];[crop.zoom]"
+		data-crop="[crop.x|or:50];[crop.y|or:50];[crop.width|or:100];[crop.height|or:100];[crop.zoom|or:100]"
 	>
 		<div block-content="legend"></div>
 	</element-image>`,
@@ -180,11 +180,12 @@ exports.inlineImage = {
 		display: {
 			title: 'Display options',
 			type: 'object',
+			nullable: true,
 			properties: {
 				avatar: {
 					title: 'avatar',
 					type: 'boolean',
-					default: true
+					default: false
 				},
 				rounded: {
 					title: 'rounded',
@@ -212,7 +213,8 @@ exports.inlineImage = {
 					}, {
 						const: "right",
 						title: "right"
-					}]
+					}],
+					default: ""
 				},
 				align: {
 					title: 'align',

package/elements/input-date.js

@@ -52,8 +52,13 @@ exports.input_date_time = {
 			title: 'Step',
 			description: 'rounding/increment in seconds',
 			type: 'integer',
-			nullable: true,
+			default: null,
 			anyOf: [{
+				const: null,
+				title: '1 minute'
+			}, {
+				const: 60
+			}, {
 				const: 60 * 5,
 				title: '5 minutes'
 			}, {

package/elements/input-property.js

@@ -41,6 +41,7 @@ exports.input_property = {
 	fuse: function(node, d, scope) {
 		const view = scope.$view;
 		const doc = scope.$doc;
+		const dateFormats = ["date", "time", "date-time"];
 		let name = d.name;
 		if (!name) {
 			return node;
@@ -67,10 +68,14 @@ exports.input_property = {
 				name = list.slice(0, i - 1).concat(list.slice(i + 1)).join('.');
 				cases = null;
 			} else {
+				if (prop.type == "array" && prop.items && !Array.isArray(prop.items)) {
+					prop = prop.items;
+				}
 				if (prop.select && prop.select.$data == `0/${propKey}`) {
 					cases = prop.selectCases;
 				}
-				prop = (prop.items && prop.items.properties || prop.properties || {})[propKey] || null;
+				if (prop.properties) prop = prop.properties;
+				prop = prop[propKey];
 			}
 			if (prop == null) break;
 		}
@@ -227,8 +232,40 @@ exports.input_property = {
 					label: prop.title
 				}
 			}));
-		} else if (propType.type == "string" && ["date", "time", "date-time"].includes(propType.format)) {
+		} else if (propType.type == "object" && Object.keys(propType.properties).sort().join(' ') == "end start" && dateFormats.includes(propType.properties.start.format) && dateFormats.includes(propType.properties.end.format)) {
 			node.appendChild(view.render({
+				id,
+				type: 'input_date_slot',
+				data: {
+					nameStart: name,
+					nameEnd: name,
+					format: propType.properties.start.format.replace('-', ''),
+					disabled: d.disabled,
+					required: required,
+					step: propType.properties.start.step
+				},
+				content: {
+					label: prop.title
+				}
+			}));
+		} else if (propType.type == "string" && dateFormats.includes(propType.format)) {
+			if (d.multiple) node.appendChild(view.render({
+				id,
+				type: 'input_date_slot',
+				data: {
+					nameStart: name,
+					nameEnd: name,
+					format: propType.format.replace('-', ''),
+					default: propType.default,
+					disabled: d.disabled,
+					required: required,
+					step: propType.step
+				},
+				content: {
+					label: prop.title
+				}
+			}));
+			else node.appendChild(view.render({
 				id,
 				type: 'input_date_time',
 				data: {

package/elements/inputs.js

@@ -156,8 +156,8 @@ exports.input_text = {
 		nodes: 'inline*'
 	},
 	patterns: {
-		tel: /^(\(\d+\))? *\d+([ .\-]?\d+)*$/.source,
-		email: /^[\w.!#$%&'*+\/=?^`{|}~-]+@\w(?:[\w-]{0,61}\w)?(?:\.\w(?:[\w-]{0,61}\w)?)*$/.source
+		tel: /^(\(\d+\))? *\d+([ .-]?\d+)*$/.source,
+		email: /^[\w.!#$%&'*+/=?^`{|}~-]+@\w(?:[\w-]{0,61}\w)?(?:\.\w(?:[\w-]{0,61}\w)?)*$/.source
 	},
 	html: `<div class="[width|num: wide] field [type|eq:hidden:hidden:]">
 		<label block-content="label">Label</label>
@@ -233,7 +233,7 @@ exports.input_range = {
 	menu: "form",
 	group: "block",
 	context: 'form//',
-	properties: Object.assign({
+	properties: Object.assign({}, exports.input_number.properties, {
 		multiple: {
 			title: 'Multiple',
 			type: 'boolean',
@@ -242,9 +242,14 @@ exports.input_range = {
 		pips: {
 			title: 'Pips',
 			type: 'boolean',
-			default: true
+			default: false
+		},
+		step: {
+			title: 'Step',
+			type: "number",
+			default: 10
 		}
-	}, exports.input_number.properties),
+	}),
 	contents: {
 		id: 'label',
 		nodes: 'inline*'

package/elements/layout.js

@@ -57,8 +57,10 @@ exports.layout = {
 		},
 		width: {
 			title: 'Width',
-			default: "full",
 			anyOf: [{
+				type: "null",
+				title: "None"
+			}, {
 				const: "full",
 				title: "Full"
 			}, {
@@ -125,6 +127,7 @@ exports.layout = {
 				crop: {
 					title: 'Crop and scale',
 					type: "object",
+					nullable: true,
 					properties: {
 						x: {
 							type: "number",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pageboard/html",
-  "version": "0.10.19",
+  "version": "0.10.21",
   "description": "",
   "main": "index.js",
   "scripts": {