Skip to content

Commit

Permalink
Merge branch 'main' into f/FE-59/add-numeric-control
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanFarmer authored Mar 11, 2024
2 parents 2a2cd8e + f7c56a7 commit bda4779
Show file tree
Hide file tree
Showing 14 changed files with 322 additions and 578 deletions.
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@
"build-storybook": "storybook build"
},
"peerDependencies": {
"react": "^17 || ^18",
"@ant-design/icons": "^5.3.0",
"@jsonforms/core": "^3.2.1",
"@jsonforms/react": "^3.2.1",
"@ant-design/icons": "^5.3.0",
"antd": "^5.14.0"
"@types/lodash.isempty": "^4.4.9",
"antd": "^5.14.0",
"lodash.isempty": "^4.4.0",
"react": "^17 || ^18"
},
"devDependencies": {
"@ant-design/icons": "^5.3.0",
Expand All @@ -51,6 +53,7 @@
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@testing-library/user-event": "^14.5.2",
"@types/lodash.isempty": "^4.4.9",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"@typescript-eslint/eslint-plugin": "^6.14.0",
Expand All @@ -64,6 +67,7 @@
"eslint-plugin-storybook": "^0.6.15",
"jsdom": "^24.0.0",
"json-schema-to-ts": "^3.0.0",
"lodash.isempty": "^4.4.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"storybook": "^7.6.8",
Expand Down
16 changes: 16 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

163 changes: 0 additions & 163 deletions src/controls/NumberControl.test.tsx

This file was deleted.

5 changes: 0 additions & 5 deletions src/controls/NumberControl.tsx

This file was deleted.

55 changes: 0 additions & 55 deletions src/controls/NumericControl.test.tsx

This file was deleted.

Loading

0 comments on commit bda4779

Please sign in to comment.