feat: regression for unistyles not bound warning

jpudysz · Jan 15, 2025 · 46ba6c6 · 46ba6c6
1 parent 0ead677
commit 46ba6c6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/cxx/core/HostUnistyle.cpp b/cxx/core/HostUnistyle.cpp
@@ -52,11 +52,11 @@ jsi::Function HostUnistyle::createAddVariantsProxyFunction(jsi::Runtime& rt) {
         Variants variants = helpers::variantsToPairs(rt, arguments[0].asObject(rt));
 
         helpers::enumerateJSIObject(rt, thisVal.asObject(rt), [this, &parser, &rt, &variants](const std::string& name, jsi::Value& value){
-            auto unistyle = this->_stylesheet->unistyles[name];
-
-            if (unistyle == nullptr) {
+            if (name == helpers::ADD_VARIANTS_FN || !this->_stylesheet->unistyles.contains(name)) {
                 return;
             }
+
+            auto unistyle = this->_stylesheet->unistyles[name];
 
             if (unistyle->dependsOn(UnistyleDependency::VARIANTS)) {
                 parser.rebuildUnistyle(rt, unistyle, variants, std::nullopt);

diff --git a/src/core/createUnistylesElement.native.tsx b/src/core/createUnistylesElement.native.tsx
@@ -19,7 +19,9 @@ export const createUnistylesElement = (Component: any) => React.forwardRef((prop
             ref={(ref: unknown) => {
                 storedRef.current = ref
                 passForwardedRef(props, ref, forwardedRef)
-                maybeWarnAboutMultipleUnistyles(props, Component.displayName)
+
+                // @ts-ignore we don't know the type of the component
+                maybeWarnAboutMultipleUnistyles(props.style, Component.displayName)
             }}
         />
     )

diff --git a/src/core/createUnistylesImageBackground.tsx b/src/core/createUnistylesImageBackground.tsx
@@ -19,6 +19,8 @@ export const createUnistylesImageBackground = (Component: typeof ImageBackground
 
     // @ts-expect-error we don't know the type of the component
     maybeWarnAboutMultipleUnistyles(props.style, 'ImageBackground')
+    // @ts-ignore we don't know the type of the component
+    maybeWarnAboutMultipleUnistyles(props.imageStyle, 'ImageBackground')
 
     return (
         <Component

diff --git a/src/core/withUnistyles/withUnistyles.native.tsx b/src/core/withUnistyles/withUnistyles.native.tsx
@@ -33,6 +33,11 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
         const narrowedProps = props as PropsWithUnistyles
         const NativeComponent = Component as ComponentType
 
+        // @ts-ignore we don't know the type of the component
+        maybeWarnAboutMultipleUnistyles(narrowedProps.style, `withUnistyles(${Component.displayName ?? 'Unknown'})`)
+        // @ts-ignore we don't know the type of the component
+        maybeWarnAboutMultipleUnistyles(narrowedProps.contentContainerStyle, `withUnistyles(${Component.displayName ?? 'Unknown'})`)
+
         const { mappingsCallback, addDependencies } = useDependencies(({ dependencies, updateTheme, updateRuntime }) => {
             const listensToTheme = dependencies.includes(UnistyleDependency.Theme)
             // @ts-expect-error - this is hidden from TS
@@ -50,11 +55,6 @@ export const withUnistyles = <TComponent, TMappings extends GenericComponentProp
         })
 
         useEffect(() => {
-            // @ts-ignore
-            maybeWarnAboutMultipleUnistyles(narrowedProps.style, `withUnistyles(${Component.displayName ?? 'Unknown'})`)
-            // @ts-ignore
-            maybeWarnAboutMultipleUnistyles(narrowedProps.contentContainerStyle, `withUnistyles(${Component.displayName ?? 'Unknown'})`)
-
             const styleSecrets = getSecrets(narrowedProps.style)
             const contentContainerStyleSecrets = getSecrets(narrowedProps.contentContainerStyle)