@selfcommunity/react-ui 0.11.0-alpha.92 → 0.11.0-alpha.93

package/lib/cjs/components/Feed/Feed.js

@@ -170,13 +170,17 @@ const Feed = (inProps, ref) => {
                 }
             ]
             : []),
-        {
-            type: 'widget',
-            component: FooterWidget_1.default,
-            componentProps: {},
-            column: 'right',
-            position: 1
-        }
+        ...(oneColLayout
+            ? []
+            : [
+                {
+                    type: 'widget',
+                    component: FooterWidget_1.default,
+                    componentProps: {},
+                    column: 'right',
+                    position: 1
+                }
+            ])
     ]
         .map((w, i) => Object.assign({}, w, { position: w.position * (w.column === 'right' ? 5 : 1), id: `${w.column}_${i}` }))
         .sort(feed_1.widgetSort), [widgets, advEnabled]);

package/lib/cjs/components/Footer/Footer.js

@@ -6,6 +6,7 @@ const react_1 = require("react");
 const system_1 = require("@mui/system");
 const material_1 = require("@mui/material");
 const classnames_1 = tslib_1.__importDefault(require("classnames"));
+const types_1 = require("@selfcommunity/types");
 const utils_1 = require("@selfcommunity/utils");
 const react_core_1 = require("@selfcommunity/react-core");
 const Skeleton_1 = tslib_1.__importDefault(require("./Skeleton"));
@@ -53,8 +54,10 @@ function Footer(inProps) {
         name: constants_1.PREFIX
     });
     const { className, menu = null, startActions = null, endActions = null } = props, rest = tslib_1.__rest(props, ["className", "menu", "startActions", "endActions"]);
+    // CONTEXT
+    const scUserContext = (0, react_core_1.useSCUser)();
     // HOOKS
