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
2 changes: 1 addition & 1 deletion packages/uniwind/src/core/config/config.native.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class UniwindConfigBuilder extends UniwindConfigBuilderBase {
})

if (theme === this.currentTheme) {
UniwindListener.notify([StyleDependency.Theme])
UniwindListener.notify([StyleDependency.Variables])
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/uniwind/src/core/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class UniwindConfigBuilder extends UniwindConfigBuilderBase {
})

if (theme === this.currentTheme) {
UniwindListener.notify([StyleDependency.Theme])
UniwindListener.notify([StyleDependency.Variables])
}
}

Expand Down
1 change: 1 addition & 0 deletions packages/uniwind/src/core/listener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class UniwindListenerBuilder {
[StyleDependency.FontScale]: new Set<() => void>(),
[StyleDependency.Rtl]: new Set<() => void>(),
[StyleDependency.AdaptiveThemes]: new Set<() => void>(),
[StyleDependency.Variables]: new Set<() => void>(),
}

notify(dependencies: Array<StyleDependency>) {
Expand Down
8 changes: 5 additions & 3 deletions packages/uniwind/src/core/native/store.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class UniwindStoreBuilder {
private resolveStyles(classNames: string, state?: ComponentState) {
const result = {} as Record<string, any>
let vars = this.vars
const dependencies = [] as Array<StyleDependency>
const dependencies = new Set<StyleDependency>()
const bestBreakpoints = new Map<string, Style>()

for (const className of classNames.split(' ')) {
Expand All @@ -93,7 +93,9 @@ class UniwindStoreBuilder {
}

for (const style of this.stylesheet[className] as Array<Style>) {
dependencies.push(...style.dependencies)
if (style.dependencies) {
style.dependencies.forEach(dep => dependencies.add(dep))
}

if (
style.minWidth > this.runtime.screen.width
Expand Down Expand Up @@ -214,7 +216,7 @@ class UniwindStoreBuilder {

return {
styles: { ...result } as RNStyle,
dependencies: Array.from(new Set(dependencies)),
dependencies: Array.from(dependencies),
}
}
}
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 @@ -9,7 +9,7 @@ export type Style = {
theme: ColorScheme | null
rtl: boolean | null
native: boolean
dependencies: Array<StyleDependency>
dependencies: Array<StyleDependency> | null
index: number
className: string
importantProperties: Array<string>
Expand Down
5 changes: 4 additions & 1 deletion packages/uniwind/src/hooks/useCSSVariable/useCSSVariable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ export const useCSSVariable: UseCSSVariable = (name: string | Array<string>) =>

useEffect(() => {
const updateValue = () => setValue(getValue(nameRef.current))
const dispose = UniwindListener.subscribe(updateValue, [StyleDependency.Theme])
const dispose = UniwindListener.subscribe(
updateValue,
[StyleDependency.Theme, StyleDependency.Variables],
)

return dispose
}, [])
Expand Down
6 changes: 5 additions & 1 deletion packages/uniwind/src/metro/addMetaToStylesTemplate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ export const addMetaToStylesTemplate = (Processor: ProcessorBuilder, currentPlat
})
})

if (usedVars.length > 0) {
dependencies.push(StyleDependency.Variables)
}

if (theme !== null || isUsingThemedVar || stringifiedEntries.includes('rt.lightDark')) {
dependencies.push(StyleDependency.Theme)
}
Expand Down Expand Up @@ -108,7 +112,7 @@ export const addMetaToStylesTemplate = (Processor: ProcessorBuilder, currentPlat
rtl,
colorScheme: makeSafeForSerialization(colorScheme),
native: platform !== null,
dependencies,
dependencies: dependencies.length > 0 ? dependencies : null,
index,
className: makeSafeForSerialization(className),
active,
Expand Down
1 change: 1 addition & 0 deletions packages/uniwind/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export enum StyleDependency {
FontScale = 6,
Rtl = 7,
AdaptiveThemes = 8,
Variables = 9,
}

export const enum Orientation {
Expand Down