@amityco/react-native-social-uikit 4.0.0-1fa7ca8.0 → 4.0.0-354a3a5.0
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/lib/commonjs/components/Toast/Toast.js +2 -1
- package/lib/commonjs/components/Toast/Toast.js.map +1 -1
- package/lib/commonjs/providers/file-provider.js +38 -19
- package/lib/commonjs/providers/file-provider.js.map +1 -1
- package/lib/commonjs/svg/svg-xml-list.js +6 -1
- package/lib/commonjs/svg/svg-xml-list.js.map +1 -1
- package/lib/commonjs/v4/PublicApi/Pages/AmityPostComposerPage/AmityPostComposerPage.js +38 -2
- package/lib/commonjs/v4/PublicApi/Pages/AmityPostComposerPage/AmityPostComposerPage.js.map +1 -1
- package/lib/commonjs/v4/PublicApi/Pages/AmityViewStoryPage/Components/AmityViewStoryItem.js +54 -21
- package/lib/commonjs/v4/PublicApi/Pages/AmityViewStoryPage/Components/AmityViewStoryItem.js.map +1 -1
- package/lib/commonjs/v4/PublicApi/Pages/AmityViewStoryPage/styles.js +24 -2
- package/lib/commonjs/v4/PublicApi/Pages/AmityViewStoryPage/styles.js.map +1 -1
- package/lib/commonjs/v4/assets/icons/toast.js +6 -6
- package/lib/commonjs/v4/assets/icons/toast.js.map +1 -1
- package/lib/commonjs/v4/component/CommunityStories/index.js +9 -4
- package/lib/commonjs/v4/component/CommunityStories/index.js.map +1 -1
- package/lib/commonjs/v4/component/CommunityStories/styles.js +7 -2
- package/lib/commonjs/v4/component/CommunityStories/styles.js.map +1 -1
- package/lib/commonjs/v4/component/LoadingImage/index.js +22 -25
- package/lib/commonjs/v4/component/LoadingImage/index.js.map +1 -1
- package/lib/commonjs/v4/component/LoadingImage/styles.js +19 -2
- package/lib/commonjs/v4/component/LoadingImage/styles.js.map +1 -1
- package/lib/commonjs/v4/component/LoadingVideo/index.js +11 -3
- package/lib/commonjs/v4/component/LoadingVideo/index.js.map +1 -1
- package/lib/commonjs/v4/component/MyStories/StoryCircleItem.js +11 -4
- package/lib/commonjs/v4/component/MyStories/StoryCircleItem.js.map +1 -1
- package/lib/commonjs/v4/component/MyStories/styles.js +5 -0
- package/lib/commonjs/v4/component/MyStories/styles.js.map +1 -1
- package/lib/commonjs/v4/component/PreviewLink/LinkPreview.js +3 -3
- package/lib/commonjs/v4/component/PreviewLink/LinkPreview.js.map +1 -1
- package/lib/commonjs/v4/component/PreviewLink/utils.js +9 -73
- package/lib/commonjs/v4/component/PreviewLink/utils.js.map +1 -1
- package/lib/module/components/Toast/Toast.js +2 -1
- package/lib/module/components/Toast/Toast.js.map +1 -1
- package/lib/module/providers/file-provider.js +38 -19
- package/lib/module/providers/file-provider.js.map +1 -1
- package/lib/module/svg/svg-xml-list.js +4 -0
- package/lib/module/svg/svg-xml-list.js.map +1 -1
- package/lib/module/v4/PublicApi/Pages/AmityPostComposerPage/AmityPostComposerPage.js +38 -2
- package/lib/module/v4/PublicApi/Pages/AmityPostComposerPage/AmityPostComposerPage.js.map +1 -1
- package/lib/module/v4/PublicApi/Pages/AmityViewStoryPage/Components/AmityViewStoryItem.js +54 -21
- package/lib/module/v4/PublicApi/Pages/AmityViewStoryPage/Components/AmityViewStoryItem.js.map +1 -1
- package/lib/module/v4/PublicApi/Pages/AmityViewStoryPage/styles.js +24 -2
- package/lib/module/v4/PublicApi/Pages/AmityViewStoryPage/styles.js.map +1 -1
- package/lib/module/v4/assets/icons/toast.js +6 -6
- package/lib/module/v4/assets/icons/toast.js.map +1 -1
- package/lib/module/v4/component/CommunityStories/index.js +10 -5
- package/lib/module/v4/component/CommunityStories/index.js.map +1 -1
- package/lib/module/v4/component/CommunityStories/styles.js +7 -2
- package/lib/module/v4/component/CommunityStories/styles.js.map +1 -1
- package/lib/module/v4/component/LoadingImage/index.js +22 -24
- package/lib/module/v4/component/LoadingImage/index.js.map +1 -1
- package/lib/module/v4/component/LoadingImage/styles.js +19 -2
- package/lib/module/v4/component/LoadingImage/styles.js.map +1 -1
- package/lib/module/v4/component/LoadingVideo/index.js +11 -3
- package/lib/module/v4/component/LoadingVideo/index.js.map +1 -1
- package/lib/module/v4/component/MyStories/StoryCircleItem.js +13 -6
- package/lib/module/v4/component/MyStories/StoryCircleItem.js.map +1 -1
- package/lib/module/v4/component/MyStories/styles.js +5 -0
- package/lib/module/v4/component/MyStories/styles.js.map +1 -1
- package/lib/module/v4/component/PreviewLink/LinkPreview.js +3 -3
- package/lib/module/v4/component/PreviewLink/LinkPreview.js.map +1 -1
- package/lib/module/v4/component/PreviewLink/utils.js +9 -73
- package/lib/module/v4/component/PreviewLink/utils.js.map +1 -1
- package/lib/typescript/src/components/Toast/Toast.d.ts.map +1 -1
- package/lib/typescript/src/providers/file-provider.d.ts.map +1 -1
- package/lib/typescript/src/svg/svg-xml-list.d.ts +1 -0
- package/lib/typescript/src/svg/svg-xml-list.d.ts.map +1 -1
- package/lib/typescript/src/v4/PublicApi/Pages/AmityPostComposerPage/AmityPostComposerPage.d.ts.map +1 -1
- package/lib/typescript/src/v4/PublicApi/Pages/AmityViewStoryPage/Components/AmityViewStoryItem.d.ts.map +1 -1
- package/lib/typescript/src/v4/PublicApi/Pages/AmityViewStoryPage/styles.d.ts +22 -0
- package/lib/typescript/src/v4/PublicApi/Pages/AmityViewStoryPage/styles.d.ts.map +1 -1
- package/lib/typescript/src/v4/assets/icons/toast.d.ts +3 -3
- package/lib/typescript/src/v4/assets/icons/toast.d.ts.map +1 -1
- package/lib/typescript/src/v4/component/CommunityStories/index.d.ts.map +1 -1
- package/lib/typescript/src/v4/component/CommunityStories/styles.d.ts +5 -0
- package/lib/typescript/src/v4/component/CommunityStories/styles.d.ts.map +1 -1
- package/lib/typescript/src/v4/component/LoadingImage/index.d.ts +2 -1
- package/lib/typescript/src/v4/component/LoadingImage/index.d.ts.map +1 -1
- package/lib/typescript/src/v4/component/LoadingImage/styles.d.ts +21 -0
- package/lib/typescript/src/v4/component/LoadingImage/styles.d.ts.map +1 -1
- package/lib/typescript/src/v4/component/LoadingVideo/index.d.ts +2 -1
- package/lib/typescript/src/v4/component/LoadingVideo/index.d.ts.map +1 -1
- package/lib/typescript/src/v4/component/MyStories/StoryCircleItem.d.ts.map +1 -1
- package/lib/typescript/src/v4/component/MyStories/styles.d.ts +5 -0
- package/lib/typescript/src/v4/component/MyStories/styles.d.ts.map +1 -1
- package/lib/typescript/src/v4/component/PreviewLink/utils.d.ts +6 -1
- package/lib/typescript/src/v4/component/PreviewLink/utils.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/components/Toast/Toast.tsx +1 -0
- package/src/providers/file-provider.tsx +42 -20
- package/src/svg/svg-xml-list.ts +6 -0
- package/src/v4/PublicApi/Pages/AmityPostComposerPage/AmityPostComposerPage.tsx +47 -1
- package/src/v4/PublicApi/Pages/AmityViewStoryPage/Components/AmityViewStoryItem.tsx +122 -57
- package/src/v4/PublicApi/Pages/AmityViewStoryPage/styles.ts +23 -1
- package/src/v4/assets/icons/toast.tsx +12 -9
- package/src/v4/component/CommunityStories/index.tsx +26 -17
- package/src/v4/component/CommunityStories/styles.ts +7 -2
- package/src/v4/component/LoadingImage/index.tsx +28 -25
- package/src/v4/component/LoadingImage/styles.ts +17 -0
- package/src/v4/component/LoadingVideo/index.tsx +12 -3
- package/src/v4/component/MyStories/StoryCircleItem.tsx +19 -12
- package/src/v4/component/MyStories/styles.ts +5 -0
- package/src/v4/component/PreviewLink/LinkPreview.tsx +3 -3
- package/src/v4/component/PreviewLink/utils.ts +9 -108
|
@@ -2,12 +2,13 @@ import { Image, Text, TouchableOpacity, View } from 'react-native';
|
|
|
2
2
|
import React, { FC, useEffect, useState } from 'react';
|
|
3
3
|
import { SvgXml } from 'react-native-svg';
|
|
4
4
|
import {
|
|
5
|
+
errorIcon,
|
|
5
6
|
officialIcon,
|
|
6
7
|
privateIcon,
|
|
7
8
|
storyRing,
|
|
8
9
|
} from '../../../svg/svg-xml-list';
|
|
9
10
|
import { ComponentID, ElementID, ImageSizeState, PageID } from '../../enum';
|
|
10
|
-
import { useFile } from '../../hook';
|
|
11
|
+
import { useFile, useStoryPermission } from '../../hook';
|
|
11
12
|
import useConfig from '../../hook/useConfig';
|
|
12
13
|
import { useStyles } from './styles';
|
|
13
14
|
import { CommunityRepository } from '@amityco/ts-sdk-react-native';
|
|
@@ -26,18 +27,20 @@ const StoryCircleItem: FC<IStoryCircleItem> = ({
|
|
|
26
27
|
const theme = useTheme() as MyMD3Theme;
|
|
27
28
|
const [avatarUrl, setAvatarUrl] = useState(null);
|
|
28
29
|
const [communityData, setCommunityData] = useState<Amity.Community>(null);
|
|
30
|
+
const hasStoryPermission = useStoryPermission(storyTarget.targetId);
|
|
29
31
|
const { getImage } = useFile();
|
|
30
32
|
const { getUiKitConfig } = useConfig();
|
|
31
33
|
const styles = useStyles();
|
|
32
|
-
const storyRingColor: string[] =
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
34
|
+
const storyRingColor: string[] =
|
|
35
|
+
hasStoryPermission && storyTarget?.failedStoriesCount > 0
|
|
36
|
+
? ['#DE1029', '#DE1029']
|
|
37
|
+
: storyTarget?.hasUnseen
|
|
38
|
+
? (getUiKitConfig({
|
|
39
|
+
page: PageID.StoryPage,
|
|
40
|
+
component: ComponentID.StoryTab,
|
|
41
|
+
element: ElementID.StoryRing,
|
|
42
|
+
})?.progress_color as string[]) ?? ['#e2e2e2', '#e2e2e2']
|
|
43
|
+
: ['#e2e2e2', '#e2e2e2'];
|
|
41
44
|
|
|
42
45
|
useEffect(() => {
|
|
43
46
|
if (storyTarget.targetType !== 'community') return;
|
|
@@ -80,12 +83,16 @@ const StoryCircleItem: FC<IStoryCircleItem> = ({
|
|
|
80
83
|
height={68}
|
|
81
84
|
xml={storyRing(storyRingColor[0], storyRingColor[1])}
|
|
82
85
|
/>
|
|
83
|
-
{
|
|
86
|
+
{hasStoryPermission && storyTarget?.failedStoriesCount > 0 ? (
|
|
87
|
+
<View style={styles.errorIcon}>
|
|
88
|
+
<SvgXml width={16} height={16} xml={errorIcon()} />
|
|
89
|
+
</View>
|
|
90
|
+
) : communityData?.isOfficial ? (
|
|
84
91
|
<SvgXml
|
|
85
92
|
style={styles.officialIcon}
|
|
86
93
|
xml={officialIcon(theme.colors.primary)}
|
|
87
94
|
/>
|
|
88
|
-
)}
|
|
95
|
+
) : null}
|
|
89
96
|
<View style={styles.textRow}>
|
|
90
97
|
{!communityData?.isPublic && (
|
|
91
98
|
<SvgXml width={17} height={17} xml={privateIcon(theme.colors.base)} />
|
|
@@ -21,7 +21,7 @@ export const LinkPreview = React.memo(
|
|
|
21
21
|
|
|
22
22
|
const fetchData = async () => {
|
|
23
23
|
setData(undefined);
|
|
24
|
-
const newData = await getPreviewData(text
|
|
24
|
+
const newData = await getPreviewData(text);
|
|
25
25
|
if (!isCancelled) {
|
|
26
26
|
setData(newData);
|
|
27
27
|
}
|
|
@@ -37,8 +37,8 @@ export const LinkPreview = React.memo(
|
|
|
37
37
|
|
|
38
38
|
const renderImageNode = React.useCallback(
|
|
39
39
|
(image: PreviewDataImage) => {
|
|
40
|
-
const imageUrl = image
|
|
41
|
-
? { uri: image
|
|
40
|
+
const imageUrl = image
|
|
41
|
+
? { uri: image }
|
|
42
42
|
: require('../../assets/images/previewLinkDefaultBackground.png');
|
|
43
43
|
|
|
44
44
|
return (
|
|
@@ -2,6 +2,7 @@ import { decode } from 'html-entities';
|
|
|
2
2
|
import { Image } from 'react-native';
|
|
3
3
|
|
|
4
4
|
import { PreviewData, PreviewDataImage, Size } from './types';
|
|
5
|
+
import { Client } from '@amityco/ts-sdk-react-native';
|
|
5
6
|
|
|
6
7
|
export const getActualImageUrl = (baseUrl: string, imageUrl?: string) => {
|
|
7
8
|
let actualImageUrl = imageUrl?.trim();
|
|
@@ -54,7 +55,7 @@ export const getImageSize = (url: string) => {
|
|
|
54
55
|
|
|
55
56
|
// Functions below use functions from the same file and mocks are not working
|
|
56
57
|
/* istanbul ignore next */
|
|
57
|
-
export const getPreviewData = async (text: string
|
|
58
|
+
export const getPreviewData = async (text: string) => {
|
|
58
59
|
const previewData: PreviewData = {
|
|
59
60
|
description: undefined,
|
|
60
61
|
image: undefined,
|
|
@@ -77,114 +78,14 @@ export const getPreviewData = async (text: string, requestTimeout = 5000) => {
|
|
|
77
78
|
url = 'https://' + url;
|
|
78
79
|
}
|
|
79
80
|
|
|
80
|
-
|
|
81
|
-
const abortController = new AbortController();
|
|
81
|
+
const request = await Client.fetchLinkPreview(url);
|
|
82
82
|
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
});
|
|
90
|
-
|
|
91
|
-
abortControllerTimeout = setTimeout(() => {
|
|
92
|
-
abortController.abort();
|
|
93
|
-
}, requestTimeout);
|
|
94
|
-
|
|
95
|
-
const response = await request;
|
|
96
|
-
|
|
97
|
-
clearTimeout(abortControllerTimeout);
|
|
98
|
-
|
|
99
|
-
previewData.link = url;
|
|
100
|
-
|
|
101
|
-
const contentType = response.headers.get('content-type') ?? '';
|
|
102
|
-
|
|
103
|
-
if (REGEX_IMAGE_CONTENT_TYPE.test(contentType)) {
|
|
104
|
-
const image = await getPreviewDataImage(url);
|
|
105
|
-
previewData.image = image;
|
|
106
|
-
return previewData;
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
const html = await response.text();
|
|
110
|
-
|
|
111
|
-
// Some pages return undefined
|
|
112
|
-
if (!html) return previewData;
|
|
113
|
-
|
|
114
|
-
const head = html.substring(0, html.indexOf('<body'));
|
|
115
|
-
|
|
116
|
-
// Get page title
|
|
117
|
-
const title = REGEX_TITLE.exec(head);
|
|
118
|
-
previewData.title = getHtmlEntitiesDecodedText(title?.[1]);
|
|
119
|
-
|
|
120
|
-
let matches: RegExpMatchArray | null;
|
|
121
|
-
const meta: RegExpMatchArray[] = [];
|
|
122
|
-
while ((matches = REGEX_META.exec(head)) !== null) {
|
|
123
|
-
// @ts-ignore
|
|
124
|
-
meta.push([...matches]);
|
|
125
|
-
}
|
|
126
|
-
|
|
127
|
-
const metaPreviewData = meta.reduce<{
|
|
128
|
-
description?: string;
|
|
129
|
-
imageUrl?: string;
|
|
130
|
-
title?: string;
|
|
131
|
-
}>(
|
|
132
|
-
(acc, curr) => {
|
|
133
|
-
// Verify that we have property/name and content
|
|
134
|
-
// Note that if a page will specify property, name and content in the same meta, regex will fail
|
|
135
|
-
if (!curr[2] || !curr[3]) return acc;
|
|
136
|
-
|
|
137
|
-
// Only take the first occurrence
|
|
138
|
-
// For description take the meta description tag into consideration
|
|
139
|
-
const description =
|
|
140
|
-
!acc.description &&
|
|
141
|
-
(getContent(curr[2], curr[3], 'og:description') ||
|
|
142
|
-
getContent(curr[2], curr[3], 'description'));
|
|
143
|
-
const ogImage =
|
|
144
|
-
!acc.imageUrl && getContent(curr[2], curr[3], 'og:image');
|
|
145
|
-
const ogTitle = !acc.title && getContent(curr[2], curr[3], 'og:title');
|
|
146
|
-
|
|
147
|
-
return {
|
|
148
|
-
description: description
|
|
149
|
-
? getHtmlEntitiesDecodedText(description)
|
|
150
|
-
: acc.description,
|
|
151
|
-
imageUrl: ogImage ? getActualImageUrl(url, ogImage) : acc.imageUrl,
|
|
152
|
-
title: ogTitle ? getHtmlEntitiesDecodedText(ogTitle) : acc.title,
|
|
153
|
-
};
|
|
154
|
-
},
|
|
155
|
-
{ title: previewData.title }
|
|
156
|
-
);
|
|
157
|
-
|
|
158
|
-
previewData.description = metaPreviewData.description;
|
|
159
|
-
previewData.image = await getPreviewDataImage(metaPreviewData.imageUrl);
|
|
160
|
-
previewData.title = metaPreviewData.title;
|
|
161
|
-
|
|
162
|
-
if (!previewData.image) {
|
|
163
|
-
let imageMatches: RegExpMatchArray | null;
|
|
164
|
-
const tags: RegExpMatchArray[] = [];
|
|
165
|
-
while ((imageMatches = REGEX_IMAGE_TAG.exec(html)) !== null) {
|
|
166
|
-
// @ts-ignore
|
|
167
|
-
tags.push([...imageMatches]);
|
|
168
|
-
}
|
|
169
|
-
|
|
170
|
-
let images: PreviewDataImage[] = [];
|
|
171
|
-
|
|
172
|
-
for (const tag of tags
|
|
173
|
-
.filter((t) => !t[1].startsWith('data'))
|
|
174
|
-
.slice(0, 5)) {
|
|
175
|
-
const image = await getPreviewDataImage(getActualImageUrl(url, tag[1]));
|
|
176
|
-
|
|
177
|
-
if (!image) continue;
|
|
178
|
-
|
|
179
|
-
images = [...images, image];
|
|
180
|
-
}
|
|
181
|
-
|
|
182
|
-
previewData.image = images.sort(
|
|
183
|
-
(a, b) => b.height * b.width - a.height * a.width
|
|
184
|
-
)[0];
|
|
185
|
-
}
|
|
186
|
-
|
|
187
|
-
return previewData;
|
|
83
|
+
return {
|
|
84
|
+
description: request.description || undefined,
|
|
85
|
+
image: request.image || undefined,
|
|
86
|
+
link: url,
|
|
87
|
+
title: request.title || undefined,
|
|
88
|
+
};
|
|
188
89
|
} catch {
|
|
189
90
|
return previewData;
|
|
190
91
|
}
|