@fluentui-react-native/experimental-avatar 0.14.19 → 0.14.20

package/CHANGELOG.json

@@ -2,7 +2,34 @@
   "name": "@fluentui-react-native/experimental-avatar",
   "entries": [
     {
-      "date": "Fri, 29 Apr 2022 21:54:04 GMT",
+      "date": "Sat, 30 Apr 2022 06:33:26 GMT",
+      "tag": "@fluentui-react-native/experimental-avatar_v0.14.20",
+      "version": "0.14.20",
+      "comments": {
+        "patch": [
+          {
+            "author": "mischreiber@microsoft.com",
+            "package": "@fluentui-react-native/experimental-avatar",
+            "commit": "c9c1e71e25fac45d2266ee2bea387dfa0d05598b",
+            "comment": "Move to official 0.5.0 release"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/experimental-avatar",
+            "comment": "Bump @fluentui-react-native/icon to v0.11.20",
+            "commit": "c9c1e71e25fac45d2266ee2bea387dfa0d05598b"
+          },
+          {
+            "author": "beachball",
+            "package": "@fluentui-react-native/experimental-avatar",
+            "comment": "Bump @fluentui-react-native/interactive-hooks to v0.15.5",
+            "commit": "c9c1e71e25fac45d2266ee2bea387dfa0d05598b"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 29 Apr 2022 21:54:17 GMT",
       "tag": "@fluentui-react-native/experimental-avatar_v0.14.19",
       "version": "0.14.19",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Change Log - @fluentui-react-native/experimental-avatar
 
-This log was last generated on Fri, 29 Apr 2022 21:54:04 GMT and should not be manually modified.
+This log was last generated on Sat, 30 Apr 2022 06:33:26 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.14.20
+
+Sat, 30 Apr 2022 06:33:26 GMT
+
+### Patches
+
+- Move to official 0.5.0 release (mischreiber@microsoft.com)
+- Bump @fluentui-react-native/icon to v0.11.20
+- Bump @fluentui-react-native/interactive-hooks to v0.15.5
+
 ## 0.14.19
 
-Fri, 29 Apr 2022 21:54:04 GMT
+Fri, 29 Apr 2022 21:54:17 GMT
 
 ### Patches
 

package/FRNAvatar.podspec

@@ -16,13 +16,13 @@ Pod::Spec.new do |s|
 
   s.pod_target_xcconfig = { 'BUILD_LIBRARY_FOR_DISTRIBUTION' => 'YES', 'OTHER_SWIFT_FLAGS' => '-gline-tables-only' }
 
-  s.ios.deployment_target = "13.0"
+  s.ios.deployment_target = "14.0"
   s.ios.source_files      = "ios/*.{swift,h,m}"
-  s.ios.dependency 'MicrosoftFluentUI/Avatar_ios', '0.3.0'
+  s.ios.dependency 'MicrosoftFluentUI/Avatar_ios', '0.5.0'
 
   s.osx.deployment_target = "10.15"
   s.osx.source_files      = "macos/*.{swift,h,m}"
-  s.osx.dependency 'MicrosoftFluentUI', '0.3.0'
+  s.osx.dependency 'MicrosoftFluentUI', '0.5.0'
 
   s.dependency 'React'
 end

package/ios/AvatarViewManager.swift

@@ -5,15 +5,7 @@ import FluentUI
 class AvatarViewManager: RCTViewManager {
 
 	override func view()->UIView! {
-		let viewWrapper = MSFAvatar()
-        let view = viewWrapper.view
-
-        // Store the key value pair for lookup when we set props
-        let storage = MSFAvatar.storage()
-        let key = NSValue(nonretainedObject: view)
-        storage[key] = viewWrapper
-
-		return view
+		return MSFAvatar()
 	}
 
 	override class func requiresMainQueueSetup() -> Bool {

package/ios/FRNAvatarViewManager.h

@@ -1,3 +1 @@
 #import <React/RCTViewManager.h>
-
-#import "FRNAvatarStorage.h"

package/ios/FRNAvatarViewManager.m

@@ -1,31 +1,7 @@
 #import <React/RCTViewManager.h>
 
-#import "FRNAvatarStorage.h"
-
 @import FluentUI;
 
-// Macros inspired by https://betterprogramming.pub/react-native-meets-swiftui-d1606a8e1681
-
-#define RCT_EXPORT_SWIFTUI_PROPERTY(name, type, proxyClass) \
-RCT_REMAP_VIEW_PROPERTY(name, __custom__, type)  \
-- (void)set_##name:(id)json forView:(UIView *)view withDefaultView:(UIView *)defaultView RCT_DYNAMIC { \
-    NSMutableDictionary *storage = [proxyClass storage]; \
-    proxyClass *proxy = storage[[NSValue valueWithNonretainedObject:view]];  \
-    proxy.state.name = [RCTConvert type:json]; \
-}
-
-#define RCT_REMAP_SWIFTUI_PROPERTY(name, keyPath, type, proxyClass) \
-RCT_REMAP_VIEW_PROPERTY(name, __custom__, type)  \
-- (void)set_##name:(id)json forView:(UIView *)view withDefaultView:(UIView *)defaultView RCT_DYNAMIC { \
-    NSMutableDictionary *storage = [proxyClass storage]; \
-    proxyClass *proxy = storage[[NSValue valueWithNonretainedObject:view]];  \
-    proxy.state.keyPath = [RCTConvert type:json]; \
-}
-
-#define RCT_EXPORT_CUSTOM_SWIFTUI_PROPERTY(name, type, proxyClass) \
-RCT_REMAP_VIEW_PROPERTY(name, __custom__, type)  \
-- (void)set_##name:(id)json forView:(UIView *)view withDefaultView:(UIView *)defaultView RCT_DYNAMIC
-
 NS_ASSUME_NONNULL_BEGIN
 
 @implementation RCTConvert (FRNAvatarAdditions)
@@ -63,39 +39,33 @@ RCT_ENUM_CONVERTER(MSFAvatarStyle, (@{
 
 @interface RCT_EXTERN_MODULE(FRNAvatarViewManager, RCTViewManager)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(primaryText, NSString, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(primaryText, state.primaryText, NSString)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(secondaryText, NSString, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(secondaryText, state.secondaryText, NSString)
 
-RCT_REMAP_SWIFTUI_PROPERTY(imageSource, image, UIImage, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(imageSource, state.image, UIImage)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(ringColor, UIColor, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(ringColor, state.ringColor, UIColor)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(foregroundColor, UIColor, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(foregroundColor, state.foregroundColor, UIColor)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(backgroundColor, UIColor, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(backgroundColor, state.backgroundColor, UIColor)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(presence, MSFAvatarPresence, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(presence, state.presence, MSFAvatarPresence)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(isRingVisible, BOOL, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(isRingVisible, state.isRingVisible, BOOL)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(isTransparent, BOOL, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(isTransparent, state.isTransparent, BOOL)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(isOutOfOffice, BOOL, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(isOutOfOffice, state.isOutOfOffice, BOOL)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(size, MSFAvatarSize, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(size, state.size, MSFAvatarSize)
 
-RCT_REMAP_SWIFTUI_PROPERTY(avatarStyle, style, MSFAvatarStyle, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(avatarStyle, state.style, MSFAvatarStyle)
 
-RCT_EXPORT_SWIFTUI_PROPERTY(hasRingInnerGap, BOOL, MSFAvatar)
+RCT_REMAP_VIEW_PROPERTY(hasRingInnerGap, state.hasRingInnerGap, BOOL)
 
-RCT_EXPORT_CUSTOM_SWIFTUI_PROPERTY(customBorderImageSource, UIImage, MSFAvatar)
-{
-    NSMutableDictionary *storage = [MSFAvatar storage];
-    MSFAvatar *viewWrapper = storage[[NSValue valueWithNonretainedObject:view]];
-    UIImage *customBorderImage = [RCTConvert UIImage:json];
-    [[viewWrapper state] setImageBasedRingColor:customBorderImage];
-}
+RCT_REMAP_VIEW_PROPERTY(customBorderImageSource, state.imageBasedRingColor, UIImage)
 
 @end
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui-react-native/experimental-avatar",
-  "version": "0.14.19",
+  "version": "0.14.20",
   "description": "A cross-platform Avatar component using the Fluent Design System. Currently only implemented on iOS",
   "license": "MIT",
   "author": "Microsoft <fluentuinativeowners@microsoft.com>",

package/ios/FRNAvatarStorage.h

@@ -1,16 +0,0 @@
-#ifndef FRNAvatarStorage_h
-#define FRNAvatarStorage_h
-
-@import FluentUI;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MSFAvatar (FRNAvatarViewManagerAdditons)
-
-+ (NSMutableDictionary *)storage;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#endif /* FRNAvatarStorage_h */

package/ios/FRNAvatarStorage.m

@@ -1,23 +0,0 @@
-#import <Foundation/Foundation.h>
-#import "FRNAvatarStorage.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@implementation MSFAvatar (FRNAvatarViewManagerAdditons)
-
-static NSMutableDictionary *s_sharedInstance;
-
-+(NSMutableDictionary *)storage
-{
-    if (s_sharedInstance == nil) {
-        static dispatch_once_t onceToken;
-        dispatch_once(&onceToken, ^{
-            s_sharedInstance = [NSMutableDictionary new];
-        });
-    }
-    return s_sharedInstance;
-}
-
-@end
-
-NS_ASSUME_NONNULL_END