@xaui/native 0.9.1-alpha.4 → 0.9.1-alpha.41

package/dist/chunk-N3KTZMPG.js

@@ -0,0 +1,293 @@
+import {
+  SelectionFill
+} from "./chunk-BA2DBSAN.js";
+import {
+  useControllableState
+} from "./chunk-F6W3JQ7K.js";
+import {
+  PressableFeedback
+} from "./chunk-6UEZJRVI.js";
+import {
+  usePressState
+} from "./chunk-423RQBOX.js";
+import {
+  createRecipe,
+  radiusAxis
+} from "./chunk-4GTAZM2C.js";
+import {
+  useXAUITheme
+} from "./chunk-A3EGFI6T.js";
+import {
+  childrenToString,
+  createSlotContext
+} from "./chunk-K72UDPVN.js";
+import {
+  useStyleProps
+} from "./chunk-M63GFNKV.js";
+
+// src/components/radio/radio-indicator.tsx
+import { forwardRef } from "react";
+import { View } from "react-native";
+
+// src/components/radio/radio.context.ts
+var [RadioProvider, useRadio] = createSlotContext("Radio");
+
+// src/components/radio/radio-indicator.tsx
+import { jsx } from "react/jsx-runtime";
+var RadioIndicator = forwardRef(
+  function RadioIndicator2({ children, animation = true, style, ...props }, ref) {
+    const { indicatorStyle, fillStyle, isSelected } = useRadio();
+    const [styleProps, rest] = useStyleProps(props);
+    return /* @__PURE__ */ jsx(View, { ref, ...rest, style: [indicatorStyle, styleProps, style], children: /* @__PURE__ */ jsx(
+      SelectionFill,
+      {
+        isVisible: isSelected,
+        style: fillStyle,
+        animation,
+        children: children ?? /* @__PURE__ */ jsx(Thumb, {})
+      }
+    ) });
+  }
+);
+RadioIndicator.displayName = "XAUI.Radio.Indicator";
+function Thumb() {
+  const { thumbStyle } = useRadio();
+  return /* @__PURE__ */ jsx(View, { style: thumbStyle });
+}
+
+// src/components/radio/radio-label.tsx
+import { forwardRef as forwardRef2 } from "react";
+import { Text } from "react-native";
+import { jsx as jsx2 } from "react/jsx-runtime";
+var RadioLabel = forwardRef2(function RadioLabel2({ children, style, ...props }, ref) {
+  const { labelStyle } = useRadio();
+  const [styleProps, rest] = useStyleProps(props);
+  return /* @__PURE__ */ jsx2(Text, { ref, style: [labelStyle, styleProps, style], ...rest, children });
+});
+RadioLabel.displayName = "XAUI.Radio.Label";
+
+// src/components/radio/radio.tsx
+import { forwardRef as forwardRef3, useCallback, useMemo } from "react";
+
+// src/components/radio/radio.recipe.ts
+var SLOTS = ["root", "indicator", "fill", "thumb", "label"];
+var VARIANT_TOKENS = {
+  primary: {
+    bg: "fieldBackground",
+    border: "fieldBorder",
+    bgSelected: "accent",
+    fgSelected: "accentForeground"
+  },
+  secondary: {
+    bg: "default",
+    border: "fieldBorder",
+    bgSelected: "accent",
+    fgSelected: "accentForeground"
+  },
+  tertiary: {
+    border: "fieldBorder",
+    bgSelected: "accent",
+    fgSelected: "accentForeground"
+  }
+};
+function sizeAxis(step) {
+  const { box, label, gap } = step;
+  return (theme) => {
+    const side = theme.spacing(box);
+    const dot = Math.round(side * THUMB_RATIO);
+    return {
+      root: { gap: theme.spacing(gap) },
+      indicator: { width: side, height: side },
+      thumb: { width: dot, height: dot, borderRadius: dot / 2 },
+      label: {
+        fontSize: theme.fontSizes[label],
+        lineHeight: theme.lineHeights[label]
+      }
+    };
+  };
+}
+var THUMB_RATIO = 10 / 24;
+var SIZES = {
+  sm: { box: 5, gap: 2, label: "sm" },
+  md: { box: 6, gap: 2, label: "md" },
+  lg: { box: 7, gap: 2.5, label: "lg" }
+};
+var radioRecipe = createRecipe({
+  slots: SLOTS,
+  base: (theme) => ({
+    root: { flexDirection: "row", alignItems: "center", alignSelf: "flex-start" },
+    indicator: {
+      alignItems: "center",
+      justifyContent: "center",
+      borderWidth: theme.borderWidth.field,
+      // The one shape decision this component makes, and the whole difference between it
+      // and the `Checkbox`: a radio is round, at every size. `radius` still overrides it.
+      borderRadius: theme.radius.full,
+      overflow: "hidden"
+    },
+    fill: {
+      position: "absolute",
+      top: 0,
+      bottom: 0,
+      start: 0,
+      end: 0,
+      alignItems: "center",
+      justifyContent: "center"
+    },
+    label: {
+      fontFamily: theme.fontFamilies.body,
+      color: theme.colors.foreground
+    }
+  }),
+  variantTokens: VARIANT_TOKENS,
+  /** The `Checkbox`'s paint, with a dot where the check was. */
+  paint: (theme, colors) => ({
+    indicator: {
+      backgroundColor: colors.bg,
+      borderColor: colors.border,
+      borderWidth: colors.border ? theme.borderWidth.field : 0
+    },
+    fill: { backgroundColor: colors.bgSelected },
+    thumb: { backgroundColor: colors.fgSelected }
+  }),
+  variants: {
+    size: {
+      sm: sizeAxis(SIZES.sm),
+      md: sizeAxis(SIZES.md),
+      lg: sizeAxis(SIZES.lg)
+    },
+    radius: radiusAxis("indicator"),
+    /** Declared after `size` so its border wins. The `Checkbox`'s rule, to the letter. */
+    isInvalid: {
+      true: (theme) => ({
+        indicator: { borderColor: theme.colors.danger, backgroundColor: void 0 },
+        fill: { backgroundColor: theme.colors.danger },
+        thumb: { backgroundColor: theme.colors.dangerForeground },
+        label: { color: theme.colors.danger }
+      })
+    }
+  },
+  compoundVariants: [
+    {
+      when: { variant: "primary" },
+      style: (theme) => ({ indicator: theme.shadows.field })
+    }
+  ],
+  states: {
+    disabled: (theme) => ({ root: { opacity: theme.opacity.disabled } })
+  },
+  defaultVariants: { variant: "secondary", size: "md" }
+});
+
+// src/components/radio/radio.tsx
+import { Fragment, jsx as jsx3, jsxs } from "react/jsx-runtime";
+var RadioRoot = forwardRef3(function Radio({
+  children,
+  variant,
+  size,
+  radius,
+  color,
+  isSelected,
+  defaultSelected = false,
+  onSelectedChange,
+  isInvalid = false,
+  isDisabled = false,
+  asChild = false,
+  accessibilityRole,
+  accessibilityState,
+  animation,
+  style,
+  onPress,
+  onPressIn,
+  onPressOut,
+  ...props
+}, ref) {
+  const theme = useXAUITheme();
+  const [styleProps, rest] = useStyleProps(props);
+  const [isPressed, press] = usePressState({ onPressIn, onPressOut });
+  const [selected, setSelected] = useControllableState({
+    value: isSelected,
+    defaultValue: defaultSelected,
+    onChange: onSelectedChange
+  });
+  const handlePress = useCallback(
+    (event) => {
+      setSelected(true);
+      onPress?.(event);
+    },
+    [setSelected, onPress]
+  );
+  const selection = {
+    variant,
+    size,
+    radius,
+    isInvalid: isInvalid ? "true" : void 0
+  };
+  const states = { pressed: isPressed, disabled: isDisabled };
+  const styles = radioRecipe.resolve({ theme, selection, states });
+  const tint = color && !isInvalid ? radioRecipe.tint({ theme, color, selection, states }) : void 0;
+  const context = useMemo(
+    () => ({
+      // The tint never reaches the circle at rest — only the fill and the dot that say it
+      // is the chosen one. The `Checkbox` says why, at the same line.
+      indicatorStyle: styles.indicator,
+      fillStyle: tint ? [styles.fill, tint.fill] : styles.fill,
+      thumbStyle: tint ? [styles.thumb, tint.thumb] : styles.thumb,
+      labelStyle: styles.label,
+      isSelected: selected,
+      isDisabled,
+      isInvalid
+    }),
+    [styles, tint, selected, isDisabled, isInvalid]
+  );
+  const rootStyle = [
+    styles.root,
+    tint?.root,
+    styleProps,
+    typeof style === "function" ? style({ pressed: isPressed }) : style
+  ];
+  const text = childrenToString(children);
+  const content = text !== null ? /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx3(RadioIndicator, {}),
+    /* @__PURE__ */ jsx3(RadioLabel, { children: text })
+  ] }) : children ?? /* @__PURE__ */ jsx3(RadioIndicator, {});
+  return /* @__PURE__ */ jsx3(RadioProvider, { value: context, children: /* @__PURE__ */ jsx3(
+    PressableFeedback,
+    {
+      ref,
+      isPressed,
+      isDisabled,
+      asChild,
+      animation,
+      accessibilityRole: accessibilityRole ?? "radio",
+      accessibilityState: {
+        checked: selected,
+        disabled: isDisabled,
+        ...accessibilityState
+      },
+      "aria-invalid": isInvalid,
+      ...rest,
+      style: rootStyle,
+      onPress: handlePress,
+      onPressIn: press.onPressIn,
+      onPressOut: press.onPressOut,
+      children: asChild ? children : content
+    }
+  ) });
+});
+RadioRoot.displayName = "XAUI.Radio.Root";
+
+// src/components/radio/index.ts
+var Radio2 = Object.assign(RadioRoot, {
+  Indicator: RadioIndicator,
+  Label: RadioLabel
+});
+
+export {
+  useRadio,
+  RadioIndicator,
+  RadioLabel,
+  radioRecipe,
+  RadioRoot,
+  Radio2 as Radio
+};

