Skip to content
Merged
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
87 changes: 85 additions & 2 deletions src-tauri/src/state/migration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,20 @@ pub(crate) fn load_store_from_path(path: &Path) -> Result<(AppStoreData, bool)>
.with_context(|| format!("failed to read store file at {}", path.display()))?;
let (state, needs_persist) = match serde_json::from_str::<AppStoreData>(&content) {
Ok(data) => {
let needs_persist = data.font_settings.custom_fonts.iter().any(|font| {
let needs_font_persist = data.font_settings.custom_fonts.iter().any(|font| {
font.font_type == FontType::Local
&& font
.css_content
.as_ref()
.map(|c| !c.trim().is_empty())
.unwrap_or(false)
});
(normalize_state(data), needs_persist)
// rgba로 깨진 noteBorderColor가 있으면 정규화 후 디스크에도 영속 (이슈 #73)
let needs_border_color_fix = has_convertible_note_border_color(&data);
(
normalize_state(data),
needs_font_persist || needs_border_color_fix,
)
}
// 레거시/비정상 store 파일 복구 후 정규화 상태 저장
Err(_) => (repair_legacy_state(&content), true),
Expand Down Expand Up @@ -270,6 +275,42 @@ fn migrate_image_reference_to_app_data(images_dir: &Path, image_ref: &mut Option
}
}

/// `rgba(r, g, b, a)` 문자열을 `#RRGGBB`로 변환. rgba 형식이 아니거나 파싱 실패 시 None
fn rgba_to_hex(color: &str) -> Option<String> {
let inner = color.trim().strip_prefix("rgba(")?.strip_suffix(')')?;
let mut parts = inner.split(',');
let r: u8 = parts.next()?.trim().parse().ok()?;
let g: u8 = parts.next()?.trim().parse().ok()?;
let b: u8 = parts.next()?.trim().parse().ok()?;
Some(format!("#{r:02X}{g:02X}{b:02X}"))
}

/// noteBorderColor가 변환 가능한 rgba면 #RRGGBB로 교체 (그 외 입력은 그대로)
fn migrate_note_border_color(color: &mut Option<String>) {
if let Some(hex) = color.as_deref().and_then(rgba_to_hex) {
*color = Some(hex);
}
}

/// store에 #RRGGBB로 변환 가능한 rgba noteBorderColor가 남아 있는지 (디스크 영속 판단용)
fn has_convertible_note_border_color(data: &AppStoreData) -> bool {
let convertible = |color: &Option<String>| color.as_deref().and_then(rgba_to_hex).is_some();
data.key_positions
.values()
.flatten()
.any(|pos| convertible(&pos.note_border_color))
|| data
.stat_positions
.values()
.flatten()
.any(|stat| convertible(&stat.position.note_border_color))
|| data
.graph_positions
.values()
.flatten()
.any(|graph| convertible(&graph.position.note_border_color))
}

/// store 데이터 정규화 및 레거시 마이그레이션 적용
pub(crate) fn normalize_state(mut data: AppStoreData) -> AppStoreData {
if data.keys.is_empty() {
Expand All @@ -293,6 +334,24 @@ pub(crate) fn normalize_state(mut data: AppStoreData) -> AppStoreData {
}
}

// 마이그레이션: noteBorderColor에 잘못 저장된 rgba(...) → #RRGGBB 복구 (이슈 #73)
// 배치 편집 경로가 정규화 없이 rgba 문자열을 저장해 오버레이에서 초록색으로 깨짐
for positions in data.key_positions.values_mut() {
for pos in positions.iter_mut() {
migrate_note_border_color(&mut pos.note_border_color);
}
}
for positions in data.stat_positions.values_mut() {
for stat in positions.iter_mut() {
migrate_note_border_color(&mut stat.position.note_border_color);
}
}
for positions in data.graph_positions.values_mut() {
for graph in positions.iter_mut() {
migrate_note_border_color(&mut graph.position.note_border_color);
}
}

// 레거시 마이그레이션: fadePosition enum → 방향별 픽셀 fade 값
data.note_settings.migrate_fade_position();
for tab in data.tab_note_overrides.values_mut() {
Expand Down Expand Up @@ -600,3 +659,27 @@ struct LegacyOverlayPosition {
x: f64,
y: f64,
}

#[cfg(test)]
mod tests {
use super::rgba_to_hex;

#[test]
fn rgba_to_hex_converts_and_drops_alpha() {
assert_eq!(
rgba_to_hex("rgba(255, 0, 167, 1)").as_deref(),
Some("#FF00A7")
);
assert_eq!(
rgba_to_hex("rgba(18, 52, 86, 0)").as_deref(),
Some("#123456")
);
}

#[test]
fn rgba_to_hex_ignores_non_rgba() {
assert_eq!(rgba_to_hex("#FF00A7"), None);
assert_eq!(rgba_to_hex("garbage"), None);
assert_eq!(rgba_to_hex("rgba(300, 0, 0, 1)"), None); // u8 범위 초과
}
}
6 changes: 5 additions & 1 deletion src/renderer/components/main/Grid/PropertiesPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { usePropertiesPanelStore } from '@stores/grid/usePropertiesPanelStore';
import { useLayerGroupStore } from '@stores/data/useLayerGroupStore';
import { getKeyInfoByGlobalKey } from '@utils/core/KeyMaps';
import { translatePluginMessage } from '@utils/plugin/pluginI18n';
import { toRgbHexColor } from '@utils/color/colorUtils';
import type { KeyPosition } from '@src/types/key/keys';
import type { StatItemPosition, StatItemType } from '@src/types/key/statItems';
import type { GraphItemPosition } from '@src/types/key/graphItems';
Expand Down Expand Up @@ -2185,7 +2186,10 @@ const PropertiesPanel: React.FC<PropertiesPanelProps> = ({
handleBatchGlowColorChangeComplete(newColor);
}
} else if (batchPickerFor === 'borderColor') {
const solidColor = typeof newColor === 'string' ? newColor : '#FFFFFF';
// noteBorderColor는 #RRGGBB 계약 — 피커의 rgba(...) 출력을 hex로 정규화 (이슈 #73)
const solidColor = toRgbHexColor(
typeof newColor === 'string' ? newColor : undefined,
);
if (selectedKeyElements.length > 0 && selectedStatElements.length > 0) {
handleBatchKeyOnlyStyleChangeComplete('noteBorderColor', solidColor);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,12 @@ import {
import Checkbox from '@components/main/common/Checkbox';
import Dropdown from '@components/main/common/Dropdown';
import ColorPicker from '@components/main/Modal/content/pickers/ColorPicker';
import { isGradientColor } from '@utils/color/colorUtils';
import { isGradientColor, toRgbHexColor } from '@utils/color/colorUtils';
import { NOTE_SETTINGS_CONSTRAINTS } from '@src/types/settings/noteSettingsConstraints';
import { useSettingsStore } from '@stores/useSettingsStore';

const DEFAULT_NOTE_COLOR = '#FFFFFF';

// rgba(...) 또는 hex 문자열에서 #RRGGBB 추출
const toHexColor = (color: string): string => {
if (color.startsWith('#') && color.length >= 7) return color.slice(0, 7);
const match = color.match(/rgba?\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/);
if (match) {
const r = Math.min(255, Number(match[1]));
const g = Math.min(255, Number(match[2]));
const b = Math.min(255, Number(match[3]));
return `#${r.toString(16).padStart(2, '0')}${g
.toString(16)
.padStart(2, '0')}${b.toString(16).padStart(2, '0')}`.toUpperCase();
}
return DEFAULT_NOTE_COLOR;
};

// 색상 모드 상수
const COLOR_MODES = {
solid: 'solid',
Expand Down Expand Up @@ -740,15 +725,15 @@ const NoteTabContent: React.FC<NoteTabContentProps> = ({
}
onColorChange={(c: NoteColor) => {
if (pickerFor === 'border') {
const hex = toHexColor(typeof c === 'string' ? c : '#FFFFFF');
const hex = toRgbHexColor(typeof c === 'string' ? c : undefined);
setBorderColor(hex);
return;
}
handleColorChange(pickerFor, c);
}}
onColorChangeComplete={(c: NoteColor) => {
if (pickerFor === 'border') {
const hex = toHexColor(typeof c === 'string' ? c : '#FFFFFF');
const hex = toRgbHexColor(typeof c === 'string' ? c : undefined);
setBorderColor(hex);
onKeyPreview?.(keyIndex, { noteBorderColor: hex });
onKeyUpdate({ index: keyIndex, noteBorderColor: hex });
Expand Down
4 changes: 3 additions & 1 deletion src/renderer/stores/signals/noteBuffer.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { DEFAULT_NOTE_BORDER_RADIUS } from '@constants/overlayDefaults';
import { toRgbHexColor } from '@utils/color/colorUtils';

const MAX_NOTES = 2048;

Expand All @@ -19,7 +20,8 @@ const linearToSRGB = (c: number) => {
};

const parseColor = (hex: string) => {
const color = hex.replace('#', '');
// rgba(...)/3·8자리 hex 등 어떤 입력이든 #RRGGBB로 정규화 — NaN 방어 (이슈 #73)
const color = toRgbHexColor(hex).slice(1);
const r = parseInt(color.substring(0, 2), 16);
const g = parseInt(color.substring(2, 4), 16);
const b = parseInt(color.substring(4, 6), 16);
Expand Down
38 changes: 38 additions & 0 deletions src/renderer/utils/color/colorUtils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
rgbToHsv,
toColorObject,
toCssRgba,
toRgbHexColor,
} from './colorUtils';

describe('isGradientColor', () => {
Expand Down Expand Up @@ -156,3 +157,40 @@ describe('toCssRgba', () => {
expect(result.alpha).toBe(0.8);
});
});

describe('toRgbHexColor', () => {
// 이슈 #73 회귀: rgba 문자열이 초록색으로 깨지지 않아야 함
it('rgba 문자열을 알파 버리고 #RRGGBB로 변환', () => {
expect(toRgbHexColor('rgba(255, 0, 167, 1)')).toBe('#FF00A7');
expect(toRgbHexColor('rgba(100, 200, 50, 0.8)')).toBe('#64C832');
});

it('알파 0이어도 RGB 유지', () => {
expect(toRgbHexColor('rgba(18, 52, 86, 0)')).toBe('#123456');
});

it('알파 없는 rgb()도 변환', () => {
expect(toRgbHexColor('rgb(255, 0, 167)')).toBe('#FF00A7');
});

it('#RRGGBB는 대문자로 그대로', () => {
expect(toRgbHexColor('#ff00a7')).toBe('#FF00A7');
expect(toRgbHexColor('#FF00A7')).toBe('#FF00A7');
});

it('3자리/8자리 hex도 #RRGGBB로 정규화 (알파 제거)', () => {
expect(toRgbHexColor('#f0a')).toBe('#FF00AA');
expect(toRgbHexColor('#FF00A7CC')).toBe('#FF00A7');
});

it('잘못된 입력/빈값/null은 fallback', () => {
expect(toRgbHexColor(null)).toBe('#FFFFFF');
expect(toRgbHexColor(undefined)).toBe('#FFFFFF');
expect(toRgbHexColor('')).toBe('#FFFFFF');
expect(toRgbHexColor('garbage')).toBe('#FFFFFF');
});

it('커스텀 fallback 지원', () => {
expect(toRgbHexColor(null, '#000000')).toBe('#000000');
});
});
23 changes: 23 additions & 0 deletions src/renderer/utils/color/colorUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,28 @@ const normalizeColorInput = (
return '#561ecb';
};

// 알파를 버리고 항상 대문자 #RRGGBB 반환. noteBorderColor처럼 hex 계약이 강제된 필드용
const toRgbHexColor = (
value: string | null | undefined,
fallback = '#FFFFFF',
): string => {
if (typeof value === 'string') {
const trimmed = value.trim();
// rgb(...) / rgba(...) — 알파 버리고 0~255 클램프
const rgb = trimmed.match(
/^rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})/i,
);
if (rgb) {
const toHex = (n: string) =>
Math.min(255, Number(n)).toString(16).padStart(2, '0');
return `#${toHex(rgb[1])}${toHex(rgb[2])}${toHex(rgb[3])}`.toUpperCase();
}
const parsed = parseHexColor(trimmed);
if (parsed) return parsed.hex;
}
return fallback;
};

const buildGradient = (topHex: string, bottomHex: string): GradientColor => ({
type: 'gradient',
top: topHex,
Expand Down Expand Up @@ -269,6 +291,7 @@ export {
MODES,
isGradientColor,
normalizeColorInput,
toRgbHexColor,
buildGradient,
parseHexColor,
rgbToHsv,
Expand Down
Loading