armtek-uikit-react 1.0.21 → 1.0.23

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;
@@ -253,8 +262,12 @@
     }
   }
 }
+
 .button_grouped_column{
   border-radius: 0;
+  &:not(:first-child){
+    border-top-color: transparent;
+  }
   &:first-child{
     border-top-left-radius: $radius;
     border-top-right-radius: $radius;

package/assets/ButtonGroup.scss

@@ -9,4 +9,4 @@
 }
 .button_group_column{
   flex-direction: column;
-}
+}

package/package.json

@@ -1 +1 @@
-{"name":"armtek-uikit-react","version":"1.0.21","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.23","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/AvatarGroup/AvatarGroup.d.ts

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { AvatarProps } from '../Avatar/Avatar';
+import { AvatarProps } from '../../ui/Avatar/Avatar';
 export type AvatarGroupProps = {
     limit?: number;
     children: ReactNode;

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/ButtonGroup/ButtonGroup.d.ts

@@ -1,6 +1,6 @@
-import { HTMLAttributes } from 'react';
+import { ButtonProps } from '../../ui/Button';
 type PropsType = {
     orientation?: 'column' | 'inline';
-} & HTMLAttributes<HTMLDivElement>;
+} & ButtonProps;
 declare const ButtonGroup: (props: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default ButtonGroup;

package/ui/ButtonGroup/ButtonGroup.js

@@ -1,5 +1,6 @@
+import { Children, cloneElement, isValidElement } from 'react';
 import clsx from 'clsx';
-import css from "../Button/Button.module.scss";
+import css from "./ButtonGroup.module.scss";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 const ButtonGroupClasses = ['button_group', 'button_group_inline', 'button_group_column'];
@@ -11,13 +12,20 @@ const ButtonGroup = props => {
     orientation = 'inline',
     className,
     children,
-    ...restProps
+    ...buttonProps
   } = props;
+  let arrChildren = Children.toArray(children);
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx("div", {
-      ...restProps,
       className: clsx(css.button_group, css['button_group_' + orientation], className),
-      children: children
+      children: arrChildren.map((item, index) => {
+        return /*#__PURE__*/isValidElement(item) && /*#__PURE__*/cloneElement(item, {
+          ...item.props,
+          ...buttonProps,
+          group: orientation,
+          key: index
+        });
+      })
     })
   });
 };