Skip to content

Commit

Permalink
Undeprecate Config setting APIs (facebook#1251)
Browse files Browse the repository at this point in the history
Summary:
Pull Request resolved: facebook#1251

X-link: facebook/react-native#36990

YGNode::setConfig was deprecated as part of D15416474 in an apparent goal to remove config pointers per-Node.

While I don't know the history of the motivation here, these config pointers were never removed, and we will be doubling down on per-node configs for StrictLayout, so we will want to undeprecate this.

This also exposes functions to the public C ABI, but I didn't spend the effort to create language projections for it.

Changelog: [Internal]

Reviewed By: rshest

Differential Revision: D45133646

fbshipit-source-id: 2bb15c4825717793529cdad8542447d11e723e35
  • Loading branch information
NickGerleman authored and facebook-github-bot committed Apr 20, 2023
1 parent 5fd3240 commit 19e15a4
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
12 changes: 0 additions & 12 deletions yoga/YGMacros.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,3 @@ constexpr int n() {
#else
#define YG_ENUM_SEQ_DECL YG_ENUM_DECL
#endif

#ifdef __GNUC__
#define YG_DEPRECATED __attribute__((deprecated))
#elif defined(_MSC_VER)
#define YG_DEPRECATED __declspec(deprecated)
#elif __cplusplus >= 201402L
#if defined(__has_cpp_attribute)
#if __has_cpp_attribute(deprecated)
#define YG_DEPRECATED [[deprecated]]
#endif
#endif
#endif
3 changes: 1 addition & 2 deletions yoga/YGNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include "YGConfig.h"
#include "YGLayout.h"
#include "YGStyle.h"
#include "YGMacros.h"
#include "Yoga-internal.h"

YGConfigRef YGConfigGetDefault();
Expand Down Expand Up @@ -307,7 +306,7 @@ struct YOGA_EXPORT YGNode {

// TODO: rvalue override for setChildren

YG_DEPRECATED void setConfig(YGConfigRef config) { config_ = config; }
void setConfig(YGConfigRef config) { config_ = config; }

void setDirty(bool isDirty);
void setLayoutLastOwnerDirection(YGDirection direction);
Expand Down
8 changes: 8 additions & 0 deletions yoga/Yoga.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@ YOGA_EXPORT void YGNodeSetContext(YGNodeRef node, void* context) {
return node->setContext(context);
}

YOGA_EXPORT YGConfigRef YGNodeGetConfig(YGNodeRef node) {
return node->getConfig();
}

YOGA_EXPORT void YGNodeSetConfig(YGNodeRef node, YGConfigRef config) {
node->setConfig(config);
}

YOGA_EXPORT bool YGNodeHasMeasureFunc(YGNodeRef node) {
return node->hasMeasureFunc();
}
Expand Down
4 changes: 4 additions & 0 deletions yoga/Yoga.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ WIN_EXPORT void YGNodeCopyStyle(YGNodeRef dstNode, YGNodeRef srcNode);

WIN_EXPORT void* YGNodeGetContext(YGNodeRef node);
WIN_EXPORT void YGNodeSetContext(YGNodeRef node, void* context);

WIN_EXPORT YGConfigRef YGNodeGetConfig(YGNodeRef node);
WIN_EXPORT void YGNodeSetConfig(YGNodeRef node, YGConfigRef config);

void YGConfigSetPrintTreeFlag(YGConfigRef config, bool enabled);
bool YGNodeHasMeasureFunc(YGNodeRef node);
WIN_EXPORT void YGNodeSetMeasureFunc(YGNodeRef node, YGMeasureFunc measureFunc);
Expand Down

0 comments on commit 19e15a4

Please sign in to comment.