Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/uniwind/src/components/web/generateDataSet.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
const toCamelCase = (str: string) => str.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase())

export const generateDataSet = (props: Record<PropertyKey, any>) => {
const dataSet: DataSet = props.dataSet !== undefined ? { ...props.dataSet } : {}
let dataSet = props.dataSet !== undefined
? { ...props.dataSet } as DataSet
: undefined

Object.entries(props).forEach(([key, value]) => {
if (key.startsWith('data-')) {
dataSet ??= {}
// Remove data- prefix
dataSet[toCamelCase(key.slice(5))] = value
}
Expand Down
22 changes: 13 additions & 9 deletions packages/uniwind/src/core/web/getWebStyles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,19 +103,23 @@ export const getWebStyles = (

const dataSet = generateDataSet(componentProps ?? {})

Object.entries(dataSet).forEach(([key, value]) => {
if (value === false || value === undefined) {
return
}
if (dataSet) {
Object.entries(dataSet).forEach(([key, value]) => {
if (value === false || value === undefined) {
return
}

dummy.dataset[key] = String(value)
})
dummy.dataset[key] = String(value)
})
}

const computedStyles = getActiveStylesForClass(className)

Object.keys(dataSet).forEach(key => {
delete dummy.dataset[key]
})
if (dataSet) {
Object.keys(dataSet).forEach(key => {
delete dummy.dataset[key]
})
}

return Object.fromEntries(
Object.entries(computedStyles)
Expand Down
13 changes: 13 additions & 0 deletions packages/uniwind/tests/web/components/generateDataSet.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { generateDataSet } from '../../../src/components/web/generateDataSet'

describe('generateDataSet', () => {
test('returns undefined when no dataSet or data attributes are provided', () => {
expect(generateDataSet({})).toBeUndefined()
})

test('creates a dataSet from data attributes', () => {
expect(generateDataSet({ 'data-test-value': 'test' })).toEqual({
testValue: 'test',
})
})
})