@xaui/native 0.9.1-alpha.20 → 0.9.1-alpha.22

package/dist/chunk-FTCTTBLG.js

@@ -0,0 +1,449 @@
+import {
+  PressableFeedback,
+  usePressState,
+  warnDev
+} from "./chunk-KM2TI5IC.js";
+import {
+  createRecipe
+} from "./chunk-3JATAB7S.js";
+import {
+  useXAUITheme
+} from "./chunk-A3EGFI6T.js";
+import {
+  Slot,
+  childrenToString,
+  createSlotContext,
+  useStyleProps
+} from "./chunk-PMO62QK4.js";
+
+// src/components/card/card-background.tsx
+import { forwardRef } from "react";
+import { Image, View } from "react-native";
+
+// src/components/card/card.utils.ts
+import { Children, isValidElement } from "react";
+var CARD_BACKGROUND = /* @__PURE__ */ Symbol.for("xaui.Card.background");
+function markBackground(component) {
+  return Object.assign(component, { [CARD_BACKGROUND]: true });
+}
+function isBackground(node) {
+  if (!isValidElement(node)) return false;
+  const type = node.type;
+  if (typeof type !== "function" && typeof type !== "object") return false;
+  if (type === null) return false;
+  return type[CARD_BACKGROUND] === true;
+}
+function partitionBackground(children) {
+  const all = Children.toArray(children);
+  const index = all.findIndex(isBackground);
+  if (index === -1) return { background: null, content: children };
+  return {
+    background: all[index],
+    content: all.filter((_, at) => at !== index)
+  };
+}
+
+// src/components/card/card.context.ts
+var [CardProvider, useCard] = createSlotContext("Card");
+
+// src/components/card/card.style.ts
+import { StyleSheet } from "react-native";
+var cardSheet = StyleSheet.create({
+  backgroundImage: { width: "100%", height: "100%" }
+});
+
+// src/components/card/card-background.tsx
+import { jsx } from "react/jsx-runtime";
+var CardBackground = markBackground(
+  forwardRef(function CardBackground2({ children, source, style, ...props }, ref) {
+    const { backgroundStyle } = useCard();
+    const [styleProps, rest] = useStyleProps(props);
+    return /* @__PURE__ */ jsx(
+      View,
+      {
+        ref,
+        accessibilityElementsHidden: true,
+        importantForAccessibility: "no-hide-descendants",
+        ...rest,
+        style: [backgroundStyle, styleProps, style],
+        children: source ? /* @__PURE__ */ jsx(Image, { source, style: cardSheet.backgroundImage }) : children
+      }
+    );
+  })
+);
+CardBackground.displayName = "XAUI.Card.Background";
+
+// src/components/card/card-body.tsx
+import { forwardRef as forwardRef2 } from "react";
+import { View as View2 } from "react-native";
+import { jsx as jsx2 } from "react/jsx-runtime";
+var CardBody = forwardRef2(function CardBody2({ children, style, ...props }, ref) {
+  const { bodyStyle } = useCard();
+  const [styleProps, rest] = useStyleProps(props);
+  return /* @__PURE__ */ jsx2(View2, { ref, style: [bodyStyle, styleProps, style], ...rest, children });
+});
+CardBody.displayName = "XAUI.Card.Body";
+
+// src/components/card/card-description.tsx
+import { forwardRef as forwardRef3 } from "react";
+import { Text } from "react-native";
+import { jsx as jsx3 } from "react/jsx-runtime";
+var CardDescription = forwardRef3(
+  function CardDescription2({ children, style, ...props }, ref) {
+    const { descriptionStyle } = useCard();
+    const [styleProps, rest] = useStyleProps(props);
+    return /* @__PURE__ */ jsx3(Text, { ref, style: [descriptionStyle, styleProps, style], ...rest, children });
+  }
+);
+CardDescription.displayName = "XAUI.Card.Description";
+
+// src/components/card/card-footer.tsx
+import { forwardRef as forwardRef4 } from "react";
+import { View as View3 } from "react-native";
+import { jsx as jsx4 } from "react/jsx-runtime";
+var CardFooter = forwardRef4(function CardFooter2({ children, style, ...props }, ref) {
+  const { footerStyle } = useCard();
+  const [styleProps, rest] = useStyleProps(props);
+  return /* @__PURE__ */ jsx4(View3, { ref, style: [footerStyle, styleProps, style], ...rest, children });
+});
+CardFooter.displayName = "XAUI.Card.Footer";
+
+// src/components/card/card-header.tsx
+import { forwardRef as forwardRef5 } from "react";
+import { View as View4 } from "react-native";
+import { jsx as jsx5 } from "react/jsx-runtime";
+var CardHeader = forwardRef5(function CardHeader2({ children, style, ...props }, ref) {
+  const { headerStyle } = useCard();
+  const [styleProps, rest] = useStyleProps(props);
+  return /* @__PURE__ */ jsx5(View4, { ref, style: [headerStyle, styleProps, style], ...rest, children });
+});
+CardHeader.displayName = "XAUI.Card.Header";
+
+// src/components/card/card-title.tsx
+import { forwardRef as forwardRef6 } from "react";
+import { Text as Text2 } from "react-native";
+import { jsx as jsx6 } from "react/jsx-runtime";
+var CardTitle = forwardRef6(function CardTitle2({ children, style, ...props }, ref) {
+  const { titleStyle } = useCard();
+  const [styleProps, rest] = useStyleProps(props);
+  return /* @__PURE__ */ jsx6(Text2, { ref, style: [titleStyle, styleProps, style], ...rest, children });
+});
+CardTitle.displayName = "XAUI.Card.Title";
+
+// src/components/card/card.tsx
+import { forwardRef as forwardRef7, useMemo } from "react";
+import { View as View5 } from "react-native";
+
+// src/components/card/card.recipe.ts
+var SLOTS = [
+  "root",
+  "background",
+  "header",
+  "body",
+  "footer",
+  "title",
+  "description"
+];
+var VARIANT_TOKENS = {
+  default: { bg: "surface", fg: "surfaceForeground" },
+  secondary: { bg: "surfaceSecondary", fg: "surfaceSecondaryForeground" },
+  tertiary: { border: "border", fg: "foreground" },
+  ghost: { fg: "foreground" }
+};
+var DESCRIPTION_OPACITY = 0.6;
+function sizeAxis(step) {
+  const { padding, gap, contentGap, radius, title, description } = step;
+  return (theme) => ({
+    root: {
+      padding: theme.spacing(padding),
+      gap: theme.spacing(gap),
+      borderRadius: theme.radius[radius]
+    },
+    // The same corner as the root, because this layer is what clips the image — the root
+    // deliberately does not (see `base`), so the radius has to be repeated where the
+    // `overflow` is.
+    background: { borderRadius: theme.radius[radius] },
+    header: { gap: theme.spacing(contentGap) },
+    body: { gap: theme.spacing(contentGap) },
+    footer: { gap: theme.spacing(contentGap) },
+    title: {
+      fontSize: theme.fontSizes[title],
+      lineHeight: theme.lineHeights[title]
+    },
+    description: {
+      fontSize: theme.fontSizes[description],
+      lineHeight: theme.lineHeights[description]
+    }
+  });
+}
+var SIZES = {
+  xs: {
+    padding: 3,
+    gap: 2,
+    contentGap: 1,
+    radius: "lg",
+    title: "sm",
+    description: "xs"
+  },
+  sm: {
+    padding: 3.5,
+    gap: 3,
+    contentGap: 1,
+    radius: "xl",
+    title: "md",
+    description: "sm"
+  },
+  md: {
+    padding: 4,
+    gap: 4,
+    contentGap: 1,
+    radius: "2xl",
+    title: "lg",
+    description: "md"
+  },
+  lg: {
+    padding: 5,
+    gap: 5,
+    contentGap: 1.5,
+    radius: "3xl",
+    title: "xl",
+    description: "lg"
+  }
+};
+function corner(key) {
+  return (theme) => ({
+    root: { borderRadius: theme.radius[key] },
+    background: { borderRadius: theme.radius[key] }
+  });
+}
+var cardRecipe = createRecipe({
+  slots: SLOTS,
+  base: (theme) => ({
+    root: {
+      flexDirection: "column",
+      borderWidth: 0,
+      // iOS's squircle. Free on Android, and it is what makes a card's radius read as a
+      // shape rather than as four arcs meeting straight edges.
+      borderCurve: "continuous"
+      // Deliberately no `overflow: 'hidden'`: on iOS it clips the node's own shadow, so
+      // a `default` card would lose the elevation the variant just gave it. The press
+      // wash rounds itself off the root's corners and needs no clip; a caller bleeding an
+      // image to the edges writes `overflow="hidden"` and takes the trade knowingly.
+    },
+    // R13 — `start` and `end`, never `left` and `right`, even at zero. `overflow` lives
+    // here rather than on the root: on iOS it clips the node's own shadow, and a `default`
+    // card would lose the elevation its variant just gave it.
+    background: {
+      position: "absolute",
+      top: 0,
+      bottom: 0,
+      start: 0,
+      end: 0,
+      overflow: "hidden"
+    },
+    // Top-aligned content — a badge, an icon, a title block. A column pinned to the
+    // leading edge, which RTL mirrors on its own; `flexDirection="row"` is one prop away
+    // for a header that puts an action at the far end.
+    header: { alignItems: "flex-start" },
+    // `flexGrow` and not `flex: 1`. `flex: 1` also sets `flexBasis: 0`, and in a card
+    // whose height comes from its content that measures the body as empty before there
+    // is any free space to give back to it — the collapse is silent and total.
+    body: { flexGrow: 1 },
+    // A footer is an action row: the one section whose common case is horizontal, so it
+    // is the one section that is a row by default.
+    footer: { flexDirection: "row", alignItems: "center" },
+    // `medium`, not `semibold`. A card's title sits in prose rather than on a control:
+    // one weight above the description is enough to rank them, and the heavier step reads
+    // as a section heading the card did not ask for.
+    title: {
+      fontFamily: theme.fontFamilies.heading,
+      fontWeight: theme.fontWeights.medium
+    },
+    description: {
+      fontFamily: theme.fontFamilies.body,
+      fontWeight: theme.fontWeights.regular,
+      opacity: DESCRIPTION_OPACITY
+    }
+  }),
+  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.
+   */
+  paint: (theme, colors) => ({
+    root: {
+      backgroundColor: colors.bg,
+      borderColor: colors.border,
+      borderWidth: colors.border ? theme.borderWidth.default : 0
+    },
+    title: { color: colors.fg },
+    description: { color: colors.fg }
+  }),
+  /** Declaration order is application order: `radius` overrides the radius `size` set. */
+  variants: {
+    size: {
+      xs: sizeAxis(SIZES.xs),
+      sm: sizeAxis(SIZES.sm),
+      md: sizeAxis(SIZES.md),
+      lg: sizeAxis(SIZES.lg)
+    },
+    /**
+     * Both slots move together, always: the background layer is what clips the image, so
+     * a `radius` that moved only the root would round the card and leave its photo square
+     * in the corners.
+     */
+    radius: {
+      xs: corner("xs"),
+      sm: corner("sm"),
+      md: corner("md"),
+      lg: corner("lg"),
+      xl: corner("xl"),
+      "2xl": corner("2xl"),
+      "3xl": corner("3xl"),
+      "4xl": corner("4xl"),
+      field: corner("field"),
+      full: corner("full")
+    }
+  },
+  /**
+   * The elevation belongs to the one variant that is a surface standing on the
+   * background. `secondary` is the level for a card *inside* a card and `tertiary` and
+   * `ghost` have no fill to lift, so a shadow under any of them would read as dirt rather
+   * than as height. In dark mode the theme's `surface` shadow is already nothing (§4),
+   * which is why this names the role instead of a set of numbers.
+   */
+  compoundVariants: [
+    {
+      when: { variant: "default" },
+      style: (theme) => ({ root: theme.shadows.surface })
+    }
+  ],
+  states: {
+    disabled: (theme) => ({ root: { opacity: theme.opacity.disabled } })
+  },
+  defaultVariants: { variant: "default", size: "md" }
+});
+
+// src/components/card/card.tsx
+import { Fragment, jsx as jsx7, jsxs } from "react/jsx-runtime";
+var CardRoot = forwardRef7(function Card({
+  children,
+  variant,
+  size,
+  radius,
+  color,
+  isDisabled = false,
+  isPressable = false,
+  asChild = false,
+  accessibilityRole,
+  accessibilityState,
+  animation,
+  style,
+  onPressIn,
+  onPressOut,
+  ...props
+}, ref) {
+  const theme = useXAUITheme();
+  const [styleProps, rest] = useStyleProps(props);
+  const [isPressed, press] = usePressState({ onPressIn, onPressOut });
+  const selection = { variant, size, radius };
+  const states = { disabled: isDisabled };
+  const styles = cardRecipe.resolve({ theme, selection, states });
+  const tint = color ? cardRecipe.tint({ theme, color, selection, states }) : void 0;
+  const context = useMemo(
+    () => ({
+      backgroundStyle: styles.background,
+      headerStyle: styles.header,
+      bodyStyle: styles.body,
+      footerStyle: styles.footer,
+      titleStyle: tint ? [styles.title, tint.title] : styles.title,
+      descriptionStyle: tint ? [styles.description, tint.description] : styles.description,
+      isDisabled
+    }),
+    [styles, tint, isDisabled]
+  );
+  const rootStyle = [
+    styles.root,
+    tint?.root,
+    styleProps,
+    typeof style === "function" ? style({ pressed: isPressed }) : style
+  ];
+  const text = childrenToString(children);
+  const content = text !== null ? /* @__PURE__ */ jsx7(CardDescription, { children: text }) : children;
+  if (!isPressable && !asChild && (onPressIn || onPressOut || rest.onPress || rest.onLongPress)) {
+    warnDev(
+      "Card: a press handler needs `isPressable`. Without it the card renders a View, which never receives the touch \u2014 add `isPressable` to make it a control."
+    );
+  }
+  const { background, content: body } = partitionBackground(content);
+  const layered = background === null ? body : /* @__PURE__ */ jsxs(Fragment, { children: [
+    background,
+    body
+  ] });
+  const surface = isPressable ? /* @__PURE__ */ jsx7(
+    PressableFeedback,
+    {
+      ref,
+      isPressed,
+      isDisabled,
+      asChild,
+      animation,
+      accessibilityRole: accessibilityRole ?? "button",
+      accessibilityState: { disabled: isDisabled, ...accessibilityState },
+      ...rest,
+      style: rootStyle,
+      onPressIn: press.onPressIn,
+      onPressOut: press.onPressOut,
+      children: asChild ? children : /* @__PURE__ */ jsxs(Fragment, { children: [
+        background,
+        /* @__PURE__ */ jsx7(PressableFeedback.Highlight, {}),
+        body
+      ] })
+    }
+  ) : asChild ? (
+    // R12 — the caller's element is the card, so it takes the children it was written
+    // with and the auto-wrap does not apply.
+    /* @__PURE__ */ jsx7(
+      Slot,
+      {
+        ref,
+        accessibilityRole,
+        accessibilityState,
+        ...rest,
+        style: rootStyle,
+        children
+      }
+    )
+  ) : /* @__PURE__ */ jsx7(
+    View5,
+    {
+      ref,
+      accessibilityRole,
+      accessibilityState,
+      ...rest,
+      style: rootStyle,
+      children: layered
+    }
+  );
+  return /* @__PURE__ */ jsx7(CardProvider, { value: context, children: surface });
+});
+CardRoot.displayName = "XAUI.Card.Root";
+
+// src/components/card/index.ts
+var Card2 = Object.assign(CardRoot, {
+  Background: CardBackground,
+  Header: CardHeader,
+  Body: CardBody,
+  Footer: CardFooter,
+  Title: CardTitle,
+  Description: CardDescription
+});
+
+export {
+  CARD_BACKGROUND,
+  markBackground,
+  useCard,
+  cardRecipe,
+  Card2 as Card
+};

