armtek-uikit-react 1.0.106 → 1.0.107

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.106","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/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
     })
   });