From 9e091d7667710a0989648f26b2d17a05705b0198 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Mon, 20 Jun 2022 14:51:23 -0600 Subject: [PATCH 1/3] Update validation to handle onclick and links properly --- packages/core/package.json | 2 +- packages/core/src/validation.ts | 12 +++++++++--- packages/demo/package.json | 2 +- packages/react/package.json | 4 ++-- packages/vue/package.json | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index ab4f274c2..dc267b349 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/core", - "version": "2.3.0-alpha.1", + "version": "2.3.0-alpha.2", "scripts": { "build": "rollup -c", "dev": "rollup -c -w", diff --git a/packages/core/src/validation.ts b/packages/core/src/validation.ts index 322af9760..a41510f15 100644 --- a/packages/core/src/validation.ts +++ b/packages/core/src/validation.ts @@ -189,7 +189,9 @@ const customNotificationUpdate = Joi.object({ eventCode: Joi.string(), message: Joi.string().required(), id: Joi.string().required(), - autoDismiss: Joi.number() + autoDismiss: Joi.number(), + onclick: Joi.function(), + link: Joi.string() }) const customNotification = Joi.object({ @@ -198,7 +200,9 @@ const customNotification = Joi.object({ eventCode: Joi.string(), message: Joi.string(), id: Joi.string(), - autoDismiss: Joi.number() + autoDismiss: Joi.number(), + onclick: Joi.function(), + link: Joi.string() }) const notification = Joi.object({ @@ -209,7 +213,9 @@ const notification = Joi.object({ message: Joi.string().required(), autoDismiss: Joi.number().required(), network: Joi.string().required(), - startTime: Joi.number() + startTime: Joi.number(), + onclick: Joi.function(), + link: Joi.string() }) const transactionHandlerReturn = Joi.any().allow( diff --git a/packages/demo/package.json b/packages/demo/package.json index 61c909b39..5d9c9b399 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -23,7 +23,7 @@ }, "dependencies": { "@web3-onboard/coinbase": "^2.0.5-alpha.1", - "@web3-onboard/core": "^2.3.0-alpha.1", + "@web3-onboard/core": "^2.3.0-alpha.2", "@web3-onboard/dcent": "^2.0.2-alpha.1", "@web3-onboard/fortmatic": "^2.0.4-alpha.1", "@web3-onboard/gnosis": "^2.0.3-alpha.1", diff --git a/packages/react/package.json b/packages/react/package.json index 5cc5c5764..3eae29a6d 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/react", - "version": "2.2.0-alpha.1", + "version": "2.2.0-alpha.2", "description": "Collection of React Hooks for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -23,7 +23,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@web3-onboard/core": "^2.3.0-alpha.1", + "@web3-onboard/core": "^2.3.0-alpha.2", "@web3-onboard/common": "^2.1.2-alpha.2", "use-sync-external-store": "1.0.0" }, diff --git a/packages/vue/package.json b/packages/vue/package.json index e56fbed16..8f6f6b4ce 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/vue", - "version": "2.1.0-alpha.1", + "version": "2.1.0-alpha.2", "description": "Vue Composable for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", @@ -24,7 +24,7 @@ "@vueuse/core": "^8.4.2", "@vueuse/rxjs": "^8.2.0", "@web3-onboard/common": "^2.1.2-alpha.2", - "@web3-onboard/core": "^2.3.0-alpha.1", + "@web3-onboard/core": "^2.3.0-alpha.2", "vue-demi": "^0.12.4" }, "peerDependencies": { From fd7e367380549e14dc1a54552ec9226ece543649 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Mon, 20 Jun 2022 15:02:07 -0600 Subject: [PATCH 2/3] Update react package version --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index e5ca4fb03..570ecba0d 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/react", - "version": "2.2.0-alpha.2", + "version": "2.2.0-alpha.3", "description": "Collection of React Hooks for web3-onboard", "module": "dist/index.js", "browser": "dist/index.js", From b914556fb277a547f14f1b9c12a8efc8f53c5840 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Mon, 20 Jun 2022 15:10:04 -0600 Subject: [PATCH 3/3] Update onClick for notifications to be camel case --- packages/core/src/types.ts | 2 +- packages/core/src/validation.ts | 6 +++--- packages/core/src/views/notify/Notification.svelte | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts index 7f307fc22..8a883db33 100644 --- a/packages/core/src/types.ts +++ b/packages/core/src/types.ts @@ -180,7 +180,7 @@ export type Notification = { message: string autoDismiss: number link?: string - onclick?: (event: Event) => void + onClick?: (event: Event) => void } export type TransactionHandlerReturn = CustomNotification | boolean | void diff --git a/packages/core/src/validation.ts b/packages/core/src/validation.ts index a41510f15..f66b93fc4 100644 --- a/packages/core/src/validation.ts +++ b/packages/core/src/validation.ts @@ -190,7 +190,7 @@ const customNotificationUpdate = Joi.object({ message: Joi.string().required(), id: Joi.string().required(), autoDismiss: Joi.number(), - onclick: Joi.function(), + onClick: Joi.function(), link: Joi.string() }) @@ -201,7 +201,7 @@ const customNotification = Joi.object({ message: Joi.string(), id: Joi.string(), autoDismiss: Joi.number(), - onclick: Joi.function(), + onClick: Joi.function(), link: Joi.string() }) @@ -214,7 +214,7 @@ const notification = Joi.object({ autoDismiss: Joi.number().required(), network: Joi.string().required(), startTime: Joi.number(), - onclick: Joi.function(), + onClick: Joi.function(), link: Joi.string() }) diff --git a/packages/core/src/views/notify/Notification.svelte b/packages/core/src/views/notify/Notification.svelte index 412df33a3..2f59e6892 100644 --- a/packages/core/src/views/notify/Notification.svelte +++ b/packages/core/src/views/notify/Notification.svelte @@ -103,8 +103,8 @@
notification.onclick && notification.onclick(e)} + class:bn-notify-clickable={notification.onClick} + on:click={e => notification.onClick && notification.onClick(e)} class="bn-notify-notification bn-notify-notification-{notification.type}}" >