From 68a411838d0415255dec4a5550919a954b05a410 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Tue, 15 Feb 2022 16:24:54 +0100
Subject: [PATCH] This adds back mobile click accessibility (#11693)

---
 src/entrypoints/app.ts                                   | 6 +++++-
 src/entrypoints/authorize.ts                             | 3 +++
 src/entrypoints/custom-panel.ts                          | 6 +++++-
 src/entrypoints/onboarding.ts                            | 3 +++
 .../integration-panels/zwave/ha-config-zwave.js          | 9 +++++++++
 5 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/entrypoints/app.ts b/src/entrypoints/app.ts
index d4d1852c20..e93a38769e 100644
--- a/src/entrypoints/app.ts
+++ b/src/entrypoints/app.ts
@@ -1,7 +1,11 @@
-import { setPassiveTouchGestures } from "@polymer/polymer/lib/utils/settings";
+import {
+  setPassiveTouchGestures,
+  setCancelSyntheticClickEvents,
+} from "@polymer/polymer/lib/utils/settings";
 import "../layouts/home-assistant";
 import "../resources/ha-style";
 import "../resources/roboto";
 import "../util/legacy-support";
 
 setPassiveTouchGestures(true);
+setCancelSyntheticClickEvents(false);
diff --git a/src/entrypoints/authorize.ts b/src/entrypoints/authorize.ts
index fef05a7219..0bbfdf65eb 100644
--- a/src/entrypoints/authorize.ts
+++ b/src/entrypoints/authorize.ts
@@ -1,7 +1,10 @@
 // Compat needs to be first import
 import "../resources/compatibility";
+import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
 import "../auth/ha-authorize";
 import "../resources/ha-style";
 import "../resources/roboto";
 import "../resources/safari-14-attachshadow-patch";
 import "../resources/array.flat.polyfill";
+
+setCancelSyntheticClickEvents(false);
diff --git a/src/entrypoints/custom-panel.ts b/src/entrypoints/custom-panel.ts
index e2da175ea8..4a40fcab04 100644
--- a/src/entrypoints/custom-panel.ts
+++ b/src/entrypoints/custom-panel.ts
@@ -1,5 +1,6 @@
 // Compat needs to be first import
 import "../resources/compatibility";
+import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
 import "../resources/safari-14-attachshadow-patch";
 
 import { PolymerElement } from "@polymer/polymer";
@@ -15,6 +16,8 @@ import { createCustomPanelElement } from "../util/custom-panel/create-custom-pan
 import { loadCustomPanel } from "../util/custom-panel/load-custom-panel";
 import { setCustomPanelProperties } from "../util/custom-panel/set-custom-panel-properties";
 
+setCancelSyntheticClickEvents(false);
+
 declare global {
   interface Window {
     loadES5Adapter: () => Promise<unknown>;
@@ -47,7 +50,8 @@ function initialize(
 ) {
   const style = document.createElement("style");
 
-  style.innerHTML = `body { margin:0; } 
+  style.innerHTML = `
+  body { margin:0; }
   @media (prefers-color-scheme: dark) {
     body {
       background-color: #111111;
diff --git a/src/entrypoints/onboarding.ts b/src/entrypoints/onboarding.ts
index 44a67890ab..78696169ca 100644
--- a/src/entrypoints/onboarding.ts
+++ b/src/entrypoints/onboarding.ts
@@ -1,11 +1,14 @@
 // Compat needs to be first import
 import "../resources/compatibility";
+import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
 import "../onboarding/ha-onboarding";
 import "../resources/ha-style";
 import "../resources/roboto";
 import "../resources/safari-14-attachshadow-patch";
 import "../resources/array.flat.polyfill";
 
+setCancelSyntheticClickEvents(false);
+
 declare global {
   interface Window {
     stepsPromise: Promise<Response>;
diff --git a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
index 865d808f66..58caa941af 100644
--- a/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
+++ b/src/panels/config/integrations/integration-panels/zwave/ha-config-zwave.js
@@ -4,6 +4,7 @@ import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
 import "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-listbox/paper-listbox";
+import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
 import { html } from "@polymer/polymer/lib/utils/html-tag";
 /* eslint-plugin-disable lit */
 import { PolymerElement } from "@polymer/polymer/polymer-element";
@@ -519,6 +520,14 @@ class HaConfigZwave extends LocalizeMixin(EventsMixin(PolymerElement)) {
     );
   }
 
+  attached() {
+    setCancelSyntheticClickEvents(true);
+  }
+
+  detached() {
+    setCancelSyntheticClickEvents(false);
+  }
+
   serviceCalled(ev) {
     if (ev.detail.success && ev.detail.service === "set_poll_intensity") {
       this._saveEntity();