@react-navigation/native 8.0.0-alpha.4 → 8.0.0-alpha.5

package/android/build/generated/source/codegen/java/com/facebook/react/viewmanagers/ReactNavigationSFSymbolViewManagerDelegate.java

@@ -32,6 +32,48 @@ public class ReactNavigationSFSymbolViewManagerDelegate<T extends View, U extend
       case "color":
         mViewManager.setColor(view, ColorPropConverter.getColor(value, view.getContext()));
         break;
+      case "weight":
+        mViewManager.setWeight(view, value == null ? 0 : ((Double) value).intValue());
+        break;
+      case "scale":
+        mViewManager.setScale(view, value == null ? null : (String) value);
+        break;
+      case "mode":
+        mViewManager.setMode(view, value == null ? null : (String) value);
+        break;
+      case "colorPrimary":
+        mViewManager.setColorPrimary(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "colorSecondary":
+        mViewManager.setColorSecondary(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "colorTertiary":
+        mViewManager.setColorTertiary(view, ColorPropConverter.getColor(value, view.getContext()));
+        break;
+      case "animation":
+        mViewManager.setAnimation(view, value == null ? null : (String) value);
+        break;
+      case "animationRepeating":
+        mViewManager.setAnimationRepeating(view, value == null ? false : (boolean) value);
+        break;
+      case "animationRepeatCount":
+        mViewManager.setAnimationRepeatCount(view, value == null ? 0 : ((Double) value).intValue());
+        break;
+      case "animationSpeed":
+        mViewManager.setAnimationSpeed(view, value == null ? Float.NaN : ((Double) value).floatValue());
+        break;
+      case "animationWholeSymbol":
+        mViewManager.setAnimationWholeSymbol(view, value == null ? false : (boolean) value);
+        break;
+      case "animationDirection":
+        mViewManager.setAnimationDirection(view, value == null ? null : (String) value);
+        break;
+      case "animationReversing":
+        mViewManager.setAnimationReversing(view, value == null ? false : (boolean) value);
+        break;
+      case "animationCumulative":
+        mViewManager.setAnimationCumulative(view, value == null ? false : (boolean) value);
+        break;
       default:
         super.setProperty(view, propName, value);
     }

package/android/build/generated/source/codegen/java/com/facebook/react/viewmanagers/ReactNavigationSFSymbolViewManagerInterface.java

@@ -17,4 +17,18 @@ public interface ReactNavigationSFSymbolViewManagerInterface<T extends View> ext
   void setName(T view, @Nullable String value);
   void setSize(T view, float value);
   void setColor(T view, @Nullable Integer value);
+  void setWeight(T view, int value);
+  void setScale(T view, @Nullable String value);
+  void setMode(T view, @Nullable String value);
+  void setColorPrimary(T view, @Nullable Integer value);
+  void setColorSecondary(T view, @Nullable Integer value);
+  void setColorTertiary(T view, @Nullable Integer value);
+  void setAnimation(T view, @Nullable String value);
+  void setAnimationRepeating(T view, boolean value);
+  void setAnimationRepeatCount(T view, int value);
+  void setAnimationSpeed(T view, float value);
+  void setAnimationWholeSymbol(T view, boolean value);
+  void setAnimationDirection(T view, @Nullable String value);
+  void setAnimationReversing(T view, boolean value);
+  void setAnimationCumulative(T view, boolean value);
 }

package/android/build/generated/source/codegen/jni/react/renderer/components/ReactNavigationSpec/Props.cpp

