@tooee/themes 0.15.0 → 0.16.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -0
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +18 -17
- package/dist/context.js.map +1 -1
- package/dist/loader.d.ts +0 -2
- package/dist/loader.d.ts.map +1 -1
- package/dist/loader.js +3 -4
- package/dist/loader.js.map +1 -1
- package/dist/syntax-rules.d.ts +6 -1
- package/dist/syntax-rules.d.ts.map +1 -1
- package/dist/syntax-rules.js +6 -2
- package/dist/syntax-rules.js.map +1 -1
- package/package.json +6 -6
- package/src/context.tsx +41 -19
- package/src/loader.ts +3 -6
- package/src/syntax-rules.ts +10 -2
package/README.md
CHANGED
|
@@ -3,3 +3,7 @@
|
|
|
3
3
|
Theme management with 34 bundled themes for Tooee.
|
|
4
4
|
|
|
5
5
|
Part of the [Tooee](https://github.com/gingerhendrix/tooee) monorepo. See the main repo for documentation.
|
|
6
|
+
|
|
7
|
+
## OpenTUI 0.6 migration
|
|
8
|
+
|
|
9
|
+
`Theme` (from `buildTheme()` or `defaultTheme`) contains `name`, `mode` and `colors`; it no longer contains `syntax`. A `SyntaxStyle` belongs to one renderer's native context. Components should read `useTheme().syntax` under `ThemeProvider` or `ThemeSwitcherProvider`. For imperative use, call `buildSyntaxStyle(theme.colors, renderer.nativeScene)`. Do not share that style between renderers; the native context releases it when the renderer closes.
|
package/dist/context.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AASvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAMhD,UAAU,iBAAiB;IACzB,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,WAAW,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;CACjB;AAyBD,MAAM,WAAW,kBAAkB;IACjC,8DAA8D;IAC9D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iBAAiB;IACjB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,0DAA0D;IAC1D,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,eAAO,MAAM,aAAa,gDAKvB,kBAAkB,KAAG,SAcvB,CAAC;AAEF,eAAO,MAAM,QAAQ,QAAwB,iBAQ5C,CAAC;AAMF,UAAU,yBAA0B,SAAQ,iBAAiB;IAC3D,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IAC/D,uEAAuE;IACvE,OAAO,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,IAAI,CAAC;IACjE,SAAS,EAAE,MAAM,EAAE,CAAC;CACrB;AAID,MAAM,WAAW,0BAA0B;IACzC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,QAAQ,EAAE,SAAS,CAAC;CACrB;AAED,eAAO,MAAM,qBAAqB,6CAI/B,0BAA0B,KAAG,SAqE/B,CAAC;AAEF,eAAO,MAAM,gBAAgB,QAAgC,yBAQ5D,CAAC"}
|
package/dist/context.js
CHANGED
|
@@ -1,30 +1,30 @@
|
|
|
1
1
|
import { jsx as _jsx } from "@opentui/react/jsx-runtime";
|
|
2
|
+
import { useRenderer } from "@opentui/react";
|
|
2
3
|
import { writeGlobalConfig } from "@tooee/config";
|
|
3
4
|
import { createContext, useContext, useState, useCallback, useMemo } from "react";
|
|
4
5
|
import { buildTheme, getThemeNames, defaultTheme, DEFAULT_THEME_NAME, DEFAULT_MODE, } from "./loader.js";
|
|
6
|
+
import { buildSyntaxStyle } from "./syntax-rules.js";
|
|
5
7
|
const ThemeContext = createContext({
|
|
6
8
|
mode: defaultTheme.mode,
|
|
7
9
|
name: defaultTheme.name,
|
|
8
|
-
syntax:
|
|
10
|
+
syntax: null,
|
|
9
11
|
theme: defaultTheme.colors,
|
|
10
12
|
});
|
|
13
|
+
/** Builds the theme's SyntaxStyle in the current renderer's native context. */
|
|
14
|
+
const useSyntaxStyle = function useSyntaxStyle(colors) {
|
|
15
|
+
const renderer = useRenderer();
|
|
16
|
+
return useMemo(() => buildSyntaxStyle(colors, renderer.nativeScene), [colors, renderer]);
|
|
17
|
+
};
|
|
11
18
|
export const ThemeProvider = function ThemeProvider({ name, mode, theme: themeProp, children, }) {
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
mode: themeProp.mode,
|
|
16
|
-
name: themeProp.name,
|
|
17
|
-
syntax: themeProp.syntax,
|
|
18
|
-
theme: themeProp.colors,
|
|
19
|
-
};
|
|
20
|
-
}
|
|
21
|
-
const t = buildTheme(name ?? DEFAULT_THEME_NAME, mode ?? DEFAULT_MODE);
|
|
22
|
-
return { mode: t.mode, name: t.name, syntax: t.syntax, theme: t.colors };
|
|
23
|
-
}, [themeProp, name, mode]);
|
|
19
|
+
const base = useMemo(() => themeProp ?? buildTheme(name ?? DEFAULT_THEME_NAME, mode ?? DEFAULT_MODE), [themeProp, name, mode]);
|
|
20
|
+
const syntax = useSyntaxStyle(base.colors);
|
|
21
|
+
const resolved = useMemo(() => ({ mode: base.mode, name: base.name, syntax, theme: base.colors }), [base, syntax]);
|
|
24
22
|
return _jsx(ThemeContext.Provider, { value: resolved, children: children });
|
|
25
23
|
};
|
|
26
24
|
export const useTheme = function useTheme() {
|
|
27
|
-
|
|
25
|
+
const ctx = useContext(ThemeContext);
|
|
26
|
+
const renderer = useRenderer();
|
|
27
|
+
return useMemo(() => ({ ...ctx, syntax: ctx.syntax ?? buildSyntaxStyle(ctx.theme, renderer.nativeScene) }), [ctx, renderer]);
|
|
28
28
|
};
|
|
29
29
|
const ThemeSwitcherContext = createContext(null);
|
|
30
30
|
export const ThemeSwitcherProvider = function ThemeSwitcherProvider({ initialTheme, initialMode, children, }) {
|
|
@@ -32,6 +32,7 @@ export const ThemeSwitcherProvider = function ThemeSwitcherProvider({ initialThe
|
|
|
32
32
|
const [themeName, setThemeName] = useState(initialTheme ?? DEFAULT_THEME_NAME);
|
|
33
33
|
const [mode, setMode] = useState(initialMode ?? DEFAULT_MODE);
|
|
34
34
|
const theme = useMemo(() => buildTheme(themeName, mode), [themeName, mode]);
|
|
35
|
+
const syntax = useSyntaxStyle(theme.colors);
|
|
35
36
|
const nextTheme = useCallback(() => {
|
|
36
37
|
const idx = allThemes.indexOf(themeName);
|
|
37
38
|
const next = allThemes[(idx + 1) % allThemes.length];
|
|
@@ -64,10 +65,10 @@ export const ThemeSwitcherProvider = function ThemeSwitcherProvider({ initialThe
|
|
|
64
65
|
prevTheme,
|
|
65
66
|
setMode: setModeByName,
|
|
66
67
|
setTheme: setThemeByName,
|
|
67
|
-
syntax
|
|
68
|
+
syntax,
|
|
68
69
|
theme: theme.colors,
|
|
69
|
-
}), [theme, mode, nextTheme, prevTheme, setModeByName, setThemeByName, allThemes]);
|
|
70
|
-
const themeValue = useMemo(() => ({ mode, name: theme.name, syntax
|
|
70
|
+
}), [theme, syntax, mode, nextTheme, prevTheme, setModeByName, setThemeByName, allThemes]);
|
|
71
|
+
const themeValue = useMemo(() => ({ mode, name: theme.name, syntax, theme: theme.colors }), [theme, syntax, mode]);
|
|
71
72
|
return (_jsx(ThemeSwitcherContext.Provider, { value: value, children: _jsx(ThemeContext.Provider, { value: themeValue, children: children }) }));
|
|
72
73
|
};
|
|
73
74
|
export const useThemeSwitcher = function useThemeSwitcher() {
|
package/dist/context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGlF,OAAO,EACL,UAAU,EACV,aAAa,EACb,YAAY,EACZ,kBAAkB,EAClB,YAAY,GACb,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.tsx"],"names":[],"mappings":"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"}
|
package/dist/loader.d.ts
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import type { SyntaxStyle } from "@opentui/core";
|
|
2
1
|
import type { ColorMode } from "@tooee/config";
|
|
3
2
|
import type { ThemeJSON, ResolvedTheme } from "./types.js";
|
|
4
3
|
export interface Theme {
|
|
5
4
|
name: string;
|
|
6
5
|
mode: ColorMode;
|
|
7
6
|
colors: ResolvedTheme;
|
|
8
|
-
syntax: SyntaxStyle;
|
|
9
7
|
}
|
|
10
8
|
/**
|
|
11
9
|
* The project `.tooee/themes` folders for `cwd`, in load order: the
|
package/dist/loader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG/C,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAM3D,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,aAAa,CAAC;CACvB;AAwCD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAAkC,MAAM,KAAG,MAAM,EAkB7E,CAAC;AAwBF,eAAO,MAAM,UAAU,QAA0B,GAAG,CAAC,MAAM,EAAE,SAAS,CAErE,CAAC;AAEF,eAAO,MAAM,aAAa,QAA6B,MAAM,EAE5D,CAAC;AAMF,eAAO,MAAM,kBAAkB,eAAe,CAAC;AAE/C,eAAO,MAAM,YAAY,EAAE,SAAkB,CAAC;AAkB9C,eAAO,MAAM,YAAY,EAAE,KAA8C,CAAC;AAE1E,eAAO,MAAM,UAAU,SAA6B,MAAM,QAAQ,SAAS,KAAG,KAwB7E,CAAC"}
|
package/dist/loader.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { readFileSync, readdirSync, existsSync } from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import { buildSyntaxStyle } from "./syntax-rules.js";
|
|
4
3
|
import { resolveTheme } from "./types.js";
|
|
5
4
|
/** Cache of loaded theme JSONs by name */
|
|
6
5
|
const themeJsonCache = new Map();
|
|
@@ -89,7 +88,7 @@ const bundledDefaultThemeText = readFileSync(new URL("../themes/tokyonight.json"
|
|
|
89
88
|
const bundledDefaultThemeJson = JSON.parse(bundledDefaultThemeText);
|
|
90
89
|
const buildBundledDefaultTheme = function buildBundledDefaultTheme(mode) {
|
|
91
90
|
const colors = resolveTheme(bundledDefaultThemeJson, mode);
|
|
92
|
-
return { colors, mode, name: DEFAULT_THEME_NAME
|
|
91
|
+
return { colors, mode, name: DEFAULT_THEME_NAME };
|
|
93
92
|
};
|
|
94
93
|
export const defaultTheme = buildBundledDefaultTheme(DEFAULT_MODE);
|
|
95
94
|
export const buildTheme = function buildTheme(name, mode) {
|
|
@@ -100,13 +99,13 @@ export const buildTheme = function buildTheme(name, mode) {
|
|
|
100
99
|
const fallbackJson = themes.get(DEFAULT_THEME_NAME) ?? themes.values().next().value;
|
|
101
100
|
if (fallbackJson) {
|
|
102
101
|
const resolved = resolveTheme(fallbackJson, mode);
|
|
103
|
-
return { colors: resolved, mode, name
|
|
102
|
+
return { colors: resolved, mode, name };
|
|
104
103
|
}
|
|
105
104
|
return buildBundledDefaultTheme(mode);
|
|
106
105
|
}
|
|
107
106
|
try {
|
|
108
107
|
const resolved = resolveTheme(json, mode);
|
|
109
|
-
return { colors: resolved, mode, name
|
|
108
|
+
return { colors: resolved, mode, name };
|
|
110
109
|
}
|
|
111
110
|
catch {
|
|
112
111
|
return buildBundledDefaultTheme(mode);
|
package/dist/loader.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAChE,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAa1C,0CAA0C;AAC1C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAqB,CAAC;AAEpD,MAAM,qBAAqB,GAAG,SAAS,qBAAqB,CAC1D,GAAW,EACX,MAA8B;IAE9B,IAAI,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC5B,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE1C,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;gBAC5D,0EAA0E;gBAC1E,oEAAoE;gBACpE,uEAAuE;gBACvE,0EAA0E;gBAC1E,yEAAyE;gBACzE,gEAAgE;gBAChE,kHAAkH;gBAClH,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAc,CAAC,CAAC;YACrD,CAAC;YAAC,MAAM,CAAC;gBACP,qBAAqB;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,mBAAmB;IACrB,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,SAAS,gBAAgB,CAAC,GAAW;IACnE,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,GAAG,GAAG,GAAG,CAAC;IACd,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEjC,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YACnB,MAAM;QACR,CAAC;QAED,GAAG,GAAG,MAAM,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,2DAA2D;AAC3D,MAAM,iBAAiB,GAAG,SAAS,iBAAiB;IAClD,IAAI,cAAc,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC5B,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,iBAAiB;IACjB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9F,qBAAqB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IAElD,sCAAsC;IACtC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;IAC9F,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,cAAc,CAAC,CAAC;IAE/E,2EAA2E;IAC3E,KAAK,MAAM,SAAS,IAAI,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;QACxD,qBAAqB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,UAAU;IAC3C,OAAO,iBAAiB,EAAE,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,aAAa;IACjD,OAAO,CAAC,GAAG,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC7C,CAAC,CAAC;AAEF,8EAA8E;AAC9E,gBAAgB;AAChB,8EAA8E;AAE9E,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAE/C,MAAM,CAAC,MAAM,YAAY,GAAc,MAAM,CAAC;AAE9C,MAAM,uBAAuB,GAAG,YAAY,CAC1C,IAAI,GAAG,CAAC,2BAA2B,EAAE,OAAO,IAAI,CAAC,GAAG,CAAC,EACrD,OAAO,CACR,CAAC;AAEF,+EAA+E;AAC/E,mEAAmE;AACnE,sGAAsG;AACtG,MAAM,uBAAuB,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAc,CAAC;AAEjF,MAAM,wBAAwB,GAAG,SAAS,wBAAwB,CAAC,IAAe;IAChF,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;IAE3D,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAU,wBAAwB,CAAC,YAAY,CAAC,CAAC;AAE1E,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,UAAU,CAAC,IAAY,EAAE,IAAe;IACzE,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAE9B,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,2EAA2E;QAC3E,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;QAEpF,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;YAElD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAC1C,CAAC;QAED,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE1C,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC1C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;AACH,CAAC,CAAC"}
|
package/dist/syntax-rules.d.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { SyntaxStyle } from "@opentui/core";
|
|
2
|
+
import type { NativeResourceOwner } from "@opentui/core";
|
|
2
3
|
import type { ResolvedTheme } from "./types.js";
|
|
3
|
-
|
|
4
|
+
/**
|
|
5
|
+
* OpenTUI 0.6 binds a SyntaxStyle to one native resource context. Pass the
|
|
6
|
+
* context of the scene that draws it, usually `renderer.nativeScene`.
|
|
7
|
+
*/
|
|
8
|
+
export declare const buildSyntaxStyle: (resolved: ResolvedTheme, owner: NativeResourceOwner) => SyntaxStyle;
|
|
4
9
|
//# sourceMappingURL=syntax-rules.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syntax-rules.d.ts","sourceRoot":"","sources":["../src/syntax-rules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"syntax-rules.d.ts","sourceRoot":"","sources":["../src/syntax-rules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,WAAW,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AA8MhD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,aACjB,aAAa,SAChB,mBAAmB,KACzB,WAEF,CAAC"}
|
package/dist/syntax-rules.js
CHANGED
|
@@ -201,7 +201,11 @@ const getSyntaxRules = function getSyntaxRules(resolved) {
|
|
|
201
201
|
{ scope: ["debug"], style: { foreground: RGBA.fromHex(resolved.textMuted) } },
|
|
202
202
|
];
|
|
203
203
|
};
|
|
204
|
-
|
|
205
|
-
|
|
204
|
+
/**
|
|
205
|
+
* OpenTUI 0.6 binds a SyntaxStyle to one native resource context. Pass the
|
|
206
|
+
* context of the scene that draws it, usually `renderer.nativeScene`.
|
|
207
|
+
*/
|
|
208
|
+
export const buildSyntaxStyle = function buildSyntaxStyle(resolved, owner) {
|
|
209
|
+
return SyntaxStyle.fromTheme(getSyntaxRules(resolved), owner);
|
|
206
210
|
};
|
|
207
211
|
//# sourceMappingURL=syntax-rules.js.map
|
package/dist/syntax-rules.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syntax-rules.js","sourceRoot":"","sources":["../src/syntax-rules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"syntax-rules.js","sourceRoot":"","sources":["../src/syntax-rules.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tooee/themes",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.16.1",
|
|
4
4
|
"description": "Theme management with 34 bundled themes for Tooee",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cli",
|
|
@@ -40,18 +40,18 @@
|
|
|
40
40
|
"typecheck": "tsc --noEmit"
|
|
41
41
|
},
|
|
42
42
|
"dependencies": {
|
|
43
|
-
"@tooee/config": "0.
|
|
43
|
+
"@tooee/config": "0.16.1"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@opentui/core": "^0.
|
|
47
|
-
"@opentui/react": "^0.
|
|
46
|
+
"@opentui/core": "^0.6.6",
|
|
47
|
+
"@opentui/react": "^0.6.6",
|
|
48
48
|
"@types/bun": "^1.4.2",
|
|
49
49
|
"@types/react": "^19.3.0",
|
|
50
50
|
"typescript": "^7.0.2"
|
|
51
51
|
},
|
|
52
52
|
"peerDependencies": {
|
|
53
|
-
"@opentui/core": "^0.
|
|
54
|
-
"@opentui/react": "^0.
|
|
53
|
+
"@opentui/core": "^0.6.6",
|
|
54
|
+
"@opentui/react": "^0.6.6",
|
|
55
55
|
"react": "^18.0.0 || ^19.0.0"
|
|
56
56
|
}
|
|
57
57
|
}
|
package/src/context.tsx
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { SyntaxStyle } from "@opentui/core";
|
|
2
|
+
import { useRenderer } from "@opentui/react";
|
|
2
3
|
import { writeGlobalConfig } from "@tooee/config";
|
|
3
4
|
import type { ColorMode } from "@tooee/config";
|
|
4
5
|
import { createContext, useContext, useState, useCallback, useMemo } from "react";
|
|
@@ -12,6 +13,7 @@ import {
|
|
|
12
13
|
DEFAULT_MODE,
|
|
13
14
|
} from "./loader.js";
|
|
14
15
|
import type { Theme } from "./loader.js";
|
|
16
|
+
import { buildSyntaxStyle } from "./syntax-rules.js";
|
|
15
17
|
import type { ResolvedTheme } from "./types.js";
|
|
16
18
|
|
|
17
19
|
// ---------------------------------------------------------------------------
|
|
@@ -25,13 +27,29 @@ interface ThemeContextValue {
|
|
|
25
27
|
mode: ColorMode;
|
|
26
28
|
}
|
|
27
29
|
|
|
28
|
-
|
|
30
|
+
/**
|
|
31
|
+
* The provider value. `syntax` is null only in the default value: a
|
|
32
|
+
* SyntaxStyle needs the renderer's native context, which does not exist at
|
|
33
|
+
* module load in OpenTUI 0.6.
|
|
34
|
+
*/
|
|
35
|
+
interface ThemeContextState extends Omit<ThemeContextValue, "syntax"> {
|
|
36
|
+
syntax: SyntaxStyle | null;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
const ThemeContext = createContext<ThemeContextState>({
|
|
29
40
|
mode: defaultTheme.mode,
|
|
30
41
|
name: defaultTheme.name,
|
|
31
|
-
syntax:
|
|
42
|
+
syntax: null,
|
|
32
43
|
theme: defaultTheme.colors,
|
|
33
44
|
});
|
|
34
45
|
|
|
46
|
+
/** Builds the theme's SyntaxStyle in the current renderer's native context. */
|
|
47
|
+
const useSyntaxStyle = function useSyntaxStyle(colors: ResolvedTheme): SyntaxStyle {
|
|
48
|
+
const renderer = useRenderer();
|
|
49
|
+
|
|
50
|
+
return useMemo(() => buildSyntaxStyle(colors, renderer.nativeScene), [colors, renderer]);
|
|
51
|
+
};
|
|
52
|
+
|
|
35
53
|
export interface ThemeProviderProps {
|
|
36
54
|
/** Theme name (e.g. "tokyonight", "catppuccin", "dracula") */
|
|
37
55
|
name?: string;
|
|
@@ -48,26 +66,29 @@ export const ThemeProvider = function ThemeProvider({
|
|
|
48
66
|
theme: themeProp,
|
|
49
67
|
children,
|
|
50
68
|
}: ThemeProviderProps): ReactNode {
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
name: themeProp.name,
|
|
56
|
-
syntax: themeProp.syntax,
|
|
57
|
-
theme: themeProp.colors,
|
|
58
|
-
};
|
|
59
|
-
}
|
|
69
|
+
const base = useMemo<Theme>(
|
|
70
|
+
() => themeProp ?? buildTheme(name ?? DEFAULT_THEME_NAME, mode ?? DEFAULT_MODE),
|
|
71
|
+
[themeProp, name, mode]
|
|
72
|
+
);
|
|
60
73
|
|
|
61
|
-
|
|
74
|
+
const syntax = useSyntaxStyle(base.colors);
|
|
62
75
|
|
|
63
|
-
|
|
64
|
-
|
|
76
|
+
const resolved = useMemo<ThemeContextValue>(
|
|
77
|
+
() => ({ mode: base.mode, name: base.name, syntax, theme: base.colors }),
|
|
78
|
+
[base, syntax]
|
|
79
|
+
);
|
|
65
80
|
|
|
66
81
|
return <ThemeContext.Provider value={resolved}>{children}</ThemeContext.Provider>;
|
|
67
82
|
};
|
|
68
83
|
|
|
69
84
|
export const useTheme = function useTheme(): ThemeContextValue {
|
|
70
|
-
|
|
85
|
+
const ctx = useContext(ThemeContext);
|
|
86
|
+
const renderer = useRenderer();
|
|
87
|
+
|
|
88
|
+
return useMemo(
|
|
89
|
+
() => ({ ...ctx, syntax: ctx.syntax ?? buildSyntaxStyle(ctx.theme, renderer.nativeScene) }),
|
|
90
|
+
[ctx, renderer]
|
|
91
|
+
);
|
|
71
92
|
};
|
|
72
93
|
|
|
73
94
|
// ---------------------------------------------------------------------------
|
|
@@ -101,6 +122,7 @@ export const ThemeSwitcherProvider = function ThemeSwitcherProvider({
|
|
|
101
122
|
const [mode, setMode] = useState<ColorMode>(initialMode ?? DEFAULT_MODE);
|
|
102
123
|
|
|
103
124
|
const theme = useMemo(() => buildTheme(themeName, mode), [themeName, mode]);
|
|
125
|
+
const syntax = useSyntaxStyle(theme.colors);
|
|
104
126
|
|
|
105
127
|
const nextTheme = useCallback(() => {
|
|
106
128
|
const idx = allThemes.indexOf(themeName);
|
|
@@ -147,15 +169,15 @@ export const ThemeSwitcherProvider = function ThemeSwitcherProvider({
|
|
|
147
169
|
prevTheme,
|
|
148
170
|
setMode: setModeByName,
|
|
149
171
|
setTheme: setThemeByName,
|
|
150
|
-
syntax
|
|
172
|
+
syntax,
|
|
151
173
|
theme: theme.colors,
|
|
152
174
|
}),
|
|
153
|
-
[theme, mode, nextTheme, prevTheme, setModeByName, setThemeByName, allThemes]
|
|
175
|
+
[theme, syntax, mode, nextTheme, prevTheme, setModeByName, setThemeByName, allThemes]
|
|
154
176
|
);
|
|
155
177
|
|
|
156
178
|
const themeValue = useMemo<ThemeContextValue>(
|
|
157
|
-
() => ({ mode, name: theme.name, syntax
|
|
158
|
-
[theme, mode]
|
|
179
|
+
() => ({ mode, name: theme.name, syntax, theme: theme.colors }),
|
|
180
|
+
[theme, syntax, mode]
|
|
159
181
|
);
|
|
160
182
|
|
|
161
183
|
return (
|
package/src/loader.ts
CHANGED
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { readFileSync, readdirSync, existsSync } from "node:fs";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
|
|
4
|
-
import type { SyntaxStyle } from "@opentui/core";
|
|
5
4
|
import type { ColorMode } from "@tooee/config";
|
|
6
5
|
|
|
7
|
-
import { buildSyntaxStyle } from "./syntax-rules.js";
|
|
8
6
|
import { resolveTheme } from "./types.js";
|
|
9
7
|
import type { ThemeJSON, ResolvedTheme } from "./types.js";
|
|
10
8
|
|
|
@@ -16,7 +14,6 @@ export interface Theme {
|
|
|
16
14
|
name: string;
|
|
17
15
|
mode: ColorMode;
|
|
18
16
|
colors: ResolvedTheme;
|
|
19
|
-
syntax: SyntaxStyle;
|
|
20
17
|
}
|
|
21
18
|
|
|
22
19
|
/** Cache of loaded theme JSONs by name */
|
|
@@ -133,7 +130,7 @@ const bundledDefaultThemeJson = JSON.parse(bundledDefaultThemeText) as ThemeJSON
|
|
|
133
130
|
const buildBundledDefaultTheme = function buildBundledDefaultTheme(mode: ColorMode): Theme {
|
|
134
131
|
const colors = resolveTheme(bundledDefaultThemeJson, mode);
|
|
135
132
|
|
|
136
|
-
return { colors, mode, name: DEFAULT_THEME_NAME
|
|
133
|
+
return { colors, mode, name: DEFAULT_THEME_NAME };
|
|
137
134
|
};
|
|
138
135
|
|
|
139
136
|
export const defaultTheme: Theme = buildBundledDefaultTheme(DEFAULT_MODE);
|
|
@@ -149,7 +146,7 @@ export const buildTheme = function buildTheme(name: string, mode: ColorMode): Th
|
|
|
149
146
|
if (fallbackJson) {
|
|
150
147
|
const resolved = resolveTheme(fallbackJson, mode);
|
|
151
148
|
|
|
152
|
-
return { colors: resolved, mode, name
|
|
149
|
+
return { colors: resolved, mode, name };
|
|
153
150
|
}
|
|
154
151
|
|
|
155
152
|
return buildBundledDefaultTheme(mode);
|
|
@@ -158,7 +155,7 @@ export const buildTheme = function buildTheme(name: string, mode: ColorMode): Th
|
|
|
158
155
|
try {
|
|
159
156
|
const resolved = resolveTheme(json, mode);
|
|
160
157
|
|
|
161
|
-
return { colors: resolved, mode, name
|
|
158
|
+
return { colors: resolved, mode, name };
|
|
162
159
|
} catch {
|
|
163
160
|
return buildBundledDefaultTheme(mode);
|
|
164
161
|
}
|
package/src/syntax-rules.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { RGBA, SyntaxStyle } from "@opentui/core";
|
|
2
|
+
import type { NativeResourceOwner } from "@opentui/core";
|
|
2
3
|
|
|
3
4
|
import type { ResolvedTheme } from "./types.js";
|
|
4
5
|
|
|
@@ -206,6 +207,13 @@ const getSyntaxRules = function getSyntaxRules(resolved: ResolvedTheme) {
|
|
|
206
207
|
];
|
|
207
208
|
};
|
|
208
209
|
|
|
209
|
-
|
|
210
|
-
|
|
210
|
+
/**
|
|
211
|
+
* OpenTUI 0.6 binds a SyntaxStyle to one native resource context. Pass the
|
|
212
|
+
* context of the scene that draws it, usually `renderer.nativeScene`.
|
|
213
|
+
*/
|
|
214
|
+
export const buildSyntaxStyle = function buildSyntaxStyle(
|
|
215
|
+
resolved: ResolvedTheme,
|
|
216
|
+
owner: NativeResourceOwner
|
|
217
|
+
): SyntaxStyle {
|
|
218
|
+
return SyntaxStyle.fromTheme(getSyntaxRules(resolved), owner);
|
|
211
219
|
};
|