@pageboard/html 0.10.14 → 0.11.0

package/elements/card.js

@@ -18,7 +18,7 @@ exports.cards = {
 		shape: {
 			title: 'Shape',
 			anyOf: [{
-				type: 'null',
+				const: null,
 				title: 'Default',
 			}, {
 				const: "square",
@@ -33,9 +33,8 @@ exports.cards = {
 		},
 		responsive: {
 			title: 'Responsive',
-			nullable: true,
 			anyOf: [{
-				title: 'Disable',
+				title: 'No',
 				const: null
 			}, {
 				title: 'Stackable',
@@ -160,14 +159,14 @@ exports.card_header = {
 	contents: "inline*",
 	html: '<div class="header">Header</div>'
 };
-exports.card_header_nolink = Object.assign({}, exports.card_header, {
+exports.card_header_nolink = { ...exports.card_header,
 	context: 'cardlink//',
 	contents: {
 		nodes: "inline*",
 		marks: "nolink"
 	},
 	html: '<div class="header">Header</div>'
-});
+};
 
 exports.card_meta = {
 	title: 'meta',
@@ -178,14 +177,14 @@ exports.card_meta = {
 	contents: "inline*",
 	html: '<div class="meta">Meta</div>'
 };
-exports.card_meta_nolink = Object.assign({}, exports.card_meta, {
+exports.card_meta_nolink = { ...exports.card_meta,
 	context: 'cardlink//',
 	contents: {
 		nodes: "inline*",
 		marks: "nolink"
 	},
 	html: '<div class="meta">Meta</div>'
-});
+};
 
 exports.card_description = {
 	title: 'description',
@@ -196,9 +195,9 @@ exports.card_description = {
 	contents: "paragraph+",
 	html: '<div class="description"></div>'
 };
-exports.card_description_nolink = Object.assign({}, exports.card_description, {
+exports.card_description_nolink = { ...exports.card_description,
 	context: 'cardlink//',
 	contents: "paragraph_nolink+",
 	html: '<div class="description"></div>'
-});
+};
 

package/elements/fieldsets.js

@@ -42,10 +42,10 @@ exports.fieldset_legend = {
 };
 
 exports.fieldset_list = {
-	title: 'FieldList',
+	title: 'Field List',
 	menu: "form",
 	icon: '<i class="icons"><i class="folder outline icon"></i><i class="corner add icon"></i></i>',
-	group: "block",
+	group: 'block template',
 	context: 'form//',
 	priority: 0,
 	properties: {
@@ -54,23 +54,58 @@ exports.fieldset_list = {
 			type: "integer",
 			minimum: 0,
 			default: 1
-		},
-		prefix: {
-			title: 'Prefix',
-			description: '',
-			type: "string",
-			format: 'singleline',
-			nullable: true
 		}
 	},
 	contents: [{
 		id: 'template',
-		nodes: 'block+'
+		nodes: 'block+',
+		expressions: true
 	}],
-	html: `<element-fieldset-list data-size="[size]" data-prefix="[prefix]">
+	html: `<element-fieldset-list data-size="[size]">
 		<template block-content="template"></template>
 		<div class="view"></div>
 	</element-fieldset-list>`,
 	scripts: ['../ui/fieldset-list.js'],
 	stylesheets: ['../ui/fieldset-list.css']
 };
+
+
+exports.fieldlist_button = {
+	title: 'Field List Button',
+	menu: "form",
+	icon: '<i class="icons"><i class="folder outline icon"></i><i class="corner hand pointer icon"></i></i>',
+	group: 'block',
+	context: 'fieldset_list//',
+	properties: {
+		type: {
+			title: 'Type',
+			default: 'add',
+			anyOf: [{
+				title: 'Add',
+				const: 'add'
+			}, {
+				title: 'Delete',
+				const: 'del'
+			}, {
+				title: 'Up',
+				const: 'up'
+			}, {
+				title: 'Down',
+				const: 'down'
+			}]
+		},
+		full: {
+			title: 'Full width',
+			type: 'boolean',
+			default: false
+		}
+	},
+	contents: {
+		nodes: "inline*",
+		marks: "nolink"
+	},
+	html: '<button type="button" class="ui [full|?:fluid:] button" value="[type]">Label</button>',
+	stylesheets: [
+		'../lib/components/button.css',
+	]
+};

package/elements/form.js

@@ -92,7 +92,7 @@ exports.api_form = {
 					title: 'Method',
 					nullable: true,
 					type: "string",
-					pattern: "^(\\w+\\.\\w+)?$"
+					pattern: /^(\w+\.\w+)?$/.source
 				},
 				parameters: {
 					title: 'Parameters',

package/elements/grid.js

@@ -17,8 +17,10 @@ exports.grid = {
 		},
 		responsive: {
 			title: 'Responsive',
-			nullable: true,
 			anyOf: [{
+				title: 'No',
+				const: null
+			}, {
 				title: 'Stackable',
 				const: 'stackable'
 			}, {
@@ -67,9 +69,8 @@ exports.grid_row = {
 	properties: {
 		responsive: {
 			title: 'Responsive',
-			nullable: true,
 			anyOf: [{
-				title: 'Disable',
+				title: 'No',
 				const: null
 			}, {
 				title: 'Stackable',

package/elements/image.js

@@ -12,8 +12,9 @@ exports.image = {
 		url: {
 			title: 'Address',
 			description: 'Local or remote URL',
-			nullable: true,
 			anyOf: [{
+				type: "null"
+			}, {
 				type: "string",
 				format: "uri"
 			}, {
@@ -156,8 +157,9 @@ exports.inlineImage = {
 		url: {
 			title: 'Address',
 			description: 'Local or remote URL',
-			nullable: true,
 			anyOf: [{
+				type: "null"
+			}, {
 				type: "string",
 				format: "uri"
 			}, {

package/elements/input-date.js

@@ -1,5 +1,5 @@
 exports.input_date_time = {
-	title: 'DateTime',
+	title: 'Date Time',
 	icon: '<i class="calendar outline icon"></i>',
 	menu: "form",
 	required: ["name"],
@@ -89,7 +89,7 @@ exports.input_date_time = {
 };
 
 exports.input_date_slot = {
-	title: 'DateSlot',
+	title: 'Date Slot',
 	icon: '<i class="calendar outline icon"></i>',
 	menu: "form",
 	required: ["nameStart", "nameEnd"],

package/elements/input-property.js

@@ -59,16 +59,25 @@ exports.input_property = {
 		let propKey;
 		let required = false;
 		let cases = null;
+		let discKey = null;
 		for (let i = 0; i < list.length; i++) {
 			propKey = list[i];
 			required = prop.required && prop.required.indexOf(propKey) >= 0;
 			if (cases) {
-				prop = cases[propKey];
+				if (Array.isArray(cases)) {
+					prop = cases.find(obj => obj.properties?.[discKey]?.const == propKey);
+				} else {
+					prop = cases[propKey];
+				}
 				name = list.slice(0, i - 1).concat(list.slice(i + 1)).join('.');
 				cases = null;
+				discKey = null;
 			} else {
 				if (prop.select && prop.select.$data == `0/${propKey}`) {
 					cases = prop.selectCases;
+				} else if (prop.discriminator && prop.discriminator.propertyName == propKey) {
+					cases = prop.oneOf;
+					discKey = propKey;
 				}
 				prop = (prop.items && prop.items.properties || prop.properties || {})[propKey] || null;
 			}

package/elements/inputs.js

@@ -156,8 +156,8 @@ exports.input_text = {
 		nodes: 'inline*'
 	},
 	patterns: {
-		tel: '^(\\(\\d+\\))? *\\d+([ .\\-]?\\d+)*$',
-		email: '^[\\w.!#$%&\'*+\\/=?^`{|}~-]+@\\w(?:[\\w-]{0,61}\\w)?(?:\\.\\w(?:[\\w-]{0,61}\\w)?)*$'
+		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: {
 		multiple: {
 			title: 'Multiple',
 			type: 'boolean',
@@ -243,8 +243,9 @@ exports.input_range = {
 			title: 'Pips',
 			type: 'boolean',
 			default: true
-		}
-	}, exports.input_number.properties),
+		},
+		...exports.input_number.properties
+	},
 	contents: {
 		id: 'label',
 		nodes: 'inline*'

package/elements/layout.js

@@ -106,8 +106,9 @@ exports.layout = {
 				image: {
 					title: 'Image',
 					description: 'Local or remote URL',
-					nullable: true,
 					anyOf: [{
+						type: "null"
+					}, {
 						type: "string",
 						format: "uri"
 					}, {
@@ -168,7 +169,7 @@ exports.layout = {
 				size: {
 					title: 'Size',
 					anyOf: [{
-						type: 'null',
+						const: null,
 						title: 'Auto'
 					}, {
 						const: 'cover',
@@ -181,7 +182,7 @@ exports.layout = {
 				position: {
 					title: 'Position',
 					anyOf: [{
-						type: 'null',
+						const: null,
 						title: 'Top Left'
 					}, {
 						const: 'top center',
@@ -212,7 +213,7 @@ exports.layout = {
 				repeat: {
 					title: 'Repeat',
 					anyOf: [{
-						type: 'null',
+						const: null,
 						title: 'Repeat'
 					}, {
 						const: 'no-repeat',
@@ -234,7 +235,7 @@ exports.layout = {
 				attachment: {
 					title: 'Attachment',
 					anyOf: [{
-						type: 'null',
+						const: null,
 						title: 'Local'
 					}, {
 						const: 'scroll',

package/elements/media.js

@@ -8,8 +8,9 @@ exports.video = {
 		url: {
 			title: 'Address',
 			description: 'Local or remote URL',
-			nullable: true,
 			anyOf: [{
+				type: "null"
+			}, {
 				type: "string",
 				format: "uri"
 			}, {
@@ -88,8 +89,9 @@ exports.audio = {
 		url: {
 			title: 'Address',
 			description: 'Local or remote URL',
-			nullable: true,
 			anyOf: [{
+				type: "null"
+			}, {
 				type: "string",
 				format: "uri"
 			}, {

package/elements/menu.js

@@ -9,7 +9,6 @@ exports.menu = {
 	properties: {
 		direction: {
 			title: 'Direction',
-			nullable: true,
 			anyOf: [{
 				const: null,
 				title: "Horizontal"
@@ -37,7 +36,6 @@ exports.menu_group = {
 	properties: {
 		position: {
 			title: 'Position',
-			nullable: true,
 			anyOf: [{
 				const: null,
 				title: "Left"
@@ -104,14 +102,14 @@ exports.menu_item_link = {
 	html: '<a class="[labeled|?] item" href="[url|autolink]">Link</a>'
 };
 
-exports.menu_item_block = Object.assign({}, exports.menu_item_link, {
+exports.menu_item_block = { ...exports.menu_item_link,
 	title: 'Block',
 	priority: 11,
 	contents: {
 		nodes: "block+",
 		marks: "nolink"
 	}
-});
+};
 
 exports.menu_item_text = {
 	priority: 11,
@@ -153,7 +151,6 @@ exports.menu_item_dropdown = {
 	properties: {
 		position: {
 			title: 'Position',
-			nullable: true,
 			anyOf: [{
 				const: null,
 				title: "Left"

package/elements/page.js

@@ -5,9 +5,10 @@ exports.page.stylesheets = [
 	'../ui/transition.css'
 ];
 
-exports.page.scripts = exports.page.scripts.concat([
+exports.page.scripts = [
+	...exports.page.scripts,
 	'../ui/transition.js'
-]);
+];
 
 exports.page.properties.transition = {
 	title: 'Transition',
@@ -16,9 +17,8 @@ exports.page.properties.transition = {
 	properties: {
 		close: {
 			title: 'Close',
-			nullable: true,
 			anyOf: [{
-				type: 'null',
+				const: null,
 				title: 'None'
 			}, {
 				const: 'tr-up',
@@ -39,9 +39,8 @@ exports.page.properties.transition = {
 		},
 		open: {
 			title: 'Open',
-			nullable: true,
 			anyOf: [{
-				type: 'null',
+				const: null,
 				title: 'None'
 			}, {
 				const: 'tr-up',

package/elements/paragraph.js

@@ -1,11 +1,11 @@
-exports.paragraph_nolink = Object.assign({}, exports.paragraph, {
+exports.paragraph_nolink = { ...exports.paragraph,
 	priority: exports.paragraph.priority - 1,
 	group: null,
 	contents: {
 		nodes: "inline*",
 		marks: "nolink"
 	}
-});
+};
 
 exports.segment = {
 	title: "Segment",
@@ -128,7 +128,7 @@ exports.heading = {
 		id: {
 			nullable: true,
 			type: 'string',
-			pattern: '^[a-z0-9-]*$'
+			pattern: /^[a-z0-9-]*$/.source
 		}
 	},
 	contents: {
@@ -159,13 +159,12 @@ exports.heading = {
 };
 
 
-exports.heading_nolink = Object.assign({}, exports.heading, {
+exports.heading_nolink = {
+	...exports.heading,
 	priority: exports.heading.priority - 1,
 	group: null,
-	contents: Object.assign({}, exports.heading.contents, {
-		marks: "nolink"
-	})
-});
+	contents: { ...exports.heading.contents, marks: "nolink" }
+};
 
 exports.divider = {
 	title: "Divider",

package/elements/rating.js

@@ -27,7 +27,7 @@ exports.rating = {
 			title: 'Color',
 			anyOf: [{
 				title: 'Default',
-				type: 'null'
+				const: null
 			}, {
 				title: 'Star',
 				const: "star"

package/elements/sitemap.js

@@ -1,5 +1,5 @@
 exports.sitemap = {
-	title: "Site map",
+	title: "Sitemap",
 	group: "block",
 	icon: '<i class="sitemap icon"></i>',
 	menu: 'link',
@@ -30,12 +30,13 @@ exports.sitemap = {
 			title: schema.title,
 			icon: schema.icon,
 			standalone: true,
-			properties: Object.assign({
+			properties: {
 				leaf: {
 					type: 'boolean',
 					default: Boolean(leaf)
-				}
-			}, schema.properties),
+				},
+				...schema.properties
+			},
 			menu: "link",
 			group: 'sitemap_item',
 			virtual: true,