Skip to content

Remove deprecated ShadowNode type aliases #55687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sammy-SC wants to merge 1 commit into from
+8 −17
Closed

Remove deprecated ShadowNode type aliases #55687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,6 @@ struct ShadowNodeWrapper;

class ShadowNode : public Sealable, public DebugStringConvertible, public jsi::NativeState {
public:
// TODO(T223558094): delete this in the next version.
using Shared [[deprecated("Use std::shared_ptr<const ShadowNode> instead")]] = std::shared_ptr<const ShadowNode>;
// TODO(T223558094): delete this in the next version.
using Weak [[deprecated("Use std::weak_ptr<const ShadowNode> instead")]] = std::weak_ptr<const ShadowNode>;
// TODO(T223558094): delete this in the next version.
using Unshared [[deprecated("Use std::shared_ptr<ShadowNode> instead")]] = std::shared_ptr<ShadowNode>;
// TODO(T223558094): delete this in the next version.
using ListOfShared [[deprecated("Use std::vector<std::shared_ptr<const ShadowNode>> instead")]] =
std::vector<std::shared_ptr<const ShadowNode>>;
// TODO(T223558094): delete this in the next version.
using ListOfWeak [[deprecated("Use std::vector<std::weak_ptr<const ShadowNode>> instead")]] =
std::vector<std::weak_ptr<const ShadowNode>>;
using SharedListOfShared = std::shared_ptr<const std::vector<std::shared_ptr<const ShadowNode>>>;
using UnsharedListOfShared = std::shared_ptr<std::vector<std::shared_ptr<const ShadowNode>>>;
using UnsharedListOfWeak = std::shared_ptr<std::vector<std::weak_ptr<const ShadowNode>>>;
Expand Down
13 changes: 8 additions & 5 deletions packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,10 @@ static ShadowTreeEdge findRandomShadowNode(
return findShadowNodeWithIndex(rootShadowNode, entropy.random<int>(1 /* Excluding a root node */, count - 1));
}

static ShadowNode::ListOfShared cloneSharedShadowNodeList(const ShadowNode::ListOfShared &list)
static std::vector<std::shared_ptr<const ShadowNode>> cloneSharedShadowNodeList(
const std::vector<std::shared_ptr<const ShadowNode>> &list)
{
auto result = ShadowNode::ListOfShared{};
auto result = std::vector<std::shared_ptr<const ShadowNode>>{};
result.reserve(list.size());
for (const auto &shadowNode : list) {
result.push_back(shadowNode->clone({}));
Expand All @@ -105,7 +106,8 @@ static inline std::shared_ptr<ShadowNode> messWithChildren(const Entropy &entrop
children = cloneSharedShadowNodeList(children);
entropy.shuffle(children);
return shadowNode.clone(
{ShadowNodeFragment::propsPlaceholder(), std::make_shared<const ShadowNode::ListOfShared>(children)});
{ShadowNodeFragment::propsPlaceholder(),
std::make_shared<const std::vector<std::shared_ptr<const ShadowNode>>>(children)});
}

static inline std::shared_ptr<ShadowNode> messWithLayoutableOnlyFlag(
Expand Down Expand Up @@ -280,7 +282,7 @@ static inline std::shared_ptr<const ShadowNode> generateShadowNodeTree(
auto items = std::vector<int>(size);
std::fill(items.begin(), items.end(), 1);
auto chunks = entropy.distribute(items, deviation);
auto children = ShadowNode::ListOfShared{};
auto children = std::vector<std::shared_ptr<const ShadowNode>>{};

for (const auto &chunk : chunks) {
children.push_back(generateShadowNodeTree(entropy, componentDescriptor, chunk.size()));
Expand All @@ -289,7 +291,8 @@ static inline std::shared_ptr<const ShadowNode> generateShadowNodeTree(
auto family = componentDescriptor.createFamily({generateReactTag(), SurfaceId(1), nullptr});
return componentDescriptor.createShadowNode(
ShadowNodeFragment{
generateDefaultProps(componentDescriptor), std::make_shared<const ShadowNode::ListOfShared>(children)},
generateDefaultProps(componentDescriptor),
std::make_shared<const std::vector<std::shared_ptr<const ShadowNode>>>(children)},
family);
}

Expand Down
Loading