targetj 1.0.65 → 1.0.67

package/Exports.js

@@ -4,3 +4,4 @@ export * from "./src/SearchUtil.js"
 export * from "./src/TargetUtil.js"
 export * from "./src/TUtil.js"
 export * from "./src/Browser.js"
+export * from "./src/Bracket.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "targetj",
-  "version": "1.0.65",
+  "version": "1.0.67",
   "keywords": [
     "targetj"
   ],

package/src/$Dom.js

@@ -50,12 +50,21 @@ $Dom.prototype.attr = function(name, value) {
     }
 };
 
-$Dom.prototype.opacity = function(opacity) {
-    if (TUtil.isDefined(opacity)) {
-        this.element.style.opacity = opacity;        
+$Dom.prototype.value = function(value) {
+    if (!this.element) return;
+    
+    if (TUtil.isDefined(value)) {
+        this.element.value = value;
     } else {
-        return this.element.style.opacity;        
-    }       
+        return this.element.value;
+    }    
+};
+
+$Dom.prototype.select = function() {
+    if (!this.element || typeof this.element.select !== 'function') return;
+    
+    
+    this.element.select();
 };
 
 $Dom.prototype.width = function(width) {
@@ -74,14 +83,6 @@ $Dom.prototype.height = function(height) {
     }
 };
 
-$Dom.prototype.zIndex = function(zIndex) {
-    if (TUtil.isDefined(zIndex)) {
-        this.element.style.zIndex = zIndex;
-    }
-    
-    return this.element.style.zIndex;
-};
-
 $Dom.prototype.css = function(css) {
     if (TUtil.isDefined(css)) {
          this.attr('class', css);
@@ -106,35 +107,31 @@ $Dom.prototype.setStyleByMap = function(attrMap) {
             case 'height': 
                 self.height(value);
                 break;
-                        
-            case 'zIndex': 
-                self.zIndex(value);
-                break;
-                
-            case 'opacity':
-                self.opacity(value);
-                break;
 
             default: 
-                self.setStyle(key, value);
+                self.style(key, value);
         }
     });
 };
 
