@tamagui/avatar 1.0.1-rc.5 → 1.0.1-rc.6
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.
- package/dist/cjs/Avatar.js +26 -17
- package/dist/cjs/Avatar.js.map +2 -2
- package/dist/esm/Avatar.js +26 -17
- package/dist/esm/Avatar.js.map +2 -2
- package/dist/jsx/Avatar.js +17 -8
- package/dist/jsx/Avatar.js.map +2 -2
- package/package.json +9 -9
- package/src/Avatar.tsx +32 -21
package/dist/cjs/Avatar.js
CHANGED
|
@@ -46,12 +46,19 @@ const IMAGE_NAME = "AvatarImage";
|
|
|
46
46
|
const AvatarImage = React.forwardRef(
|
|
47
47
|
(props, forwardedRef) => {
|
|
48
48
|
var _a;
|
|
49
|
-
const {
|
|
50
|
-
|
|
49
|
+
const {
|
|
50
|
+
__scopeAvatar,
|
|
51
|
+
src,
|
|
52
|
+
onLoadingStatusChange = () => {
|
|
53
|
+
},
|
|
54
|
+
...imageProps
|
|
55
|
+
} = props;
|
|
51
56
|
const context = useAvatarContext(IMAGE_NAME, __scopeAvatar);
|
|
52
57
|
const [status, setStatus] = React.useState("idle");
|
|
53
58
|
const extras = (0, import_core.getVariantExtras)(props);
|
|
54
|
-
const shapeSize = (0, import_core.getVariableValue)(
|
|
59
|
+
const shapeSize = (0, import_core.getVariableValue)(
|
|
60
|
+
(_a = (0, import_shapes.getShapeSize)(context.size, extras)) == null ? void 0 : _a.width
|
|
61
|
+
);
|
|
55
62
|
React.useEffect(() => {
|
|
56
63
|
setStatus("idle");
|
|
57
64
|
}, [JSON.stringify(src)]);
|
|
@@ -115,21 +122,23 @@ const AvatarFrame = (0, import_core.styled)(import_shapes.Square, {
|
|
|
115
122
|
overflow: "hidden"
|
|
116
123
|
});
|
|
117
124
|
const Avatar = (0, import_core.withStaticProperties)(
|
|
118
|
-
React.forwardRef(
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
scope: __scopeAvatar,
|
|
124
|
-
imageLoadingStatus,
|
|
125
|
-
onImageLoadingStatusChange: setImageLoadingStatus,
|
|
126
|
-
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AvatarFrame, {
|
|
125
|
+
React.forwardRef(
|
|
126
|
+
(props, forwardedRef) => {
|
|
127
|
+
const { __scopeAvatar, size = "$4", ...avatarProps } = props;
|
|
128
|
+
const [imageLoadingStatus, setImageLoadingStatus] = React.useState("idle");
|
|
129
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AvatarProvider, {
|
|
127
130
|
size,
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
131
|
+
scope: __scopeAvatar,
|
|
132
|
+
imageLoadingStatus,
|
|
133
|
+
onImageLoadingStatusChange: setImageLoadingStatus,
|
|
134
|
+
children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(AvatarFrame, {
|
|
135
|
+
size,
|
|
136
|
+
...avatarProps,
|
|
137
|
+
ref: forwardedRef
|
|
138
|
+
})
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
),
|
|
133
142
|
{
|
|
134
143
|
Image: AvatarImage,
|
|
135
144
|
Fallback: AvatarFallback
|
package/dist/cjs/Avatar.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Avatar.tsx"],
|
|
4
|
-
"sourcesContent": ["// forked from radix https://github.com/radix-ui/primitives/blob/main/packages/react/avatar/src/Avatar.tsx\n\nimport {\n GetProps,\n SizeTokens,\n TamaguiElement,\n getVariableValue,\n getVariantExtras,\n styled,\n withStaticProperties,\n} from '@tamagui/core'\nimport { Scope, createContextScope } from '@tamagui/create-context'\nimport { Image, ImageProps } from '@tamagui/image'\nimport { Square, getShapeSize } from '@tamagui/shapes'\nimport { YStack } from '@tamagui/stacks'\nimport * as React from 'react'\n\nconst AVATAR_NAME = 'Avatar'\n\ntype ScopedProps<P> = P & { __scopeAvatar?: Scope }\nconst [createAvatarContext, createAvatarScope] = createContextScope(AVATAR_NAME)\n\ntype ImageLoadingStatus = 'idle' | 'loading' | 'loaded' | 'error'\n\ntype AvatarContextValue = {\n size: SizeTokens\n imageLoadingStatus: ImageLoadingStatus\n onImageLoadingStatusChange(status: ImageLoadingStatus): void\n}\n\nconst [AvatarProvider, useAvatarContext]
|
|
5
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"sourcesContent": ["// forked from radix https://github.com/radix-ui/primitives/blob/main/packages/react/avatar/src/Avatar.tsx\n\nimport {\n GetProps,\n SizeTokens,\n TamaguiElement,\n getVariableValue,\n getVariantExtras,\n styled,\n withStaticProperties,\n} from '@tamagui/core'\nimport { Scope, createContextScope } from '@tamagui/create-context'\nimport { Image, ImageProps } from '@tamagui/image'\nimport { Square, getShapeSize } from '@tamagui/shapes'\nimport { YStack } from '@tamagui/stacks'\nimport * as React from 'react'\n\nconst AVATAR_NAME = 'Avatar'\n\ntype ScopedProps<P> = P & { __scopeAvatar?: Scope }\nconst [createAvatarContext, createAvatarScope] = createContextScope(AVATAR_NAME)\n\ntype ImageLoadingStatus = 'idle' | 'loading' | 'loaded' | 'error'\n\ntype AvatarContextValue = {\n size: SizeTokens\n imageLoadingStatus: ImageLoadingStatus\n onImageLoadingStatusChange(status: ImageLoadingStatus): void\n}\n\nconst [AvatarProvider, useAvatarContext] =\n createAvatarContext<AvatarContextValue>(AVATAR_NAME)\n\n/* -------------------------------------------------------------------------------------------------\n * AvatarImage\n * -----------------------------------------------------------------------------------------------*/\n\nconst IMAGE_NAME = 'AvatarImage'\n\ntype AvatarImageProps = Partial<ImageProps> & {\n onLoadingStatusChange?: (status: ImageLoadingStatus) => void\n}\n\nconst AvatarImage = React.forwardRef<TamaguiElement, AvatarImageProps>(\n (props: ScopedProps<AvatarImageProps>, forwardedRef) => {\n const {\n __scopeAvatar,\n src,\n onLoadingStatusChange = () => {},\n ...imageProps\n } = props\n const context = useAvatarContext(IMAGE_NAME, __scopeAvatar)\n const [status, setStatus] = React.useState<ImageLoadingStatus>('idle')\n const extras = getVariantExtras(props)\n const shapeSize = getVariableValue(\n getShapeSize(context.size, extras)?.width,\n ) as number\n\n React.useEffect(() => {\n setStatus('idle')\n }, [JSON.stringify(src)])\n\n React.useEffect(() => {\n onLoadingStatusChange(status)\n context.onImageLoadingStatusChange(status)\n }, [status])\n\n return (\n <YStack fullscreen zIndex={1}>\n <Image\n fullscreen\n {...(typeof shapeSize === 'number' &&\n !isNaN(shapeSize) && {\n width: shapeSize,\n height: shapeSize,\n })}\n {...imageProps}\n // @ts-ignore\n ref={forwardedRef}\n // @ts-ignore\n src={src}\n // onLoadStart={() => {\n // // setStatus('loading')\n // }}\n onError={() => {\n setStatus('error')\n }}\n onLoad={() => {\n setStatus('loaded')\n }}\n />\n </YStack>\n )\n },\n)\n\nAvatarImage.displayName = IMAGE_NAME\n\n/* -------------------------------------------------------------------------------------------------\n * AvatarFallback\n * -----------------------------------------------------------------------------------------------*/\n\nconst FALLBACK_NAME = 'AvatarFallback'\n\nexport const AvatarFallbackFrame = styled(YStack, {\n name: FALLBACK_NAME,\n position: 'absolute',\n fullscreen: true,\n zIndex: 0,\n})\n\ntype AvatarFallbackProps = GetProps<typeof AvatarFallbackFrame> & {\n delayMs?: number\n}\n\nconst AvatarFallback = AvatarFallbackFrame.extractable(\n React.forwardRef<TamaguiElement, AvatarFallbackProps>(\n (props: ScopedProps<AvatarFallbackProps>, forwardedRef) => {\n const { __scopeAvatar, delayMs, ...fallbackProps } = props\n const context = useAvatarContext(FALLBACK_NAME, __scopeAvatar)\n const [canRender, setCanRender] = React.useState(delayMs === undefined)\n\n React.useEffect(() => {\n if (delayMs !== undefined) {\n const timerId = setTimeout(() => setCanRender(true), delayMs)\n return () => clearTimeout(timerId)\n }\n }, [delayMs])\n\n return canRender && context.imageLoadingStatus !== 'loaded' ? (\n <AvatarFallbackFrame {...fallbackProps} ref={forwardedRef} />\n ) : null\n },\n ),\n)\n\nAvatarFallback.displayName = FALLBACK_NAME\n\n/* -------------------------------------------------------------------------------------------------\n * Avatar\n * -----------------------------------------------------------------------------------------------*/\n\nexport const AvatarFrame = styled(Square, {\n name: AVATAR_NAME,\n position: 'relative',\n overflow: 'hidden',\n})\n\ntype AvatarProps = GetProps<typeof AvatarFrame>\n\nconst Avatar = withStaticProperties(\n React.forwardRef<TamaguiElement, AvatarProps>(\n (props: ScopedProps<AvatarProps>, forwardedRef) => {\n const { __scopeAvatar, size = '$4', ...avatarProps } = props\n const [imageLoadingStatus, setImageLoadingStatus] =\n React.useState<ImageLoadingStatus>('idle')\n return (\n <AvatarProvider\n size={size}\n scope={__scopeAvatar}\n imageLoadingStatus={imageLoadingStatus}\n onImageLoadingStatusChange={setImageLoadingStatus}\n >\n <AvatarFrame size={size} {...avatarProps} ref={forwardedRef} />\n </AvatarProvider>\n )\n },\n ),\n {\n Image: AvatarImage,\n Fallback: AvatarFallback,\n },\n)\n\nAvatar.displayName = AVATAR_NAME\n\nexport { createAvatarScope, Avatar, AvatarImage, AvatarFallback }\nexport type { AvatarProps, AvatarImageProps, AvatarFallbackProps }\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/esm/Avatar.js
CHANGED
|
@@ -17,12 +17,19 @@ const IMAGE_NAME = "AvatarImage";
|
|
|
17
17
|
const AvatarImage = React.forwardRef(
|
|
18
18
|
(props, forwardedRef) => {
|
|
19
19
|
var _a;
|
|
20
|
-
const {
|
|
21
|
-
|
|
20
|
+
const {
|
|
21
|
+
__scopeAvatar,
|
|
22
|
+
src,
|
|
23
|
+
onLoadingStatusChange = () => {
|
|
24
|
+
},
|
|
25
|
+
...imageProps
|
|
26
|
+
} = props;
|
|
22
27
|
const context = useAvatarContext(IMAGE_NAME, __scopeAvatar);
|
|
23
28
|
const [status, setStatus] = React.useState("idle");
|
|
24
29
|
const extras = getVariantExtras(props);
|
|
25
|
-
const shapeSize = getVariableValue(
|
|
30
|
+
const shapeSize = getVariableValue(
|
|
31
|
+
(_a = getShapeSize(context.size, extras)) == null ? void 0 : _a.width
|
|
32
|
+
);
|
|
26
33
|
React.useEffect(() => {
|
|
27
34
|
setStatus("idle");
|
|
28
35
|
}, [JSON.stringify(src)]);
|
|
@@ -86,21 +93,23 @@ const AvatarFrame = styled(Square, {
|
|
|
86
93
|
overflow: "hidden"
|
|
87
94
|
});
|
|
88
95
|
const Avatar = withStaticProperties(
|
|
89
|
-
React.forwardRef(
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
scope: __scopeAvatar,
|
|
95
|
-
imageLoadingStatus,
|
|
96
|
-
onImageLoadingStatusChange: setImageLoadingStatus,
|
|
97
|
-
children: /* @__PURE__ */ jsx(AvatarFrame, {
|
|
96
|
+
React.forwardRef(
|
|
97
|
+
(props, forwardedRef) => {
|
|
98
|
+
const { __scopeAvatar, size = "$4", ...avatarProps } = props;
|
|
99
|
+
const [imageLoadingStatus, setImageLoadingStatus] = React.useState("idle");
|
|
100
|
+
return /* @__PURE__ */ jsx(AvatarProvider, {
|
|
98
101
|
size,
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
102
|
+
scope: __scopeAvatar,
|
|
103
|
+
imageLoadingStatus,
|
|
104
|
+
onImageLoadingStatusChange: setImageLoadingStatus,
|
|
105
|
+
children: /* @__PURE__ */ jsx(AvatarFrame, {
|
|
106
|
+
size,
|
|
107
|
+
...avatarProps,
|
|
108
|
+
ref: forwardedRef
|
|
109
|
+
})
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
),
|
|
104
113
|
{
|
|
105
114
|
Image: AvatarImage,
|
|
106
115
|
Fallback: AvatarFallback
|
package/dist/esm/Avatar.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Avatar.tsx"],
|
|
4
|
-
"sourcesContent": ["// forked from radix https://github.com/radix-ui/primitives/blob/main/packages/react/avatar/src/Avatar.tsx\n\nimport {\n GetProps,\n SizeTokens,\n TamaguiElement,\n getVariableValue,\n getVariantExtras,\n styled,\n withStaticProperties,\n} from '@tamagui/core'\nimport { Scope, createContextScope } from '@tamagui/create-context'\nimport { Image, ImageProps } from '@tamagui/image'\nimport { Square, getShapeSize } from '@tamagui/shapes'\nimport { YStack } from '@tamagui/stacks'\nimport * as React from 'react'\n\nconst AVATAR_NAME = 'Avatar'\n\ntype ScopedProps<P> = P & { __scopeAvatar?: Scope }\nconst [createAvatarContext, createAvatarScope] = createContextScope(AVATAR_NAME)\n\ntype ImageLoadingStatus = 'idle' | 'loading' | 'loaded' | 'error'\n\ntype AvatarContextValue = {\n size: SizeTokens\n imageLoadingStatus: ImageLoadingStatus\n onImageLoadingStatusChange(status: ImageLoadingStatus): void\n}\n\nconst [AvatarProvider, useAvatarContext]
|
|
5
|
-
"mappings": "
|
|
4
|
+
"sourcesContent": ["// forked from radix https://github.com/radix-ui/primitives/blob/main/packages/react/avatar/src/Avatar.tsx\n\nimport {\n GetProps,\n SizeTokens,\n TamaguiElement,\n getVariableValue,\n getVariantExtras,\n styled,\n withStaticProperties,\n} from '@tamagui/core'\nimport { Scope, createContextScope } from '@tamagui/create-context'\nimport { Image, ImageProps } from '@tamagui/image'\nimport { Square, getShapeSize } from '@tamagui/shapes'\nimport { YStack } from '@tamagui/stacks'\nimport * as React from 'react'\n\nconst AVATAR_NAME = 'Avatar'\n\ntype ScopedProps<P> = P & { __scopeAvatar?: Scope }\nconst [createAvatarContext, createAvatarScope] = createContextScope(AVATAR_NAME)\n\ntype ImageLoadingStatus = 'idle' | 'loading' | 'loaded' | 'error'\n\ntype AvatarContextValue = {\n size: SizeTokens\n imageLoadingStatus: ImageLoadingStatus\n onImageLoadingStatusChange(status: ImageLoadingStatus): void\n}\n\nconst [AvatarProvider, useAvatarContext] =\n createAvatarContext<AvatarContextValue>(AVATAR_NAME)\n\n/* -------------------------------------------------------------------------------------------------\n * AvatarImage\n * -----------------------------------------------------------------------------------------------*/\n\nconst IMAGE_NAME = 'AvatarImage'\n\ntype AvatarImageProps = Partial<ImageProps> & {\n onLoadingStatusChange?: (status: ImageLoadingStatus) => void\n}\n\nconst AvatarImage = React.forwardRef<TamaguiElement, AvatarImageProps>(\n (props: ScopedProps<AvatarImageProps>, forwardedRef) => {\n const {\n __scopeAvatar,\n src,\n onLoadingStatusChange = () => {},\n ...imageProps\n } = props\n const context = useAvatarContext(IMAGE_NAME, __scopeAvatar)\n const [status, setStatus] = React.useState<ImageLoadingStatus>('idle')\n const extras = getVariantExtras(props)\n const shapeSize = getVariableValue(\n getShapeSize(context.size, extras)?.width,\n ) as number\n\n React.useEffect(() => {\n setStatus('idle')\n }, [JSON.stringify(src)])\n\n React.useEffect(() => {\n onLoadingStatusChange(status)\n context.onImageLoadingStatusChange(status)\n }, [status])\n\n return (\n <YStack fullscreen zIndex={1}>\n <Image\n fullscreen\n {...(typeof shapeSize === 'number' &&\n !isNaN(shapeSize) && {\n width: shapeSize,\n height: shapeSize,\n })}\n {...imageProps}\n // @ts-ignore\n ref={forwardedRef}\n // @ts-ignore\n src={src}\n // onLoadStart={() => {\n // // setStatus('loading')\n // }}\n onError={() => {\n setStatus('error')\n }}\n onLoad={() => {\n setStatus('loaded')\n }}\n />\n </YStack>\n )\n },\n)\n\nAvatarImage.displayName = IMAGE_NAME\n\n/* -------------------------------------------------------------------------------------------------\n * AvatarFallback\n * -----------------------------------------------------------------------------------------------*/\n\nconst FALLBACK_NAME = 'AvatarFallback'\n\nexport const AvatarFallbackFrame = styled(YStack, {\n name: FALLBACK_NAME,\n position: 'absolute',\n fullscreen: true,\n zIndex: 0,\n})\n\ntype AvatarFallbackProps = GetProps<typeof AvatarFallbackFrame> & {\n delayMs?: number\n}\n\nconst AvatarFallback = AvatarFallbackFrame.extractable(\n React.forwardRef<TamaguiElement, AvatarFallbackProps>(\n (props: ScopedProps<AvatarFallbackProps>, forwardedRef) => {\n const { __scopeAvatar, delayMs, ...fallbackProps } = props\n const context = useAvatarContext(FALLBACK_NAME, __scopeAvatar)\n const [canRender, setCanRender] = React.useState(delayMs === undefined)\n\n React.useEffect(() => {\n if (delayMs !== undefined) {\n const timerId = setTimeout(() => setCanRender(true), delayMs)\n return () => clearTimeout(timerId)\n }\n }, [delayMs])\n\n return canRender && context.imageLoadingStatus !== 'loaded' ? (\n <AvatarFallbackFrame {...fallbackProps} ref={forwardedRef} />\n ) : null\n },\n ),\n)\n\nAvatarFallback.displayName = FALLBACK_NAME\n\n/* -------------------------------------------------------------------------------------------------\n * Avatar\n * -----------------------------------------------------------------------------------------------*/\n\nexport const AvatarFrame = styled(Square, {\n name: AVATAR_NAME,\n position: 'relative',\n overflow: 'hidden',\n})\n\ntype AvatarProps = GetProps<typeof AvatarFrame>\n\nconst Avatar = withStaticProperties(\n React.forwardRef<TamaguiElement, AvatarProps>(\n (props: ScopedProps<AvatarProps>, forwardedRef) => {\n const { __scopeAvatar, size = '$4', ...avatarProps } = props\n const [imageLoadingStatus, setImageLoadingStatus] =\n React.useState<ImageLoadingStatus>('idle')\n return (\n <AvatarProvider\n size={size}\n scope={__scopeAvatar}\n imageLoadingStatus={imageLoadingStatus}\n onImageLoadingStatusChange={setImageLoadingStatus}\n >\n <AvatarFrame size={size} {...avatarProps} ref={forwardedRef} />\n </AvatarProvider>\n )\n },\n ),\n {\n Image: AvatarImage,\n Fallback: AvatarFallback,\n },\n)\n\nAvatar.displayName = AVATAR_NAME\n\nexport { createAvatarScope, Avatar, AvatarImage, AvatarFallback }\nexport type { AvatarProps, AvatarImageProps, AvatarFallbackProps }\n"],
|
|
5
|
+
"mappings": "AAqEQ;AAnER;AAAA,EAIE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAgB,0BAA0B;AAC1C,SAAS,aAAyB;AAClC,SAAS,QAAQ,oBAAoB;AACrC,SAAS,cAAc;AACvB,YAAY,WAAW;AAEvB,MAAM,cAAc;AAGpB,MAAM,CAAC,qBAAqB,iBAAiB,IAAI,mBAAmB,WAAW;AAU/E,MAAM,CAAC,gBAAgB,gBAAgB,IACrC,oBAAwC,WAAW;AAMrD,MAAM,aAAa;AAMnB,MAAM,cAAc,MAAM;AAAA,EACxB,CAAC,OAAsC,iBAAiB;AA5C1D;AA6CI,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA,wBAAwB,MAAM;AAAA,MAAC;AAAA,SAC5B;AAAA,IACL,IAAI;AACJ,UAAM,UAAU,iBAAiB,YAAY,aAAa;AAC1D,UAAM,CAAC,QAAQ,SAAS,IAAI,MAAM,SAA6B,MAAM;AACrE,UAAM,SAAS,iBAAiB,KAAK;AACrC,UAAM,YAAY;AAAA,OAChB,kBAAa,QAAQ,MAAM,MAAM,MAAjC,mBAAoC;AAAA,IACtC;AAEA,UAAM,UAAU,MAAM;AACpB,gBAAU,MAAM;AAAA,IAClB,GAAG,CAAC,KAAK,UAAU,GAAG,CAAC,CAAC;AAExB,UAAM,UAAU,MAAM;AACpB,4BAAsB,MAAM;AAC5B,cAAQ,2BAA2B,MAAM;AAAA,IAC3C,GAAG,CAAC,MAAM,CAAC;AAEX,WACE,oBAAC;AAAA,MAAO,YAAU;AAAA,MAAC,QAAQ;AAAA,MACzB,8BAAC;AAAA,QACC,YAAU;AAAA,QACT,GAAI,OAAO,cAAc,YACxB,CAAC,MAAM,SAAS,KAAK;AAAA,UACnB,OAAO;AAAA,UACP,QAAQ;AAAA,QACV;AAAA,QACD,GAAG;AAAA,QAEJ,KAAK;AAAA,QAEL;AAAA,QAIA,SAAS,MAAM;AACb,oBAAU,OAAO;AAAA,QACnB;AAAA,QACA,QAAQ,MAAM;AACZ,oBAAU,QAAQ;AAAA,QACpB;AAAA,OACF;AAAA,KACF;AAAA,EAEJ;AACF;AAEA,YAAY,cAAc;AAM1B,MAAM,gBAAgB;AAEf,MAAM,sBAAsB,OAAO,QAAQ;AAAA,EAChD,MAAM;AAAA,EACN,UAAU;AAAA,EACV,YAAY;AAAA,EACZ,QAAQ;AACV,CAAC;AAMD,MAAM,iBAAiB,oBAAoB;AAAA,EACzC,MAAM;AAAA,IACJ,CAAC,OAAyC,iBAAiB;AACzD,YAAM,EAAE,eAAe,YAAY,cAAc,IAAI;AACrD,YAAM,UAAU,iBAAiB,eAAe,aAAa;AAC7D,YAAM,CAAC,WAAW,YAAY,IAAI,MAAM,SAAS,YAAY,MAAS;AAEtE,YAAM,UAAU,MAAM;AACpB,YAAI,YAAY,QAAW;AACzB,gBAAM,UAAU,WAAW,MAAM,aAAa,IAAI,GAAG,OAAO;AAC5D,iBAAO,MAAM,aAAa,OAAO;AAAA,QACnC;AAAA,MACF,GAAG,CAAC,OAAO,CAAC;AAEZ,aAAO,aAAa,QAAQ,uBAAuB,WACjD,oBAAC;AAAA,QAAqB,GAAG;AAAA,QAAe,KAAK;AAAA,OAAc,IACzD;AAAA,IACN;AAAA,EACF;AACF;AAEA,eAAe,cAAc;AAMtB,MAAM,cAAc,OAAO,QAAQ;AAAA,EACxC,MAAM;AAAA,EACN,UAAU;AAAA,EACV,UAAU;AACZ,CAAC;AAID,MAAM,SAAS;AAAA,EACb,MAAM;AAAA,IACJ,CAAC,OAAiC,iBAAiB;AACjD,YAAM,EAAE,eAAe,OAAO,SAAS,YAAY,IAAI;AACvD,YAAM,CAAC,oBAAoB,qBAAqB,IAC9C,MAAM,SAA6B,MAAM;AAC3C,aACE,oBAAC;AAAA,QACC;AAAA,QACA,OAAO;AAAA,QACP;AAAA,QACA,4BAA4B;AAAA,QAE5B,8BAAC;AAAA,UAAY;AAAA,UAAa,GAAG;AAAA,UAAa,KAAK;AAAA,SAAc;AAAA,OAC/D;AAAA,IAEJ;AAAA,EACF;AAAA,EACA;AAAA,IACE,OAAO;AAAA,IACP,UAAU;AAAA,EACZ;AACF;AAEA,OAAO,cAAc;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/jsx/Avatar.js
CHANGED
|
@@ -15,12 +15,19 @@ const [AvatarProvider, useAvatarContext] = createAvatarContext(AVATAR_NAME);
|
|
|
15
15
|
const IMAGE_NAME = "AvatarImage";
|
|
16
16
|
const AvatarImage = React.forwardRef(
|
|
17
17
|
(props, forwardedRef) => {
|
|
18
|
-
const {
|
|
19
|
-
|
|
18
|
+
const {
|
|
19
|
+
__scopeAvatar,
|
|
20
|
+
src,
|
|
21
|
+
onLoadingStatusChange = () => {
|
|
22
|
+
},
|
|
23
|
+
...imageProps
|
|
24
|
+
} = props;
|
|
20
25
|
const context = useAvatarContext(IMAGE_NAME, __scopeAvatar);
|
|
21
26
|
const [status, setStatus] = React.useState("idle");
|
|
22
27
|
const extras = getVariantExtras(props);
|
|
23
|
-
const shapeSize = getVariableValue(
|
|
28
|
+
const shapeSize = getVariableValue(
|
|
29
|
+
getShapeSize(context.size, extras)?.width
|
|
30
|
+
);
|
|
24
31
|
React.useEffect(() => {
|
|
25
32
|
setStatus("idle");
|
|
26
33
|
}, [JSON.stringify(src)]);
|
|
@@ -69,11 +76,13 @@ const AvatarFrame = styled(Square, {
|
|
|
69
76
|
overflow: "hidden"
|
|
70
77
|
});
|
|
71
78
|
const Avatar = withStaticProperties(
|
|
72
|
-
React.forwardRef(
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
79
|
+
React.forwardRef(
|
|
80
|
+
(props, forwardedRef) => {
|
|
81
|
+
const { __scopeAvatar, size = "$4", ...avatarProps } = props;
|
|
82
|
+
const [imageLoadingStatus, setImageLoadingStatus] = React.useState("idle");
|
|
83
|
+
return <AvatarProvider size={size} scope={__scopeAvatar} imageLoadingStatus={imageLoadingStatus} onImageLoadingStatusChange={setImageLoadingStatus}><AvatarFrame size={size} {...avatarProps} ref={forwardedRef} /></AvatarProvider>;
|
|
84
|
+
}
|
|
85
|
+
),
|
|
77
86
|
{
|
|
78
87
|
Image: AvatarImage,
|
|
79
88
|
Fallback: AvatarFallback
|
package/dist/jsx/Avatar.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Avatar.tsx"],
|
|
4
|
-
"sourcesContent": ["// forked from radix https://github.com/radix-ui/primitives/blob/main/packages/react/avatar/src/Avatar.tsx\n\nimport {\n GetProps,\n SizeTokens,\n TamaguiElement,\n getVariableValue,\n getVariantExtras,\n styled,\n withStaticProperties,\n} from '@tamagui/core'\nimport { Scope, createContextScope } from '@tamagui/create-context'\nimport { Image, ImageProps } from '@tamagui/image'\nimport { Square, getShapeSize } from '@tamagui/shapes'\nimport { YStack } from '@tamagui/stacks'\nimport * as React from 'react'\n\nconst AVATAR_NAME = 'Avatar'\n\ntype ScopedProps<P> = P & { __scopeAvatar?: Scope }\nconst [createAvatarContext, createAvatarScope] = createContextScope(AVATAR_NAME)\n\ntype ImageLoadingStatus = 'idle' | 'loading' | 'loaded' | 'error'\n\ntype AvatarContextValue = {\n size: SizeTokens\n imageLoadingStatus: ImageLoadingStatus\n onImageLoadingStatusChange(status: ImageLoadingStatus): void\n}\n\nconst [AvatarProvider, useAvatarContext]
|
|
5
|
-
"mappings": "AAEA;AAAA,EAIE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAgB,0BAA0B;AAC1C,SAAS,aAAyB;AAClC,SAAS,QAAQ,oBAAoB;AACrC,SAAS,cAAc;AACvB,YAAY,WAAW;AAEvB,MAAM,cAAc;AAGpB,MAAM,CAAC,qBAAqB,iBAAiB,IAAI,mBAAmB,WAAW;AAU/E,MAAM,CAAC,gBAAgB,gBAAgB,
|
|
4
|
+
"sourcesContent": ["// forked from radix https://github.com/radix-ui/primitives/blob/main/packages/react/avatar/src/Avatar.tsx\n\nimport {\n GetProps,\n SizeTokens,\n TamaguiElement,\n getVariableValue,\n getVariantExtras,\n styled,\n withStaticProperties,\n} from '@tamagui/core'\nimport { Scope, createContextScope } from '@tamagui/create-context'\nimport { Image, ImageProps } from '@tamagui/image'\nimport { Square, getShapeSize } from '@tamagui/shapes'\nimport { YStack } from '@tamagui/stacks'\nimport * as React from 'react'\n\nconst AVATAR_NAME = 'Avatar'\n\ntype ScopedProps<P> = P & { __scopeAvatar?: Scope }\nconst [createAvatarContext, createAvatarScope] = createContextScope(AVATAR_NAME)\n\ntype ImageLoadingStatus = 'idle' | 'loading' | 'loaded' | 'error'\n\ntype AvatarContextValue = {\n size: SizeTokens\n imageLoadingStatus: ImageLoadingStatus\n onImageLoadingStatusChange(status: ImageLoadingStatus): void\n}\n\nconst [AvatarProvider, useAvatarContext] =\n createAvatarContext<AvatarContextValue>(AVATAR_NAME)\n\n/* -------------------------------------------------------------------------------------------------\n * AvatarImage\n * -----------------------------------------------------------------------------------------------*/\n\nconst IMAGE_NAME = 'AvatarImage'\n\ntype AvatarImageProps = Partial<ImageProps> & {\n onLoadingStatusChange?: (status: ImageLoadingStatus) => void\n}\n\nconst AvatarImage = React.forwardRef<TamaguiElement, AvatarImageProps>(\n (props: ScopedProps<AvatarImageProps>, forwardedRef) => {\n const {\n __scopeAvatar,\n src,\n onLoadingStatusChange = () => {},\n ...imageProps\n } = props\n const context = useAvatarContext(IMAGE_NAME, __scopeAvatar)\n const [status, setStatus] = React.useState<ImageLoadingStatus>('idle')\n const extras = getVariantExtras(props)\n const shapeSize = getVariableValue(\n getShapeSize(context.size, extras)?.width,\n ) as number\n\n React.useEffect(() => {\n setStatus('idle')\n }, [JSON.stringify(src)])\n\n React.useEffect(() => {\n onLoadingStatusChange(status)\n context.onImageLoadingStatusChange(status)\n }, [status])\n\n return (\n <YStack fullscreen zIndex={1}>\n <Image\n fullscreen\n {...(typeof shapeSize === 'number' &&\n !isNaN(shapeSize) && {\n width: shapeSize,\n height: shapeSize,\n })}\n {...imageProps}\n // @ts-ignore\n ref={forwardedRef}\n // @ts-ignore\n src={src}\n // onLoadStart={() => {\n // // setStatus('loading')\n // }}\n onError={() => {\n setStatus('error')\n }}\n onLoad={() => {\n setStatus('loaded')\n }}\n />\n </YStack>\n )\n },\n)\n\nAvatarImage.displayName = IMAGE_NAME\n\n/* -------------------------------------------------------------------------------------------------\n * AvatarFallback\n * -----------------------------------------------------------------------------------------------*/\n\nconst FALLBACK_NAME = 'AvatarFallback'\n\nexport const AvatarFallbackFrame = styled(YStack, {\n name: FALLBACK_NAME,\n position: 'absolute',\n fullscreen: true,\n zIndex: 0,\n})\n\ntype AvatarFallbackProps = GetProps<typeof AvatarFallbackFrame> & {\n delayMs?: number\n}\n\nconst AvatarFallback = AvatarFallbackFrame.extractable(\n React.forwardRef<TamaguiElement, AvatarFallbackProps>(\n (props: ScopedProps<AvatarFallbackProps>, forwardedRef) => {\n const { __scopeAvatar, delayMs, ...fallbackProps } = props\n const context = useAvatarContext(FALLBACK_NAME, __scopeAvatar)\n const [canRender, setCanRender] = React.useState(delayMs === undefined)\n\n React.useEffect(() => {\n if (delayMs !== undefined) {\n const timerId = setTimeout(() => setCanRender(true), delayMs)\n return () => clearTimeout(timerId)\n }\n }, [delayMs])\n\n return canRender && context.imageLoadingStatus !== 'loaded' ? (\n <AvatarFallbackFrame {...fallbackProps} ref={forwardedRef} />\n ) : null\n },\n ),\n)\n\nAvatarFallback.displayName = FALLBACK_NAME\n\n/* -------------------------------------------------------------------------------------------------\n * Avatar\n * -----------------------------------------------------------------------------------------------*/\n\nexport const AvatarFrame = styled(Square, {\n name: AVATAR_NAME,\n position: 'relative',\n overflow: 'hidden',\n})\n\ntype AvatarProps = GetProps<typeof AvatarFrame>\n\nconst Avatar = withStaticProperties(\n React.forwardRef<TamaguiElement, AvatarProps>(\n (props: ScopedProps<AvatarProps>, forwardedRef) => {\n const { __scopeAvatar, size = '$4', ...avatarProps } = props\n const [imageLoadingStatus, setImageLoadingStatus] =\n React.useState<ImageLoadingStatus>('idle')\n return (\n <AvatarProvider\n size={size}\n scope={__scopeAvatar}\n imageLoadingStatus={imageLoadingStatus}\n onImageLoadingStatusChange={setImageLoadingStatus}\n >\n <AvatarFrame size={size} {...avatarProps} ref={forwardedRef} />\n </AvatarProvider>\n )\n },\n ),\n {\n Image: AvatarImage,\n Fallback: AvatarFallback,\n },\n)\n\nAvatar.displayName = AVATAR_NAME\n\nexport { createAvatarScope, Avatar, AvatarImage, AvatarFallback }\nexport type { AvatarProps, AvatarImageProps, AvatarFallbackProps }\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/avatar",
|
|
3
|
-
"version": "1.0.1-rc.
|
|
3
|
+
"version": "1.0.1-rc.6",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
"scripts": {
|
|
18
18
|
"build": "tamagui-build",
|
|
19
19
|
"watch": "tamagui-build --watch",
|
|
20
|
-
"lint": "
|
|
21
|
-
"lint:fix": "
|
|
20
|
+
"lint": "../../node_modules/.bin/rome check src",
|
|
21
|
+
"lint:fix": "../../node_modules/.bin/rome check --apply-suggested src",
|
|
22
22
|
"clean": "tamagui-build clean",
|
|
23
23
|
"clean:build": "tamagui-build clean:build"
|
|
24
24
|
},
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
}
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@tamagui/core": "^1.0.1-rc.
|
|
34
|
-
"@tamagui/image": "^1.0.1-rc.
|
|
35
|
-
"@tamagui/shapes": "^1.0.1-rc.
|
|
36
|
-
"@tamagui/text": "^1.0.1-rc.
|
|
37
|
-
"@tamagui/use-event": "^1.0.1-rc.
|
|
33
|
+
"@tamagui/core": "^1.0.1-rc.6",
|
|
34
|
+
"@tamagui/image": "^1.0.1-rc.6",
|
|
35
|
+
"@tamagui/shapes": "^1.0.1-rc.6",
|
|
36
|
+
"@tamagui/text": "^1.0.1-rc.6",
|
|
37
|
+
"@tamagui/use-event": "^1.0.1-rc.6"
|
|
38
38
|
},
|
|
39
39
|
"peerDependencies": {
|
|
40
40
|
"react": "^18.2.0",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"react-native": "*"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"@tamagui/build": "^1.0.1-rc.
|
|
45
|
+
"@tamagui/build": "^1.0.1-rc.6",
|
|
46
46
|
"react": "^18.2.0",
|
|
47
47
|
"react-dom": "^18.2.0",
|
|
48
48
|
"react-native": "*"
|
package/src/Avatar.tsx
CHANGED
|
@@ -28,7 +28,8 @@ type AvatarContextValue = {
|
|
|
28
28
|
onImageLoadingStatusChange(status: ImageLoadingStatus): void
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
const [AvatarProvider, useAvatarContext] =
|
|
31
|
+
const [AvatarProvider, useAvatarContext] =
|
|
32
|
+
createAvatarContext<AvatarContextValue>(AVATAR_NAME)
|
|
32
33
|
|
|
33
34
|
/* -------------------------------------------------------------------------------------------------
|
|
34
35
|
* AvatarImage
|
|
@@ -42,11 +43,18 @@ type AvatarImageProps = Partial<ImageProps> & {
|
|
|
42
43
|
|
|
43
44
|
const AvatarImage = React.forwardRef<TamaguiElement, AvatarImageProps>(
|
|
44
45
|
(props: ScopedProps<AvatarImageProps>, forwardedRef) => {
|
|
45
|
-
const {
|
|
46
|
+
const {
|
|
47
|
+
__scopeAvatar,
|
|
48
|
+
src,
|
|
49
|
+
onLoadingStatusChange = () => {},
|
|
50
|
+
...imageProps
|
|
51
|
+
} = props
|
|
46
52
|
const context = useAvatarContext(IMAGE_NAME, __scopeAvatar)
|
|
47
53
|
const [status, setStatus] = React.useState<ImageLoadingStatus>('idle')
|
|
48
54
|
const extras = getVariantExtras(props)
|
|
49
|
-
const shapeSize = getVariableValue(
|
|
55
|
+
const shapeSize = getVariableValue(
|
|
56
|
+
getShapeSize(context.size, extras)?.width,
|
|
57
|
+
) as number
|
|
50
58
|
|
|
51
59
|
React.useEffect(() => {
|
|
52
60
|
setStatus('idle')
|
|
@@ -83,7 +91,7 @@ const AvatarImage = React.forwardRef<TamaguiElement, AvatarImageProps>(
|
|
|
83
91
|
/>
|
|
84
92
|
</YStack>
|
|
85
93
|
)
|
|
86
|
-
}
|
|
94
|
+
},
|
|
87
95
|
)
|
|
88
96
|
|
|
89
97
|
AvatarImage.displayName = IMAGE_NAME
|
|
@@ -122,8 +130,8 @@ const AvatarFallback = AvatarFallbackFrame.extractable(
|
|
|
122
130
|
return canRender && context.imageLoadingStatus !== 'loaded' ? (
|
|
123
131
|
<AvatarFallbackFrame {...fallbackProps} ref={forwardedRef} />
|
|
124
132
|
) : null
|
|
125
|
-
}
|
|
126
|
-
)
|
|
133
|
+
},
|
|
134
|
+
),
|
|
127
135
|
)
|
|
128
136
|
|
|
129
137
|
AvatarFallback.displayName = FALLBACK_NAME
|
|
@@ -141,24 +149,27 @@ export const AvatarFrame = styled(Square, {
|
|
|
141
149
|
type AvatarProps = GetProps<typeof AvatarFrame>
|
|
142
150
|
|
|
143
151
|
const Avatar = withStaticProperties(
|
|
144
|
-
React.forwardRef<TamaguiElement, AvatarProps>(
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
152
|
+
React.forwardRef<TamaguiElement, AvatarProps>(
|
|
153
|
+
(props: ScopedProps<AvatarProps>, forwardedRef) => {
|
|
154
|
+
const { __scopeAvatar, size = '$4', ...avatarProps } = props
|
|
155
|
+
const [imageLoadingStatus, setImageLoadingStatus] =
|
|
156
|
+
React.useState<ImageLoadingStatus>('idle')
|
|
157
|
+
return (
|
|
158
|
+
<AvatarProvider
|
|
159
|
+
size={size}
|
|
160
|
+
scope={__scopeAvatar}
|
|
161
|
+
imageLoadingStatus={imageLoadingStatus}
|
|
162
|
+
onImageLoadingStatusChange={setImageLoadingStatus}
|
|
163
|
+
>
|
|
164
|
+
<AvatarFrame size={size} {...avatarProps} ref={forwardedRef} />
|
|
165
|
+
</AvatarProvider>
|
|
166
|
+
)
|
|
167
|
+
},
|
|
168
|
+
),
|
|
158
169
|
{
|
|
159
170
|
Image: AvatarImage,
|
|
160
171
|
Fallback: AvatarFallback,
|
|
161
|
-
}
|
|
172
|
+
},
|
|
162
173
|
)
|
|
163
174
|
|
|
164
175
|
Avatar.displayName = AVATAR_NAME
|