Skip to content

Allow string color types #117

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

Merged
marklundin merged 1 commit into from
Apr 28, 2025
Merged

Allow string color types #117

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
11 changes: 0 additions & 11 deletions packages/lib/src/utils/color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,3 @@ export const getColorPropertyNames = <T extends object>(target: T): Array<keyof

return colorNames as Array<keyof T & string>;
};

// Extract color names directly from the object
type CssColorName = keyof typeof cssColorNamesMap;

// Combine all valid CSS color types
export type CssColor = CssColorName | `#${string}`

// // Utility to replace pc.Color with CssColor
// export type WithCssColors<T> = {
// [K in keyof T]: T[K] extends Color ? CssColor : T[K];
// };
3 changes: 1 addition & 2 deletions packages/lib/src/utils/types-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Color } from "playcanvas";
import { Vec4 } from "playcanvas";
import { Quat } from "playcanvas";
import { Vec3 } from "playcanvas";
import { CssColor } from "./color";

type BuiltInKeys =
| 'constructor' | 'prototype' | 'length' | 'name'
Expand Down Expand Up @@ -36,7 +35,7 @@ export type PublicProps<T> = {


export type Serializable<T> = {
[K in keyof T]: T[K] extends Color ? CssColor :
[K in keyof T]: T[K] extends Color ? string :
T[K] extends Vec2 ? [number, number] :
T[K] extends Vec3 ? [number, number, number] :
T[K] extends Vec4 ? [number, number, number, number] :
Expand Down
Loading