From c4a2f6f6387e4aed26c1b8848ac14e5f868fdb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Sun, 9 Mar 2025 08:46:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0CSS=E8=87=AA=E5=8A=A8Scheme?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=86=85=E5=AE=B9=E7=9A=84=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=92=8C=E5=B1=95=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/material-2-scheme.ts | 1 + src/material-3-scheme.ts | 1 + src/page-components/scheme/Export.tsx | 3 +++ src/page-components/scheme/m2-scheme/Builder.tsx | 5 +++-- src/page-components/scheme/m3-dynamic-scheme/Builder.tsx | 5 +++-- src/page-components/scheme/m3-scheme/Builder.tsx | 5 +++-- src/page-components/scheme/q-scheme/Builder.tsx | 5 +++-- src/page-components/scheme/swatch-scheme/Builder.tsx | 5 +++-- src/q-scheme.ts | 1 + src/swatch_scheme.ts | 1 + 10 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/material-2-scheme.ts b/src/material-2-scheme.ts index ea3f3ef..c4639e4 100644 --- a/src/material-2-scheme.ts +++ b/src/material-2-scheme.ts @@ -32,6 +32,7 @@ export type MaterialDesign2SchemeStorage = { source?: MaterialDesign2SchemeSource; scheme?: MaterialDesign2Scheme; cssVariables?: string; + cssAutoSchemeVariables?: string; scssVariables?: string; jsVariables?: string; }; diff --git a/src/material-3-scheme.ts b/src/material-3-scheme.ts index 301dc21..6a79e30 100644 --- a/src/material-3-scheme.ts +++ b/src/material-3-scheme.ts @@ -72,6 +72,7 @@ export type MaterialDesign3DynamicSchemeStorage = { source?: MaterialDesign3DynamicSchemeSource; scheme?: MaterialDesign3Scheme; cssVariables?: string; + cssAutoSchemeVariables?: string; scssVariables?: string; jsVariables?: string; }; diff --git a/src/page-components/scheme/Export.tsx b/src/page-components/scheme/Export.tsx index af7d452..7671581 100644 --- a/src/page-components/scheme/Export.tsx +++ b/src/page-components/scheme/Export.tsx @@ -8,6 +8,7 @@ import styles from './Export.module.css'; const exportOptions: Option[] = [ { label: 'CSS', value: 'css' }, + { label: 'CSS Auto Scheme', value: 'css-auto' }, { label: 'SCSS', value: 'scss' }, { label: 'Javascript Object', value: 'js_object' }, ]; @@ -22,6 +23,8 @@ export function SchemeExport({ scheme }: SchemeExportProps) { switch (activeExport) { case 'css': return scheme.schemeStorage.cssVariables; + case 'css-auto': + return scheme.schemeStorage.cssAutoSchemeVariables; case 'scss': return scheme.schemeStorage.scssVariables; case 'js_object': diff --git a/src/page-components/scheme/m2-scheme/Builder.tsx b/src/page-components/scheme/m2-scheme/Builder.tsx index 74dd0c3..38501d4 100644 --- a/src/page-components/scheme/m2-scheme/Builder.tsx +++ b/src/page-components/scheme/m2-scheme/Builder.tsx @@ -79,8 +79,9 @@ export function M2SchemeBuilder({ scheme, onBuildComplete }: M2SchemeBuilderProp dark: { custom_colors: mapToObject(generatedScheme[0].dark.custom_colors) }, }); prev.schemeStorage.cssVariables = generatedScheme[1]; - prev.schemeStorage.scssVariables = generatedScheme[2]; - prev.schemeStorage.jsVariables = generatedScheme[3]; + prev.schemeStorage.cssAutoSchemeVariables = generatedScheme[2]; + prev.schemeStorage.scssVariables = generatedScheme[3]; + prev.schemeStorage.jsVariables = generatedScheme[4]; return prev; }); diff --git a/src/page-components/scheme/m3-dynamic-scheme/Builder.tsx b/src/page-components/scheme/m3-dynamic-scheme/Builder.tsx index f539fc4..6776b77 100644 --- a/src/page-components/scheme/m3-dynamic-scheme/Builder.tsx +++ b/src/page-components/scheme/m3-dynamic-scheme/Builder.tsx @@ -103,8 +103,9 @@ export function M3DynamicSchemeBuilder({ scheme, onBuildCompleted }: M3DynamicSc }, }; prev.schemeStorage.cssVariables = generate_scheme[1]; - prev.schemeStorage.scssVariables = generate_scheme[2]; - prev.schemeStorage.jsVariables = generate_scheme[3]; + prev.schemeStorage.cssAutoSchemeVariables = generate_scheme[2]; + prev.schemeStorage.scssVariables = generate_scheme[3]; + prev.schemeStorage.jsVariables = generate_scheme[4]; return prev; }); diff --git a/src/page-components/scheme/m3-scheme/Builder.tsx b/src/page-components/scheme/m3-scheme/Builder.tsx index f260b47..723290f 100644 --- a/src/page-components/scheme/m3-scheme/Builder.tsx +++ b/src/page-components/scheme/m3-scheme/Builder.tsx @@ -83,8 +83,9 @@ export function M3SchemeBuilder({ scheme, onBuildCompleted }: M3SchemeBuilderPro }, } as MaterialDesign3Scheme; prev.schemeStorage.cssVariables = generatedScheme[1]; - prev.schemeStorage.scssVariables = generatedScheme[2]; - prev.schemeStorage.jsVariables = generatedScheme[3]; + prev.schemeStorage.cssAutoSchemeVariables = generatedScheme[2]; + prev.schemeStorage.scssVariables = generatedScheme[3]; + prev.schemeStorage.jsVariables = generatedScheme[4]; return prev; }); diff --git a/src/page-components/scheme/q-scheme/Builder.tsx b/src/page-components/scheme/q-scheme/Builder.tsx index 0983147..157b367 100644 --- a/src/page-components/scheme/q-scheme/Builder.tsx +++ b/src/page-components/scheme/q-scheme/Builder.tsx @@ -163,8 +163,9 @@ export function QSchemeBuilder({ scheme, onBuildCompleted }: QSchemeBuilderProps prev.schemeStorage.source = source; prev.schemeStorage.scheme = generatedScheme[0]; prev.schemeStorage.cssVariables = generatedScheme[1]; - prev.schemeStorage.scssVariables = generatedScheme[2]; - prev.schemeStorage.jsVariables = generatedScheme[3]; + prev.schemeStorage.cssAutoSchemeVariables = generatedScheme[2]; + prev.schemeStorage.scssVariables = generatedScheme[3]; + prev.schemeStorage.jsVariables = generatedScheme[4]; return prev; }); onBuildCompleted?.(); diff --git a/src/page-components/scheme/swatch-scheme/Builder.tsx b/src/page-components/scheme/swatch-scheme/Builder.tsx index 6978065..2b61bbb 100644 --- a/src/page-components/scheme/swatch-scheme/Builder.tsx +++ b/src/page-components/scheme/swatch-scheme/Builder.tsx @@ -123,8 +123,9 @@ export function SwatchSchemeBuilder({ scheme, onBuildCompleted }: SwatchSchemeBu }; prev.schemeStorage.scheme = mapToObject(generatedScheme[0]) as SwatchScheme; prev.schemeStorage.cssVariables = generatedScheme[1]; - prev.schemeStorage.scssVariables = generatedScheme[2]; - prev.schemeStorage.jsVariables = generatedScheme[3]; + prev.schemeStorage.cssAutoSchemeVariables = generatedScheme[2]; + prev.schemeStorage.scssVariables = generatedScheme[3]; + prev.schemeStorage.jsVariables = generatedScheme[4]; return prev; }); diff --git a/src/q-scheme.ts b/src/q-scheme.ts index c11f013..e522afb 100644 --- a/src/q-scheme.ts +++ b/src/q-scheme.ts @@ -55,6 +55,7 @@ export type QSchemeStorage = { source?: QSchemeSource; scheme?: QScheme; cssVariables?: string; + cssAutoSchemeVariables?: string; scssVariables?: string; jsVariables?: string; }; diff --git a/src/swatch_scheme.ts b/src/swatch_scheme.ts index 3850ab6..c365dd4 100644 --- a/src/swatch_scheme.ts +++ b/src/swatch_scheme.ts @@ -21,6 +21,7 @@ export type SwatchSchemeStorage = { source?: SwatchSchemeSource; scheme?: SwatchScheme; cssVariables?: string; + cssAutoSchemeVariables?: string; scssVariables?: string; jsVariables?: string; };