@tamagui/text 1.74.2 → 1.74.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -21,7 +21,8 @@ var import_get_font_sized = require("@tamagui/get-font-sized"), import_web = req
21
21
  const variants = {
22
22
  unstyled: {
23
23
  false: {
24
- size: "$true"
24
+ size: "$true",
25
+ color: "$color"
25
26
  }
26
27
  },
27
28
  size: import_get_font_sized.getFontSized
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/SizableText.tsx"],
4
- "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA6B,oCAC7B,aAAuC;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,eAAO,oCAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,kBAAc,mBAAO,iBAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
4
+ "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA6B,oCAC7B,aAAuC;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,MACN,OAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,eAAO,oCAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,kBAAc,mBAAO,iBAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
5
5
  "names": []
6
6
  }
@@ -22,7 +22,8 @@ var import_get_font_sized = require("@tamagui/get-font-sized"), import_web = req
22
22
  const variants = {
23
23
  unstyled: {
24
24
  false: {
25
- size: "$true"
25
+ size: "$true",
26
+ color: "$color"
26
27
  }
27
28
  },
28
29
  size: import_get_font_sized.getFontSized
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/SizableText.tsx"],
4
- "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA6B,oCAC7B,aAAuC;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,eAAO,oCAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,kBAAc,mBAAO,iBAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
4
+ "mappings": ";;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAA6B,oCAC7B,aAAuC;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,MACN,OAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,eAAO,oCAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,kBAAc,mBAAO,iBAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
5
5
  "names": []
6
6
  }
@@ -0,0 +1,44 @@
1
+ import { styled } from "@tamagui/web";
2
+ import { Paragraph } from "./Paragraph";
3
+ const Heading = styled(Paragraph, {
4
+ tag: "span",
5
+ name: "Heading",
6
+ accessibilityRole: "header",
7
+ fontFamily: "$heading",
8
+ size: "$8",
9
+ margin: 0
10
+ }), H1 = styled(Heading, {
11
+ name: "H1",
12
+ tag: "h1",
13
+ size: "$10"
14
+ }), H2 = styled(Heading, {
15
+ name: "H2",
16
+ tag: "h2",
17
+ size: "$9"
18
+ }), H3 = styled(Heading, {
19
+ name: "H3",
20
+ tag: "h3",
21
+ size: "$8"
22
+ }), H4 = styled(Heading, {
23
+ name: "H4",
24
+ tag: "h4",
25
+ size: "$7"
26
+ }), H5 = styled(Heading, {
27
+ name: "H5",
28
+ tag: "h5",
29
+ size: "$6"
30
+ }), H6 = styled(Heading, {
31
+ name: "H6",
32
+ tag: "h6",
33
+ size: "$5"
34
+ });
35
+ export {
36
+ H1,
37
+ H2,
38
+ H3,
39
+ H4,
40
+ H5,
41
+ H6,
42
+ Heading
43
+ };
44
+ //# sourceMappingURL=Headings.js.map
@@ -0,0 +1,6 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../../src/Headings.tsx"],
4
+ "mappings": "AAAA,SAAmB,cAAc;AAEjC,SAAS,iBAAiB;AAEnB,MAAM,UAAU,OAAO,WAAW;AAAA,EACvC,KAAK;AAAA,EACL,MAAM;AAAA,EACN,mBAAmB;AAAA,EACnB,YAAY;AAAA,EACZ,MAAM;AAAA,EACN,QAAQ;AACV,CAAC,GAIY,KAAK,OAAO,SAAS;AAAA,EAChC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,MAAM;AACR,CAAC,GAEY,KAAK,OAAO,SAAS;AAAA,EAChC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,MAAM;AACR,CAAC,GAEY,KAAK,OAAO,SAAS;AAAA,EAChC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,MAAM;AACR,CAAC,GAEY,KAAK,OAAO,SAAS;AAAA,EAChC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,MAAM;AACR,CAAC,GAEY,KAAK,OAAO,SAAS;AAAA,EAChC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,MAAM;AACR,CAAC,GAEY,KAAK,OAAO,SAAS;AAAA,EAChC,MAAM;AAAA,EACN,KAAK;AAAA,EACL,MAAM;AACR,CAAC;",
5
+ "names": []
6
+ }
@@ -0,0 +1,13 @@
1
+ import { styled } from "@tamagui/web";
2
+ import { SizableText } from "./SizableText";
3
+ const Paragraph = styled(SizableText, {
4
+ name: "Paragraph",
5
+ tag: "p",
6
+ userSelect: "auto",
7
+ color: "$color",
8
+ size: "$true"
9
+ });
10
+ export {
11
+ Paragraph
12
+ };
13
+ //# sourceMappingURL=Paragraph.js.map
@@ -0,0 +1,6 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../../src/Paragraph.tsx"],
4
+ "mappings": "AAAA,SAAmB,cAAc;AAEjC,SAAS,mBAAmB;AAErB,MAAM,YAAY,OAAO,aAAa;AAAA,EAC3C,MAAM;AAAA,EACN,KAAK;AAAA,EACL,YAAY;AAAA,EACZ,OAAO;AAAA,EACP,MAAM;AACR,CAAC;",
5
+ "names": []
6
+ }
@@ -3,7 +3,8 @@ import { Text, styled } from "@tamagui/web";
3
3
  const variants = {
4
4
  unstyled: {
5
5
  false: {
6
- size: "$true"
6
+ size: "$true",
7
+ color: "$color"
7
8
  }
8
9
  },
9
10
  size: getFontSized
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/SizableText.tsx"],
4
- "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAmB,MAAM,cAAc;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,WAAO,aAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,cAAc,OAAO,MAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
4
+ "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAmB,MAAM,cAAc;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,MACN,OAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,WAAO,aAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,cAAc,OAAO,MAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
5
5
  "names": []
6
6
  }
