self-hosted/focalboard
1
0
Fork 0
mirror of https://github.com/mattermost/focalboard.git synced 2025-07-15 23:54:29 +02:00
Code Issues Releases Activity

Don't allow empty option names

Browse Source
This commit is contained in:
Chen-I Lim
2020-10-24 11:33:20 -07:00
parent f295c783f7
commit 39680fe6d4
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/src/components/boardComponent.tsx
View File

@ -309,6 +309,8 @@ class BoardComponent extends React.Component<Props, State> {
<Editable <Editable
className={`octo-label ${group.option.color}`} className={`octo-label ${group.option.color}`}
text={group.option.value} text={group.option.value}
placeholderText='New Select'
allowEmpty={false}
onChanged={(text) => { onChanged={(text) => {
this.propertyNameChanged(group.option, text) this.propertyNameChanged(group.option, text)
}} }}

14
webapp/src/components/editable.tsx
View File

@ -12,6 +12,7 @@ type Props = {
style?: React.CSSProperties style?: React.CSSProperties
isMarkdown: boolean isMarkdown: boolean
isMultiline: boolean isMultiline: boolean
allowEmpty: boolean
onFocus?: () => void onFocus?: () => void
onBlur?: () => void onBlur?: () => void
@ -26,6 +27,7 @@ class Editable extends React.Component<Props, State> {
text: '', text: '',
isMarkdown: false, isMarkdown: false,
isMultiline: false, isMultiline: false,
allowEmpty: true,
} }
private _text = '' private _text = ''
@ -103,11 +105,15 @@ class Editable extends React.Component<Props, State> {
onBlur={async () => { onBlur={async () => {
const newText = this.elementRef.current.innerText const newText = this.elementRef.current.innerText
const oldText = this.props.text || '' const oldText = this.props.text || ''
if (newText !== oldText && onChanged) { if (this.props.allowEmpty || newText) {
onChanged(newText) if (newText !== oldText && onChanged) {
} onChanged(newText)
}
this.text = newText this.text = newText
} else {
this.text = oldText // Reset text
}
this.elementRef.current.classList.remove('active') this.elementRef.current.classList.remove('active')
if (onBlur) { if (onBlur) {