Fix issue #97

PolymerElements · Mar 15, 2016 · 9054937 · 9054937
1 parent 73a2092
commit 9054937
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 6 deletions.
diff --git a/app-header-layout/app-header-layout.html b/app-header-layout/app-header-layout.html
@@ -179,9 +179,11 @@
 
       _updateFixedNodesPosition: function() {
         var rect = this.getBoundingClientRect();
+        var rightOffset = document.documentElement.clientWidth - rect.right;
+
         this._getFixedNodes().forEach(function(node) {
           node.style.left = this.hasScrollingRegion ? '' : rect.left + 'px';
-          node.style.width = this.hasScrollingRegion ? '' : rect.width + 'px';
+          node.style.right = this.hasScrollingRegion ? '' : rightOffset + 'px';
         }.bind(this));
       },
 

diff --git a/app-header-layout/test/app-header-layout.html b/app-header-layout/test/app-header-layout.html
@@ -29,10 +29,6 @@
     }
 
     app-header {
-      position: fixed;
-      top: 0;
-      left: 0;
-      width: 100%;
       background: green;
     }
 
@@ -78,7 +74,28 @@
 
       test('scrolling region', function() {
         headerLayout.hasScrollingRegion = true;
-        assert.isTrue(header.scroller !== window, 'scroller should not point to the document element');        
+        assert.isTrue(header.scroller !== window, 'scroller should not point to the document element');
+      });
+
+      test('header box size', function(done) {
+        headerLayout.hasScrollingRegion = false;
+
+        flush(function() {
+          assert.equal(headerLayout.offsetWidth, header.offsetWidth,
+              'should have the same width of app-header-layout');
+
+          headerLayout.style.width = '200px';
+
+          headerLayout.resetLayout();
+
+          flush(function() {
+            assert.equal(headerLayout.offsetWidth, header.offsetWidth,
+              'should have the same width of app-header-layout even after setting a width');
+            done();
+          });
+
+        });
+
       });
 
     });

diff --git a/demo/demo7.html b/demo/demo7.html
@@ -0,0 +1,76 @@
+<!--
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
+
+  <title>demo7</title>
+
+  <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
+
+  <link rel="import" href="../../font-roboto/roboto.html">
+  <link rel="import" href="../../iron-icons/iron-icons.html">
+  <link rel="import" href="../../paper-icon-button/paper-icon-button.html">
+  <link rel="import" href="../app-drawer-layout/app-drawer-layout.html">
+  <link rel="import" href="../app-drawer/app-drawer.html">
+  <link rel="import" href="../app-scroll-effects/app-scroll-effects.html">
+  <link rel="import" href="../app-header/app-header.html">
+  <link rel="import" href="../app-header-layout/app-header-layout.html">
+  <link rel="import" href="../app-toolbar/app-toolbar.html">
+  <link rel="import" href="../demo/sample-content.html">
+
+  <style is="custom-style">
+
+    body {
+      margin: 0;
+      font-family: 'Roboto', 'Noto', sans-serif;
+      background-color: #eee;
+    }
+
+    app-header {
+      background-color: #4285f4;
+      color: #fff;
+    }
+
+    app-header paper-icon-button {
+      --paper-icon-button-ink-color: white;
+    }
+
+  </style>
+
+</head>
+<body unresolved>
+
+  <app-drawer-layout>
+
+    <app-header-layout>
+
+      <app-header fixed effects="waterfall">
+        <app-toolbar>
+          <div spacer title>My Drive</div>
+          <paper-icon-button icon="menu" drawer-toggle></paper-icon-button>
+        </app-toolbar>
+      </app-header>
+
+      <sample-content size="100"></sample-content>
+
+    </app-header-layout>
+
+    <app-drawer align="end">
+      <app-toolbar>App name</app-toolbar>
+    </app-drawer>
+
+  </app-drawer-layout>
+
+</body>
+</html>