Skip to content

Commit

Permalink
fix(module): prevent class merging on default children
Browse files Browse the repository at this point in the history
Fixes #1076
  • Loading branch information
benjamincanac committed Dec 7, 2023
1 parent a8dc9b2 commit f07968a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/runtime/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const customTwMerge = extendTailwindMerge({
})

const defuTwMerge = createDefu((obj, key, value, namespace) => {
if (namespace !== 'default' && typeof obj[key] === 'string' && typeof value === 'string' && obj[key] && value) {
if (namespace !== 'default' && !namespace.startsWith('default.') && typeof obj[key] === 'string' && typeof value === 'string' && obj[key] && value) {
// @ts-ignore
obj[key] = customTwMerge(obj[key], value)
return true
Expand Down

2 comments on commit f07968a

@vercel
Copy link

@vercel vercel bot commented on f07968a Dec 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

ui – ./

ui.nuxt.com
ui-nuxt-js.vercel.app
ui-git-dev-nuxt-js.vercel.app

@lewebsimple
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea when this will be released ?

Please sign in to comment.