@selfcommunity/react-ui 0.8.0-alpha.11 → 0.8.0-alpha.13

package/lib/cjs/components/Composer/Composer.js

@@ -503,6 +503,8 @@ function Composer(inProps) {
         }
         else {
             onClose && onClose(e);
+            setLayer(null);
+            dispatch({ type: 'reset' });
             /*setLayer(null);
             feedType && feedType === SCFeedTypologyType.CATEGORY
               ? dispatch({type: 'resetCategoryFeed'})

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

@@ -26,6 +26,12 @@ const Skeleton_2 = tslib_1.__importDefault(require("./Skeleton"));
 const use_deep_compare_effect_1 = require("use-deep-compare-effect");
 const StickyBox_1 = tslib_1.__importDefault(require("../../shared/StickyBox"));
 const constants_1 = require("./constants");
+const messages = (0, react_intl_1.defineMessages)({
+    refresh: {
+        id: 'ui.feed.refreshRelease',
+        defaultMessage: 'ui.feed.refreshRelease'
+    }
+});
 const classes = {
     root: `${constants_1.PREFIX}-root`,
     left: `${constants_1.PREFIX}-left`,
@@ -78,7 +84,9 @@ const Feed = (inProps, ref) => {
         props: inProps,
         name: constants_1.PREFIX
     });
-    const { id = 'feed', className, endpoint, endpointQueryParams = { limit: Pagination_1.DEFAULT_PAGINATION_LIMIT, offset: Pagination_1.DEFAULT_PAGINATION_OFFSET }, endMessage = (0, jsx_runtime_1.jsx)(react_intl_1.FormattedMessage, { id: "ui.feed.noOtherFeedObject", defaultMessage: "ui.feed.noOtherFeedObject" }), refreshMessage = (0, jsx_runtime_1.jsx)(react_intl_1.FormattedMessage, { id: "ui.feed.refreshRelease", defaultMessage: "ui.feed.refreshRelease" }), HeaderComponent, FooterComponent = Footer_1.default, FooterComponentProps = {}, widgets = [], ItemComponent, itemPropsGenerator, itemIdGenerator, ItemProps = {}, ItemSkeleton, ItemSkeletonProps = {}, onNextData, onPreviousData, FeedSidebarProps = {}, CustomAdvProps = {}, enabledCustomAdvPositions = [types_1.SCCustomAdvPosition.POSITION_FEED_SIDEBAR, types_1.SCCustomAdvPosition.POSITION_FEED], requireAuthentication = false, cacheStrategy = utils_1.CacheStrategies.NETWORK_ONLY, prefetchedData, scrollableTargetId, VirtualizedScrollerProps = {}, disablePaginationLinks = false, hidePaginationLinks = true, paginationLinksPageQueryParam = Pagination_1.DEFAULT_PAGINATION_QUERY_PARAM_NAME, PaginationLinkProps = {}, hideAdvs = false, emptyFeedPlaceholder } = props;
+    // HOOKS
+    const intl = (0, react_intl_1.useIntl)();
+    const { id = 'feed', className, endpoint, endpointQueryParams = { limit: Pagination_1.DEFAULT_PAGINATION_LIMIT, offset: Pagination_1.DEFAULT_PAGINATION_OFFSET }, endMessage = (0, jsx_runtime_1.jsx)(react_intl_1.FormattedMessage, { id: "ui.feed.noOtherFeedObject", defaultMessage: "ui.feed.noOtherFeedObject" }), refreshMessage = (0, jsx_runtime_1.jsx)(material_1.Typography, { dangerouslySetInnerHTML: { __html: `${intl.formatMessage(messages.refresh)}` } }), HeaderComponent, FooterComponent = Footer_1.default, FooterComponentProps = {}, widgets = [], ItemComponent, itemPropsGenerator, itemIdGenerator, ItemProps = {}, ItemSkeleton, ItemSkeletonProps = {}, onNextData, onPreviousData, FeedSidebarProps = {}, CustomAdvProps = {}, enabledCustomAdvPositions = [types_1.SCCustomAdvPosition.POSITION_FEED_SIDEBAR, types_1.SCCustomAdvPosition.POSITION_FEED], requireAuthentication = false, cacheStrategy = utils_1.CacheStrategies.NETWORK_ONLY, prefetchedData, scrollableTargetId, VirtualizedScrollerProps = {}, disablePaginationLinks = false, hidePaginationLinks = true, paginationLinksPageQueryParam = Pagination_1.DEFAULT_PAGINATION_QUERY_PARAM_NAME, PaginationLinkProps = {}, hideAdvs = false, emptyFeedPlaceholder } = props;
     // CONTEXT
     const scPreferences = (0, react_1.useContext)(react_core_1.SCPreferencesContext);
     const scUserContext = (0, react_1.useContext)(react_core_1.SCUserContext);

package/lib/cjs/components/NavigationToolbar/NavigationToolbar.js

@@ -119,7 +119,7 @@ function NavigationToolbar(inProps) {
     const eventsEnabled = (0, react_1.useMemo)(() => scPreferences.preferences &&
         scPreferences.features &&
         scPreferences.features.includes(types_1.SCFeatureName.TAGGING) &&
-        react_core_1.SCPreferences.CONFIGURATIONS_EVENTS_ENABLED in preferences &&
+        react_core_1.SCPreferences.CONFIGURATIONS_EVENTS_ENABLED in scPreferences.preferences &&
         scPreferences.preferences[react_core_1.SCPreferences.CONFIGURATIONS_EVENTS_ENABLED].value, [scPreferences.preferences, scPreferences.features]);
     const showComposer = (0, react_1.useMemo)(() => {
         return (!disableComposer &&

package/lib/cjs/shared/InfiniteScroll/index.js

@@ -225,7 +225,7 @@ class InfiniteScroll extends react_1.Component {
         // because heighted infiniteScroll visualy breaks
         // on drag down as overflow becomes visible
         const outerDivStyle = this.props.pullDownToRefresh && this.props.height ? { overflow: 'auto' } : {};
-        return ((0, jsx_runtime_1.jsx)("div", Object.assign({ style: outerDivStyle, className: "infinite-scroll-component__outerdiv" }, { children: (0, jsx_runtime_1.jsxs)("div", Object.assign({ className: `infinite-scroll-component ${this.props.className || ''}`, ref: (infScroll) => (this._infScroll = infScroll), style: style }, { children: [this.props.header, this.props.pullDownToRefresh && ((0, jsx_runtime_1.jsx)("div", Object.assign({ style: { position: 'relative' }, ref: (pullDown) => (this._pullDown = pullDown) }, { children: (0, jsx_runtime_1.jsx)("div", Object.assign({ style: {
+        return ((0, jsx_runtime_1.jsx)("div", Object.assign({ style: outerDivStyle, className: "infinite-scroll-component__outerdiv" }, { children: (0, jsx_runtime_1.jsxs)("div", Object.assign({ className: `infinite-scroll-component ${this.props.className || ''}`, ref: (infScroll) => (this._infScroll = infScroll), style: style }, { children: [this.props.header, this.props.pullDownToRefresh && ((0, jsx_runtime_1.jsx)("div", Object.assign({ style: { position: 'relative', marginBottom: 16 }, ref: (pullDown) => (this._pullDown = pullDown) }, { children: (0, jsx_runtime_1.jsx)("div", Object.assign({ style: {
                                 position: 'absolute',
                                 left: 0,
                                 right: 0,

package/lib/cjs/utils/formatRelativeTime.js

@@ -5,8 +5,8 @@ const getRelativeTime = (date) => {
     const diffInMilliseconds = new Date().getTime() - new Date(date).getTime();
     const seconds = Math.floor(diffInMilliseconds / 1000);
     const minutes = Math.floor(seconds / 60);
-    const hours = Math.ceil(minutes / 60);
-    const days = Math.floor(hours / 24);
+    const hours = Math.floor(minutes / 60);
+    const days = Math.round(hours / 24);
     const weeks = Math.floor(days / 7);
     const months = Math.floor(days / 30);
     const years = Math.floor(months / 12);

package/lib/esm/components/Composer/Composer.js

@@ -501,6 +501,8 @@ export default function Composer(inProps) {
         }
         else {
             onClose && onClose(e);
+            setLayer(null);
+            dispatch({ type: 'reset' });
             /*setLayer(null);
             feedType && feedType === SCFeedTypologyType.CATEGORY
               ? dispatch({type: 'resetCategoryFeed'})

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

@@ -3,8 +3,8 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import React, { forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { Link, SCCache, SCPreferences, SCPreferencesContext, SCUserContext, useIsComponentMountedRef, usePreviousValue, useSCFetchFeed } from '@selfcommunity/react-core';
 import { styled, useTheme } from '@mui/material/styles';
-import { Box, CardContent, Grid, Hidden, useMediaQuery } from '@mui/material';
-import { FormattedMessage } from 'react-intl';
+import { Box, CardContent, Grid, Hidden, Typography, useMediaQuery } from '@mui/material';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { GenericSkeleton } from '../Skeleton';
 import CustomAdv from '../CustomAdv';
 import { SCCustomAdvPosition } from '@selfcommunity/types';
@@ -23,6 +23,12 @@ import FeedSkeleton from './Skeleton';
 import { useDeepCompareEffectNoCheck } from 'use-deep-compare-effect';
 import StickyBoxComp from '../../shared/StickyBox';
 import { PREFIX } from './constants';
+const messages = defineMessages({
+    refresh: {
+        id: 'ui.feed.refreshRelease',
+        defaultMessage: 'ui.feed.refreshRelease'
+    }
+});
 const classes = {
     root: `${PREFIX}-root`,
     left: `${PREFIX}-left`,
@@ -75,7 +81,9 @@ const Feed = (inProps, ref) => {
         props: inProps,
         name: PREFIX
     });
-    const { id = 'feed', className, endpoint, endpointQueryParams = { limit: DEFAULT_PAGINATION_LIMIT, offset: DEFAULT_PAGINATION_OFFSET }, endMessage = _jsx(FormattedMessage, { id: "ui.feed.noOtherFeedObject", defaultMessage: "ui.feed.noOtherFeedObject" }), refreshMessage = _jsx(FormattedMessage, { id: "ui.feed.refreshRelease", defaultMessage: "ui.feed.refreshRelease" }), HeaderComponent, FooterComponent = Footer, FooterComponentProps = {}, widgets = [], ItemComponent, itemPropsGenerator, itemIdGenerator, ItemProps = {}, ItemSkeleton, ItemSkeletonProps = {}, onNextData, onPreviousData, FeedSidebarProps = {}, CustomAdvProps = {}, enabledCustomAdvPositions = [SCCustomAdvPosition.POSITION_FEED_SIDEBAR, SCCustomAdvPosition.POSITION_FEED], requireAuthentication = false, cacheStrategy = CacheStrategies.NETWORK_ONLY, prefetchedData, scrollableTargetId, VirtualizedScrollerProps = {}, disablePaginationLinks = false, hidePaginationLinks = true, paginationLinksPageQueryParam = DEFAULT_PAGINATION_QUERY_PARAM_NAME, PaginationLinkProps = {}, hideAdvs = false, emptyFeedPlaceholder } = props;
+    // HOOKS
+    const intl = useIntl();
+    const { id = 'feed', className, endpoint, endpointQueryParams = { limit: DEFAULT_PAGINATION_LIMIT, offset: DEFAULT_PAGINATION_OFFSET }, endMessage = _jsx(FormattedMessage, { id: "ui.feed.noOtherFeedObject", defaultMessage: "ui.feed.noOtherFeedObject" }), refreshMessage = _jsx(Typography, { dangerouslySetInnerHTML: { __html: `${intl.formatMessage(messages.refresh)}` } }), HeaderComponent, FooterComponent = Footer, FooterComponentProps = {}, widgets = [], ItemComponent, itemPropsGenerator, itemIdGenerator, ItemProps = {}, ItemSkeleton, ItemSkeletonProps = {}, onNextData, onPreviousData, FeedSidebarProps = {}, CustomAdvProps = {}, enabledCustomAdvPositions = [SCCustomAdvPosition.POSITION_FEED_SIDEBAR, SCCustomAdvPosition.POSITION_FEED], requireAuthentication = false, cacheStrategy = CacheStrategies.NETWORK_ONLY, prefetchedData, scrollableTargetId, VirtualizedScrollerProps = {}, disablePaginationLinks = false, hidePaginationLinks = true, paginationLinksPageQueryParam = DEFAULT_PAGINATION_QUERY_PARAM_NAME, PaginationLinkProps = {}, hideAdvs = false, emptyFeedPlaceholder } = props;
     // CONTEXT
     const scPreferences = useContext(SCPreferencesContext);
     const scUserContext = useContext(SCUserContext);

package/lib/esm/components/NavigationToolbar/NavigationToolbar.js

@@ -117,7 +117,7 @@ export default function NavigationToolbar(inProps) {
     const eventsEnabled = useMemo(() => scPreferences.preferences &&
         scPreferences.features &&
         scPreferences.features.includes(SCFeatureName.TAGGING) &&
-        SCPreferences.CONFIGURATIONS_EVENTS_ENABLED in preferences &&
+        SCPreferences.CONFIGURATIONS_EVENTS_ENABLED in scPreferences.preferences &&
         scPreferences.preferences[SCPreferences.CONFIGURATIONS_EVENTS_ENABLED].value, [scPreferences.preferences, scPreferences.features]);
     const showComposer = useMemo(() => {
         return (!disableComposer &&

package/lib/esm/shared/InfiniteScroll/index.js

@@ -223,7 +223,7 @@ class InfiniteScroll extends Component {
         // because heighted infiniteScroll visualy breaks
         // on drag down as overflow becomes visible
         const outerDivStyle = this.props.pullDownToRefresh && this.props.height ? { overflow: 'auto' } : {};
-        return (_jsx("div", Object.assign({ style: outerDivStyle, className: "infinite-scroll-component__outerdiv" }, { children: _jsxs("div", Object.assign({ className: `infinite-scroll-component ${this.props.className || ''}`, ref: (infScroll) => (this._infScroll = infScroll), style: style }, { children: [this.props.header, this.props.pullDownToRefresh && (_jsx("div", Object.assign({ style: { position: 'relative' }, ref: (pullDown) => (this._pullDown = pullDown) }, { children: _jsx("div", Object.assign({ style: {
+        return (_jsx("div", Object.assign({ style: outerDivStyle, className: "infinite-scroll-component__outerdiv" }, { children: _jsxs("div", Object.assign({ className: `infinite-scroll-component ${this.props.className || ''}`, ref: (infScroll) => (this._infScroll = infScroll), style: style }, { children: [this.props.header, this.props.pullDownToRefresh && (_jsx("div", Object.assign({ style: { position: 'relative', marginBottom: 16 }, ref: (pullDown) => (this._pullDown = pullDown) }, { children: _jsx("div", Object.assign({ style: {
                                 position: 'absolute',
                                 left: 0,
                                 right: 0,

package/lib/esm/utils/formatRelativeTime.js

@@ -2,8 +2,8 @@ export const getRelativeTime = (date) => {
     const diffInMilliseconds = new Date().getTime() - new Date(date).getTime();
     const seconds = Math.floor(diffInMilliseconds / 1000);
     const minutes = Math.floor(seconds / 60);
-    const hours = Math.ceil(minutes / 60);
-    const days = Math.floor(hours / 24);
+    const hours = Math.floor(minutes / 60);
+    const days = Math.round(hours / 24);
     const weeks = Math.floor(days / 7);
     const months = Math.floor(days / 30);
     const years = Math.floor(months / 12);