diff --git a/java/com/facebook/yoga/YogaNode.java b/java/com/facebook/yoga/YogaNode.java index fdb5b4be..90caf8f8 100644 --- a/java/com/facebook/yoga/YogaNode.java +++ b/java/com/facebook/yoga/YogaNode.java @@ -234,15 +234,14 @@ public class YogaNode implements Cloneable { * {@link YogaNode} is shared between two or more YogaTrees. */ @Nullable - public - YogaNode getOwner() { + public YogaNode getOwner() { return mOwner; } /** @deprecated Use #getOwner() instead. This will be removed in the next version. */ @Deprecated @Nullable - YogaNode getParent() { + public YogaNode getParent() { return getOwner(); } diff --git a/yoga/YGNode.cpp b/yoga/YGNode.cpp index 64a47d35..16f9e4d0 100644 --- a/yoga/YGNode.cpp +++ b/yoga/YGNode.cpp @@ -53,6 +53,10 @@ YGNodeRef YGNode::getOwner() const { return owner_; } +YGNodeRef YGNode::getParent() const { + return getOwner(); +} + YGVector YGNode::getChildren() const { return children_; } diff --git a/yoga/YGNode.h b/yoga/YGNode.h index 96541a57..e3562bb6 100644 --- a/yoga/YGNode.h +++ b/yoga/YGNode.h @@ -78,6 +78,8 @@ struct YGNode { // to one YogaTree or nullptr when the YGNode is shared between two or more // YogaTrees. YGNodeRef getOwner() const; + // Deprecated, use getOwner() instead. + YGNodeRef getParent() const; YGVector getChildren() const; uint32_t getChildrenCount() const; YGNodeRef getChild(uint32_t index) const; diff --git a/yoga/Yoga.cpp b/yoga/Yoga.cpp index a927ef55..c6a8ffd2 100644 --- a/yoga/Yoga.cpp +++ b/yoga/Yoga.cpp @@ -535,6 +535,10 @@ YGNodeRef YGNodeGetOwner(const YGNodeRef node) { return node->getOwner(); } +YGNodeRef YGNodeGetParent(const YGNodeRef node) { + return node->getOwner(); +} + void YGNodeMarkDirty(const YGNodeRef node) { YGAssertWithNode( node, diff --git a/yoga/Yoga.h b/yoga/Yoga.h index 25eb0eb6..a9fc89d7 100644 --- a/yoga/Yoga.h +++ b/yoga/Yoga.h @@ -92,6 +92,7 @@ WIN_EXPORT void YGNodeRemoveChild(const YGNodeRef node, const YGNodeRef child); WIN_EXPORT void YGNodeRemoveAllChildren(const YGNodeRef node); WIN_EXPORT YGNodeRef YGNodeGetChild(const YGNodeRef node, const uint32_t index); WIN_EXPORT YGNodeRef YGNodeGetOwner(const YGNodeRef node); +WIN_EXPORT YGNodeRef YGNodeGetParent(const YGNodeRef node); WIN_EXPORT uint32_t YGNodeGetChildCount(const YGNodeRef node); WIN_EXPORT void YGNodeSetChildren( YGNodeRef const owner,