Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: duplicate id data-table in carbon-website #5080

Merged
merged 7 commits into from
Jan 17, 2020
Merged

fix: duplicate id data-table in carbon-website #5080

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3dc71b4
fix: duplicate id data-table in carbon-website
Jan 17, 2020
b11e877
fix: fix duplicate label of a rest of page
Jan 17, 2020
c06b951
Merge branch 'master' into duytran/fix-duplicate-id-carbon-website
xxxle0 Jan 17, 2020
ab2190e
Merge branch 'master' into duytran/fix-duplicate-id-carbon-website
tw15egan Jan 17, 2020
a8a2fc3
Merge branch 'master' into duytran/fix-duplicate-id-carbon-website
xxxle0 Jan 17, 2020
2fdcc4d
Merge branch 'master' into duytran/fix-duplicate-id-carbon-website
tw15egan Jan 17, 2020
d6a5c44
Merge branch 'master' into duytran/fix-duplicate-id-carbon-website
joshblack Jan 17, 2020
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
14 changes: 7 additions & 7 deletions packages/components/src/components/data-table/data-table.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ const columnsExpandable = [
name: 'select',
title: 'Label name',
checkbox: true,
checkboxId: `${prefix}--checkbox-20`,
checkboxName: 'checkbox-20',
checkboxId: `${prefix}--checkbox-21`,
checkboxName: 'checkbox-21',
checkboxValue: 'green',
},
{
Expand Down Expand Up @@ -209,10 +209,10 @@ const columnsSmall = columns.slice(1, -1).map(column => ({

const rows = [
{
id: 'row-id-13',
id: 'row-id-16',
select: {
id: `${prefix}--checkbox-13`,
name: 'checkbox-13',
id: `${prefix}--checkbox-16`,
name: 'checkbox-16',
value: 'green',
label: 'Label name',
},
Expand Down Expand Up @@ -338,8 +338,8 @@ const rowsExpandable = [
` <p>A variety of content types can live here. Be sure to follow Carbon design guidelines for spacing and alignment.</p>
`,
select: {
id: `${prefix}--checkbox-12`,
name: 'checkbox-12',
id: `${prefix}--checkbox-10`,
name: 'checkbox-10',
value: 'green',
label: 'Label name',
},
Expand Down