Skip to content

Commit fbc7b9d

Browse files
Hyperkid123Hyperkid123
authored
Merge pull request #1010 from rvsia/missingPF4components
Use original DatePicker and TimePicker PF4 components
2 parents f8690ab + 5e182f6 commit fbc7b9d

File tree

9 files changed

+37
-43
lines changed

9 files changed

+37
-43
lines changed

‎packages/ant-component-mapper/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"react-select": "^2.2.0"
6464
},
6565
"peerDependencies": {
66-
"@data-driven-forms/react-form-renderer": ">=2.4.6",
66+
"@data-driven-forms/react-form-renderer": ">=3.2.1",
6767
"antd": "^4.2.0",
6868
"react": ">=16.13.0",
6969
"react-dom": ">=16.13.0"

‎packages/mui-component-mapper/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"webpack-merge": "^4.1.4"
5656
},
5757
"peerDependencies": {
58-
"@data-driven-forms/react-form-renderer": ">=2.4.6",
58+
"@data-driven-forms/react-form-renderer": ">=3.2.1",
5959
"@material-ui/core": "^4.11.0",
6060
"@material-ui/icons": "^4.9.1",
6161
"@material-ui/styles": "^4.9.14",

‎packages/pf4-component-mapper/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
2929
"@babel/preset-env": "^7.1.6",
3030
"@babel/preset-react": "^7.0.0",
31-
"@patternfly/react-core": "^4.90.2",
32-
"@patternfly/react-icons": "^4.8.4",
31+
"@patternfly/react-core": "^4.101.3",
32+
"@patternfly/react-icons": "^4.9.5",
3333
"@semantic-release/git": "^7.0.5",
3434
"@semantic-release/npm": "^5.1.1",
3535
"babel-core": "^7.0.0-bridge.0",
@@ -59,9 +59,9 @@
5959
"webpack-merge": "^4.1.4"
6060
},
6161
"peerDependencies": {
62-
"@data-driven-forms/react-form-renderer": ">=2.4.6",
63-
"@patternfly/react-core": "^4.90.2",
64-
"@patternfly/react-icons": "^4.8.4"
62+
"@data-driven-forms/react-form-renderer": ">=3.2.1",
63+
"@patternfly/react-core": "^4.101.3",
64+
"@patternfly/react-icons": "^4.9.5"
6565
},
6666
"dependencies": {
6767
"@data-driven-forms/common": "*",

‎packages/pf4-component-mapper/src/date-picker/date-picker.js

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import React from 'react';
2-
import { TextInput } from '@patternfly/react-core';
2+
import { DatePicker as PF4DatePicker } from '@patternfly/react-core';
33
import PropTypes from 'prop-types';
44
import { useFieldApi } from '@data-driven-forms/react-form-renderer';
55
import FormGroup from '../form-group/form-group';
6-
import showError from '../show-error/show-error';
76

87
const DatePicker = (props) => {
98
const {
@@ -33,14 +32,11 @@ const DatePicker = (props) => {
3332
id={id || input.name}
3433
FormGroupProps={FormGroupProps}
3534
>
36-
<TextInput
35+
<PF4DatePicker
3736
{...input}
38-
{...showError(meta, validateOnMount)}
3937
{...rest}
40-
type="date"
4138
id={id || input.name}
42-
isReadOnly={isReadOnly}
43-
isDisabled={isDisabled}
39+
isDisabled={isDisabled || isReadOnly}
4440
/>
4541
</FormGroup>
4642
);

‎packages/pf4-component-mapper/src/tests/form-fields.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ describe('FormFields', () => {
312312
.first()
313313
.props().disabled
314314
).toEqual(true);
315-
} else if ([componentTypes.CHECKBOX, componentTypes.RADIO, componentTypes.SWITCH, componentTypes.SLIDER].includes(component)) {
315+
} else if ([componentTypes.DATE_PICKER, componentTypes.TIME_PICKER, componentTypes.CHECKBOX, componentTypes.RADIO, componentTypes.SWITCH, componentTypes.SLIDER].includes(component)) {
316316
expect(
317317
wrapper
318318
.find('input')

‎packages/pf4-component-mapper/src/tests/form-template-common.test.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ describe('FormTemplate PF4 Common', () => {
143143
onSubmit={jest.fn}
144144
FormTemplate={FormTemplate}
145145
initialValues={expectedValues}
146+
componentMapper={{}}
146147
/>
147148
);
148149

‎packages/pf4-component-mapper/src/time-picker/time-picker.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import React from 'react';
22
import FormGroup from '../form-group/form-group';
3-
import { TextInput } from '@patternfly/react-core';
3+
import { TimePicker as PF4TimePicker } from '@patternfly/react-core';
44
import { useFieldApi } from '@data-driven-forms/react-form-renderer';
55
import PropTypes from 'prop-types';
6-
import showError from '../show-error/show-error';
76

87
const TimePicker = (props) => {
98
const {
@@ -33,14 +32,12 @@ const TimePicker = (props) => {
3332
id={id || input.name}
3433
FormGroupProps={FormGroupProps}
3534
>
36-
<TextInput
37-
{...showError(meta, validateOnMount)}
35+
<PF4TimePicker
3836
{...input}
37+
defaultTime={input.value}
3938
{...rest}
40-
type="time"
4139
id={id || input.name}
42-
isReadOnly={isReadOnly}
43-
isDisabled={isDisabled}
40+
isDisabled={isDisabled || isReadOnly}
4441
/>
4542
</FormGroup>
4643
);

‎packages/suir-component-mapper/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"webpack-merge": "^4.1.4"
5555
},
5656
"peerDependencies": {
57-
"@data-driven-forms/react-form-renderer": ">=2.2.0",
57+
"@data-driven-forms/react-form-renderer": ">=3.2.1",
5858
"react": ">=16.13.1",
5959
"react-dom": ">=16.13.1",
6060
"semantic-ui-react": "^0.88.2"

‎yarn.lock

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3399,33 +3399,33 @@
33993399
resolved "https://registry.yarnpkg.com/@opentelemetry/context-base/-/context-base-0.14.0.tgz#c67fc20a4d891447ca1a855d7d70fa79a3533001"
34003400
integrity sha512-sDOAZcYwynHFTbLo6n8kIbLiVF3a3BLkrmehJUyEbT9F+Smbi47kLGS2gG2g0fjBLR/Lr1InPD7kXL7FaTqEkw==
34013401

3402-
"@patternfly/react-core@^4.90.2":
3403-
version "4.90.2"
3404-
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-4.90.2.tgz#d03346d8f3a8d785e076b93df296ce4fa79d9dbe"
3405-
integrity sha512-Ld4HCXYrVZR+ycWKvygmOEDyyMpb/pfZFklJiT/9ktSSSU9SfKwH2XmXotgjwBy1lYUoRYJ58xTpV19duouEoA==
3406-
dependencies:
3407-
"@patternfly/react-icons" "^4.8.4"
3408-
"@patternfly/react-styles" "^4.7.29"
3409-
"@patternfly/react-tokens" "^4.9.26"
3402+
"@patternfly/react-core@^4.101.3":
3403+
version "4.101.3"
3404+
resolved "https://registry.yarnpkg.com/@patternfly/react-core/-/react-core-4.101.3.tgz#aecf6c0e05f4e4811e5d1d55cae9725d51440026"
3405+
integrity sha512-xmBzwtpTHjykwahWVEc+xlqEJ7k+g90EYlLDSIFhNylnoq6iAka8cWbiRWuxOzAIwmk4UrKy2lOYP/Ff5A8ZCw==
3406+
dependencies:
3407+
"@patternfly/react-icons" "^4.9.5"
3408+
"@patternfly/react-styles" "^4.8.5"
3409+
"@patternfly/react-tokens" "^4.10.5"
34103410
focus-trap "6.2.2"
34113411
react-dropzone "9.0.0"
34123412
tippy.js "5.1.2"
34133413
tslib "1.13.0"
34143414

3415-
"@patternfly/react-icons@^4.8.4":
3416-
version "4.8.4"
3417-
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.8.4.tgz#2917088b29dda5843872321ae222fb96302ec6a0"
3418-
integrity sha512-nGrZ6F57drim7t5FlFz7YusHVs8xngiayB20oSsJeewppOZ3vJDVhHaiJjsIRMB9PcVOY99QT2wnyiY1eYPVyA==
3415+
"@patternfly/react-icons@^4.9.5":
3416+
version "4.9.5"
3417+
resolved "https://registry.yarnpkg.com/@patternfly/react-icons/-/react-icons-4.9.5.tgz#4f727ed1c161ba6932abd3fa7bddb0e03bca5ec1"
3418+
integrity sha512-5M6yBW2v0d7WDuW7AyR//84iFxz7CBp5clGReYS/2SNwBGX+TwWoedS8EM06xtLSKCMrTQG1lqeyZASn6KyoMA==
34193419

3420-
"@patternfly/react-styles@^4.7.29":
3421-
version "4.7.29"
3422-
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.7.29.tgz#a11cc8a9d4c4a0ac9c6bc298a47477473eaa430c"
3423-
integrity sha512-eAO9xh2+IQHIBCihmwNuDVCeAWhGXIhbUNJEwZzvevYuH4Pnl0X8YaWoYmM2ZfL8ZdagRTLvjGW+hoZGkUyCBQ==
3420+
"@patternfly/react-styles@^4.8.5":
3421+
version "4.8.5"
3422+
resolved "https://registry.yarnpkg.com/@patternfly/react-styles/-/react-styles-4.8.5.tgz#2e7579768d1b1e5d244ee9af6fd78524fc1e3e22"
3423+
integrity sha512-ANJoOJpcO0R7DY0CsTHMWaZfiLoMfMKu36ctnVnheJ3YfZievCo6O8mztNBB6QLhJvF/PrirJ8yffyVxOopT5w==
34243424

3425-
"@patternfly/react-tokens@^4.9.26":
3426-
version "4.9.26"
3427-
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.9.26.tgz#320759bceef71ff752d79acea278c6cdada9e51f"
3428-
integrity sha512-SSbY6BaUb7ycXhvdBNk2yzOlteRUHnchHSYPBFvhUk+SqpsjQ7j13/ZTok6pcHXrcj3FaL9f82/ep4eTXPzmWg==
3425+
"@patternfly/react-tokens@^4.10.5":
3426+
version "4.10.5"
3427+
resolved "https://registry.yarnpkg.com/@patternfly/react-tokens/-/react-tokens-4.10.5.tgz#be8cccc1d350e0583a28b65914aefcfddfc8197c"
3428+
integrity sha512-/lJRrC1asoaMSJVt1e5eZNn+y87x0q9WzeKx+aMi44RmJLwRLSNYGe8CxZiOUP1gw45jpzjRAbLihU+AGESckg==
34293429

34303430
"@polka/url@^1.0.0-next.9":
34313431
version "1.0.0-next.11"

0 commit comments

Comments
 (0)