diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e83399a..dc6e7011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - Name colors in pinned messages. - Rename "Heating up" to "Petting cats" - Concurrency guard for profile lookups. +- Hex color input for power level editor. ## 1.2.0 diff --git a/src/app/features/common-settings/permissions/PowersEditor.tsx b/src/app/features/common-settings/permissions/PowersEditor.tsx index 1ed122a6..68cfba60 100644 --- a/src/app/features/common-settings/permissions/PowersEditor.tsx +++ b/src/app/features/common-settings/permissions/PowersEditor.tsx @@ -69,11 +69,17 @@ function EditPower({ maxPower, power, tag, onSave, onClose }: EditPowerProps) { const [iconFile, setIconFile] = useState(); const pickFile = useFilePicker(setIconFile, false); - const [tagColor, setTagColor] = useState(tag?.color); + const [tagColor, setTagColor] = useState(tag?.color || '#FFFFFF'); const [tagIcon, setTagIcon] = useState(tag?.icon); + const uploadingIcon = iconFile && !tagIcon; const tagIconSrc = tagIcon && getPowerTagIconSrc(mx, useAuthentication, tagIcon); + const handleUpdateColor = (newColor: string) => { + const sanitized = newColor.startsWith('#') ? newColor : `#${newColor}`; + setTagColor(sanitized); + }; + const iconUploadAtom = useMemo(() => { if (iconFile) return createUploadAtom(iconFile); return undefined; @@ -84,9 +90,7 @@ function EditPower({ maxPower, power, tag, onSave, onClose }: EditPowerProps) { }, []); const handleIconUploaded = useCallback((upload: UploadSuccess) => { - setTagIcon({ - key: upload.mxc, - }); + setTagIcon({ key: upload.mxc }); setIconFile(undefined); }, []); @@ -105,9 +109,11 @@ function EditPower({ maxPower, power, tag, onSave, onClose }: EditPowerProps) { const tagName = nameInput.value.trim(); if (!tagName) return; + const finalColor = /^#[0-9A-F]{6}$/i.test(tagColor) ? tagColor : undefined; + const editedTag: MemberPowerTag = { name: tagName, - color: tagColor, + color: finalColor, icon: tagIcon, }; @@ -121,10 +127,10 @@ function EditPower({ maxPower, power, tag, onSave, onClose }: EditPowerProps) { Color - + } - onRemove={() => setTagColor(undefined)} + picker={} + onRemove={() => setTagColor('#FFFFFF')} > {(openPicker, opened) => (