Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/uxcore/components/NewUpdateModal/NewUpdateModal.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import Button from '@uxcore/components/Button';
import Modal from '@uxcore/components/Modal';
import Image from 'next/image';
import Link from 'next/link';
import { FC } from 'react';
import ReactMarkdown from 'react-markdown';

import Button from '@uxcore/components/Button';
import Modal from '@uxcore/components/Modal';

import type { NewUpdateModalProps } from './NewUpdateModal.types';

import styles from './NewUpdateModal.module.scss';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export interface NewUpdateData {
'Close button text'?: string;
'Frontend modal visibility'?: boolean;
'Appears after x seconds'?: number;
updatedAt?: string;
}

export interface NewUpdateModalProps {
Expand Down
18 changes: 17 additions & 1 deletion src/uxcore/components/NewUpdateModal/NewUpdateModalContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { FC, useEffect, useState } from 'react';
import NewUpdateModal from './NewUpdateModal';
import type { NewUpdateData } from './NewUpdateModal.types';

const DISMISSED_KEY = 'uxcoreNewUpdateDismissed';

const NewUpdateModalContainer: FC = () => {
const router = useRouter();
const [data, setData] = useState<NewUpdateData | null>(null);
Expand All @@ -22,6 +24,11 @@ const NewUpdateModalContainer: FC = () => {

if (cancelled || !res || !res['Frontend modal visibility']) return;

// Dismissal is keyed to the CMS updatedAt: closing hides this update
// for the rest of the session, but a newly published one shows again.
if (sessionStorage.getItem(DISMISSED_KEY) === (res.updatedAt ?? 'seen'))
return;

setData(res);

const delaySeconds = Number(res['Appears after x seconds']) || 0;
Expand All @@ -42,9 +49,18 @@ const NewUpdateModalContainer: FC = () => {
};
}, [router.locale]);

const handleClose = () => {
setOpen(false);
try {
sessionStorage.setItem(DISMISSED_KEY, data?.updatedAt ?? 'seen');
} catch {
// Storage can be unavailable (private mode); closing still works.
}
};

if (!open || !data) return null;

return <NewUpdateModal data={data} onClose={() => setOpen(false)} />;
return <NewUpdateModal data={data} onClose={handleClose} />;
};

export default NewUpdateModalContainer;
Loading