fix: remove unneeded focus management

dnbexperience · Feb 2, 2019 · 37cd58d · 37cd58d
1 parent 23a832d
commit 37cd58d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 30 deletions.
diff --git a/packages/dnb-ui-lib/src/components/button/__tests__/__snapshots__/Button.test.js.snap b/packages/dnb-ui-lib/src/components/button/__tests__/__snapshots__/Button.test.js.snap
@@ -733,10 +733,8 @@ exports[`Button scss have to match snapshot 1`] = `
       html[data-whatinput='keyboard'] .dnb-button--reset:not([disabled]):focus, html[data-whatinput='keyboard'] .dnb-button--reset:not([disabled]):active {
         box-shadow: 0 0 0 2px var(--color-emerald-green);
         border-color: transparent; }
-    html[data-whatinput='mouse']
-.dnb-button--reset:not([disabled]):focus:not(.dnb-no-mouse-focus),
-    html[data-whatinput='mouse']
-.dnb-button--reset:not([disabled]):active:not(.dnb-no-mouse-focus) {
+    html[data-whatinput='mouse'] .dnb-button--reset:not([disabled]):focus,
+    html[data-whatinput='mouse'] .dnb-button--reset:not([disabled]):active {
       box-shadow: none;
       color: inherit;
       border: none; }

diff --git a/packages/dnb-ui-lib/src/components/button/style/_button.scss b/packages/dnb-ui-lib/src/components/button/style/_button.scss
@@ -181,10 +181,8 @@
       @include fakeFocus();
     }
 
-    html[data-whatinput='mouse']
-      &:not([disabled]):focus:not(.dnb-no-mouse-focus),
-    html[data-whatinput='mouse']
-      &:not([disabled]):active:not(.dnb-no-mouse-focus) {
+    html[data-whatinput='mouse'] &:not([disabled]):focus,
+    html[data-whatinput='mouse'] &:not([disabled]):active {
       box-shadow: none;
       color: inherit;
       border: none;

diff --git a/packages/dnb-ui-lib/src/components/dropdown/__tests__/__snapshots__/Dropdown.test.js.snap b/packages/dnb-ui-lib/src/components/dropdown/__tests__/__snapshots__/Dropdown.test.js.snap
@@ -506,10 +506,8 @@ exports[`Dropdown scss have to match snapshot 1`] = `
       html[data-whatinput='keyboard'] .dnb-button--reset:not([disabled]):focus, html[data-whatinput='keyboard'] .dnb-button--reset:not([disabled]):active {
         box-shadow: 0 0 0 2px var(--color-emerald-green);
         border-color: transparent; }
-    html[data-whatinput='mouse']
-.dnb-button--reset:not([disabled]):focus:not(.dnb-no-mouse-focus),
-    html[data-whatinput='mouse']
-.dnb-button--reset:not([disabled]):active:not(.dnb-no-mouse-focus) {
+    html[data-whatinput='mouse'] .dnb-button--reset:not([disabled]):focus,
+    html[data-whatinput='mouse'] .dnb-button--reset:not([disabled]):active {
       box-shadow: none;
       color: inherit;
       border: none; }

diff --git a/...s/dnb-ui-lib/src/components/input-masked/__tests__/__snapshots__/InputMasked.test.js.snap b/...s/dnb-ui-lib/src/components/input-masked/__tests__/__snapshots__/InputMasked.test.js.snap
@@ -362,10 +362,8 @@ exports[`InputMasked scss have to match snapshot 1`] = `
       html[data-whatinput='keyboard'] .dnb-button--reset:not([disabled]):focus, html[data-whatinput='keyboard'] .dnb-button--reset:not([disabled]):active {
         box-shadow: 0 0 0 2px var(--color-emerald-green);
         border-color: transparent; }
-    html[data-whatinput='mouse']
-.dnb-button--reset:not([disabled]):focus:not(.dnb-no-mouse-focus),
-    html[data-whatinput='mouse']
-.dnb-button--reset:not([disabled]):active:not(.dnb-no-mouse-focus) {
+    html[data-whatinput='mouse'] .dnb-button--reset:not([disabled]):focus,
+    html[data-whatinput='mouse'] .dnb-button--reset:not([disabled]):active {
       box-shadow: none;
       color: inherit;
       border: none; }

diff --git a/packages/dnb-ui-lib/src/components/input/__tests__/__snapshots__/Input.test.js.snap b/packages/dnb-ui-lib/src/components/input/__tests__/__snapshots__/Input.test.js.snap
@@ -547,10 +547,8 @@ exports[`Input scss have to match snapshot 1`] = `
       html[data-whatinput='keyboard'] .dnb-button--reset:not([disabled]):focus, html[data-whatinput='keyboard'] .dnb-button--reset:not([disabled]):active {
         box-shadow: 0 0 0 2px var(--color-emerald-green);
         border-color: transparent; }
-    html[data-whatinput='mouse']
-.dnb-button--reset:not([disabled]):focus:not(.dnb-no-mouse-focus),
-    html[data-whatinput='mouse']
-.dnb-button--reset:not([disabled]):active:not(.dnb-no-mouse-focus) {
+    html[data-whatinput='mouse'] .dnb-button--reset:not([disabled]):focus,
+    html[data-whatinput='mouse'] .dnb-button--reset:not([disabled]):active {
       box-shadow: none;
       color: inherit;
       border: none; }

diff --git a/packages/dnb-ui-lib/src/components/modal/__tests__/__snapshots__/Modal.test.js.snap b/packages/dnb-ui-lib/src/components/modal/__tests__/__snapshots__/Modal.test.js.snap
@@ -733,10 +733,8 @@ exports[`Modal scss have to match snapshot 1`] = `
       html[data-whatinput='keyboard'] .dnb-button--reset:not([disabled]):focus, html[data-whatinput='keyboard'] .dnb-button--reset:not([disabled]):active {
         box-shadow: 0 0 0 2px var(--color-emerald-green);
         border-color: transparent; }
-    html[data-whatinput='mouse']
-.dnb-button--reset:not([disabled]):focus:not(.dnb-no-mouse-focus),
-    html[data-whatinput='mouse']
-.dnb-button--reset:not([disabled]):active:not(.dnb-no-mouse-focus) {
+    html[data-whatinput='mouse'] .dnb-button--reset:not([disabled]):focus,
+    html[data-whatinput='mouse'] .dnb-button--reset:not([disabled]):active {
       box-shadow: none;
       color: inherit;
       border: none; }

diff --git a/packages/dnb-ui-lib/src/style/core/dnb-core.scss b/packages/dnb-ui-lib/src/style/core/dnb-core.scss
@@ -19,12 +19,6 @@ body {
 }
 
 // Focus management
-html[data-whatinput='mouse'] .dnb-spacing *:focus {
-  outline: none;
-}
-html[data-whatinput='keyboard'] .dnb-spacing *:not(a):not(div):focus {
-  @include fakeFocus();
-}
 .dnb-no-focus {
   outline: none;
 }