@@ -0,0 +1,29 @@
1
+ import { getFontSized } from "@tamagui/get-font-sized";
2
+ import { Text, styled } from "@tamagui/web";
3
+ const variants = {
4
+ unstyled: {
5
+ false: {
6
+ size: "$true",
7
+ color: "$color"
8
+ }
9
+ },
10
+ size: getFontSized
11
+ };
12
+ variants.fontFamily = {
13
+ "...": (_, extras) => {
14
+ const size = extras.props.size || "$true";
15
+ return getFontSized(size, extras);
16
+ }
17
+ };
18
+ const SizableText = styled(Text, {
19
+ name: "SizableText",
20
+ fontFamily: "$body",
21
+ variants,
22
+ defaultVariants: {
23
+ unstyled: !1
24
+ }
25
+ });
26
+ export {
27
+ SizableText
28
+ };
29
+ //# sourceMappingURL=SizableText.js.map
@@ -0,0 +1,6 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../../src/SizableText.tsx"],
4
+ "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAmB,MAAM,cAAc;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,MACN,OAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,WAAO,aAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,cAAc,OAAO,MAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
5
+ "names": []
6
+ }
@@ -0,0 +1,6 @@
1
+ export * from "./SizableText";
2
+ export * from "./Paragraph";
3
+ export * from "./Headings";
4
+ export * from "./wrapChildrenInText";
5
+ export * from "./types";
6
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1,6 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../../src/index.tsx"],
4
+ "mappings": "AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;",
5
+ "names": []
6
+ }
@@ -0,0 +1 @@
1
+ //# sourceMappingURL=types.js.map
@@ -0,0 +1,6 @@
1
+ {
2
+ "version": 3,
3
+ "sources": [],
4
+ "mappings": "",
5
+ "names": []
6
+ }
@@ -0,0 +1,31 @@
1
+ import React from "react";
2
+ import { jsx } from "react/jsx-runtime";
3
+ function wrapChildrenInText(TextComponent, propsIn, extraProps) {
4
+ const {
5
+ children,
6
+ textProps,
7
+ size,
8
+ noTextWrap,
9
+ color,
10
+ fontFamily,
11
+ fontSize,
12
+ fontWeight,
13
+ letterSpacing,
14
+ textAlign,
15
+ fontStyle,
16
+ maxFontSizeMultiplier
17
+ } = propsIn;
18
+ if (noTextWrap || !children)
19
+ return [children];
20
+ const props = {
21
+ ...extraProps
22
+ };
23
+ return color && (props.color = color), fontFamily && (props.fontFamily = fontFamily), fontSize && (props.fontSize = fontSize), fontWeight && (props.fontWeight = fontWeight), letterSpacing && (props.letterSpacing = letterSpacing), textAlign && (props.textAlign = textAlign), size && (props.size = size), fontStyle && (props.fontStyle = fontStyle), maxFontSizeMultiplier && (props.maxFontSizeMultiplier = maxFontSizeMultiplier), React.Children.toArray(children).map((child, index) => typeof child == "string" ? (
24
+ // so "data-disable-theme" is a hack to fix themeInverse, don't ask me why
25
+ /* @__PURE__ */ jsx(TextComponent, { ...props, ...textProps, children: child }, index)
26
+ ) : child);
27
+ }
28
+ export {
29
+ wrapChildrenInText
30
+ };
31
+ //# sourceMappingURL=wrapChildrenInText.js.map
@@ -0,0 +1,6 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../../src/wrapChildrenInText.tsx"],
4
+ "mappings": "AACA,OAAO,WAAW;AAqDZ;AA5CC,SAAS,mBACd,eACA,SAGA,YACA;AACA,QAAM;AAAA,IACJ;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IAAI;AAEJ,MAAI,cAAc,CAAC;AACjB,WAAO,CAAC,QAAQ;AAGlB,QAAM,QAAQ;AAAA,IACZ,GAAG;AAAA,EACL;AAGA,SAAI,UAAO,MAAM,QAAQ,QACrB,eAAY,MAAM,aAAa,aAC/B,aAAU,MAAM,WAAW,WAC3B,eAAY,MAAM,aAAa,aAC/B,kBAAe,MAAM,gBAAgB,gBACrC,cAAW,MAAM,YAAY,YAC7B,SAAM,MAAM,OAAO,OACnB,cAAW,MAAM,YAAY,YAC7B,0BAAuB,MAAM,wBAAwB,wBAElD,MAAM,SAAS,QAAQ,QAAQ,EAAE,IAAI,CAAC,OAAO,UAC3C,OAAO,SAAU;AAAA;AAAA,IAEtB,oBAAC,iBAA2B,GAAG,OAAQ,GAAG,WACvC,mBADiB,KAEpB;AAAA,MAEA,KAEH;AACH;",
5
+ "names": []
6
+ }
@@ -3,7 +3,8 @@ import { Text, styled } from "@tamagui/web";
3
3
  const variants = {
4
4
  unstyled: {
5
5
  false: {
6
- size: "$true"
6
+ size: "$true",
7
+ color: "$color"
7
8
  }
8
9
  },
9
10
  size: getFontSized
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/SizableText.tsx"],
4
- "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAmB,MAAM,cAAc;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,WAAO,aAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,cAAc,OAAO,MAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
4
+ "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAmB,MAAM,cAAc;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,MACN,OAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,WAAO,aAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,cAAc,OAAO,MAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
5
5
  "names": []
6
6
  }
