Skip to content

Commit

Permalink
Introduce toDynamic conversion for ParagraphLocalData class
Browse files Browse the repository at this point in the history
Summary: This diff introduces a way to convert ParagraphLocalData object to dynamic objects

Reviewed By: shergin

Differential Revision: D9801892

fbshipit-source-id: e50217042a216ea67f28178bb80b136cbb8fb195
  • Loading branch information
mdvacca authored and facebook-github-bot committed Sep 17, 2018
1 parent c5276ef commit 470a958
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
#include <fabric/graphics/conversions.h>
#include <gtest/gtest.h>
#include <assert.h>
#include <string>
#include <iostream>

namespace facebook {
namespace react {

Expand Down
2 changes: 1 addition & 1 deletion ReactCommon/fabric/components/text/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ fb_xplat_cxx_test(
"-Wall",
],
contacts = ["oncall+react_native@xmail.facebook.com"],
platforms = APPLE,
platforms = (ANDROID, APPLE),
deps = [
"xplat//folly:molly",
"xplat//third-party/gmock:gtest",
Expand Down
16 changes: 16 additions & 0 deletions ReactCommon/fabric/components/text/paragraph/conversions.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

#include <fabric/attributedstring/conversions.h>
#include <fabric/components/text/ParagraphLocalData.h>
#include <folly/dynamic.h>

namespace facebook {
namespace react {

inline folly::dynamic toDynamic(const ParagraphLocalData &paragraphLocalData) {
folly::dynamic newLocalData = folly::dynamic::object();
newLocalData["attributedString"] = toDynamic(paragraphLocalData.getAttributedString());
return newLocalData;
}

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/**
* 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.
*/

#include <memory>

#include <fabric/attributedstring/AttributedString.h>
#include <fabric/attributedstring/TextAttributes.h>
#include <fabric/attributedstring/primitives.h>
#include <fabric/components/text/conversions.h>
#include <fabric/components/text/ParagraphLocalData.h>
#include <gtest/gtest.h>
#include <assert.h>

namespace facebook {
namespace react {

TEST(ParagraphLocalDataTest, testSomething) {
auto attString = AttributedString();
auto fragment = AttributedString::Fragment();
fragment.string = "test";

auto text = TextAttributes();
text.foregroundColor = {colorFromComponents({100/255.0, 153/255.0, 253/255.0, 1.0})};
text.opacity = 0.5;
text.fontStyle = FontStyle::Italic;
text.fontWeight = FontWeight::Thin;
text.fontVariant = FontVariant::TabularNums;
fragment.textAttributes = text;
attString.prependFragment(fragment);

auto paragraphLocalData = ParagraphLocalData();
paragraphLocalData.setAttributedString(attString);

auto result = toDynamic(paragraphLocalData)["attributedString"];

assert(result["string"] == fragment.string);
auto textAttribute = result["fragments"][0]["textAttributes"];
assert(textAttribute["foregroundColor"] == toDynamic(text.foregroundColor));
assert(textAttribute["opacity"] == text.opacity);
assert(textAttribute["fontStyle"] == toString(*text.fontStyle));
assert(textAttribute["fontWeight"] == toString(*text.fontWeight));
}

}
}

0 comments on commit 470a958

Please sign in to comment.