package/dist/chunk-NCTOTTVW.js

@@ -0,0 +1,13 @@
+import {
+  mergeRefs
+} from "./chunk-36PRYGAM.js";
+
+// src/hooks/use-merged-ref.ts
+import { useMemo } from "react";
+function useMergedRef(...refs) {
+  return useMemo(() => mergeRefs(...refs), refs);
+}
+
+export {
+  useMergedRef
+};

package/dist/chunk-NWGLP6JX.cjs

@@ -0,0 +1,410 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : {
+    default: obj
+  };
+}
+function _optionalChain(ops) {
+  let lastAccessLHS = undefined;
+  let value = ops[0];
+  let i = 1;
+  while (i < ops.length) {
+    const op = ops[i];
+    const fn = ops[i + 1];
+    i += 2;
+    if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) {
+      return undefined;
+    }
+    if (op === 'access' || op === 'optionalAccess') {
+      lastAccessLHS = value;
+      value = fn(value);
+    } else if (op === 'call' || op === 'optionalCall') {
+      value = fn((...args) => value.call(lastAccessLHS, ...args));
+      lastAccessLHS = undefined;
+    }
+  }
+  return value;
+}
+var _chunk4KFKWBN5cjs = require('./chunk-4KFKWBN5.cjs');
+var _chunkFNEUOBCVcjs = require('./chunk-FNEUOBCV.cjs');
+var _chunk57SJ4LJFcjs = require('./chunk-57SJ4LJF.cjs');
+var _chunk7GHM4GKLcjs = require('./chunk-7GHM4GKL.cjs');
+var _chunkTK44VBIEcjs = require('./chunk-TK44VBIE.cjs');
+
+// src/components/avatar/avatar-fallback.tsx
+var _react = require('react');
+var _reactnative = require('react-native');
+
+// src/components/avatar/avatar-initials.tsx
+
+// src/components/avatar/avatar.context.ts
+var [AvatarProvider, useAvatar] = _chunk7GHM4GKLcjs.createSlotContext.call(void 0, "Avatar");
+
+// src/components/avatar/avatar-initials.tsx
+var _jsxruntime = require('react/jsx-runtime');
+var AvatarInitials = _react.forwardRef.call(void 0, function AvatarInitials2({
+  children,
+  style,
+  ...props
+}, ref) {
+  const {
+    initialsStyle
+  } = useAvatar();
+  const [styleProps, rest] = _chunkTK44VBIEcjs.useStyleProps.call(void 0, props);
+  return /* @__PURE__ */_jsxruntime.jsx.call(void 0, _reactnative.Text, {
+    ref,
+    accessibilityElementsHidden: true,
+    importantForAccessibility: "no",
+    numberOfLines: 1,
+    ...rest,
+    style: [initialsStyle, styleProps, style],
+    children
+  });
+});
+AvatarInitials.displayName = "XAUI.Avatar.Initials";
+
+// src/components/avatar/avatar-fallback.tsx
+
+var AvatarFallback = _react.forwardRef.call(void 0, function AvatarFallback2({
+  children,
+  style,
+  ...props
+}, ref) {
+  const {
+    fallbackStyle,
+    icon
+  } = useAvatar();
+  const [styleProps, rest] = _chunkTK44VBIEcjs.useStyleProps.call(void 0, props);
+  const text = _chunk7GHM4GKLcjs.childrenToString.call(void 0, children);
+  const content = text !== null ? /* @__PURE__ */_jsxruntime.jsx.call(void 0, AvatarInitials, {
+    children: text
+  }) : children;
+  return /* @__PURE__ */_jsxruntime.jsx.call(void 0, _reactnative.View, {
+    ref,
+    style: [fallbackStyle, styleProps, style],
+    ...rest,
+    children: /* @__PURE__ */_jsxruntime.jsx.call(void 0, _chunk4KFKWBN5cjs.IconContext.Provider, {
+      value: icon,
+      children: content
+    })
+  });
+});
+AvatarFallback.displayName = "XAUI.Avatar.Fallback";
+
+// src/components/avatar/avatar-image.tsx
+
+var _reactnativereanimated = require('react-native-reanimated');
+var _reactnativereanimated2 = _interopRequireDefault(_reactnativereanimated);
+
+// src/components/avatar/avatar.style.ts
+
+var avatarSheet = _reactnative.StyleSheet.create({
+  image: {
+    position: "absolute",
+    top: 0,
+    bottom: 0,
+    start: 0,
+    end: 0
+  }
+});
+
+// src/components/avatar/avatar-image.tsx
+
+var FADE_DURATION = 200;
+var AvatarImage = _react.forwardRef.call(void 0, function AvatarImage2({
+  animation = true,
+  style,
+  ...props
+}, ref) {
+  const [styleProps, rest] = _chunkTK44VBIEcjs.useStyleProps.call(void 0, props);
+  const frameStyle = [avatarSheet.image, styleProps, style];
+  if (!animation) return /* @__PURE__ */_jsxruntime.jsx.call(void 0, _reactnative.Image, {
+    ref,
+    ...rest,
+    style: frameStyle
+  });
+  return /* @__PURE__ */_jsxruntime.jsx.call(void 0, FadingImage, {
+    ref,
+    ...rest,
+    style: frameStyle
+  });
+});
+AvatarImage.displayName = "XAUI.Avatar.Image";
+const _worklet_17449085045817_init_data = {
+  code: "function chunkNWGLP6JXCjs1(){const{opacity}=this.__closure;return{opacity:opacity.value};}",
+  location: "/home/runner/work/xaui/xaui/packages/native/dist/chunk-NWGLP6JX.cjs",
+  sourceMap: "{\"version\":3,\"names\":[\"chunkNWGLP6JXCjs1\",\"opacity\",\"__closure\",\"value\"],\"sources\":[\"/home/runner/work/xaui/xaui/packages/native/dist/chunk-NWGLP6JX.cjs\"],\"mappings\":\"AAoG+E,SAAAA,iBAAMA,CAAA,QAAAC,OAAA,OAAAC,SAAA,CAE/E,MAAO,CAAED,OAAO,CAAEA,OAAO,CAACE,KAAM,CAAC,CACnC\",\"ignoreList\":[]}"
+};
+var FadingImage = _react.forwardRef.call(void 0, function FadingImage2({
+  onLoad,
+  style,
+  ...props
+}, ref) {
+  const opacity = _reactnativereanimated.useSharedValue.call(void 0, 0);
+  const handleLoad = _react.useCallback.call(void 0, event => {
+    opacity.value = _reactnativereanimated.withTiming.call(void 0, 1, {
+      duration: FADE_DURATION
+    });
+    _optionalChain([onLoad, 'optionalCall', _ => _(event)]);
+  }, [opacity, onLoad]);
+  const animatedStyle = _reactnativereanimated.useAnimatedStyle.call(void 0, function chunkNWGLP6JXCjs1Factory({
+    _worklet_17449085045817_init_data,
+    opacity
+  }) {
+    const _e = [new global.Error(), -2, -27];
+    const chunkNWGLP6JXCjs1 = function () {
+      return {
+        opacity: opacity.value
+      };
+    };
+    chunkNWGLP6JXCjs1.__closure = {
+      opacity
+    };
+    chunkNWGLP6JXCjs1.__workletHash = 17449085045817;
+    chunkNWGLP6JXCjs1.__pluginVersion = "0.7.4";
+    chunkNWGLP6JXCjs1.__initData = _worklet_17449085045817_init_data;
+    chunkNWGLP6JXCjs1.__stackDetails = _e;
+    return chunkNWGLP6JXCjs1;
+  }({
+    _worklet_17449085045817_init_data,
+    opacity
+  }), [opacity]);
+  return /* @__PURE__ */_jsxruntime.jsx.call(void 0, _reactnativereanimated2.default.Image, {
+    ref,
+    ...props,
+    onLoad: handleLoad,
+    style: [style, animatedStyle]
+  });
+});
+
+// src/components/avatar/avatar.tsx
+
+// src/components/avatar/avatar.recipe.ts
+var SLOTS = ["root", "fallback", "initials", "icon"];
+var VARIANT_TOKENS = {
+  primary: {
+    bg: "accent",
+    fg: "accentForeground"
+  },
+  secondary: {
+    bg: "accentSoft",
+    fg: "accentSoftForeground"
+  },
+  default: {
+    bg: "default",
+    fg: "defaultForeground"
+  },
+  tertiary: {
+    border: "border",
+    fg: "foreground"
+  },
+  ghost: {
+    fg: "foreground"
+  },
+  success: {
+    bg: "success",
+    fg: "successForeground"
+  },
+  "success-soft": {
+    bg: "successSoft",
+    fg: "successSoftForeground"
+  },
+  warning: {
+    bg: "warning",
+    fg: "warningForeground"
+  },
+  "warning-soft": {
+    bg: "warningSoft",
+    fg: "warningSoftForeground"
+  },
+  danger: {
+    bg: "danger",
+    fg: "dangerForeground"
+  },
+  "danger-soft": {
+    bg: "dangerSoft",
+    fg: "dangerSoftForeground"
+  }
+};
+function sizeAxis(step) {
+  return theme => {
+    const diameter = theme.spacing(step.diameter);
+    return {
+      root: {
+        width: diameter,
+        height: diameter
+      },
+      initials: {
+        fontSize: theme.fontSizes[step.initials],
+        lineHeight: theme.lineHeights[step.initials]
+      },
+      icon: {
+        fontSize: theme.fontSizes[step.glyph]
+      }
+    };
+  };
+}
+var SIZES = {
+  xs: {
+    diameter: 8,
+    initials: "xs",
+    glyph: "xs"
+  },
+  sm: {
+    diameter: 10,
+    initials: "xs",
+    glyph: "sm"
+  },
+  md: {
+    diameter: 12,
+    initials: "sm",
+    glyph: "md"
+  },
+  lg: {
+    diameter: 16,
+    initials: "md",
+    glyph: "xl"
+  }
+};
+var avatarRecipe = _chunkFNEUOBCVcjs.createRecipe.call(void 0, {
+  slots: SLOTS,
+  base: theme => ({
+    root: {
+      alignItems: "center",
+      justifyContent: "center",
+      // The clip is what makes a square photo round, so unlike on the `Chip` it is not
+      // optional here: without it the image is a rectangle sitting over a circle.
+      overflow: "hidden",
+      // Squircle corners for when `radius` overrides the circle. Free on Android.
+      borderCurve: "continuous",
+      borderWidth: 0
+    },
+    fallback: {
+      width: "100%",
+      height: "100%",
+      alignItems: "center",
+      justifyContent: "center"
+    },
+    initials: {
+      fontFamily: theme.fontFamilies.body,
+      fontWeight: theme.fontWeights.medium,
+      // Two letters in a circle sit off-centre by the descender otherwise.
+      textAlign: "center"
+    }
+  }),
+  variantTokens: VARIANT_TOKENS,
+  /**
+   * Where the variant's colours land, for every variant at once. The border width follows
+   * the *presence* of the border role, so `ghost` needs no rule of its own to say it has
+   * no edge.
+   *
+   * The image takes no colour: it is a photograph, and tinting one is what `Icon`'s
+   * `source` form is for.
+   */
+  paint: (theme, colors) => ({
+    root: {
+      backgroundColor: colors.bg,
+      borderColor: colors.border,
+      borderWidth: colors.border ? theme.borderWidth.default : 0
+    },
+    initials: {
+      color: colors.fg
+    },
+    icon: {
+      color: colors.fg
+    }
+  }),
+  /** Declaration order is application order: `radius` overrides the circle `base` set. */
+  variants: {
+    size: {
+      xs: sizeAxis(SIZES.xs),
+      sm: sizeAxis(SIZES.sm),
+      md: sizeAxis(SIZES.md),
+      lg: sizeAxis(SIZES.lg)
+    },
+    radius: _chunkFNEUOBCVcjs.radiusAxis.call(void 0, "root")
+  },
+  /**
+   * A circle at every size, where HeroUI fixes one large radius for all three — which
+   * makes their small avatars round and their large ones squircles. `full` says the shape
+   * the name means once, and `radius` is still there for the logo that wants a square.
+   */
+  defaultVariants: {
+    variant: "default",
+    size: "md",
+    radius: "full"
+  }
+});
+
+// src/components/avatar/avatar.tsx
+
+var AvatarRoot = _react.forwardRef.call(void 0, function Avatar({
+  children,
+  variant,
+  size,
+  radius,
+  color,
+  asChild = false,
+  style,
+  ...props
+}, ref) {
+  const theme = _chunk57SJ4LJFcjs.useXAUITheme.call(void 0);
+  const [styleProps, rest] = _chunkTK44VBIEcjs.useStyleProps.call(void 0, props);
+  const selection = {
+    variant,
+    size,
+    radius
+  };
+  const styles = avatarRecipe.resolve({
+    theme,
+    selection
+  });
+  const tint = color ? avatarRecipe.tint({
+    theme,
+    color,
+    selection
+  }) : void 0;
+  const context = _react.useMemo.call(void 0, () => {
+    const icon = _reactnative.StyleSheet.flatten([styles.icon, _optionalChain([tint, 'optionalAccess', _2 => _2.icon])]);
+    return {
+      fallbackStyle: styles.fallback,
+      initialsStyle: tint ? [styles.initials, tint.initials] : styles.initials,
+      icon: {
+        size: icon.fontSize,
+        // `ColorValue` also covers the platform's opaque colours, which `Icon` cannot
+        // hand to a third-party component expecting a string.
+        color: typeof icon.color === "string" ? icon.color : void 0
+      }
+    };
+  }, [styles, tint]);
+  const rootStyle = [styles.root, _optionalChain([tint, 'optionalAccess', _3 => _3.root]), styleProps, style];
+  const text = _chunk7GHM4GKLcjs.childrenToString.call(void 0, children);
+  const content = text !== null ? /* @__PURE__ */_jsxruntime.jsx.call(void 0, AvatarFallback, {
+    children: text
+  }) : children;
+  const Root = asChild ? _chunk7GHM4GKLcjs.Slot : _reactnative.View;
+  return /* @__PURE__ */_jsxruntime.jsx.call(void 0, AvatarProvider, {
+    value: context,
+    children: /* @__PURE__ */_jsxruntime.jsx.call(void 0, Root, {
+      ref,
+      ...rest,
+      style: rootStyle,
+      children: asChild ? children : content
+    })
+  });
+});
+AvatarRoot.displayName = "XAUI.Avatar.Root";
+
+// src/components/avatar/index.ts
+var Avatar2 = Object.assign(AvatarRoot, {
+  Image: AvatarImage,
+  Fallback: AvatarFallback,
+  Initials: AvatarInitials
+});
+exports.useAvatar = useAvatar;
+exports.avatarRecipe = avatarRecipe;
+exports.Avatar = Avatar2;