@@ -70,7 +70,21 @@ ReactNavigationSFSymbolViewProps::ReactNavigationSFSymbolViewProps(
 
     name(convertRawProp(context, rawProps, "name", sourceProps.name, {})),
     size(convertRawProp(context, rawProps, "size", sourceProps.size, {0.0})),
-    color(convertRawProp(context, rawProps, "color", sourceProps.color, {})) {}
+    color(convertRawProp(context, rawProps, "color", sourceProps.color, {})),
+    weight(convertRawProp(context, rawProps, "weight", sourceProps.weight, {0})),
+    scale(convertRawProp(context, rawProps, "scale", sourceProps.scale, {})),
+    mode(convertRawProp(context, rawProps, "mode", sourceProps.mode, {})),
+    colorPrimary(convertRawProp(context, rawProps, "colorPrimary", sourceProps.colorPrimary, {})),
+    colorSecondary(convertRawProp(context, rawProps, "colorSecondary", sourceProps.colorSecondary, {})),
+    colorTertiary(convertRawProp(context, rawProps, "colorTertiary", sourceProps.colorTertiary, {})),
+    animation(convertRawProp(context, rawProps, "animation", sourceProps.animation, {})),
+    animationRepeating(convertRawProp(context, rawProps, "animationRepeating", sourceProps.animationRepeating, {false})),
+    animationRepeatCount(convertRawProp(context, rawProps, "animationRepeatCount", sourceProps.animationRepeatCount, {0})),
+    animationSpeed(convertRawProp(context, rawProps, "animationSpeed", sourceProps.animationSpeed, {0.0})),
+    animationWholeSymbol(convertRawProp(context, rawProps, "animationWholeSymbol", sourceProps.animationWholeSymbol, {false})),
+    animationDirection(convertRawProp(context, rawProps, "animationDirection", sourceProps.animationDirection, {})),
+    animationReversing(convertRawProp(context, rawProps, "animationReversing", sourceProps.animationReversing, {false})),
+    animationCumulative(convertRawProp(context, rawProps, "animationCumulative", sourceProps.animationCumulative, {false})) {}
     
 #ifdef RN_SERIALIZABLE_STATE
 ComponentName ReactNavigationSFSymbolViewProps::getDiffPropsImplementationTarget() const {
@@ -99,6 +113,62 @@ folly::dynamic ReactNavigationSFSymbolViewProps::getDiffProps(
   if (color != oldProps->color) {
     result["color"] = *color;
   }
+    
+  if (weight != oldProps->weight) {
+    result["weight"] = weight;
+  }
+    
+  if (scale != oldProps->scale) {
+    result["scale"] = scale;
+  }
+    
+  if (mode != oldProps->mode) {
+    result["mode"] = mode;
+  }
+    
+  if (colorPrimary != oldProps->colorPrimary) {
+    result["colorPrimary"] = *colorPrimary;
+  }
+    
+  if (colorSecondary != oldProps->colorSecondary) {
+    result["colorSecondary"] = *colorSecondary;
+  }
+    
+  if (colorTertiary != oldProps->colorTertiary) {
+    result["colorTertiary"] = *colorTertiary;
+  }
+    
+  if (animation != oldProps->animation) {
+    result["animation"] = animation;
+  }
+    
+  if (animationRepeating != oldProps->animationRepeating) {
+    result["animationRepeating"] = animationRepeating;
+  }
+    
+  if (animationRepeatCount != oldProps->animationRepeatCount) {
+    result["animationRepeatCount"] = animationRepeatCount;
+  }
+    
+  if ((animationSpeed != oldProps->animationSpeed) && !(std::isnan(animationSpeed) && std::isnan(oldProps->animationSpeed))) {
+    result["animationSpeed"] = animationSpeed;
+  }
+    
+  if (animationWholeSymbol != oldProps->animationWholeSymbol) {
+    result["animationWholeSymbol"] = animationWholeSymbol;
+  }
+    
+  if (animationDirection != oldProps->animationDirection) {
+    result["animationDirection"] = animationDirection;
+  }
+    
+  if (animationReversing != oldProps->animationReversing) {
+    result["animationReversing"] = animationReversing;
+  }
+    
+  if (animationCumulative != oldProps->animationCumulative) {
+    result["animationCumulative"] = animationCumulative;
+  }
   return result;
 }
 #endif

package/android/build/generated/source/codegen/jni/react/renderer/components/ReactNavigationSpec/Props.h

@@ -107,6 +107,20 @@ class ReactNavigationSFSymbolViewProps final : public ViewProps {
   std::string name{};
   Float size{0.0};
   SharedColor color{};
+  int weight{0};
+  std::string scale{};
+  std::string mode{};
+  SharedColor colorPrimary{};
+  SharedColor colorSecondary{};
+  SharedColor colorTertiary{};
+  std::string animation{};
+  bool animationRepeating{false};
+  int animationRepeatCount{0};
+  Float animationSpeed{0.0};
+  bool animationWholeSymbol{false};
+  std::string animationDirection{};
+  bool animationReversing{false};
+  bool animationCumulative{false};
 
   #ifdef RN_SERIALIZABLE_STATE
   ComponentName getDiffPropsImplementationTarget() const override;

package/android/build/generated/source/codegen/schema.json

@@ -1 +1 @@
-{"libraryName":"","modules":{"ReactNavigationMaterialSymbolView":{"type":"Component","components":{"ReactNavigationMaterialSymbolView":{"extendsProps":[{"type":"ReactNativeBuiltInType","knownTypeName":"ReactNativeCoreViewProps"}],"events":[],"props":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"variant","optional":true,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"weight","optional":true,"typeAnnotation":{"type":"Int32EnumTypeAnnotation","default":0,"options":[0,100,200,300,400,500,600,700]}},{"name":"size","optional":false,"typeAnnotation":{"type":"FloatTypeAnnotation","default":0}},{"name":"color","optional":false,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}}],"commands":[]}}},"NativeMaterialSymbolModule":{"type":"NativeModule","aliasMap":{},"enumMap":{},"spec":{"eventEmitters":[],"methods":[{"name":"getImageSource","optional":false,"typeAnnotation":{"type":"FunctionTypeAnnotation","returnTypeAnnotation":{"type":"StringTypeAnnotation"},"params":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation"}},{"name":"variant","optional":false,"typeAnnotation":{"type":"NullableTypeAnnotation","typeAnnotation":{"type":"StringTypeAnnotation"}}},{"name":"weight","optional":false,"typeAnnotation":{"type":"NullableTypeAnnotation","typeAnnotation":{"type":"UnionTypeAnnotation","memberType":"NumberTypeAnnotation"}}},{"name":"size","optional":false,"typeAnnotation":{"type":"NumberTypeAnnotation"}},{"name":"color","optional":false,"typeAnnotation":{"type":"GenericObjectTypeAnnotation"}}]}}]},"moduleName":"ReactNavigationMaterialSymbolModule"},"ReactNavigationSFSymbolView":{"type":"Component","components":{"ReactNavigationSFSymbolView":{"extendsProps":[{"type":"ReactNativeBuiltInType","knownTypeName":"ReactNativeCoreViewProps"}],"events":[],"props":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"size","optional":false,"typeAnnotation":{"type":"FloatTypeAnnotation","default":0}},{"name":"color","optional":false,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}}],"commands":[]}}}}}
+{"libraryName":"","modules":{"ReactNavigationMaterialSymbolView":{"type":"Component","components":{"ReactNavigationMaterialSymbolView":{"extendsProps":[{"type":"ReactNativeBuiltInType","knownTypeName":"ReactNativeCoreViewProps"}],"events":[],"props":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"variant","optional":true,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"weight","optional":true,"typeAnnotation":{"type":"Int32EnumTypeAnnotation","default":0,"options":[0,100,200,300,400,500,600,700]}},{"name":"size","optional":false,"typeAnnotation":{"type":"FloatTypeAnnotation","default":0}},{"name":"color","optional":false,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}}],"commands":[]}}},"NativeMaterialSymbolModule":{"type":"NativeModule","aliasMap":{},"enumMap":{},"spec":{"eventEmitters":[],"methods":[{"name":"getImageSource","optional":false,"typeAnnotation":{"type":"FunctionTypeAnnotation","returnTypeAnnotation":{"type":"StringTypeAnnotation"},"params":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation"}},{"name":"variant","optional":false,"typeAnnotation":{"type":"NullableTypeAnnotation","typeAnnotation":{"type":"StringTypeAnnotation"}}},{"name":"weight","optional":false,"typeAnnotation":{"type":"NullableTypeAnnotation","typeAnnotation":{"type":"UnionTypeAnnotation","memberType":"NumberTypeAnnotation"}}},{"name":"size","optional":false,"typeAnnotation":{"type":"NumberTypeAnnotation"}},{"name":"color","optional":false,"typeAnnotation":{"type":"GenericObjectTypeAnnotation"}}]}}]},"moduleName":"ReactNavigationMaterialSymbolModule"},"ReactNavigationSFSymbolView":{"type":"Component","components":{"ReactNavigationSFSymbolView":{"extendsProps":[{"type":"ReactNativeBuiltInType","knownTypeName":"ReactNativeCoreViewProps"}],"events":[],"props":[{"name":"name","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"size","optional":false,"typeAnnotation":{"type":"FloatTypeAnnotation","default":0}},{"name":"color","optional":true,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}},{"name":"weight","optional":false,"typeAnnotation":{"type":"Int32TypeAnnotation","default":0}},{"name":"scale","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"mode","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"colorPrimary","optional":true,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}},{"name":"colorSecondary","optional":true,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}},{"name":"colorTertiary","optional":true,"typeAnnotation":{"type":"ReservedPropTypeAnnotation","name":"ColorPrimitive"}},{"name":"animation","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"animationRepeating","optional":false,"typeAnnotation":{"type":"BooleanTypeAnnotation","default":false}},{"name":"animationRepeatCount","optional":false,"typeAnnotation":{"type":"Int32TypeAnnotation","default":0}},{"name":"animationSpeed","optional":false,"typeAnnotation":{"type":"FloatTypeAnnotation","default":0}},{"name":"animationWholeSymbol","optional":false,"typeAnnotation":{"type":"BooleanTypeAnnotation","default":false}},{"name":"animationDirection","optional":false,"typeAnnotation":{"type":"StringTypeAnnotation","default":null}},{"name":"animationReversing","optional":false,"typeAnnotation":{"type":"BooleanTypeAnnotation","default":false}},{"name":"animationCumulative","optional":false,"typeAnnotation":{"type":"BooleanTypeAnnotation","default":false}}],"commands":[]}}}}}

package/android/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-10
+11
 0

package/android/src/main/java/org/reactnavigation/MaterialSymbolView.kt

@@ -31,32 +31,38 @@ class MaterialSymbolView @JvmOverloads constructor(
 
   fun setName(name: String) {
     text = name
+
+    invalidate()
   }
 
   fun setVariant(variant: String) {
-    val resolvedVariant = variant.ifEmpty { null }
-
-    if (this.variant == resolvedVariant) {
+    if (this.variant == variant) {
       return
     }
 
-    this.variant = resolvedVariant
+    this.variant = variant
+
     updateTypeface()
   }
 
   fun setWeight(weight: Int) {
-    val resolvedWeight = weight.takeIf { it != 0 }
-
-    if (this.weight == resolvedWeight) {
+    if (this.weight == weight) {
       return
     }
 
-    this.weight = resolvedWeight
+    this.weight = weight
+
     updateTypeface()
   }
 
   private fun updateTypeface() {
-    setTypeface(MaterialSymbolTypeface.get(context, variant, weight).typeface)
+    setTypeface(
+      MaterialSymbolTypeface.get(
+        context,
+        variant?.ifEmpty { null },
+        weight.takeIf { it != 0 }).typeface
+    )
+
     invalidate()
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-navigation/native",
   "description": "React Native integration for React Navigation",
-  "version": "8.0.0-alpha.4",
+  "version": "8.0.0-alpha.5",
   "keywords": [
     "react-native",
     "react-navigation",
@@ -107,5 +107,5 @@
       }
     }
   },
-  "gitHead": "cd1c673cd6b8f43b992b76e8ed6cf6c5c85bdd6c"
+  "gitHead": "e70fcf951732df83d28fe5157408974346a1abbc"
 }