@fonixtree/magic-design 2.0.51 → 2.0.52

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.
Files changed (41) hide show
  1. package/es/assets/fonts/.DS_Store +0 -0
  2. package/es/composite-comp/dito/components/AffiliateRecommend/mobile/index.less +2 -2
  3. package/es/core/Designer/ToolBarModal/ToolBtn/components/AlignPicker/images/AlignCenterSVG.js +19 -6
  4. package/es/core/Designer/ToolBarModal/ToolBtn/components/AlignPicker/images/AlignLeftSVG.js +19 -6
  5. package/es/core/Designer/ToolBarModal/ToolBtn/components/AlignPicker/images/AlignRightSVG.js +19 -6
  6. package/es/core/Designer/ToolBarModal/ToolBtn/components/BulletPicker/index.js +27 -6
  7. package/es/core/Designer/ToolBarModal/ToolBtn/components/BulletPicker/index.less +4 -20
  8. package/es/core/Designer/ToolBarModal/ToolBtn/components/ColorPickerBtn/UnderlineSelectPicker/index.js +77 -0
  9. package/es/core/Designer/ToolBarModal/ToolBtn/components/ColorPickerBtn/UnderlineSelectPicker/index.less +27 -0
  10. package/es/core/Designer/ToolBarModal/ToolBtn/components/ColorPickerBtn/index.js +36 -5
  11. package/es/core/Designer/ToolBarModal/ToolBtn/components/ColorPickerBtn/index.less +17 -16
  12. package/es/core/Designer/ToolBarModal/ToolBtn/components/OrderedPicker/index.js +27 -6
  13. package/es/core/Designer/ToolBarModal/ToolBtn/components/OrderedPicker/index.less +4 -20
  14. package/es/core/Designer/ToolBarModal/ToolBtn/images/AlignCenterSVG.js +40 -0
  15. package/es/core/Designer/ToolBarModal/ToolBtn/images/AlignLeftSVG.js +40 -0
  16. package/es/core/Designer/ToolBarModal/ToolBtn/images/AlignRightSVG.js +40 -0
  17. package/es/core/Designer/ToolBarModal/ToolBtn/index.js +27 -11
  18. package/es/core/Designer/ToolBarModal/ToolBtn/index.less +2 -1
  19. package/es/core/Designer/ToolBarModal/index.js +41 -51
  20. package/es/meta-comp/components/Text/index.less +8 -0
  21. package/lib/assets/fonts/.DS_Store +0 -0
  22. package/lib/composite-comp/dito/components/AffiliateRecommend/mobile/index.less +2 -2
  23. package/lib/core/Designer/ToolBarModal/ToolBtn/components/AlignPicker/images/AlignCenterSVG.js +19 -6
  24. package/lib/core/Designer/ToolBarModal/ToolBtn/components/AlignPicker/images/AlignLeftSVG.js +19 -6
  25. package/lib/core/Designer/ToolBarModal/ToolBtn/components/AlignPicker/images/AlignRightSVG.js +19 -6
  26. package/lib/core/Designer/ToolBarModal/ToolBtn/components/BulletPicker/index.js +27 -6
  27. package/lib/core/Designer/ToolBarModal/ToolBtn/components/BulletPicker/index.less +4 -20
  28. package/lib/core/Designer/ToolBarModal/ToolBtn/components/ColorPickerBtn/UnderlineSelectPicker/index.js +77 -0
  29. package/lib/core/Designer/ToolBarModal/ToolBtn/components/ColorPickerBtn/UnderlineSelectPicker/index.less +27 -0
  30. package/lib/core/Designer/ToolBarModal/ToolBtn/components/ColorPickerBtn/index.js +36 -5
  31. package/lib/core/Designer/ToolBarModal/ToolBtn/components/ColorPickerBtn/index.less +17 -16
  32. package/lib/core/Designer/ToolBarModal/ToolBtn/components/OrderedPicker/index.js +27 -6
  33. package/lib/core/Designer/ToolBarModal/ToolBtn/components/OrderedPicker/index.less +4 -20
  34. package/lib/core/Designer/ToolBarModal/ToolBtn/images/AlignCenterSVG.js +40 -0
  35. package/lib/core/Designer/ToolBarModal/ToolBtn/images/AlignLeftSVG.js +40 -0
  36. package/lib/core/Designer/ToolBarModal/ToolBtn/images/AlignRightSVG.js +40 -0
  37. package/lib/core/Designer/ToolBarModal/ToolBtn/index.js +27 -11
  38. package/lib/core/Designer/ToolBarModal/ToolBtn/index.less +2 -1
  39. package/lib/core/Designer/ToolBarModal/index.js +41 -51
  40. package/lib/meta-comp/components/Text/index.less +8 -0
  41. package/package.json +1 -1
