react-native-unistyles 3.0.0-alpha.20 → 3.0.0-alpha.21

package/cxx/common/Constants.h

@@ -8,5 +8,6 @@ static const std::string STYLE_DEPENDENCIES = "uni__dependencies";
 static const std::string STYLE_VARIANTS = "uni__variants";
 static const std::string WEB_STYLE_KEY = "_web";
 static const std::string EXOTIC_STYLE_KEY = "_exotic";
+static const std::string NAME_STYLE_KEY = "__unistyles_name";
 
 }

package/cxx/core/UnistyleWrapper.h

@@ -17,34 +17,6 @@ struct UnistyleWrapper: public jsi::NativeState {
     Unistyle::Shared unistyle;
 };
 
-inline static std::string generateStyleKey(std::string& key, int tag) {
-    return std::string("__unid_").append(std::to_string(tag)).append("_").append(key).c_str();
-}
-
-inline static Unistyle::Shared unistyleFromKey(jsi::Runtime& rt, const std::string& key) {
-    std::string prefix = "__unid_";
-
-    if (key.substr(0, prefix.length()) != prefix) {
-        return nullptr;
-    }
-
-    std::string remaining = key.substr(prefix.length());
-
-    size_t underscorePos = remaining.find('_');
-
-    if (underscorePos == std::string::npos) {
-        return nullptr;
-    }
-
-    std::string tagStr = remaining.substr(0, underscorePos);
-
-    auto& registry = UnistylesRegistry::get();
-    auto tag = std::stoi(tagStr);
-    auto styleKey = remaining.substr(underscorePos + 1);
-
-    return registry.findUnistyleFromKey(rt, styleKey, tag);
-}
-
 inline static Unistyle::Shared unistyleFromStaticStyleSheet(jsi::Runtime& rt, jsi::Object& value) {
     auto exoticUnistyle = std::make_shared<Unistyle>(
         UnistyleType::Object,
@@ -60,21 +32,29 @@ inline static Unistyle::Shared unistyleFromStaticStyleSheet(jsi::Runtime& rt, js
 
 
 inline static std::vector<Unistyle::Shared> unistylesFromNonExistentNativeState(jsi::Runtime& rt, jsi::Object& value) {
-    std::vector<Unistyle::Shared> foundUnistyles{};
-
-    helpers::enumerateJSIObject(rt, value, [&](const std::string& key, jsi::Value& value){
-        auto maybeUnistyle = unistyleFromKey(rt, key);
+    auto hasUnistyleName = value.hasProperty(rt, helpers::NAME_STYLE_KEY.c_str());
 
-        if (maybeUnistyle != nullptr) {
-            foundUnistyles.emplace_back(maybeUnistyle);
-        }
-    });
-
-    if (foundUnistyles.size() == 0) {
+    // return wrapped RN/inline style
+    if (!hasUnistyleName) {
         return {unistyleFromStaticStyleSheet(rt, value)};
     }
 
-    return foundUnistyles;
+    throw jsi::JSError(rt, R"(Unistyles: Style is not bound!
+    
+Potential reasons:
+- You likely used the spread operator on a Unistyle style outside of a JSX component
+    
+If you need to merge styles, do it within the style prop of your JSX component:
+    
+style={{...styles.container, ...styles.otherProp}}
+or 
+style={[styles.container, styles.otherProp]}
+
+If you pass computed style prop to component use array syntax:
+
+customStyleProp={[styles.container, styles.otherProp]}
+    
+Copying a Unistyle style outside of a JSX element will remove its internal C++ state, leading to unexpected behavior.)");
 }
 
 inline static std::vector<Unistyle::Shared> unistyleFromValue(jsi::Runtime& rt, const jsi::Value& value) {
@@ -99,7 +79,7 @@ inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, Unistyle::Shared un
         jsi::Object obj = jsi::Object(rt);
        
         obj.setNativeState(rt, std::move(wrappedUnistyle));
-        obj.setProperty(rt, std::string("__unid_").append(std::to_string(tag)).append("_").append(unistyle->styleKey).c_str(), jsi::Value::undefined());
+        obj.setProperty(rt, helpers::NAME_STYLE_KEY.c_str(), jsi::String::createFromUtf8(rt, unistyle->styleKey));
         
         helpers::mergeJSIObjects(rt, obj, unistyle->parsedStyle.value());
 
@@ -110,7 +90,7 @@ inline static jsi::Value valueFromUnistyle(jsi::Runtime& rt, Unistyle::Shared un
     auto hostFn = jsi::Value(rt, unistyleFn->proxiedFunction.value()).asObject(rt).asFunction(rt);
 
     hostFn.setNativeState(rt, std::move(wrappedUnistyle));
-    hostFn.setProperty(rt, std::string("__unid_").append(std::to_string(tag)).append("_").append(unistyleFn->styleKey).c_str(), jsi::Value::undefined());
+    hostFn.setProperty(rt, helpers::NAME_STYLE_KEY.c_str(), jsi::String::createFromUtf8(rt, unistyleFn->styleKey));
     
     return std::move(hostFn);
 }

package/lib/typescript/expo-example/app/(tabs)/_layout.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export default function TabLayout(): React.JSX.Element;
+//# sourceMappingURL=_layout.d.ts.map

package/lib/typescript/expo-example/app/(tabs)/_layout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"_layout.d.ts","sourceRoot":"","sources":["../../../../../expo-example/app/(tabs)/_layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,MAAM,CAAC,OAAO,UAAU,SAAS,sBAqBhC"}

package/lib/typescript/expo-example/app/(tabs)/explore.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export default function TabTwoScreen(): React.JSX.Element;
+//# sourceMappingURL=explore.d.ts.map

package/lib/typescript/expo-example/app/(tabs)/explore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"explore.d.ts","sourceRoot":"","sources":["../../../../../expo-example/app/(tabs)/explore.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,MAAM,CAAC,OAAO,UAAU,YAAY,sBAQnC"}

package/lib/typescript/expo-example/app/(tabs)/index.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export default function HomeScreen(): React.JSX.Element;
+//# sourceMappingURL=index.d.ts.map

package/lib/typescript/expo-example/app/(tabs)/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../expo-example/app/(tabs)/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,MAAM,CAAC,OAAO,UAAU,UAAU,sBAQjC"}

package/lib/typescript/expo-example/app/+html.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { type PropsWithChildren } from 'react';
+export default function Root({ children }: PropsWithChildren): React.JSX.Element;
+//# sourceMappingURL=+html.d.ts.map

package/lib/typescript/expo-example/app/+html.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"+html.d.ts","sourceRoot":"","sources":["../../../../expo-example/app/+html.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAE9C,MAAM,CAAC,OAAO,UAAU,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,iBAAiB,qBAqB3D"}

package/lib/typescript/expo-example/app/+not-found.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export default function NotFoundScreen(): React.JSX.Element;
+//# sourceMappingURL=+not-found.d.ts.map

package/lib/typescript/expo-example/app/+not-found.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"+not-found.d.ts","sourceRoot":"","sources":["../../../../expo-example/app/+not-found.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,MAAM,CAAC,OAAO,UAAU,cAAc,sBAIrC"}

package/lib/typescript/expo-example/app/_layout.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export default function RootLayout(): React.JSX.Element;
+//# sourceMappingURL=_layout.d.ts.map

package/lib/typescript/expo-example/app/_layout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"_layout.d.ts","sourceRoot":"","sources":["../../../../expo-example/app/_layout.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,MAAM,CAAC,OAAO,UAAU,UAAU,sBAMjC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-unistyles",
-  "version": "3.0.0-alpha.20",
+  "version": "3.0.0-alpha.21",
   "description": "Level up your React Native StyleSheet",
   "scripts": {
     "test": "jest",