jfs-components 0.1.17 → 0.1.18

package/lib/commonjs/utils/GlassFill/GlassFill.js

@@ -7,10 +7,8 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _blur = require("@react-native-community/blur");
-var _maskedView = _interopRequireDefault(require("@react-native-masked-view/masked-view"));
 var _reactNativeSvg = _interopRequireWildcard(require("react-native-svg"));
 var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const DEFAULT_FALLBACK_DARK = '#1414174a';
 const DEFAULT_FALLBACK_LIGHT = '#ffffff66';
@@ -20,32 +18,30 @@ const DEFAULT_FALLBACK_LIGHT = '#ffffff66';
 const NATIVE_BLUR_NAME = _reactNative.Platform.OS === 'android' ? 'AndroidBlurView' : 'BlurView';
 
 /**
- * Alpha stop on a layer's vertical reveal mask. `offset` is the vertical
- * position (0 = top of the surface, 1 = bottom); `opacity` is the mask alpha
- * there (0 = layer hidden / fully clear, 1 = layer fully applied).
+ * Alpha stop on the no-native-blur fallback gradient. `offset` is the vertical
+ * position (0 = top of the surface, 1 = bottom); `opacity` is the tint alpha
+ * there (0 = fully clear, 1 = full fallback color).
  *
- * Using several stops (rather than a single linear 0 → 1 ramp) lets each layer
- * EASE in, so the blur swells smoothly toward the bottom instead of appearing
- * along a hard horizontal seam. That soft S-curve is what gives the surface its
- * "glass" feel rather than a flat translucent panel.
+ * Using several stops (rather than a single linear 0 → 1 ramp) eases the tint
+ * in, so it swells smoothly toward the bottom instead of along a hard seam —
+ * the soft S-curve that gives the surface its "glass" feel.
  */
 
 /**
- * A single layer of the progressive ramp.
- *  - `stops` describe how this layer is revealed from top to bottom.
- *  - `amount` is this layer's share (0–1) of the max `blurAmount`.
+ * A single bottom-anchored band of the progressive blur stack.
+ *  - `start` is where the band begins, as a fraction from the top (0 = covers
+ *    the whole surface, 0.8 = only the bottom 20%). Each band runs from `start`
+ *    to the bottom.
+ *  - `amount` is the band's own blur strength as a share (0–1) of the peak.
  *
- * We stack just TWO layers on both platforms: a faint base blur that covers
- * most of the footer and a slightly stronger accent concentrated near the
- * bottom. Keeping the overlap shallow avoids compounding the dark tint of
- * multiple `BlurView`s (which is what made the earlier 3-layer ramp read as a
- * heavy block), while still giving a genuine variable-radius result — the blur
- * radius grows toward the bottom where the two layers overlap.
+ * Because each `BlurView` re-blurs everything rendered behind it, the bands
+ * COMPOUND where they overlap (toward the bottom), so the effective radius grows
+ * downward without any masking. The top region is covered only by the first,
+ * faint band; the bottom is covered by all of them.
  */
 
