armtek-uikit-react 1.0.20 → 1.0.22

package/assets/Button.scss

@@ -18,6 +18,12 @@
     cursor: initial;
   }
 }
+.button_radius_none{
+  border-radius: 0;
+}
+.button_radius_full{
+  border-radius: 30px;
+}
 .button_contained {
   &.button_primary{
     color: #fff;
@@ -164,7 +170,10 @@
 }
 
 .button__adornment{
-  font-size: inherit;
+  font-size: 0;
+  & > * {
+    font-size: 20px;
+  }
 }
 .button__adornment_end{
   margin-left: $size-step;

package/assets/ButtonIcon.scss

@@ -8,15 +8,15 @@
   align-items: center;
   justify-content: center;
   font-size: 30px;
-  &.button_large{
+  &.button_icon_large{
     width: $size-large;
     font-size: 24px;
   }
-  &.button_medium{
+  &.button_icon_medium{
     width: $size-medium;
     font-size: 20px;
   }
-  &.button_small{
+  &.button_icon_small{
     width: $size-small;
     padding: calc($size-step / 2);
     font-size: 16px;

package/assets/variables.scss

@@ -53,7 +53,7 @@ $color-red-50: #FFF0F1;
 
 $box-shadow: 0px 8px 10px 0px rgba(0, 0, 0, 0.1);
 
-:root{
+.app{
   --font-family: 'Roboto';
   --size-elarge: 56px;
   --size-large: 42px;

package/package.json

@@ -1 +1 @@
-{"name":"armtek-uikit-react","version":"1.0.20","description":"Armtek UIKit for React","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"rc-slider":"^10.2.1","react":"*","react-datepicker":"^4.16.0","react-dom":"*"},"peerDependencies":{"react":"*","react-dom":"*"},"scripts":{"pub":"npm version patch && npm publish"}}
+{"name":"armtek-uikit-react","version":"1.0.22","description":"Armtek UIKit for React","repository":{"type":"git","url":"ssh://git@gl.corp:10022/int/uikit/uikit_react.git"},"author":"","license":"ISC","dependencies":{"rc-slider":"^10.2.1","react":"*","react-datepicker":"^4.16.0","react-dom":"*"},"peerDependencies":{"react":"*","react-dom":"*"},"scripts":{"pub":"npm version patch && npm publish"}}

package/ui/Button/Button.d.ts

@@ -8,6 +8,7 @@ type OwnProps<T extends ElementType = ElementType> = {
     startAdornment?: string | ReactNode;
     endAdornment?: string | ReactNode;
     group?: 'inline' | 'column';
+    radius?: boolean;
     as?: T;
 };
 export type ButtonProps<T extends ElementType = ElementType<HTMLAttributes<HTMLButtonElement>>> = OwnProps<T> & Omit<ComponentPropsWithoutRef<T>, keyof OwnProps>;

package/ui/Button/Button.js

@@ -17,6 +17,7 @@ const Button = props => {
     children,
     className,
     group,
+    radius,
     as,
     ...restProps
   } = props;
@@ -25,7 +26,9 @@ const Button = props => {
     children: /*#__PURE__*/_jsxs(Component, {
       ...restProps,
       className: clsx(css.button, css['button_' + size], css['button_' + variant], css['button_' + color], className, {
-        [css['button_grouped_' + group]]: group
+        [css['button_grouped_' + group]]: group,
+        [css.button_radius_none]: radius === false,
+        [css.button_radius_full]: radius === true
       }),
       children: [startAdornment && /*#__PURE__*/_jsx("div", {
         className: clsx(css.button__adornment, css.button__adornment_start),

package/ui/ButtonIcon/ButtonIcon.js

@@ -11,7 +11,7 @@ const ButtonIcon = props => {
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(Button, {
       ...props,
-      className: clsx(css.button_icon, props.className),
+      className: clsx(css.button_icon, css['button_icon_' + props.size], props.className),
       children: props.children
     })
   });