Merge branch 'master' of https://github.com/markjameshoward/scrolltotop

MarkJamesHoward · Aug 28, 2019 · ca97a7c · ca97a7c
2 parents 44d0343 + 93ef68e
commit ca97a7c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 29 deletions.
diff --git a/cypress/integration/home_page_spec.js b/cypress/integration/home_page_spec.js
@@ -1,7 +1,11 @@
 describe("The Home Page", function() {
   it("successfully loads", function() {
-    cy.visit("/").scrollTo('bottom');
-    cy.pause();
-    cy.get('#ScrollToTopWC').click();
+    cy.visit("/").scrollTo("bottom", { duration: 1000 });
+
+    cy.contains("top").click();
+
+    cy.window().then($window => {
+      expect($window.scrollY).to.be.closeTo(0, 30);
+    });
   });
 });
diff --git a/demo/index.html b/demo/index.html
@@ -41,22 +41,20 @@
         margin: 1rem;
       }
 
-      body,
-      html {
-        scroll-behavior: smooth;
-      }
+
     </style>
     <script src="../src/index.ts"></script>
   </head>
 
   <body>
     <div class="vertical-section-container centered">
-      <h3>Basic scroll-to-top demo</h3>
+      <h3 id="MainHeading">Basic scroll-to-top demo</h3>
       <div class="container1"></div>
       <div class="container2"></div>
       <div class="container3"></div>
       <div class="container4"></div>
-      <scroll-to-top-wc id="ScrollToTopWC" activateWhen="500"></scroll-to-top-wc>
+      <scroll-to-top-wc id="ScrollToTopWC"  activateWhen="500"></scroll-to-top-wc>
     </div>
   </body>
+
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,16 +1,19 @@
 {
   "name": "scroll-to-top-wc",
-  "version": "0.3.6",
+  "version": "0.3.9",
   "description": "scroll page up",
   "main": "src/index.ts",
+  "license": "MIT",
   "browserslist": [
     "Chrome > 70  "
   ],
-  "scripts": {},
+  "scripts": {
+    "version": "npx @pika/pack"
+  },
   "@pika/pack": {
     "pipeline": [
       [
-        "@pika/plugin-tsp-standard-pkg"
+        "@pika/plugin-ts-standard-pkg"
       ],
       [
         "@pika/plugin-build-web"
@@ -24,6 +27,18 @@
   "dependencies": {
     "lit-element": "^2.2.1"
   },
+  "keywords": [
+    "scroll",
+    "top",
+    "scrolltop",
+    "scroll to top",
+    "scroll top",
+    "scroll up",
+    "move to top",
+    "move top",
+    "scrollTo",
+    "smooth scroll"
+  ],
   "devDependencies": {
     "@pika/cli": "^0.2.0",
     "@pika/pack": "^0.5.0",

diff --git a/polymer.json b/polymer.json
diff --git a/src/index.ts b/src/index.ts
@@ -89,7 +89,6 @@ export class ScrollToTop extends LitElement {
   //When the user clicks on the button, scroll to the top of the document
   topFunction() {
     console.log("called top function");
-    document.body.scrollTop = 0; // For Chrome, Safari and Opera
-    document.documentElement.scrollTop = 0; // For IE and Firefox
+    window.scrollTo({ top: 0, behavior: "smooth" });
   }
 }