diff --git a/README.md b/README.md index dfc7aa8..761d4e0 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ - **Version 2.2 (breaking changes from 2.1.x)** + - 2.2.26: Updated NotificationPopUp secondary button to have hover and href. - 2.2.25: - Added box-shadow to CardWrapper. - Added item border-radius to PrimaryTopNav. diff --git a/package-lock.json b/package-lock.json index 55fd9f3..a074ab0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { "name": "@conduction/components", - "version": "2.2.25", + "version": "2.2.26", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@conduction/components", - "version": "2.2.25", + "version": "2.2.26", "license": "ISC", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.2.0", "@fortawesome/free-solid-svg-icons": "^6.2.0", "@fortawesome/react-fontawesome": "^0.2.0", - "@utrecht/component-library-react": "^1.0.0-alpha.319", + "@utrecht/component-library-react": "1.0.0-alpha.394", "clsx": "^1.1.1", "gatsby": "^4.11.1", "react": "^18.2.0", @@ -4474,17 +4474,30 @@ } }, "node_modules/@utrecht/component-library-react": { - "version": "1.0.0-alpha.319", - "resolved": "https://registry.npmjs.org/@utrecht/component-library-react/-/component-library-react-1.0.0-alpha.319.tgz", - "integrity": "sha512-uRpWISxTRpFw/uKegDsuOXnf+jI1TBwO5w/i+7k4RWMRui2sF/DlCOEOv9HmppvzSvPuCPdvLIarwY8xap3mIw==", + "version": "1.0.0-alpha.394", + "resolved": "https://registry.npmjs.org/@utrecht/component-library-react/-/component-library-react-1.0.0-alpha.394.tgz", + "integrity": "sha512-zUmK34IqDH19Gou5BVhKqqY2i+BGYwD2xn68+Q74CSUz+2EOnZpwgwWqfJURPr1BZHtkGYtbxF36OheS+wFb2g==", "dependencies": { "clsx": "1.2.1", - "date-fns": "2.30.0", "lodash.chunk": "4.2.0" }, "peerDependencies": { - "react": "16 - 18", - "react-dom": "16 - 18" + "date-fns": "^2.30.0", + "react": "18", + "react-dom": "18", + "react-vega": "^7.6.0", + "vega": "^5.25.0" + }, + "peerDependenciesMeta": { + "date-fns": { + "optional": true + }, + "react-vega": { + "optional": true + }, + "vega": { + "optional": true + } } }, "node_modules/@vercel/webpack-asset-relocator-loader": { @@ -5050,6 +5063,14 @@ "node": ">=4" } }, + "node_modules/axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, "node_modules/axobject-query": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", @@ -9324,14 +9345,6 @@ "node": ">=14.15.0" } }, - "node_modules/gatsby/node_modules/axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "dependencies": { - "follow-redirects": "^1.14.0" - } - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -19646,12 +19659,11 @@ } }, "@utrecht/component-library-react": { - "version": "1.0.0-alpha.319", - "resolved": "https://registry.npmjs.org/@utrecht/component-library-react/-/component-library-react-1.0.0-alpha.319.tgz", - "integrity": "sha512-uRpWISxTRpFw/uKegDsuOXnf+jI1TBwO5w/i+7k4RWMRui2sF/DlCOEOv9HmppvzSvPuCPdvLIarwY8xap3mIw==", + "version": "1.0.0-alpha.394", + "resolved": "https://registry.npmjs.org/@utrecht/component-library-react/-/component-library-react-1.0.0-alpha.394.tgz", + "integrity": "sha512-zUmK34IqDH19Gou5BVhKqqY2i+BGYwD2xn68+Q74CSUz+2EOnZpwgwWqfJURPr1BZHtkGYtbxF36OheS+wFb2g==", "requires": { "clsx": "1.2.1", - "date-fns": "2.30.0", "lodash.chunk": "4.2.0" } }, @@ -20084,6 +20096,14 @@ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz", "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==" }, + "axios": { + "version": "0.21.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "requires": { + "follow-redirects": "^1.14.0" + } + }, "axobject-query": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz", @@ -23034,16 +23054,6 @@ "webpack-virtual-modules": "^0.3.2", "xstate": "4.32.1", "yaml-loader": "^0.8.0" - }, - "dependencies": { - "axios": { - "version": "0.21.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", - "requires": { - "follow-redirects": "^1.14.0" - } - } } }, "gatsby-cli": { diff --git a/package.json b/package.json index 9661fab..db16e8c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@conduction/components", - "version": "2.2.25", + "version": "2.2.26", "description": "React (Gatsby) components used within the Conduction Skeleton Application (and its implementations)", "main": "lib/index.js", "scripts": { @@ -23,7 +23,7 @@ "@fortawesome/fontawesome-svg-core": "^6.2.0", "@fortawesome/free-solid-svg-icons": "^6.2.0", "@fortawesome/react-fontawesome": "^0.2.0", - "@utrecht/component-library-react": "^1.0.0-alpha.319", + "@utrecht/component-library-react": "1.0.0-alpha.394", "clsx": "^1.1.1", "gatsby": "^4.11.1", "react": "^18.2.0", diff --git a/src/components/notificationPopUp/NotificationPopUp.tsx b/src/components/notificationPopUp/NotificationPopUp.tsx index 3ab5ddb..6261709 100644 --- a/src/components/notificationPopUp/NotificationPopUp.tsx +++ b/src/components/notificationPopUp/NotificationPopUp.tsx @@ -13,14 +13,15 @@ export interface NotificationPopUpProps { hide: () => void; primaryButton: { label: string; - icon?: JSX.Element; handleClick: () => any; + icon?: JSX.Element; layoutClassName?: string; }; secondaryButton?: { label: string; - icon?: JSX.Element; handleClick: () => any; + href: string; + icon?: JSX.Element; layoutClassName?: string; }; layoutClassName?: string; @@ -59,8 +60,14 @@ export const NotificationPopUp = ({
{secondaryButton && ( -
handleClick(secondaryButton.handleClick)} className={secondaryButton.layoutClassName}> - +
+ { + e.preventDefault(), handleClick(secondaryButton.handleClick); + }} + className={styles.link} + href={secondaryButton.href} + > {secondaryButton.icon ?? } {secondaryButton.label}