@chipmobilesdk/rn-theme 1.1.0 → 1.3.0

package/src/theme/validateThemeConfig.ts

@@ -36,6 +36,32 @@ function assertPositiveNumber(value: unknown, path: string): void {
 	}
 }
 
+/** The tones this package builds, which an app's own tone may not take over. */
+const STANDARD_TONE_NAMES: ReadonlySet<string> = new Set([
+	'neutral',
+	'primary',
+	'info',
+	'success',
+	'warning',
+	'error',
+]);
+
+function validateCustomTones(value: unknown, path: string): void {
+	if (value == null) {
+		return;
+	}
+	assertObject(value, path);
+	for (const name of Object.keys(value)) {
+		if (STANDARD_TONE_NAMES.has(name)) {
+			throw new ThemeConfigError(
+				`${path}.${name}`,
+				'is a standard tone; customise it through `overrides.<theme>.tone` instead.',
+			);
+		}
+	}
+	validateColorRecord(value, path);
+}
+
 function validateColorRecord(value: unknown, path: string, keys?: readonly string[]): void {
 	if (value == null) {
 		return;
@@ -134,7 +160,7 @@ function validateNamedThemes(value: unknown): void {
 		}
 
 		validateColorRecord(theme.seeds, `${path}.seeds`, SEED_KEYS);
-		validateColorRecord(theme.tones, `${path}.tones`);
+		validateCustomTones(theme.tones, `${path}.tones`);
 	}
 }
 
@@ -157,7 +183,7 @@ export function validateThemeConfig(config: unknown): void {
 	assertObject(config, 'config');
 	validateBrandColors(config.brandColors, 'brandColors');
 	validateColorRecord(config.seeds, 'seeds', SEED_KEYS);
-	validateColorRecord(config.tones, 'tones');
+	validateCustomTones(config.tones, 'tones');
 	validateTypography(config.typography);
 	validateNamedThemes(config.themes);
 

package/src/tokens/defaults.ts

@@ -43,15 +43,21 @@ export function buildSize(): SizeTokens {
 	return { touchTarget: 44, icon: { sm: 16, md: 20, lg: 24 } };
 }
 
+/**
+ * The opacity scale, as one definition. `color.disabled` is derived from
+ * `disabledContent` rather than from a second copy of 0.38 (THM-07).
+ */
+export const DEFAULT_OPACITY: OpacityTokens = {
+	hover: 0.08,
+	focus: 0.1,
+	pressed: 0.1,
+	dragged: 0.16,
+	disabledContent: 0.38,
+	disabledContainer: 0.12,
+};
+
 export function buildOpacity(): OpacityTokens {
-	return {
-		hover: 0.08,
-		focus: 0.1,
-		pressed: 0.1,
-		dragged: 0.16,
-		disabledContent: 0.38,
-		disabledContainer: 0.12,
-	};
+	return { ...DEFAULT_OPACITY };
 }
 
 export function buildMotion(): MotionTokens {

package/src/unistyles/createUnistylesConfig.ts

@@ -1,7 +1,7 @@
 import { buildThemes, type BuildThemesOptions } from '../theme/buildThemes';
 import { ThemeConfigError } from '../theme/errors';
 import { isPlainObject } from '../theme/overrides';
-import { themeNamesOf } from '../theme/validateThemeConfig';
+import { themeNamesOf, validateThemeConfig } from '../theme/validateThemeConfig';
 import { DEFAULT_BREAKPOINTS } from '../tokens/defaults';
 import type { EmptyExtension, ThemeConfig, ThemeName, Themes } from '../types/theme';
 
@@ -159,6 +159,9 @@ export function createUnistylesConfig<
 	config: ThemeConfig<TExt, TTone, TName>,
 	options?: UnistylesConfigOptions<NoInfer<TName>, TBreakpoints>,
 ): UnistylesConfig<TExt, TTone, TName, TBreakpoints> {
+	// The config first: reading `config.themes` for the theme names threw a
+	// TypeError with no path when the config itself was not an object (THM-10).
+	validateThemeConfig(config);
 	validateOptions(options, themeNamesOf(config));
 
 	return {

package/src/vendor/mcu/index.ts

@@ -2,4 +2,4 @@
 // imports from here only, so the vendored surface stays explicit.
 export { Hct } from './hct/hct';
 export { TonalPalette } from './palettes/tonal_palette';
-export { argbFromRgb, lstarFromArgb } from './utils/color_utils';
+export { argbFromRgb } from './utils/color_utils';