status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-23 06:38:13 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup measure function

Browse Source 
Summary: Trivial diff that cleans up measure function in C++ and Android

Reviewed By: shergin

Differential Revision: D13200340

fbshipit-source-id: 6c0888439640241cdedf514898a1ba3dac231d6a
This commit is contained in:
David Vacca 2018-11-30 17:16:21 -08:00 committed by Facebook Github Bot
parent a2ead1c7b5
commit 3c50d04cf2
5 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ReactCommon/fabric/components/text/paragraph/ParagraphShadowNode.cpp
View File

@ -36,8 +36,10 @@ void ParagraphShadowNode::updateLocalDataIfNeeded() {
ensureUnsealed();
auto attributedString = getAttributedString();
auto currentLocalData = std::static_pointer_cast<const ParagraphLocalData>(getLocalData());
if (currentLocalData && currentLocalData->getAttributedString() == attributedString) {
auto currentLocalData =
std::static_pointer_cast<const ParagraphLocalData>(getLocalData());
if (currentLocalData &&
currentLocalData->getAttributedString() == attributedString) {
return;
}
@ -51,7 +53,6 @@ void ParagraphShadowNode::updateLocalDataIfNeeded() {
Size ParagraphShadowNode::measure(LayoutConstraints layoutConstraints) const {
return textLayoutManager_->measure(
getTag(),
getAttributedString(),
getProps()->paragraphAttributes,
layoutConstraints);

3
ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.cpp
View File

@ -23,7 +23,6 @@ void *TextLayoutManager::getNativeTextLayoutManager() const {
}
Size TextLayoutManager::measure(
Tag reactTag,
AttributedString attributedString,
ParagraphAttributes paragraphAttributes,
LayoutConstraints layoutConstraints) const {
@ -34,7 +33,6 @@ Size TextLayoutManager::measure(
auto clazz =
jni::findClassStatic("com/facebook/fbreact/fabric/FabricUIManager");
static auto measure = clazz->getMethod<jlong(
jint,
jstring,
ReadableNativeMap::javaobject,
ReadableNativeMap::javaobject,
@ -52,7 +50,6 @@ Size TextLayoutManager::measure(
local_ref<JString> componentName = make_jstring("RCTText");
return yogaMeassureToSize(measure(
fabricUIManager,
reactTag,
componentName.get(),
ReadableNativeMap::newObjectCxxArgs(toDynamic(attributedString)).get(),
ReadableNativeMap::newObjectCxxArgs(toDynamic(paragraphAttributes)).get(),

1
ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h
View File

@ -34,7 +34,6 @@ class TextLayoutManager {
* Measures `attributedString` using native text rendering infrastructure.
*/
Size measure(
Tag reactTag,
AttributedString attributedString,
ParagraphAttributes paragraphAttributes,
LayoutConstraints layoutConstraints) const;

1
ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h
View File

@ -33,7 +33,6 @@ class TextLayoutManager {
* Measures `attributedString` using native text rendering infrastructure.
*/
Size measure(
Tag reactTag,
AttributedString attributedString,
ParagraphAttributes paragraphAttributes,
LayoutConstraints layoutConstraints) const;

1
ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.mm
View File

@ -27,7 +27,6 @@ void *TextLayoutManager::getNativeTextLayoutManager() const {
}
Size TextLayoutManager::measure(
Tag reactTag,
AttributedString attributedString,
ParagraphAttributes paragraphAttributes,
LayoutConstraints layoutConstraints) const {