Skip to content

Commit

Permalink
cleanup enabled_automatic_interop_android (facebook#47321)
Browse files Browse the repository at this point in the history
Summary:

Changelog: [Internal]

this seems to be the last callsite where we read the ReactNativeConfig from the contextContainer. i don't think this killswitch should block cleanup of the ReactNativeConfig, so maybe we can just remove this?

Reviewed By: cortinico

Differential Revision: D65192744
  • Loading branch information
philIip authored and facebook-github-bot committed Oct 31, 2024
1 parent e3f8c63 commit d41bcb3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
namespace facebook::react {

bool EmptyReactNativeConfig::getBool(const std::string& param) const {
if (param == "react_fabric:enabled_automatic_interop_android") {
return true;
}
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

#include "componentNameByReactViewName.h"

#include <react/config/ReactNativeConfig.h>
#include <react/debug/react_native_assert.h>
#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
#include <react/renderer/components/legacyviewmanagerinterop/UnstableLegacyViewManagerAutomaticComponentDescriptor.h>
Expand Down Expand Up @@ -83,25 +82,13 @@ const ComponentDescriptor& ComponentDescriptorRegistry::at(
// assert(it != _registryByName.end());
}

if (it == _registryByName.end()) {
auto reactNativeConfig_ =
contextContainer_->at<std::shared_ptr<const ReactNativeConfig>>(
"ReactNativeConfig");
if (reactNativeConfig_->getBool(
"react_fabric:enabled_automatic_interop_android")) {
auto componentDescriptor = std::make_shared<
const UnstableLegacyViewManagerAutomaticComponentDescriptor>(
parameters_, unifiedComponentName);
registerComponentDescriptor(componentDescriptor);
return *_registryByName.find(unifiedComponentName)->second;
} else if (_fallbackComponentDescriptor == nullptr) {
throw std::invalid_argument(
("Unable to find componentDescriptor for " + unifiedComponentName)
.c_str());
} else {
return *_fallbackComponentDescriptor.get();
}
}
if (it == _registryByName.end()) {
auto componentDescriptor = std::make_shared<
const UnstableLegacyViewManagerAutomaticComponentDescriptor>(
parameters_, unifiedComponentName);
registerComponentDescriptor(componentDescriptor);
return *_registryByName.find(unifiedComponentName)->second;
}

return *it->second;
}
Expand Down

0 comments on commit d41bcb3

Please sign in to comment.