added corner edge

opensrc0 · Dec 7, 2023 · 0c6ff8c · 0c6ff8c
1 parent 0708c27
commit 0c6ff8c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ theme.fontFamily = {};
 theme.fontSize = {};
 theme.fontWeight = {};
 theme.display = {};
-theme.borderRadius = '';
+theme.cornerEdge = '';
 theme.pxScale = '';
 
 export default theme;

diff --git a/__application/component/Button/Button.js b/__application/component/Button/Button.js
@@ -59,10 +59,10 @@ const styles = {
   },
   borderRadius(props) {
     if (props.shape === 'bluntEdged') {
-      return props.theme.borderRadius;
+      return props.theme.cornerEdge;
     }
     if (props.shape === 'sharpEdged') {
-      return '2px';
+      return '0';
     }
     if (props.shape === 'capsular') {
       return props.theme.px(10);
@@ -178,27 +178,29 @@ function Button({ label, disabled, className, onClick, spin, ...props }) {
 Button.propTypes = {
   label: PropTypes.string,
   onClick: PropTypes.func,
-  type: PropTypes.oneOf(['submit', 'button']),
-  kind: PropTypes.oneOf(['filled', 'outlined']),
-  size: PropTypes.oneOf(['small', 'medium', 'large']),
-  shape: PropTypes.oneOf(['bluntEdged', 'sharpEdged', 'capsular', 'circular']),
   fluid: PropTypes.bool,
   disabled: PropTypes.bool,
   spin: PropTypes.bool,
   className: PropTypes.string,
+  type: PropTypes.oneOf(['submit', 'button']),
+  variant: PropTypes.oneOf(['primary', 'secondary', 'tertiary', 'quaternary']),
+  shape: PropTypes.oneOf(['bluntEdged', 'sharpEdged', 'capsular', 'circular']),
+  size: PropTypes.oneOf(['small', 'medium', 'large']),
+
+  // kind: PropTypes.oneOf(['filled', 'outlined']),
 };
 
 Button.defaultProps = {
   label: 'Button',
   onClick: () => {},
-  type: 'submit',
-  kind: 'filled',
-  size: 'medium',
-  shape: 'bluntEdged',
   fluid: false,
   disabled: false,
   spin: false,
   className: '',
+  type: 'submit',
+  variant: 'primary',
+  size: 'medium',
+  shape: 'bluntEdged',
 };
 
 export default Button;
diff --git a/__application/component/Init/Init.js b/__application/component/Init/Init.js
@@ -24,7 +24,7 @@ export default function Init(userTheme) {
       ...userTheme?.display,
     },
 
-    borderRadius: userTheme?.borderRadius || defaultTheme.color,
+    cornerEdge: userTheme?.cornerEdge || defaultTheme.cornerEdge,
 
     pxScale: userTheme?.pxScale || defaultTheme.pxScale,
 

diff --git a/__application/component/Input/Input.js b/__application/component/Input/Input.js
@@ -7,7 +7,7 @@ import theme from '../theme';
 const styles = {
   borderRadius(props) {
     if (props.shape === 'bluntEdged') {
-      return theme.borderRadius;
+      return theme.cornerEdge;
     }
     if (props.shape === 'sharpEdged') {
       return '2px';

diff --git a/__application/component/WIP-Chip/Chip.js b/__application/component/WIP-Chip/Chip.js
@@ -23,7 +23,7 @@ const styles = {
   },
   borderRadius(props) {
     if (props.shape === 'bluntEdged') {
-      return props.theme.borderRadius;
+      return props.theme.cornerEdge;
     }
     if (props.shape === 'sharpEdged') {
       return '0';

diff --git a/__application/component/theme/theme.js b/__application/component/theme/theme.js
@@ -18,7 +18,7 @@ theme.display = {
   none: 'none',
 };
 
-theme.borderRadius = '8px';
+theme.cornerEdge = '8px';
 
 theme.pxScale = 8;
 

diff --git a/sample-theme.js b/sample-theme.js
@@ -18,7 +18,7 @@ theme.fontFamily = {};
 theme.fontSize = {};
 theme.fontWeight = {};
 theme.display = {};
-theme.borderRadius = '';
+theme.cornerEdge = '';
 theme.pxScale = '';
 
 export default theme;