-
-
{header}
+// توابع داخلی بدون dispatch
+function notify(n) {
+ const content = (
+
+ {n.header &&
{n.header}}
+
{n.message}
+ {Array.isArray(n.buttons) && n.buttons.length > 0 && (
+
+ {n.buttons.map((b, idx) => (
+
+ ))}
- {result}
-
- );
- }
-
- return result;
-};
-
-/**
- * Presentation component for the global snackbar of the main window.
- *
- * @returns {Object} the rendered snackbar component
- */
-const ToastNotificationManager = ({ dispatch }) => {
- const { addToast, toastStack, removeToast } = useToasts();
-
- useSignal(
- snackbarSignal,
- ({
- buttons,
- header,
- message,
- permanent = false,
- semantics = MessageSemantics.DEFAULT,
- timeout,
- topic,
- }) => {
- const match = topic && toastStack.find((t) => t?.topic === topic);
-
- const content = createContentNode({ buttons, message, header }, dispatch);
- const options = {
- appearance: semanticsToAppearance[semantics] || 'info',
- autoDismiss: !permanent,
- // We don't want to override the default, and `undefined` is not ignored
- // internally, so we only pass the parameter, if it's actually present
- ...(timeout && { autoDismissTimeout: timeout }),
- topic,
- };
-
- if (match) {
- // If a previous notification with the same topic exists, remove it and
- // delay the showing of the next one until it has finished disappearing
- removeToast(match.id);
- if (content) {
- setTimeout(() => {
- addToast(content, options);
- }, SNACKBAR_TRANSITION_DURATION);
- }
- } else {
- if (content) {
- addToast(content, options);
- }
- }
- }
+ )}
+
);
- return null;
+ const options = {
+ duration: n.permanent ? Infinity : n.timeout || 5000,
+ style: { borderRadius: '8px', background: '#333', color: '#fff' },
+ position: 'top-right',
+ };
+
+ const toastFn = {
+ [MessageSemantics.INFO]: toast,
+ [MessageSemantics.SUCCESS]: toast.success,
+ [MessageSemantics.WARNING]: toast,
+ [MessageSemantics.ERROR]: toast.error,
+ }[n.semantics || MessageSemantics.INFO] || toast;
+
+ toastFn(content, options);
+}
+
+// نسخه Thunk برای dispatch
+export const showNotification = (notification) => {
+ return () => {
+ const n = typeof notification === 'string' ? { message: notification } : notification;
+ notify(n);
+ };
};
-ToastNotificationManager.propTypes = {
- dispatch: PropTypes.func.isRequired,
+export const showError = (message) => {
+ return () => {
+ notify({ message, semantics: MessageSemantics.ERROR });
+ };
};
-/**
- * Global snackbar at the bottom of the main window.
- */
-export default connect()(ToastNotificationManager);
-// We only need `connect` to get `dispatch` as a prop.
+export const showSuccess = (message) => {
+ return () => {
+ notify({ message, semantics: MessageSemantics.SUCCESS });
+ };
+};
diff --git a/src/features/snackbar/actions.ts b/src/features/snackbar/actions.ts
deleted file mode 100644
index ead0a242f..000000000
--- a/src/features/snackbar/actions.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { sendSnackbarSignal } from './signal';
-import { MessageSemantics, type Notification } from './types';
-
-import type { AppThunk } from '~/store/reducers';
-
-export function showNotification(
- notification: string | Notification
-): AppThunk {
- return () => {
- sendSnackbarSignal(
- typeof notification === 'string'
- ? { message: notification }
- : notification
- );
- };
-}
-
-export function showError(message: string): AppThunk {
- return showNotification({
- message,
- semantics: MessageSemantics.ERROR,
- });
-}
-
-export function showSuccess(message: string): AppThunk {
- return showNotification({
- message,
- semantics: MessageSemantics.SUCCESS,
- });
-}
diff --git a/src/features/snackbar/signal.ts b/src/features/snackbar/signal.ts
deleted file mode 100644
index 95228a1bf..000000000
--- a/src/features/snackbar/signal.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { MiniSignal } from 'mini-signals';
-
-import type { Notification } from './types';
-
-const snackbarSignal = new MiniSignal<[string | Notification]>();
-
-export const sendSnackbarSignal = (
- notification: string | Notification
-): void => {
- snackbarSignal.dispatch(notification);
-};
-
-export default snackbarSignal;
diff --git a/src/features/three-d/actions.js b/src/features/three-d/actions.js
index 0053a2252..d29c5f17e 100644
--- a/src/features/three-d/actions.js
+++ b/src/features/three-d/actions.js
@@ -1,5 +1,5 @@
import AFrame from '@skybrush/aframe-components';
-import { showError } from '~/features/snackbar/actions';
+import { showError } from '~/features/snackbar/ToastNotificationManager';
import { getActiveUAVIds } from '~/features/uavs/selectors';
import { getDroneFlockDOMNode } from './refs';
diff --git a/src/features/uav-control/actions.js b/src/features/uav-control/actions.js
index 5d6fbce1c..124ddee1d 100644
--- a/src/features/uav-control/actions.js
+++ b/src/features/uav-control/actions.js
@@ -1,6 +1,6 @@
import meanBy from 'lodash-es/meanBy';
-import { showError } from '~/features/snackbar/actions';
+import { showError } from '~/features/snackbar/ToastNotificationManager';
import {
getCurrentGPSPositionByUavId,
getSelectedUAVIds,
diff --git a/src/features/uavs/UAVLogsPanel.jsx b/src/features/uavs/UAVLogsPanel.jsx
index 20ab95d91..24333f486 100644
--- a/src/features/uavs/UAVLogsPanel.jsx
+++ b/src/features/uavs/UAVLogsPanel.jsx
@@ -21,7 +21,7 @@ import LargeProgressIndicator from '@skybrush/mui-components/lib/LargeProgressIn
import StatusLight from '@skybrush/mui-components/lib/StatusLight';
import { listOf } from '~/components/helpers/lists';
-import { showNotification } from '~/features/snackbar/actions';
+import { showNotification } from '~/features/snackbar/ToastNotificationManager';
import { MessageSemantics } from '~/features/snackbar/types';
import {
getLogDownloadState,
diff --git a/src/message-hub.js b/src/message-hub.js
index d6163f9fd..fea93257e 100644
--- a/src/message-hub.js
+++ b/src/message-hub.js
@@ -21,7 +21,7 @@ import {
import { handleObjectDeletionMessage } from './model/objects';
import { batchAddInboundMessages } from './features/messages/slice';
-import { showError, showNotification } from './features/snackbar/actions';
+import { showError, showNotification } from './features/snackbar/ToastNotificationManager';
import { semanticsFromSeverity } from './features/snackbar/utils';
import flock from './flock';
diff --git a/src/utils/messaging.js b/src/utils/messaging.js
index f0b79d86b..774d2bd08 100644
--- a/src/utils/messaging.js
+++ b/src/utils/messaging.js
@@ -11,7 +11,7 @@ import values from 'lodash-es/values';
import { showConfirmationDialog } from '~/features/prompt/actions';
import { UAV_SIGNAL_DURATION } from '~/features/settings/constants';
import { shouldConfirmUAVOperation } from '~/features/settings/selectors';
-import { showNotification } from '~/features/snackbar/actions';
+import { showNotification } from '~/features/snackbar/ToastNotificationManager';
import { MessageSemantics } from '~/features/snackbar/types';
import messageHub from '~/message-hub';
import store from '~/store';
diff --git a/src/views/features/FeaturePanelToolbar.jsx b/src/views/features/FeaturePanelToolbar.jsx
index 142b87f93..51484d1e6 100644
--- a/src/views/features/FeaturePanelToolbar.jsx
+++ b/src/views/features/FeaturePanelToolbar.jsx
@@ -12,7 +12,7 @@ import FolderOpen from '@material-ui/icons/FolderOpen';
import FileButton from '~/components/FileButton';
import { addFeatureWithName } from '~/features/map-features/actions';
-import { showError, showSuccess } from '~/features/snackbar/actions';
+import { showError, showSuccess } from '~/features/snackbar/ToastNotificationManager';
import { createFeaturesFromOpenLayers } from '~/model/openlayers';
import { readFileAsArrayBuffer } from '~/utils/files';
diff --git a/src/views/map/layers/geojson.jsx b/src/views/map/layers/geojson.jsx
index 4d9acd5ac..f3ef8c0dc 100644
--- a/src/views/map/layers/geojson.jsx
+++ b/src/views/map/layers/geojson.jsx
@@ -15,7 +15,7 @@ import TextField from '@material-ui/core/TextField';
import Colors from '~/components/colors';
import PopupColorPicker from '~/components/PopupColorPicker';
import { setLayerParametersById } from '~/features/map/layers';
-import { showNotification } from '~/features/snackbar/actions';
+import { showNotification } from '~/features/snackbar/ToastNotificationManager';
import { parseColor } from '~/utils/coloring';
import { convertSimpleStyleToOLStyle } from '~/utils/simplestyle';
diff --git a/src/views/show-control/OutdoorEnvironmentEditor.jsx b/src/views/show-control/OutdoorEnvironmentEditor.jsx
index ffc02c33c..31a76a287 100644
--- a/src/views/show-control/OutdoorEnvironmentEditor.jsx
+++ b/src/views/show-control/OutdoorEnvironmentEditor.jsx
@@ -43,7 +43,7 @@ import {
getOutdoorShowOrientation,
getOutdoorShowTakeoffHeadingSpecification,
} from '~/features/show/selectors';
-import { showNotification } from '~/features/snackbar/actions';
+import { showNotification } from '~/features/snackbar/ToastNotificationManager';
import { MessageSemantics } from '~/features/snackbar/types';
import { getAverageHeadingOfActiveUAVs } from '~/features/uavs/selectors';
import i18n from '~/i18n';
diff --git a/src/views/show-control/ShowConfiguratorButton.tsx b/src/views/show-control/ShowConfiguratorButton.tsx
index 27b4f2133..394cf1082 100644
--- a/src/views/show-control/ShowConfiguratorButton.tsx
+++ b/src/views/show-control/ShowConfiguratorButton.tsx
@@ -25,7 +25,7 @@ import {
hasLoadedShowFile,
} from '~/features/show/selectors';
import { getSetupStageStatuses } from '~/features/show/stages';
-import { showError } from '~/features/snackbar/actions';
+import { showError } from '~/features/snackbar/ToastNotificationManager';
import { type PreparedI18nKey, tt } from '~/i18n';
import Pro from '~/icons/Pro';
import {