Skip to content

Commit 16437a8

Browse files
author
Edward Xiao
committed
- Remove classnames as dependency.
1 parent 5cb006b commit 16437a8

15 files changed

+236
-296
lines changed

‎lib/components/Checkbox.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ var React = _interopRequireWildcard(require("react"));
99

1010
var _message = _interopRequireDefault(require("./message"));
1111

12-
var _classnames = _interopRequireDefault(require("classnames"));
13-
1412
var _const = require("./const");
1513

1614
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -281,12 +279,12 @@ function (_React$Component) {
281279
msg = _this$state.msg,
282280
checked = _this$state.checked,
283281
successMsg = _this$state.successMsg;
284-
var wrapperClass = (0, _classnames.default)(classNameWrapper, reactInputsValidationCss['checkbox__wrapper'], checked && reactInputsValidationCss['checked'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
285-
var containerClass = (0, _classnames.default)(classNameContainer, reactInputsValidationCss['checkbox__container'], checked && reactInputsValidationCss['checked'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
286-
var boxClass = (0, _classnames.default)(classNameInputBox, reactInputsValidationCss['checkbox__box'], err && reactInputsValidationCss['error'], checked && reactInputsValidationCss['checked'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
287-
var labelClass = (0, _classnames.default)(checked && reactInputsValidationCss['checked'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
288-
var errMsgClass = (0, _classnames.default)(reactInputsValidationCss['msg'], err && reactInputsValidationCss['error']);
289-
var successMsgClass = (0, _classnames.default)(reactInputsValidationCss['msg'], !err && reactInputsValidationCss['success']);
282+
var wrapperClass = "".concat(classNameWrapper, " ").concat(reactInputsValidationCss['checkbox__wrapper'], " ").concat(checked && reactInputsValidationCss['checked'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled']);
283+
var containerClass = "".concat(classNameContainer, " ").concat(reactInputsValidationCss['checkbox__container'], " ").concat(checked && reactInputsValidationCss['checked'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled']);
284+
var boxClass = "".concat(classNameInputBox, " ").concat(reactInputsValidationCss['checkbox__box'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(checked && reactInputsValidationCss['checked'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled']);
285+
var labelClass = "".concat(checked && reactInputsValidationCss['checked'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled']);
286+
var errMsgClass = "".concat(reactInputsValidationCss['msg'], " ").concat(err && reactInputsValidationCss['error']);
287+
var successMsgClass = "".concat(reactInputsValidationCss['msg'], " ").concat(!err && reactInputsValidationCss['success']);
290288
var msgHtml;
291289

292290
var _getDefaultValidation3 = getDefaultValidationOption(validationOption),

‎lib/components/Radiobox.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ var React = _interopRequireWildcard(require("react"));
99

1010
var _message = _interopRequireDefault(require("./message"));
1111

12-
var _classnames = _interopRequireDefault(require("classnames"));
13-
1412
var _const = require("./const");
1513

1614
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -270,13 +268,13 @@ function (_React$Component) {
270268
err = _this$state.err,
271269
msg = _this$state.msg,
272270
successMsg = _this$state.successMsg;
273-
var wrapperClass = (0, _classnames.default)(classNameWrapper, err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], reactInputsValidationCss['radiobox__wrapper'], disabled && reactInputsValidationCss['disabled']);
274-
var containerClass = (0, _classnames.default)(classNameContainer, err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], reactInputsValidationCss['radiobox__container'], disabled && reactInputsValidationCss['disabled']);
275-
var inputClass = (0, _classnames.default)(classNameInput, err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], reactInputsValidationCss['radiobox__input'], disabled && reactInputsValidationCss['disabled']);
276-
var labelClass = (0, _classnames.default)(err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], reactInputsValidationCss['radiobox__label'], disabled && reactInputsValidationCss['disabled']);
277-
var optionListItemClass = (0, _classnames.default)(classNameOptionListItem, err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], reactInputsValidationCss['radiobox__item'], disabled && reactInputsValidationCss['disabled']);
278-
var errMsgClass = (0, _classnames.default)(reactInputsValidationCss['msg'], err && reactInputsValidationCss['error']);
279-
var successMsgClass = (0, _classnames.default)(reactInputsValidationCss['msg'], !err && reactInputsValidationCss['success']);
271+
var wrapperClass = "".concat(classNameWrapper, " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(reactInputsValidationCss['radiobox__wrapper'], " ").concat(disabled && reactInputsValidationCss['disabled']);
272+
var containerClass = "".concat(classNameContainer, " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(reactInputsValidationCss['radiobox__container'], " ").concat(disabled && reactInputsValidationCss['disabled']);
273+
var inputClass = "".concat(classNameInput, " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(reactInputsValidationCss['radiobox__input'], " ").concat(disabled && reactInputsValidationCss['disabled']);
274+
var labelClass = "".concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(reactInputsValidationCss['radiobox__label'], " ").concat(disabled && reactInputsValidationCss['disabled']);
275+
var optionListItemClass = "".concat(classNameOptionListItem, " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(reactInputsValidationCss['radiobox__item'], " ").concat(disabled && reactInputsValidationCss['disabled']);
276+
var errMsgClass = "".concat(reactInputsValidationCss['msg'], " ").concat(err && reactInputsValidationCss['error']);
277+
var successMsgClass = "".concat(reactInputsValidationCss['msg'], " ").concat(!err && reactInputsValidationCss['success']);
280278
var msgHtml;
281279

282280
var _getDefaultValidation3 = getDefaultValidationOption(validationOption),

‎lib/components/Select.js‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ var React = _interopRequireWildcard(require("react"));
99

1010
var _message = _interopRequireDefault(require("./message"));
1111

12-
var _classnames = _interopRequireDefault(require("classnames"));
13-
1412
var _const = require("./const");
1513

1614
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -412,6 +410,7 @@ function (_React$Component) {
412410
value: function scroll() {
413411
var direction = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
414412
var itemsWrapperNode = this.itemsWrapper;
413+
/* istanbul ignore next */
415414

416415
if (itemsWrapperNode === null) {
417416
return;
@@ -425,6 +424,7 @@ function (_React$Component) {
425424
}
426425

427426
var optionItemsNode = this.optionItems[this.currentFocus];
427+
/* istanbul ignore next */
428428

429429
if (optionItemsNode === null) {
430430
return;
@@ -449,6 +449,8 @@ function (_React$Component) {
449449
}
450450
}
451451
}
452+
/* istanbul ignore next */
453+
452454

453455
if (direction === 'up') {
454456
this.corrected = false;
@@ -472,6 +474,7 @@ function (_React$Component) {
472474
if (this.currentFocus >= x.length) this.currentFocus = 0;
473475
if (this.currentFocus < 0) this.currentFocus = x.length - 1;
474476
var node = x[this.currentFocus];
477+
/* istanbul ignore next */
475478

476479
if (node === null) {
477480
return;
@@ -486,6 +489,7 @@ function (_React$Component) {
486489

487490
for (var i = 0; i < x.length; i += 1) {
488491
var node = x[i];
492+
/* istanbul ignore next */
489493

490494
if (node === null) {
491495
break;
@@ -498,6 +502,7 @@ function (_React$Component) {
498502
key: "pageClick",
499503
value: function pageClick(e) {
500504
var node = this.wrapper;
505+
/* istanbul ignore next */
501506

502507
if (node === null) {
503508
return;
@@ -621,15 +626,15 @@ function (_React$Component) {
621626
show = _this$state2.show,
622627
successMsg = _this$state2.successMsg,
623628
isTyping = _this$state2.isTyping;
624-
var wrapperClass = (0, _classnames.default)(classNameWrapper, reactInputsValidationCss['select__wrapper'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
625-
var containerClass = (0, _classnames.default)(classNameContainer, reactInputsValidationCss['select__container'], err && reactInputsValidationCss['error'], show && reactInputsValidationCss['show'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
626-
var inputClass = (0, _classnames.default)(reactInputsValidationCss['select__input'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
627-
var selectClass = (0, _classnames.default)(classNameSelect, reactInputsValidationCss['ellipsis'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
628-
var selectOptionListContainerClass = (0, _classnames.default)(classNameOptionListContainer, reactInputsValidationCss['select__options-container'], err && reactInputsValidationCss['error'], show && reactInputsValidationCss['show'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
629-
var selectOptionListItemClass = (0, _classnames.default)(!isTyping && reactInputsValidationCss['select__options-item-show-cursor'], classNameOptionListItem, reactInputsValidationCss['select__options-item'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
630-
var dropdownIconClass = (0, _classnames.default)(classNameDropdownIconOptionListItem, reactInputsValidationCss['select__dropdown-icon']);
631-
var errMsgClass = (0, _classnames.default)(reactInputsValidationCss['msg'], err && reactInputsValidationCss['error']);
632-
var successMsgClass = (0, _classnames.default)(reactInputsValidationCss['msg'], !err && reactInputsValidationCss['success']);
629+
var wrapperClass = "".concat(classNameWrapper, " ").concat(reactInputsValidationCss['select__wrapper'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled'], ";");
630+
var containerClass = "".concat(classNameContainer, " ").concat(reactInputsValidationCss['select__container'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(show && reactInputsValidationCss['show'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled'], ";");
631+
var inputClass = "".concat(reactInputsValidationCss['select__input'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled'], ";");
632+
var selectClass = "".concat(classNameSelect, " ").concat(reactInputsValidationCss['ellipsis'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled'], ";");
633+
var selectOptionListContainerClass = "".concat(classNameOptionListContainer, " ").concat(reactInputsValidationCss['select__options-container'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(show && reactInputsValidationCss['show'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled'], ";");
634+
var selectOptionListItemClass = "".concat(!isTyping && reactInputsValidationCss['select__options-item-show-cursor'], " ").concat(classNameOptionListItem, " ").concat(reactInputsValidationCss['select__options-item'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled'], ";");
635+
var dropdownIconClass = "".concat(classNameDropdownIconOptionListItem, " ").concat(reactInputsValidationCss['select__dropdown-icon']);
636+
var errMsgClass = "".concat(reactInputsValidationCss['msg'], " ").concat(err && reactInputsValidationCss['error']);
637+
var successMsgClass = "".concat(reactInputsValidationCss['msg'], " ").concat(!err && reactInputsValidationCss['success']);
633638
var msgHtml;
634639

635640
var _getDefaultValidation3 = getDefaultValidationOption(validationOption),

‎lib/components/Textarea.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ var React = _interopRequireWildcard(require("react"));
99

1010
var _message = _interopRequireDefault(require("./message"));
1111

12-
var _classnames = _interopRequireDefault(require("classnames"));
13-
1412
var _validator = _interopRequireDefault(require("./validator"));
1513

1614
var _utils = _interopRequireDefault(require("./utils"));
@@ -384,11 +382,11 @@ function (_React$Component) {
384382
err = _this$state.err,
385383
msg = _this$state.msg,
386384
successMsg = _this$state.successMsg;
387-
var wrapperClass = (0, _classnames.default)(classNameWrapper, reactInputsValidationCss['textarea__wrapper'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
388-
var containerClass = (0, _classnames.default)(classNameContainer, reactInputsValidationCss['textarea__container'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
389-
var inputClass = (0, _classnames.default)(classNameInput, reactInputsValidationCss['textarea__input'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
390-
var errmsgClass = (0, _classnames.default)(reactInputsValidationCss['msg'], err && reactInputsValidationCss['error']);
391-
var successMsgClass = (0, _classnames.default)(reactInputsValidationCss['msg'], !err && reactInputsValidationCss['success']);
385+
var wrapperClass = "".concat(classNameWrapper, " ").concat(reactInputsValidationCss['textarea__wrapper'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled']);
386+
var containerClass = "".concat(classNameContainer, " ").concat(reactInputsValidationCss['textarea__container'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled']);
387+
var inputClass = "".concat(classNameInput, " ").concat(reactInputsValidationCss['textarea__input'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled']);
388+
var errmsgClass = "".concat(reactInputsValidationCss['msg'], " ").concat(err && reactInputsValidationCss['error']);
389+
var successMsgClass = "".concat(reactInputsValidationCss['msg'], " ").concat(!err && reactInputsValidationCss['success']);
392390
var msgHtml;
393391

394392
var _getDefaultValidation3 = getDefaultValidationOption(validationOption),

‎lib/components/Textbox.js‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ var React = _interopRequireWildcard(require("react"));
99

1010
var _message = _interopRequireDefault(require("./message"));
1111

12-
var _classnames = _interopRequireDefault(require("classnames"));
13-
1412
var _validator = _interopRequireDefault(require("./validator"));
1513

1614
var _utils = _interopRequireDefault(require("./utils"));
@@ -475,11 +473,11 @@ function (_React$Component) {
475473
err = _this$state.err,
476474
msg = _this$state.msg,
477475
successMsg = _this$state.successMsg;
478-
var wrapperClass = (0, _classnames.default)(classNameWrapper, reactInputsValidationCss['textbox__wrapper'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
479-
var containerClass = (0, _classnames.default)(classNameContainer, reactInputsValidationCss['textbox__container'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
480-
var inputClass = (0, _classnames.default)(classNameInput, reactInputsValidationCss['textbox__input'], err && reactInputsValidationCss['error'], successMsg && !err && reactInputsValidationCss['success'], disabled && reactInputsValidationCss['disabled']);
481-
var errmsgClass = (0, _classnames.default)(reactInputsValidationCss['msg'], err && reactInputsValidationCss['error']);
482-
var successMsgClass = (0, _classnames.default)(reactInputsValidationCss['msg'], !err && reactInputsValidationCss['success']);
476+
var wrapperClass = "".concat(classNameWrapper, " ").concat(reactInputsValidationCss['textbox__wrapper'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled']);
477+
var containerClass = "".concat(classNameContainer, " ").concat(reactInputsValidationCss['textbox__container'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled']);
478+
var inputClass = "".concat(classNameInput, " ").concat(reactInputsValidationCss['textbox__input'], " ").concat(err && reactInputsValidationCss['error'], " ").concat(successMsg && !err && reactInputsValidationCss['success'], " ").concat(disabled && reactInputsValidationCss['disabled']);
479+
var errmsgClass = "".concat(reactInputsValidationCss['msg'], " ").concat(err && reactInputsValidationCss['error']);
480+
var successMsgClass = "".concat(reactInputsValidationCss['msg'], " ").concat(!err && reactInputsValidationCss['success']);
483481
var msgHtml;
484482

485483
var _getDefaultValidation4 = getDefaultValidationOption(validationOption),

0 commit comments

Comments
 (0)