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
29 changes: 22 additions & 7 deletions packages/unistyles/src/reanimated/useAnimatedTheme.native.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,37 @@
import { useEffect } from 'react'
import { useEffect, useState } from 'react'
import { type SharedValue, useSharedValue } from 'react-native-reanimated'

import type { UnistylesTheme } from '../types'

import { StyleSheet, UnistyleDependency, UnistylesRuntime } from '../specs'
import { StyleSheet, UnistyleDependency, UnistylesRuntime, UnistylesShadowRegistry } from '../specs'

export const useAnimatedTheme = () => {
const theme = useSharedValue(UnistylesRuntime.getTheme())
const [scopedTheme, setScopedTheme] = useState(
() => UnistylesShadowRegistry.getScopedTheme() as UnistylesTheme | undefined,
)
const theme = useSharedValue(UnistylesRuntime.getTheme(scopedTheme))
const maybeNewScopedTheme = UnistylesShadowRegistry.getScopedTheme() as UnistylesTheme | undefined

if (scopedTheme !== maybeNewScopedTheme) {
setScopedTheme(maybeNewScopedTheme)
theme.set(UnistylesRuntime.getTheme(maybeNewScopedTheme))
}

useEffect(() => {
const dispose = StyleSheet.addChangeListener((changedDependencies) => {
if (changedDependencies.includes(UnistyleDependency.Theme)) {
theme.set(UnistylesRuntime.getTheme())
const dispose = StyleSheet.addChangeListener(changedDependencies => {
if (!changedDependencies.includes(UnistyleDependency.Theme)) {
return
}

if (scopedTheme) {
return
}

theme.set(UnistylesRuntime.getTheme())
Comment thread
jpudysz marked this conversation as resolved.
})

return () => dispose()
}, [])
}, [scopedTheme])

return theme as SharedValue<UnistylesTheme>
}
27 changes: 20 additions & 7 deletions packages/unistyles/src/reanimated/useAnimatedTheme.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,36 @@
import { useEffect } from 'react'
import { useEffect, useState } from 'react'
import { type SharedValue, useSharedValue } from 'react-native-reanimated'

import type { UnistylesTheme } from '../types'

import { UnistyleDependency, UnistylesRuntime } from '../specs'
import { UnistyleDependency, UnistylesRuntime, UnistylesShadowRegistry } from '../specs'
import { services } from '../web/services'

export const useAnimatedTheme = () => {
const theme = useSharedValue(UnistylesRuntime.getTheme())
const [scopedTheme, setScopedTheme] = useState(
() => UnistylesShadowRegistry.getScopedTheme() as UnistylesTheme | undefined,
)
const theme = useSharedValue(UnistylesRuntime.getTheme(scopedTheme))
const maybeNewScopedTheme = UnistylesShadowRegistry.getScopedTheme() as UnistylesTheme | undefined

if (scopedTheme !== maybeNewScopedTheme) {
setScopedTheme(maybeNewScopedTheme)
theme.set(UnistylesRuntime.getTheme(maybeNewScopedTheme))
}

useEffect(() => {
const dispose = services.listener.addListeners([UnistyleDependency.Theme], () =>
theme.set(UnistylesRuntime.getTheme()),
)
const dispose = services.listener.addListeners([UnistyleDependency.Theme], () => {
if (scopedTheme) {
return
}

theme.set(UnistylesRuntime.getTheme())
})
Comment thread
jpudysz marked this conversation as resolved.

return () => {
dispose()
}
}, [])
}, [scopedTheme])

return theme as SharedValue<UnistylesTheme>
}
Loading