@@ -3,7 +3,8 @@ import { Text, styled } from "@tamagui/web";
3
3
  const variants = {
4
4
  unstyled: {
5
5
  false: {
6
- size: "$true"
6
+ size: "$true",
7
+ color: "$color"
7
8
  }
8
9
  },
9
10
  size: getFontSized
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../../src/SizableText.tsx"],
4
- "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAmB,MAAM,cAAc;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,IACR;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,WAAO,aAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,cAAc,OAAO,MAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
4
+ "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAmB,MAAM,cAAc;AAEvC,MAAM,WAAW;AAAA,EACf,UAAU;AAAA,IACR,OAAO;AAAA,MACL,MAAM;AAAA,MACN,OAAO;AAAA,IACT;AAAA,EACF;AAAA,EAEA,MAAM;AACR;AAKA,SAAS,aAAgB;AAAA,EACvB,OAAO,CAAC,GAAG,WAAW;AACpB,UAAM,OAAO,OAAO,MAAM,QAAW;AACrC,WAAO,aAAa,MAAM,MAAM;AAAA,EAClC;AACF;AAEO,MAAM,cAAc,OAAO,MAAM;AAAA,EACtC,MAAM;AAAA,EACN,YAAY;AAAA,EAEZ;AAAA,EAEA,iBAAiB;AAAA,IACf,UAAU;AAAA,EACZ;AACF,CAAC;",
5
5
  "names": []
6
6
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/text",
3
- "version": "1.74.2",
3
+ "version": "1.74.4",
4
4
  "sideEffects": [
5
5
  "*.css"
6
6
  ],
@@ -31,15 +31,15 @@
31
31
  }
32
32
  },
33
33
  "dependencies": {
34
- "@tamagui/get-font-sized": "1.74.2",
35
- "@tamagui/helpers-tamagui": "1.74.2",
36
- "@tamagui/web": "1.74.2"
34
+ "@tamagui/get-font-sized": "1.74.4",
35
+ "@tamagui/helpers-tamagui": "1.74.4",
36
+ "@tamagui/web": "1.74.4"
37
37
  },
38
38
  "peerDependencies": {
39
39
  "react": "*"
40
40
  },
41
41
  "devDependencies": {
42
- "@tamagui/build": "1.74.2",
42
+ "@tamagui/build": "1.74.4",
43
43
  "react": "^18.2.0"
44
44
  },
45
45
  "publishConfig": {
@@ -5,6 +5,7 @@ const variants = {
5
5
  unstyled: {
6
6
  false: {
7
7
  size: '$true',
8
+ color: '$color',
8
9
  },
9
10
  },
10
11
 
@@ -1 +1 @@
1
- {"version":3,"file":"SizableText.d.ts","sourceRoot":"","sources":["../src/SizableText.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAgB,MAAM,cAAc,CAAA;AAsBrD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;EAStB,CAAA;AAEF,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAA"}
1
+ {"version":3,"file":"SizableText.d.ts","sourceRoot":"","sources":["../src/SizableText.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAgB,MAAM,cAAc,CAAA;AAuBrD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;EAStB,CAAA;AAEF,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,OAAO,WAAW,CAAC,CAAA"}