Skip to content

Commit 410814f

Browse files
committed
merge -> mergeRight in table visual tests
1 parent 6ac0d7b commit 410814f

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

components/dash-table/tests/visual/percy-storybook/Style.percy.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ storiesOf('DashTable/Style type condition', module)
473473
id='styling-20'
474474
data={mock.data}
475475
columns={mock.columns.map((col: any) =>
476-
R.merge(col, {
476+
R.mergeRight(col, {
477477
name: col.name,
478478
deletable: true
479479
})
@@ -499,7 +499,7 @@ storiesOf('DashTable/Style type condition', module)
499499
id='paging-large-current-page'
500500
data={mock.data.slice(0, 10)}
501501
columns={mock.columns.map((col: any) =>
502-
R.merge(col, {
502+
R.mergeRight(col, {
503503
name: col.name,
504504
deletable: true
505505
})
@@ -527,7 +527,7 @@ storiesOf('DashTable/Style type condition', module)
527527
id='paging-large-current-page'
528528
data={mock.data.slice(0, 10)}
529529
columns={mock.columns.map((col: any) =>
530-
R.merge(col, {
530+
R.mergeRight(col, {
531531
name: col.name,
532532
deletable: true
533533
})

components/dash-table/tests/visual/percy-storybook/Width.empty.percy.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,25 @@ storiesOf('DashTable/Empty', module).add('all variants', () => (
4040
<DataTable {...props} />
4141
<div>with column filters -- invalid query</div>
4242
<DataTable
43-
{...R.merge(props, {
43+
{...R.mergeRight(props, {
4444
filter_query: '{a} !'
4545
})}
4646
/>
4747
<div>with column filters -- single query</div>
4848
<DataTable
49-
{...R.merge(props, {
49+
{...R.mergeRight(props, {
5050
filter_query: '{a} ge 0'
5151
})}
5252
/>
5353
<div>with column filters -- multi query</div>
5454
<DataTable
55-
{...R.merge(props, {
55+
{...R.mergeRight(props, {
5656
filter_query: '{a} ge 0 && {b} ge 0'
5757
})}
5858
/>
5959
<div>with column filters -- multi query, no data</div>
6060
<DataTable
61-
{...R.merge(props, {
61+
{...R.mergeRight(props, {
6262
filter_query: '{a} gt 1000 && {b} gt 1000'
6363
})}
6464
/>

0 commit comments

Comments
 (0)