Merge pull request #15 from mattermost/remove-text-property-from-button

Remove text property from Button because children is enough
This commit is contained in:
chenilim 2020-10-15 11:49:33 -07:00 committed by GitHub
commit 93d3dd6ee2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 9 deletions

View file

@ -149,7 +149,7 @@ class BoardComponent extends React.Component<Props, State> {
<div className="octo-board-header-cell">
<div className="octo-label" title={`Items with an empty ${boardTree.groupByProperty?.name} property will go here. This column cannot be removed.`}>{`No ${boardTree.groupByProperty?.name}`}</div>
<Button text={`${boardTree.emptyGroupCards.length}`} />
<Button>{`${boardTree.emptyGroupCards.length}`}</Button>
<div className="octo-spacer" />
<Button><div className="imageOptions" /></Button>
<Button onClick={() => { this.addCard(undefined) }}><div className="imageAdd" /></Button>
@ -173,7 +173,7 @@ class BoardComponent extends React.Component<Props, State> {
className={`octo-label ${group.option.color}`}
text={group.option.value}
onChanged={(text) => { this.propertyNameChanged(group.option, text) }} />
<Button text={`${group.cards.length}`} />
<Button>{`${group.cards.length}`}</Button>
<div className="octo-spacer" />
<MenuWrapper>
<Button><div className="imageOptions" /></Button>
@ -190,7 +190,7 @@ class BoardComponent extends React.Component<Props, State> {
)}
<div className="octo-board-header-cell">
<Button text="+ Add a group" onClick={(e) => { this.addGroupClicked() }} />
<Button onClick={(e) => { this.addGroupClicked() }}>+ Add a group</Button>
</div>
</div>
@ -210,7 +210,7 @@ class BoardComponent extends React.Component<Props, State> {
onDragStart={() => { this.draggedCard = card }}
onDragEnd={() => { this.draggedCard = undefined }} />
)}
<Button text="+ New" onClick={() => { this.addCard(undefined) }} />
<Button onClick={() => { this.addCard(undefined) }} >+ New</Button>
</BoardColumn>
{/* Columns */}
@ -226,7 +226,7 @@ class BoardComponent extends React.Component<Props, State> {
onDragStart={() => { this.draggedCard = card }}
onDragEnd={() => { this.draggedCard = undefined }} />
)}
<Button text="+ New" onClick={() => { this.addCard(group.option.value) }} />
<Button onClick={() => { this.addCard(group.option.value) }} >+ New</Button>
</BoardColumn>
)}
</div>

View file

@ -6,7 +6,7 @@ type Props = {
onClick?: (e: React.MouseEvent<HTMLDivElement>) => void
style?: React.CSSProperties
backgroundColor?: string
text?: string
children?: React.ReactNode
title?: string
}
@ -20,7 +20,6 @@ export default class Button extends React.Component<Props> {
style={style}
title={this.props.title}>
{this.props.children}
{this.props.text}
</div>)
}
}

View file

@ -149,7 +149,7 @@ class CardDialog extends React.Component<Props, State> {
<div className="dialog" >
<div className="toolbar">
<div className="octo-spacer"></div>
<Button text="..." onClick={(e) => {
<Button onClick={(e) => {
Menu.shared.options = [
{ id: "delete", name: "Delete" },
]
@ -163,7 +163,7 @@ class CardDialog extends React.Component<Props, State> {
}
}
Menu.shared.showAtElement(e.target as HTMLElement)
}}></Button>
}}>...</Button>
</div>
<div className="content">
{icon ?