Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,326 changes: 554 additions & 772 deletions package-lock.json

Large diffs are not rendered by default.

41 changes: 26 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,15 @@
"publishConfig": {
"access": "public"
},
"peerDependencies": {
"react": "^19.2.4",
"react-dom": "^19.2.4"
},
"overrides": {

"react": "^19.2.4",
"react-dom": "^19.2.4",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3"
},
"scripts": {
"dev": "vite build --watch",
Expand Down Expand Up @@ -49,9 +56,9 @@
"@kyper/tokenprovider": "^4.0.1",
"@kyper/userfeedback": "^2.0.0",
"@kyper/utilityrow": "^2.1.0",
"@mui/icons-material": "^6.1.5",
"@mui/material": "^6.1.5",
"@mxenabled/mxui": "^1.5.4",
"@mui/icons-material": "^7.3.9",
"@mui/material": "^7.3.9",
"@mxenabled/mxui": "^2.2.4",
"@reduxjs/toolkit": "^2.2.7",
"@types/node": "^22.1.0",
"axios": "^1.8.4",
Expand All @@ -63,23 +70,21 @@
"js-sha256": "^0.11.0",
"lodash": "^4.17.21",
"numeral": "^2.0.6",
"react": "^18.3.1",
"react-confetti": "^6.1.0",
"react-dom": "^18.3.1",
"react-redux": "^9.1.2",
"react-confetti": "^6.4.0",
"react-redux": "^9.2.0",
"rxjs": "^7.8.1",
"uuid": "^11.1.0",
"velocity-animate": "^1.5.2",
"vite-plugin-dts": "^4.0.0-beta.2"
},
"devDependencies": {
"@mx-cartographer/kyper-mui": "^2.2.0-alpha1",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^16.0.0",
"@testing-library/user-event": "^14.5.2",
"@types/react": "^18.3.3",
"@types/react-dom": "^18.3.0",
"@testing-library/dom": "^10.4.1",
"@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2",
"@testing-library/user-event": "^14.6.1",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "^8.56.1",
"@typescript-eslint/parser": "^8.56.1",
Expand All @@ -100,20 +105,26 @@
"lint-staged": "^15.2.8",
"markdown-eslint-parser": "^1.2.1",
"prettier": "3.7.4",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"rollup": "^4.59.0",
"semantic-release": "^25.0.3",
"typescript": "^5.2.2",
"typescript-eslint": "^8.56.1",
"vite": "^7.3.1",
"vite-plugin-svgr": "^4.2.0",
"vitest": "^3.1.4"
"vitest": "^4.0.18"
},
"lint-staged": {
"**/*.{js,jsx,ts,tsx}": [
"npm run lint",
"npx prettier . --write"
]
},
"resolutions": {
"react": "^19.0.0",
"react-dom": "^19.0.0"
},
"volta": {
"node": "24.14.0",
"npm": "11.9.0"
Expand Down
6 changes: 2 additions & 4 deletions src/ConnectedTokenProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useSelector } from 'react-redux'

import { Theme, ThemeProvider } from '@mui/material'
import { deepmerge } from '@mui/utils'
import { createMXTheme, Icon, IconWeight } from '@mxenabled/mxui'
import { createMXTheme, Icon } from '@mxenabled/mxui'
import { TokenProvider, THEMES } from '@kyper/tokenprovider'

