From 6a3984a45e5886c46041b71c000924a986aab6b6 Mon Sep 17 00:00:00 2001
From: Hubert Bieszczad <brentlokk@gmail.com>
Date: Tue, 23 Dec 2025 11:32:01 +0100
Subject: [PATCH] fix: useUniwind type with moduleSuffixes

---
 packages/uniwind/src/core/config/config.common.ts | 9 ++-------
 packages/uniwind/src/core/config/config.native.ts | 4 ++--
 packages/uniwind/src/core/config/config.ts        | 6 ++----
 packages/uniwind/src/core/native/store.ts         | 3 +--
 packages/uniwind/src/core/types.ts                | 2 +-
 packages/uniwind/src/hooks/useUniwind.ts          | 3 ++-
 6 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/packages/uniwind/src/core/config/config.common.ts b/packages/uniwind/src/core/config/config.common.ts
index 1d338697..7eb30d60 100644
--- a/packages/uniwind/src/core/config/config.common.ts
+++ b/packages/uniwind/src/core/config/config.common.ts
@@ -1,12 +1,7 @@
 import { Appearance, Insets, Platform } from 'react-native'
-import { ColorScheme, StyleDependency, UniwindConfig } from '../../types'
+import { ColorScheme, StyleDependency } from '../../types'
 import { UniwindListener } from '../listener'
-import { CSSVariables, GenerateStyleSheetsCallback } from '../types'
-
-type UserThemes = UniwindConfig extends { themes: infer T extends ReadonlyArray<string> } ? T
-    : ReadonlyArray<string>
-
-export type ThemeName = UserThemes[number]
+import { CSSVariables, GenerateStyleSheetsCallback, ThemeName } from '../types'
 
 const SYSTEM_THEME = 'system' as const
 
diff --git a/packages/uniwind/src/core/config/config.native.ts b/packages/uniwind/src/core/config/config.native.ts
index ddacdd5f..15aa39ac 100644
--- a/packages/uniwind/src/core/config/config.native.ts
+++ b/packages/uniwind/src/core/config/config.native.ts
@@ -4,8 +4,8 @@ import { StyleDependency } from '../../types'
 import { UniwindListener } from '../listener'
 import { Logger } from '../logger'
 import { UniwindStore } from '../native'
-import { CSSVariables, GenerateStyleSheetsCallback } from '../types'
-import { ThemeName, UniwindConfigBuilder as UniwindConfigBuilderBase } from './config.common'
+import { CSSVariables, GenerateStyleSheetsCallback, ThemeName } from '../types'
+import { UniwindConfigBuilder as UniwindConfigBuilderBase } from './config.common'
 
 class UniwindConfigBuilder extends UniwindConfigBuilderBase {
     constructor() {
diff --git a/packages/uniwind/src/core/config/config.ts b/packages/uniwind/src/core/config/config.ts
index 7b21bccc..a09d162a 100644
--- a/packages/uniwind/src/core/config/config.ts
+++ b/packages/uniwind/src/core/config/config.ts
@@ -1,10 +1,8 @@
 import { StyleDependency } from '../../types'
 import { UniwindListener } from '../listener'
 import { Logger } from '../logger'
-import { CSSVariables } from '../types'
-import { ThemeName, UniwindConfigBuilder as UniwindConfigBuilderBase } from './config.common'
-
-export { type ThemeName } from './config.common'
+import { CSSVariables, ThemeName } from '../types'
+import { UniwindConfigBuilder as UniwindConfigBuilderBase } from './config.common'
 
 class UniwindConfigBuilder extends UniwindConfigBuilderBase {
     private runtimeCSSVariables = new Map<ThemeName, CSSVariables>()
diff --git a/packages/uniwind/src/core/native/store.ts b/packages/uniwind/src/core/native/store.ts
index 5558a41a..a6d72887 100644
--- a/packages/uniwind/src/core/native/store.ts
+++ b/packages/uniwind/src/core/native/store.ts
@@ -1,9 +1,8 @@
 /* eslint-disable max-depth */
 import { Dimensions, Platform } from 'react-native'
 import { Orientation, StyleDependency } from '../../types'
-import type { ThemeName } from '../config'
 import { UniwindListener } from '../listener'
-import { ComponentState, CSSVariables, GenerateStyleSheetsCallback, RNStyle, Style, StyleSheets } from '../types'
+import { ComponentState, CSSVariables, GenerateStyleSheetsCallback, RNStyle, Style, StyleSheets, ThemeName } from '../types'
 import { cloneWithAccessors } from './native-utils'
 import { parseBoxShadow, parseFontVariant, parseTextShadowMutation, parseTransformsMutation, resolveGradient } from './parsers'
 import { UniwindRuntime } from './runtime'
diff --git a/packages/uniwind/src/core/types.ts b/packages/uniwind/src/core/types.ts
index 4420200d..e243d7a2 100644
--- a/packages/uniwind/src/core/types.ts
+++ b/packages/uniwind/src/core/types.ts
@@ -30,7 +30,7 @@ export type GenerateStyleSheetsCallback = (rt: UniwindRuntime) => {
 type UserThemes = UniwindConfig extends { themes: infer T extends readonly string[] } ? T
     : readonly string[]
 
-type ThemeName = UserThemes[number]
+export type ThemeName = UserThemes[number]
 
 export type UniwindRuntime = {
     screen: {
diff --git a/packages/uniwind/src/hooks/useUniwind.ts b/packages/uniwind/src/hooks/useUniwind.ts
index 4233bb5a..0e426f5d 100644
--- a/packages/uniwind/src/hooks/useUniwind.ts
+++ b/packages/uniwind/src/hooks/useUniwind.ts
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react'
-import { ThemeName, Uniwind } from '../core'
+import { Uniwind } from '../core'
 import { UniwindListener } from '../core/listener'
+import { ThemeName } from '../core/types'
 import { StyleDependency } from '../types'
 
 export const useUniwind = () => {