fluent-styles 1.62.1 → 1.62.2

package/src/circularProgress/index.tsx

@@ -6,7 +6,6 @@ import React, {
 import {
   Animated,
   Easing,
-  StyleSheet,
 } from 'react-native'
 import Svg, { Circle, Defs, LinearGradient, Stop } from 'react-native-svg'
 
@@ -54,38 +53,41 @@ export interface StyledCircularProgressProps {
   colors?: Partial<CircularProgressColors>
 
   /**
-   * Controls how built-in text is arranged.
-   * - 'stacked': display text first, then label / sublabel underneath
-   * - 'center': display text, label, and sublabel are centered inside the ring
-   * @default 'stacked'
+   * 'inside'  — percentage / label rendered centred inside the ring (default)
+   * 'stacked' — text sits below the ring
+   * 'center'  — alias for 'inside' (backwards-compat)
    */
-  contentPosition?: 'center' | 'stacked'
+  contentPosition?: 'inside' | 'center' | 'stacked'
 
   children?: React.ReactNode
 }
 
+// ─── Size presets ─────────────────────────────────────────────────────────────
+
 const SIZE_MAP: Record<
   CircularProgressSize,
   { diameter: number; stroke: number; primaryFont: number; secondaryFont: number }
 > = {
-  xs: { diameter: 48, stroke: 4, primaryFont: 11, secondaryFont: 8 },
-  sm: { diameter: 64, stroke: 5, primaryFont: 13, secondaryFont: 9 },
-  md: { diameter: 80, stroke: 6, primaryFont: 15, secondaryFont: 10 },
+  xs: { diameter: 48,  stroke: 4, primaryFont: 11, secondaryFont: 8  },
+  sm: { diameter: 64,  stroke: 5, primaryFont: 13, secondaryFont: 9  },
+  md: { diameter: 80,  stroke: 6, primaryFont: 15, secondaryFont: 10 },
   lg: { diameter: 100, stroke: 7, primaryFont: 18, secondaryFont: 11 },
   xl: { diameter: 128, stroke: 8, primaryFont: 22, secondaryFont: 12 },
 }
 
 const DEFAULT_COLORS: CircularProgressColors = {
-  arc: theme.colors.indigo?.[500] ?? '#6366f1',
-  track: theme.colors.gray[200],
-  label: theme.colors.gray[800],
-  sublabel: theme.colors.gray[400],
+  arc:          theme.colors.indigo?.[500]  ?? '#6366f1',
+  track:        theme.colors.gray[200],
+  label:        theme.colors.gray[800],
+  sublabel:     theme.colors.gray[400],
   gradientFrom: theme.colors.violet?.[500] ?? '#8b5cf6',
-  gradientTo: theme.colors.cyan?.[400] ?? '#22d3ee',
+  gradientTo:   theme.colors.cyan?.[400]   ?? '#22d3ee',
 }
 
 const AnimatedCircle = Animated.createAnimatedComponent(Circle)
 
+// ─── Component ────────────────────────────────────────────────────────────────
+
 export const StyledCircularProgress: React.FC<StyledCircularProgressProps> = ({
   value,
   total = 100,
@@ -100,25 +102,25 @@ export const StyledCircularProgress: React.FC<StyledCircularProgressProps> = ({
   animated = true,
   duration = 900,
   colors: colorOverrides,
-  contentPosition = 'stacked',
+  contentPosition = 'inside',
   children,
 }) => {
-  const preset = SIZE_MAP[size]
-  const diameter = diameterProp ?? preset.diameter
+  const preset      = SIZE_MAP[size]
+  const diameter    = diameterProp    ?? preset.diameter
   const strokeWidth = strokeWidthProp ?? preset.stroke
 
   const isDashboard = variant === 'dashboard'
 
-  const radius = (diameter - strokeWidth) / 2
+  const radius       = (diameter - strokeWidth) / 2
   const circumference = 2 * Math.PI * radius
-  const arcLength = isDashboard ? circumference / 2 : circumference
+  const arcLength    = isDashboard ? circumference / 2 : circumference
 
   const colors: CircularProgressColors = useMemo(
     () => (colorOverrides ? { ...DEFAULT_COLORS, ...colorOverrides } : DEFAULT_COLORS),
-    [colorOverrides]
+    [colorOverrides],
   )
 
-  const clamped = Math.min(Math.max(value, 0), total)
+  const clamped  = Math.min(Math.max(value, 0), total)
   const fraction = total > 0 ? clamped / total : 0
 
   const progress = useRef(new Animated.Value(animated ? 0 : fraction)).current
@@ -128,59 +130,117 @@ export const StyledCircularProgress: React.FC<StyledCircularProgressProps> = ({
       progress.setValue(fraction)
       return
     }
-
     Animated.timing(progress, {
-      toValue: fraction,
+      toValue:         fraction,
       duration,
-      easing: Easing.out(Easing.cubic),
+      easing:          Easing.out(Easing.cubic),
       useNativeDriver: false,
     }).start()
   }, [fraction, animated, duration, progress])
 
   const strokeDashoffset = progress.interpolate({
-    inputRange: [0, 1],
+    inputRange:  [0, 1],
     outputRange: [arcLength, 0],
   })
 
-  const center = diameter / 2
+  const center     = diameter / 2
   const gradientId = `cpGrad-${Math.round(diameter)}-${variant}`
 
   const centreText = useMemo(() => {
     switch (display) {
-      case 'percent':
-        return `${Math.round(fraction * 100)}%`
-      case 'fraction':
-        return `${clamped}/${total}`
-      case 'value':
-        return String(clamped)
-      case 'label':
-        return label ?? ''
-      case 'none':
-        return null
-      default:
-        return null
+      case 'percent':  return `${Math.round(fraction * 100)}%`
+      case 'fraction': return `${clamped}/${total}`
+      case 'value':    return String(clamped)
+      case 'label':    return label ?? ''
+      case 'none':     return null
+      default:         return null
     }
   }, [display, fraction, clamped, total, label])
 
-  const arcStroke = variant === 'gradient' ? `url(#${gradientId})` : colors.arc
+  const arcStroke    = variant === 'gradient' ? `url(#${gradientId})` : colors.arc
   const trackOpacity = variant === 'ghost' ? 0 : 1
-  const trackDash = isDashboard ? [arcLength, circumference - arcLength] : undefined
+  const trackDash    = isDashboard ? [arcLength, circumference - arcLength] : undefined
+
+  // 'inside' and 'center' both mean text lives inside the ring
+  const isInside = contentPosition === 'inside' || contentPosition === 'center'
 
-  const dashboardTextOffset = isDashboard ? -(diameter / 4) : 0
+  // ── SVG height for dashboard variant ──────────────────────────────────────
+  const svgHeight    = isDashboard ? diameter / 2 + strokeWidth : diameter
+  const containerH   = isDashboard ? diameter / 2 + strokeWidth : diameter
+
+  // ── Text overlay rendered inside the ring ─────────────────────────────────
+  const renderInsideText = () => {
+    if (children) return null   // custom children take over
 
- const renderTextBlock = () => {
-  if (contentPosition === 'center') {
     return (
       <Stack
         position="absolute"
-        left={strokeWidth + 6}
-        right={strokeWidth + 6}
         top={0}
-        bottom={0}
+        left={0}
+        width={diameter}
+        height={containerH}
         alignItems="center"
         justifyContent="center"
-        gap={1}
         pointerEvents="none"
+      >
+        <Stack
+          alignItems="center"
+          justifyContent="center"
+          gap={2}
+          paddingBottom={isDashboard ? strokeWidth + 4 : 0}
+        >
+          {centreText !== null && centreText !== '' && (
+            <StyledText
+              fontSize={preset.primaryFont}
+              fontWeight={theme.fontWeight.bold}
+              color={colors.label}
+              lineHeight={preset.primaryFont + 3}
+              textAlign="center"
+            >
+              {centreText}
+            </StyledText>
+          )}
+
+          {display !== 'label' && display !== 'none' && !!label && (
+            <StyledText
+              fontSize={preset.secondaryFont}
+              color={colors.sublabel}
+              lineHeight={preset.secondaryFont + 2}
+              textAlign="center"
+            >
+              {label}
+            </StyledText>
+          )}
+
+          {!!sublabel && (
+            <StyledText
+              fontSize={Math.max(preset.secondaryFont - 1, 8)}
+              color={colors.sublabel}
+              lineHeight={preset.secondaryFont + 1}
+              textAlign="center"
+            >
+              {sublabel}
+            </StyledText>
+          )}
+        </Stack>
+      </Stack>
+    )
+  }
+
+  // ── Text block rendered below the ring ────────────────────────────────────
+  const renderStackedText = () => {
+    if (children) return null
+
+    const showLabel    = display !== 'label' && display !== 'none' && !!label
+    const showSublabel = !!sublabel
+
+    return (
+      <Stack
+        alignItems="center"
+        justifyContent="center"
+        gap={1}
+        marginTop={isDashboard ? -(diameter / 4) : 0}
+        paddingHorizontal={strokeWidth + 4}
       >
         {centreText !== null && centreText !== '' && (
           <StyledText
@@ -194,7 +254,7 @@ export const StyledCircularProgress: React.FC<StyledCircularProgressProps> = ({
           </StyledText>
         )}
 
-        {!!label && (
+        {showLabel && (
           <StyledText
             fontSize={preset.secondaryFont}
             color={colors.sublabel}
@@ -205,11 +265,13 @@ export const StyledCircularProgress: React.FC<StyledCircularProgressProps> = ({
           </StyledText>
         )}
 
-        {!!sublabel && (
+        {showSublabel && (
           <StyledText
-            fontSize={Math.max(preset.secondaryFont - 1, 8)}
+            fontSize={showLabel
+              ? Math.max(preset.secondaryFont - 1, 8)
+              : preset.secondaryFont}
             color={colors.sublabel}
-            lineHeight={preset.secondaryFont + 1}
+            lineHeight={preset.secondaryFont + 2}
             textAlign="center"
           >
             {sublabel}
@@ -219,131 +281,82 @@ export const StyledCircularProgress: React.FC<StyledCircularProgressProps> = ({
     )
   }
 
-  const showSecondLine = display !== 'label' && display !== 'none' && !!label
-  const showSubLabel = !!sublabel
-
-  return (
-    <Stack
-      alignItems="center"
-      justifyContent="center"
-      gap={1}
-      marginTop={dashboardTextOffset}
-      paddingHorizontal={strokeWidth + 4}
-    >
-      {centreText !== null && centreText !== '' && (
-        <StyledText
-          fontSize={preset.primaryFont}
-          fontWeight={theme.fontWeight.bold}
-          color={colors.label}
-          lineHeight={preset.primaryFont + 3}
-          textAlign="center"
-        >
-          {centreText}
-        </StyledText>
-      )}
-
-      {showSecondLine && (
-        <StyledText
-          fontSize={preset.secondaryFont}
-          color={colors.sublabel}
-          lineHeight={preset.secondaryFont + 2}
-          textAlign="center"
-        >
-          {label}
-        </StyledText>
-      )}
-
-      {showSubLabel && !showSecondLine && (
-        <StyledText
-          fontSize={preset.secondaryFont}
-          color={colors.sublabel}
-          lineHeight={preset.secondaryFont + 2}
-          textAlign="center"
-        >
-          {sublabel}
-        </StyledText>
-      )}
-
-      {showSubLabel && showSecondLine && (
-        <StyledText
-          fontSize={Math.max(preset.secondaryFont - 1, 8)}
-          color={colors.sublabel}
-          lineHeight={preset.secondaryFont + 1}
-          textAlign="center"
-        >
-          {sublabel}
-        </StyledText>
-      )}
-    </Stack>
-  )
-}
+  // ─────────────────────────────────────────────────────────────────────────
 
   return (
     <Stack
       width={diameter}
-      height={isDashboard ? diameter / 2 + strokeWidth : diameter}
+      height={isInside ? containerH : undefined}
       alignItems="center"
       justifyContent="center"
-        position="relative"
+      position="relative"
     >
-      <Stack style={S.svg_wrap}>
-        <Svg
-          width={diameter}
-          height={diameter}
-          style={isDashboard ? { marginTop: -(diameter / 2) } : undefined}
-        >
-          {variant === 'gradient' && (
-            <Defs>
-              <LinearGradient id={gradientId} x1="0%" y1="0%" x2="100%" y2="0%">
-                <Stop offset="0%" stopColor={colors.gradientFrom} />
-                <Stop offset="100%" stopColor={colors.gradientTo} />
-              </LinearGradient>
-            </Defs>
-          )}
-
-          <Circle
-            cx={center}
-            cy={center}
-            r={radius}
-            stroke={colors.track}
-            strokeWidth={strokeWidth}
-            strokeDasharray={trackDash}
-            strokeLinecap="butt"
-            fill="none"
-            opacity={trackOpacity}
-            rotation={isDashboard ? 90 : 0}
-            origin={`${center}, ${center}`}
-          />
-
-          <AnimatedCircle
-            cx={center}
-            cy={center}
-            r={radius}
-            stroke={arcStroke as any}
-            strokeWidth={strokeWidth}
-            fill="none"
-            strokeDasharray={arcLength}
-            strokeDashoffset={strokeDashoffset as any}
-            strokeLinecap={lineCap}
-            rotation={isDashboard ? 90 : -90}
-            origin={`${center}, ${center}`}
-          />
-        </Svg>
-      </Stack>
+      {/* SVG ring */}
+      <Svg
+        width={diameter}
+        height={svgHeight}
+        style={isDashboard ? { marginTop: -(diameter / 2) } : undefined}
+      >
+        {variant === 'gradient' && (
+          <Defs>
+            <LinearGradient id={gradientId} x1="0%" y1="0%" x2="100%" y2="0%">
+              <Stop offset="0%"   stopColor={colors.gradientFrom} />
+              <Stop offset="100%" stopColor={colors.gradientTo}   />
+            </LinearGradient>
+          </Defs>
+        )}
 
+        {/* Track */}
+        <Circle
+          cx={center}
+          cy={center}
+          r={radius}
+          stroke={colors.track}
+          strokeWidth={strokeWidth}
+          strokeDasharray={trackDash}
+          strokeLinecap="butt"
+          fill="none"
+          opacity={trackOpacity}
+          rotation={isDashboard ? 90 : 0}
+          origin={`${center}, ${center}`}
+        />
+
+        {/* Progress arc */}
+        <AnimatedCircle
+          cx={center}
+          cy={center}
+          r={radius}
+          stroke={arcStroke as any}
+          strokeWidth={strokeWidth}
+          fill="none"
+          strokeDasharray={arcLength}
+          strokeDashoffset={strokeDashoffset as any}
+          strokeLinecap={lineCap}
+          rotation={isDashboard ? 90 : -90}
+          origin={`${center}, ${center}`}
+        />
+      </Svg>
+
+      {/* Text / children */}
       {children ? (
-        <Stack alignItems="center" justifyContent="center">
+        <Stack
+          position="absolute"
+          top={0}
+          left={0}
+          width={diameter}
+          height={containerH}
+          alignItems="center"
+          justifyContent="center"
+          pointerEvents="none"
+          gap={2}
+        >
           {children}
         </Stack>
+      ) : isInside ? (
+        renderInsideText()
       ) : (
-        renderTextBlock()
+        renderStackedText()
       )}
     </Stack>
   )
-}
-
-const S = StyleSheet.create({
-  svg_wrap: {
-    position: 'absolute',
-  },
-})
+}

package/src/utiles/styled.tsx

@@ -1,5 +1,5 @@
 
-import React, { forwardRef, ComponentType } from "react";
+import React, { ComponentType, Ref, forwardRef } from "react";
 import { ViewStyle, TextStyle, ImageStyle } from "react-native";
 
 type Style = ViewStyle | TextStyle | ImageStyle;
@@ -13,13 +13,15 @@ interface StyledOptions {
     };
 }
 
+// React 19 passes ref as a regular prop; React 18 and below do not.
+const isReact19 = typeof React.version === "string" && parseInt(React.version) >= 19;
+
 const styled = <P extends object>(
     Component: ComponentType<P>,
     { base, variants }: StyledOptions = {}
 ) => {
-    return forwardRef<any, P>((props, ref) => {
+    function buildStyles(options: Record<string, any>): Style {
         const styles: Style = { ...(base || {}) };
-        const options = props as Record<string, any>;
 
         if (variants) {
             Object.keys(variants).forEach((category) => {
@@ -28,9 +30,7 @@ const styled = <P extends object>(
 
                 if (typeof variantValue === "function") {
                     const style = variantValue(variantSelected, options);
-                    if (style) {
-                        Object.assign(styles, style);
-                    }
+                    if (style) Object.assign(styles, style);
                 } else if (variantValue && variantValue[variantSelected]) {
                     const value = variantValue[variantSelected];
                     Object.assign(
@@ -41,6 +41,22 @@ const styled = <P extends object>(
             });
         }
 
+        return styles;
+    }
+
+    if (isReact19) {
+        // React 19: ref is a plain prop
+        function StyledComponent19(props: P & { ref?: Ref<any> }) {
+            const { ref, ...rest } = props as any;
+            const styles = buildStyles(rest);
+            return <Component {...(rest as any)} style={styles} ref={ref} />;
+        }
+        return StyledComponent19;
+    }
+
+    // React 18 and below: use forwardRef
+    return forwardRef<any, P>((props, ref) => {
+        const styles = buildStyles(props as Record<string, any>);
         return <Component {...(props as any)} style={styles} ref={ref} />;
     });
 };