import { getPrimarySeedColor } from 'src/redux/selectors/ClientColorScheme'
Expand Down Expand Up @@ -66,9 +66,7 @@ const connectThemeOverrides = (palette: Theme['palette']) => ({
},
},
defaultProps: {
expandIcon: (
<Icon color="secondary" name="stat_minus_1" size={24} weight={IconWeight.Dark} />
),
expandIcon: <Icon color="secondary" name="stat_minus_1" size={24} />,
},
},
MuiAccordionDetails: {
Expand Down
4 changes: 2 additions & 2 deletions src/components/ActionTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'

import { useTokens } from '@kyper/tokenprovider'
import { Text } from '@mxenabled/mxui'
import { ChevronRightIcon } from '@mxenabled/mxui'
import { Button } from '@mui/material'
import ChevronRightIcon from '@mui/icons-material/ChevronRight'

export const ActionTile = (props) => {
const { icon, onSelectAction, subTitle, title } = props
Expand All @@ -19,7 +19,7 @@ export const ActionTile = (props) => {
return (
<div>
<Button
endIcon={<ChevronRightIcon size={24} />}
endIcon={<ChevronRightIcon sx={{ fontSize: 24 }} />}
fullWidth={true}
onClick={onSelectAction}
size="large"
Expand Down
4 changes: 3 additions & 1 deletion src/components/DataClusterDropDown.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'

import { useTokens } from '@mxenabled/mxui'
import { useTokens } from '@kyper/tokenprovider'
import {
Accordion,
AccordionSummary,
Expand Down Expand Up @@ -31,6 +31,7 @@ export const DataClusterDropDown: React.FC<DataClusterDropDownProps> = ({ dataCl
component="p"
data-test={dataCluster.dataTest}
truncate={false}
// @ts-expect-error - Custom variant from @mxenabled/mxui
variant="Paragraph"
>
<Icon sx={styles.icon}>{dataCluster.icon}</Icon>
Expand All @@ -43,6 +44,7 @@ export const DataClusterDropDown: React.FC<DataClusterDropDownProps> = ({ dataCl
component="p"
style={styles.accordionDetailText}
truncate={false}
// @ts-expect-error - Custom variant from @mxenabled/mxui
variant="ParagraphSmall"
>
{__('This includes:')}
Expand Down
15 changes: 6 additions & 9 deletions src/views/consent/DynamicDisclosure.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import type { RootState } from 'reduxify/Store'
import { __, getLocale, setLocale } from 'src/utilities/Intl'

import { Box, Button, IconButton, Link, Stack } from '@mui/material'
import { Icon, IconWeight } from '@mxenabled/mxui'
import { Icon } from '@mxenabled/mxui'
import { Text } from '@mxenabled/mxui'
import { useTokens } from '@mxenabled/mxui'
import { useTokens } from '@kyper/tokenprovider'
import { SlideDown } from 'src/components/SlideDown'
import { getDelay } from 'src/utilities/getDelay'

Expand Down Expand Up @@ -167,6 +167,7 @@ export const DynamicDisclosure = React.forwardRef<any, DynamicDisclosureProps>(
data-test="dynamic-disclosure-title"
style={styles.title}
truncate={false}
// @ts-expect-error - Custom variant from @mxenabled/mxui
variant="H2"
>
{__('Share your data')}
Expand All @@ -179,6 +180,7 @@ export const DynamicDisclosure = React.forwardRef<any, DynamicDisclosureProps>(
data-test="dynamic-disclosure-p1"
style={styles.paragraph}
truncate={false}
// @ts-expect-error - Custom variant from @mxenabled/mxui
variant="Paragraph"
>
{appName
Expand All @@ -189,13 +191,7 @@ export const DynamicDisclosure = React.forwardRef<any, DynamicDisclosureProps>(
onClick={() => setDialogIsOpen((prev) => !prev)}
sx={{ fontSize: 16, padding: 0, minWidth: 0, minHeight: 0 }}
>
<Icon
color="secondary"
name="info"
size={16}
sx={{ marginBottom: '6px' }}
weight={IconWeight.Dark}
/>
<Icon color="secondary" name="info" size={16} sx={{ marginBottom: '6px' }} />
</IconButton>
{institution.name
? __(' to securely access the following %1 data to', institution.name)
Expand All @@ -205,6 +201,7 @@ export const DynamicDisclosure = React.forwardRef<any, DynamicDisclosureProps>(
</Stack>
<div>{accordionElement}</div>
<div style={styles.disclosureParagraph}>
{/* @ts-expect-error - Custom variant from @mxenabled/mxui */}
<Text component="p" truncate={false} variant="XSmall">
{appName
? __(
Expand Down
2 changes: 1 addition & 1 deletion src/views/search/Search.js
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ export const Search = React.forwardRef((_, navigationRef) => {
style={inlineStyles.headerText}
tabIndex={-1}
truncate={false}
variant="H2"
variant="h2"
>
{__('Select your institution')}
</Text>
Expand Down
21 changes: 18 additions & 3 deletions vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// <reference types="vitest" />
/// <reference types="vite-plugin-svgr/client" />
import { defineConfig } from 'vite'
import { defineConfig } from 'vitest/config'
import path from 'path'
import react from '@vitejs/plugin-react'
import dts from 'vite-plugin-dts'
Expand All @@ -24,11 +24,18 @@ export default defineConfig({
fileName: (format) => `index.${format}.js`,
},
rollupOptions: {
external: ['react', 'react-dom'],
external: [
'react',
'react-dom',
'react/jsx-runtime',
'react/jsx-dev-runtime',
'react-dom/client',
],
output: {
globals: {
react: 'React',
'react-dom': 'ReactDOM',
'react/jsx-runtime': 'react/jsx-runtime',
},
assetFileNames: (assetInfo) => {
if (assetInfo.name && assetInfo.name.endsWith('.css')) {
Expand Down Expand Up @@ -67,6 +74,8 @@ export default defineConfig({
alias: {
src: path.resolve(__dirname, './src'),
utils: path.join(__dirname, 'src/utils'),
'@mui/material/styles': path.resolve(__dirname, 'node_modules/@mui/material/styles/index.js'),
'@mui/material/colors': path.resolve(__dirname, 'node_modules/@mui/material/colors/index.js'),
},
},

Expand All @@ -82,7 +91,13 @@ export default defineConfig({
include: ['**/*-{test,spec}.?(c|m)[jt]s?(x)'],
server: {
deps: {
inline: ['@mxenabled/mx-icons'],
inline: [
'@mxenabled/mx-icons',
'@mxenabled/mxui',
'@mui/material',
'@mui/x-date-pickers',
'@mui/x-date-pickers-pro',
],
},
},
},
Expand Down
Loading