Skip to content

Commit b01f250

Browse files
rcdextarcdexta
committed
Merge branch 'oisti-master'
2 parents 0873274 + 3e40b8d commit b01f250

3 files changed

Lines changed: 2 additions & 35 deletions

File tree

‎src/components/BoardContainer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class BoardContainer extends Component {
117117
}
118118

119119
render() {
120-
const {id, reducerData, draggable, laneDraggable, laneDragClass, style, onDataChange, addLaneTitle, editable, canAddLanes, ...otherProps} = this.props
120+
const {id, reducerData, draggable, laneDraggable, laneDragClass, style, onDataChange, onLaneScroll, onCardClick, onLaneClick, onCardDelete, onCardAdd, addLaneTitle, editable, canAddLanes, ...otherProps} = this.props
121121
// Stick to whitelisting attributes to segregate board and lane props
122122
const passthroughProps = pick(this.props, [
123123
'onLaneScroll',

‎src/components/Lane.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class Lane extends Component {
228228

229229
render() {
230230
const {loading, isDraggingOver} = this.state
231-
const {id, onLaneClick, onCardAdd, ...otherProps} = this.props
231+
const {id, onLaneClick, onLaneScroll, onCardClick, onCardAdd, onCardDelete, ...otherProps} = this.props
232232
return (
233233
<Section {...otherProps} key={id} onClick={() => onLaneClick && onLaneClick(id)} draggable={false} className="react-trello-lane">
234234
{this.renderHeader()}

‎tests/__snapshots__/Storyshots.test.js.snap‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1944,8 +1944,6 @@ exports[`Storyshots Advanced Features Event Handling 1`] = `
19441944
}
19451945
}
19461946
draggable={false}
1947-
onCardClick={[Function]}
1948-
onLaneClick={[Function]}
19491947
style={undefined}
19501948
>
19511949
<div
@@ -1958,7 +1956,6 @@ exports[`Storyshots Advanced Features Event Handling 1`] = `
19581956
className="react-trello-lane sc-htpNat dJewwL"
19591957
draggable={false}
19601958
label={undefined}
1961-
onCardClick={[Function]}
19621959
onClick={[Function]}
19631960
style={Object {}}
19641961
title="Planned Tasks"
@@ -2053,7 +2050,6 @@ exports[`Storyshots Advanced Features Event Handling 1`] = `
20532050
className="react-trello-lane sc-htpNat dJewwL"
20542051
draggable={false}
20552052
label={undefined}
2056-
onCardClick={[Function]}
20572053
onClick={[Function]}
20582054
style={Object {}}
20592055
title="Executing"
@@ -4262,7 +4258,6 @@ exports[`Storyshots Advanced Features Scrolling and Events 1`] = `
42624258
}
42634259
}
42644260
draggable={false}
4265-
onLaneScroll={[Function]}
42664261
style={undefined}
42674262
>
42684263
<div
@@ -4274,7 +4269,6 @@ exports[`Storyshots Advanced Features Scrolling and Events 1`] = `
42744269
draggable={false}
42754270
label={undefined}
42764271
onClick={[Function]}
4277-
onLaneScroll={[Function]}
42784272
style={Object {}}
42794273
title="Lane1"
42804274
>
@@ -7088,7 +7082,6 @@ exports[`Storyshots Basic Functions Infinite Scrolling 1`] = `
70887082
}
70897083
}
70907084
draggable={false}
7091-
onLaneScroll={[Function]}
70927085
style={undefined}
70937086
>
70947087
<div
@@ -7100,7 +7093,6 @@ exports[`Storyshots Basic Functions Infinite Scrolling 1`] = `
71007093
draggable={false}
71017094
label={undefined}
71027095
onClick={[Function]}
7103-
onLaneScroll={[Function]}
71047096
style={Object {}}
71057097
title="Lane1"
71067098
>
@@ -10500,7 +10492,6 @@ exports[`Storyshots Custom Templates Custom Card Template 1`] = `
1050010492
}
1050110493
}
1050210494
draggable={false}
10503-
onCardClick={[Function]}
1050410495
style={undefined}
1050510496
>
1050610497
<div
@@ -10513,7 +10504,6 @@ exports[`Storyshots Custom Templates Custom Card Template 1`] = `
1051310504
className="react-trello-lane sc-htpNat dJewwL"
1051410505
draggable={false}
1051510506
label="12/12"
10516-
onCardClick={[Function]}
1051710507
onClick={[Function]}
1051810508
style={
1051910509
Object {
@@ -10776,7 +10766,6 @@ exports[`Storyshots Custom Templates Custom Card Template 1`] = `
1077610766
className="react-trello-lane sc-htpNat dJewwL"
1077710767
draggable={false}
1077810768
label={undefined}
10779-
onCardClick={[Function]}
1078010769
onClick={[Function]}
1078110770
style={Object {}}
1078210771
title="Long Lane name this is i suppose ha!"
@@ -12545,7 +12534,6 @@ exports[`Storyshots Custom Templates Drag-n-Drop Styling 1`] = `
1254512534
}
1254612535
}
1254712536
draggable={false}
12548-
onCardClick={[Function]}
1254912537
style={undefined}
1255012538
>
1255112539
<div
@@ -12558,7 +12546,6 @@ exports[`Storyshots Custom Templates Drag-n-Drop Styling 1`] = `
1255812546
className="react-trello-lane sc-htpNat dJewwL"
1255912547
draggable={false}
1256012548
label={undefined}
12561-
onCardClick={[Function]}
1256212549
onClick={[Function]}
1256312550
style={Object {}}
1256412551
title="Planned"
@@ -12747,7 +12734,6 @@ exports[`Storyshots Custom Templates Drag-n-Drop Styling 1`] = `
1274712734
className="react-trello-lane sc-htpNat dJewwL"
1274812735
draggable={false}
1274912736
label={undefined}
12750-
onCardClick={[Function]}
1275112737
onClick={[Function]}
1275212738
style={Object {}}
1275312739
title="Work In Progress"
@@ -19215,9 +19201,6 @@ exports[`Storyshots Editable Board Add/Delete Cards 1`] = `
1921519201
}
1921619202
}
1921719203
draggable={false}
19218-
onCardAdd={[Function]}
19219-
onCardClick={[Function]}
19220-
onCardDelete={[Function]}
1922119204
style={undefined}
1922219205
>
1922319206
<div
@@ -19230,8 +19213,6 @@ exports[`Storyshots Editable Board Add/Delete Cards 1`] = `
1923019213
className="react-trello-lane sc-htpNat dJewwL"
1923119214
draggable={false}
1923219215
label="20/70"
19233-
onCardClick={[Function]}
19234-
onCardDelete={[Function]}
1923519216
onClick={[Function]}
1923619217
style={
1923719218
Object {
@@ -19459,8 +19440,6 @@ exports[`Storyshots Editable Board Add/Delete Cards 1`] = `
1945919440
className="react-trello-lane sc-htpNat dJewwL"
1946019441
draggable={false}
1946119442
label="10/20"
19462-
onCardClick={[Function]}
19463-
onCardDelete={[Function]}
1946419443
onClick={[Function]}
1946519444
style={
1946619445
Object {
@@ -19556,8 +19535,6 @@ exports[`Storyshots Editable Board Add/Delete Cards 1`] = `
1955619535
className="react-trello-lane sc-htpNat dJewwL"
1955719536
draggable={false}
1955819537
label="0/0"
19559-
onCardClick={[Function]}
19560-
onCardDelete={[Function]}
1956119538
onClick={[Function]}
1956219539
style={
1956319540
Object {
@@ -19608,8 +19585,6 @@ exports[`Storyshots Editable Board Add/Delete Cards 1`] = `
1960819585
className="react-trello-lane sc-htpNat dJewwL"
1960919586
draggable={false}
1961019587
label="2/5"
19611-
onCardClick={[Function]}
19612-
onCardDelete={[Function]}
1961319588
onClick={[Function]}
1961419589
style={
1961519590
Object {
@@ -19749,8 +19724,6 @@ exports[`Storyshots Editable Board Add/Delete Cards 1`] = `
1974919724
className="react-trello-lane sc-htpNat dJewwL"
1975019725
draggable={false}
1975119726
label="1/1"
19752-
onCardClick={[Function]}
19753-
onCardDelete={[Function]}
1975419727
onClick={[Function]}
1975519728
style={
1975619729
Object {
@@ -19846,8 +19819,6 @@ exports[`Storyshots Editable Board Add/Delete Cards 1`] = `
1984619819
className="react-trello-lane sc-htpNat dJewwL"
1984719820
draggable={false}
1984819821
label="1/1"
19849-
onCardClick={[Function]}
19850-
onCardDelete={[Function]}
1985119822
onClick={[Function]}
1985219823
style={
1985319824
Object {
@@ -19943,8 +19914,6 @@ exports[`Storyshots Editable Board Add/Delete Cards 1`] = `
1994319914
className="react-trello-lane sc-htpNat dJewwL"
1994419915
draggable={false}
1994519916
label="1/1"
19946-
onCardClick={[Function]}
19947-
onCardDelete={[Function]}
1994819917
onClick={[Function]}
1994919918
style={
1995019919
Object {
@@ -20040,8 +20009,6 @@ exports[`Storyshots Editable Board Add/Delete Cards 1`] = `
2004020009
className="react-trello-lane sc-htpNat dJewwL"
2004120010
draggable={false}
2004220011
label="1/1"
20043-
onCardClick={[Function]}
20044-
onCardDelete={[Function]}
2004520012
onClick={[Function]}
2004620013
style={
2004720014
Object {

0 commit comments

Comments
 (0)