@tap-payments/os-micro-frontend-shared 0.1.391 → 0.1.392

package/build/components/StatusBar/StatusBar.js

@@ -23,7 +23,7 @@ function StatusBar({ isFilteredIdsShown, availableStatuses, status, onStatusChan
         onStatusChange === null || onStatusChange === void 0 ? void 0 : onStatusChange(selected);
     }, [onStatusChange]);
     return (_jsx(_Fragment, { children: availableStatuses === null || availableStatuses === void 0 ? void 0 : availableStatuses.map((_a, index) => {
-            var _b, _c;
+            var _b;
             var { render } = _a, s = __rest(_a, ["render"]);
             if (render) {
                 return (_jsx(Fragment, { children: render({ status: status, onChange: handleStatusChange }, Object.assign(Object.assign({}, s), { index })) }, `custom-status-slot-${index}`));
@@ -42,13 +42,13 @@ function StatusBar({ isFilteredIdsShown, availableStatuses, status, onStatusChan
                 []);
             const hasMatchingDropdownStatus = !!status && formattedStatuses.some((item) => (item === null || item === void 0 ? void 0 : item.value) === status);
             const variant = hasMatchingDropdownStatus ? 'active' : 'inActive';
-            const selectedStatus = hasMatchingDropdownStatus ? status : (_b = formattedStatuses[0]) === null || _b === void 0 ? void 0 : _b.value;
+            const selectedStatus = hasMatchingDropdownStatus ? status : undefined;
             return (_jsx("div", { children: _jsx(StatusButton, Object.assign({}, s, { selectedStatus: selectedStatus, variant: variant, onButtonBodyClick: (buttonStatus) => handleStatusChange(buttonStatus), dropdownOptions: formattedStatuses.map((stat) => ({
                         label: t((stat === null || stat === void 0 ? void 0 : stat.value) || ''),
                         status: stat === null || stat === void 0 ? void 0 : stat.value,
                         icon: stat.icon,
                         onClick: () => handleStatusChange(stat.value),
-                    })), buttonSx: buttonSx })) }, (_c = formattedStatuses[0]) === null || _c === void 0 ? void 0 : _c.value));
+                    })), buttonSx: buttonSx })) }, (_b = formattedStatuses[0]) === null || _b === void 0 ? void 0 : _b.value));
         }) }));
 }
 export default memo(StatusBar);

package/build/components/StatusButton/StatusButton.js

@@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next';
 import StyledBadge, { BadgeVariants } from '../CountBadge';
 import { convertToNumber, formatNumber } from '../../utils/index.js';
 import { ChevronIcon } from './ChevronIcon';
