Skip to content

Commit 8ddf15a

Browse files
aabidsofi19aabidsofi19
authored
Merge pull request #566 from aabidsofi19/custom-modal
feat : Create Custom modal and Stepper
2 parents 897d6ab + 2cab09f commit 8ddf15a

File tree

11 files changed

+6079
-5734
lines changed

11 files changed

+6079
-5734
lines changed

‎Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ package-setup:
88
package-build: setup
99
npm run build
1010

11+
package-build-watch: setup
12+
npm run build:watch
13+
1114
package-format-check:
1215
npm run format:check
1316

@@ -26,4 +29,4 @@ version-minor:
2629

2730
# Create a major versio of packages
2831
version-major:
29-
npm run versionup:major
32+
npm run versionup:major

‎package.json

+96-95
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,104 @@
11
{
2-
"name": "@layer5/sistent",
3-
"version": "0.14.11",
4-
"description": "Reusable React Components and SVG Icons library",
5-
"repository": {
6-
"type": "git",
7-
"url": "git+ssh://[email protected]/layer5io/sistent.git"
8-
},
9-
"main": "./dist/index.js",
10-
"module": "./dist/index..js",
11-
"types": "./dist/index.d.ts",
12-
"files": [
13-
"dist"
14-
],
15-
"scripts": {
16-
"build": "NODE_ENV=production tsup",
17-
"commitlint": "commitlint --edit",
18-
"coverage": "jest --coverage",
19-
"dev": "NODE_ENV=development tsup",
20-
"format:check": "prettier --check \"**/*.{ts,tsx,md}\" --config ./.prettierrc",
21-
"format:write": "prettier --write \"**/*.{ts,tsx,md}\" --config ./.prettierrc",
22-
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
23-
"lint:fix": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0 --fix",
24-
"prepare": "husky install",
25-
"test": "jest",
26-
"versionup:major": "npm version major",
27-
"versionup:minor": "npm version minor",
28-
"versionup:patch": "npm version patch"
29-
},
30-
"lint-staged": {
31-
"*.{ts,tsx,md}": [
32-
"prettier --write",
33-
"eslint --fix"
34-
]
35-
},
36-
"config": {
37-
"commitizen": {
38-
"path": "./node_modules/cz-conventional-changelog"
39-
}
40-
},
41-
"devDependencies": {
42-
"@commitlint/cli": "^17.7.2",
43-
"@commitlint/config-conventional": "^17.7.0",
44-
"@mui/icons-material": "^5.15.11",
45-
"@testing-library/react": "^14.1.2",
46-
"@types/jest": "^29.5.11",
47-
"@types/react": "^18.2.45",
48-
"@types/react-dom": "^18.2.18",
49-
"@typescript-eslint/eslint-plugin": "^6.12.0",
50-
"@typescript-eslint/parser": "^6.12.0",
51-
"commitizen": "^4.3.0",
52-
"cz-conventional-changelog": "^3.3.0",
53-
"eslint": "^8.49.0",
54-
"eslint-plugin-react": "^7.33.2",
55-
"eslint-plugin-react-hooks": "^4.6.0",
56-
"eslint-plugin-react-refresh": "^0.4.4",
57-
"eslint-plugin-storybook": "^0.6.15",
58-
"husky": "^8.0.0",
59-
"jest": "^29.7.0",
60-
"jest-environment-jsdom": "^29.7.0",
61-
"lint-staged": "^14.0.1",
62-
"mui-datatables": "^4.3.0",
63-
"notistack": "^3.0.1",
64-
"prettier": "^3.0.3",
65-
"prettier-plugin-organize-imports": "^3.2.3",
66-
"react-error-boundary": "^4.0.12",
67-
"ts-jest": "^29.1.1",
68-
"tsup": "^8.0.1",
69-
"typescript": "^5.3.3"
70-
},
71-
"peerDependencies": {
72-
"@emotion/react": "^11.11.3",
73-
"@emotion/styled": "^11.11.0",
74-
"@mui/material": "^5.15.11",
75-
"@types/mui-datatables": "*",
76-
"mui-datatables": "*",
77-
"react": ">=17",
78-
"react-dom": ">=17"
79-
},
80-
"peerDependenciesMeta": {
81-
"@emotion/react": {
82-
"optional": true
2+
"name": "@layer5/sistent",
3+
"version": "0.14.11",
4+
"description": "Reusable React Components and SVG Icons library",
5+
"repository": {
6+
"type": "git",
7+
"url": "git+ssh://[email protected]/layer5io/sistent.git"
8+
},
9+
"main": "./dist/index.js",
10+
"module": "./dist/index..js",
11+
"types": "./dist/index.d.ts",
12+
"files": [
13+
"dist"
14+
],
15+
"scripts": {
16+
"build": "NODE_ENV=production tsup",
17+
"build:watch": "NODE_ENV=production tsup --watch",
18+
"commitlint": "commitlint --edit",
19+
"coverage": "jest --coverage",
20+
"dev": "NODE_ENV=development tsup",
21+
"format:check": "prettier --check \"**/*.{ts,tsx,md}\" --config ./.prettierrc",
22+
"format:write": "prettier --write \"**/*.{ts,tsx,md}\" --config ./.prettierrc",
23+
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
24+
"lint:fix": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0 --fix",
25+
"prepare": "husky install",
26+
"test": "jest",
27+
"versionup:major": "npm version major",
28+
"versionup:minor": "npm version minor",
29+
"versionup:patch": "npm version patch"
30+
},
31+
"lint-staged": {
32+
"*.{ts,tsx,md}": [
33+
"prettier --write",
34+
"eslint --fix"
35+
]
8336
},
84-
"@emotion/styled": {
85-
"optional": true
37+
"config": {
38+
"commitizen": {
39+
"path": "./node_modules/cz-conventional-changelog"
40+
}
8641
},
87-
"@mui/material": {
88-
"optional": true
42+
"devDependencies": {
43+
"@commitlint/cli": "^17.7.2",
44+
"@commitlint/config-conventional": "^17.7.0",
45+
"@mui/icons-material": "^5.15.11",
46+
"@testing-library/react": "^14.1.2",
47+
"@types/jest": "^29.5.11",
48+
"@types/react": "^18.2.45",
49+
"@types/react-dom": "^18.2.18",
50+
"@typescript-eslint/eslint-plugin": "^6.12.0",
51+
"@typescript-eslint/parser": "^6.12.0",
52+
"commitizen": "^4.3.0",
53+
"cz-conventional-changelog": "^3.3.0",
54+
"eslint": "^8.49.0",
55+
"eslint-plugin-react": "^7.33.2",
56+
"eslint-plugin-react-hooks": "^4.6.0",
57+
"eslint-plugin-react-refresh": "^0.4.4",
58+
"eslint-plugin-storybook": "^0.6.15",
59+
"husky": "^8.0.0",
60+
"jest": "^29.7.0",
61+
"jest-environment-jsdom": "^29.7.0",
62+
"lint-staged": "^14.0.1",
63+
"mui-datatables": "^4.3.0",
64+
"notistack": "^3.0.1",
65+
"prettier": "^3.0.3",
66+
"prettier-plugin-organize-imports": "^3.2.3",
67+
"react-error-boundary": "^4.0.12",
68+
"ts-jest": "^29.1.1",
69+
"tsup": "^8.0.1",
70+
"typescript": "^5.3.3"
8971
},
90-
"mui-datatables": {
91-
"optional": true
72+
"peerDependencies": {
73+
"@emotion/react": "^11.11.3",
74+
"@emotion/styled": "^11.11.0",
75+
"@mui/material": "^5.15.11",
76+
"@types/mui-datatables": "*",
77+
"mui-datatables": "*",
78+
"react": ">=17",
79+
"react-dom": ">=17"
9280
},
93-
"react": {
94-
"optional": true
81+
"peerDependenciesMeta": {
82+
"@emotion/react": {
83+
"optional": true
84+
},
85+
"@emotion/styled": {
86+
"optional": true
87+
},
88+
"@mui/material": {
89+
"optional": true
90+
},
91+
"mui-datatables": {
92+
"optional": true
93+
},
94+
"react": {
95+
"optional": true
96+
},
97+
"react-dom": {
98+
"optional": true
99+
}
95100
},
96-
"react-dom": {
97-
"optional": true
101+
"publishConfig": {
102+
"access": "public"
98103
}
99-
},
100-
"publishConfig": {
101-
"access": "public"
102-
}
103104
}

‎src/base/Button/Button.tsx

+16
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,20 @@ export function Button({ label, children, ...props }: ButtonProps): JSX.Element
1414
);
1515
}
1616

17+
export const ContainedButton = (props: ButtonProps): JSX.Element => (
18+
<Button variant="contained" {...props}>
19+
{props.children}
20+
</Button>
21+
);
22+
export const OutlinedButton = (props: ButtonProps): JSX.Element => (
23+
<Button variant="outlined" {...props}>
24+
{props.children}
25+
</Button>
26+
);
27+
export const TextButton = (props: ButtonProps): JSX.Element => (
28+
<Button variant="text" {...props}>
29+
{props.children}
30+
</Button>
31+
);
32+
1733
export default Button;

0 commit comments

Comments
 (0)