Focus style improvements

- Replace js :focus-visible polyfill with css
- Improve fallback :focus styles

index.html

@@ -139,7 +139,7 @@
             --background-hover: #cccccc; /* Button :hover/selected */
             --background-active: #eeeeee; /* Button :active */
 
-            --outline-focus: #cccccc; /* Button :focus outline */
+            --outline-focus: #eeeeee; /* Button :focus outline */
 
             --border-radius: 1rem;
             --border-color: #333333; /* Control borders */

package.json

@@ -13,7 +13,6 @@
   "dependencies": {
     "@kyvg/vue3-notification": "2.3.0",
     "@soerenmartius/vue3-clipboard": "^0.1",
-    "focus-visible": "^5.2",
     "leaflet": "1.7.1",
     "normalize-scss": "^7.0",
     "vue": "^3.1",

src/components/Map.vue

@@ -351,8 +351,7 @@ export default defineComponent({
 		box-sizing: border-box;
 		position: relative;
 
-		@include focus {
-			&:before {
+		&:focus:before {
 			content: '';
 			position: absolute;
 			top: 0;
@@ -364,6 +363,11 @@ export default defineComponent({
 			z-index: 2000;
 			pointer-events: none;
 		}
+
+		@include focus-reset {
+			&:before {
+				content: none;
+			}
 		}
 	}
 </style>

src/main.ts

@@ -22,7 +22,6 @@ import 'leaflet/dist/leaflet.css';
 import 'normalize-scss/sass/normalize/_import-now.scss';
 import '@/scss/style.scss';
 
-import 'focus-visible';
 import {MutationTypes} from "@/store/mutation-types";
 import {showSplashError} from "@/util/splash";
 import { VueClipboard } from '@soerenmartius/vue3-clipboard';

src/scss/_leaflet.scss

@@ -10,8 +10,12 @@
 
 	/* Workaround for focus outlines until https://github.com/Leaflet/Leaflet/pull/7259 gets released */
 	* {
-		@include focus {
+		&:focus {
 			outline-style: auto !important;
 		}
+
+		@include focus-reset {
+			outline-style: none !important;
+		}
 	}
 }

src/scss/_mixins.scss

@@ -1,12 +1,6 @@
-/*
- Adds styles for both :focus-visible and .focus-visible for maximum browser support.
-*/
-@mixin focus() {
-	&:focus-visible {
-		@content;
-	}
-
-	&.focus-visible {
+/* Mixin for resetting :focus styles on browsers supporting :focus-visible */
+@mixin focus-reset() {
+	&:focus:not(:focus-visible) {
 		@content;
 	}
 }
@@ -67,12 +61,7 @@
 	color: var(--text-disabled);
 	cursor: not-allowed;
 
-	&:hover, &:active {
-		background-color: var(--background-disabled);
-		color: var(--text-disabled);
-	}
-
-	@include focus {
+	&:hover, &:active, &:focus {
 		background-color: var(--background-disabled);
 		color: var(--text-disabled);
 	}

src/scss/_placeholders.scss

@@ -23,10 +23,15 @@
 		@include button-hovered;
 	}
 
-	@include focus {
+	&:focus {
 		@include button-focused;
 	}
 
+	&:focus:not(:focus-visible) {
+		outline-style: none;
+		z-index: auto;
+	}
+
 	&:active {
 		@include button-active;
 	}

src/scss/leaflet/_controls.scss

@@ -338,11 +338,7 @@
 	animation: fade 0.3s linear;
 	animation-fill-mode: forwards;
 
-	&:hover, &:active {
-		background-color: var(--background-base);
-	}
-
-	@include focus {
+	&:hover, &:active, &:focus {
 		background-color: var(--background-base);
 	}
 

src/scss/leaflet/_markers.scss

@@ -58,15 +58,11 @@
 		overflow: hidden;
 
 		@at-root .leaflet-pane--show-labels .marker__label {
-			display: block;
+			display: block !important;
 		}
 	}
 
-	&:hover {
-		z-index: 1000;
-	}
-
-	@include focus {
+	&:hover, &:focus {
 		z-index: 1000;
 
 		.marker__label {
@@ -75,8 +71,16 @@
 		}
 	}
 
-	&:hover .marker__label {
-		display: block;
+	&:focus .marker__label {
+		outline: auto;
+	}
+
+	@include focus-reset {
+		z-index: auto;
+
+		.marker__label {
+			display: none;
+		}
 	}
 
 	@at-root {

src/scss/style.scss

@@ -73,11 +73,15 @@ input {
 	border: 0.2rem solid var(--border-color);
 	border-radius: 0.3rem;
 
-	@include focus {
+	&:focus {
 		color: var(--text-emphasis);
 		outline-color: var(--text-emphasis);
 	}
 
+	@include focus-reset {
+		color: var(--text-base);
+	}
+
 	&[disabled] {
 		background-color: var(--background-disabled);
 		border-color: var(--border-color);
@@ -85,8 +89,16 @@ input {
 	}
 }
 
-.js-focus-visible :focus:not(.focus-visible):not(:focus-visible) {
-  outline: none;
+:focus:not(:focus-visible) {
+	outline: none !important;
+}
+
+:focus {
+	outline: var(--outline-focus) auto thick !important;
+}
+
+:focus-visible {
+	outline: var(--outline-focus) auto thick !important;
 }
 
 .checkbox {
@@ -131,10 +143,9 @@ input {
 			}
 		}
 
-		@include focus {
-			& ~ span:after {
+		&:focus ~ span:after {
 			content: '';
-				outline: var(--outline-focus) 2px solid;
+			outline: var(--outline-focus) auto thick;
 			position: absolute;
 			top: 0;
 			right: -0.5rem;
@@ -142,6 +153,11 @@ input {
 			left: -0.5rem;
 			border-radius: 0.5rem;
 		}
+
+		@include focus-reset {
+			& ~ span:after {
+				content: none;
+			}
 		}
 	}
 
@@ -206,6 +222,11 @@ input {
 			@include button-focused;
 		}
 
+		&:focus:not(:focus-visible) + label {
+			z-index: auto;
+			outline: none !important;
+		}
+
 		&:active + label {
 			@include button-active;
 		}