Skip to content

fix: style panel not detecting applied text color (shows "None") #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: style panel not detecting applied text color (shows "None") #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions apps/studio/src/routes/editor/EditPanel/StylesTab/single/ColorInput/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { invokeMainChannel } from '@/lib/utils';
import type { ColorItem } from '@/routes/editor/LayersPanel/BrandTab/ColorPanel/ColorPalletGroup';
import { DEFAULT_COLOR_NAME, MainChannels } from '@onlook/models/constants';
import { Icons } from '@onlook/ui/icons';
import { Color, isColorEmpty } from '@onlook/utility';
import { Color, isColorEmpty, resolveCssVariables } from '@onlook/utility';
import { observer } from 'mobx-react-lite';
import { memo, useCallback, useEffect, useMemo, useState } from 'react';
import { BrandPopoverPicker } from './ColorBrandPicker';
Expand Down Expand Up @@ -98,12 +98,17 @@ const ColorInput = observer(
}
const newValue = elementStyle.getValue(editorEngine.style.selectedStyle?.styles);

const resolvedValue = resolveCssVariables(
newValue,
editorEngine.style.selectedStyle.styles,
);

const color = editorEngine.theme.getColorByName(newValue);
if (color) {
return Color.from(color);
}

return Color.from(newValue);
return Color.from(resolvedValue);
}, [editorEngine.style.selectedStyle?.styles, elementStyle, isFocused, editorEngine.theme]);

// Update color state when getColor changes
Expand Down
10 changes: 10 additions & 0 deletions packages/utility/src/color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,3 +337,13 @@ function rgb2hsv({ r, g, b }: { r: number; g: number; b: number }): {
const h = c && (v === r ? (g - b) / c : v === g ? 2 + (b - r) / c : 4 + (r - g) / c);
return { h: (h < 0 ? h + 6 : h) / 6, s: v && c / v, v };
}

export function resolveCssVariables(
valueWithVars: string,
styleRecord: Record<string, string>,
fallback = '1',
): string {
return valueWithVars.replace(/var\((--[^)]+)\)/g, (_, varName: string) => {
return styleRecord[varName] ?? fallback;
});
}