Skip to content

Fixed the element color refresh to default color when color is deleted from brand panel #9

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 2 commits into
base: main
Choose a base branch
from
Open

Fixed the element color refresh to default color when color is deleted from brand panel #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daf2f83
Fixed the element color refresh to default color when color is delete…
SoloDevAbu Apr 27, 2025
f8f84da
Added await in the scanConfig
SoloDevAbu Apr 27, 2025
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
16 changes: 16 additions & 0 deletions apps/studio/src/lib/editor/engine/style/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,22 @@ export class StyleManager {
update(style: string, value: string) {
const styleObj = { [style]: value };
const action = this.getUpdateStyleAction(styleObj);

if (!value) {
const updatedTargets = action.targets.map((target) => ({
...target,
change: {
...target.change,
update: {
[style]: {
value: '',
type: StyleChangeType.Value,
},
},
},
}));
action.targets = updatedTargets;
}
this.editorEngine.action.run(action);
this.updateStyleNoAction(styleObj);
}
Expand Down
6 changes: 4 additions & 2 deletions apps/studio/src/lib/editor/engine/theme/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,8 @@ export class ThemeManager {

// Refresh colors after deletion
this.scanConfig();

await this.editorEngine.webviews.reloadWebviews();
} catch (error) {
console.error('Error deleting color:', error);
}
Expand Down Expand Up @@ -376,10 +378,10 @@ export class ThemeManager {
});

// Refresh colors after update
this.scanConfig();
await this.scanConfig();

// Force a theme refresh for all frames
await this.editorEngine.webviews.reloadWebviews();
this.editorEngine.webviews.reloadWebviews();
}
} catch (error) {
console.error('Error updating color:', error);
Expand Down
15 changes: 15 additions & 0 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 @@ -108,6 +108,21 @@ const ColorInput = observer(

// Update color state when getColor changes
const [color, setColor] = useState(getColor);

useEffect(() => {
const styles = editorEngine.style.selectedStyle?.styles || {};
const currentValue = elementStyle.getValue(styles);

if (currentValue && !currentValue.startsWith('#')) {
const colorExists = editorEngine.theme.getColorByName(currentValue);

if (!colorExists) {
const defaultColor = Color.from(elementStyle.defaultValue);
sendStyleUpdate(defaultColor);
}
}
}, [editorEngine.theme.colorGroups, editorEngine.theme.colorDefaults]);

useEffect(() => {
if (!isFocused) {
setColor(getColor);
Expand Down