-$Dom.prototype.setStyle = function(name, value) {
-    this.element.style[name] = value;
-};
-
-$Dom.prototype.getStyle = function(name) {
-    return this.element.style[name];
+$Dom.prototype.style = function(name, value) {
+    if (TUtil.isDefined(value)) {
+        this.element.style[name] = value;
+    } else {
+        return this.element.style[name];
+    }  
 };
 
 $Dom.prototype.getStyleValue = function(name) {
-    var styleValue = this.getStyle(name);
+    var styleValue = this.style(name);
     var numericValue = TUtil.isDefined(styleValue) ? styleValue.replace(/[^-\d.]/g, '') : 0;
     return parseFloat(numericValue);    
 };
 
+$Dom.prototype.getBoundingClientRect = function() {
+    return this.element.getBoundingClientRect();
+};
+
 $Dom.prototype.parent = function() {
     return this.element ? this.element.parentElement : null;
 };

package/src/Bracket.js

@@ -7,7 +7,7 @@ function Bracket(parent) {
 
     var tm = new TModel("BI", {
         canHaveDom: false,
-        outerXEast: 0        
+        outerXEast: 0
     });
     
     tm.parent = parent;
@@ -43,6 +43,17 @@ function Bracket(parent) {
         return this.getRealParent().getScrollLeft();
     };
     
+    tm.getBoundingRect = function() {
+        this.initParents();                
+        return TUtil.getBoundingRect(this.getRealParent());
+    };
+    
+    tm.calculateAbsolutePosition = function(x, y) {
+        var rect = this.getBoundingRect();
+        this.absX = rect.left + x;
+        this.absY = rect.top + y;
+    };
+
     tm.isVisible = function () {
         return this.yVisible;
     };

package/src/EventListener.js

@@ -140,7 +140,6 @@ EventListener.prototype.handleEvent = function (event) {
     var lastEvent = this.eventQueue.length > 0 ? this.eventQueue[this.eventQueue.length - 1] : null;
     
     if (lastEvent) {
-
         var lastEventItem = lastEvent.eventItem;
         var rate  = now - lastEvent.timeStamp; 
 
@@ -237,6 +236,10 @@ EventListener.prototype.findEventHandlers = function(tmodel) {
     var scrollTopHandler = tmodel ? SearchUtil.findFirstScrollTopHandler(tmodel) : null;
     var pinchHandler = tmodel ? SearchUtil.findFirstPinchHandler(tmodel) : null;
 
+    if (this.currentHandlers.scrollLeft !== scrollLeftHandler || this.currentHandlers.scrollTop !== scrollTopHandler) {
+        this.clearTouch();
+    }
+
     this.currentHandlers.touch = touchHandler;
     this.currentHandlers.scrollLeft = scrollLeftHandler;
     this.currentHandlers.scrollTop = scrollTopHandler; 
@@ -320,6 +323,34 @@ EventListener.prototype.resetEventsOnTimeout = function () {
 
 };
 
+EventListener.prototype.deltaX = function()  {
+    return this.currentTouch.deltaX;
+};
+
+EventListener.prototype.deltaY = function()  {
+    return this.currentTouch.deltaY;
+};
+
+EventListener.prototype.pinchDelta = function()  {
+    return this.currentTouch.pinchDelta;
+};
+
+EventListener.prototype.dir = function()  {
+    return this.currentTouch.dir;
+};
+
+EventListener.prototype.getScrollLeftHandler = function()  {
+    return this.currentHandlers.scrollLeft;
+};
+
+EventListener.prototype.getScrollTopHandler = function()  {
+    return this.currentHandlers.scrollTop;
+};
+
+EventListener.prototype.getPinchHandler = function()  {
+    return this.currentHandlers.pinch;
+};
+
 EventListener.prototype.getTouchHandler = function() {
     return this.currentHandlers.touch;
 };

package/src/LocationManager.js

@@ -1,7 +1,7 @@
 import { Bracket } from "./Bracket.js";
 import { TUtil } from "./TUtil.js";
 import { TargetUtil } from "./TargetUtil.js";
-import { tapp } from "./App.js";
+import { tapp, getEvents, getScreenWidth, getScreenHeight } from "./App.js";
 import { browser } from "./Browser.js";
 
 function LocationManager() {
@@ -10,6 +10,10 @@ function LocationManager() {
 
     this.bracketThreshold = 6;
     this.locationCount = [];
+    
+    this.screenWidth = getScreenWidth();
+    this.screenHeight = getScreenHeight();
+    this.resizeFlag = false;
 }
 
 LocationManager.prototype.calculateAll = function() {
@@ -17,7 +21,14 @@ LocationManager.prototype.calculateAll = function() {
     this.hasLocationMap = {};
     this.locationCount.length = 0;
     this.startTime = browser.now();
+    this.resizeFlag = false;
 
+    if (this.screenWidth !== getScreenWidth() || this.screenHeight !== getScreenHeight()) {
+        this.resizeFlag = true;
+        this.screenWidth = getScreenWidth();
+        this.screenHeight = getScreenHeight();
+    }
+    
     this.calculate();
 };
 
@@ -43,7 +54,7 @@ LocationManager.prototype.isProlificContainer = function(container)   {
 LocationManager.prototype.calculateContainer = function(container) {
     var allChildren = this.getChildren(container);
         
-    var viewport = container.createViewport();  
+    var viewport = container.createViewport();
     container.resetVisibleList();
                    
     var i = 0, length = allChildren.length;
@@ -62,6 +73,7 @@ LocationManager.prototype.calculateContainer = function(container) {
          
         viewport.setCurrentChild(child);  
         child.setLocation(viewport);
+        child.calculateAbsolutePosition(child.x, child.y);
         
         innerXEast = TUtil.isDefined(container.getValue('innerXEast')) ? container.getValue('innerXEast') : container.getInnerXEast();
         outerXEast = TUtil.isDefined(child.getValue('outerXEast')) ? child.getValue('outerXEast') : child.getOuterXEast();
@@ -72,27 +84,31 @@ LocationManager.prototype.calculateContainer = function(container) {
         } else {            
             child.setLocation(viewport);
         }
-                 
+        
         if (child.isIncluded() && !this.hasLocationMap[child.oid]) {    
             this.addToLocationList(child);          
         }
 
         if (!child.targetUpdatingMap.x) {
-            if (TUtil.isDefined(child.targets.x)) {
-                //tapp.targetManager.setTargetValue(child, 'x');
+            if (child.isTargetEnabled('x')) {
+                TargetUtil.assignValueArray(child, 'x');
+                tapp.targetManager.setJustActualValue(child, 'x');
             } else if (!TUtil.isDefined(child.targetValues.x)) {
                 child.setValue('x', child.x);                
             }
         }
 
         if (!child.targetUpdatingMap.y) {
-            if (TUtil.isDefined(child.targets.y)) {
-                //tapp.targetManager.setTargetValue(child, 'y');
+            if (child.isTargetEnabled('y')) {
+                TargetUtil.assignValueArray(child, 'y');
+                tapp.targetManager.setJustActualValue(child, 'y');
             } else if (!TUtil.isDefined(child.targetValues.y)) {
                 child.setValue('y', child.y);
             }            
         }
-
+        
+        child.calculateAbsolutePosition(child.getX(), child.getY());
+        
         viewport.isVisible(child);
                                
         child.addToParentVisibleList();
@@ -119,15 +135,15 @@ LocationManager.prototype.calculateContainer = function(container) {
                 }
             }
 
-            if (child.getHeight() !== childLastHeight && tapp.events.isScrollTopHandler(child.getParent())
-                        && tapp.events.currentTouch.dir === 'up') {
+            if (child.getHeight() !== childLastHeight && getEvents().isScrollTopHandler(child.getParent())
+                        && getEvents().dir() === 'up') {
                 this.calculateContainer(child); 
             } 
             
             if (TUtil.isNumber(child.getValue('appendNewLine'))) {
                 viewport.appendNewLine();
             } else {
-                viewport.nextLocation();
+                viewport.nextLocation();             
             }
         }
         
@@ -137,12 +153,23 @@ LocationManager.prototype.calculateContainer = function(container) {
     viewport.calcContentWidthHeight();
 };
 
-LocationManager.prototype.calculateTargets = function(tmodel) { 
+LocationManager.prototype.calculateTargets = function(tmodel) {
+    if (this.resizeFlag && Array.isArray(tmodel.getValue('onResize'))) {
+        tmodel.getValue('onResize').forEach(function(key) {
+            if (tmodel.targets[key] && typeof tmodel.targets[key] !== 'number' && tmodel.targetValues[key] && !tmodel.isTargetActive(key)) {
+                tmodel.activeTargetMap[key] = true;
+                tmodel.targetValues[key].status = '';
+            }            
+        });     
+    }
+
     tapp.targetManager.setTargetValues(tmodel, Object.keys(tmodel.activeTargetMap));        
     tapp.targetManager.setActualValues(tmodel);
-
-    if ((!TUtil.isDefined(tmodel.targetValues.width) || tmodel.getTargetValue('widthFromDom')) && tmodel.hasDom()) TargetUtil.setWidthFromDom(tmodel);
-    if ((!TUtil.isDefined(tmodel.targetValues.height) || tmodel.getTargetValue('heightFromDom')) && tmodel.hasDom()) TargetUtil.setHeightFromDom(tmodel);
+   
+    if (tmodel.hasDom()) {
+        if ((!TUtil.isDefined(tmodel.targetValues.width) && !TUtil.isDefined(tmodel.targets.width)) || tmodel.getTargetValue('widthFromDom')) TargetUtil.setWidthFromDom(tmodel);
+        if ((!TUtil.isDefined(tmodel.targetValues.height) && !TUtil.isDefined(tmodel.targets.height)) || tmodel.getTargetValue('heightFromDom')) TargetUtil.setHeightFromDom(tmodel);
+    }
 };
 
 LocationManager.prototype.addToLocationList = function(child)   {

package/src/SearchUtil.js

@@ -35,7 +35,7 @@ SearchUtil.findEventHandler = function(tmodel, eventName) {
     }
 };
 
-SearchUtil.findParentWithType = function(child, type) {
+SearchUtil.findParentByType = function(child, type) {
     var parent;
       
     function search() {
@@ -61,7 +61,7 @@ SearchUtil.findParentWithType = function(child, type) {
     return SearchUtil.foundParentWithType[indexKey];
 };
 
-SearchUtil.findParentWithTarget = function(child, targetName) {
+SearchUtil.findParentByTarget = function(child, targetName) {
     var parent;
       
     function search() {

package/src/TModel.js

@@ -16,12 +16,13 @@ function TModel(type, targets) {
     this.type = type ? type : 'blank';
     this.targets = Object.assign({}, targets);
     this.activeTargetMap = {};
-    this.resetActiveTargetMap();
+    this.styleTargets = [];
+    this.initTargets();
     
     var uniqueId = App.getOid(this.type);
     this.oid = uniqueId.oid;
     this.oidNum = uniqueId.num;
-
+    
     this.targetValues = {};
     
     this.actualValues = {
@@ -58,7 +59,8 @@ function TModel(type, targets) {
         canBeBracketed: true,      
         isDomDeletable: true,
         calculateChildren: undefined,
-        isVisible: undefined
+        isVisible: undefined,
+        onResize: undefined
     };
         
     this.targetUpdatingMap = {};
@@ -87,8 +89,6 @@ function TModel(type, targets) {
     this.y = 0;
     this.absX = 0;
     this.absY = 0;
-    this.deepY = 0;
-    this.deepX = 0;
     
     this.inFlowVisibles = [];
                
@@ -108,20 +108,26 @@ TModel.prototype.getDomParent = function() {
 };
 
 TModel.prototype.getDomHolder = function() {
-    return this.actualValues.domHolder ? this.actualValues.domHolder : this.getDomParent() ? this.getDomParent().$dom : SearchUtil.findParentWithTarget(this, 'domHolder') ? SearchUtil.findParentWithTarget(this, 'domHolder').$dom : null;
+    return this.actualValues.domHolder ? this.actualValues.domHolder : this.getDomParent() ? this.getDomParent().$dom : SearchUtil.findParentByTarget(this, 'domHolder') ? SearchUtil.findParentByTarget(this, 'domHolder').$dom : null;
 };
 
-TModel.prototype.resetActiveTargetMap = function() {
+TModel.prototype.addToStyleTargets = function(key) {
+    if (TargetUtil.styleTargetMap[key] && !this.styleTargets.includes(key)) {
+        this.styleTargets.push(key);
+    }
+};
+
+TModel.prototype.initTargets = function() {
     var self = this;
     this.targetValues = {};
     this.activeTargetMap = {};
     Object.keys(this.targets).forEach(function(key) {
         self.activeTargetMap[key] = true;
+        self.addToStyleTargets(key);
     });    
 };
 
 TModel.prototype.hasDomHolderChanged = function() {
-
     return this.getDomHolder() && this.getDomHolder().exists() && this.$dom.parent().getAttribute("id") !== this.getDomHolder().attr("id");
 };
 
@@ -211,7 +217,7 @@ TModel.prototype.findLastChild = function(type) {
 };
 
 TModel.prototype.getParentValue = function(targetName) {
-    var parent =  SearchUtil.findParentWithTarget(this, targetName);
+    var parent =  SearchUtil.findParentByTarget(this, targetName);
     return parent ? parent.getValue(targetName) : undefined;
 };
 
@@ -292,23 +298,16 @@ TModel.prototype.createViewport = function() {
 TModel.prototype.setLocation = function(viewport) {
     this.x = viewport.getXNext();
     this.y = viewport.getYNext();
+};
 
-    this.absX = this.getDomParent() ? this.getDomParent().absX + this.x : this.x;
-    this.absY = this.getDomParent() ? this.getDomParent().absY + this.y : this.y;
-     
-    var scrollTopHandler = SearchUtil.findFirstScrollTopHandler(this);
-    var scrollLeftHandler = SearchUtil.findFirstScrollLeftHandler(this);    
-
-    this.deepX = this.absX + (scrollTopHandler ? scrollTopHandler.getScrollTop() : 0);
-    this.deepY = this.absY + (scrollLeftHandler ? scrollLeftHandler.getScrollLeft() : 0);   
+TModel.prototype.calculateAbsolutePosition = function(x, y) {
+    var rect = this.getBoundingRect();
+    this.absX = rect.left + x;
+    this.absY = rect.top + y;
 };
 
-TModel.prototype.fixOpacity = function () {
-    var opacity = this.getOpacity() ? this.getOpacity().toFixed(2) : 0;
-    
-    if (this.$dom.opacity() !== opacity) {
-        this.$dom.opacity(opacity); 
-    }
+TModel.prototype.getBoundingRect = function() {              
+    return TUtil.getBoundingRect(this);
 };
 
 TModel.prototype.fixCss = function () {
@@ -323,7 +322,7 @@ TModel.prototype.fixStyle = function () {
     if (TUtil.isDefined(style) && this.domValues.style !== style) {
         this.$dom.setStyleByMap(style);
         this.domValues.style = style;
-    }  
+    }
 };
 
 TModel.prototype.fixXYRotateScale = function () {
@@ -349,12 +348,13 @@ TModel.prototype.fixDim = function () {
     }
 };
 
-TModel.prototype.fixZIndex = function () {
-
-    var zIndex = Math.floor(this.getZIndex());
-    if (this.$dom.zIndex() !== zIndex) {
-        this.$dom.zIndex(zIndex);
-    }
+TModel.prototype.fixStyleAttributes = function() {
+    var self = this;
+    this.styleTargets.forEach(function(key) {
+        if (TUtil.isDefined(self.getValue(key)) && self.$dom.style(key) !== self.getValue(key)) {
+            self.$dom.style(key, self.getValue(key));
+        }
+    });
 };
 
 TModel.prototype.isMarkedDeleted = function() {
@@ -773,13 +773,18 @@ TModel.prototype.removeUpdatingChild = function(child) {
 TModel.prototype.removeTarget = function(key) {
     delete this.targets[key];
     delete this.activeTargetMap[key];
-    delete this.targetValues[key]; 
+    delete this.targetValues[key];
+    var index = this.styleTargets.indexOf(key);
+    if (index !== -1) {
+        this.styleTargets.splice(index, 1);
+    }    
 };
 
 TModel.prototype.addTarget = function(key, target) {
     this.targets[key] = target;
     this.activeTargetMap[key] = true;
     delete this.targetValues[key];
+    this.addToStyleTargets(key);    
             
     tapp.manager.scheduleRun(10, 'addTarget-' + this.oid + "-" + key);
 };
@@ -787,8 +792,13 @@ TModel.prototype.addTarget = function(key, target) {
 TModel.prototype.addTargets = function(targets) {
     var self = this;
     Object.keys(targets).forEach(function(key) {
-        self.addTarget(key, targets[key]);
+        self.targets[key] = targets[key];
+        self.activeTargetMap[key] = true;
+        delete self.targetValues[key];
+        self.addToStyleTargets(key);
     });
+    
+    tapp.manager.scheduleRun(10, 'addTargets-' + this.oid);    
 };
 
 TModel.prototype.deleteTargetValue = function(key)   {
@@ -798,6 +808,17 @@ TModel.prototype.deleteTargetValue = function(key)   {
     tapp.manager.scheduleRun(10, 'deleteTargetValue-' + this.oid + "-" + key);    
 };
 
+TModel.prototype.deleteTargetValues = function(keys) {
+    var self = this;
+    keys.forEach(function(key) {
+        delete self.targetValues[key];
+        self.activeTargetMap[key] = true;
+    });
+    
+    tapp.manager.scheduleRun(10, 'deleteTargetValues-' + this.oid);    
+    
+};
+
 TModel.prototype.setTargetMethodName = function(targetName, methodName) {
     if (!this.targetMethodMap[targetName]) {
         this.targetMethodMap[targetName] = [];

package/src/TModelManager.js

@@ -366,11 +366,11 @@ TModelManager.prototype.run = function(oid, delay) {
                         var tmodel = tapp.manager.lists.visible[i];
                         if (tmodel.hasDom()) {
                             tmodel.fixXYRotateScale();
-                            tmodel.fixOpacity();
-                            tmodel.fixZIndex();
                             tmodel.fixCss();
                             tmodel.fixStyle();
                             tmodel.fixDim();
+                            tmodel.fixStyleAttributes();
+                            
                         }
 
                     }                    

package/src/TUtil.js

@@ -1,7 +1,38 @@
 import { $Dom } from "./$Dom.js";
+import { getScreenWidth, getScreenHeight } from "./App.js";
+import { SearchUtil } from "./SearchUtil.js";
 
 function TUtil() {}
 
+TUtil.getBoundingRect = function(tmodel) {
+    var left, top, right, bottom;
+    
+    if (tmodel.actualValues.domHolder && tmodel.actualValues.domHolder.exists()) {
+        var rect = tmodel.actualValues.domHolder.getBoundingClientRect();
+        left = rect.left;
+        top = rect.top;
+        right = rect.right;
+        bottom = rect.bottom;
+    } else {
+        var parent = tmodel.getDomParent() ? tmodel.getDomParent() : SearchUtil.findParentByTarget(tmodel, 'domHolder');
+
+        if (parent) {
+            left = parent.absX;
+            top = parent.absY;
+            right = left + parent.getWidth();
+            bottom = top + parent.getHeight();
+        } else {
+            left = 0;
+            top = 0;
+            right = getScreenWidth();
+            bottom = getScreenHeight();
+        }
+    }
+    
+    return { left: left, top: top, right: right, bottom: bottom };
+};
+
+
 TUtil.initDoms = function(visibleList) {
     
     var elements = $Dom.findByClass('tgt'); 

package/src/TargetUtil.js

@@ -4,6 +4,16 @@ import { TUtil } from "./TUtil.js";
 
 function TargetUtil() {}
 
+TargetUtil.styleTargetMap = {
+    'opacity': true,
+    'zIndex': true,
+    'fontSize': true,
+    'borderRadius': true,
+    'padding': true,
+    'background': true,
+    'color': true
+};
+
 TargetUtil.extractInvisibles = function(tmodel, target, key) {
     if (typeof target === 'object' && target) {
         Object.keys(target).forEach(function(k) {
@@ -34,6 +44,20 @@ TargetUtil.emptyValue = function() {
     };
 };
 
+TargetUtil.isValueStepsCycleArray = function(arr) {
+    if (arr.length > 4) {
+        return false;
+    }
+  
+    for (var i = 0; i < arr.length; i++) {
+        if (typeof arr[i] !== 'number') {
+            return false;
+        }
+    }
+    
+    return true;
+};
+
 TargetUtil.getValueStepsCycles = function(tmodel, key) {
     var _target = tmodel.targets[key];
     var valueOnly = _target && _target.valueOnly ? true : false;
@@ -43,7 +67,7 @@ TargetUtil.getValueStepsCycles = function(tmodel, key) {
     
     function getValue(target) {             
         if (Array.isArray(target)) {                      
-            if (valueOnly) {
+            if (valueOnly || !TargetUtil.isValueStepsCycleArray(target)) {
                 return [target, steps, stepInterval, cycles];
             } else {
                 if (typeof target[0] === 'function') {
@@ -64,7 +88,7 @@ TargetUtil.getValueStepsCycles = function(tmodel, key) {
             stepInterval = typeof target.stepInterval === 'function' ? target.stepInterval.call(tmodel, key, cycle, tmodel.getTargetStepInterval(key)) : TUtil.isDefined(target.stepInterval) ? target.stepInterval : 0;            
             cycles = typeof target.cycles === 'function' ? target.cycles.call(tmodel, key, cycle, tmodel.getTargetCycles(key)) : TUtil.isDefined(target.cycles) ? target.cycles : 0;
 
-            if (Array.isArray(value) && valueOnly === false) {
+            if (Array.isArray(value)) {
                 return getValue(value);
             } else {
                 return [value, steps, stepInterval, cycles];

package/src/Viewport.js

@@ -1,6 +1,7 @@
 import { browser } from "./Browser.js";
 import { TUtil } from "./TUtil.js";
 import { tapp } from "./App.js";
+import { getScreenWidth, getScreenHeight } from "./App.js";
 
 function Viewport(tmodel) {
     
@@ -90,51 +91,30 @@ Viewport.prototype.getYNext = function() {
     return this.yNext + this.currentChild.getTopMargin() + this.yOffset - this.tmodel.getScrollTop();
 };
 
-Viewport.prototype.isXVisible = function(child, x1, x2, minX, maxX) {
+Viewport.prototype.isXVisible = function(x1, x2, minX, maxX) {
     return x1 <= maxX && x2 >= minX;
 };
 
-Viewport.prototype.isYVisible = function(child, y1, y2, minY, maxY) {
+Viewport.prototype.isYVisible = function(y1, y2, minY, maxY) {
     return y1 <= maxY && y2 >= minY;
 };
 
 Viewport.prototype.isVisible = function(child) {
     
+    var x = child.absX;
+    var y = child.absY;
+      
     var parentScale = child.getDomParent() ? child.getDomParent().getMeasuringScale() : 1;
-
-    var minX = tapp.dim.screen.x;
-    var minY = tapp.dim.screen.y;
-    var maxX = tapp.dim.screen.width;
-    var maxY = tapp.dim.screen.height;
-         
-    var x = child.getX();
-    var y = child.getY();
-    
-    var domHolder = child.type === 'BI' ? child.getRealParent().getDomHolder() : child.getDomHolder();
-    var domParent = child.type === 'BI' ? child.getRealParent().getDomParent() : child.getDomParent();
-
-    if (domParent) { 
-        minX = domParent.isInFlow() ? domParent.absX : domParent.getX();
-        minY = domParent.isInFlow() ? domParent.absY : domParent.getY();       
-                
-        x = minX + child.getX();
-        y = minY + child.getY();
-        
-        maxX = Math.min(maxX, minX + domParent.getWidth());
-        maxY = Math.min(maxY, minY + domParent.getHeight());
-        minX = Math.max(0, minX);
-        minY = Math.max(0, minY);              
-    } 
-   
     var scale = parentScale * child.getMeasuringScale();
     var maxWidth = TUtil.isDefined(child.getWidth()) ? scale * child.getWidth() : 0;
     var maxHeight = TUtil.isDefined(child.getHeight()) ? scale * child.getHeight() : 0;
 
-    child.xVisible = this.isXVisible(child, x, x + maxWidth, minX, maxX);
-    child.yVisible = this.isYVisible(child, y, y + maxHeight, minY, maxY);
+    var rect = child.getBoundingRect();
+    child.xVisible = this.isXVisible(x, x + maxWidth, rect.left, rect.right);
+    child.yVisible = this.isYVisible(y, y + maxHeight, rect.top, rect.bottom);
         
-    //browser.log(child.oid === 'BI199')("oid: " + child.oid + " in " + this.tmodel.oid + " min-maxX:" + Math.round(minX) + "-" + Math.round(maxX) + " x:" + Math.round(x) + " w:" + Math.floor(maxWidth) +  " sc:" + scale +  " vx:" + child.xVisible);
-    //browser.log(child.oid === 'BI199')("oid: " + child.oid + " in " + this.tmodel.oid + " min-maxY:" + Math.round(minY) + "-" + Math.round(maxY) + " y:" + Math.round(y) + " h:" + Math.floor(maxHeight) + " sc:" + scale + " vy:" + child.yVisible);
+    //browser.log(child.oid === 'num')("oid: " + child.oid + " in " + this.tmodel.oid + " min-maxX:" + Math.round(rect.left) + "-" + Math.round(rect.right) + " x:" + Math.round(x) + " w:" + Math.floor(maxWidth) +  " sc:" + scale +  " vx:" + child.xVisible);
+    //browser.log(child.oid === 'docsPanel')("oid: " + child.oid + " in " + this.tmodel.oid + " min-maxY:" + Math.round(rect.top) + "-" + Math.round(rect.bottom) + " y:" + Math.round(y) + " h:" + Math.floor(maxHeight) + " sc:" + scale + " vy:" + child.yVisible);
 
     return child.isVisible();    
 };