Merge pull request #5585 from GeekyAnts/release/3.4.24

Release/3.4.24

package.json

@@ -36,7 +36,7 @@
       "prettier --write"
     ]
   },
-  "version": "3.4.23",
+  "version": "3.4.24",
   "license": "MIT",
   "private": false,
   "main": "lib/commonjs/index",

src/components/composites/Popper/Popper.tsx

@@ -193,8 +193,8 @@ const PopperArrow = React.forwardRef(
     );
 
     const arrowStyles = React.useMemo(
-      () => [arrowProps.style, triangleStyle, additionalStyles, style],
-      [triangleStyle, additionalStyles, arrowProps.style, style]
+      () => [arrowProps?.style, triangleStyle, additionalStyles, style],
+      [triangleStyle, additionalStyles, arrowProps?.style, style]
     );
 
     return (

src/components/primitives/Text/index.tsx

@@ -5,7 +5,7 @@ import { useHover } from '@react-native-aria/interactions';
 import { mergeRefs } from '../../../utils/mergeRefs';
 import { makeStyledComponent } from '../../../utils/styled';
 import { useResolvedFontFamily } from '../../../hooks/useResolvedFontFamily';
-import { Text as NativeText } from 'react-native';
+import { Platform, Text as NativeText } from 'react-native';
 import { useHasResponsiveProps } from '../../../hooks/useHasResponsiveProps';
 
 const StyledText = makeStyledComponent(NativeText);
@@ -49,8 +49,9 @@ const Text = ({ children, ...props }: ITextProps, ref: any) => {
   let fontFamily = propFontFamily;
   const fontStyle = italic ? 'italic' : propFontStyle;
   const fontWeight = bold ? 'bold' : propFontWeight;
+  let resolvedFontFamily;
 
-  const resolvedFontFamily = useResolvedFontFamily({
+  resolvedFontFamily = useResolvedFontFamily({
     fontFamily,
     fontWeight: fontWeight ?? (hasTextAncestor ? undefined : 400),
     fontStyle: fontStyle ?? (hasTextAncestor ? undefined : 'normal'),
@@ -60,6 +61,18 @@ const Text = ({ children, ...props }: ITextProps, ref: any) => {
     fontFamily = resolvedFontFamily;
   }
 
+  // Need to apply fontWeight & fontStyle on web
+  if (Platform.OS === 'web') {
+    if (resolvedFontFamily) {
+      fontFamily = resolvedFontFamily;
+    }
+    resolvedFontFamily = {
+      fontFamily,
+      fontWeight: fontWeight ?? (hasTextAncestor ? undefined : 400),
+      fontStyle: fontStyle ?? (hasTextAncestor ? undefined : 'normal'),
+    };
+  }
+
   //TODO: refactor for responsive prop
   if (useHasResponsiveProps(props)) {
     return null;