package/dist/chunk-FVP5FUVS.js

@@ -0,0 +1,68 @@
+import {
+  useXAUITheme
+} from "./chunk-A3EGFI6T.js";
+import {
+  useStyleProps
+} from "./chunk-PMO62QK4.js";
+
+// src/system/icon/icon-context.ts
+import { createContext, useContext } from "react";
+var IconContext = createContext({});
+IconContext.displayName = "XAUI.Icon.Context";
+function useIconContext() {
+  return useContext(IconContext);
+}
+
+// src/system/icon/icon.tsx
+import { cloneElement, isValidElement } from "react";
+import { Image } from "react-native";
+import { jsx } from "react/jsx-runtime";
+function Icon(props) {
+  const inherited = useIconContext();
+  const theme = useXAUITheme();
+  const size = props.size ?? inherited.size ?? theme.fontSizes.md;
+  const color = props.color ?? inherited.color ?? theme.colors.foreground;
+  if (props.as) {
+    const Component = props.as;
+    return /* @__PURE__ */ jsx(Component, { size, color });
+  }
+  if (isValidElement(props.children)) {
+    return cloneElement(props.children, {
+      width: size,
+      height: size,
+      color
+    });
+  }
+  if (props.source) return /* @__PURE__ */ jsx(IconImage, { ...props, resolved: { size, color } });
+  throw new Error(
+    "XAUI: Icon needs one of `as` (an icon component), a raw SVG element as its child, or `source` (an image). It renders nothing on its own."
+  );
+}
+Icon.displayName = "XAUI.Icon";
+function IconImage({
+  source,
+  style,
+  resolved,
+  size: _size,
+  color: _color,
+  ...props
+}) {
+  const [styleProps] = useStyleProps(props);
+  return /* @__PURE__ */ jsx(
+    Image,
+    {
+      source,
+      style: [
+        { width: resolved.size, height: resolved.size, tintColor: resolved.color },
+        styleProps,
+        style
+      ]
+    }
+  );
+}
+
+export {
+  IconContext,
+  useIconContext,
+  Icon
+};