-import { ChevronContainer, Label, LabelWrapper, StyledStatusIcon, StyledDropdown, statusButtonVariants } from './style';
+import { ChevronContainer, Label, LabelWrapper, StyledStatusIcon, StyledDropdown, statusButtonVariants, IconWrapper } from './style';
 import { statusButtonIcons } from './constant';
 const StatusButton = memo((props) => {
     var _a;
@@ -25,14 +25,26 @@ const StatusButton = memo((props) => {
     const buttonRef = useRef(null);
     const [anchorEl, setAnchorEl] = useState(null);
     const [selectedStatus, setSelectedStatus] = useState(initialStatus !== null && initialStatus !== void 0 ? initialStatus : (_a = dropdownOptions === null || dropdownOptions === void 0 ? void 0 : dropdownOptions[0]) === null || _a === void 0 ? void 0 : _a.status);
-    // Memoized computed values
+    useEffect(() => {
+        if (initialStatus !== undefined) {
+            setSelectedStatus(initialStatus);
+        }
+    }, [initialStatus]);
     const hasDropdown = useMemo(() => Boolean(dropdownOptions === null || dropdownOptions === void 0 ? void 0 : dropdownOptions.length), [dropdownOptions]);
     // only open if button is clicked more than once
     const isDropdownOpen = Boolean(anchorEl) && buttonClicks > 1;
     const isActiveVariant = variant === 'active';
     const badgeVariant = useMemo(() => (isActiveVariant ? BadgeVariants.ACTIVE : BadgeVariants.INACTIVE), [isActiveVariant]);
-    // Memoized UI elements
-    const statusIcon = useMemo(() => (icon ? _jsx(StyledStatusIcon, { icon: icon, variant: variant, src: iconMapper[icon], alt: `${icon}-icon` }) : null), [icon, iconMapper, variant]);
+    const statusIcon = useMemo(() => {
+        const selectedOption = selectedStatus ? dropdownOptions === null || dropdownOptions === void 0 ? void 0 : dropdownOptions.find((option) => option.status === selectedStatus) : null;
+        if (selectedOption === null || selectedOption === void 0 ? void 0 : selectedOption.icon) {
+            return _jsx(IconWrapper, Object.assign({ variant: variant }, { children: selectedOption.icon }));
+        }
+        const iconKey = selectedStatus && iconMapper[selectedStatus] ? selectedStatus : icon;
+        if (iconKey && iconMapper[iconKey]) {
+            return _jsx(StyledStatusIcon, { icon: iconKey, variant: variant, src: iconMapper[iconKey], alt: `${iconKey}-icon` });
+        }
+    }, [selectedStatus, dropdownOptions, iconMapper, icon, variant]);
     const statusBadge = useMemo(() => {
         if (!badgeCount || Number.isNaN(convertToNumber(badgeCount)))
             return null;

package/build/components/StatusButton/style.d.ts

@@ -38,3 +38,8 @@ export declare const StyledStatusIcon: import("@emotion/styled").StyledComponent
     variant: StatusButtonVariant;
     icon?: StatusButtonProps['icon'];
 }, React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, {}>;
+export declare const IconWrapper: import("@emotion/styled").StyledComponent<import("@mui/system").BoxOwnProps<Theme> & Omit<Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
+    ref?: ((instance: HTMLDivElement | null) => void) | React.RefObject<HTMLDivElement> | null | undefined;
+}, keyof import("@mui/system").BoxOwnProps<Theme>> & import("@mui/system").MUIStyledCommonProps<Theme> & {
+    variant: StatusButtonVariant;
+}, {}, {}>;

package/build/components/StatusButton/style.js

@@ -79,3 +79,14 @@ export const StyledStatusIcon = styled('img')(({ theme, variant, icon }) => {
         filter: variant === 'active' ? 'brightness(0) invert(1)' : 'brightness(0) invert(0)',
     })), { maxWidth: '14px', maxHeight: '14px' }));
 });
+export const IconWrapper = styled(Box)(({ variant }) => ({
+    width: '14px',
+    height: '14px',
+    display: 'flex',
+    alignItems: 'center',
+    '& img': {
+        width: '14px',
+        height: '14px',
+        filter: variant === 'active' ? 'brightness(0) invert(1)' : 'brightness(0) invert(0)',
+    },
+}));

package/build/constants/assets.d.ts

@@ -78,6 +78,9 @@ export declare const minimizeIcon: string;
 export declare const closeIcon: string;
 export declare const dashedCheckIcon: string;
 export declare const outstandingIcon: string;
+export declare const cancelledNoBgIcon: string;
+export declare const expiredNoBgIcon: string;
+export declare const paidNoBgIcon: string;
 export declare const deactivatedIcon: string;
 export declare const topUpIcon: string;
 export declare const deMaximizeIcon: string;

package/build/constants/assets.js

@@ -83,6 +83,9 @@ export const minimizeIcon = `${lightUrl}/minimize.svg`;
 export const closeIcon = `${lightUrl}/close.svg`;
 export const dashedCheckIcon = `${lightUrl}/dashedCheckIcon.svg`;
 export const outstandingIcon = `${lightUrl}/outstandingIcon.svg`;
+export const cancelledNoBgIcon = `${lightUrl}/cancelledStatusIcon.svg`;
+export const expiredNoBgIcon = `${lightUrl}/expiredStatusIcon.svg`;
+export const paidNoBgIcon = `${lightUrl}/paidStatusIcon.svg`;
 export const deactivatedIcon = `${lightUrl}/deactivatedIcon.svg`;
 export const topUpIcon = `${lightUrl}/topup.svg`;
 export const deMaximizeIcon = `${appBaseUrl}/demaximize.svg`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tap-payments/os-micro-frontend-shared",
   "description": "Shared components and utilities for Tap Payments micro frontends",
-  "version": "0.1.391",
+  "version": "0.1.392",
   "testVersion": 0,
   "type": "module",
   "main": "build/index.js",