Skip to content

Commit ca495d5

Browse files
committed
Replace merge-class-names with clsx
1 parent b7c3295 commit ca495d5

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
"license": "MIT",
3030
"dependencies": {
3131
"@wojtekmaj/date-utils": "^1.0.0",
32+
"clsx": "^1.2.1",
3233
"get-user-locale": "^1.2.0",
3334
"make-event-props": "^1.1.0",
34-
"merge-class-names": "^1.1.1",
3535
"prop-types": "^15.6.0",
3636
"react-clock": "^3.1.0",
3737
"react-fit": "^1.4.0",

src/TimeInput/AmPm.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import mergeClassNames from 'merge-class-names';
3+
import clsx from 'clsx';
44
import { getHours } from '@wojtekmaj/date-utils';
55

66
import { convert24to12 } from '../shared/dates';
@@ -29,7 +29,7 @@ export default function AmPm({
2929
return (
3030
<select
3131
aria-label={ariaLabel}
32-
className={mergeClassNames(`${className}__input`, `${className}__${name}`)}
32+
className={clsx(`${className}__input`, `${className}__${name}`)}
3333
data-input="true"
3434
data-select="true"
3535
disabled={disabled}

src/TimeInput/Input.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useLayoutEffect } from 'react';
22
import PropTypes from 'prop-types';
3-
import mergeClassNames from 'merge-class-names';
3+
import clsx from 'clsx';
44
import updateInputWidth, { getFontShorthand } from 'update-input-width';
55

66
import { isRef } from '../shared/propTypes';
@@ -141,7 +141,7 @@ export default function Input({
141141
aria-label={ariaLabel}
142142
autoComplete="off"
143143
autoFocus={autoFocus}
144-
className={mergeClassNames(
144+
className={clsx(
145145
`${className}__input`,
146146
`${className}__${nameForClass || name}`,
147147
hasLeadingZero && `${className}__input--hasLeadingZero`,

src/TimePicker.jsx

Lines changed: 3 additions & 3 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 Fit from 'react-fit';
77

88
import Clock from 'react-clock';
@@ -254,7 +254,7 @@ export default class TimePicker extends PureComponent {
254254
} = this.props;
255255

256256
const className = `${baseClassName}__clock`;
257-
const classNames = mergeClassNames(className, `${className}--${isOpen ? 'open' : 'closed'}`);
257+
const classNames = clsx(className, `${className}--${isOpen ? 'open' : 'closed'}`);
258258

259259
const [valueFrom] = [].concat(value);
260260

@@ -302,7 +302,7 @@ export default class TimePicker extends PureComponent {
302302

303303
return (
304304
<div
305-
className={mergeClassNames(
305+
className={clsx(
306306
baseClassName,
307307
`${baseClassName}--${isOpen ? 'open' : 'closed'}`,
308308
`${baseClassName}--${disabled ? 'disabled' : 'enabled'}`,

yarn.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2728,6 +2728,13 @@ __metadata:
27282728
languageName: node
27292729
linkType: hard
27302730

2731+
"clsx@npm:^1.2.1":
2732+
version: 1.2.1
2733+
resolution: "clsx@npm:1.2.1"
2734+
checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
2735+
languageName: node
2736+
linkType: hard
2737+
27312738
"co@npm:^4.6.0":
27322739
version: 4.6.0
27332740
resolution: "co@npm:4.6.0"
@@ -6023,6 +6030,7 @@ __metadata:
60236030
"@testing-library/jest-dom": ^5.15.0
60246031
"@testing-library/react": ^13.4.0
60256032
"@wojtekmaj/date-utils": ^1.0.0
6033+
clsx: ^1.2.1
60266034
eslint: ^8.26.0
60276035
eslint-config-wojtekmaj: ^0.7.1
60286036
get-user-locale: ^1.2.0
@@ -6031,7 +6039,6 @@ __metadata:
60316039
jest-environment-jsdom: ^29.0.0
60326040
less: ^4.0.0
60336041
make-event-props: ^1.1.0
6034-
merge-class-names: ^1.1.1
60356042
prettier: ^2.7.0
60366043
pretty-quick: ^3.1.0
60376044
prop-types: ^15.6.0

0 commit comments

Comments
 (0)