From 0d997f451ca35392ac07811367ae9837d817a4df Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Tue, 5 Feb 2019 18:25:23 +0300
Subject: [PATCH] fixed most of the issues with lists of made items, still not
 final...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 ui (gen4)/lib/widget/browse2.js | 45 ++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/ui (gen4)/lib/widget/browse2.js b/ui (gen4)/lib/widget/browse2.js
index 526411f5..5cc624fc 100755
--- a/ui (gen4)/lib/widget/browse2.js	
+++ b/ui (gen4)/lib/widget/browse2.js	
@@ -15,6 +15,28 @@ var widget = require('./widget')
 
 
 /*********************************************************************/
+// Helpers...
+
+// 
+// NOTE: this will remove the made via make(..) items from .items thus the
+// 		caller is responsible for adding them back...
+var normalizeItems = function(context, items){
+	var made = items
+		.filter(function(e){
+			return e === context })
+	var l = context.items.length - made.length
+	// constructed item list...
+	made = context.items.splice(l, made.length)
+	// get the actual item values...
+	return items
+		.map(function(e){
+			return e === context ?
+				made.shift()
+				: e }) }
+
+
+
+//---------------------------------------------------------------------
 // XXX general design:
 // 		- each of these can take either a value or a function (constructor)
 //		- the function has access to Items.* and context
@@ -57,21 +79,6 @@ Items.focus = function(){
 
 
 
-// helper...
-var normalizeItems = function(context, items){
-	var made = items
-		.filter(function(e){
-			return e === context })
-	var l = context.items.length - items.length
-	// constructed item list...
-	made = context.items.slice(l)
-	// get the actual item values...
-	return items
-		.map(function(e){
-			return e === context ?
-				made.shift()
-				: e }) }
-
 
 //
 //	.group(make(..), ..)
@@ -80,7 +87,8 @@ var normalizeItems = function(context, items){
 // Example:
 // 	make.group(
 // 		make('made item'),
-// 		'literal item')
+// 		'literal item',
+// 		...)
 //
 // XXX do we need to pass options to groups???
 // XXX would be nice to have a better check/test...
@@ -92,19 +100,16 @@ var normalizeItems = function(context, items){
 // 		and prevent allot of specific errors...
 Items.group = function(...items){
 	var that = this
-	// XXX ???
 	items = items.length == 1 && items[0] instanceof Array ?
 		items[0]
 		: items
-	var l = this.items.length - items.length
 
 	// replace the items with the group...
-	this.items.splice(l, items.length, normalizeItems(this, items))
+	this.items.splice(this.items.length, 0, ...normalizeItems(this, items))
 
 	return this
 }
 
-// XXX add support for lists of items (a-la .group(..))
 Items.nest = function(item, list, options){
 	options = options || {}
 	options.sublist = list instanceof Array ?