Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Back out "Use ConcreteStateTeller in RCTParagraphComponentView"

Browse Source 
Summary:
RCTParagraphComponentView does not need to have the state teller because it does not change the state.
Also, we are thinking about removing State Teller, so to simplify a fix coming in the next diff, we are backout the introducing a state telled in RCTParagraphComponentView.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: sammy-SC

Differential Revision: D24095655

fbshipit-source-id: 90bd21cb8b01056c0db902a604b4088bf8c7750e
This commit is contained in:
Valentin Shergin
2020-10-04 19:10:05 -07:00
committed by Facebook GitHub Bot
parent a977ad0071
commit 03e120daa9
1 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
+21 -26
View File
@@ -25,7 +25,7 @@
using namespace facebook::react;
@implementation RCTParagraphComponentView {
ParagraphShadowNode::ConcreteStateTeller _stateTeller;
ParagraphShadowNode::ConcreteState::Shared _state;
ParagraphAttributes _paragraphAttributes;
RCTParagraphComponentAccessibilityProvider *_accessibilityProvider;
}
@@ -58,12 +58,11 @@ using namespace facebook::react;
- (NSAttributedString *_Nullable)attributedText
{
auto data = _stateTeller.getData();
if (!data.hasValue()) {
if (!_state) {
return nil;
}
return RCTNSAttributedStringFromAttributedString(data.value().attributedString);
return RCTNSAttributedStringFromAttributedString(_state->getData().attributedString);
}
#pragma mark - RCTComponentViewProtocol
@@ -91,24 +90,23 @@ using namespace facebook::react;
- (void)updateState:(State::Shared const &)state oldState:(State::Shared const &)oldState
{
_stateTeller.setConcreteState(state);
_state = std::static_pointer_cast<ParagraphShadowNode::ConcreteState const>(state);
[self setNeedsDisplay];
}
- (void)prepareForRecycle
{
[super prepareForRecycle];
_stateTeller.invalidate();
_state.reset();
}
- (void)drawRect:(CGRect)rect
{
auto data = _stateTeller.getData();
if (!data.hasValue()) {
if (!_state) {
return;
}
auto textLayoutManager = data.value().layoutManager;
auto textLayoutManager = _state->getData().layoutManager;
assert(textLayoutManager && "TextLayoutManager must not be `nullptr`.");
if (!textLayoutManager) {
@@ -120,7 +118,7 @@ using namespace facebook::react;
CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
[nativeTextLayoutManager drawAttributedString:data.value().attributedString
[nativeTextLayoutManager drawAttributedString:_state->getData().attributedString
paragraphAttributes:_paragraphAttributes
frame:frame];
}
@@ -134,27 +132,25 @@ using namespace facebook::react;
return superAccessibilityLabel;
}
auto data = _stateTeller.getData();
if (!data.hasValue()) {
if (!_state) {
return nil;
}
return RCTNSStringFromString(data.value().attributedString.getString());
return RCTNSStringFromString(_state->getData().attributedString.getString());
}
- (NSArray *)accessibilityElements
{
auto data = _stateTeller.getData().value();
if (![_accessibilityProvider isUpToDate:data.attributedString]) {
if (![_accessibilityProvider isUpToDate:_state->getData().attributedString]) {
RCTTextLayoutManager *textLayoutManager =
(RCTTextLayoutManager *)unwrapManagedObject(data.layoutManager->getNativeTextLayoutManager());
(RCTTextLayoutManager *)unwrapManagedObject(_state->getData().layoutManager->getNativeTextLayoutManager());
CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
_accessibilityProvider = [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:data.attributedString
layoutManager:textLayoutManager
paragraphAttributes:data.paragraphAttributes
frame:frame
view:self];
_accessibilityProvider =
[[RCTParagraphComponentAccessibilityProvider alloc] initWithString:_state->getData().attributedString
layoutManager:textLayoutManager
paragraphAttributes:_state->getData().paragraphAttributes
frame:frame
view:self];
}
self.isAccessibilityElement = NO;
@@ -168,12 +164,11 @@ using namespace facebook::react;
- (SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point
{
auto data = _stateTeller.getData();
if (!data.hasValue()) {
if (!_state) {
return _eventEmitter;
}
auto textLayoutManager = data.value().layoutManager;
auto textLayoutManager = _state->getData().layoutManager;
assert(textLayoutManager && "TextLayoutManager must not be `nullptr`.");
@@ -185,7 +180,7 @@ using namespace facebook::react;
(RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
auto eventEmitter = [nativeTextLayoutManager getEventEmitterWithAttributeString:data.value().attributedString
auto eventEmitter = [nativeTextLayoutManager getEventEmitterWithAttributeString:_state->getData().attributedString
paragraphAttributes:_paragraphAttributes
frame:frame
atPoint:point];