@cdx-ui/components 0.0.1-beta.8 → 0.0.1-beta.81

package/lib/commonjs/components/Avatar/index.js

@@ -12,22 +12,34 @@ var _Icon = require("../Icon");
 var _styles = require("./styles");
 var _jsxRuntime = require("react/jsx-runtime");
 const SCOPE = 'AVATAR';
-const Root = (0, _utils.withStyleContext)(_reactNative.View, SCOPE);
 const useAvatarStyleContext = () => (0, _utils.useStyleContext)(SCOPE);
-const AvatarPrimitive = (0, _primitives.createAvatar)({
-  Root,
-  Image: _reactNative.Image,
-  Text: _reactNative.Text,
-  Icon: _Icon.Icon,
-  Badge: _reactNative.View
-});
+
+// =============================================================================
+// UTILITIES
+// =============================================================================
+
+function getInitials(name) {
+  const trimmed = name.trim();
+  const words = trimmed.split(/\s+/);
+  if (words.length === 1 && trimmed.length <= 2) {
+    return trimmed.toUpperCase();
+  }
+  let result = '';
+  for (const word of words) {
+    if (word.length > 0) {
+      result += word.charAt(0);
+    }
+    if (result.length >= 2) break;
+  }
+  return result.toUpperCase();
+}
 
 // =============================================================================
 // AVATAR ROOT
 // =============================================================================
 
 const AvatarRoot = /*#__PURE__*/(0, _react.forwardRef)(({
-  size = 'lg',
+  size = 'md',
   className,
   children,
   style,
@@ -36,15 +48,25 @@ const AvatarRoot = /*#__PURE__*/(0, _react.forwardRef)(({
   const computedClassName = (0, _utils.cn)((0, _styles.avatarRootVariants)({
     size
   }), className);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(AvatarPrimitive, {
-    ref: ref,
-    className: computedClassName,
-    style: style,
-    context: {
+  const parent = (0, _utils.useParentContext)();
+  const ctx = (0, _react.useMemo)(() => ({
+    ...parent,
+    [SCOPE]: {
       size
-    },
-    ...props,
-    children: children
+    }
+  }), [parent, size]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.ParentContext.Provider, {
+    value: ctx,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_primitives.AvatarRoot, {
+      ref: ref,
+      className: computedClassName,
+      style: style,
+      ...props,
+      ...(0, _primitives.mergeDataAttributes)(props, (0, _primitives.dataAttributes)({
+        slot: 'avatar'
+      })),
+      children: children
+    })
   });
 });
 AvatarRoot.displayName = 'Avatar';
@@ -54,16 +76,53 @@ AvatarRoot.displayName = 'Avatar';
 // =============================================================================
 
 const AvatarImage = /*#__PURE__*/(0, _react.forwardRef)(({
+  asChild,
   className,
   style,
+  src,
+  source,
+  onLoad,
+  onError,
   ...props
 }, ref) => {
+  const {
+    imageError,
+    setImageLoaded,
+    setImageError
+  } = (0, _primitives.useAvatarContext)();
   const computedClassName = (0, _utils.cn)((0, _styles.avatarImageVariants)(), className);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(AvatarPrimitive.Image, {
+  const resolvedSource = (0, _react.useMemo)(() => src ? {
+    uri: src
+  } : source, [src, source]);
+  (0, _react.useEffect)(() => {
+    if (!resolvedSource) {
+      setImageError(true);
+    } else {
+      setImageError(false);
+      setImageLoaded(false);
+    }
+  }, [resolvedSource, setImageError, setImageLoaded]);
+  if (!resolvedSource || imageError) {
+    return null;
+  }
+  const Comp = asChild ? _primitives.Slot : _reactNative.Image;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
     ref: ref,
+    source: resolvedSource,
     className: computedClassName,
     style: style,
-    ...props
+    onLoad: e => {
+      setImageLoaded(true);
+      if (onLoad) onLoad(e);
+    },
+    onError: e => {
+      setImageError(true);
+      if (onError) onError(e);
+    },
+    ...props,
+    ...(0, _primitives.mergeDataAttributes)(props, (0, _primitives.dataAttributes)({
+      slot: 'avatar-image'
+    }))
   });
 });
 AvatarImage.displayName = 'Avatar.Image';
@@ -73,6 +132,7 @@ AvatarImage.displayName = 'Avatar.Image';
 // =============================================================================
 
 const AvatarText = /*#__PURE__*/(0, _react.forwardRef)(({
+  asChild,
   className,
   children,
   style,
@@ -81,15 +141,27 @@ const AvatarText = /*#__PURE__*/(0, _react.forwardRef)(({
   const {
     size
   } = useAvatarStyleContext();
+  const {
+    imageLoaded,
+    imageError
+  } = (0, _primitives.useAvatarContext)();
+  const visible = !imageLoaded || imageError;
   const computedClassName = (0, _utils.cn)((0, _styles.avatarTextVariants)({
     size
   }), className);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(AvatarPrimitive.Text, {
+  const text = typeof children === 'string' ? getInitials(children) : children;
+  const Comp = asChild ? _primitives.Slot : _reactNative.Text;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
     ref: ref,
     className: computedClassName,
-    style: style,
+    style: [style, !visible && {
+      opacity: 0
+    }],
     ...props,
-    children: children
+    ...(0, _primitives.mergeDataAttributes)(props, (0, _primitives.dataAttributes)({
+      slot: 'avatar-text'
+    })),
+    children: text
   });
 });
 AvatarText.displayName = 'Avatar.Text';
@@ -99,6 +171,7 @@ AvatarText.displayName = 'Avatar.Text';
 // =============================================================================
 
 const AvatarIcon = ({
+  asChild,
   className,
   style,
   ...props
@@ -106,13 +179,35 @@ const AvatarIcon = ({
   const {
     size
   } = useAvatarStyleContext();
+  const {
+    imageLoaded,
+    imageError
+  } = (0, _primitives.useAvatarContext)();
+  const visible = !imageLoaded || imageError;
   const computedClassName = (0, _utils.cn)((0, _styles.avatarIconVariants)({
     size
   }), className);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(AvatarPrimitive.Icon, {
+  if (asChild) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_primitives.Slot, {
+      className: computedClassName,
+      style: [style, !visible && {
+        opacity: 0
+      }],
+      ...props,
+      ...(0, _primitives.mergeDataAttributes)(props, (0, _primitives.dataAttributes)({
+        slot: 'avatar-icon'
+      }))
+    });
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Icon.Icon, {
     className: computedClassName,
-    style: style,
-    ...props
+    style: [style, !visible && {
+      opacity: 0
+    }],
+    ...props,
+    ...(0, _primitives.mergeDataAttributes)(props, (0, _primitives.dataAttributes)({
+      slot: 'avatar-icon'
+    }))
   });
 };
 AvatarIcon.displayName = 'Avatar.Icon';
@@ -122,6 +217,7 @@ AvatarIcon.displayName = 'Avatar.Icon';
 // =============================================================================
 
 const AvatarBadge = /*#__PURE__*/(0, _react.forwardRef)(({
+  asChild,
   className,
   children,
   style,
@@ -133,11 +229,15 @@ const AvatarBadge = /*#__PURE__*/(0, _react.forwardRef)(({
   const computedClassName = (0, _utils.cn)((0, _styles.avatarBadgeVariants)({
     size
   }), className);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(AvatarPrimitive.Badge, {
+  const Comp = asChild ? _primitives.Slot : _reactNative.View;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
     ref: ref,
     className: computedClassName,
     style: style,
     ...props,
+    ...(0, _primitives.mergeDataAttributes)(props, (0, _primitives.dataAttributes)({
+      slot: 'avatar-badge'
+    })),
     children: children
   });
 });

package/lib/commonjs/components/Avatar/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_reactNative","_primitives","_utils","_Icon","_styles","_jsxRuntime","SCOPE","Root","withStyleContext","View","useAvatarStyleContext","useStyleContext","AvatarPrimitive","createAvatar","Image","Text","Icon","IconComponent","Badge","AvatarRoot","forwardRef","size","className","children","style","props","ref","computedClassName","cn","avatarRootVariants","jsx","context","displayName","AvatarImage","avatarImageVariants","AvatarText","avatarTextVariants","AvatarIcon","avatarIconVariants","AvatarBadge","avatarBadgeVariants","Avatar","exports","Object","assign"],"sourceRoot":"../../../../src","sources":["components/Avatar/index.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_reactNative","_primitives","_utils","_Icon","_styles","_jsxRuntime","SCOPE","useAvatarStyleContext","useStyleContext","getInitials","name","trimmed","trim","words","split","length","toUpperCase","result","word","charAt","AvatarRoot","forwardRef","size","className","children","style","props","ref","computedClassName","cn","avatarRootVariants","parent","useParentContext","ctx","useMemo","jsx","ParentContext","Provider","value","mergeDataAttributes","dataAttributes","slot","displayName","AvatarImage","asChild","src","source","onLoad","onError","imageError","setImageLoaded","setImageError","useAvatarContext","avatarImageVariants","resolvedSource","uri","useEffect","Comp","Slot","Image","e","AvatarText","imageLoaded","visible","avatarTextVariants","text","Text","opacity","AvatarIcon","avatarIconVariants","Icon","AvatarBadge","avatarBadgeVariants","View","Avatar","exports","Object","assign","Badge"],"sourceRoot":"../../../../src","sources":["components/Avatar/index.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AASA,IAAAG,MAAA,GAAAH,OAAA;AACA,IAAAI,KAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AAOkB,IAAAM,WAAA,GAAAN,OAAA;AAElB,MAAMO,KAAK,GAAG,QAAQ;AAEtB,MAAMC,qBAAqB,GAAGA,CAAA,KAAM,IAAAC,sBAAe,EAACF,KAAK,CAAuB;;AAEhF;AACA;AACA;;AAEA,SAASG,WAAWA,CAACC,IAAY,EAAU;EACzC,MAAMC,OAAO,GAAGD,IAAI,CAACE,IAAI,CAAC,CAAC;EAC3B,MAAMC,KAAK,GAAGF,OAAO,CAACG,KAAK,CAAC,KAAK,CAAC;EAElC,IAAID,KAAK,CAACE,MAAM,KAAK,CAAC,IAAIJ,OAAO,CAACI,MAAM,IAAI,CAAC,EAAE;IAC7C,OAAOJ,OAAO,CAACK,WAAW,CAAC,CAAC;EAC9B;EAEA,IAAIC,MAAM,GAAG,EAAE;EACf,KAAK,MAAMC,IAAI,IAAIL,KAAK,EAAE;IACxB,IAAIK,IAAI,CAACH,MAAM,GAAG,CAAC,EAAE;MACnBE,MAAM,IAAIC,IAAI,CAACC,MAAM,CAAC,CAAC,CAAC;IAC1B;IACA,IAAIF,MAAM,CAACF,MAAM,IAAI,CAAC,EAAE;EAC1B;EACA,OAAOE,MAAM,CAACD,WAAW,CAAC,CAAC;AAC7B;;AAEA;AACA;AACA;;AAOA,MAAMI,UAAU,gBAAG,IAAAC,iBAAU,EAC3B,CAAC;EAAEC,IAAI,GAAG,IAAI;EAAEC,SAAS;EAAEC,QAAQ;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,GAAG,KAAK;EAC9D,MAAMC,iBAAiB,GAAG,IAAAC,SAAE,EAAC,IAAAC,0BAAkB,EAAC;IAAER;EAAK,CAAC,CAAC,EAAEC,SAAS,CAAC;EAErE,MAAMQ,MAAM,GAAG,IAAAC,uBAAgB,EAAC,CAAC;EACjC,MAAMC,GAAG,GAAG,IAAAC,cAAO,EAAC,OAAO;IAAE,GAAGH,MAAM;IAAE,CAACzB,KAAK,GAAG;MAAEgB;IAAK;EAAE,CAAC,CAAC,EAAE,CAACS,MAAM,EAAET,IAAI,CAAC,CAAC;EAE7E,oBACE,IAAAjB,WAAA,CAAA8B,GAAA,EAACjC,MAAA,CAAAkC,aAAa,CAACC,QAAQ;IAACC,KAAK,EAAEL,GAAI;IAAAT,QAAA,eACjC,IAAAnB,WAAA,CAAA8B,GAAA,EAAClC,WAAA,CAAAmB,UAAmB;MAClBO,GAAG,EAAEA,GAAI;MACTJ,SAAS,EAAEK,iBAAkB;MAC7BH,KAAK,EAAEA,KAAM;MAAA,GACTC,KAAK;MAAA,GACL,IAAAa,+BAAmB,EAACb,KAAK,EAAE,IAAAc,0BAAc,EAAC;QAAEC,IAAI,EAAE;MAAS,CAAC,CAAC,CAAC;MAAAjB,QAAA,EAEjEA;IAAQ,CACU;EAAC,CACA,CAAC;AAE7B,CACF,CAAC;AAEDJ,UAAU,CAACsB,WAAW,GAAG,QAAQ;;AAEjC;AACA;AACA;;AAOA,MAAMC,WAAW,gBAAG,IAAAtB,iBAAU,EAC5B,CAAC;EAAEuB,OAAO;EAAErB,SAAS;EAAEE,KAAK;EAAEoB,GAAG;EAAEC,MAAM;EAAEC,MAAM;EAAEC,OAAO;EAAE,GAAGtB;AAAM,CAAC,EAAEC,GAAG,KAAK;EAC9E,MAAM;IAAEsB,UAAU;IAAEC,cAAc;IAAEC;EAAc,CAAC,GAAG,IAAAC,4BAAgB,EAAC,CAAC;EACxE,MAAMxB,iBAAiB,GAAG,IAAAC,SAAE,EAAC,IAAAwB,2BAAmB,EAAC,CAAC,EAAE9B,SAAS,CAAC;EAE9D,MAAM+B,cAAc,GAAG,IAAApB,cAAO,EAAC,MAAOW,GAAG,GAAG;IAAEU,GAAG,EAAEV;EAAI,CAAC,GAAGC,MAAO,EAAE,CAACD,GAAG,EAAEC,MAAM,CAAC,CAAC;EAElF,IAAAU,gBAAS,EAAC,MAAM;IACd,IAAI,CAACF,cAAc,EAAE;MACnBH,aAAa,CAAC,IAAI,CAAC;IACrB,CAAC,MAAM;MACLA,aAAa,CAAC,KAAK,CAAC;MACpBD,cAAc,CAAC,KAAK,CAAC;IACvB;EACF,CAAC,EAAE,CAACI,cAAc,EAAEH,aAAa,EAAED,cAAc,CAAC,CAAC;EAEnD,IAAI,CAACI,cAAc,IAAIL,UAAU,EAAE;IACjC,OAAO,IAAI;EACb;EAEA,MAAMQ,IAAI,GAAGb,OAAO,GAAGc,gBAAI,GAAGC,kBAAK;EAEnC,oBACE,IAAAtD,WAAA,CAAA8B,GAAA,EAACsB,IAAI;IACH9B,GAAG,EAAEA,GAAI;IACTmB,MAAM,EAAEQ,cAAe;IACvB/B,SAAS,EAAEK,iBAAkB;IAC7BH,KAAK,EAAEA,KAAM;IACbsB,MAAM,EAAGa,CAAU,IAAK;MACtBV,cAAc,CAAC,IAAI,CAAC;MACpB,IAAIH,MAAM,EAAGA,MAAM,CAA0Ba,CAAC,CAAC;IACjD,CAAE;IACFZ,OAAO,EAAGY,CAAU,IAAK;MACvBT,aAAa,CAAC,IAAI,CAAC;MACnB,IAAIH,OAAO,EAAGA,OAAO,CAA0BY,CAAC,CAAC;IACnD,CAAE;IAAA,GACElC,KAAK;IAAA,GACL,IAAAa,+BAAmB,EAACb,KAAK,EAAE,IAAAc,0BAAc,EAAC;MAAEC,IAAI,EAAE;IAAe,CAAC,CAAC;EAAC,CACzE,CAAC;AAEN,CACF,CAAC;AAEDE,WAAW,CAACD,WAAW,GAAG,cAAc;;AAExC;AACA;AACA;;AAQA,MAAMmB,UAAU,gBAAG,IAAAxC,iBAAU,EAC3B,CAAC;EAAEuB,OAAO;EAAErB,SAAS;EAAEC,QAAQ;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,GAAG,KAAK;EAC1D,MAAM;IAAEL;EAAK,CAAC,GAAGf,qBAAqB,CAAC,CAAC;EACxC,MAAM;IAAEuD,WAAW;IAAEb;EAAW,CAAC,GAAG,IAAAG,4BAAgB,EAAC,CAAC;EACtD,MAAMW,OAAO,GAAG,CAACD,WAAW,IAAIb,UAAU;EAC1C,MAAMrB,iBAAiB,GAAG,IAAAC,SAAE,EAAC,IAAAmC,0BAAkB,EAAC;IAAE1C;EAAK,CAAC,CAAC,EAAEC,SAAS,CAAC;EAErE,MAAM0C,IAAI,GAAG,OAAOzC,QAAQ,KAAK,QAAQ,GAAGf,WAAW,CAACe,QAAQ,CAAC,GAAGA,QAAQ;EAE5E,MAAMiC,IAAI,GAAGb,OAAO,GAAGc,gBAAI,GAAGQ,iBAAI;EAElC,oBACE,IAAA7D,WAAA,CAAA8B,GAAA,EAACsB,IAAI;IACH9B,GAAG,EAAEA,GAAI;IACTJ,SAAS,EAAEK,iBAAkB;IAC7BH,KAAK,EAAE,CAACA,KAAK,EAAE,CAACsC,OAAO,IAAI;MAAEI,OAAO,EAAE;IAAE,CAAC,CAAE;IAAA,GACvCzC,KAAK;IAAA,GACL,IAAAa,+BAAmB,EAACb,KAAK,EAAE,IAAAc,0BAAc,EAAC;MAAEC,IAAI,EAAE;IAAc,CAAC,CAAC,CAAC;IAAAjB,QAAA,EAEtEyC;EAAI,CACD,CAAC;AAEX,CACF,CAAC;AAEDJ,UAAU,CAACnB,WAAW,GAAG,aAAa;;AAEtC;AACA;AACA;;AAOA,MAAM0B,UAAU,GAAGA,CAAC;EAAExB,OAAO;EAAErB,SAAS;EAAEE,KAAK;EAAE,GAAGC;AAAuB,CAAC,KAAK;EAC/E,MAAM;IAAEJ;EAAK,CAAC,GAAGf,qBAAqB,CAAC,CAAC;EACxC,MAAM;IAAEuD,WAAW;IAAEb;EAAW,CAAC,GAAG,IAAAG,4BAAgB,EAAC,CAAC;EACtD,MAAMW,OAAO,GAAG,CAACD,WAAW,IAAIb,UAAU;EAC1C,MAAMrB,iBAAiB,GAAG,IAAAC,SAAE,EAAC,IAAAwC,0BAAkB,EAAC;IAAE/C;EAAK,CAAC,CAAC,EAAEC,SAAS,CAAC;EAErE,IAAIqB,OAAO,EAAE;IACX,oBACE,IAAAvC,WAAA,CAAA8B,GAAA,EAAClC,WAAA,CAAAyD,IAAI;MACHnC,SAAS,EAAEK,iBAAkB;MAC7BH,KAAK,EAAE,CAACA,KAAK,EAAE,CAACsC,OAAO,IAAI;QAAEI,OAAO,EAAE;MAAE,CAAC,CAAE;MAAA,GACvCzC,KAAK;MAAA,GACL,IAAAa,+BAAmB,EAACb,KAAK,EAAE,IAAAc,0BAAc,EAAC;QAAEC,IAAI,EAAE;MAAc,CAAC,CAAC;IAAC,CACxE,CAAC;EAEN;EAEA,oBACE,IAAApC,WAAA,CAAA8B,GAAA,EAAChC,KAAA,CAAAmE,IAAa;IACZ/C,SAAS,EAAEK,iBAAkB;IAC7BH,KAAK,EAAE,CAACA,KAAK,EAAE,CAACsC,OAAO,IAAI;MAAEI,OAAO,EAAE;IAAE,CAAC,CAAE;IAAA,GACvCzC,KAAK;IAAA,GACL,IAAAa,+BAAmB,EAACb,KAAK,EAAE,IAAAc,0BAAc,EAAC;MAAEC,IAAI,EAAE;IAAc,CAAC,CAAC;EAAC,CACxE,CAAC;AAEN,CAAC;AAED2B,UAAU,CAAC1B,WAAW,GAAG,aAAa;;AAEtC;AACA;AACA;;AAQA,MAAM6B,WAAW,gBAAG,IAAAlD,iBAAU,EAC5B,CAAC;EAAEuB,OAAO;EAAErB,SAAS;EAAEC,QAAQ;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,GAAG,KAAK;EAC1D,MAAM;IAAEL;EAAK,CAAC,GAAGf,qBAAqB,CAAC,CAAC;EACxC,MAAMqB,iBAAiB,GAAG,IAAAC,SAAE,EAAC,IAAA2C,2BAAmB,EAAC;IAAElD;EAAK,CAAC,CAAC,EAAEC,SAAS,CAAC;EACtE,MAAMkC,IAAI,GAAGb,OAAO,GAAGc,gBAAI,GAAGe,iBAAI;EAElC,oBACE,IAAApE,WAAA,CAAA8B,GAAA,EAACsB,IAAI;IACH9B,GAAG,EAAEA,GAAI;IACTJ,SAAS,EAAEK,iBAAkB;IAC7BH,KAAK,EAAEA,KAAM;IAAA,GACTC,KAAK;IAAA,GACL,IAAAa,+BAAmB,EAACb,KAAK,EAAE,IAAAc,0BAAc,EAAC;MAAEC,IAAI,EAAE;IAAe,CAAC,CAAC,CAAC;IAAAjB,QAAA,EAEvEA;EAAQ,CACL,CAAC;AAEX,CACF,CAAC;AAED+C,WAAW,CAAC7B,WAAW,GAAG,cAAc;;AAExC;AACA;AACA;;AASO,MAAMgC,MAAM,GAAAC,OAAA,CAAAD,MAAA,GAAGE,MAAM,CAACC,MAAM,CAACzD,UAAU,EAAE;EAC9CuC,KAAK,EAAEhB,WAAW;EAClBuB,IAAI,EAAEL,UAAU;EAChBS,IAAI,EAAEF,UAAU;EAChBU,KAAK,EAAEP;AACT,CAAC,CAA4B","ignoreList":[]}

package/lib/commonjs/components/Avatar/styles.js

@@ -5,76 +5,83 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.avatarTextVariants = exports.avatarRootVariants = exports.avatarImageVariants = exports.avatarIconVariants = exports.avatarBadgeVariants = void 0;
 var _classVarianceAuthority = require("class-variance-authority");
-var _primitives = require("../../styles/primitives");
 // ── Root ─────────────────────────────────────────────────
 
-const avatarRootVariants = exports.avatarRootVariants = (0, _classVarianceAuthority.cva)([_primitives.RADIUS_FULL, 'relative items-center justify-center', _primitives.COLOR_BG_MUTED], {
+const avatarRootVariants = exports.avatarRootVariants = (0, _classVarianceAuthority.cva)(['rounded-[var(--border-radius-round)]', 'relative items-center justify-center', 'bg-surface-tertiary'], {
   variants: {
     size: {
-      sm: 'w-8 h-8',
-      md: 'w-10 h-10',
-      lg: 'w-12 h-12',
-      xl: 'w-16 h-16',
-      '2xl': 'w-20 h-20'
+      '2xs': 'w-3 h-3',
+      xs: 'w-[18px] h-[18px]',
+      sm: 'w-6 h-6',
+      md: 'w-8 h-8',
+      lg: 'w-10 h-10',
+      xl: 'w-12 h-12',
+      '2xl': 'w-14 h-14'
     }
   },
   defaultVariants: {
-    size: 'lg'
+    size: 'md'
   }
 });
 
 // ── Image ────────────────────────────────────────────────
 
-const avatarImageVariants = exports.avatarImageVariants = (0, _classVarianceAuthority.cva)(['absolute top-0 left-0 w-full h-full', _primitives.RADIUS_FULL, 'overflow-hidden']);
+const avatarImageVariants = exports.avatarImageVariants = (0, _classVarianceAuthority.cva)(['absolute top-0 left-0 w-full h-full', 'rounded-[var(--border-radius-round)]', 'overflow-hidden', 'border border-stroke-secondary']);
 
 // ── Text ─────────────────────────────────────────────────
 
-const avatarTextVariants = exports.avatarTextVariants = (0, _classVarianceAuthority.cva)([_primitives.COLOR_TEXT_SECONDARY, 'font-semibold'], {
+const avatarTextVariants = exports.avatarTextVariants = (0, _classVarianceAuthority.cva)(['text-content-primary', 'font-medium'], {
   variants: {
     size: {
+      '2xs': 'text-[6px]',
+      xs: 'text-[9px]',
       sm: 'text-xs',
-      md: 'text-sm',
-      lg: 'text-base',
-      xl: 'text-xl',
-      '2xl': 'text-2xl'
+      md: 'text-base',
+      lg: 'text-xl',
+      xl: 'text-2xl',
+      '2xl': 'text-[28px]'
     }
   },
   defaultVariants: {
-    size: 'lg'
+    size: 'md'
   }
 });
 
 // ── Icon ─────────────────────────────────────────────────
 
-const avatarIconVariants = exports.avatarIconVariants = (0, _classVarianceAuthority.cva)([_primitives.COLOR_TEXT_SECONDARY], {
+const avatarIconVariants = exports.avatarIconVariants = (0, _classVarianceAuthority.cva)(['text-content-primary'], {
   variants: {
     size: {
-      sm: 'size-4',
-      md: 'size-5',
-      lg: 'size-6',
-      xl: 'size-8',
-      '2xl': 'size-10'
+      '2xs': 'size-1.5',
+      xs: 'size-[9px]',
+      sm: 'size-3',
+      md: 'size-4',
+      lg: 'size-5',
+      xl: 'size-6',
+      '2xl': 'size-7'
     }
   },
   defaultVariants: {
-    size: 'lg'
+    size: 'md'
   }
 });
 
 // ── Badge ────────────────────────────────────────────────
 
-const avatarBadgeVariants = exports.avatarBadgeVariants = (0, _classVarianceAuthority.cva)(['absolute border-2 border-white', _primitives.RADIUS_FULL], {
+const avatarBadgeVariants = exports.avatarBadgeVariants = (0, _classVarianceAuthority.cva)(['absolute border-white', 'rounded-[var(--border-radius-round)]', 'bottom-0 right-0'], {
   variants: {
     size: {
-      sm: 'w-2.5 h-2.5 bottom-0 right-0',
-      md: 'w-3 h-3 bottom-0 right-0',
-      lg: 'w-3.5 h-3.5 bottom-0 right-0',
-      xl: 'w-4 h-4 bottom-0.5 right-0.5',
-      '2xl': 'w-5 h-5 bottom-0.5 right-0.5'
+      '2xs': 'w-1.5 h-1.5 border translate-x-[21%] translate-y-[21%]',
+      xs: 'w-2 h-2 border translate-x-[17%] translate-y-[17%]',
+      sm: 'w-2.5 h-2.5 border-2 translate-x-[15%] translate-y-[15%]',
+      md: 'w-3 h-3 border-2 translate-x-[11%] translate-y-[11%]',
+      lg: 'w-3.5 h-3.5 border-2 translate-x-[8%] translate-y-[8%]',
+      xl: 'w-4 h-4 border-2 translate-x-[6%] translate-y-[6%]',
+      '2xl': 'w-5 h-5 border-2 translate-x-[9%] translate-y-[9%]'
     }
   },
   defaultVariants: {
-    size: 'lg'
+    size: 'md'
   }
 });
 //# sourceMappingURL=styles.js.map

package/lib/commonjs/components/Avatar/styles.js.map

@@ -1 +1 @@
-{"version":3,"names":["_classVarianceAuthority","require","_primitives","avatarRootVariants","exports","cva","RADIUS_FULL","COLOR_BG_MUTED","variants","size","sm","md","lg","xl","defaultVariants","avatarImageVariants","avatarTextVariants","COLOR_TEXT_SECONDARY","avatarIconVariants","avatarBadgeVariants"],"sourceRoot":"../../../../src","sources":["components/Avatar/styles.ts"],"mappings":";;;;;;AAAA,IAAAA,uBAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAEA;;AAEO,MAAME,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,GAAG,IAAAE,2BAAG,EACnC,CAACC,uBAAW,EAAE,sCAAsC,EAAEC,0BAAc,CAAC,EACrE;EACEC,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,WAAW;MACfC,EAAE,EAAE,WAAW;MACfC,EAAE,EAAE,WAAW;MACf,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfL,IAAI,EAAE;EACR;AACF,CACF,CAAC;;AAED;;AAEO,MAAMM,mBAAmB,GAAAX,OAAA,CAAAW,mBAAA,GAAG,IAAAV,2BAAG,EAAC,CACrC,qCAAqC,EACrCC,uBAAW,EACX,iBAAiB,CAClB,CAAC;;AAEF;;AAEO,MAAMU,kBAAkB,GAAAZ,OAAA,CAAAY,kBAAA,GAAG,IAAAX,2BAAG,EAAC,CAACY,gCAAoB,EAAE,eAAe,CAAC,EAAE;EAC7ET,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,WAAW;MACfC,EAAE,EAAE,SAAS;MACb,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfL,IAAI,EAAE;EACR;AACF,CAAC,CAAC;;AAEF;;AAEO,MAAMS,kBAAkB,GAAAd,OAAA,CAAAc,kBAAA,GAAG,IAAAb,2BAAG,EAAC,CAACY,gCAAoB,CAAC,EAAE;EAC5DT,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZ,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfL,IAAI,EAAE;EACR;AACF,CAAC,CAAC;;AAEF;;AAEO,MAAMU,mBAAmB,GAAAf,OAAA,CAAAe,mBAAA,GAAG,IAAAd,2BAAG,EAAC,CAAC,gCAAgC,EAAEC,uBAAW,CAAC,EAAE;EACtFE,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJC,EAAE,EAAE,8BAA8B;MAClCC,EAAE,EAAE,0BAA0B;MAC9BC,EAAE,EAAE,8BAA8B;MAClCC,EAAE,EAAE,8BAA8B;MAClC,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfL,IAAI,EAAE;EACR;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["_classVarianceAuthority","require","avatarRootVariants","exports","cva","variants","size","xs","sm","md","lg","xl","defaultVariants","avatarImageVariants","avatarTextVariants","avatarIconVariants","avatarBadgeVariants"],"sourceRoot":"../../../../src","sources":["components/Avatar/styles.ts"],"mappings":";;;;;;AAAA,IAAAA,uBAAA,GAAAC,OAAA;AAEA;;AAEO,MAAMC,kBAAkB,GAAAC,OAAA,CAAAD,kBAAA,GAAG,IAAAE,2BAAG,EACnC,CACE,sCAAsC,EACtC,sCAAsC,EACtC,qBAAqB,CACtB,EACD;EACEC,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJ,KAAK,EAAE,SAAS;MAChBC,EAAE,EAAE,mBAAmB;MACvBC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,WAAW;MACfC,EAAE,EAAE,WAAW;MACf,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfN,IAAI,EAAE;EACR;AACF,CACF,CAAC;;AAED;;AAEO,MAAMO,mBAAmB,GAAAV,OAAA,CAAAU,mBAAA,GAAG,IAAAT,2BAAG,EAAC,CACrC,qCAAqC,EACrC,sCAAsC,EACtC,iBAAiB,EACjB,gCAAgC,CACjC,CAAC;;AAEF;;AAEO,MAAMU,kBAAkB,GAAAX,OAAA,CAAAW,kBAAA,GAAG,IAAAV,2BAAG,EAAC,CAAC,sBAAsB,EAAE,aAAa,CAAC,EAAE;EAC7EC,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJ,KAAK,EAAE,YAAY;MACnBC,EAAE,EAAE,YAAY;MAChBC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,WAAW;MACfC,EAAE,EAAE,SAAS;MACbC,EAAE,EAAE,UAAU;MACd,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfN,IAAI,EAAE;EACR;AACF,CAAC,CAAC;;AAEF;;AAEO,MAAMS,kBAAkB,GAAAZ,OAAA,CAAAY,kBAAA,GAAG,IAAAX,2BAAG,EAAC,CAAC,sBAAsB,CAAC,EAAE;EAC9DC,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJ,KAAK,EAAE,UAAU;MACjBC,EAAE,EAAE,YAAY;MAChBC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZC,EAAE,EAAE,QAAQ;MACZ,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfN,IAAI,EAAE;EACR;AACF,CAAC,CAAC;;AAEF;;AAEO,MAAMU,mBAAmB,GAAAb,OAAA,CAAAa,mBAAA,GAAG,IAAAZ,2BAAG,EACpC,CAAC,uBAAuB,EAAE,sCAAsC,EAAE,kBAAkB,CAAC,EACrF;EACEC,QAAQ,EAAE;IACRC,IAAI,EAAE;MACJ,KAAK,EAAE,wDAAwD;MAC/DC,EAAE,EAAE,oDAAoD;MACxDC,EAAE,EAAE,0DAA0D;MAC9DC,EAAE,EAAE,sDAAsD;MAC1DC,EAAE,EAAE,wDAAwD;MAC5DC,EAAE,EAAE,oDAAoD;MACxD,KAAK,EAAE;IACT;EACF,CAAC;EACDC,eAAe,EAAE;IACfN,IAAI,EAAE;EACR;AACF,CACF,CAAC","ignoreList":[]}

package/lib/commonjs/components/BottomSheet/index.js

@@ -8,15 +8,26 @@ exports.useBottomSheet = useBottomSheet;
 var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _reactNativeSafeAreaContext = require("react-native-safe-area-context");
+var _uniwind = require("uniwind");
 var _bottomSheet = require("@gorhom/bottom-sheet");
 var _utils = require("@cdx-ui/utils");
 var _icons = require("@cdx-ui/icons");
 var _Heading = require("../Heading");
-var _Icon = require("../Icon");
+var _IconButton = require("../IconButton");
 var _Text = require("../Text");
 var _styles = require("./styles");
 var _jsxRuntime = require("react/jsx-runtime");
 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 ZERO_INSETS = {
+  top: 0,
+  bottom: 0,
+  left: 0,
+  right: 0
+};
+function useSafeInsets() {
+  return (0, _react.useContext)(_reactNativeSafeAreaContext.SafeAreaInsetsContext) ?? ZERO_INSETS;
+}
+
 /** Ref type for BottomSheet; forwards the @gorhom modal ref (present, dismiss, snapToIndex, minimize, restore, etc.). */
 
 function BottomSheetHeaderComponent({
@@ -37,29 +48,27 @@ function BottomSheetHeaderComponent({
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
     ref: ref,
     className: computedClassName,
-    children: [onBack && /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Pressable, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(BottomSheetBackButton, {
+      className: (0, _utils.cn)(!onBack && 'opacity-0'),
       onPress: onBack,
-      hitSlop: 12,
-      accessibilityRole: "button",
-      accessibilityLabel: backAccessibilityLabel,
-      className: (0, _utils.cn)((0, _styles.bottomSheetBackButtonVariants)()),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Icon.Icon, {
-        as: _icons.ArrowBackIosNew,
-        className: (0, _styles.bottomSheetBackIconVariants)()
+      ...(backAccessibilityLabel !== undefined && {
+        accessibilityLabel: backAccessibilityLabel
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
       className: "flex-1",
       children: children ?? (hasTitle ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Heading.Heading, {
-          size: "xs",
-          className: "text-lg",
+          size: "md",
+          className: "text-center",
           children: title
         }), subtitle ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Text.Text, {
-          className: (0, _styles.bottomSheetSubtitleVariants)(),
+          size: "sm",
+          className: "text-center text-content-secondary",
           children: subtitle
         }) : null]
       }) : null)
-    }), onClose && /*#__PURE__*/(0, _jsxRuntime.jsx)(BottomSheetCloseButton, {
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(BottomSheetCloseButton, {
+      className: (0, _utils.cn)(!onClose && 'opacity-0'),
       onPress: onClose,
       ...(closeAccessibilityLabel !== undefined && {
         accessibilityLabel: closeAccessibilityLabel
@@ -71,6 +80,28 @@ BottomSheetHeaderComponent.displayName = 'BottomSheet.Header';
 const BottomSheetHeader = /*#__PURE__*/(0, _react.forwardRef)(BottomSheetHeaderComponent);
 BottomSheetHeader.displayName = 'BottomSheet.Header';
 
+// =============================================================================
+// BACKBUTTON
+// =============================================================================
+
+function BottomSheetBackButton({
+  onPress,
+  className,
+  accessibilityLabel = 'Go back'
+}) {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.IconButton, {
+    as: _icons.ArrowBack,
+    variant: "solid",
+    color: "neutral",
+    size: "default",
+    onPress: onPress,
+    hitSlop: 12,
+    accessibilityLabel: accessibilityLabel,
+    className: className
+  });
+}
+BottomSheetBackButton.displayName = 'BottomSheet.BackButton';
+
 // =============================================================================
 // CLOSEBUTTON
 // =============================================================================
@@ -80,16 +111,15 @@ function BottomSheetCloseButton({
   className,
   accessibilityLabel = 'Close'
 }) {
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Pressable, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.IconButton, {
+    as: _icons.Close,
+    variant: "solid",
+    color: "neutral",
+    size: "default",
     onPress: onPress,
     hitSlop: 12,
-    accessibilityRole: "button",
     accessibilityLabel: accessibilityLabel,
-    className: (0, _utils.cn)((0, _styles.bottomSheetCloseButtonVariants)(), className),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Icon.Icon, {
-      as: _icons.Close,
-      className: (0, _styles.bottomSheetCloseIconVariants)()
-    })
+    className: className
   });
 }
 BottomSheetCloseButton.displayName = 'BottomSheet.CloseButton';
@@ -104,7 +134,7 @@ const BottomSheetContent = /*#__PURE__*/(0, _react.forwardRef)(({
   hasSafeAreaInset,
   style
 }, ref) => {
-  const insets = (0, _reactNativeSafeAreaContext.useSafeAreaInsets)();
+  const insets = useSafeInsets();
   const computedClassName = (0, _utils.cn)((0, _styles.bottomSheetContentVariants)(), className);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
     ref: ref,
@@ -128,7 +158,7 @@ const BottomSheetFooter = /*#__PURE__*/(0, _react.forwardRef)(({
   className,
   style
 }, ref) => {
-  const insets = (0, _reactNativeSafeAreaContext.useSafeAreaInsets)();
+  const insets = useSafeInsets();
   const computedClassName = (0, _utils.cn)((0, _styles.bottomSheetFooterVariants)(), className);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
     ref: ref,
@@ -148,6 +178,12 @@ BottomSheetFooter.displayName = 'BottomSheet.Footer';
 // =============================================================================
 
 const MAX_DYNAMIC_CONTENT_SIZE = _reactNative.Dimensions.get('window').height * 0.9;
+const SHEET_BORDER_RADIUS = 24;
+const sheetContainerStyle = {
+  overflow: 'hidden',
+  borderTopLeftRadius: SHEET_BORDER_RADIUS,
+  borderTopRightRadius: SHEET_BORDER_RADIUS
+};
 const CustomBackdrop = props => {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_bottomSheet.BottomSheetBackdrop, {
     ...props,
@@ -157,27 +193,44 @@ const CustomBackdrop = props => {
     pressBehavior: "close"
   });
 };
+const CustomBackground = props => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+  ...props,
+  className: (0, _utils.cn)((0, _styles.bottomSheetContainerVariants)())
+});
 const BottomSheetModalStyled = /*#__PURE__*/(0, _react.forwardRef)(({
   handleVisible = true,
   footer,
+  onDismiss,
+  onChange,
   ...rest
 }, ref) => {
   const renderFooter = (0, _react.useCallback)(props => /*#__PURE__*/(0, _jsxRuntime.jsx)(_bottomSheet.BottomSheetFooter, {
     ...props,
     children: footer
   }), [footer]);
+  const dismissedRef = (0, _react.useRef)(false);
+  const handleDismiss = (0, _react.useCallback)(() => {
+    if (dismissedRef.current) return;
+    dismissedRef.current = true;
+    onDismiss?.();
+  }, [onDismiss]);
+  const handleChange = (0, _react.useCallback)((...args) => {
+    dismissedRef.current = false;
+    onChange?.(...args);
+  }, [onChange]);
+  const handleIndicatorStyle = (0, _uniwind.useResolveClassNames)('bg-surface-neutral-subtle w-9 h-1 rounded-full');
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_bottomSheet.BottomSheetModal, {
     ref: ref,
     enableDynamicSizing: true,
     maxDynamicContentSize: MAX_DYNAMIC_CONTENT_SIZE,
+    style: sheetContainerStyle,
     handleComponent: handleVisible ? undefined : null,
-    handleIndicatorStyle: handleVisible ? _styles.handleIndicatorStyle : undefined,
+    handleIndicatorStyle: handleVisible ? handleIndicatorStyle : undefined,
     backdropComponent: CustomBackdrop,
-    backgroundComponent: backgroundProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-      ...backgroundProps,
-      className: (0, _utils.cn)((0, _styles.bottomSheetContainerVariants)())
-    }),
+    backgroundComponent: CustomBackground,
     ...rest,
+    onDismiss: handleDismiss,
+    onChange: handleChange,
     ...(footer != null && {
       footerComponent: renderFooter
     })