Skip to content

Commit 3fb1118

Browse files
5.0.0-beta.3 dependencies versions updated
1 parent ad7655c commit 3fb1118

File tree

9 files changed

+2183
-1008
lines changed

9 files changed

+2183
-1008
lines changed

components/NavSidebar.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';
22
import { useRouter } from 'next/router';
33
import Link from 'next/link';
44

5-
import 'react-minimal-side-navigation/lib/ReactMinimalSideNavigation.css';
65
import {
76
Accordion,
87
AccordionDetails,
@@ -193,7 +192,7 @@ const allMenuItems = [
193192
itemId: '/examples/react-bootstrap',
194193
},
195194
{
196-
title: 'React Native Usage',
195+
title: 'React Native',
197196
itemId: '/examples/react-native',
198197
},
199198
{

next.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const nextConfig = {
55
basePath: process.env.NEXT_PUBLIC_BASE_PATH,
66
assetPrefix: process.env.NEXT_PUBLIC_BASE_PATH,
77
env: {
8-
VERSION: '5.0.0-beta.2',
8+
VERSION: '5.0.0-beta.3',
99
},
1010
};
1111

package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-validatable-form-demo",
3-
"version": "5.0.0-beta.2",
3+
"version": "5.0.0-beta.3",
44
"license": "MIT",
55
"scripts": {
66
"dev": "next dev -p 3155",
@@ -10,31 +10,31 @@
1010
"lint": "next lint"
1111
},
1212
"dependencies": {
13-
"@date-io/date-fns": "2.16.0",
14-
"@emotion/react": "11.10.4",
15-
"@emotion/styled": "11.10.4",
16-
"@mui/icons-material": "5.10.9",
17-
"@mui/material": "5.10.9",
18-
"@mui/x-date-pickers": "5.0.4",
19-
"antd": "4.23.5",
20-
"bootstrap": "5.2.2",
21-
"date-fns": "2.29.3",
22-
"next": "13.0.6",
23-
"primereact": "8.6.1",
13+
"@date-io/date-fns": "2.17.0",
14+
"@emotion/react": "11.11.1",
15+
"@emotion/styled": "11.11.0",
16+
"@mui/icons-material": "5.14.16",
17+
"@mui/material": "5.14.16",
18+
"@mui/x-date-pickers": "6.17.0",
19+
"antd": "5.10.3",
20+
"bootstrap": "5.3.2",
21+
"date-fns": "2.30.0",
22+
"next": "14.0.1",
23+
"primereact": "10.0.9",
2424
"react": "18.2.0",
25-
"react-bootstrap": "2.5.0",
25+
"react-bootstrap": "2.9.1",
2626
"react-dom": "18.2.0",
2727
"react-minimal-side-navigation": "1.9.2",
28-
"react-validatable-form": "5.0.0-beta.2"
28+
"react-validatable-form": "5.0.0-beta.3"
2929
},
3030
"devDependencies": {
31-
"eslint": "8.23.1",
31+
"eslint": "8.52.0",
3232
"eslint-config-next": "12.3.0",
33-
"eslint-config-prettier": "8.5.0",
34-
"eslint-plugin-prettier": "4.2.1",
35-
"eslint-plugin-react": "7.31.8",
33+
"eslint-config-prettier": "9.0.0",
34+
"eslint-plugin-prettier": "5.0.1",
35+
"eslint-plugin-react": "7.33.2",
3636
"eslint-plugin-react-hooks": "4.6.0",
37-
"prettier": "2.7.1"
37+
"prettier": "3.0.3"
3838
},
3939
"browserslist": {
4040
"production": [

pages/_app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ function MyApp({ Component, pageProps }) {
378378
focusToErrorAfterSubmit={currentSettings.focusToErrorAfterSubmit}
379379
elementFocusHandler={customElementFocusHandler}
380380
>
381-
<Component {...pageProps} />
381+
<Component openSettingsDialog={openSettingsDialog} {...pageProps} />
382382
</ReactValidatableFormProvider>
383383
</LocalizationProvider>
384384
</div>

pages/customizations/apply-to-nulls.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useValidatableForm } from 'react-validatable-form';
22
import TextField from '@mui/material/TextField';
33
import { Autocomplete, Button } from '@mui/material';
4-
import { DesktopDatePicker } from '@mui/x-date-pickers';
4+
import { DatePicker } from '@mui/x-date-pickers';
55
import AddIcon from '@mui/icons-material/Add';
66
import DeleteIcon from '@mui/icons-material/Delete';
77
import { options } from '../../constants/Data';
@@ -124,14 +124,11 @@ const ApplyToNulls = () => {
124124
/>
125125
</div>
126126
<div>
127-
<DesktopDatePicker
127+
<DatePicker
128128
label="dateApplyToNulls"
129-
inputFormat="MM/dd/yyyy"
130129
value={getValue('val5') || null}
131130
onChange={(val) => setPathValue('val5', val)}
132-
renderInput={(params) => (
133-
<TextField {...params} error={!!getError('val5')} helperText={getError('val5') || ' '} />
134-
)}
131+
slotProps={{ textField: { error: !!getError('val5'), helperText: getError('val5') || ' ' } }}
135132
/>
136133
</div>
137134
<div>

pages/examples/antd.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,7 @@ const Antd = () => {
126126
<ValidationResult isValid={isValid} />
127127
<CurrentRulesInfo currentRules={rules} />
128128
</div>
129-
<Modal
130-
title={'Form Data Submitted'}
131-
visible={dialogOpen}
132-
footer={null}
133-
onCancel={() => setDialogOpen(false)}
134-
>
129+
<Modal title={'Form Data Submitted'} open={dialogOpen} footer={null} onCancel={() => setDialogOpen(false)}>
135130
<FormSubmitResult formData={formData} />
136131
</Modal>
137132
</ExampleUsageWrapper>

pages/rules/date.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import Checkbox from '@mui/material/Checkbox';
66
import { ruleOptions } from '../../constants/Constants';
77
import ExampleUsageWrapper from '../../components/ExampleUsageWrapper';
88
import TextField from '@mui/material/TextField';
9-
import { DesktopDatePicker, DateTimePicker } from '@mui/x-date-pickers';
9+
import { DatePicker, DateTimePicker } from '@mui/x-date-pickers';
1010
import Autocomplete from '@mui/material/Autocomplete';
1111
import ValidationResult from '../../components/ValidationResult';
1212
import CurrentRulesInfo from '../../components/CurrentRulesInfo';
@@ -69,7 +69,7 @@ const DateRule = () => {
6969
setWithTime(newValue);
7070
};
7171

72-
const PickerComponent = withTime ? DateTimePicker : DesktopDatePicker;
72+
const PickerComponent = withTime ? DateTimePicker : DatePicker;
7373
const pickerFormat = withTime ? 'MM/dd/yyyy HH:mm' : 'MM/dd/yyyy';
7474

7575
return (
@@ -85,9 +85,7 @@ const DateRule = () => {
8585
inputFormat={pickerFormat}
8686
value={getValue('val')}
8787
onChange={(val) => setPathValue('val', val)}
88-
renderInput={(params) => (
89-
<TextField {...params} error={!!getError('val')} helperText={getError('val') || ' '} />
90-
)}
88+
slotProps={{ textField: { error: !!getError('val'), helperText: getError('val') || ' ' } }}
9189
/>
9290

9391
<Autocomplete
@@ -105,7 +103,7 @@ const DateRule = () => {
105103
inputFormat={pickerFormat}
106104
value={getValue('comparisonValue')}
107105
onChange={(val) => setPathValue('comparisonValue', val)}
108-
renderInput={(params) => <TextField className="comparisonDateComponent" {...params} />}
106+
slotProps={{ textField: { className: 'comparisonDateComponent' } }}
109107
/>
110108
) : (
111109
<PickerComponent
@@ -114,7 +112,7 @@ const DateRule = () => {
114112
inputFormat={pickerFormat}
115113
value={today}
116114
onChange={() => {}}
117-
renderInput={(params) => <TextField className="comparisonDateComponent" {...params} />}
115+
slotProps={{ textField: { className: 'comparisonDateComponent' } }}
118116
/>
119117
)}
120118
<FormGroup className={'checkboxOnRight'}>

styles/globals.css

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ a {
1919
text-align: center;
2020
}
2121

22-
select,
23-
input {
24-
border: 1px solid;
25-
}
26-
2722
.pureButton {
2823
border: 1px solid;
2924
padding-left: 20px;
@@ -148,10 +143,6 @@ input {
148143
width: 200px !important;
149144
}
150145

151-
.comparisonDateComponent {
152-
width: 250px !important;
153-
}
154-
155146
.comparisonDiv {
156147
display: flex;
157148
gap: 10px;

0 commit comments

Comments
 (0)