fix: add check for secrets

jpudysz · Dec 16, 2024 · 42c4cc7 · 42c4cc7
1 parent 3c6b3c7
commit 42c4cc7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/web/shadowRegistry.ts b/src/web/shadowRegistry.ts
@@ -2,7 +2,7 @@ import type { UnistylesTheme, UnistylesValues } from '../types'
 import { UnistylesListener } from './listener'
 import { UnistylesRegistry } from './registry'
 import { deepMergeObjects } from '../utils'
-import { equal, extractSecrets, extractUnistyleDependencies, isInDocument, keyInObject } from './utils'
+import { equal, extractSecrets, extractUnistyleDependencies, isInDocument } from './utils'
 import { getVariants } from './variants'
 
 type Style = UnistylesValues | ((...args: Array<any>) => UnistylesValues)
@@ -67,13 +67,6 @@ class UnistylesShadowRegistryBuilder {
 
                 // Regular style
                 if (!secrets) {
-                    Object.keys(unistyleStyle).forEach(key => {
-                        if (keyInObject(ref.style, key)) {
-                            // @ts-expect-error - Styles won't have read only properties
-                            ref.style[key] = ''
-                        }
-                    })
-
                     return unistyleStyle as UnistylesValues
                 }
 
@@ -133,6 +126,7 @@ class UnistylesShadowRegistryBuilder {
         this.classNamesMap.set(ref, newClassNames)
         // Add new classnames to the ref
         ref.classList.add(...newClassNames)
+        ref.removeAttribute('styles')
 
         return newClassNames
     }

diff --git a/src/web/utils/unistyle.ts b/src/web/utils/unistyle.ts
@@ -30,7 +30,7 @@ export const assignSecrets = <T>(object: T, secrets: UnistyleSecrets) => {
 }
 
 export const extractSecrets = (object: any) => {
-    return keyInObject(object, '__uni__secrets__') ? object.__uni__secrets__ as UnistyleSecrets : undefined
+    return object && keyInObject(object, '__uni__secrets__') ? object.__uni__secrets__ as UnistyleSecrets : undefined
 }
 
 export const removeInlineStyles = (values: UnistylesValues) => {