zimjs 18.0.2 → 18.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zimjs",
-  "version": "18.0.2",
+  "version": "18.0.4",
   "type": "module",
   "main": "./src/zim.js",
   "types": "./ts-src/typings/zim",

package/src/zim.js

@@ -47513,6 +47513,7 @@ or using next(), prev() or go() methods or index property.
 Can be horizontal or vertical.
 See: ZIM Carousel for a 2D component.
 See: https://zimjs.com/018/carousel3D.html for an example
+See: https://zimjs.com/018/carousel3D_2.html for a simple example
 
 NOTE: as of ZIM 5.5.0 the zim namespace is no longer required (unless zns is set to true before running zim)
 
@@ -65348,7 +65349,7 @@ addChild(), removeChild(), addChildAt(), getChildAt(), contains(), removeAllChil
 PROPERTIES
 type - holds the class name as a String
 items - an array of the wrapper items 
-items2D - read only array of rows each containing an array of colums of items
+items2D - read only array of rows each containing an array of columns of items
 ** see the parameter for descriptions of the following
 ** setting each will resize the wrapper at the current width and height
 ** all these properties accept ZIM VEE (except spacingH) for instance: flip:series(false,true)
@@ -66321,12 +66322,12 @@ addChild(), removeChild(), addChildAt(), getChildAt(), contains(), removeAllChil
 PROPERTIES
 type - holds the class name as a String
 items - read only array of the original tile items - or use tile.getChildAt() or tile.loop(function (item) {})
-items2D - read only array of rows each containing an array of colums of items
+items2D - read only array of rows each containing an array of columns of items
 items2DCols - read only array of columns each containing array of rows of items
 ** the current properties work for equal column size and equal row size
 ** although the row and column size can be different
 current ** - a read only array of the current order of tile items - if items have been scrambled
-current2D ** - read only array the current order of rows each containing an array of colums of items
+current2D ** - read only array the current order of rows each containing an array of columns of items
 current2DCols ** - read only array the current order of columns each containing array of rows of items
 tileNum - this property is added to each object in the tile to give its number in the tile
 tileCol - this property is added to each object in the tile to give its column number in the tile
@@ -66391,49 +66392,44 @@ note: the item is not the event object target - as that is the tile
 
 		if (zot(spacingH)) spacingH = DS.spacingH!=null?DS.spacingH:null;
 		if (zot(spacingV)) spacingV = DS.spacingV!=null?DS.spacingV:null;
-	
-		// Added ZIM 018
-		var spacingHOList = [];
-		var spacingVOList = [];
-		var spacingHOTotal = 0;
-		var spacingVOTotal = 0;
-		for (i=0; i<cols-1; i++) {
-			var s = zik(spacingH);
-			spacingHOList.push(s);
-			spacingHOTotal += s;
-		}
-		for (i=0; i<rows-1; i++) {
-			var s = zik(spacingV);
-			spacingVOList.push(s);
-			spacingVOTotal += s;
-		}
-		var spacingHAve = cols-1>0?spacingHTotal/(cols-1):0
-		var spacingVAve = rows-1>0?spacingVTotal/(rows-1):0
 
 		if (zot(spacingH) || !zot(colSize) || !zot(width)) spacingH = 0; // sizes override spacing
 		if (zot(spacingV) || !zot(rowSize) || !zot(height)) spacingV = 0;	
+		if (zot(squeezeH)) squeezeH = DS.squeezeH!=null?DS.squeezeH:false;
+		if (zot(squeezeV)) squeezeV = DS.squeezeV!=null?DS.squeezeV:false;
+		if (zot(align)) align = DS.align!=null?DS.align:"left";
+		if (zot(valign)) valign = DS.valign!=null?DS.valign:"top";
+		if (zot(count)) count = DS.count!=null?DS.count:(unique&&Array.isArray(obj))?obj.length:null;
+		if (count === 0) {count = null; if (zon) {zogy("ZIM Tile() - count parameter of 0 is ignored - see docs");}}
 
 		// Added ZIM 018
+
 		var spacingHList = [];
 		var spacingVList = [];
 		var spacingHTotal = 0;
 		var spacingVTotal = 0;
-		for (i=0; i<cols-1; i++) {
+		var mCols = (count && count<cols)?count-1:cols-1;
+		for (i=0; i<mCols; i++) {
 			var s = zik(spacingH);
 			spacingHList.push(s);
 			spacingHTotal += s;
 		}
-		for (i=0; i<rows-1; i++) {
+		var mRows = (count && Math.ceil(count/cols)<rows)?Math.ceil(count/cols)-1:rows-1;
+		for (i=0; i<mRows; i++) {
 			var s = zik(spacingV);
 			spacingVList.push(s);
 			spacingVTotal += s;
 		}	
-		if (zot(squeezeH)) squeezeH = DS.squeezeH!=null?DS.squeezeH:false;
-		if (zot(squeezeV)) squeezeV = DS.squeezeV!=null?DS.squeezeV:false;
-		if (zot(align)) align = DS.align!=null?DS.align:"left";
-		if (zot(valign)) valign = DS.valign!=null?DS.valign:"top";
-		if (zot(count)) count = DS.count!=null?DS.count:(unique&&Array.isArray(obj))?obj.length:null;
-		if (count === 0) {count = null; if (zon) {zogy("ZIM Tile() - count parameter of 0 is ignored - see docs");}}
+
+		var spacingHOList = zim.copy(spacingHList);
+		var spacingVOList = zim.copy(spacingVList);;
+		var spacingHOTotal = spacingHTotal;
+		var spacingVOTotal = spacingVTotal;
+		var spacingHAve = cols-1>0?spacingHTotal/(cols-1):0
+		var spacingVAve = rows-1>0?spacingVTotal/(rows-1):0
+
+		// end add 018
+
 		if (zot(mirrorH)) mirrorH = DS.mirrorH!=null?DS.mirrorH:false;
 		if (zot(mirrorV)) mirrorV = DS.mirrorV!=null?DS.mirrorV:false;
 		if (zot(snapToPixel)) snapToPixel = DS.snapToPixel!=null?DS.snapToPixel:true;
@@ -66665,15 +66661,15 @@ note: the item is not the event object target - as that is the tile
 			}
 
 			if (!zot(height)&&that.squeezeV=="full") {
-				overallHeight = height;
-			} else if (!zot(height)) {				
+				overallHeight = height;				
+			} else if (!zot(height)) {						
 				if (scaleToV) overallHeight = height;
 				else overallHeight = Math.max(heightTotalMax+spacingVTotal, height);
 			} else {
 				if (heightUncompressedMax > 0) overallHeight = heightUncompressedMax+spacingVTotal;
 				else overallHeight = heightTotalMax+spacingVTotal;
 			}
-
+			
 			that.setBounds(0,0,overallWidth,overallHeight);
 			widthScaling = (overallWidth-spacingHOTotal)/(widthO);
 			heightScaling = (overallHeight-spacingVOTotal)/(heightO);