@selfcommunity/react-ui 0.7.9-alpha.31 → 0.7.9-alpha.32
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/cjs/components/GroupHeader/GroupHeader.js +3 -1
- package/lib/cjs/components/GroupMembersButton/GroupMembersButton.js +5 -1
- package/lib/esm/components/GroupHeader/GroupHeader.js +4 -2
- package/lib/esm/components/GroupMembersButton/GroupMembersButton.js +6 -2
- package/lib/umd/react-ui.js +1 -1
- package/package.json +2 -2
|
@@ -138,7 +138,9 @@ function GroupHeader(inProps) {
|
|
|
138
138
|
react_1.default.createElement(react_intl_1.FormattedMessage, { id: "ui.groupHeader.visibility.visible", defaultMessage: "ui.groupHeader.visibility.visible" }))) : (react_1.default.createElement(material_1.Typography, { className: classes.visibilityItem },
|
|
139
139
|
react_1.default.createElement(material_1.Icon, null, "visibility_off"),
|
|
140
140
|
react_1.default.createElement(react_intl_1.FormattedMessage, { id: "ui.groupHeader.visibility.hidden", defaultMessage: "ui.groupHeader.visibility.hidden" })))),
|
|
141
|
-
react_1.default.createElement(react_1.default.Fragment, null, ((scGroup && scGroup.privacy === types_1.SCGroupPrivacyType.PUBLIC) ||
|
|
141
|
+
react_1.default.createElement(react_1.default.Fragment, null, ((scGroup && scGroup.privacy === types_1.SCGroupPrivacyType.PUBLIC) ||
|
|
142
|
+
scGroup.subscription_status === types_1.SCGroupSubscriptionStatusType.SUBSCRIBED ||
|
|
143
|
+
isGroupAdmin) && (react_1.default.createElement(material_1.Box, { className: classes.members },
|
|
142
144
|
react_1.default.createElement(material_1.Typography, { className: classes.membersCounter, component: "div" },
|
|
143
145
|
react_1.default.createElement(react_intl_1.FormattedMessage, { id: "ui.groupHeader.members", defaultMessage: "ui.groupHeader.members", values: { total: scGroup.subscribers_counter } })),
|
|
144
146
|
react_1.default.createElement(GroupMembersButton_1.default, Object.assign({ groupId: scGroup === null || scGroup === void 0 ? void 0 : scGroup.id, group: scGroup, autoHide: !isGroupAdmin }, GroupMembersButtonProps))))),
|
|
@@ -72,7 +72,11 @@ function GroupMembersButton(inProps) {
|
|
|
72
72
|
const { scGroup } = (0, react_core_1.useSCFetchGroup)({ id: groupId, group });
|
|
73
73
|
// FETCH FIRST FOLLOWERS
|
|
74
74
|
(0, use_deep_compare_effect_1.useDeepCompareEffectNoCheck)(() => {
|
|
75
|
-
if (!scGroup ||
|
|
75
|
+
if (!scGroup ||
|
|
76
|
+
(scGroup &&
|
|
77
|
+
scGroup.privacy !== types_1.SCGroupPrivacyType.PUBLIC &&
|
|
78
|
+
scGroup.subscription_status !== types_1.SCGroupSubscriptionStatusType.SUBSCRIBED &&
|
|
79
|
+
autoHide)) {
|
|
76
80
|
return;
|
|
77
81
|
}
|
|
78
82
|
if (members.length === 0) {
|
|
@@ -2,7 +2,7 @@ import { __rest } from "tslib";
|
|
|
2
2
|
import React, { useMemo } from 'react';
|
|
3
3
|
import { styled } from '@mui/material/styles';
|
|
4
4
|
import { Avatar, Box, Icon, Paper, Typography } from '@mui/material';
|
|
5
|
-
import { SCGroupPrivacyType } from '@selfcommunity/types';
|
|
5
|
+
import { SCGroupPrivacyType, SCGroupSubscriptionStatusType } from '@selfcommunity/types';
|
|
6
6
|
import { SCPreferences, useSCFetchGroup, useSCPreferences, useSCUser } from '@selfcommunity/react-core';
|
|
7
7
|
import GroupHeaderSkeleton from './Skeleton';
|
|
8
8
|
import classNames from 'classnames';
|
|
@@ -136,7 +136,9 @@ export default function GroupHeader(inProps) {
|
|
|
136
136
|
React.createElement(FormattedMessage, { id: "ui.groupHeader.visibility.visible", defaultMessage: "ui.groupHeader.visibility.visible" }))) : (React.createElement(Typography, { className: classes.visibilityItem },
|
|
137
137
|
React.createElement(Icon, null, "visibility_off"),
|
|
138
138
|
React.createElement(FormattedMessage, { id: "ui.groupHeader.visibility.hidden", defaultMessage: "ui.groupHeader.visibility.hidden" })))),
|
|
139
|
-
React.createElement(React.Fragment, null, ((scGroup && scGroup.privacy === SCGroupPrivacyType.PUBLIC) ||
|
|
139
|
+
React.createElement(React.Fragment, null, ((scGroup && scGroup.privacy === SCGroupPrivacyType.PUBLIC) ||
|
|
140
|
+
scGroup.subscription_status === SCGroupSubscriptionStatusType.SUBSCRIBED ||
|
|
141
|
+
isGroupAdmin) && (React.createElement(Box, { className: classes.members },
|
|
140
142
|
React.createElement(Typography, { className: classes.membersCounter, component: "div" },
|
|
141
143
|
React.createElement(FormattedMessage, { id: "ui.groupHeader.members", defaultMessage: "ui.groupHeader.members", values: { total: scGroup.subscribers_counter } })),
|
|
142
144
|
React.createElement(GroupMembersButton, Object.assign({ groupId: scGroup === null || scGroup === void 0 ? void 0 : scGroup.id, group: scGroup, autoHide: !isGroupAdmin }, GroupMembersButtonProps))))),
|
|
@@ -8,7 +8,7 @@ import InfiniteScroll from '../../shared/InfiniteScroll';
|
|
|
8
8
|
import User, { UserSkeleton } from '../User';
|
|
9
9
|
import { Endpoints, GroupService, http } from '@selfcommunity/api-services';
|
|
10
10
|
import { useSCFetchGroup } from '@selfcommunity/react-core';
|
|
11
|
-
import { SCGroupPrivacyType } from '@selfcommunity/types';
|
|
11
|
+
import { SCGroupPrivacyType, SCGroupSubscriptionStatusType } from '@selfcommunity/types';
|
|
12
12
|
import AvatarGroupSkeleton from '../Skeleton/AvatarGroupSkeleton';
|
|
13
13
|
import classNames from 'classnames';
|
|
14
14
|
import { useThemeProps } from '@mui/system';
|
|
@@ -70,7 +70,11 @@ export default function GroupMembersButton(inProps) {
|
|
|
70
70
|
const { scGroup } = useSCFetchGroup({ id: groupId, group });
|
|
71
71
|
// FETCH FIRST FOLLOWERS
|
|
72
72
|
useDeepCompareEffectNoCheck(() => {
|
|
73
|
-
if (!scGroup ||
|
|
73
|
+
if (!scGroup ||
|
|
74
|
+
(scGroup &&
|
|
75
|
+
scGroup.privacy !== SCGroupPrivacyType.PUBLIC &&
|
|
76
|
+
scGroup.subscription_status !== SCGroupSubscriptionStatusType.SUBSCRIBED &&
|
|
77
|
+
autoHide)) {
|
|
74
78
|
return;
|
|
75
79
|
}
|
|
76
80
|
if (members.length === 0) {
|