@king-design/react 2.1.1 → 3.0.0-beta.1

package/components/steps/index.js

@@ -6,9 +6,10 @@ import { bind } from '../utils';
 export * from './step';
 var typeDefs = {
   value: Number,
-  status: ['normal', 'error'],
-  type: ['default', 'line', 'simple'],
-  clickable: Boolean
+  status: ['normal', 'error', 'done'],
+  type: ['default', 'line', 'simple', 'line-compact', 'dot'],
+  clickable: Boolean,
+  vertical: Boolean
 };
 
 var defaults = function defaults() {

package/components/steps/index.spec.js

@@ -21,7 +21,7 @@ describe('Steps', function () {
 
           case 5:
             expect(element.innerHTML).to.matchSnapshot();
-            _element$querySelecto2 = element.querySelectorAll('.k-step'), step1 = _element$querySelecto2[0], step2 = _element$querySelecto2[1];
+            _element$querySelecto2 = element.querySelectorAll('.k-step-wrapper'), step1 = _element$querySelecto2[0], step2 = _element$querySelecto2[1];
             step1.click();
             _context.next = 10;
             return wait();

package/components/steps/index.vdt.js

@@ -17,11 +17,12 @@ export default function ($props, $blocks, $__proto__) {
       value = _this$get.value,
       status = _this$get.status,
       type = _this$get.type,
-      clickable = _this$get.clickable;
+      clickable = _this$get.clickable,
+      vertical = _this$get.vertical;
 
   var classNameObj = (_classNameObj = {
     'k-steps': true
-  }, _classNameObj[className] = className, _classNameObj["k-" + type] = true, _classNameObj['k-clickable'] = clickable, _classNameObj[makeStepsStyles()] = true, _classNameObj);
+  }, _classNameObj[className] = className, _classNameObj["k-" + type] = true, _classNameObj['k-clickable'] = clickable, _classNameObj['k-vertical'] = vertical, _classNameObj[makeStepsStyles()] = true, _classNameObj);
   var stepIndex = 0;
   var steps = [];
   eachChildren(children, function (vNode) {
@@ -34,12 +35,15 @@ export default function ($props, $blocks, $__proto__) {
     }
   }); // add width
 
-  var width = 100 / stepIndex + '%';
+  /* const width = (100 / stepIndex) + '%';  */
+
   return _$cc(StepsContext.Provider, {
     'value': {
       value: value,
       status: status,
-      width: width,
+
+      /* width, */
+      type: type,
       onChange: this.changeIndex
     },
     'children': _$cv('div', _extends({

package/components/steps/step.vdt.js

@@ -2,8 +2,16 @@ import _extends from "@babel/runtime-corejs3/helpers/extends";
 import { createUnknownComponentVNode as _$cc, createVNode as _$cv, className as _$cn, createElementVNode as _$ce } from 'intact-react';
 import { linkEvent } from 'intact';
 import { getRestProps, addStyle } from '../utils';
-import { makeStepStyles } from './styles';
 import { context as StepsContext } from './context';
+import { Icon } from '../icon';
+var _$tmp0 = {
+  'className': 'k-icon-close-big',
+  'color': 'danger'
+};
+var _$tmp1 = {
+  'className': 'k-icon-check',
+  'color': 'primary'
+};
 export default function ($props, $blocks, $__proto__) {
   var _this = this;
 
@@ -24,23 +32,23 @@ export default function ($props, $blocks, $__proto__) {
 
       var value = _ref.value,
           status = _ref.status,
-          width = _ref.width,
-          onChange = _ref.onChange;
+          onChange = _ref.onChange,
+          type = _ref.type;
       var selected = value === index;
       var error = selected && status === 'error';
+      var done = value > index;
       var classNameObj = (_classNameObj = {
         'k-step': true,
         'k-active': selected,
-        'k-done': value > index,
+        'k-done': done,
         'k-error': error
-      }, _classNameObj[className] = className, _classNameObj[makeStepStyles()] = true, _classNameObj);
+      }, _classNameObj[className] = className, _classNameObj);
       return _$cv('div', _extends({}, getRestProps(_this), {
         'className': _$cn(classNameObj),
-        'style': addStyle(style, {
-          width: width
-        }),
+        'style': style
+      }), [_$ce(2, 'div', [_$ce(2, 'div', error && type !== 'simple' ? _$cc(Icon, _$tmp0) : done && (type === 'line' || type === 'line-compact') ? _$cc(Icon, _$tmp1) : type !== 'simple' ? _$ce(2, 'span', index + 1, 0) : undefined, 0, 'k-step-mark'), _$ce(2, 'div', [_$ce(2, 'div', title, 0, 'k-step-title'), _$ce(2, 'div', _children, 0, 'k-step-content')], 4, 'k-step-main')], 4, 'k-step-wrapper', {
         'ev-click': linkEvent(index, onChange)
-      }), [_$ce(2, 'div', null, 1, 'k-step-tail'), _$ce(2, 'div', [_$ce(2, 'div', _$ce(2, 'div', error ? _$ce(2, 'i', null, 1, 'k-step-icon ion-ios-close-empty') : _$ce(2, 'span', index + 1, 0), 2, 'k-step-inner'), 2, 'k-step-head'), _$ce(2, 'div', [_$ce(2, 'div', title, 0, 'k-step-title'), _$ce(2, 'div', _children, 0, 'k-step-content')], 4, 'k-step-main')], 4, 'k-step-wrapper')]);
+      }), _$ce(2, 'div', null, 1, 'k-step-tail')]);
     }
   });
 }

