armtek-uikit-react 1.0.105 → 1.0.107

package/assets/Checkbox.scss

@@ -157,6 +157,7 @@
   }
   &.checkbox_secondary{
     &:before{
+      background: transparent;
       border-color: $color-secondary;
     }
     &:after{

package/assets/Icon.scss

@@ -18,4 +18,14 @@
 .Icon_color_success{color:var(--color-success)}
 .Icon_color_info{color:var(--color-info)}
 .Icon_color_warning{color:var(--color-warning)}
-.Icon_color_error{color:var(--color-error)}
+.Icon_color_error{color:var(--color-error)}
+
+.Icon_theme_dark {
+  //&.Icon_color_primary{color: var(--color-primary-contrast)}
+  //&.Icon_color_secondary{color: var(--color-secondary-contrast)}
+  &.Icon_color_neutral{color: var(--color-neutral-contrast)}
+  //&.Icon_color_success{color:var(--color-success-contrast)}
+  //&.Icon_color_info{color:var(--color-info-contrast)}
+  //&.Icon_color_warning{color:var(--color-warning-contrast)}
+  //&.Icon_color_error{color:var(--color-error-contrast)}
+}

package/assets/styles.scss

@@ -1,6 +1,7 @@
 //@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap');
 //@import url('https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200');
 
+@import "global.css";
 @import "variables";
 @import "Button";
 @import "Adornment";

package/package.json

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

package/ui/Form/Checkbox/Checkbox.d.ts

@@ -1,6 +1,6 @@
 import { InputHTMLAttributes, ReactNode } from 'react';
 import { ColorType, SizeType, ThemeType, VariantType } from '../../../types/theme';
-type BaseCheckboxPropsType = {
+type BaseCheckboxProps = {
     label?: string | ReactNode;
     size?: Exclude<SizeType, 'extraLarge'>;
     color?: ColorType;
@@ -8,6 +8,6 @@ type BaseCheckboxPropsType = {
     variant?: Exclude<VariantType, 'transparent'>;
     intermediate?: boolean;
 };
-export type CheckboxPropsType = BaseCheckboxPropsType & Omit<InputHTMLAttributes<any>, 'size'>;
-declare const Checkbox: (props: CheckboxPropsType) => import("react/jsx-runtime").JSX.Element;
+export type CheckboxProps = BaseCheckboxProps & Omit<InputHTMLAttributes<any>, 'size'>;
+declare const Checkbox: (props: CheckboxProps) => import("react/jsx-runtime").JSX.Element;
 export default Checkbox;

package/ui/Form/Checkbox/Checkbox.js

@@ -1,7 +1,7 @@
 "use client";
 
-import clsx from 'clsx';
 import { useState } from 'react';
+import clsx from 'clsx';
 import css from "./Checkbox.module.scss";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -22,34 +22,31 @@ const Checkbox = props => {
     ...inputProps
   } = props;
   let [checked, setChecked] = useState(!!props.defaultChecked);
-  const handleClick = e => {
-    if (!inputProps.disabled) {
-      if (inputProps.checked === undefined) setChecked(prev => !prev);
-      if (onChange) onChange(e);
-    }
+  const handleChange = e => {
+    if (inputProps.checked === undefined) setChecked(prev => !prev);
+    if (onChange) onChange(e);
   };
   return /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/_jsxs("div", {
+    children: /*#__PURE__*/_jsx("div", {
       className: clsx(css.checkbox, className),
-      children: [/*#__PURE__*/_jsx("input", {
-        ...inputProps,
-        className: clsx(css.checkbox__input, {
-          '_checked': !!inputProps.checked
-        }),
-        onChange: onChange,
-        type: props.type || 'checkbox'
-      }), /*#__PURE__*/_jsx("label", {
-        onClick: handleClick,
+      children: /*#__PURE__*/_jsxs("label", {
         className: clsx(css.checkbox__label, css['checkbox_' + size], css['checkbox_' + variant], css['checkbox_' + color], {
           [css.checkbox__label_checked]: inputProps.checked !== undefined ? inputProps.checked : checked,
           [css.checkbox__label_intermediate]: !!intermediate,
           [css.checkbox__label_disabled]: !!inputProps.disabled
         }),
-        children: label && /*#__PURE__*/_jsx("span", {
+        children: [/*#__PURE__*/_jsx("input", {
+          ...inputProps,
+          className: clsx(css.checkbox__input, {
+            '_checked': !!inputProps.checked
+          }),
+          onChange: handleChange,
+          type: props.type || 'checkbox'
+        }), label && /*#__PURE__*/_jsx("span", {
           className: css.checkbox__text,
           children: label
-        })
-      })]
+        })]
+      })
     })
   });
 };

package/ui/Form/Radio/Radio.d.ts

@@ -1,3 +1,3 @@
-import { CheckboxPropsType } from '../Checkbox/Checkbox';
-declare const Radio: (props: CheckboxPropsType) => import("react/jsx-runtime").JSX.Element;
+import { CheckboxProps } from '../Checkbox/Checkbox';
+declare const Radio: (props: CheckboxProps) => import("react/jsx-runtime").JSX.Element;
 export default Radio;

package/ui/Icon/Icon.d.ts

@@ -1,10 +1,11 @@
 import { ComponentPropsWithoutRef } from 'react';
-import { ColorStatusType, ColorType, SizeType, VariantType } from '../../types/theme';
+import { ColorStatusType, ColorType, SizeType, ThemeType, VariantType } from '../../types/theme';
 type OwnProps = {
     icon: string;
     variant?: VariantType;
     color?: ColorType | ColorStatusType;
     size?: SizeType;
+    theme?: ThemeType;
     fs?: number;
 };
 export type IconProps = OwnProps & Omit<ComponentPropsWithoutRef<'span'>, keyof OwnProps>;

package/ui/Icon/Icon.js

@@ -9,6 +9,7 @@ const Icon = /*#__PURE__*/forwardRef((props, ref) => {
     className,
     size,
     icon,
+    theme,
     variant = 'outlined',
     color,
     fs,
@@ -20,13 +21,15 @@ const Icon = /*#__PURE__*/forwardRef((props, ref) => {
       ...spanProps,
       className: clsx(className, 'Arm-Icon', {
         [css['Icon_size_' + size]]: size,
+        [css['Icon_theme_' + theme]]: theme,
         'mi': variant === 'outlined',
         'mis': variant === 'contained',
         [css['Icon_color_' + color]]: color
       }),
       style: fs ? {
+        ...spanProps.style,
         fontSize: fs + 'px'
-      } : undefined,
+      } : spanProps.style,
       children: icon || children
     })
   });