Fix crash when creating custom colors for labels

This commit is contained in:
Jackson Harper 2023-03-08 11:53:00 +08:00
parent 25a721d183
commit 976c2386ae
3 changed files with 15 additions and 10 deletions

View file

@ -7,7 +7,7 @@ export type LabelColor =
| '#7BE4FF'
| '#CE88EF'
| '#EF8C43'
| 'custom color'
| '#000000'
export const labelFragment = gql`
fragment LabelFields on Label {

View file

@ -148,15 +148,16 @@ export default function LabelsPage(): JSX.Element {
const { labels, revalidate } = useGetLabelsQuery()
const [labelColorHex, setLabelColorHex] = useState<LabelColorHex>({
rowId: '',
value: 'custom color',
value: '#000000',
})
const [editingLabelId, setEditingLabelId] = useState<string | null>(null)
const [nameInputText, setNameInputText] = useState<string>('')
const [descriptionInputText, setDescriptionInputText] = useState<string>('')
const [isCreateMode, setIsCreateMode] = useState<boolean>(false)
const [windowWidth, setWindowWidth] = useState<number>(0)
const [confirmRemoveLabelId, setConfirmRemoveLabelId] =
useState<string | null>(null)
const [confirmRemoveLabelId, setConfirmRemoveLabelId] = useState<
string | null
>(null)
const breakpoint = 768
applyStoredTheme(false)
@ -559,7 +560,10 @@ function GenericTableCard(
alignment="center"
css={{ ml: '16px', '@smDown': { ml: '0px' } }}
>
<LabelChip color={labelColor || ''} text={label?.name || ''} />
<LabelChip
color={labelColor || '#000000'}
text={label?.name || ''}
/>
</HStack>
)}
{showInput && !label ? (
@ -632,7 +636,7 @@ function GenericTableCard(
labelColorHexRowId={labelColorHex.rowId}
labelColorHexValue={labelColorHex.value}
labelId={label?.id || ''}
labelColor={label?.color || 'custom color'}
labelColor={label?.color || '#000000'}
setLabelColorHex={setLabelColorHex}
/>
)}
@ -804,7 +808,7 @@ function MobileEditCard(props: any) {
labelColorHexRowId={labelColorHex.rowId}
labelColorHexValue={labelColorHex.value}
labelId={label?.id || ''}
labelColor={label?.color || 'custom color'}
labelColor={label?.color || '#000000'}
setLabelColorHex={setLabelColorHex}
/>
<TextArea
@ -900,7 +904,7 @@ function DesktopEditCard(props: any) {
labelColorHexRowId={labelColorHex.rowId}
labelColorHexValue={labelColorHex.value}
labelId={label?.id || ''}
labelColor={label?.color || 'custom color'}
labelColor={label?.color || '#000000'}
setLabelColorHex={setLabelColorHex}
/>
<Input

View file

@ -47,6 +47,7 @@ export const labelColorObjects: LabelColorObjects = {
export const randomLabelColorHex = () => {
const colorHexes = Object.keys(labelColorObjects).slice(0, -1)
const randomColorHex = colorHexes[Math.floor(Math.random() * colorHexes.length)]
const randomColorHex =
colorHexes[Math.floor(Math.random() * colorHexes.length)]
return randomColorHex
}
}