Skip to content

Commit e38cbbf

Browse files
authored
Merge pull request #16 from evillollive/copilot/restore-old-theme-naming-conventions
Use the active theme's per-tile labels in the toolbar palette
2 parents c00b6c5 + c356f61 commit e38cbbf

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

‎src/components/Toolbar.tsx‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ const Toolbar: React.FC<ToolbarProps> = ({
4747
activeTool, activeTile, themeId, onSetTool, onSetTile,
4848
onSetTheme, preserveOnThemeSwitch, onTogglePreserveOnThemeSwitch,
4949
}) => {
50+
const theme = getTheme(themeId);
51+
const tileLabels = React.useMemo(() => {
52+
const map = new Map<TileType, string>();
53+
for (const t of theme.tiles) map.set(t.id, t.label);
54+
return map;
55+
}, [theme]);
56+
const tileLabel = (tileType: TileType): string =>
57+
tileLabels.get(tileType) ?? TILE_LABELS[tileType];
5058
return (
5159
<div className="toolbar">
5260
<div className="toolbar-section">
@@ -104,10 +112,10 @@ const Toolbar: React.FC<ToolbarProps> = ({
104112
key={tileType}
105113
className={`tile-btn ${activeTile === tileType ? 'active' : ''}`}
106114
onClick={() => onSetTile(tileType)}
107-
title={TILE_LABELS[tileType]}
115+
title={tileLabel(tileType)}
108116
>
109117
<TilePreview type={tileType} size={22} themeId={themeId} />
110-
<span className="tile-btn-label">{TILE_LABELS[tileType]}</span>
118+
<span className="tile-btn-label">{tileLabel(tileType)}</span>
111119
</button>
112120
))}
113121
</div>

0 commit comments

Comments
 (0)