Skip to content

Commit de0321c

Browse files
committed
Replace merge-class-names with clsx
1 parent f9996a9 commit de0321c

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
"license": "MIT",
3535
"dependencies": {
3636
"@wojtekmaj/date-utils": "^1.0.3",
37+
"clsx": "^1.2.1",
3738
"get-user-locale": "^1.2.0",
3839
"make-event-props": "^1.1.0",
39-
"merge-class-names": "^1.1.1",
4040
"prop-types": "^15.6.0",
4141
"react-calendar": "^3.7.0",
4242
"react-clock": "^3.1.0",

src/DateTimePicker.jsx

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { createRef, PureComponent } from 'react';
22
import { createPortal } from 'react-dom';
33
import PropTypes from 'prop-types';
44
import makeEventProps from 'make-event-props';
5-
import mergeClassNames from 'merge-class-names';
5+
import clsx from 'clsx';
66
import Calendar from 'react-calendar';
77
import Fit from 'react-fit';
88

@@ -334,10 +334,7 @@ export default class DateTimePicker extends PureComponent {
334334
} = this.props;
335335

336336
const className = `${baseClassName}__calendar`;
337-
const classNames = mergeClassNames(
338-
className,
339-
`${className}--${isCalendarOpen ? 'open' : 'closed'}`,
340-
);
337+
const classNames = clsx(className, `${className}--${isCalendarOpen ? 'open' : 'closed'}`);
341338

342339
const calendar = (
343340
<Calendar
@@ -390,10 +387,7 @@ export default class DateTimePicker extends PureComponent {
390387
} = this.props;
391388

392389
const className = `${baseClassName}__clock`;
393-
const classNames = mergeClassNames(
394-
className,
395-
`${className}--${isClockOpen ? 'open' : 'closed'}`,
396-
);
390+
const classNames = clsx(className, `${className}--${isClockOpen ? 'open' : 'closed'}`);
397391

398392
const [valueFrom] = [].concat(value);
399393

@@ -441,7 +435,7 @@ export default class DateTimePicker extends PureComponent {
441435

442436
return (
443437
<div
444-
className={mergeClassNames(
438+
className={clsx(
445439
baseClassName,
446440
`${baseClassName}--${isCalendarOpen || isClockOpen ? 'open' : 'closed'}`,
447441
`${baseClassName}--${disabled ? 'disabled' : 'enabled'}`,

test/yarn.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2508,6 +2508,13 @@ __metadata:
25082508
languageName: node
25092509
linkType: hard
25102510

2511+
"clsx@npm:^1.2.1":
2512+
version: 1.2.1
2513+
resolution: "clsx@npm:1.2.1"
2514+
checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
2515+
languageName: node
2516+
linkType: hard
2517+
25112518
"color-convert@npm:^1.9.0":
25122519
version: 1.9.3
25132520
resolution: "color-convert@npm:1.9.3"
@@ -5342,9 +5349,9 @@ __metadata:
53425349
resolution: "react-datetime-picker@portal:../::locator=react-datetime-picker-test-page%40workspace%3A."
53435350
dependencies:
53445351
"@wojtekmaj/date-utils": ^1.0.3
5352+
clsx: ^1.2.1
53455353
get-user-locale: ^1.2.0
53465354
make-event-props: ^1.1.0
5347-
merge-class-names: ^1.1.1
53485355
prop-types: ^15.6.0
53495356
react-calendar: ^3.7.0
53505357
react-clock: ^3.1.0

yarn.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2737,6 +2737,13 @@ __metadata:
27372737
languageName: node
27382738
linkType: hard
27392739

2740+
"clsx@npm:^1.2.1":
2741+
version: 1.2.1
2742+
resolution: "clsx@npm:1.2.1"
2743+
checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
2744+
languageName: node
2745+
linkType: hard
2746+
27402747
"co@npm:^4.6.0":
27412748
version: 4.6.0
27422749
resolution: "co@npm:4.6.0"
@@ -6020,6 +6027,7 @@ __metadata:
60206027
"@testing-library/jest-dom": ^5.15.0
60216028
"@testing-library/react": ^13.4.0
60226029
"@wojtekmaj/date-utils": ^1.0.3
6030+
clsx: ^1.2.1
60236031
eslint: ^8.26.0
60246032
eslint-config-wojtekmaj: ^0.7.1
60256033
get-user-locale: ^1.2.0
@@ -6028,7 +6036,6 @@ __metadata:
60286036
jest-environment-jsdom: ^29.0.0
60296037
less: ^4.0.0
60306038
make-event-props: ^1.1.0
6031-
merge-class-names: ^1.1.1
60326039
prettier: ^2.7.0
60336040
pretty-quick: ^3.1.0
60346041
prop-types: ^15.6.0

0 commit comments

Comments
 (0)