improve size/position-ing

googlearchive · Apr 9, 2014 · 1522805 · 1522805
1 parent 3b08d4c
commit 1522805
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 38 deletions.
diff --git a/core-overlay.html b/core-overlay.html
@@ -211,27 +211,43 @@
           });
           this.enableElementListener(this.opened, window, 'resize',
               'resizeHandler');
-          this.target.classList.add('core-revealed');
-          // TODO(sorvell): force SD Polyfill to render
-          if (window.ShadowDOMPolyfill) {
-            this.target.offsetHeight;
+          //this.target.classList.add('core-revealed');
+          if (this.opened) {
+            // TODO(sorvell): force SD Polyfill to render
+            if (window.ShadowDOMPolyfill) {
+              this.target.offsetHeight;
+            }
+            if (!this._shouldPosition) {
+              this.target.style.position = 'static';
+              var computed = getComputedStyle(this.target);
+              var t = (computed.top === 'auto' && computed.bottom === 'auto');
+              var l = (computed.left === 'auto' && computed.right === 'auto');
+              this.target.style.position = '';
+              this._shouldPosition = {top: t, left: l};
+            }
+            // if we are showing, then take care when measuring
+            this.prepareMeasure(this.target);
+            this.updateTargetDimensions();
+            this.finishMeasure(this.target);
           }
-          this.updateTargetDimensions();
         },
 
         // tasks which cause the overlay to actually open; typically play an
         // animation
         // TODO(sorvell): normalize event names: transitionend, animationend
         renderOpened: function() {
-          this.target.classList.toggle('core-opened', this.opened);
-          this.target.classList.toggle('core-closed', !this.opened);
-          var completeMethod = 'completeRenderOpened';
-          if (this.completionEventName) {
-            this.addElementListener(this.target, this.completionEventName, 
-                completeMethod);
-          } else {
-            this.async(completeMethod);
-          }
+          this.target.classList.add('core-revealed');
+          this.async(function() {
+            this.target.classList.toggle('core-opened', this.opened);
+            this.target.classList.toggle('core-closed', !this.opened);
+            var completeMethod = 'completeRenderOpened';
+            if (this.completionEventName) {
+              this.addElementListener(this.target, this.completionEventName, 
+                  completeMethod);
+            } else {
+              this.async(completeMethod);
+            }
+          });
         },
 
         // finishing tasks; typically called via an animation end event
@@ -248,6 +264,18 @@
           this.applyFocus();
         },
 
+        prepareMeasure: function(target) {
+          target.style.display = 'block';
+          target.transition = target.webkitTransition = 'none';
+          target.transform = target.webkitTransform = 'none';
+        },
+
+        finishMeasure: function(target) {
+          target.style.display = null;
+          target.transform = target.webkitTransform = null;
+          target.transition = target.webkitTransition = null;
+        },
+
         getFocusNode: function() {
           return this.target.querySelector('[autofocus]') || this.target;
         },
@@ -265,25 +293,10 @@
         },
 
         updateTargetDimensions: function() {
-          if (this.opened) {
-            if (!this._shouldPosition) {
-              this.target.style.position = 'static';
-              var computed = getComputedStyle(this.target);
-              var t = (computed.top === 'auto' && computed.bottom === 'auto');
-              var l = (computed.left === 'auto' && computed.right === 'auto');
-              this.target.style.position = '';
-              this._shouldPosition = {top: t, left: l};
-            }
-
-            // TODO(sorvell): need to work out interaction between sizing 
-            // and positioning
-            this.sizeTarget();
-            this.positionTarget();
-          }
+          this.positionTarget();
+          this.sizeTarget();
         },
 
-        // TODO(sorvell): getBoundingClientRect may give dubious info due to
-        // transform.
         sizeTarget: function() {
           var sizer = this.sizingTarget || this.target;
           var rect = sizer.getBoundingClientRect();
@@ -299,12 +312,12 @@
           // vertically and horizontally center if not positioned
           if (this._shouldPosition.top) {
             var t = Math.max((window.innerHeight - 
-                this.target.offsetHeight) / 2, 0);
+                this.target.offsetHeight - this.margin*2) / 2, this.margin);
             this.target.style.top = t + 'px';
           }
           if (this._shouldPosition.left) {
             var l = Math.max((window.innerWidth - 
-                this.target.offsetWidth) / 2, 0);
+                this.target.offsetWidth - this.margin*2) / 2, this.margin);
             this.target.style.left = l + 'px';
           }
         },

diff --git a/demo.html b/demo.html
@@ -21,14 +21,12 @@
 
 			#dialog {
 				/*top: 72px;
-				left: 10px;
-				margin-left: -256px;*/
-				width: 512px;
-
+				left: 10px;*/
+				width: 500px;
 			}
 
 			#dialog.core-revealed {
-				transition: all 0.3s ease-in;
+				transition: -webkit-transform 0.2s ease-in, opacity 0.2s ease-in;
 				-webkit-transform: scale(0.1) translateY(-500px);
 			}