Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Material UI 5 + React 18 & other updates #152

Merged
merged 43 commits into from
Apr 8, 2024
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
5854270
Validator component update to latest version
Oct 31, 2022
94e4157
Updated various npm packages
Oct 31, 2022
fb9919f
Example material ui updated
Oct 31, 2022
04e9d91
Material ui migration and rollup config updated
Oct 31, 2022
b81a66e
Examples migrated to v5
Oct 31, 2022
3467f2a
Material UI migration
Oct 31, 2022
4eecf66
Material UI update
Nov 1, 2022
b211ce8
Material UI date and time pickers updated
Nov 2, 2022
891bfa7
Date and time picker updated
Nov 2, 2022
fb7a09d
Select picker fixes updated
Nov 3, 2022
ac47599
Active Date and time pickers updated
Nov 4, 2022
1ab2016
Active Date and time pickers updated
Nov 4, 2022
180bb10
Active form select design fixes
Nov 4, 2022
87a1b81
Styleguid updated
Nov 4, 2022
3db8494
Unicef stylegude updated
Nov 21, 2022
3452d82
Styleguide updated for date and time pickers
Nov 21, 2022
d65b7d2
Fix styleguides
Nov 21, 2022
452f542
Auto complete component updated
Nov 21, 2022
8d48752
Readme file updated
Nov 21, 2022
2807382
UNavbarCenter style guide updated
Nov 21, 2022
9fd9392
supress warning and add react-script back
Mar 1, 2024
89e07bd
Merge branch 'master' into feaure/update-material-ui
Mar 4, 2024
2a9fa75
Updated package lock
Mar 4, 2024
ff5f887
issue fixes and refactor
Mar 4, 2024
04f813d
theme fixes
Mar 4, 2024
105eddd
radio style fix
Mar 6, 2024
14613ea
updated the versions of libraries
Mar 7, 2024
04e41ba
Merge branch 'v0.x' into feaure/update-material-ui
Mar 7, 2024
85535bb
New accessibility components added and docs error fixed
Mar 20, 2024
74809f4
Fix code
Mar 20, 2024
de63650
Fix docs error
Mar 20, 2024
dbbad01
Update styleguide for new accessiility components
Mar 20, 2024
53f6e1e
PR fixes
Apr 1, 2024
dce9e4d
PR fixes 1
Apr 1, 2024
87eee2c
Fix validation issues after update the lib
Apr 2, 2024
ceabf37
PR fixes
Apr 2, 2024
8ed82f9
PR fixes classname prefix added
Apr 2, 2024
8b356c4
Merge pull request #156 from unicef/fix/form-validation
vinuganesan Apr 2, 2024
e805949
Conflict fixed
Apr 3, 2024
f999b2a
Merge pull request #155 from unicef/feature/accessibility
vinuganesan Apr 3, 2024
ae3d991
Code clean up
Apr 3, 2024
8a29e42
clean up and testing
Apr 3, 2024
9409bca
Tooltip fixed in pickers
Apr 8, 2024
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
8 changes: 6 additions & 2 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{
"presets": ["@babel/preset-env", "@babel/preset-react"],
"presets": ["@babel/preset-env", ["@babel/preset-react", {
"runtime": "automatic"
}]],
"plugins": [
"transform-object-rest-spread",
"transform-react-jsx",
["@babel/plugin-transform-react-jsx", {
"runtime": "automatic"
}],
["@babel/plugin-proposal-class-properties"]
]
}
7 changes: 4 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"editor.formatOnSave": true,
"editor.tabSize": 2,
}
"editor.formatOnSave": true,
"editor.tabSize": 2,
"cSpell.words": ["inputlabelhelpprops"]
}
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![npm version](https://badge.fury.io/js/%40unicef%2Fmaterial-ui.svg)](https://badge.fury.io/js/%40unicef%2Fmaterial-ui)

Customized version for UNICEF of [Material UI](https://material-ui.com/). Material UI is a set of [ReactJS](http://reactjs.org) user interface components based on [Google's material design](https://material.io/design/) written in Javascript.
Customized version for UNICEF of [Material UI](https://mui.com/). Material UI is a set of [ReactJS](http://reactjs.org) user interface components based on [Google's material design](https://material.io/design/) written in Javascript.

You can see a **[Demo site](https://unicef.github.io/unicef-material-ui/example/)** and the **[reference documentation](https://unicef.github.io/unicef-material-ui/)**.

Expand All @@ -18,26 +18,26 @@ In order to use the UNICEF's Material UI components in your React project instal

### Adding UNICEF theme to your app

To use UNICEF theme add `MuiThemeProvider` at the top level of your app and warp you components inside `UNICEFStyleProvider`
To use UNICEF theme add `ThemeProvider` at the top level of your app and warp you components inside `UNICEFStyleProvider`

```jsx
// App.js
import React from 'react'
import MuiThemeProvider from '@material-ui/core/styles/MuiThemeProvider'
import { ThemeProvider } from '@mui/material/styles'
import { theme, UNICEFStyleProvider } from '@unicef/material-ui'

export default function App() {
return (
<MuiThemeProvider theme={theme}>
<ThemeProvider theme={theme}>
<UNICEFStyleProvider>
{/* Components*/}
</UNICEFStyleProvider>
</MuiThemeProvider>
</ThemeProvider>
)
}
```

More info: <a href="https://material-ui.com/styles/advanced/#theming">Material-ui theming</a>
More info: <a href="https://mui.com/material-ui/customization/theming/">Material-ui theming</a>

### Example project

Expand Down
Loading