Skip to content

Commit

Permalink
Expose dirtied func in Javascript bindings (#842)
Browse files Browse the repository at this point in the history
Summary:
Yoga currently has the concept of a 'dirtied func', which is called when a Node becomes dirty, which can be useful to trigger a repaint. This PR exposes that functionality in the Javascript bindings.
Pull Request resolved: facebook/yoga#842

Reviewed By: SidharthGuglani

Differential Revision: D13847093

Pulled By: davidaurelio

fbshipit-source-id: 41913abd6eedc46ee7d66929140e08a084f23972
  • Loading branch information
Reinier Hartog authored and facebook-github-bot committed Feb 1, 2019
1 parent 4a6b1e1 commit 8691cda
Show file tree
Hide file tree
Showing 4 changed files with 208 additions and 1 deletion.
27 changes: 27 additions & 0 deletions javascript/sources/Node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ static YGSize globalMeasureFunc(YGNodeRef nodeRef, float width, YGMeasureMode wi
return ygSize;
}

static void globalDirtiedFunc(YGNodeRef nodeRef)
{
Node const & node = *reinterpret_cast<Node const *>(YGNodeGetContext(nodeRef));

node.callDirtiedFunc();
}

/* static */ Node * Node::createDefault(void)
{
return new Node(nullptr);
Expand All @@ -46,6 +53,7 @@ static YGSize globalMeasureFunc(YGNodeRef nodeRef, float width, YGMeasureMode wi
Node::Node(Config * config)
: m_node(config != nullptr ? YGNodeNewWithConfig(config->m_config) : YGNodeNew())
, m_measureFunc(nullptr)
, m_dirtiedFunc(nullptr)
{
YGNodeSetContext(m_node, reinterpret_cast<void *>(this));
}
Expand All @@ -58,6 +66,7 @@ Node::~Node(void)
void Node::reset(void)
{
m_measureFunc.reset(nullptr);
m_dirtiedFunc.reset(nullptr);

YGNodeReset(m_node);
}
Expand Down Expand Up @@ -429,6 +438,24 @@ Size Node::callMeasureFunc(double width, int widthMode, double height, int heigh
return m_measureFunc->call<Size>(width, widthMode, height, heightMode);
}

void Node::setDirtiedFunc(nbind::cbFunction & dirtiedFunc)
{
m_dirtiedFunc.reset(new nbind::cbFunction(dirtiedFunc));

YGNodeSetDirtiedFunc(m_node, &globalDirtiedFunc);
}

void Node::unsetDirtiedFunc(void) {
m_dirtiedFunc.reset(nullptr);

YGNodeSetDirtiedFunc(m_node, nullptr);
}

void Node::callDirtiedFunc(void) const
{
m_dirtiedFunc->call<void>();
}

void Node::markDirty(void)
{
YGNodeMarkDirty(m_node);
Expand Down
11 changes: 10 additions & 1 deletion javascript/sources/Node.hh
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,15 @@ class Node {

Size callMeasureFunc(double width, int widthMode, double height, int heightMode) const;

public: // Dirtied func mutators

void setDirtiedFunc(nbind::cbFunction & dirtiedFunc);
void unsetDirtiedFunc(void);

public: // Dirtied func inspectors

void callDirtiedFunc(void) const;

public: // Dirtiness accessors

void markDirty(void);
Expand Down Expand Up @@ -194,5 +203,5 @@ class Node {
YGNodeRef m_node;

std::unique_ptr<nbind::cbFunction> m_measureFunc;

std::unique_ptr<nbind::cbFunction> m_dirtiedFunc;
};
3 changes: 3 additions & 0 deletions javascript/sources/nbind.cc
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ NBIND_CLASS(Node)
method(setMeasureFunc);
method(unsetMeasureFunc);

method(setDirtiedFunc);
method(unsetDirtiedFunc);

method(markDirty);
method(isDirty);

Expand Down
168 changes: 168 additions & 0 deletions javascript/tests/Facebook.Yoga/YGDirtiedTest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

var Yoga = Yoga || require("../../sources/entry-" + process.env.TEST_ENTRY);

it("dirtied", function() {
var root = Yoga.Node.create();
root.setAlignItems(Yoga.ALIGN_FLEX_START);
root.setWidth(100);
root.setHeight(100);

root.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);

let dirtied = 0;
root.setDirtiedFunc(function() { dirtied++; });
// only nodes with a measure function can be marked dirty
root.setMeasureFunc(function() {});

console.assert(0 === dirtied, "0 === dirtied");

// dirtied func MUST be called in case of explicit dirtying.
root.markDirty();
console.assert(1 === dirtied, "1 === dirtied");

// dirtied func MUST be called ONCE.
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() + ")");
});

it("dirtied_propagation", function() {
var root = Yoga.Node.create();
root.setAlignItems(Yoga.ALIGN_FLEX_START);
root.setWidth(100);
root.setHeight(100);

var root_child0 = Yoga.Node.create();
root_child0.setAlignItems(Yoga.ALIGN_FLEX_START);
root_child0.setWidth(50);
root_child0.setHeight(20);
root_child0.setMeasureFunc(function() {});
root.insertChild(root_child0, 0);

var root_child1 = Yoga.Node.create();
root_child1.setAlignItems(Yoga.ALIGN_FLEX_START);
root_child1.setWidth(50);
root_child1.setHeight(20);
root.insertChild(root_child1, 0);

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 for the first time.
root_child0.markDirty();
console.assert(1 === dirtied, "1 === dirtied");

// dirtied func must NOT be called for the second time.
root_child0.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() + ")");
});

it("dirtied_hierarchy", function() {
var root = Yoga.Node.create();
root.setAlignItems(Yoga.ALIGN_FLEX_START);
root.setWidth(100);
root.setHeight(100);

var root_child0 = Yoga.Node.create();
root_child0.setAlignItems(Yoga.ALIGN_FLEX_START);
root_child0.setWidth(50);
root_child0.setHeight(20);
root_child0.setMeasureFunc(function() {});
root.insertChild(root_child0, 0);

var root_child1 = Yoga.Node.create();
root_child1.setAlignItems(Yoga.ALIGN_FLEX_START);
root_child1.setWidth(50);
root_child1.setHeight(20);
root_child1.setMeasureFunc(function() {});
root.insertChild(root_child1, 0);

root.calculateLayout(undefined, undefined, Yoga.DIRECTION_LTR);

let dirtied = 0;
root_child0.setDirtiedFunc(function() {
dirtied++;
});

console.assert(0 === dirtied, "0 === dirtied");

// dirtied func must NOT be called for descendants.
// NOTE: nodes without a measure function cannot be marked dirty manually,
// but nodes with a measure function can not have children.
// Update the width to dirty the node instead.
root.setWidth(110);
console.assert(0 === dirtied, "0 === dirtied");

// dirtied func MUST be called in case of explicit dirtying.
root_child0.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() + ")");
});

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() + ")");
});

0 comments on commit 8691cda

Please sign in to comment.