DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Add test for 'reset' of a node

Browse Source
This commit is contained in:
Reinier Hartog
2019-01-29 13:06:07 +01:00
parent 7a930957a9
commit 79cdd9a2d7
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javascript/sources/Node.cc
View File

@@ -53,6 +53,7 @@ static void globalDirtiedFunc(YGNodeRef nodeRef)
Node::Node(Config * config) Node::Node(Config * config)
: m_node(config != nullptr ? YGNodeNewWithConfig(config->m_config) : YGNodeNew()) : m_node(config != nullptr ? YGNodeNewWithConfig(config->m_config) : YGNodeNew())
, m_measureFunc(nullptr) , m_measureFunc(nullptr)
, m_dirtiedFunc(nullptr)
{ {
YGNodeSetContext(m_node, reinterpret_cast<void *>(this)); YGNodeSetContext(m_node, reinterpret_cast<void *>(this));
} }
@@ -65,6 +66,7 @@ Node::~Node(void)
void Node::reset(void) void Node::reset(void)
{ {
m_measureFunc.reset(nullptr); m_measureFunc.reset(nullptr);
m_dirtiedFunc.reset(nullptr);
YGNodeReset(m_node); YGNodeReset(m_node);
} }

42
javascript/tests/Facebook.Yoga/YGDirtiedTest.js
View File

@@ -124,3 +124,45 @@ it("dirtied_hierarchy", function() {
typeof gc !== "undefined" && gc(); typeof gc !== "undefined" && gc();
console.assert(0 === Yoga.getInstanceCount(), "0 === Yoga.getInstanceCount() (" + Yoga.getInstanceCount() + ")"); console.assert(0 === Yoga.getInstanceCount(), "0 === Yoga.getInstanceCount() (" + Yoga.getInstanceCount() + ")");
}); });
it("dirtied_reset", function() {
var root = Yoga.Node.create();
root.setAlignItems(Yoga.ALIGN_FLEX_START);
root.setWidth(100);
root.setHeight(100);
root.setMeasureFunc(function() {});
root.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
let dirtied = 0;
root.setDirtiedFunc(function() {
dirtied++;
});
console.assert(0 === dirtied, "0 === dirtied");
// dirtied func MUST be called in case of explicit dirtying.
root.markDirty();
console.assert(1 === dirtied, "1 === dirtied");
// recalculate so the root is no longer dirty
root.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);
root.reset();
root.setAlignItems(Yoga.ALIGN_FLEX_START);
root.setWidth(100);
root.setHeight(100);
root.setMeasureFunc(function() {});
root.markDirty();
// dirtied func must NOT be called after reset.
root.markDirty();
console.assert(1 === dirtied, "1 === dirtied");
if (typeof root !== "undefined")
root.freeRecursive();
typeof gc !== "undefined" && gc();
console.assert(0 === Yoga.getInstanceCount(), "0 === Yoga.getInstanceCount() (" + Yoga.getInstanceCount() + ")");
});