-// Base reveal: a faint trace of blur begins near the very top and grows
-// steadily downward, so the upper half still carries visible glass rather than
-// snapping clear. Also reused for the no-native-blur fallback scrim.
+// Eased tint ramp for the no-native-blur fallback scrim. A faint trace begins
+// near the very top and grows steadily downward.
 const BASE_MASK_STOPS = [{
   offset: 0.0,
   opacity: 0
@@ -62,26 +58,26 @@ const BASE_MASK_STOPS = [{
   offset: 1.0,
   opacity: 1
 }];
-const PROGRESSIVE_LAYERS = [{
-  amount: 0.65,
-  stops: BASE_MASK_STOPS
-},
-// Accent: the strongest blur, gathering over the lower portion for depth.
-{
-  amount: 1.0,
-  stops: [{
-    offset: 0.0,
-    opacity: 0
-  }, {
-    offset: 0.3,
-    opacity: 0.15
-  }, {
-    offset: 0.65,
-    opacity: 0.65
-  }, {
-    offset: 1.0,
-    opacity: 1
-  }]
+
+// Bottom-anchored blur bands (top → bottom). The first band is faint and covers
+// the whole surface so the top reads as barely-there glass; each subsequent band
+// starts lower and adds strength, compounding toward the bottom for a smooth
+// variable-radius result. Quadrature of these shares lands the bottom at ~peak.
+const PROGRESSIVE_BANDS = [{
+  start: 0.0,
+  amount: 0.18
+}, {
+  start: 0.3,
+  amount: 0.28
+}, {
+  start: 0.52,
+  amount: 0.38
+}, {
+  start: 0.7,
+  amount: 0.5
+}, {
+  start: 0.84,
+  amount: 0.6
 }];
 
 /**
@@ -114,13 +110,14 @@ const NATIVE_BLUR_SUPPORTED = (() => {
 })();
 
 /**
- * Vertical alpha-gradient mask drawn with `react-native-svg`. `MaskedView`
- * reveals its child in proportion to this mask's alpha, so feeding it an eased
- * multi-stop gradient makes the layer's blur swell in smoothly from top to
- * bottom instead of along a hard seam.
+ * Vertical color-gradient scrim drawn with `react-native-svg` — used as the
+ * no-native-blur fallback. Paints `color` at the eased per-stop alpha so the
+ * tint swells smoothly from clear (top) to full (bottom), exactly mirroring the
+ * old `MaskedView`-over-solid-color fallback but with no native-view masking.
  */
-function GradientMask({
+function GradientScrim({
   id,
+  color,
   stops
 }) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNativeSvg.default, {
@@ -135,7 +132,7 @@ function GradientMask({
         y2: "1",
         children: stops.map((s, i) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNativeSvg.Stop, {
           offset: s.offset,
-          stopColor: "#000000",
+          stopColor: color,
           stopOpacity: s.opacity
         }, i))
       })
@@ -200,38 +197,37 @@ function GlassFill({
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
         style: [_reactNative.StyleSheet.absoluteFill, style],
         pointerEvents: "none",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_maskedView.default, {
-          style: _reactNative.StyleSheet.absoluteFill,
-          maskElement: /*#__PURE__*/(0, _jsxRuntime.jsx)(GradientMask, {
-            id: `${maskId}-fb`,
-            stops: BASE_MASK_STOPS
-          }),
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-            style: [_reactNative.StyleSheet.absoluteFill, {
-              backgroundColor: fallbackColor
-            }]
-          })
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(GradientScrim, {
+          id: `${maskId}-fb`,
+          color: fallbackColor,
+          stops: BASE_MASK_STOPS
         })
       });
     }
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
       style: [_reactNative.StyleSheet.absoluteFill, style],
       pointerEvents: "none",
-      children: PROGRESSIVE_LAYERS.map((layer, i) => {
-        const amount = Math.max(1, Math.round(peakBlur * layer.amount));
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_maskedView.default, {
-          style: _reactNative.StyleSheet.absoluteFill,
-          maskElement: /*#__PURE__*/(0, _jsxRuntime.jsx)(GradientMask, {
-            id: `${maskId}-${i}`,
-            stops: layer.stops
-          }),
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_blur.BlurView, {
-            style: _reactNative.StyleSheet.absoluteFill,
-            blurType: blurType,
-            blurAmount: amount,
-            reducedTransparencyFallbackColor: fallbackColor
-          })
-        }, i);
+      children: PROGRESSIVE_BANDS.map((band, i) => {
+        const amount = Math.max(1, Math.round(peakBlur * band.amount));
+        return (
+          /*#__PURE__*/
+          // Each band is clipped to start at `band.start` and run to
+          // the bottom; its `BlurView` blurs the content (and any
+          // lower bands) behind it, so the radius compounds downward.
+          (0, _jsxRuntime.jsx)(_reactNative.View, {
+            style: [_reactNative.StyleSheet.absoluteFill, {
+              top: `${band.start * 100}%`,
+              overflow: 'hidden'
+            }],
+            pointerEvents: "none",
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_blur.BlurView, {
+              style: _reactNative.StyleSheet.absoluteFill,
+              blurType: blurType,
+              blurAmount: amount,
+              reducedTransparencyFallbackColor: fallbackColor
+            })
+          }, i)
+        );
       })
     });
   }

