cavalion-vcl 1.1.71 → 1.1.73

package/.md

@@ -1,38 +1,29 @@
 * [CHANGELOG.md]() - [README.md]() - [package.json]()
-* [.workspace](`(devtools/Workspace<${ws.getSpecializer()}>)`) - [.js]()
-
-# cavalion-entities // va-objects
-
-* Interpret, modify, kvp via a model
-
-# cavalion-vcl
-
-* [src](:/)
-	* [Factory](src/:.js) [.parse](src/Factory:.js) - [Reader](src/:.js) - [Writer](src/:.js)
-	* [CssRules](src/:.js) - [Listeners](src/:.js) 
-	* **[Component](src/:.js)** [.query](src/Component:.js)
-		* **[Application](src/:.js)** - **[Action](src/:.js)**
-		* [data](src/:/) / [Array](src/data/:.js)
-			* [entities](src/:/) / [Query](src/entities/:.js) - [Instance](src/entities/:.js)
-		* **[Control](src/:.js)** < [ui](src/:/) /
-			* [Element](src/ui/:.js) < [LargeIcon](src/ui/:.js) << _smdl - alert_
-				* [Button](src/ui/:.js) < [PopupButton](src/ui/:.js)
-				* [Select](src/ui/:.js)
-				* [Input](src/ui/:.js) < [Checkbox](src/ui/:.js) - [Combobox](src/ui/:.js) - [DatePicker](src/ui/:.js) 
-			* [Container](src/ui/:.js)
-				* [Group](src/ui/:.js)
-					* [Bar](src/ui/:.js)
-					* [CheckGroup](src/ui/:.js)
-				* [Panel](src/ui/:.js) 
-					* [Popup](src/ui/:.js) - [Ace](src/ui/:.js) - [Console](src/ui/:.js)
-					* [Form](src/ui/:.js) - [FormContainer](src/ui/:.js)
-					* [List](src/ui/:.js) | [ListColumn](src/ui/:.js) - [ListBody](src/ui/:.js) - [ListFooter](src/ui/:.js) - [ListHeader](src/ui/:.js) - [ListRow](src/ui/:.js)
-			* [Sizer](src/ui/:.js)
-			* [Tabs](src/ui/:.js) 
-				* [Tab](src/ui/:.js)
-			* [Tree](src/ui/:.js)
-				* [Node](src/ui/:.js)
-					* [.closeable](src/ui/Node:.js)
+* [.workspace](`(devtools/Workspace<${ws.getSpecializer()}>)`) - [.js]() - [src](:/)
+
+# cavalion-vcl / classes
+
+* [Factory](src/:.js) [.parse](src/Factory:.js) - [Reader](src/:.js) - [Writer](src/:.js)
+* [CssRules](src/:.js) - [Listeners](src/:.js) 
+* **[Component](src/:.js)** [.query](src/Component:.js)
+	* **[Application](src/:.js)** - **[Action](src/:.js)**
+	* [data](src/:/) / [Array](src/data/:.js)
+		* [entities](src/:/) / [Query](src/entities/:.js) - [Instance](src/entities/:.js)
+	* **[Control](src/:.js)** < [ui](src/:/) / [Sizer](src/ui/:.js)
+		* [Element](src/ui/:.js) < [LargeIcon](src/ui/:.js) << _smdl - alert_
+			* [Input](src/ui/:.js) < [Checkbox](src/ui/:.js) - [Combobox](src/ui/:.js) - [DatePicker](src/ui/:.js) 
+			* [Button](src/ui/:.js) < [PopupButton](src/ui/:.js)
+			* [Select](src/ui/:.js)
+		* [Container](src/ui/:.js)
+			* [Group](src/ui/:.js)
+				* [CheckGroup](src/ui/:.js)
+				* [Bar](src/ui/:.js)
+					* [Tabs](src/ui/:.js) - [Tab](src/ui/:.js)
+			* [Panel](src/ui/:.js) 
+				* [Popup](src/ui/:.js) - [Ace](src/ui/:.js) - [Console](src/ui/:.js)
+				* ( [Form](src/ui/:.js) - [FormContainer](src/ui/:.js) ) _where does onActive/Deactive go?_
+				* [List](src/ui/:.js) | [ListColumn](src/ui/:.js) - [ListBody](src/ui/:.js) - [ListFooter](src/ui/:.js) - [ListHeader](src/ui/:.js) - [ListRow](src/ui/:.js)
+				* [Tree](src/ui/:.js) - [Node](src/ui/:.js) [.closeable](src/ui/Node:.js)
 
 # prototypes `2022/04/17` 
 
@@ -61,4 +52,7 @@
 		* [Query](src/prototypes/ui/entities/:.js) - [.scaffold](src/prototypes/ui/entities/Query:.js) - [scaffold.future](src/prototypes/ui/entities/Query:.js)
 		* [QueryFilters](src/prototypes/ui/entities/:.js)
 
