From 45af635b1e9f7d7bd1092d5e99296bd3fa5d691c Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Tue, 15 Feb 2022 14:05:04 -0800 Subject: [PATCH] Fix some nits/typos in MapBuffer Summary: Was trying out some behaviour when using the MapBuffer experiment and fixed some small issues. Changelog: [Internal] Reviewed By: ShikaSD Differential Revision: D34108859 fbshipit-source-id: 550ca0847419006ec17472cc4b70d38fc8d05396 --- .../react/common/mapbuffer/ReadableMapBuffer.java | 2 +- .../com/facebook/react/fabric/StateWrapperImpl.java | 2 +- .../com/facebook/react/uimanager/StateWrapper.java | 2 +- .../react/views/text/ReactTextViewManager.java | 2 +- .../facebook/react/views/text/TextAttributeProps.java | 8 ++++---- .../react/renderer/attributedstring/conversions.h | 4 ++-- .../renderer/textlayoutmanager/TextLayoutManager.h | 10 ++++------ 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.java b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.java index cbcaf8169a4..b757de4fc38 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.java +++ b/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/ReadableMapBuffer.java @@ -116,11 +116,11 @@ public class ReadableMapBuffer implements IterableUnstable API - DO NOT USE. */ @Nullable - ReadableMapBuffer getStatDataMapBuffer(); + ReadableMapBuffer getStateDataMapBuffer(); /** * Get a ReadableNativeMap object from the C++ layer, which is a K/V map of string keys to values. diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java index 04af66144bb..a9623479824 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java @@ -97,7 +97,7 @@ public class ReactTextViewManager } if (ReactFeatureFlags.isMapBufferSerializationEnabled()) { - ReadableMapBuffer stateMapBuffer = stateWrapper.getStatDataMapBuffer(); + ReadableMapBuffer stateMapBuffer = stateWrapper.getStateDataMapBuffer(); if (stateMapBuffer != null) { return getReactTextUpdate(view, props, stateMapBuffer); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java index e2e717b2b51..ed75ed5a5d9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java +++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java @@ -48,7 +48,7 @@ public class TextAttributeProps { public static final short TA_KEY_TEXT_DECORATION_COLOR = 14; public static final short TA_KEY_TEXT_DECORATION_LINE = 15; public static final short TA_KEY_TEXT_DECORATION_STYLE = 16; - public static final short TA_KEY_TEXT_SHADOW_RAIDUS = 18; + public static final short TA_KEY_TEXT_SHADOW_RADIUS = 18; public static final short TA_KEY_TEXT_SHADOW_COLOR = 19; public static final short TA_KEY_IS_HIGHLIGHTED = 20; public static final short TA_KEY_LAYOUT_DIRECTION = 21; @@ -193,8 +193,8 @@ public class TextAttributeProps { break; case TA_KEY_TEXT_DECORATION_STYLE: break; - case TA_KEY_TEXT_SHADOW_RAIDUS: - result.setTextShadowRadius(entry.getInt()); + case TA_KEY_TEXT_SHADOW_RADIUS: + result.setTextShadowRadius((float) entry.getDouble()); break; case TA_KEY_TEXT_SHADOW_COLOR: result.setTextShadowColor(entry.getInt()); @@ -243,7 +243,7 @@ public class TextAttributeProps { result.setTextDecorationLine(getStringProp(props, ViewProps.TEXT_DECORATION_LINE)); result.setTextShadowOffset( props.hasKey(PROP_SHADOW_OFFSET) ? props.getMap(PROP_SHADOW_OFFSET) : null); - result.setTextShadowRadius(getIntProp(props, PROP_SHADOW_RADIUS, 1)); + result.setTextShadowRadius(getFloatProp(props, PROP_SHADOW_RADIUS, 1)); result.setTextShadowColor(getIntProp(props, PROP_SHADOW_COLOR, DEFAULT_TEXT_SHADOW_COLOR)); result.setTextTransform(getStringProp(props, PROP_TEXT_TRANSFORM)); result.setLayoutDirection(getStringProp(props, ViewProps.LAYOUT_DIRECTION)); diff --git a/ReactCommon/react/renderer/attributedstring/conversions.h b/ReactCommon/react/renderer/attributedstring/conversions.h index 77472d413e1..c8b5a9ab2dd 100644 --- a/ReactCommon/react/renderer/attributedstring/conversions.h +++ b/ReactCommon/react/renderer/attributedstring/conversions.h @@ -977,7 +977,7 @@ constexpr static MapBuffer::Key TA_KEY_BEST_WRITING_DIRECTION = 13; constexpr static MapBuffer::Key TA_KEY_TEXT_DECORATION_COLOR = 14; constexpr static MapBuffer::Key TA_KEY_TEXT_DECORATION_LINE = 15; constexpr static MapBuffer::Key TA_KEY_TEXT_DECORATION_STYLE = 16; -constexpr static MapBuffer::Key TA_KEY_TEXT_SHADOW_RAIDUS = 18; +constexpr static MapBuffer::Key TA_KEY_TEXT_SHADOW_RADIUS = 18; constexpr static MapBuffer::Key TA_KEY_TEXT_SHADOW_COLOR = 19; constexpr static MapBuffer::Key TA_KEY_IS_HIGHLIGHTED = 20; constexpr static MapBuffer::Key TA_KEY_LAYOUT_DIRECTION = 21; @@ -1104,7 +1104,7 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) { // Shadow if (!std::isnan(textAttributes.textShadowRadius)) { builder.putDouble( - TA_KEY_TEXT_SHADOW_RAIDUS, textAttributes.textShadowRadius); + TA_KEY_TEXT_SHADOW_RADIUS, textAttributes.textShadowRadius); } if (textAttributes.textShadowColor) { builder.putInt( diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h index e739e8ba07a..396cd5d0e10 100644 --- a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h +++ b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h @@ -28,14 +28,12 @@ class TextLayoutManager { public: TextLayoutManager(const ContextContainer::Shared &contextContainer) : contextContainer_(contextContainer), - measureCache_{ + mapBufferSerializationEnabled_( + contextContainer->at("MapBufferSerializationEnabled")), + measureCache_( contextContainer->at("EnableLargeTextMeasureCache") ? 1024 - : kSimpleThreadSafeCacheSizeCap} { - static auto value = - contextContainer->at("MapBufferSerializationEnabled"); - mapBufferSerializationEnabled_ = value; - } + : kSimpleThreadSafeCacheSizeCap) {} ~TextLayoutManager(); /*