fixed bug with input msg click emulation

FlowFuse · Sep 19, 2024 · 7648ef5 · 7648ef5
1 parent 36a5f50
commit 7648ef5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/nodes/widgets/ui_button.js b/nodes/widgets/ui_button.js
@@ -15,7 +15,9 @@ module.exports = function (RED) {
             let payload = null
             let payloadType = null
 
-            switch (msg.type) {
+            msg._event = msg._event || {"type": "inject"}
+
+            switch (msg._event.type) {
             case 'pointerup':
                 payload = config.pointerupPayload
                 payloadType = config.pointerupPayloadType
@@ -28,6 +30,10 @@ module.exports = function (RED) {
                 payload = config.payload
                 payloadType = config.payloadType
                 break
+            case 'inject':
+                payload = config.payload
+                payloadType = config.payloadType
+                break
             default:
                 payload = config.payload
                 payloadType = config.payloadType
@@ -105,6 +111,7 @@ module.exports = function (RED) {
             beforeSend,
             onInput: async function (msg) {
                 if (config.emulateClick) {
+
                     msg = await beforeSend(msg)
 
                     if (config.topic || config.topicType) {

diff --git a/ui/src/widgets/ui-button/UIButton.vue b/ui/src/widgets/ui-button/UIButton.vue
@@ -65,46 +65,43 @@ export default {
     methods: {
         action ($evt) {
             const evt = {
-                type: 'click',
+                type: $evt.type,
                 clientX: $evt.clientX,
                 clientY: $evt.clientY,
                 bbox: $evt.target.getBoundingClientRect()
             }
             const msg = this.messages[this.id] || {}
             msg._event = evt
-            msg.type = 'click'
             this.$socket.emit('widget-action', this.id, msg)
         },
         pointerdown: function ($evt) {
             if (!this.props.enablePointerdown) {
                 return
             }
             const evt = {
-                type: 'click',
+                type: $evt.type,
                 clientX: $evt.clientX,
                 clientY: $evt.clientY,
                 bbox: $evt.target.getBoundingClientRect()
             }
             const msg = this.messages[this.id] || {}
             msg._event = evt
             $evt.target.setPointerCapture($evt.pointerId)
-            msg.type = 'pointerdown'
             this.$socket.emit('widget-action', this.id, msg)
         },
         pointerup: function ($evt) {
             if (!this.props.enablePointerup) {
                 return
             }
             const evt = {
-                type: 'click',
+                type: $evt.type,
                 clientX: $evt.clientX,
                 clientY: $evt.clientY,
                 bbox: $evt.target.getBoundingClientRect()
             }
             const msg = this.messages[this.id] || {}
             msg._event = evt
             $evt.target.releasePointerCapture($evt.pointerId)
-            msg.type = 'pointerup'
             this.$socket.emit('widget-action', this.id, msg)
         },