From 987822074b87417c60f0248a1c19735e7cf0c730 Mon Sep 17 00:00:00 2001 From: Hugo Cuvillier Date: Fri, 6 Mar 2020 07:56:28 -0800 Subject: [PATCH] Back out "Use `component.className` instead of `NSStringFromClass`" Summary: Original diff broke OSS flipper. Need a new OSS release of CK first Original commit changeset: 3e7564b25610 Reviewed By: kfirapps Differential Revision: D20304743 fbshipit-source-id: 08a56359a42bc56b576d212e7cf642197a064076 --- .../FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm | 4 ++-- .../SKComponentLayoutWrapper.mm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm index 0e489fe56..99365cb4a 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm @@ -109,10 +109,10 @@ static CK::StaticMutex _mutex = CK_MUTEX_INITIALIZER; auto const canBeReusedCounter = self.flipper_canBeReusedCounter; if (canBeReusedCounter > 0) { return [NSString stringWithFormat:@"%@ (Can be reused x%lu)", - self.className, + NSStringFromClass([self class]), (unsigned long)canBeReusedCounter]; } - return self.className; + return NSStringFromClass([self class]); } - (NSString*)sonar_getDecoration { diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm index 44c707346..33d958a95 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/SKComponentLayoutWrapper.mm @@ -98,7 +98,7 @@ static CKFlexboxComponentChild findFlexboxLayoutParams( _size = layout.size; _position = position; _identifier = [parentKey stringByAppendingString:layout.component - ? layout.component.className + ? NSStringFromClass([layout.component class]) : @"(null)"]; if (_component && reuseWrapper) {