package/components/steps/styles.d.ts

@@ -1,3 +1,4 @@
 import '../../styles/global';
 export declare function makeStepsStyles(): string;
-export declare function makeStepStyles(): string;
+export declare function makeCommonStyles(): string;
+export declare function makeVerticalStyles(): string;

package/components/steps/styles.js

@@ -4,137 +4,132 @@ import { theme, setDefault } from '../../styles/theme';
 import { deepDefaults } from '../../styles/utils';
 import '../../styles/global';
 var defaults = {
-  get transition() {
-    return theme.transition.middle;
-  },
+  gap: '10px',
 
-  get height() {
-    return theme.default.height;
+  get titleColor() {
+    return theme.color.title;
   },
 
-  get bgColor() {
-    return theme.color.bg;
+  get desColor() {
+    return theme.color.lightBlack;
   },
 
-  gutter: '10px',
-  gapTop: '-2px',
-  // head
-  head: {
-    innerWidth: '16px',
+  get markColor() {
+    return theme.color.placeholder;
+  },
 
-    get innerBorder() {
-      return "1px solid " + theme.color.placeholder;
+  markBgColor: '#fff',
+  default: {
+    get height() {
+      return theme.default.height;
     },
 
-    iconFontSize: '24px',
-    paddingRight: '10px'
-  },
-  main: {
-    get color() {
-      return theme.color.text;
+    get bgColor() {
+      return theme.color.bg;
     },
 
-    get titlePaddingRight() {
-      return steps.head.paddingRight;
+    get markborder() {
+      return "1px solid " + theme.color.placeholder;
     },
 
-    contentFontSize: '12px'
+    markWidth: '16px',
+    padding: '16px'
   },
   // done
   done: {
-    get headColor() {
+    get markColor() {
       return theme.color.primary;
     },
 
-    get headInnerBorderColor() {
+    get markBorderColor() {
       return theme.color.primary;
     },
 
-    headInnerBgColor: 'transparent',
+    markBgColor: '#fff',
 
     get mainColor() {
       return theme.color.primary;
-    },
-
-    get simpleColor() {
-      return theme.color.text;
     }
 
   },
   // active
   active: {
-    headColor: '#fff',
+    markColor: '#fff',
 
-    get headInnerBorderColor() {
+    get markBorderColor() {
       return theme.color.primary;
     },
 
-    get headInnerBgColor() {
+    get markBgColor() {
       return theme.color.primary;
     },
 
     get mainColor() {
       return theme.color.primary;
-    },
-
-    get simpleColor() {
-      return theme.color.primary;
     }
 
   },
   // error
   error: {
-    get headColor() {
+    get markColor() {
       return theme.color.danger;
     },
 
-    get headInnerBorderColor() {
+    get markBorderColor() {
       return theme.color.danger;
     },
 
-    headInnerBgColor: 'transparent',
+    markBgColor: '#fff',
 
     get mainColor() {
       return theme.color.danger;
-    },
-
-    get simpleColor() {
-      return theme.color.danger;
     }
 
   },
   // line
   line: {
-    bgColor: '#fff',
-    mainContentGap: '5px 0 0',
-
-    get tailBgColor() {
-      return theme.color.placeholder;
+    get markborder() {
+      return "2px solid " + theme.color.placeholder;
     },
 
-    get doneTailBgColor() {
-      return theme.color.primary;
+    markWidth: '32px',
+    markFontSize: '18px',
+
+    get lineColor() {
+      return theme.color.border;
     },
 
-    innerWidth: '32px',
-    innerLineHeight: '30px',
-    innerFontSize: '18px',
-    headTop: '16px',
-    titleFontSize: '14px',
-    titleGopTop: '16px',
-    iconLineHeight: '30px',
-    tailTop: '16px',
-    width: '160px'
+    lineWidth: '2px',
+    titleGap: '16px',
+    descGap: '4px',
+    contentWidth: '200px'
   },
   // simple
   simple: {
-    fontSize: '14px',
+    markWidth: '12px',
 
-    get color() {
-      return theme.color.disabled;
+    get markBgColor() {
+      return theme.color.placeholder;
     },
 
-    headPaddingRight: '6px'
+    get doneMarkBgColor() {
+      return theme.color.primary;
+    },
+
+    get errorMarkBgColor() {
+      return theme.color.danger;
+    }
+
+  },
+  // vertical
+  vertical: {
+    line: {
+      minHeight: '100px',
+      padding: '16px'
+    },
+    simple: {
+      titleGap: '8px'
+    }
   }
 };
 var steps;
@@ -145,14 +140,53 @@ setDefault(function () {
 });
 var stepStatus = ['done', 'active', 'error'];
 export function makeStepsStyles() {
-  return /*#__PURE__*/css("display:flex;&.k-default,&.k-line{", _mapInstanceProperty(stepStatus).call(stepStatus, function (status) {
-    var styles = steps[status];
-    return /*#__PURE__*/css(".k-", status, "{.k-step-inner{color:", styles.headColor, ";border-color:", styles.headInnerBorderColor, "!important;background:", styles.headInnerBgColor, ";}.k-step-main{color:", styles.mainColor, ";}}");
-  }), ";.k-step-head{padding-right:", steps.head.paddingRight, ";}.k-step-inner{width:", steps.head.innerWidth, ";height:", steps.head.innerWidth, ";line-height:calc(", steps.head.innerWidth, " - 2px);border-radius:50%;text-align:center;border:", steps.head.innerBorder, ";}.k-step-icon:before{line-height:calc(", steps.head.innerWidth, " - 2px);}.k-step-main{color:", steps.main.color, ";}.k-step-tail{position:absolute;}.k-step:last-of-type{.k-step-tail{display:none;}}}&.k-simple,&.k-default{text-align:center;height:", steps.height, ";line-height:", steps.height, ";overflow:hidden;.k-step-head,.k-step-main,.k-step-content,.k-step-inner{display:inline-block;}.k-step{white-space:nowrap;}.k-step-wrapper{overflow:hidden;}}&.k-default{background:", steps.bgColor, ";.k-step-tail{top:0;right:calc(-1 * (", steps.height, " / 2 + ", steps.gutter, "));width:calc(", steps.height, " / 2 + ", steps.gutter, ");height:", steps.height, ";overflow:hidden;z-index:1;&:after,&:before{content:'';border-width:calc(", steps.height, " / 2 + ", steps.gutter, ");border-style:solid;border-color:transparent;position:absolute;top:calc(-1 * ", steps.gutter, ");}&:after{border-left-color:", steps.bgColor, ";left:calc(-1 * ", steps.head.paddingRight, ");}&:before{border-left-color:", steps.line.bgColor, ";left:0;}}.k-step-head,.k-step-inner{vertical-align:middle;margin-top:", steps.gapTop, ";}.k-step:not(:first-of-type){padding-left:calc(", steps.height, " / 2 + ", steps.gutter, ");}}&.k-line{.k-step{width:auto!important;&:last-of-type{flex:0 0 auto;.k-step-wrapper{display:flex;}.k-step-title{padding-right:0;}}}.k-step-head{background:", steps.line.bgColor, ";position:relative;display:flex;padding:0;&:before,&:after{content:'';display:block;flex:1;height:1px;background:", theme.color.placeholder, ";top:", steps.line.headTop, ";position:relative;}}.k-step-inner{width:", steps.line.innerWidth, ";height:", steps.line.innerWidth, ";line-height:", steps.line.innerLineHeight, ";font-size:", steps.line.innerFontSize, ";}.k-step-main{position:relative;width:", steps.line.width, ";}.k-step-title{line-height:", steps.head.innerWidth, ";background:", steps.line.bgColor, ";font-size:", steps.line.titleFontSize, ";padding:0;margin-top:", steps.line.titleGopTop, ";}.k-step-content{margin:", steps.line.mainContentGap, ";}.k-step-tail{left:0;right:", steps.head.paddingRight, ";top:calc(", steps.head.innerWidth, " / 2);height:1px;background:", steps.line.tailBgColor, ";}.k-step:first-of-type .k-step-head:before,.k-step:last-of-type .k-step-head:after{background:transparent;}.k-done{.k-step-tail{background:", steps.line.doneTailBgColor, ";}.k-step-head{&:before,&:after{background:", theme.color.primary, ";}}}.k-active{.k-step-head{&:before{background:", theme.color.primary, ";}}}.k-step-icon:before{line-height:", steps.line.iconLineHeight, ";}.k-step-wrapper{display:inline-block!important;text-align:center;}.k-step-tail{right:0;top:", steps.line.tailTop, ";}}&.k-simple{font-size:", steps.simple.fontSize, ";", _mapInstanceProperty(stepStatus).call(stepStatus, function (status) {
+  return /*#__PURE__*/css("display:flex;", makeCommonStyles(), ";&.k-default{", makeDefaultStyles(), ";}&.k-line,&.k-line-compact,&.k-simple{", makeLineStyles(), ";}&.k-line-compact{", makeLineCompactStyles(), ";}&.k-simple{", makeSimpleStyles(), ";}&.k-clickable{.k-done{cursor:pointer;}}", makeVerticalStyles(), ";");
+}
+
+function makeDefaultStyles() {
+  var defaults = steps.default;
+  return /*#__PURE__*/css("text-align:center;height:", defaults.height, ";background:", defaults.bgColor, ";.k-step-wrapper{", center(), ";height:100%;padding:0 ", defaults.padding, ";}.k-step-mark{width:", defaults.markWidth, ";height:", defaults.markWidth, ";margin-right:", steps.gap, ";}.k-step-main{display:flex;overflow:hidden;white-space:nowrap;}.k-step-title{padding-right:", steps.gap, ";}.k-step:last-of-type{.k-step-tail{display:none;}}&:not(.k-vertical){", makeArrow(false), ";}");
+}
+
+function makeArrow(isVertical) {
+  var defaults = steps.default;
+  var offset = "calc(-1 * (" + defaults.height + " / 2 + " + steps.gap + "))";
+  var size = "calc(" + defaults.height + " / 2 + " + steps.gap + ")";
+  return /*#__PURE__*/css(".k-step-tail{position:absolute;", !isVertical ? "\n                    top: 0;\n                    right: " + offset + ";\n                    width: " + size + ";\n                    height: " + defaults.height + ";\n                " : "\n                    left: 0;\n                    bottom: " + offset + ";\n                    height: " + size + ";\n                    width: " + defaults.height + ";\n                ", " overflow:hidden;z-index:1;&:after,&:before{content:'';border-width:calc(", defaults.height, " / 2 + ", steps.gap, ");border-style:solid;border-color:transparent;position:absolute;", isVertical ? 'left' : 'top', ":calc(-1 * ", steps.gap, ");}&:after{border-", isVertical ? 'top' : 'left', "-color:", defaults.bgColor, ";", isVertical ? 'top' : 'left', ":calc(-1 * ", steps.gap, ");}&:before{border-", isVertical ? 'top' : 'left', "-color:#fff;", isVertical ? 'top' : 'left', ":0;}}.k-step:not(:first-of-type){padding-", isVertical ? 'top' : 'left', ":calc(", defaults.height, " / 2 + ", steps.gap, ");}");
+}
+
+function makeLineStyles() {
+  var line = steps.line;
+  var top = "calc(" + line.markWidth + " / 2 - " + line.lineWidth + " / 2)";
+  return /*#__PURE__*/css(".k-step{display:flex;}.k-step-wrapper{display:inline-block;text-align:center;position:relative;width:", line.contentWidth, ";}.k-step:last-of-type{flex:0 0 auto;}.k-step-mark{border:", line.markborder, ";width:", line.markWidth, ";height:", line.markWidth, ";position:relative;z-index:1;&,.k-icon{font-size:", line.markFontSize, ";}}.k-step-main{padding-top:", line.titleGap, ";}.k-step-title{font-size:14px;color:", theme.color.text, ";}.k-step-content{margin-top:", line.descGap, ";color:", theme.color.placeholder, ";}.k-step-wrapper{&:before,&:after{content:'';display:block;height:", line.lineWidth, ";background:", line.lineColor, ";width:50%;position:absolute;top:", top, ";}&:after{right:0;}}.k-step{&:first-of-type .k-step-wrapper:before,&:last-of-type .k-step-wrapper:after{background:transparent;}}.k-step-tail{flex:1;height:", line.lineWidth, ";background:", line.lineColor, ";margin-top:", top, ";}.k-step{&.k-done{.k-step-tail,&:not(:last-of-type) .k-step-wrapper:after,&:not(:first-of-type) .k-step-wrapper:before{background:", theme.color.primary, ";}}&:not(:first-of-type).k-active{.k-step-wrapper:before{background:", theme.color.primary, ";}}&.k-active .k-step-title{color:", theme.color.primary, ";}&.k-error .k-step-title{color:", theme.color.danger, ";}}");
+}
+
+function makeLineCompactStyles() {
+  var line = steps.line;
+  return /*#__PURE__*/css(".k-step-wrapper{display:inline-flex;text-align:left;width:auto;&:before,&:after{display:none;}}.k-step-main{flex:1;padding:0 0 0 ", line.titleGap, ";}.k-step-content{margin:0;}.k-step-tail{margin-right:", line.titleGap, ";}.k-step-title{display:flex;align-items:center;height:", line.markWidth, ";&:after{content:'';display:block;flex:1;height:", line.lineWidth, ";background:", line.lineColor, ";margin-left:", line.titleGap, ";}}.k-step:last-of-type .k-step-title:after{display:none;}.k-step{&.k-done{.k-step-title:after{background:", theme.color.primary, ";}}}");
+}
+
+function makeSimpleStyles() {
+  var simple = steps.simple;
+  var top = "calc(" + simple.markWidth + " / 2 - " + steps.line.lineWidth + " / 2)";
+  return /*#__PURE__*/css(".k-step-mark{width:", simple.markWidth, ";height:", simple.markWidth, ";background:", simple.markBgColor, ";}.k-step-wrapper{font-size:0;&:before,&:after{top:", top, ";}}.k-step-main{font-size:", theme.default.fontSize, ";}.k-step-tail{margin-top:", top, ";}.k-step{&.k-done{.k-step-mark{background:", simple.doneMarkBgColor, ";}}&.k-error{.k-step-mark{background:", simple.errorMarkBgColor, ";}}}");
+}
+
+function center(flex) {
+  if (flex === void 0) {
+    flex = 'flex';
+  }
+
+  return /*#__PURE__*/css("display:", flex, ";align-items:center;justify-content:center;");
+}
+
+export function makeCommonStyles() {
+  return /*#__PURE__*/css(".k-step{position:relative;flex:1;", _mapInstanceProperty(stepStatus).call(stepStatus, function (status) {
     var styles = steps[status];
-    return /*#__PURE__*/css(".k-", status, "{.k-step-main,.k-step-inner{color:", styles.simpleColor, ";}}");
-  }), ";.k-step,.k-step-main{color:", steps.simple.color, ";}.k-step-head{padding-right:", steps.simple.headPaddingRight, ";vertical-align:top;}}&.k-clickable{.k-done{cursor:pointer;}}");
+    return /*#__PURE__*/css("&.k-", status, "{.k-step-mark{color:", styles.markColor, ";border-color:", styles.markBorderColor, ";background:", styles.markBgColor, ";}.k-step-main{color:", styles.mainColor, ";}}");
+  }), ";}.k-step-mark{", center('inline-flex'), ";border:", steps.default.markborder, ";border-radius:50%;vertical-align:top;color:", steps.markColor, ";background:", steps.markBgColor, ";}");
 }
-export function makeStepStyles() {
-  return /*#__PURE__*/css("position:relative;flex:1;.k-step-icon:before{font-size:", steps.head.iconFontSize, ";}.k-step-title{display:inline-block;padding-right:", steps.main.titlePaddingRight, ";white-space:nowrap;}.k-step-content{font-size:", steps.main.contentFontSize, ";}.k-step-inner,.k-step-main{transition:all ", steps.transition, ";}");
+export function makeVerticalStyles() {
+  var verticalLine = steps.vertical.line;
+  return /*#__PURE__*/css("&.k-vertical{&.k-default{height:auto;width:", steps.default.height, ";writing-mode:vertical-rl;letter-spacing:1px;", makeArrow(true), ";.k-step-wrapper{width:100%;padding:", steps.default.padding, " 0;}.k-step-mark{margin-right:0;margin-bottom:", steps.gap, ";}.k-step-title{padding-right:0;padding-bottom:", steps.gap, ";}}&.k-line,&.k-line-compact,&.k-simple{flex-direction:column;.k-step{flex:none;min-height:", verticalLine.minHeight, ";}.k-step-wrapper{display:flex;width:auto;text-align:left;}.k-step-main{flex:1;padding:0 0 ", verticalLine.padding, " ", verticalLine.padding, ";}.k-step-title{display:flex;align-items:center;height:", steps.line.markWidth, ";&:after{display:none;}}.k-step-wrapper{&:before,&:after{display:none;}}.k-step-tail{position:absolute;left:calc(", steps.line.markWidth, " / 2 - ", steps.line.lineWidth, " / 2);height:100%;width:", steps.line.lineWidth, ";background:", steps.line.lineColor, ";}.k-step:last-of-type{.k-step-tail{display:none;}}}&.k-simple{.k-step-tail{left:calc(", steps.simple.markWidth, " / 2 - ", steps.line.lineWidth, " / 2);}.k-step-title{height:", steps.simple.markWidth, ";margin-bottom:", steps.vertical.simple.titleGap, ";}}}");
 }