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.

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

fix: better prop management to not trigger runtime warnings #545

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
36 changes: 26 additions & 10 deletions src/controllers/BoardContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,28 +114,42 @@ class BoardContainer extends Component {
const {
id,
components,
actions,
data,
reducerData,
draggable,
laneDraggable,
laneDragClass,
laneDropClass,
style,
onDataChange,
onCardAdd,
onCardUpdate,
eventBusHandle,
onLaneScroll,
onCardClick,
onBeforeCardDelete,
onCardDelete,
onLaneScroll,
onLaneClick,
onCardAdd,
onCardUpdate,
onLaneAdd,
onLaneDelete,
onLaneClick,
onLaneUpdate,
laneSortFunction,
draggable,
collapsibleLanes,
editable,
canAddLanes,
laneStyle,
hideCardDeleteIcon,
handleDragStart,
handleDragEnd,
handleLaneDragStart,
handleLaneDragEnd,
style,
tagStyle,
laneDraggable,
cardDraggable,
cardDragClass,
laneDragClass,
laneDropClass,
onCardMoveAcrossLanes,
t,
cardStyle,
laneStyle,
...otherProps
} = this.props

Expand Down Expand Up @@ -251,6 +265,8 @@ BoardContainer.propTypes = {
laneDropClass: PropTypes.string,
onCardMoveAcrossLanes: PropTypes.func.isRequired,
t: PropTypes.func.isRequired,
cardStyle: PropTypes.object,
laneStyle: PropTypes.object
}

BoardContainer.defaultProps = {
Expand Down
40 changes: 32 additions & 8 deletions src/controllers/Lane.js
Original file line number Diff line number Diff line change
Expand Up @@ -242,20 +242,42 @@ class Lane extends Component {
render() {
const {loading, isDraggingOver, collapsed} = this.state
const {
actions,
id,
boardId,
title,
index,
laneSortFunction,
style,
cardStyle,
tagStyle,
titleStyle,
labelStyle,
cards,
label,
currentPage,
draggable,
collapsibleLanes,
components,
onLaneClick,
onLaneScroll,
droppable,
onCardMoveAcrossLanes,
onCardClick,
onCardAdd,
onBeforeCardDelete,
onCardDelete,
onCardAdd,
onCardUpdate,
onLaneDelete,
onLaneUpdate,
onCardUpdate,
onCardMoveAcrossLanes,
onLaneClick,
onLaneScroll,
editable,
laneDraggable,
cardDraggable,
cardDragClass,
cardDropClass,
canAddLanes,
t,
components,
className,
...otherProps
} = this.props
const allClassNames = classNames('react-trello-lane', this.props.className || '')
Expand All @@ -267,7 +289,7 @@ class Lane extends Component {
onClick={() => onLaneClick && onLaneClick(id)}
draggable={false}
className={allClassNames}>
{this.renderHeader({id, cards, ...otherProps})}
{this.renderHeader({id, cards, t, ...otherProps})}
{this.renderDragContainer(isDraggingOver)}
{loading && <components.Loader />}
{showFooter && <components.LaneFooter onClick={this.toggleLaneCollapsed} collapsed={collapsed} />}
Expand Down Expand Up @@ -310,7 +332,9 @@ Lane.propTypes = {
cardDragClass: PropTypes.string,
cardDropClass: PropTypes.string,
canAddLanes: PropTypes.bool,
t: PropTypes.func.isRequired
t: PropTypes.func.isRequired,
components: PropTypes.object,
className: PropTypes.string
}

Lane.defaultProps = {
Expand Down