@talismn/util 0.0.0-pr920-20230713051537 → 0.0.0-pr920-20230714024531

package/CHANGELOG.md

@@ -1,12 +1,16 @@
 # @talismn/util
 
-## 0.0.0-pr920-20230713051537
+## 0.0.0-pr920-20230714024531
 
 ### Minor Changes
 
 - b920ab98: Added GPL licence
 - 7573864f: chore: remove dead code
 
+### Patch Changes
+
+- 8664539c: fix: non-conflict tw class merging for classNames via twMerge
+
 ## 0.1.9
 
 ### Patch Changes

package/dist/declarations/src/classNames.d.ts

@@ -1,3 +1 @@
-type ClassName = string | false | undefined | null;
-export declare const classNames: (...args: ClassName[]) => string | undefined;
-export {};
+export declare const classNames: (...classLists: import("tailwind-merge").ClassNameValue[]) => string;

package/dist/talismn-util.cjs.dev.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var util = require('@polkadot/util');
 var utilCrypto = require('@polkadot/util-crypto');
+var tailwindMerge = require('tailwind-merge');
 var keyring = require('@polkadot/keyring');
 var BigNumber = require('bignumber.js');
 
@@ -43,9 +44,7 @@ function blake2Concat(input) {
   return util.u8aToHex(util.u8aConcat(utilCrypto.blake2AsU8a(input, bitLength$1), util.u8aToU8a(input)));
 }
 
-const classNames = (...args) => {
-  return args.filter(Boolean).join(" ") || undefined;
-};
+const classNames = tailwindMerge.twMerge;
 
 function decodeAnyAddress(encoded, ignoreChecksum, ss58Format) {
   try {

package/dist/talismn-util.cjs.prod.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var util = require('@polkadot/util');
 var utilCrypto = require('@polkadot/util-crypto');
+var tailwindMerge = require('tailwind-merge');
 var keyring = require('@polkadot/keyring');
 var BigNumber = require('bignumber.js');
 
@@ -43,9 +44,7 @@ function blake2Concat(input) {
   return util.u8aToHex(util.u8aConcat(utilCrypto.blake2AsU8a(input, bitLength$1), util.u8aToU8a(input)));
 }
 
-const classNames = (...args) => {
-  return args.filter(Boolean).join(" ") || undefined;
-};
+const classNames = tailwindMerge.twMerge;
 
 function decodeAnyAddress(encoded, ignoreChecksum, ss58Format) {
   try {

package/dist/talismn-util.esm.js

@@ -1,5 +1,6 @@
 import { u8aToHex, u8aConcat, u8aToU8a, hexToU8a } from '@polkadot/util';
 import { blake2AsU8a, isEthereumAddress as isEthereumAddress$1, ethereumEncode, xxhashAsU8a } from '@polkadot/util-crypto';
+import { twMerge } from 'tailwind-merge';
 import { decodeAddress, encodeAddress } from '@polkadot/keyring';
 import BigNumber from 'bignumber.js';
 
@@ -35,9 +36,7 @@ function blake2Concat(input) {
   return u8aToHex(u8aConcat(blake2AsU8a(input, bitLength$1), u8aToU8a(input)));
 }
 
-const classNames = (...args) => {
-  return args.filter(Boolean).join(" ") || undefined;
-};
+const classNames = twMerge;
 
 function decodeAnyAddress(encoded, ignoreChecksum, ss58Format) {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/util",
-  "version": "0.0.0-pr920-20230713051537",
+  "version": "0.0.0-pr920-20230714024531",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -26,7 +26,8 @@
     "clean": "rm -rf dist && rm -rf .turbo rm -rf node_modules"
   },
   "dependencies": {
-    "bignumber.js": "^9.1.1"
+    "bignumber.js": "^9.1.1",
+    "tailwind-merge": "^1.13.2"
   },
   "devDependencies": {
     "@polkadot/keyring": "^12.2.1",