package/dist/{chunk-BHTFIZTQ.cjs → chunk-GBPWTFTU.cjs}

@@ -161,7 +161,7 @@ var tokens = {
     foreground: "#18181b",
     surface: "#ffffff",
     surfaceForeground: "#18181b",
-    surfaceSecondary: "#f4f4f5",
+    surfaceSecondary: "#ececee",
     surfaceSecondaryForeground: "#18181b",
     surfaceTertiary: "#e4e4e7",
     surfaceTertiaryForeground: "#18181b",
@@ -179,7 +179,7 @@ var tokens = {
     fieldBorder: "#e4e4e7",
     success: "#15803d",
     successForeground: "#fafafa",
-    warning: "#b45309",
+    warning: "#c2410c",
     warningForeground: "#fafafa",
     danger: "#dc2626",
     dangerForeground: "#fafafa",
@@ -191,7 +191,7 @@ var tokens = {
     link: "#18181b",
     accentPressed: "#8533d3",
     successPressed: "#1b753a",
-    warningPressed: "#a34d13",
+    warningPressed: "#af3e15",
     dangerPressed: "#c72927",
     defaultPressed: "#dbdbde",
     surfacePressed: "#eaeaea",
@@ -204,9 +204,9 @@ var tokens = {
     successSoft: "rgba(21, 128, 61, 0.15)",
     successSoftForeground: "#205f34",
     successSoftPressed: "rgba(21, 128, 61, 0.2)",
-    warningSoft: "rgba(180, 83, 9, 0.15)",
-    warningSoftForeground: "#793f1e",
-    warningSoftPressed: "rgba(180, 83, 9, 0.2)",
+    warningSoft: "rgba(194, 65, 12, 0.15)",
+    warningSoftForeground: "#82361e",
+    warningSoftPressed: "rgba(194, 65, 12, 0.2)",
     dangerSoft: "rgba(220, 38, 38, 0.15)",
     dangerSoftForeground: "#b22b28",
     dangerSoftPressed: "rgba(220, 38, 38, 0.2)",
@@ -249,7 +249,7 @@ var tokens = {
     fieldBorder: "#3f3f46",
     success: "#4ade80",
     successForeground: "#18181b",
-    warning: "#fbbf24",
+    warning: "#fb923c",
     warningForeground: "#18181b",
     danger: "#f87171",
     dangerForeground: "#18181b",
@@ -261,7 +261,7 @@ var tokens = {
     link: "#fafafa",
     accentPressed: "#c691fd",
     successPressed: "#64e18d",
-    warningPressed: "#fbc54b",
+    warningPressed: "#fc9d55",
     dangerPressed: "#fa807e",
     defaultPressed: "#2e2e31",
     surfacePressed: "#27272a",
@@ -274,9 +274,9 @@ var tokens = {
     successSoft: "rgba(74, 222, 128, 0.15)",
     successSoftForeground: "#8de8a6",
     successSoftPressed: "rgba(74, 222, 128, 0.2)",
-    warningSoft: "rgba(251, 191, 36, 0.15)",
-    warningSoftForeground: "#fbd586",
-    warningSoftPressed: "rgba(251, 191, 36, 0.2)",
+    warningSoft: "rgba(251, 146, 60, 0.15)",
+    warningSoftForeground: "#feb887",
+    warningSoftPressed: "rgba(251, 146, 60, 0.2)",
     dangerSoft: "rgba(248, 113, 113, 0.15)",
     dangerSoftForeground: "#fc8f8c",
     dangerSoftPressed: "rgba(248, 113, 113, 0.2)",

package/dist/{chunk-MWXE7D4L.js → chunk-GG2WWCBK.js}

@@ -161,7 +161,7 @@ var tokens = {
     foreground: "#18181b",
     surface: "#ffffff",
     surfaceForeground: "#18181b",
-    surfaceSecondary: "#f4f4f5",
+    surfaceSecondary: "#ececee",
     surfaceSecondaryForeground: "#18181b",
     surfaceTertiary: "#e4e4e7",
     surfaceTertiaryForeground: "#18181b",
@@ -179,7 +179,7 @@ var tokens = {
     fieldBorder: "#e4e4e7",
     success: "#15803d",
     successForeground: "#fafafa",
-    warning: "#b45309",
+    warning: "#c2410c",
     warningForeground: "#fafafa",
     danger: "#dc2626",
     dangerForeground: "#fafafa",
@@ -191,7 +191,7 @@ var tokens = {
     link: "#18181b",
     accentPressed: "#8533d3",
     successPressed: "#1b753a",
-    warningPressed: "#a34d13",
+    warningPressed: "#af3e15",
     dangerPressed: "#c72927",
     defaultPressed: "#dbdbde",
     surfacePressed: "#eaeaea",
@@ -204,9 +204,9 @@ var tokens = {
     successSoft: "rgba(21, 128, 61, 0.15)",
     successSoftForeground: "#205f34",
     successSoftPressed: "rgba(21, 128, 61, 0.2)",
-    warningSoft: "rgba(180, 83, 9, 0.15)",
-    warningSoftForeground: "#793f1e",
-    warningSoftPressed: "rgba(180, 83, 9, 0.2)",
+    warningSoft: "rgba(194, 65, 12, 0.15)",
+    warningSoftForeground: "#82361e",
+    warningSoftPressed: "rgba(194, 65, 12, 0.2)",
     dangerSoft: "rgba(220, 38, 38, 0.15)",
     dangerSoftForeground: "#b22b28",
     dangerSoftPressed: "rgba(220, 38, 38, 0.2)",
@@ -249,7 +249,7 @@ var tokens = {
     fieldBorder: "#3f3f46",
     success: "#4ade80",
     successForeground: "#18181b",
-    warning: "#fbbf24",
+    warning: "#fb923c",
     warningForeground: "#18181b",
     danger: "#f87171",
     dangerForeground: "#18181b",
@@ -261,7 +261,7 @@ var tokens = {
     link: "#fafafa",
     accentPressed: "#c691fd",
     successPressed: "#64e18d",
-    warningPressed: "#fbc54b",
+    warningPressed: "#fc9d55",
     dangerPressed: "#fa807e",
     defaultPressed: "#2e2e31",
     surfacePressed: "#27272a",
@@ -274,9 +274,9 @@ var tokens = {
     successSoft: "rgba(74, 222, 128, 0.15)",
     successSoftForeground: "#8de8a6",
     successSoftPressed: "rgba(74, 222, 128, 0.2)",
-    warningSoft: "rgba(251, 191, 36, 0.15)",
-    warningSoftForeground: "#fbd586",
-    warningSoftPressed: "rgba(251, 191, 36, 0.2)",
+    warningSoft: "rgba(251, 146, 60, 0.15)",
+    warningSoftForeground: "#feb887",
+    warningSoftPressed: "rgba(251, 146, 60, 0.2)",
     dangerSoft: "rgba(248, 113, 113, 0.15)",
     dangerSoftForeground: "#fc8f8c",
     dangerSoftPressed: "rgba(248, 113, 113, 0.2)",