+# cavalion-entities // va-objects
+
+* Interpret, modify, kvp via a model
 

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+### 2023/03/26 - 1.1.73
+
+* Fixes issues with Component.getImplicitBasesByUri
+
+### 2022/12/11 - 1.1.72
+
+* ListHeader: Fixes the rendering bug which appeared in Chrome 107+
+
 ### 2022/11/15 - 1.1.71
 
 * Updates the docs
@@ -5,7 +13,6 @@
 * Query: fixes some bug in error handling 
 * List: improves rendering while loading
 
-
 ### 2022/10/30 - 1.1.70
 
 `#VA-20221028-1`, `-2` & `-3`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cavalion-vcl",
-  "version": "1.1.71",
+  "version": "1.1.73",
   "description": "Visual Component Library for vcl-comps",
   "main": "index.js",
   "scripts": {

package/src/Component.js

@@ -1232,7 +1232,11 @@ define(function (require) {
                 if (base !== null) {
                     var keys = Component.getKeysByUri(uri);
                     var classes = keys.classes;
-                    var spec_classes = keys.specializer_classes;
+                    var spec_classes = [].concat(keys.specializer_classes);
+
+                    // Always inherit the implicit base first
+                    r.push(base);
+                    
                     if (classes.length > 1) {
                         // [A] Each class expands
                         classes.forEach(function (cls) {
@@ -1240,10 +1244,11 @@ define(function (require) {
                             r.push(Component.getUriByKeys(keys));
                         });
                     } else if (classes.length === 1) {
-                        if (spec_classes.length > 1) {
+                        if (spec_classes.length/* > 1*/) {
                             // [B] Each specializer_class expands
                             spec_classes.forEach(function (cls) {
-                                keys.specializer_classes = [cls];
+                                keys.specializer_classes = [];
+                                keys.specializer = cls;
                                 r.push(Component.getUriByKeys(keys));
                             });
                         } else if (spec_classes.length === 1) {
@@ -1261,10 +1266,12 @@ define(function (require) {
                         } else {
                             // [J] equals [G], continue on prototypes/ prefix
                         }
-                    } else if (spec_classes.length > 1) {
+                    } else if (spec_classes.length/* > 1*/) {
                         // [E] Each specializer_class expands
                         spec_classes.forEach(function (cls) {
-                            keys.specializer_classes = [cls];
+                            // keys.specializer_classes = [cls];
+                            keys.specializer_classes = [];
+                            keys.specializer = cls;
                             r.push(Component.getUriByKeys(keys));
                         });
                     } else if (spec_classes.length === 1) {
@@ -1279,8 +1286,6 @@ define(function (require) {
                         // empty specifier due to: ComponentClass<>
                     }
 
-                    // Always inherit the implicit base
-                    r.push(base);
 
                 } else if (uri.indexOf(Factory.PREFIX_PROTOTYPES) !== 0) {
                     r.push(String.format("%s%s", Factory.PREFIX_PROTOTYPES, uri));

package/src/Factory.js

@@ -527,8 +527,7 @@ define(function(require) {
 				var sourceUri = Factory.makeTextUri(name);
 
 				function instantiate(source, local) {
-					var p = "";//local ? ".skip-fetch.local" : "";
-					var factory = new Factory(parentRequire, name + p, sourceUri + p);
+					var factory = new Factory(parentRequire, name, sourceUri);
 // console.log("instantiate", name + p);
 					factory.load(source, function() {
 						load(factory, source);
@@ -536,7 +535,6 @@ define(function(require) {
 				}
 
 				function fallback() {
-// console.log("fallback");
 					parentRequire([sourceUri], instantiate, function(err) {
 						// Source not found, assume it...
 						var source = Component.getImplicitSourceByUri(name);
@@ -545,18 +543,11 @@ define(function(require) {
 						}
 						//console.log("304", name, "-->", source);
 						Factory.implicit_sources[sourceUri] = source;
+// console.log(name, "implicit source generated", source);
 						instantiate(source);
 					});
 				}
 				
-				if(name.endsWith(".skip-fetch")) {
-console.log("skip-fetch", name);
-					name = name.split("."); 
-					name.pop();
-					name = name.join(".");
-					return fallback()
-				}
-
 // console.log("fetch", name);
 				this.fetch(name)
 					.then(source => source ? instantiate(source, true) : fallback())

package/src/ui/List.js

@@ -191,7 +191,7 @@ define(function(require) {
 					s.left = String.format("%dpx", bw);
 					s.top = String.format("%dpx", bh + rect.top);
 
-					thisObj._body.setBounds(rect.left, rect.top, undefined, undefined, bw, bh);
+					thisObj._body.setBounds(rect.left, rect.top - 3, undefined, undefined, bw, bh);
 				}];
 
 				args.callee = arguments.callee;

package/src/ui/ListHeader.js

@@ -16,12 +16,10 @@ define(function(require) {
 			    overflow: "hidden",
 			    transition: "width 50ms",
 				">div": {
-//					background: "-webkit-linear-gradient(top,  rgba(240,240,240,1) 0%,rgba(227,227,227,1) 100%)", // Chrome10+,Safari5.1+
-					// "background-image": "-webkit-gradient(linear, 0% 0%, 0% 100%, from(rgb(245, 245, 245)), to(rgb(229, 229, 229)))",
-					
 					"background-image": "-webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(245, 245, 245, 0.9)), to(rgba(229, 229, 229, 0.9)))",
-					
-					// background: "rgba(255, 255, 255, 0.9)",
+			    	'line-height': "8px",
+			    	'padding-top': "3px",
+			    	'padding-bottom': "3px",
 /**
 					background: [
 						"rgb(240,240,240)", // Old browsers
@@ -38,7 +36,7 @@ define(function(require) {
 					"overflow": "hidden",
 					"white-space": "nowrap",
 					cursor: "default",
-					display: "inline-flex"
+					display: "inline-block"
 				}
 			},
 

package/src/ui/Popup.js

@@ -15,25 +15,20 @@ define(function(require) {
 
 				this._hook = new DocumentHook(undefined, true);
 				js.mixIn(this._hook, {
-
-					/**
-					 *
-					 */
-					keydown: function(evt) {
+					keydown: (evt) => {
 						if(evt.keyCode === 27) {
 							popup.close();
 							evt.preventDefault();
 						}
 					},
-
-					/**
-					 *
-					 */
-					click: function(evt) {
-						if(!HtmlElement.hasParent(evt.target, popup._node)) {
+					click: (evt) => {
+						var hasParent = HtmlElement.hasParent(evt.target, popup._node);
+						if(popup._autoClose || !hasParent) {
 							popup.close();
-							evt.bubbleUp = false;
-							evt.preventDefault(); // for A's
+							if(!hasParent) {
+								evt.bubbleUp = false;
+								evt.preventDefault(); // for A's
+							}
 						}
 					}
 				});
@@ -45,6 +40,7 @@ define(function(require) {
 			},
 
 			_visible: false,
+			_autoClose: true,
 			_autoSize: "both",
 			_hook: null,
 
@@ -58,25 +54,29 @@ define(function(require) {
 				 * @param relativeTo
 				 * @param onClose
 				 */
-				if(!this._hook.isActive()) {
-					var p = relativeTo.clientToDocument(0, 0);
-					var cs = relativeTo.getComputedStyle();
-					var cs_ = this.getComputedStyle();
-
-					if(this._parent) {
-						p = this._parent.documentToClient(p);
-					}
+				const align = () => {
+	
+						var p = relativeTo.clientToDocument(0, 0);
+						var cs = relativeTo.getComputedStyle();
+						var cs_ = this.getComputedStyle();
+
+						if(this._parent) {
+							p = this._parent.documentToClient(p);
+						}
+						
+						if(position.origin === "bottom-left") {
+							this.setLeft(p.x + (position.dx || 0));
+							this.setTop(p.y + parseInt(cs.height, 10) + (position.dy || 0));
+						} else if(position.origin === "bottom-right") {
+							this.setLeft(p.x + parseInt(cs.width, 10) + (position.dx || 0) - parseInt(cs_.width, 10));
+							this.setTop(p.y + parseInt(cs.height, 10) + (position.dy || 0));
+						}
+					};
 
-					if(position.origin === "bottom-left") {
-						this.setLeft(p.x + (position.dx || 0));
-						this.setTop(p.y + parseInt(cs.height, 10) + (position.dy || 0));
-					} else if(position.origin === "bottom-right") {
-						this.setLeft(p.x + parseInt(cs.width, 10) + (position.dx || 0) - parseInt(cs_.width, 10));
-						this.setTop(p.y + parseInt(cs.height, 10) + (position.dy || 0));
-					}
+				var n = 2;
+				if(!this._hook.isActive()) {
 					
 					this.setVisible(true);
-
 					this._hook.activate();
 
 					this._hook.release = function() {
@@ -86,8 +86,11 @@ define(function(require) {
 						onClose();
 					};
 
+					this.update(align);
 					this.onpopup();
 				}
+				
+				align();
 			},
 			close: function() {
 				if(this._hook.isActive()) {
@@ -134,6 +137,9 @@ define(function(require) {
 			}
 		},
 		properties: {
+			"autoClose": {
+				type: Class.Type.BOOLEAN
+			},
 			"onPopup": {
 				type: Class.Type.EVENT
 			},

package/src/ui/Tree.js

@@ -28,13 +28,14 @@ define(function (require) {
 				},
                 ".{./Node}": {
     		        display: "block",
+                	cursor: "pointer",
                     "list-style-type": "none",
                     "white-space": "nowrap",
                     ">.close": {
                     	position: "absolute",
                     	right: "4px",
                     	"padding-top": "2px",
-                    	cursor: "pointer",
+                    	// cursor: "pointer",
                     	display: "none"
                     },
                     ">ol": {
@@ -75,8 +76,8 @@ define(function (require) {
                     },
                     ">.text": {
                         'input[type=checkbox]': `position:relative;top:${checkbox_top}px;`,
-                    	cursor: "pointer",
                         position: "relative",
+                        // cursor: "pointer",//"default",
 //        				width: "100%",
                         display: 'inline-block',
                         'margin-left': "2px",