@salutejs/plasma-new-hope 0.183.1-canary.1517.11698919027.0 → 0.184.0-canary.1511.11700617196.0

package/emotion/es/components/Steps/Steps.tokens.js

@@ -56,7 +56,6 @@ export var tokens = {
   inactiveTitleColor: '--plasma-step-item-inactive-title-color',
   inactiveTitleColorHover: '--plasma-step-item-inactive-title-color-hover',
   contentColor: '--plasma-step-item-content-color',
-  focusColor: '--plasma-step-item-focus-color',
   activeIndicatorBorder: '--plasma-step-item-active-indicator-border',
   activeIndicatorBorderHover: '--plasma-step-item-active-indicator-border-hover',
   activeIndicatorColor: '--plasma-step-item-active-indicator-color',

package/emotion/es/components/Steps/ui/StepItem/StepItem.js

@@ -43,7 +43,6 @@ export var StepItem = function StepItem(_ref) {
   var prevItem = items[index - 1];
   var nextItem = items[index + 1];
   var isActive = status === 'active';
-  var isNextActive = (nextItem === null || nextItem === void 0 ? void 0 : nextItem.status) === 'active';
   var isInactive = status === 'inactive';
   var isPrevInactive = prevItem && !(prevItem !== null && prevItem !== void 0 && prevItem.status) || (prevItem === null || prevItem === void 0 ? void 0 : prevItem.status) === 'inactive';
   var isNextInactive = !(nextItem !== null && nextItem !== void 0 && nextItem.status) || (nextItem === null || nextItem === void 0 ? void 0 : nextItem.status) === 'inactive';
@@ -81,31 +80,8 @@ export var StepItem = function StepItem(_ref) {
       setIsHovered(false);
     }
   }, [isDisabled]);
-  if (isSimple) {
-    var _cls;
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StepItemStyled, {
-      className: cls((_cls = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_cls, classes.simple, isSimple), classes.active, isActive), classes.hovered, isHovered && !isActive), classes.inactive, isInactive), classes.centered, isCentered), classes.disabled, isDisabled), classes.clickable, clickable && !isActive), classes.hasIndicator, hasIndicator), classes.verticalOrientation, isVertical), "isFirst", isFirst), _defineProperty(_defineProperty(_defineProperty(_cls, "isLast", isLast), "isPrevInactive", isPrevInactive), "isNextInactive", isNextInactive)))
-    }, /*#__PURE__*/React.createElement(BulletIndicatorWrapper, {
-      className: cls(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, classes.verticalOrientation, isVertical), classes.centered, isCentered), classes.simple, isSimple), classes.hasIndicator, hasIndicator)),
-      onClick: onClickHandler,
-      onFocus: onMouseOver,
-      onBlur: onMouseOut,
-      onMouseOver: onMouseOver,
-      onMouseOut: onMouseOut
-    }, hasLoader && /*#__PURE__*/React.createElement(SpinnerStyled, {
-      hasIndicator: hasIndicator
-    }), !hasLoader && /*#__PURE__*/React.createElement(BulletNode, {
-      className: cls(_defineProperty(_defineProperty({}, classes.active, isActive), classes.inactive, isInactive))
-    }, typeof indicator === 'function' && indicator({
-      status: status,
-      item: item,
-      size: size
-    }), typeof indicator !== 'function' && indicator))), !isLast && /*#__PURE__*/React.createElement(StepItemDivider, {
-      className: cls(classes.simple, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, classes.verticalOrientation, isVertical), classes.transparentDivider, !hasLine), classes.active, isActive), classes.inactive, isInactive || isNextInactive))
-    }));
-  }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(StepItemStyled, {
-    className: cls(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, classes.simple, isSimple), classes.active, isActive), classes.hovered, isHovered && !isActive), classes.inactive, isInactive), classes.centered, isCentered), classes.disabled, isDisabled), classes.clickable, clickable && !isActive), classes.hasIndicator, hasIndicator), classes.verticalOrientation, isVertical), "isNextActive", isNextActive))
+    className: cls(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, classes.simple, isSimple), classes.active, isActive), classes.hovered, isHovered && !isActive), classes.inactive, isInactive), classes.centered, isCentered), classes.disabled, isDisabled), classes.clickable, clickable && !isActive), classes.hasIndicator, hasIndicator), classes.verticalOrientation, isVertical))
   }, /*#__PURE__*/React.createElement(BulletIndicatorWrapper, {
     className: cls(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, classes.verticalOrientation, isVertical), classes.centered, isCentered), classes.simple, isSimple), classes.hasIndicator, hasIndicator)),
     onClick: onClickHandler,
@@ -115,7 +91,7 @@ export var StepItem = function StepItem(_ref) {
     onMouseOut: onMouseOut
   }, contentAlign === 'center' && !isSimple && /*#__PURE__*/React.createElement(StepItemDivider, {
     className: cls(_defineProperty(_defineProperty(_defineProperty({}, classes.simple, isSimple), classes.transparentDivider, !hasLine || isFirst), classes.inactive, isInactive || isPrevInactive))
-  }), isVertical && /*#__PURE__*/React.createElement(StepItemDivider, {
+  }), isVertical && (isSimple ? !isFirst : true) && /*#__PURE__*/React.createElement(StepItemDivider, {
     className: cls(classes.indentDivider, _defineProperty(_defineProperty(_defineProperty({}, classes.simple, isSimple), classes.transparentDivider, !hasLine || isFirst), classes.inactive, isInactive || isPrevInactive)),
     indentToken: indentToken
   }), hasLoader && /*#__PURE__*/React.createElement(SpinnerStyled, {
@@ -126,9 +102,9 @@ export var StepItem = function StepItem(_ref) {
     status: status,
     item: item,
     size: size
-  }), typeof indicator !== 'function' && indicator), /*#__PURE__*/React.createElement(StepItemDivider, {
+  }), typeof indicator !== 'function' && indicator), !isSimple && /*#__PURE__*/React.createElement(StepItemDivider, {
     className: cls(_defineProperty(_defineProperty(_defineProperty({}, classes.simple, isSimple), classes.transparentDivider, !hasLine || isLast), classes.inactive, isInactive || isNextInactive))
-  })), /*#__PURE__*/React.createElement(StepItemContentWrapper, {
+  })), !isSimple && /*#__PURE__*/React.createElement(StepItemContentWrapper, {
     className: cls(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, classes.verticalOrientation, isVertical), classes.centered, isCentered), classes.active, isActive), classes.hasIndicator, hasIndicator))
   }, /*#__PURE__*/React.createElement(StepItemTitle, {
     onClick: onClickHandler,
@@ -136,5 +112,7 @@ export var StepItem = function StepItem(_ref) {
     onBlur: onMouseOut,
     onMouseOver: onMouseOver,
     onMouseOut: onMouseOut
-  }, title), content && /*#__PURE__*/React.createElement(StepItemContent, null, typeof content === 'function' ? content(status, index, items) : content))));
+  }, title), content && /*#__PURE__*/React.createElement(StepItemContent, null, typeof content === 'function' ? content(status, index, items) : content))), isSimple && !isLast && /*#__PURE__*/React.createElement(StepItemDivider, {
+    className: cls(classes.simple, _defineProperty(_defineProperty(_defineProperty({}, classes.verticalOrientation, isVertical), classes.transparentDivider, !hasLine), classes.inactive, isInactive || isNextInactive))
+  }));
 };