From 71993fd8b72b83fb2deaf6b4db7f8737756926c0 Mon Sep 17 00:00:00 2001
From: Alexei Anoshenko <anoshenko@gmail.com>
Date: Fri, 15 Apr 2022 15:41:44 +0300
Subject: [PATCH] Bug fixing

---
 app_scripts.js | 4 ++++
 colorPicker.go | 3 +++
 datePicker.go  | 3 +++
 filePicker.go  | 3 +++
 timePicker.go  | 3 +++
 5 files changed, 16 insertions(+)

diff --git a/app_scripts.js b/app_scripts.js
index a75afd3..e57d7d0 100644
--- a/app_scripts.js
+++ b/app_scripts.js
@@ -1768,4 +1768,8 @@ function tableRowClickEvent(element, event) {
 	}
 
 	sendMessage("rowClick{session=" + sessionID + ",id=" + tableID + ",row=" + row + "}");
+}
+
+function stopEventPropagation(element, event) {
+	event.stopPropagation()
 }
\ No newline at end of file
diff --git a/colorPicker.go b/colorPicker.go
index 93c17f7..7c2ee2b 100644
--- a/colorPicker.go
+++ b/colorPicker.go
@@ -188,6 +188,9 @@ func (picker *colorPickerData) htmlProperties(self View, buffer *strings.Builder
 	buffer.WriteByte('"')
 
 	buffer.WriteString(` oninput="editViewInputEvent(this)"`)
+	if picker.getRaw(ClickEvent) == nil {
+		buffer.WriteString(` onclick="stopEventPropagation(this, event)"`)
+	}
 }
 
 func (picker *colorPickerData) htmlDisabledProperties(self View, buffer *strings.Builder) {
diff --git a/datePicker.go b/datePicker.go
index f2e379f..5e70cab 100644
--- a/datePicker.go
+++ b/datePicker.go
@@ -302,6 +302,9 @@ func (picker *datePickerData) htmlProperties(self View, buffer *strings.Builder)
 	buffer.WriteByte('"')
 
 	buffer.WriteString(` oninput="editViewInputEvent(this)"`)
+	if picker.getRaw(ClickEvent) == nil {
+		buffer.WriteString(` onclick="stopEventPropagation(this, event)"`)
+	}
 }
 
 func (picker *datePickerData) htmlDisabledProperties(self View, buffer *strings.Builder) {
diff --git a/filePicker.go b/filePicker.go
index 8864d3b..0086a42 100644
--- a/filePicker.go
+++ b/filePicker.go
@@ -292,6 +292,9 @@ func (picker *filePickerData) htmlProperties(self View, buffer *strings.Builder)
 	}
 
 	buffer.WriteString(` oninput="fileSelectedEvent(this)"`)
+	if picker.getRaw(ClickEvent) == nil {
+		buffer.WriteString(` onclick="stopEventPropagation(this, event)"`)
+	}
 }
 
 func (picker *filePickerData) htmlDisabledProperties(self View, buffer *strings.Builder) {
diff --git a/timePicker.go b/timePicker.go
index 1c2fa5f..34aa390 100644
--- a/timePicker.go
+++ b/timePicker.go
@@ -302,6 +302,9 @@ func (picker *timePickerData) htmlProperties(self View, buffer *strings.Builder)
 	buffer.WriteByte('"')
 
 	buffer.WriteString(` oninput="editViewInputEvent(this)"`)
+	if picker.getRaw(ClickEvent) == nil {
+		buffer.WriteString(` onclick="stopEventPropagation(this, event)"`)
+	}
 }
 
 func (picker *timePickerData) htmlDisabledProperties(self View, buffer *strings.Builder) {