@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
9
9
 
10
10
  var _classnames = _interopRequireDefault(require("classnames"));
11
11
 
12
+ var _UnderlineSelectPicker = _interopRequireDefault(require("./UnderlineSelectPicker"));
13
+
12
14
  var _FontColorSVG = _interopRequireDefault(require("../../images/FontColorSVG"));
13
15
 
14
16
  var _BackgroundSVG = _interopRequireDefault(require("../../images/BackgroundSVG"));
@@ -17,6 +19,8 @@ var _UnderlineSVG = _interopRequireDefault(require("../../images/UnderlineSVG"))
17
19
 
18
20
  var _ColorPicker = _interopRequireDefault(require("../../../../../../common/ColorPicker"));
19
21
 
22
+ var _Iconfont = _interopRequireDefault(require("../../../../../../common/Iconfont"));
23
+
20
24
  require("./index.less");
21
25
 
22
26
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -56,7 +60,8 @@ function (_super) {
56
60
  var _this = _super !== null && _super.apply(this, arguments) || this;
57
61
 
58
62
  _this.state = {
59
- visibility: false
63
+ visibility: false,
64
+ showSelectUnderline: false
60
65
  };
61
66
  return _this;
62
67
  }
@@ -68,11 +73,18 @@ function (_super) {
68
73
  value = _a.value,
69
74
  onChange = _a.onChange,
70
75
  _b = _a.type,
71
- type = _b === void 0 ? 'color' : _b;
72
- var visibility = this.state.visibility;
76
+ type = _b === void 0 ? 'color' : _b,
77
+ underlineValue = _a.underlineValue,
78
+ underlineOnChange = _a.underlineOnChange;
79
+ var _c = this.state,
80
+ visibility = _c.visibility,
81
+ showSelectUnderline = _c.showSelectUnderline;
73
82
  var color = value === null || value === void 0 ? void 0 : value.color;
74
83
  return /*#__PURE__*/_react["default"].createElement("div", {
75
- className: (0, _classnames["default"])('tool-btn-wrap'),
84
+ className: (0, _classnames["default"])('color-picker-tool-btn-wrap', {
85
+ padding: type == 'text-decoration-color'
86
+ })
87
+ }, /*#__PURE__*/_react["default"].createElement("div", {
76
88
  onClick: function onClick() {
77
89
  _this.setState({
78
90
  visibility: !visibility
@@ -84,7 +96,26 @@ function (_super) {
84
96
  color: color || '#262626'
85
97
  }), type == 'text-decoration-color' && /*#__PURE__*/_react["default"].createElement(_UnderlineSVG["default"], {
86
98
  color: color || '#262626'
87
- }), /*#__PURE__*/_react["default"].createElement(_ColorPicker["default"], {
99
+ })), type == 'text-decoration-color' && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
100
+ className: "btn_icon",
101
+ color: "#8493AF",
102
+ onClick: function onClick() {
103
+ return _this.setState({
104
+ showSelectUnderline: !showSelectUnderline
105
+ });
106
+ },
107
+ size: 12,
108
+ type: "icon-outlined-down"
109
+ }), showSelectUnderline && /*#__PURE__*/_react["default"].createElement(_UnderlineSelectPicker["default"], {
110
+ onChange: function onChange(v) {
111
+ underlineOnChange(v);
112
+
113
+ _this.setState({
114
+ showSelectUnderline: !showSelectUnderline
115
+ });
116
+ },
117
+ value: underlineValue
118
+ })), /*#__PURE__*/_react["default"].createElement(_ColorPicker["default"], {
88
119
  color: color,
89
120
  onChangeColor: onChange,
90
121
  onClose: function onClose() {
@@ -1,26 +1,27 @@
1
- .tool-btn-wrap {
2
- width: 26px;
3
- height: 26px;
1
+ .color-picker-tool-btn-wrap {
4
2
  display: flex;
5
3
  align-items: center;
6
4
  justify-content: center;
7
- cursor: pointer;
8
- border-radius: 6px;
9
- padding: 0;
10
- border: none;
11
- transition: .2s all linear;
12
- position: relative;
13
5
 
14
- &:hover {
15
- background: #f8f8f8;
6
+ >div {
7
+ display: flex;
8
+ align-items: center;
9
+ justify-content: center;
16
10
  }
17
11
 
18
- &.active {
19
- background: #E7E9E8;
12
+ &.padding {
13
+ padding: 0 5px;
20
14
  }
21
15
 
22
- svg {
23
- height: 18px;
24
- height: 18px;
16
+ .underlineWrap {
17
+ position: absolute;
18
+ left: 0;
19
+ top: 27px;
20
+ padding: 5px;
21
+ background-color: #fff;
22
+ // border: 1px solid #E7E9E8;
23
+ box-shadow: 0 8px 16px 4px hsla(0, 0%, 0%, 0.04);
24
+ color: #262626;
25
+ border-radius: 6px;
25
26
  }
26
27
  }
@@ -23,6 +23,8 @@ var _LowerRomanSVG = _interopRequireDefault(require("./images/LowerRomanSVG"));
23
23
 
24
24
  var _UpperRomanSVG = _interopRequireDefault(require("./images/UpperRomanSVG"));
25
25
 
26
+ var _Iconfont = _interopRequireDefault(require("../../../../../../common/Iconfont"));
27
+
26
28
  require("./index.less");
27
29
 
28
30
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -81,18 +83,37 @@ function (_super) {
81
83
 
82
84
  var _a = this.props,
83
85
  value = _a.value,
84
- onChange = _a.onChange;
86
+ _onChange = _a.onChange;
85
87
  var visibility = this.state.visibility;
86
- var list = (value === null || value === void 0 ? void 0 : value.list) || 'decimal';
88
+ var list = value === null || value === void 0 ? void 0 : value.list;
89
+
90
+ var iconClick = function iconClick() {
91
+ if (list) _onChange('');else _onChange('decimal');
92
+ };
93
+
87
94
  return /*#__PURE__*/_react["default"].createElement("div", {
88
- className: (0, _classnames["default"])('tool-btn-wrap'),
95
+ className: (0, _classnames["default"])('ordered-tool-btn-wrap')
96
+ }, /*#__PURE__*/_react["default"].createElement(_DecimalSVG["default"], {
97
+ onChange: iconClick
98
+ }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
99
+ className: "btn_icon",
100
+ color: "#8493AF",
89
101
  onClick: function onClick() {
90
102
  _this.setState({
91
103
  visibility: !visibility
92
104
  });
93
- }
94
- }, SvgMap[list] ? SvgMap[list]({}) : /*#__PURE__*/_react["default"].createElement(_DecimalSVG["default"], null), /*#__PURE__*/_react["default"].createElement(_IconSelectPicker["default"], {
95
- onChange: onChange,
105
+ },
106
+ size: 12,
107
+ type: "icon-outlined-down"
108
+ }), /*#__PURE__*/_react["default"].createElement(_IconSelectPicker["default"], {
109
+ onChange: function onChange(v) {
110
+ _onChange(v);
111
+
112
+ _this.setState({
113
+ visibility: !visibility
114
+ });
115
+ },
116
+ value: list,
96
117
  visibility: visibility
97
118
  }));
98
119
  };
@@ -1,26 +1,10 @@
1
- .tool-btn-wrap {
2
- width: 26px;
3
- height: 26px;
1
+ .ordered-tool-btn-wrap {
4
2
  display: flex;
5
3
  align-items: center;
6
4
  justify-content: center;
7
- cursor: pointer;
8
- border-radius: 6px;
9
- padding: 0;
10
- border: none;
11
- transition: .2s all linear;
12
- position: relative;
5
+ padding: 0 3px;
13
6
 
14
- &:hover {
15
- background: #f8f8f8;
16
- }
17
-
18
- &.active {
19
- background: #E7E9E8;
20
- }
21
-
22
- svg {
23
- height: 18px;
24
- height: 18px;
7
+ .btn_icon {
8
+ margin-left: 3px;
25
9
  }
26
10
  }
@@ -0,0 +1,40 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = void 0;
7
+
8
+ var _react = _interopRequireDefault(require("react"));
9
+
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
11
+
12
+ var _default = function _default(_a) {
13
+ var onChange = _a.onChange;
14
+ return /*#__PURE__*/_react["default"].createElement("svg", {
15
+ fill: "none",
16
+ height: "10",
17
+ id: "ne-t-alignment-center",
18
+ onClick: onChange,
19
+ viewBox: "0 0 15 10",
20
+ width: "15",
21
+ xmlns: "http://www.w3.org/2000/svg"
22
+ }, /*#__PURE__*/_react["default"].createElement("path", {
23
+ clipRule: "evenodd",
24
+ d: "M0.25 1C0.25 0.585786 0.585786 0.25 1 0.25H13.375C13.7892 0.25 14.125 0.585786 14.125 1C14.125 1.41421 13.7892 1.75 13.375 1.75H1C0.585786 1.75 0.25 1.41421 0.25 1Z",
25
+ fill: "#232F46",
26
+ fillRule: "evenodd"
27
+ }), /*#__PURE__*/_react["default"].createElement("path", {
28
+ clipRule: "evenodd",
29
+ d: "M0.25 4.9375C0.25 4.52329 0.585786 4.1875 1 4.1875H13.375C13.7892 4.1875 14.125 4.52329 14.125 4.9375C14.125 5.35171 13.7892 5.6875 13.375 5.6875H1C0.585786 5.6875 0.25 5.35171 0.25 4.9375Z",
30
+ fill: "#232F46",
31
+ fillRule: "evenodd"
32
+ }), /*#__PURE__*/_react["default"].createElement("path", {
33
+ clipRule: "evenodd",
34
+ d: "M0.25 8.875C0.25 8.46079 0.585786 8.125 1 8.125H13.375C13.7892 8.125 14.125 8.46079 14.125 8.875C14.125 9.28921 13.7892 9.625 13.375 9.625H1C0.585786 9.625 0.25 9.28921 0.25 8.875Z",
35
+ fill: "#232F46",
36
+ fillRule: "evenodd"
37
+ }));
38
+ };
39
+
40
+ exports["default"] = _default;
@@ -0,0 +1,40 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = void 0;
7
+
8
+ var _react = _interopRequireDefault(require("react"));
9
+
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
11
+
12
+ var _default = function _default(_a) {
13
+ var onChange = _a.onChange;
14
+ return /*#__PURE__*/_react["default"].createElement("svg", {
15
+ fill: "none",
16
+ height: "10",
17
+ id: "ne-t-alignment-left",
18
+ onClick: onChange,
19
+ viewBox: "0 0 15 10",
20
+ width: "15",
21
+ xmlns: "http://www.w3.org/2000/svg"
22
+ }, /*#__PURE__*/_react["default"].createElement("path", {
23
+ clipRule: "evenodd",
24
+ d: "M0.25 1C0.25 0.585786 0.585786 0.25 1 0.25H10C10.4142 0.25 10.75 0.585786 10.75 1C10.75 1.41421 10.4142 1.75 10 1.75H1C0.585786 1.75 0.25 1.41421 0.25 1Z",
25
+ fill: "#232F46",
26
+ fillRule: "evenodd"
27
+ }), /*#__PURE__*/_react["default"].createElement("path", {
28
+ clipRule: "evenodd",
29
+ d: "M0.25 4.9375C0.25 4.52329 0.585786 4.1875 1 4.1875H13.375C13.7892 4.1875 14.125 4.52329 14.125 4.9375C14.125 5.35171 13.7892 5.6875 13.375 5.6875H1C0.585786 5.6875 0.25 5.35171 0.25 4.9375Z",
30
+ fill: "#232F46",
31
+ fillRule: "evenodd"
32
+ }), /*#__PURE__*/_react["default"].createElement("path", {
33
+ clipRule: "evenodd",
34
+ d: "M0.25 8.875C0.25 8.46079 0.585786 8.125 1 8.125H10C10.4142 8.125 10.75 8.46079 10.75 8.875C10.75 9.28921 10.4142 9.625 10 9.625H1C0.585786 9.625 0.25 9.28921 0.25 8.875Z",
35
+ fill: "#232F46",
36
+ fillRule: "evenodd"
37
+ }));
38
+ };
39
+
40
+ exports["default"] = _default;
@@ -0,0 +1,40 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = void 0;
7
+
8
+ var _react = _interopRequireDefault(require("react"));
9
+
10
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
11
+
12
+ var _default = function _default(_a) {
13
+ var onChange = _a.onChange;
14
+ return /*#__PURE__*/_react["default"].createElement("svg", {
15
+ fill: "none",
16
+ height: "10",
17
+ id: "ne-t-alignment-right",
18
+ onClick: onChange,
19
+ viewBox: "0 0 15 10",
20
+ width: "15",
21
+ xmlns: "http://www.w3.org/2000/svg"
22
+ }, /*#__PURE__*/_react["default"].createElement("path", {
23
+ clipRule: "evenodd",
24
+ d: "M3.625 1C3.625 0.585786 3.96079 0.25 4.375 0.25H13.375C13.7892 0.25 14.125 0.585786 14.125 1C14.125 1.41421 13.7892 1.75 13.375 1.75H4.375C3.96079 1.75 3.625 1.41421 3.625 1Z",
25
+ fill: "#232F46",
26
+ fillRule: "evenodd"
27
+ }), /*#__PURE__*/_react["default"].createElement("path", {
28
+ clipRule: "evenodd",
29
+ d: "M0.25 4.9375C0.25 4.52329 0.585786 4.1875 1 4.1875H13.375C13.7892 4.1875 14.125 4.52329 14.125 4.9375C14.125 5.35171 13.7892 5.6875 13.375 5.6875H1C0.585786 5.6875 0.25 5.35171 0.25 4.9375Z",
30
+ fill: "#232F46",
31
+ fillRule: "evenodd"
32
+ }), /*#__PURE__*/_react["default"].createElement("path", {
33
+ clipRule: "evenodd",
34
+ d: "M3.625 8.875C3.625 8.46079 3.96079 8.125 4.375 8.125H13.375C13.7892 8.125 14.125 8.46079 14.125 8.875C14.125 9.28921 13.7892 9.625 13.375 9.625H4.375C3.96079 9.625 3.625 9.28921 3.625 8.875Z",
35
+ fill: "#232F46",
36
+ fillRule: "evenodd"
37
+ }));
38
+ };
39
+
40
+ exports["default"] = _default;
@@ -27,6 +27,12 @@ var _OrderSVG = _interopRequireDefault(require("./images/OrderSVG"));
27
27
 
28
28
  var _UnorderSVG = _interopRequireDefault(require("./images/UnorderSVG"));
29
29
 
30
+ var _AlignLeftSVG = _interopRequireDefault(require("./images/AlignLeftSVG"));
31
+
32
+ var _AlignCenterSVG = _interopRequireDefault(require("./images/AlignCenterSVG"));
33
+
34
+ var _AlignRightSVG = _interopRequireDefault(require("./images/AlignRightSVG"));
35
+
30
36
  var _BulletPicker = _interopRequireDefault(require("./components/BulletPicker"));
31
37
 
32
38
  var _OrderedPicker = _interopRequireDefault(require("./components/OrderedPicker"));
@@ -63,6 +69,22 @@ var __extends = void 0 && (void 0).__extends || function () {
63
69
  };
64
70
  }();
65
71
 
72
+ var __assign = void 0 && (void 0).__assign || function () {
73
+ __assign = Object.assign || function (t) {
74
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
75
+ s = arguments[i];
76
+
77
+ for (var p in s) {
78
+ if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
79
+ }
80
+ }
81
+
82
+ return t;
83
+ };
84
+
85
+ return __assign.apply(this, arguments);
86
+ };
87
+
66
88
  var iconTypeMap = {
67
89
  bold: _BoldSVG["default"],
68
90
  italic: _ItalicSVG["default"],
@@ -95,15 +117,9 @@ var iconTypeMap = {
95
117
  type: "text-decoration-color"
96
118
  }, props));
97
119
  },
98
- alignLeft: function alignLeft(props) {
99
- return /*#__PURE__*/_react["default"].createElement(_OrderedPicker["default"], props);
100
- },
101
- alignCenter: function alignCenter(props) {
102
- return /*#__PURE__*/_react["default"].createElement(_OrderedPicker["default"], props);
103
- },
104
- alignRight: function alignRight(props) {
105
- return /*#__PURE__*/_react["default"].createElement(_OrderedPicker["default"], props);
106
- }
120
+ alignLeft: _AlignLeftSVG["default"],
121
+ alignCenter: _AlignCenterSVG["default"],
122
+ alignRight: _AlignRightSVG["default"]
107
123
  };
108
124
 
109
125
  var ToolBtn =
@@ -146,10 +162,10 @@ function (_super) {
146
162
  className: (0, _classnames["default"])('tool-btn-wrap', {
147
163
  active: active
148
164
  })
149
- }, iconTypeMap[type]({
165
+ }, iconTypeMap[type](__assign({
150
166
  value: value,
151
167
  onChange: onChange
152
- }));
168
+ }, this.props)));
153
169
  };
154
170
 
155
171
  ToolBtn.defaultProps = {};
@@ -1,5 +1,6 @@
1
1
  .tool-btn-wrap {
2
- width: 26px;
2
+ width: auto;
3
+ min-width: 26px;
3
4
  height: 26px;
4
5
  display: flex;
5
6
  align-items: center;
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.fontWeightList = exports.fontSizeList = exports.fontFamilyList = exports["default"] = void 0;
6
+ exports.fontWeightList = exports.fontSizeList = exports.fontFamilyList = exports["default"] = exports.OpenSansFontWeightList = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
@@ -11,12 +11,8 @@ var _antd = require("antd");
11
11
 
12
12
  var _ToolBtn = _interopRequireDefault(require("./ToolBtn"));
13
13
 
14
- var _Iconfont = _interopRequireDefault(require("../../../common/Iconfont"));
15
-
16
14
  var _coreUtil = require("../../../utils/coreUtil");
17
15
 
18
- var _UnderlineSelect = _interopRequireDefault(require("../../../meta-comp/config-panels/TextConfig/UnderlineSelect"));
19
-
20
16
  require("./index.less");
21
17
 
22
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -71,6 +67,17 @@ var fontWeightList = [{
71
67
  value: '700'
72
68
  }];
73
69
  exports.fontWeightList = fontWeightList;
70
+ var OpenSansFontWeightList = [{
71
+ name: 'Regular',
72
+ value: '400'
73
+ }, {
74
+ name: 'Semibold',
75
+ value: '600'
76
+ }, {
77
+ name: 'Bold',
78
+ value: '700'
79
+ }];
80
+ exports.OpenSansFontWeightList = OpenSansFontWeightList;
74
81
 
75
82
  var ToolBarModal =
76
83
  /** @class */
@@ -164,24 +171,30 @@ function (_super) {
164
171
  } else if (type == 'bullet') {
165
172
  _this.props.quillRef.setSelection(0, _this.props.quillRef.getLength());
166
173
 
167
- _this.props.quillRef.format('list-style-type', value);
174
+ if (!value || value === quillFormat['list-style-type']) {
175
+ _this.props.quillRef.format('list-style-type', '');
168
176
 
169
- if (value === quillFormat['list-style-type']) {
170
177
  _this.props.quillRef.format('list', '');
171
178
  } else {
179
+ _this.props.quillRef.format('list-style-type', value);
180
+
172
181
  _this.props.quillRef.format('list', 'bullet');
173
182
  }
174
183
  } else if (type == 'ordered') {
175
184
  _this.props.quillRef.setSelection(0, _this.props.quillRef.getLength());
176
185
 
177
- _this.props.quillRef.format('list-style-type', value);
186
+ if (!value || value === quillFormat['list-style-type']) {
187
+ _this.props.quillRef.format('list-style-type', '');
178
188
 
179
- if (value === quillFormat['list-style-type']) {
180
189
  _this.props.quillRef.format('list', '');
181
190
  } else {
191
+ _this.props.quillRef.format('list-style-type', value);
192
+
182
193
  _this.props.quillRef.format('list', 'ordered');
183
194
  }
184
195
  } else if (type == 'text-decoration-color') {
196
+ _this.props.quillRef.setSelection(0, _this.props.quillRef.getLength());
197
+
185
198
  if (value) {
186
199
  _this.props.quillRef.format('underline', true);
187
200
  } else {
@@ -218,6 +231,10 @@ function (_super) {
218
231
  var _this = this;
219
232
 
220
233
  var quillFormat = this.state.quillFormat;
234
+ console.log('quillFormat render', quillFormat);
235
+
236
+ var _fontWeightList = quillFormat['font-family'] === 'OpenSans' ? OpenSansFontWeightList : fontWeightList;
237
+
221
238
  return /*#__PURE__*/_react["default"].createElement("div", {
222
239
  ref: this.toolBarRef,
223
240
  className: "toolbar-wrap"
@@ -252,7 +269,7 @@ function (_super) {
252
269
  width: '150px'
253
270
  },
254
271
  value: quillFormat['font-weight']
255
- }, fontWeightList.map(function (v) {
272
+ }, _fontWeightList.map(function (v) {
256
273
  return /*#__PURE__*/_react["default"].createElement(_antd.Select.Option, {
257
274
  label: v.name,
258
275
  value: v.value
@@ -274,20 +291,7 @@ function (_super) {
274
291
  label: v.name,
275
292
  value: v
276
293
  }, v, "px");
277
- }))), /*#__PURE__*/_react["default"].createElement("div", {
278
- className: "tool-item"
279
- }, /*#__PURE__*/_react["default"].createElement(_UnderlineSelect["default"], {
280
- onChange: function onChange(v) {
281
- _this.onToolBtnClick('text-decoration-style', v);
282
- },
283
- placeholder: "Underline Style",
284
- repeatCount: 28,
285
- size: "small",
286
- style: {
287
- width: '140px'
288
- },
289
- value: quillFormat['text-decoration-style']
290
- }))), /*#__PURE__*/_react["default"].createElement("div", {
294
+ })))), /*#__PURE__*/_react["default"].createElement("div", {
291
295
  className: "toolbar-row"
292
296
  }, /*#__PURE__*/_react["default"].createElement("div", {
293
297
  className: "tool-item"
@@ -312,16 +316,13 @@ function (_super) {
312
316
  _this.onToolBtnClick('text-decoration-color', value);
313
317
  },
314
318
  type: "text-decoration-color",
319
+ underlineOnChange: function underlineOnChange(value) {
320
+ return _this.onToolBtnClick('text-decoration-style', value);
321
+ },
322
+ underlineValue: quillFormat['text-decoration-style'],
315
323
  value: {
316
324
  color: quillFormat['text-decoration-color']
317
325
  }
318
- }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
319
- color: "#8493AF",
320
- onClick: function onClick() {
321
- return _this.onToolBtnClick('text-decoration-color', '');
322
- },
323
- size: 12,
324
- type: "icon-outlined-down"
325
326
  })), /*#__PURE__*/_react["default"].createElement("div", {
326
327
  className: "tooll-line"
327
328
  }), /*#__PURE__*/_react["default"].createElement("div", {
@@ -354,13 +355,6 @@ function (_super) {
354
355
  value: {
355
356
  list: quillFormat['list-style-type']
356
357
  }
357
- }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
358
- color: "#8493AF",
359
- onClick: function onClick() {
360
- return _this.onToolBtnClick('text-decoration-color', '');
361
- },
362
- size: 12,
363
- type: "icon-outlined-down"
364
358
  })), /*#__PURE__*/_react["default"].createElement("div", {
365
359
  className: "tool-item"
366
360
  }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
@@ -371,34 +365,30 @@ function (_super) {
371
365
  value: {
372
366
  list: quillFormat['list-style-type']
373
367
  }
374
- }), /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
375
- color: "#8493AF",
376
- onClick: function onClick() {
377
- return _this.onToolBtnClick('text-decoration-color', '');
378
- },
379
- size: 12,
380
- type: "icon-outlined-down"
381
368
  })), /*#__PURE__*/_react["default"].createElement("div", {
382
369
  className: "tooll-line"
383
370
  }), /*#__PURE__*/_react["default"].createElement("div", {
384
371
  className: "tool-item"
385
372
  }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
386
- onChange: function onChange(value) {
387
- _this.onToolBtnClick('', value);
373
+ active: quillFormat['align'] === undefined,
374
+ onChange: function onChange() {
375
+ _this.onToolBtnClick('align', '');
388
376
  },
389
377
  type: "alignLeft"
390
378
  })), /*#__PURE__*/_react["default"].createElement("div", {
391
379
  className: "tool-item"
392
380
  }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
393
- onChange: function onChange(value) {
394
- _this.onToolBtnClick('link', value);
381
+ active: quillFormat['align'] === 'center',
382
+ onChange: function onChange() {
383
+ _this.onToolBtnClick('align', 'center');
395
384
  },
396
385
  type: "alignCenter"
397
386
  })), /*#__PURE__*/_react["default"].createElement("div", {
398
387
  className: "tool-item"
399
388
  }, /*#__PURE__*/_react["default"].createElement(_ToolBtn["default"], {
400
- onChange: function onChange(value) {
401
- _this.onToolBtnClick('link', value);
389
+ active: quillFormat['align'] === 'right',
390
+ onChange: function onChange() {
391
+ _this.onToolBtnClick('align', 'right');
402
392
  },
403
393
  type: "alignRight"
404
394
  })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -35,6 +35,14 @@
35
35
  font-style: normal;
36
36
  font-weight: 600;
37
37
  }
38
+
39
+ .ql-align-center {
40
+ text-align: center;
41
+ }
42
+
43
+ .ql-align-right {
44
+ text-align: right;
45
+ }
38
46
  }
39
47
 
40
48
  .ql-clipboard {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fonixtree/magic-design",
3
3
  "author": "Cylon Team",
4
- "version": "2.0.51",
4
+ "version": "2.0.52",
5
5
  "description": "Magic Design",
6
6
  "license": "MIT",
7
7
  "module": "es/index.js",