Skip to content

Commit

Permalink
Merge pull request #500 from jpudysz/fix/handle-cssvars-in-native
Browse files Browse the repository at this point in the history
fix: handle cssvars in native settings
  • Loading branch information
jpudysz authored Jan 20, 2025
2 parents 58ef985 + 64d2098 commit 817e994
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions cxx/hybridObjects/HybridStyleSheet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ void HybridStyleSheet::parseSettings(jsi::Runtime &rt, jsi::Object settings) {
return;
}

if (propertyName == "CSSVars") {
return;
}

helpers::assertThat(rt, false, "StyleSheet.configure's settings received unexpected key: '" + std::string(propertyName) + "'");
});
}
Expand Down Expand Up @@ -255,13 +259,13 @@ void HybridStyleSheet::onPlatformDependenciesChange(std::vector<UnistyleDependen
auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, dependencies);

parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, std::nullopt);

// we need to stop here if there is nothing to update at the moment,
// but we need to compute dependentStyleSheets
if (dependencyMap.empty()) {
return;
}

parser.rebuildShadowLeafUpdates(rt, dependencyMap);

this->notifyJSListeners(dependencies);
Expand Down Expand Up @@ -306,13 +310,13 @@ void HybridStyleSheet::onPlatformNativeDependenciesChange(std::vector<UnistyleDe
auto dependentStyleSheets = registry.getStyleSheetsToRefresh(rt, unistyleDependencies);

parser.rebuildUnistylesInDependencyMap(rt, dependencyMap, dependentStyleSheets, miniRuntime);

// we need to stop here if there is nothing to update at the moment,
// but we need to compute dependentStyleSheets
if (dependencyMap.empty()) {
return;
}

parser.rebuildShadowLeafUpdates(rt, dependencyMap);

this->notifyJSListeners(unistyleDependencies);
Expand Down

0 comments on commit 817e994

Please sign in to comment.