Skip to content

Commit 77b6fb9

Browse files
Jakub007dJakub007d
committed
resolving conflicts
2 parents 51989be + e03943e commit 77b6fb9

File tree

50 files changed

+514
-716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+514
-716
lines changed

‎config/jest.setup.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,8 @@ Object.defineProperty(window, 'matchMedia', {
1616
dispatchEvent: jest.fn(),
1717
})),
1818
});
19+
global.ResizeObserver = jest.fn().mockImplementation(() => ({
20+
observe: jest.fn(),
21+
unobserve: jest.fn(),
22+
disconnect: jest.fn(),
23+
}));

‎package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@
123123
"webpack-cli": "^4.9.1",
124124
"webpack-dev-server": "^4.7.3"
125125
},
126+
"resolutions": {
127+
"react-is": "^19.0.0"
128+
},
126129
"dependencies": {
127130
"ts-node": "^10.9.1"
128131
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@data-driven-forms/ant-component-mapper",
3-
"version": "4.1.1",
3+
"version": "4.1.2",
44
"description": "Ant Design React component mapper for Data Driven Forms.",
55
"main": "index.js",
66
"module": "esm/index.js",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@data-driven-forms/blueprint-component-mapper",
3-
"version": "4.1.1",
3+
"version": "4.1.2",
44
"description": "BlueprintJS React component mapper for Data Driven Forms.",
55
"main": "index.js",
66
"module": "esm/index.js",

‎packages/carbon-component-mapper/demo/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<meta http-equiv="X-UA-Compatible" content="ie=edge">
7-
<link rel="stylesheet" href="https://unpkg.com/carbon-components/css/carbon-components.min.css">
7+
<link rel="stylesheet" href="https://unpkg.com/@carbon/styles/css/styles.min.css">
88
<title>Data driven forms</title>
99
</head>
1010
<body>

‎packages/carbon-component-mapper/demo/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { wizardSchema } from './demo-schemas/wizard-schema';
77
import sandboxSchema from './demo-schemas/sandbox';
88
import demoSchema from '../../../shared/demoschema';
99

10-
import { Button } from 'carbon-components-react';
10+
import { Button } from '@carbon/react';
1111

1212
const fieldArrayState = {
1313
schema: arraySchemaDDF,

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@data-driven-forms/carbon-component-mapper",
3-
"version": "4.1.1",
3+
"version": "4.1.2",
44
"description": "Carbon React component mapper for Data Driven Forms.",
55
"main": "index.js",
66
"module": "esm/index.js",
@@ -28,11 +28,7 @@
2828
"javascript"
2929
],
3030
"devDependencies": {
31-
"@carbon/icons-react": "^10.41.0",
32-
"@types/carbon-components-react": "^7.44.1",
33-
"carbon-components": "^10.46.0",
34-
"carbon-components-react": "^7.46.0",
35-
"carbon-icons": "^7.0.7"
31+
"@carbon/react": "^1.95.0"
3632
},
3733
"peerDependencies": {
3834
"react": "^17.0.2 || ^18.0.0 || ^19.0.0",

‎packages/carbon-component-mapper/src/checkbox/checkbox.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-render
22
import { ReactNode } from "react";
33
import { FormGroupProps } from "../form-group";
44

5-
import { CheckboxProps as CarbonCheckboxProps } from 'carbon-components-react';
5+
import { CheckboxProps as CarbonCheckboxProps } from '@carbon/react';
66

77
export interface CheckboxOption extends CarbonCheckboxProps {
88
value?: any;

‎packages/carbon-component-mapper/src/checkbox/checkbox.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from 'react';
22
import { useFieldApi } from '@data-driven-forms/react-form-renderer';
33
import MultipleChoiceListCommon from '@data-driven-forms/common/multiple-choice-list';
44

5-
import { Checkbox as CarbonCheckbox, FormGroup } from 'carbon-components-react';
5+
import { Checkbox as CarbonCheckbox, FormGroup } from '@carbon/react';
66

77
import WithDescription from '../with-description';
88
import prepareProps, { buildLabel } from '../prepare-props';
@@ -33,7 +33,7 @@ const SingleCheckbox = (props) => {
3333
};
3434

3535
const SingleCheckboxInCommon = ({ label, isDisabled, id, meta, option: { value, name, ...rest }, onChange, ...props }) => (
36-
<CarbonCheckbox id={id} labelText={label} disabled={isDisabled} {...props} {...rest} onChange={(_value, _name, event) => onChange(event)} />
36+
<CarbonCheckbox id={id} labelText={label} disabled={isDisabled} {...props} {...rest} onChange={(event, data) => onChange(event, data)} />
3737
);
3838

3939
const Checkbox = ({ options, ...props }) =>

‎packages/carbon-component-mapper/src/date-picker/date-picker.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FormGroupProps } from "../form-group";
22
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
33

4-
import { DatePickerProps as CarbonDatePickerProps, DatePickerInputProps } from 'carbon-components-react';
4+
import { DatePickerProps as CarbonDatePickerProps, DatePickerInputProps } from '@carbon/react';
55

66
interface InternalDatePickerProps extends DatePickerInputProps {
77
datePickerType?: string;

0 commit comments

Comments
 (0)