Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 2 additions & 7 deletions packages/uniwind/src/core/config/config.common.ts
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions packages/uniwind/src/core/config/config.native.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 2 additions & 4 deletions packages/uniwind/src/core/config/config.ts
Original file line number Diff line number Diff line change
@@ -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>()
Expand Down
3 changes: 1 addition & 2 deletions packages/uniwind/src/core/native/store.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/uniwind/src/core/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
3 changes: 2 additions & 1 deletion packages/uniwind/src/hooks/useUniwind.ts
Original file line number Diff line number Diff line change
@@ -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 = () => {
Expand Down