package/lib/module/components/AvatarGroup/AvatarGroup.js

@@ -1,18 +1,21 @@
 "use strict";
 
-import React from 'react';
+import React, { useId } from 'react';
 import { View, Platform } from 'react-native';
-import MaskedView from '@react-native-masked-view/masked-view';
-import Svg, { Path } from 'react-native-svg';
+import Svg, { Defs, Mask, Path, ForeignObject } from 'react-native-svg';
 import { getVariableByName } from '../../design-tokens/figma-variables-resolver';
 import { EMPTY_MODES, flattenChildren } from '../../utils/react-utils';
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function AvatarGroup({
   modes = EMPTY_MODES,
   children,
   style,
   ...rest
 }) {
+  // Stable, collision-free base for the per-avatar SVG mask ids so multiple
+  // groups on one screen (and multiple avatars in a group) never clash.
+  const rawId = useId();
+  const maskBaseId = `avatargroup-mask-${rawId.replace(/[^a-zA-Z0-9_-]/g, '')}`;
   const gap = getVariableByName('avatarGroup/gap', modes);
   const avatarSize = getVariableByName('avatar/size', modes);
   const avatarRadius = getVariableByName('avatar/radius', modes);
@@ -41,7 +44,11 @@ function AvatarGroup({
     y: r
   };
 
-  // Native Mask Path
+  // Native mask path: the full avatar square MINUS a circular hole where the
+  // next (overlapping) avatar sits. Drawn as a single `evenodd` path so the
+  // hole is cut out of the square. Filled WHITE because react-native-svg's
+  // `<Mask>` is a *luminance* mask (white = visible, black/absent = hidden) —
+  // the inverse of the old `@react-native-masked-view` alpha convention.
   const rectPath = `M 0 0 h ${avatarSizeInt} v ${avatarSizeInt} h -${avatarSizeInt} z`;
   const circlePath = `M ${holeCenter.x},${holeCenter.y} m -${holeRadius},0 a ${holeRadius},${holeRadius} 0 1,0 ${holeRadius * 2},0 a ${holeRadius},${holeRadius} 0 1,0 -${holeRadius * 2},0`;
   const maskPath = `${rectPath} ${circlePath}`;
@@ -99,25 +106,40 @@ function AvatarGroup({
         }, index);
       }
 
-      // Native MaskedView
+      // Native: mask the avatar with react-native-svg instead of the
+      // unmaintained `@react-native-masked-view/masked-view`, whose
+      // legacy `requireNativeComponent('RNCMaskedView')` resolves to a
+      // plain object (crashing "Element type is invalid") under the New
+      // Architecture interop. react-native-svg ships a Fabric/codegen
+      // `<Mask>` + `<ForeignObject>` that resolves on both architectures;
+      // the avatar is hosted inside the `<ForeignObject>` and revealed
+      // through the luminance mask.
+      const maskId = `${maskBaseId}-${index}`;
       return /*#__PURE__*/_jsx(View, {
         style: wrapperStyle,
-        children: /*#__PURE__*/_jsx(MaskedView, {
-          style: {
-            flex: 1,
-            height: '100%'
-          },
-          maskElement: /*#__PURE__*/_jsx(Svg, {
-            height: "100%",
-            width: "100%",
-            viewBox: `0 0 ${avatarSizeInt} ${avatarSizeInt}`,
-            children: /*#__PURE__*/_jsx(Path, {
-              d: maskPath,
-              fill: "black",
-              fillRule: "evenodd"
+        children: /*#__PURE__*/_jsxs(Svg, {
+          height: "100%",
+          width: "100%",
+          viewBox: `0 0 ${avatarSizeInt} ${avatarSizeInt}`,
+          children: [/*#__PURE__*/_jsx(Defs, {
+            children: /*#__PURE__*/_jsx(Mask, {
+              id: maskId,
+              maskUnits: "userSpaceOnUse",
+              maskContentUnits: "userSpaceOnUse",
+              children: /*#__PURE__*/_jsx(Path, {
+                d: maskPath,
+                fill: "white",
+                fillRule: "evenodd"
+              })
             })
-          }),
-          children: clonedChild
+          }), /*#__PURE__*/_jsx(ForeignObject, {
+            x: "0",
+            y: "0",
+            width: avatarSizeInt,
+            height: avatarSizeInt,
+            mask: `url(#${maskId})`,
+            children: clonedChild
+          })]
         })
       }, index);
     })

package/lib/module/components/ProductMerchandisingCard/ProductMerchandisingCard.js

@@ -1,9 +1,8 @@
 "use strict";
 
 import React, { useId, useMemo } from 'react';
-import { View, Text, Pressable, StyleSheet, Platform, Image as RNImage } from 'react-native';
-import MaskedView from '@react-native-masked-view/masked-view';
-import Svg, { Defs, LinearGradient, Stop, Rect } from 'react-native-svg';
+import { View, Text, Pressable, StyleSheet } from 'react-native';
+import Svg, { Defs, LinearGradient, Stop, Rect, Mask, Filter, FeGaussianBlur, Image as SvgImage } from 'react-native-svg';
 import { getVariableByName } from '../../design-tokens/figma-variables-resolver';
 import { EMPTY_MODES, resolveTruncation } from '../../utils/react-utils';
 import Avatar from '../Avatar/Avatar';
@@ -65,7 +64,9 @@ function ProductMerchandisingCard({
   const rawId = useId();
   const safeId = rawId.replace(/[^a-zA-Z0-9_-]/g, '');
   const scrimId = `pmc-footer-scrim-${safeId}`;
+  const blurGradientId = `pmc-footer-blurgrad-${safeId}`;
   const blurMaskId = `pmc-footer-blurmask-${safeId}`;
+  const blurFilterId = `pmc-footer-blurfilter-${safeId}`;
   const normalizedImageSource = useMemo(() => normalizeImageSource(imageSource), [imageSource]);
   const tokens = useMemo(() => resolveTokens(modes), [modes]);
   const containerStyle = {
@@ -159,57 +160,63 @@ function ProductMerchandisingCard({
       children: [normalizedImageSource != null ? /*#__PURE__*/_jsx(View, {
         style: StyleSheet.absoluteFill,
         pointerEvents: "none",
-        children: /*#__PURE__*/_jsx(MaskedView, {
-          style: StyleSheet.absoluteFill,
-          maskElement: /*#__PURE__*/_jsxs(Svg, {
-            width: "100%",
-            height: "100%",
-            children: [/*#__PURE__*/_jsx(Defs, {
-              children: /*#__PURE__*/_jsxs(LinearGradient, {
-                id: blurMaskId,
-                x1: "0",
-                y1: "0",
-                x2: "0",
-                y2: "1",
-                children: [/*#__PURE__*/_jsx(Stop, {
-                  offset: "0",
-                  stopColor: "#000000",
-                  stopOpacity: 0
-                }), /*#__PURE__*/_jsx(Stop, {
-                  offset: "0.35",
-                  stopColor: "#000000",
-                  stopOpacity: 0.5
-                }), /*#__PURE__*/_jsx(Stop, {
-                  offset: "0.7",
-                  stopColor: "#000000",
-                  stopOpacity: 0.92
-                }), /*#__PURE__*/_jsx(Stop, {
-                  offset: "1",
-                  stopColor: "#000000",
-                  stopOpacity: 1
-                })]
+        children: /*#__PURE__*/_jsxs(Svg, {
+          width: "100%",
+          height: "100%",
+          children: [/*#__PURE__*/_jsxs(Defs, {
+            children: [/*#__PURE__*/_jsx(Filter, {
+              id: blurFilterId,
+              x: "-15%",
+              y: "-15%",
+              width: "130%",
+              height: "130%",
+              children: /*#__PURE__*/_jsx(FeGaussianBlur, {
+                stdDeviation: tokens.imageBlurStdDeviation,
+                edgeMode: "duplicate"
+              })
+            }), /*#__PURE__*/_jsxs(LinearGradient, {
+              id: blurGradientId,
+              x1: "0",
+              y1: "0",
+              x2: "0",
+              y2: "1",
+              children: [/*#__PURE__*/_jsx(Stop, {
+                offset: "0",
+                stopColor: "#ffffff",
+                stopOpacity: 0
+              }), /*#__PURE__*/_jsx(Stop, {
+                offset: "0.35",
+                stopColor: "#ffffff",
+                stopOpacity: 0.5
+              }), /*#__PURE__*/_jsx(Stop, {
+                offset: "0.7",
+                stopColor: "#ffffff",
+                stopOpacity: 0.92
+              }), /*#__PURE__*/_jsx(Stop, {
+                offset: "1",
+                stopColor: "#ffffff",
+                stopOpacity: 1
+              })]
+            }), /*#__PURE__*/_jsx(Mask, {
+              id: blurMaskId,
+              children: /*#__PURE__*/_jsx(Rect, {
+                x: "0",
+                y: "0",
+                width: "100%",
+                height: "100%",
+                fill: `url(#${blurGradientId})`
               })
-            }), /*#__PURE__*/_jsx(Rect, {
-              x: "0",
-              y: "0",
-              width: "100%",
-              height: "100%",
-              fill: `url(#${blurMaskId})`
             })]
-          }),
-          children: /*#__PURE__*/_jsx(RNImage, {
-            source: normalizedImageSource,
-            blurRadius: tokens.imageBlurRadius,
-            resizeMode: "cover",
-            style: {
-              position: 'absolute',
-              left: 0,
-              right: 0,
-              bottom: 0,
-              width: '100%',
-              height
-            }
-          })
+          }), /*#__PURE__*/_jsx(SvgImage, {
+            href: normalizedImageSource,
+            x: "0",
+            y: "0",
+            width: "100%",
+            height: "100%",
+            preserveAspectRatio: "xMidYMid slice",
+            filter: `url(#${blurFilterId})`,
+            mask: `url(#${blurMaskId})`
+          })]
         })
       }) : /*#__PURE__*/_jsx(GlassFill, {
         tint: "dark",
@@ -328,19 +335,16 @@ function resolveTokens(modes) {
   const sbFamily = asStr(getVariableByName('productMerchandisingcard/specialbadge/text/fontfamily', modes), 'JioType Var');
   const sbWeight = asStr(getVariableByName('productMerchandisingcard/specialbadge/text/fontweight', modes), '500');
 
-  // `Image.blurRadius` is interpreted differently per platform — iOS applies a
-  // strong Gaussian while Android's IterativeBoxBlur is gentler at the same
-  // numeric radius — so we tune each platform to land on the same perceived
-  // "minimal" frosted strength as the Figma design.
-  const imageBlurRadius = Platform.select({
-    ios: Math.max(6, Math.round(blurRadius * 0.5)),
-    android: Math.max(12, Math.round(blurRadius * 0.95)),
-    default: Math.max(8, Math.round(blurRadius * 0.6))
-  });
+  // SVG `<FeGaussianBlur stdDeviation>` is resolution-independent and renders
+  // an identical Gaussian on iOS, Android and web — so unlike the old
+  // `Image.blurRadius` path it needs no per-platform tuning. `stdDeviation` is
+  // roughly half a perceptual "blur radius", so we scale the `blur/minimal`
+  // token down to land on the same subtle frosted strength as the design.
+  const imageBlurStdDeviation = Math.max(4, Math.round(blurRadius * 0.35));
   return {
     radius,
     blurIntensity: Math.max(0, Math.min(100, Math.round(blurRadius * BLUR_INTENSITY_FACTOR))),
-    imageBlurRadius,
+    imageBlurStdDeviation,
     header: {
       flexDirection: 'row',
       alignItems: 'flex-start',