-    const { _menu, loading } = (0, react_core_1.useFetchMenuFooter)(menu);
+    const { _menu, loading } = (0, react_core_1.useFetchMenuFooter)(scUserContext.user ? types_1.SCCustomMenu.BASE : types_1.SCCustomMenu.NOT_LOGGED, menu);
     // PREFERENCES
     const { preferences } = (0, react_core_1.useSCPreferences)();
     const copyright = (0, react_1.useMemo)(() => {

package/lib/cjs/components/NavigationSettingsIconButton/NavigationSettingsIconButton.js

@@ -87,7 +87,7 @@ function NavigationSettingsIconButton(inProps) {
     const theme = (0, material_1.useTheme)();
     const isMobile = (0, material_1.useMediaQuery)(theme.breakpoints.down('md'));
     const scRoutingContext = (0, react_core_1.useSCRouting)();
-    const { _menu } = (0, react_core_1.useFetchMenuFooter)(null);
+    const { _menu } = (0, react_core_1.useFetchMenuFooter)(types_1.SCCustomMenu.USER);
     // PREFERENCES
     const scPreferences = (0, react_core_1.useSCPreferences)();
     const preferences = (0, react_1.useMemo)(() => {

package/lib/cjs/components/PlatformWidget/PlatformWidget.js

@@ -172,7 +172,6 @@ const Root = (0, material_1.styled)(Widget_1.default, {
  * @param inProps
  */
 function PlatformWidget(inProps) {
-    var _a;
     // PROPS
     const props = (0, system_1.useThemeProps)({
         props: inProps,
@@ -304,7 +303,7 @@ function PlatformWidget(inProps) {
     /**
      * Renders root object (if not hidden by autoHide prop)
      */
-    if (!autoHide && ((_a = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _a === void 0 ? void 0 : _a.role)) {
+    if (!autoHide && (isAdmin || isEditor || isModerator)) {
         return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(Root, Object.assign({ className: (0, classnames_1.default)(classes.root, className, { [classes.tutorialOpen]: isTutorialOpen }) }, rest, { children: [content, tutorial] })), (0, jsx_runtime_1.jsx)(material_1.Backdrop, { sx: { color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }, open: isTutorialOpen, onClick: handleCloseTutorial })] }));
     }
     return (0, jsx_runtime_1.jsx)(HiddenPlaceholder_1.default, {});

package/lib/esm/components/Feed/Feed.js

@@ -167,13 +167,17 @@ const Feed = (inProps, ref) => {
                 }
             ]
             : []),
-        {
-            type: 'widget',
-            component: FooterWidget,
-            componentProps: {},
-            column: 'right',
-            position: 1
-        }
+        ...(oneColLayout
+            ? []
+            : [
+                {
+                    type: 'widget',
+                    component: FooterWidget,
+                    componentProps: {},
+                    column: 'right',
+                    position: 1
+                }
+            ])
     ]
         .map((w, i) => Object.assign({}, w, { position: w.position * (w.column === 'right' ? 5 : 1), id: `${w.column}_${i}` }))
         .sort(widgetSort), [widgets, advEnabled]);

package/lib/esm/components/Footer/Footer.js

@@ -4,8 +4,9 @@ import { useMemo } from 'react';
 import { useThemeProps } from '@mui/system';
 import { Box, Button, Typography, styled } from '@mui/material';
 import classNames from 'classnames';
+import { SCCustomMenu } from '@selfcommunity/types';
 import { sortByAttr } from '@selfcommunity/utils';
-import { Link, SCPreferences, useFetchMenuFooter, useSCPreferences } from '@selfcommunity/react-core';
+import { Link, SCPreferences, useFetchMenuFooter, useSCPreferences, useSCUser } from '@selfcommunity/react-core';
 import FooterSkeleton from './Skeleton';
 import { PREFIX, EXPLORE_MENU_ITEM } from './constants';
 const classes = {
@@ -51,8 +52,10 @@ export default function Footer(inProps) {
         name: PREFIX
     });
     const { className, menu = null, startActions = null, endActions = null } = props, rest = __rest(props, ["className", "menu", "startActions", "endActions"]);
+    // CONTEXT
+    const scUserContext = useSCUser();
     // HOOKS
-    const { _menu, loading } = useFetchMenuFooter(menu);
+    const { _menu, loading } = useFetchMenuFooter(scUserContext.user ? SCCustomMenu.BASE : SCCustomMenu.NOT_LOGGED, menu);
     // PREFERENCES
     const { preferences } = useSCPreferences();
     const copyright = useMemo(() => {

package/lib/esm/components/NavigationSettingsIconButton/NavigationSettingsIconButton.js

@@ -9,7 +9,7 @@ import { FormattedMessage } from 'react-intl';
 import { PreferenceService, UserService } from '@selfcommunity/api-services';
 import { SCOPE_SC_UI } from '../../constants/Errors';
 import { Logger, sortByAttr } from '@selfcommunity/utils';
-import { SCPreferenceName } from '@selfcommunity/types';
+import { SCCustomMenu, SCPreferenceName } from '@selfcommunity/types';
 import { EXPLORE_MENU_ITEM } from '../Footer/constants';
 const PREFIX = 'SCNavigationSettingsIconButton';
 const classes = {
@@ -85,7 +85,7 @@ export default function NavigationSettingsIconButton(inProps) {
     const theme = useTheme();
     const isMobile = useMediaQuery(theme.breakpoints.down('md'));
     const scRoutingContext = useSCRouting();
-    const { _menu } = useFetchMenuFooter(null);
+    const { _menu } = useFetchMenuFooter(SCCustomMenu.USER);
     // PREFERENCES
     const scPreferences = useSCPreferences();
     const preferences = useMemo(() => {

package/lib/esm/components/PlatformWidget/PlatformWidget.js

@@ -170,7 +170,6 @@ const Root = styled(Widget, {
  * @param inProps
  */
 export default function PlatformWidget(inProps) {
-    var _a;
     // PROPS
     const props = useThemeProps({
         props: inProps,
@@ -302,7 +301,7 @@ export default function PlatformWidget(inProps) {
     /**
      * Renders root object (if not hidden by autoHide prop)
      */
-    if (!autoHide && ((_a = scUserContext === null || scUserContext === void 0 ? void 0 : scUserContext.user) === null || _a === void 0 ? void 0 : _a.role)) {
+    if (!autoHide && (isAdmin || isEditor || isModerator)) {
         return (_jsxs(_Fragment, { children: [_jsxs(Root, Object.assign({ className: classNames(classes.root, className, { [classes.tutorialOpen]: isTutorialOpen }) }, rest, { children: [content, tutorial] })), _jsx(Backdrop, { sx: { color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }, open: isTutorialOpen, onClick: handleCloseTutorial })] }));
     }
     return _jsx(HiddenPlaceholder, {});