@lumx/react 2.2.10-alpha.1 → 2.2.12-alpha.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -60,20 +60,31 @@ var Icon = forwardRef(function (props, ref) {
60
60
 
61
61
  var iconColor;
62
62
  var iconColorVariant;
63
+ var iconTheme;
63
64
 
64
65
  if (color) {
65
66
  iconColor = color;
66
- iconColorVariant = colorVariant;
67
- } else if (theme) {
68
- iconColor = theme === Theme.light ? ColorPalette.dark : ColorPalette.light;
67
+ iconTheme = theme;
68
+ }
69
69
 
70
- if (colorVariant) {
71
- iconColorVariant = colorVariant;
70
+ if (hasShape) {
71
+ if (theme === Theme.dark && !iconColor) {
72
+ iconColor = ColorPalette.light;
73
+ iconTheme = theme;
72
74
  } else {
73
- iconColorVariant = Theme.light ? 'L1' : 'N';
75
+ iconColor = iconColor || ColorPalette.dark;
76
+ }
77
+ } else if (!iconColor && theme) {
78
+ iconTheme = theme;
79
+ iconColor = iconColor || theme === Theme.light ? ColorPalette.dark : ColorPalette.light;
80
+ }
81
+
82
+ if (!iconColorVariant) {
83
+ if (hasShape && iconColor === ColorPalette.dark) {
84
+ iconColorVariant = colorVariant || 'L2';
85
+ } else {
86
+ iconColorVariant = colorVariant || (theme === Theme.dark ? 'N' : 'L1');
74
87
  }
75
- } else if (hasShape) {
76
- iconColor = ColorPalette.dark;
77
88
  }
78
89
 
79
90
  var iconSize;
@@ -102,6 +113,7 @@ var Icon = forwardRef(function (props, ref) {
102
113
  colorVariant: iconColorVariant,
103
114
  hasShape: hasShape,
104
115
  prefix: CLASSNAME,
116
+ theme: iconTheme,
105
117
  size: iconSize
106
118
  }), !hasShape && "".concat(CLASSNAME, "--no-shape"), !hasShape && iconColor === ColorPalette.yellow && icon === mdiAlertCircle && "".concat(CLASSNAME, "--has-dark-layer"), "".concat(CLASSNAME, "--path"))
107
119
  }), React.createElement("svg", {