From 8c79954f2dc5f6536046ad517c2c55c5bf0265c7 Mon Sep 17 00:00:00 2001
From: Shan Carter <shanjcarter@gmail.com>
Date: Thu, 12 Oct 2017 10:07:09 -0700
Subject: [PATCH] No focus ring on mouse events, but keep for keyboard

---
 examples/article.html |  2 ++
 src/ui/d-slider.js    | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/examples/article.html b/examples/article.html
index 45b8ccc..81e91e8 100644
--- a/examples/article.html
+++ b/examples/article.html
@@ -43,6 +43,8 @@
 <d-abstract>
   <figure style="grid-column: page; margin: 1rem 0;"><img src="momentum.png" style="width:100%; border: 1px solid rgba(0, 0, 0, 0.2);"/></figure>
   <d-slider style="grid-column: page;"></d-slider>
+  <d-slider style="width: 100px;"></d-slider>
+  <input type="range" />
   <script>
     document.querySelector("d-slider").addEventListener("input", e => { console.log("input", e.target.value); });
     document.querySelector("d-slider").addEventListener("change", e => { console.log("change", e.target.value); });
diff --git a/src/ui/d-slider.js b/src/ui/d-slider.js
index be8c0c0..1f5ec24 100644
--- a/src/ui/d-slider.js
+++ b/src/ui/d-slider.js
@@ -17,6 +17,7 @@ const T = Template('d-slider', `
   .background {
     padding-top: 6px;
     color: white;
+    position: relative;
   }
 
   .track {
@@ -68,7 +69,7 @@ const T = Template('d-slider', `
     transition-timing-function: ease;
   }
 
-  :host(:focus) .knob-highlight {
+  .focus .knob-highlight {
     transform: scale(2);
   }
 
@@ -131,18 +132,20 @@ export class Slider extends T(HTMLElement) {
     if (!this.hasAttribute("tabindex")) {
       this.setAttribute("tabindex", 0);
     }
+    this.mouseEvent = false;
     this.knob = this.root.querySelector(".knob-container");
     this.background = this.root.querySelector(".background");
     this.trackFill = this.root.querySelector(".track-fill");
     this.track = this.root.querySelector(".track");
     this.min = this.hasAttribute("min") ? this.getAttribute("min") : 0;
-    this.max = this.hasAttribute("max") ? this.getAttribute("max") : 1;
+    this.max = this.hasAttribute("max") ? this.getAttribute("max") : 100;
     this.value = this.hasAttribute("value") ? this.getAttribute("value") : 0;
-    this.step = this.hasAttribute("step") ? this.getAttribute("step") : 0.1;
+    this.step = this.hasAttribute("step") ? this.getAttribute("step") : 1;
     this.scale = scaleLinear().domain([this.min, this.max]).range([0, 1]).clamp(true);
     this.drag = drag()
       .container(this.track)
       .on("start", () => {
+        this.mouseEvent = true;
         this.background.classList.add("mousedown");
         this.dragUpdate();
       })
@@ -150,10 +153,19 @@ export class Slider extends T(HTMLElement) {
         this.dragUpdate();
       })
       .on("end", () => {
+        this.mouseEvent = false;
         this.background.classList.remove("mousedown");
       });
     this.drag(select(this.background));
     this.renderTicks(5);
+    this.addEventListener("focusin", (e) => {
+      if(!this.mouseEvent) {
+        this.background.classList.add("focus");
+      }
+    });
+    this.addEventListener("focusout", (e) => {
+      this.background.classList.remove("focus");
+    });
     this.addEventListener("keydown", (e) => {
       console.log("keydown", e);
       let stopPropagation = false;
@@ -189,6 +201,7 @@ export class Slider extends T(HTMLElement) {
           break;
       }
       if (stopPropagation) {
+        this.background.classList.add("focus");
         e.preventDefault();
         e.stopPropagation();
       }