Skip to content

Commit 13b8f2f

Browse files
committed
Merge branch 'main' of github.com:vip-git/react-jsonschema-form-material-ui into universal-schema
2 parents a4d554a + 05a5e9d commit 13b8f2f

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,4 @@ LICENSE
2121
.eslintrc.js
2222
browserstack.js
2323
src/generated
24+
demo/

.github/workflows/node.js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/setup-node@v1
2929
with:
3030
node-version: ${{ matrix.node-version }}
31-
- run: npm install
31+
- run: npm install --force
3232
- run: npm run build
3333
- run: npx jest --env=jsdom --config=jest.config.js --coverage --ci --updateSnapshot --detectOpenHandles --forceExit
3434
- name: Codecov

src/cross-framework-wrapper/react/FieldSet/__tests__/FieldSet.spec.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ describe('FieldSet', () => {
261261
expect(ffComp.at(1).prop('last')).toBe(true);
262262
const addButton = wrapper.find(IconButton);
263263
expect(addButton).toHaveLength(3);
264-
addButton.at(2).simulate('click');
264+
expect(addButton.at(2).prop('onClick')).toBe(undefined);
265265
expect(onAddItem).toBeCalledWith(path, defaultValue);
266266
});
267267

@@ -427,9 +427,9 @@ describe('FieldSet', () => {
427427
expect(buttonList).toHaveLength(3);
428428
buttonList.at(0).prop('onClick')();
429429
expect(onMoveItemUp).toHaveBeenCalled();
430-
buttonList.at(1).simulate('click');
430+
buttonList.at(1).prop('onClick')();
431431
expect(onMoveItemDown).toHaveBeenCalled();
432-
buttonList.at(2).simulate('click');
432+
buttonList.at(2).prop('onClick')();
433433
expect(onDeleteItem).toHaveBeenCalled();
434434
});
435435
it('ReorderControls - first', () => {

src/cross-framework-wrapper/react/FieldSet/variants/fieldset-array/field-array.wrappers.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const RENDER_ARRAY_WRAPPER = ({
4141
}
4242
return Utils.callFunctionIfExists(
4343
FIELDSET_ARRAY_VARIANTS,
44-
'hasReorderableButtons',
44+
ARRAY_VARIANTS.HAS_REORDERABLE_BUTTONS,
4545
{
4646
path,
4747
schema,
@@ -60,7 +60,7 @@ const RENDER_ARRAY_WRAPPER = ({
6060
})}
6161
{(!isRecursiveHole() || allowRecursive) && Utils.callFunctionIfExists(
6262
FIELDSET_ARRAY_VARIANTS,
63-
'addNewButton',
63+
ARRAY_VARIANTS.ADD_NEW_BUTTON,
6464
{
6565
classes,
6666
uiSchema,
@@ -88,7 +88,7 @@ const RENDER_ARRAY_WRAPPER = ({
8888
}),
8989
[ARRAY_VARIANTS.HAS_ENUM_VALUES]: () => Utils.callFunctionIfExists(
9090
FIELDSET_ARRAY_VARIANTS,
91-
'hasEnumValues',
91+
ARRAY_VARIANTS.HAS_ENUM_VALUES,
9292
{
9393
path,
9494
schema,

src/helpers/enzyme-unit-test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { defaultTheme } from '../form-styles';
1111
export const mountTheme = ({ component }) => mount(
1212
<StyledEngineProvider injectFirst>
1313
<ThemeProvider theme={createTheme(defaultTheme)}>
14-
<LocalizationProvider dateAdapter={AdapterMoment}>
14+
<LocalizationProvider dateAdapter={AdapterMoment as any}>
1515
{component}
1616
</LocalizationProvider>
1717
</ThemeProvider>
@@ -21,7 +21,7 @@ export const mountTheme = ({ component }) => mount(
2121
export const shallowTheme = ({ component }) => shallow(
2222
<StyledEngineProvider injectFirst>
2323
<ThemeProvider theme={createTheme(defaultTheme)}>
24-
<LocalizationProvider dateAdapter={AdapterMoment}>
24+
<LocalizationProvider dateAdapter={AdapterMoment as any}>
2525
{component}
2626
</LocalizationProvider>
2727
</ThemeProvider>

tsconfig.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@framework/*": ["./src/framework/*"],
1313
},
1414
"forceConsistentCasingInFileNames": true,
15-
"module": "esnext",
15+
"module": "es6",
1616
"moduleResolution": "node",
1717
"preserveConstEnums": true,
1818
"declaration": true,
@@ -21,7 +21,7 @@
2121
"noLib": false,
2222
"emitDecoratorMetadata": true,
2323
"experimentalDecorators": true,
24-
"target": "esnext",
24+
"target": "es6",
2525
"resolveJsonModule": true,
2626
"sourceMap": true,
2727
"allowJs": true,
@@ -53,4 +53,4 @@
5353
"src/**/*",
5454
"node_modules/selection-is-backward/*"
5555
]
56-
}
56+
}

universal-json-schema.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ This document explains on how this project is aiming towards becoming "Universal
99
- React Native
1010
- Angular
1111
- Vue
12-
- Web Components
13-
- Ionic
12+
- Stencil JS (Web Components)
13+
- Svelte
1414
- Nativescript
1515

1616
- Logic
@@ -37,6 +37,7 @@ This document explains on how this project is aiming towards becoming "Universal
3737
- material-input
3838
- empty-div
3939
- ratings
40+
- ANT Design UI (Theme)
4041
- Semantic UI (Theme)
4142
- Bootstrap UI (Theme)
4243
- Fluent UI (Theme)

0 commit comments

Comments
 (0)