From 14770a6c0156abebb756ef1fedae16763da1416e Mon Sep 17 00:00:00 2001 From: AlphaX-Projects <77661270+AlphaX-Projects@users.noreply.github.com> Date: Sat, 3 Dec 2022 18:07:06 +0100 Subject: [PATCH] fix copy paste in wallet plugin --- qortal-ui-core/package.json | 2 +- qortal-ui-plugins/package.json | 2 +- .../plugins/core/wallet/wallet-app.src.js | 48 +++++++++++++++++-- 3 files changed, 45 insertions(+), 7 deletions(-) diff --git a/qortal-ui-core/package.json b/qortal-ui-core/package.json index 01c5d040..e6348f40 100644 --- a/qortal-ui-core/package.json +++ b/qortal-ui-core/package.json @@ -73,7 +73,7 @@ "random-sentence-generator": "0.0.8", "redux": "4.2.0", "redux-thunk": "2.4.2", - "rollup": "3.5.0", + "rollup": "3.5.1", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-postcss": "4.0.2", "rollup-plugin-progress": "1.1.2", diff --git a/qortal-ui-plugins/package.json b/qortal-ui-plugins/package.json index 2dd5bac5..8ecea406 100644 --- a/qortal-ui-plugins/package.json +++ b/qortal-ui-plugins/package.json @@ -55,7 +55,7 @@ "html-escaper": "3.0.3", "lit": "2.4.1", "lit-translate": "2.0.1", - "rollup": "3.5.0", + "rollup": "3.5.1", "rollup-plugin-node-globals": "1.4.0", "rollup-plugin-progress": "1.1.2" }, diff --git a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js index b89b15b4..3e3726b0 100644 --- a/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js +++ b/qortal-ui-plugins/plugins/core/wallet/wallet-app.src.js @@ -93,7 +93,8 @@ class MultiWallet extends LitElement { dogeBookAddress: { type: String }, dgbBookAddress: { type: String }, rvnBookAddress: { type: String }, - arrrBookAddress: { type: String } + arrrBookAddress: { type: String }, + myElementId: { type: String } } } @@ -649,7 +650,6 @@ class MultiWallet extends LitElement { this.dgbBookAddress = '' this.rvnBookAddress = '' this.arrrBookAddress = '' - this.recipient = '' this.btcRecipient = '' this.ltcRecipient = '' @@ -661,6 +661,7 @@ class MultiWallet extends LitElement { this.arrrWalletAddress = '' this.errorMessage = '' this.successMessage = '' + this.myElementId = '' this.sendMoneyLoading = false this.isValidAmount = false this.btnDisable = false @@ -732,6 +733,14 @@ class MultiWallet extends LitElement { this.isTextMenuOpen = false } }) + + parentEpml.subscribe('frame_paste_menu_switch', async res => { + res = JSON.parse(res) + if (res.isOpen === false && this.isPasteMenuOpen === true) { + this.pasteToTextBox(this.myElementId) + this.isPasteMenuOpen = false + } + }) }) } @@ -2498,7 +2507,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'amountInput') + this.myElementId = this.shadowRoot.getElementById('amountInput') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2521,7 +2532,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'recipient') + this.myElementId = this.shadowRoot.getElementById('recipient') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2544,7 +2557,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'btcAmountInput') + this.myElementId = this.shadowRoot.getElementById('btcAmountInput') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2567,7 +2582,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'btcRecipient') + this.myElementId = this.shadowRoot.getElementById('btcRecipient') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2590,7 +2607,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'ltcAmountInput') + this.myElementId = this.shadowRoot.getElementById('ltcAmountInput') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2613,7 +2632,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'ltcRecipient') + this.myElementId = this.shadowRoot.getElementById('ltcRecipient') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2636,7 +2657,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'dogeAmountInput') + this.myElementId = this.shadowRoot.getElementById('dogeAmountInput') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2659,7 +2682,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'dogeRecipient') + this.myElementId = this.shadowRoot.getElementById('dogeRecipient') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2682,7 +2707,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'dgbAmountInput') + this.myElementId = this.shadowRoot.getElementById('dgbAmountInput') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2705,7 +2732,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'dgbRecipient') + this.myElementId = this.shadowRoot.getElementById('dgbRecipient') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2728,7 +2757,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'rvnAmountInput') + this.myElementId = this.shadowRoot.getElementById('rvnAmountInput') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2751,7 +2782,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'rvnRecipient') + this.myElementId = this.shadowRoot.getElementById('rvnRecipient') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2774,7 +2807,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'arrrAmountInput') + this.myElementId = this.shadowRoot.getElementById('arrrAmountInput') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2797,7 +2832,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'arrrRecipient') + this.myElementId = this.shadowRoot.getElementById('arrrRecipient') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -2820,7 +2857,9 @@ class MultiWallet extends LitElement { let selectedText = getSelectedText() if (selectedText && typeof selectedText === 'string') { } else { + this.myElementId = '' this.pasteMenu(event, 'arrrMemo') + this.myElementId = this.shadowRoot.getElementById('arrrMemo') this.isPasteMenuOpen = true event.preventDefault() event.stopPropagation() @@ -3856,9 +3895,8 @@ class MultiWallet extends LitElement { pasteToTextBox(elementId) { window.focus() navigator.clipboard.readText().then((clipboardText) => { - let element = this.shadowRoot.getElementById(elementId) - element.value += clipboardText - element.focus() + elementId.value += clipboardText + elementId.focus() }) }