@astral/ui 1.50.0 → 1.50.1

package/ListItem/ListItem.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import { ListItemProps } from './types';
-export declare const ListItem: ({ ...props }: ListItemProps) => JSX.Element;
+export declare const ListItem: (props: ListItemProps) => JSX.Element;

package/ListItem/ListItem.js

@@ -1,21 +1,9 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListItem = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const styles_1 = require("./styles");
-const ListItem = (_a) => {
-    var props = __rest(_a, []);
+const ListItem = (props) => {
     return (0, jsx_runtime_1.jsx)(styles_1.StyledListItem, Object.assign({}, props));
 };
 exports.ListItem = ListItem;

package/MenuGroup/MenuGroup.d.ts

@@ -1,3 +1,9 @@
-/// <reference types="react" />
-import { MenuGroupProps } from './types';
+import { ReactNode } from 'react';
+export type MenuGroupProps = {
+    children: ReactNode;
+    /**
+     * Заголовок группы
+     */
+    label: string;
+};
 export declare const MenuGroup: (props: MenuGroupProps) => JSX.Element;

package/MenuGroup/MenuGroup.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MenuGroup = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
-const styled_1 = require("./styled");
+const styles_1 = require("./styles");
 const MenuGroup = (props) => {
     const { children, label } = props;
     const upperCasedLabel = (0, react_1.useMemo)(() => label.toUpperCase(), [label]);
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(styled_1.StyledLabel, Object.assign({ variant: "h7" }, { children: upperCasedLabel })), (0, jsx_runtime_1.jsx)(styled_1.StyledContentWrapper, { children: children })] }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(styles_1.MenuGroupLabel, Object.assign({ component: "li", variant: "h7" }, { children: upperCasedLabel })), (0, jsx_runtime_1.jsx)(styles_1.MenuGroupContent, { children: (0, jsx_runtime_1.jsx)("ul", { children: children }) })] }));
 };
 exports.MenuGroup = MenuGroup;

package/MenuGroup/stories/styled.d.ts

@@ -35,4 +35,4 @@ export declare const StyledLabel: import("@emotion/styled").StyledComponent<Pick
 export declare const StyledMenuWrapper: import("@emotion/styled").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any> | undefined;
-}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
+}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLUListElement>, HTMLUListElement>, {}>;

package/MenuGroup/stories/styled.js

@@ -10,6 +10,6 @@ exports.StyledMenuItem = (0, styles_1.styled)(MenuItem_1.MenuItem) `
 exports.StyledLabel = (0, styles_1.styled)(Typography_1.Typography) `
   font-size: ${({ theme }) => theme.typography.h5.fontSize};
 `;
-exports.StyledMenuWrapper = styles_1.styled.div `
-  padding-top: ${({ theme }) => theme.spacing(2)};
+exports.StyledMenuWrapper = styles_1.styled.ul `
+  padding: ${({ theme }) => theme.spacing(2, 0, 0, 0)};
 `;

package/MenuGroup/styles.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+export declare const MenuGroupLabel: import("@emotion/styled").StyledComponent<Pick<import("react").PropsWithChildren<import("../Typography").TypographyProps>, string | number | symbol> & import("react").RefAttributes<HTMLElement> & {
+    theme?: import("@emotion/react").Theme | undefined;
+}, {}, {}>;
+export declare const MenuGroupContent: import("@emotion/styled").StyledComponent<{
+    theme?: import("@emotion/react").Theme | undefined;
+    as?: import("react").ElementType<any> | undefined;
+}, import("react").DetailedHTMLProps<import("react").LiHTMLAttributes<HTMLLIElement>, HTMLLIElement>, {}>;

package/MenuGroup/{styled.js → styles.js}

@@ -1,17 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StyledContentWrapper = exports.StyledLabel = void 0;
+exports.MenuGroupContent = exports.MenuGroupLabel = void 0;
 const styles_1 = require("../styles");
 const Typography_1 = require("../Typography");
-exports.StyledLabel = (0, styles_1.styled)(Typography_1.Typography) `
+exports.MenuGroupLabel = (0, styles_1.styled)(Typography_1.Typography) `
   display: block;
+  width: 100%;
   padding: ${({ theme }) => theme.spacing(2, 4)};
 
   color: ${({ theme }) => theme.palette.grey[700]};
   line-height: ${({ theme }) => theme.typography.pxToRem(16)};
 `;
-exports.StyledContentWrapper = styles_1.styled.div `
-  & > li {
-    padding-left: ${({ theme }) => theme.spacing(7)};
+exports.MenuGroupContent = styles_1.styled.li `
+  width: 100%;
+
+  & ul {
+    padding: 0;
+
+    list-style: none;
   }
 `;

package/ProductSwitcher/ProductSwitcher.js

@@ -41,6 +41,6 @@ const ProductSwitcher = ({ getProducts }) => {
             }
         }
     });
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(IconButton_1.IconButton, Object.assign({ ref: anchorRef, selected: open, variant: "text", onClick: handleShowProducts }, { children: (0, jsx_runtime_1.jsx)(icons_1.ProductsFillMd, {}) })), (0, jsx_runtime_1.jsx)(styles_1.WidgetMenu, Object.assign({ open: open, anchorEl: anchorRef.current, onClose: handleCloseMenu }, { children: (0, jsx_runtime_1.jsx)(styles_1.ContentWrapper, { children: (0, jsx_runtime_1.jsx)(ProductSwitcherContent_1.ProductSwitcherContent, { isLoading: isLoading, isError: isError, products: products }) }) }))] }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(IconButton_1.IconButton, Object.assign({ ref: anchorRef, selected: open, variant: "text", onClick: handleShowProducts }, { children: (0, jsx_runtime_1.jsx)(icons_1.ProductsFillMd, {}) })), (0, jsx_runtime_1.jsx)(styles_1.WidgetMenu, Object.assign({ open: open, anchorEl: anchorRef.current, onClose: handleCloseMenu }, { children: (0, jsx_runtime_1.jsx)(ProductSwitcherContent_1.ProductSwitcherContent, { isLoading: isLoading, isError: isError, products: products }) }))] }));
 };
 exports.ProductSwitcher = ProductSwitcher;

package/ProductSwitcher/ProductSwitcher.stories.js

@@ -20,42 +20,49 @@ exports.handleReject = handleReject;
 const handleGetProducts = () => {
     return new Promise((resolve) => setTimeout(() => resolve([
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff53b1',
             url: '',
             name: 'Астрал.Отчет',
             logoUrl: 'https://identity.astral.ru/api/Files/06a5fb56-210c-4f08-bb7b-253a9103560f',
             color: '#2d77ff',
         },
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff532',
             url: '',
             name: 'Астрал.ЭДО',
             logoUrl: 'https://identity.astral.ru/api/Files/b5b06b5a-2d0e-491b-9815-043d82f104aa',
             color: 'rgb(117 90 253)',
         },
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff533',
             url: '',
             name: 'Астрал.КЭДО',
             logoUrl: 'https://identity.astral.ru/api/Files/f0519e97-7a50-4796-a8d2-877cd15c7668',
             color: 'rgb(117 90 253)',
         },
         {
-            url: '',
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff534',
+            url: 'https://ofd.astralnalog.ru/lk',
             name: 'Астрал.ОФД',
             logoUrl: 'https://identity.astral.ru/api/Files/f0519e97-7a50-4796-a8d2-877cd15c7668',
             color: 'rgb(117 90 253)',
         },
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff535',
             url: '',
             name: 'Астрал.ЭТ',
             logoUrl: 'https://identity.astral.ru/api/Files/ac497150-1926-47be-9e5f-42e739e7279c',
             color: 'rgb(55 103 152)',
         },
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff536',
             url: '',
             name: 'Личный кабинет',
             logoUrl: 'https://identity.astral.ru/api/Files/9d214f12-c518-44e2-a711-fa1bf2b89fdd',
             color: 'rgb(10, 124, 255)',
         },
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff537',
             url: '',
             name: 'Кабинет партнера',
             logoUrl: 'https://identity.astral.ru/api/Files/f0519e97-7a50-4796-a8d2-877cd15c7668',

package/ProductSwitcher/ProductSwitcherContent/ProductSwitcherContent.js

@@ -2,16 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProductSwitcherContent = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
+const icons_1 = require("@astral/icons");
 const ContentState_1 = require("../../ContentState");
+const MenuGroup_1 = require("../../MenuGroup");
+const Typography_1 = require("../../Typography");
 const styles_1 = require("./styles");
 const ProductSwitcherContent = ({ isLoading, isError, products = [], }) => {
     return ((0, jsx_runtime_1.jsx)(ContentState_1.ContentState, Object.assign({ isLoading: isLoading, isCustom: isError, customState: {
             imgAlt: 'Что-то пошло не так',
-            title: 'Что-то пошло не так',
+            title: ((0, jsx_runtime_1.jsxs)(styles_1.TitleErrorContainer, Object.assign({ container: true, autoFlow: "column", alignItems: "center", justifyContent: "center", component: "span" }, { children: [(0, jsx_runtime_1.jsx)(icons_1.ErrorFillSm, { color: "inherit" }), (0, jsx_runtime_1.jsx)(Typography_1.Typography, Object.assign({ variant: "h6", color: "grey", colorIntensity: 900 }, { children: "\u0427\u0442\u043E-\u0442\u043E \u043F\u043E\u0448\u043B\u043E \u043D\u0435 \u0442\u0430\u043A" }))] }))),
             description: 'Произошла ошибка. Повторите попытку позже.',
-            // TODO: imgSrc обязательный параметр, а в title не засунуть текст с иконкой. Соответствующая доработка в задаче:
-            // https://astraltrack.atlassian.net/jira/software/c/projects/UIKIT/boards/142?modal=detail&selectedIssue=UIKIT-435
-            imgSrc: '',
-        } }, { children: products.map((product) => ((0, jsx_runtime_1.jsxs)(styles_1.ProductItem, Object.assign({}, product, { children: [(0, jsx_runtime_1.jsx)(styles_1.Logo, { src: product.logoUrl, color: product.color }), product.name] }), product.name))) })));
+        } }, { children: (0, jsx_runtime_1.jsx)(MenuGroup_1.MenuGroup, Object.assign({ label: "\u041F\u0440\u043E\u0434\u0443\u043A\u0442\u044B \u044D\u043A\u043E\u0441\u0438\u0441\u0442\u0435\u043C\u044B" }, { children: products.map((product) => {
+                return ((0, jsx_runtime_1.jsx)("li", { children: (0, jsx_runtime_1.jsxs)(styles_1.ProductItem, Object.assign({ component: "a", href: product.url }, { children: [(0, jsx_runtime_1.jsx)(styles_1.Logo, { src: product.logoUrl, color: product.color }), (0, jsx_runtime_1.jsx)(Typography_1.Typography, Object.assign({ variant: "ui", color: "grey", colorIntensity: 900 }, { children: product.name }))] })) }, product.id));
+            }) })) })));
 };
 exports.ProductSwitcherContent = ProductSwitcherContent;

package/ProductSwitcher/ProductSwitcherContent/styles.d.ts

@@ -1,35 +1,11 @@
 /// <reference types="react" />
-export declare const ProductItem: import("@emotion/styled").StyledComponent<{
-    autoFocus?: boolean | undefined;
-    classes?: Partial<import("@mui/material").MenuItemClasses> | undefined;
-    dense?: boolean | undefined;
-    disabled?: boolean | undefined;
-    disableGutters?: boolean | undefined;
-    divider?: boolean | undefined;
-    selected?: boolean | undefined;
-    sx?: import("@mui/system").SxProps<import("@mui/material").Theme> | undefined;
-} & Omit<{
-    action?: import("react").Ref<import("@mui/material").ButtonBaseActions> | undefined;
-    centerRipple?: boolean | undefined;
-    children?: import("react").ReactNode;
-    classes?: Partial<import("@mui/material").ButtonBaseClasses> | undefined;
-    disabled?: boolean | undefined;
-    disableRipple?: boolean | undefined;
-    disableTouchRipple?: boolean | undefined;
-    focusRipple?: boolean | undefined;
-    focusVisibleClassName?: string | undefined;
-    LinkComponent?: import("react").ElementType<any> | undefined;
-    onFocusVisible?: import("react").FocusEventHandler<any> | undefined;
-    sx?: import("@mui/system").SxProps<import("@mui/material").Theme> | undefined;
-    tabIndex?: number | undefined;
-    TouchRippleProps?: Partial<import("@mui/material/ButtonBase/TouchRipple").TouchRippleProps> | undefined;
-    touchRippleRef?: import("react").Ref<import("@mui/material/ButtonBase/TouchRipple").TouchRippleActions> | undefined;
-}, "classes"> & import("@mui/material/OverridableComponent").CommonProps & Omit<Pick<import("react").DetailedHTMLProps<import("react").LiHTMLAttributes<HTMLLIElement>, HTMLLIElement>, "css" | "key" | keyof import("react").LiHTMLAttributes<HTMLLIElement>> & {
-    ref?: ((instance: HTMLLIElement | null) => void) | import("react").RefObject<HTMLLIElement> | null | undefined;
-}, "disabled" | "action" | "divider" | "sx" | "onFocusVisible" | "tabIndex" | "children" | "autoFocus" | "selected" | keyof import("@mui/material/OverridableComponent").CommonProps | "centerRipple" | "disableRipple" | "disableTouchRipple" | "focusRipple" | "focusVisibleClassName" | "LinkComponent" | "TouchRippleProps" | "touchRippleRef" | "dense" | "disableGutters"> & {
-    theme?: import("@emotion/react").Theme | undefined;
-}, {}, {}>;
+export declare const ProductItem: import("@mui/material").ExtendButtonBase<import("@mui/material").MenuItemTypeMap<{}, "li">>;
 export declare const Logo: import("@emotion/styled").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any> | undefined;
 }, import("react").DetailedHTMLProps<import("react").ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, {}>;
+export declare const TitleErrorContainer: import("@emotion/styled").StyledComponent<import("../../Grid").GridContainerProps & import("../../Grid").GridElementsProps & {
+    children?: import("react").ReactNode;
+} & import("react").RefAttributes<HTMLElement> & {
+    theme?: import("@emotion/react").Theme | undefined;
+}, {}, {}>;

package/ProductSwitcher/ProductSwitcherContent/styles.js

@@ -1,18 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logo = exports.ProductItem = void 0;
+exports.TitleErrorContainer = exports.Logo = exports.ProductItem = void 0;
 const styles_1 = require("../../styles");
 const MenuItem_1 = require("../../MenuItem");
+const Grid_1 = require("../../Grid");
+// as typeof MenuItem необходим для возможности прокинуть component
+// https://github.com/mui/material-ui/issues/15695
 exports.ProductItem = (0, styles_1.styled)(MenuItem_1.MenuItem) `
-  width: 100%;
-
-  border-radius: ${({ theme }) => theme.shape.small};
+  padding-left: ${({ theme }) => theme.spacing(6)};
 `;
-exports.Logo = styles_1.styled.img `
+exports.Logo = (0, styles_1.styled)('img', {
+    shouldForwardProp: (prop) => prop !== 'color',
+}) `
   width: 40px;
   height: 40px;
-  margin-right: ${({ theme }) => theme.spacing(2)};
+  margin-right: ${({ theme }) => theme.spacing(4)};
 
   background-color: ${({ color }) => color};
   border-radius: ${({ theme }) => theme.shape.small};
 `;
+exports.TitleErrorContainer = (0, styles_1.styled)(Grid_1.Grid) `
+  color: ${({ theme }) => theme.palette.error.dark};
+  column-gap: ${({ theme }) => theme.spacing(2)};
+`;

package/ProductSwitcher/styles.d.ts

@@ -1,8 +1,3 @@
-/// <reference types="react" />
-export declare const ContentWrapper: import("@emotion/styled").StyledComponent<{
-    theme?: import("@emotion/react").Theme | undefined;
-    as?: import("react").ElementType<any> | undefined;
-}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
 export declare const WidgetMenu: import("@emotion/styled").StyledComponent<import("../Menu").MenuProps & {
     theme?: import("@emotion/react").Theme | undefined;
 }, {}, {}>;

package/ProductSwitcher/styles.js

@@ -1,20 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WidgetMenu = exports.ContentWrapper = void 0;
+exports.WidgetMenu = void 0;
 const styles_1 = require("../styles");
 const Menu_1 = require("../Menu");
-exports.ContentWrapper = styles_1.styled.div `
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  min-width: 240px;
-  max-width: 280px;
-  min-height: 150px;
-  padding: ${({ theme }) => theme.spacing(2)};
-`;
 exports.WidgetMenu = (0, styles_1.styled)(Menu_1.Menu) `
-  .MuiList-root {
-    padding: 0;
+  .MuiPaper-root > .MuiList-root {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 285px;
+    min-height: 124px;
+    padding: ${({ theme }) => theme.spacing(3, 0)};
   }
 `;

package/ProductSwitcher/types.d.ts

@@ -1,4 +1,5 @@
 export type WidgetProduct = {
+    id: string;
     url: string;
     name: string;
     logoUrl: string;

package/esm/ListItem/ListItem.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import { ListItemProps } from './types';
-export declare const ListItem: ({ ...props }: ListItemProps) => JSX.Element;
+export declare const ListItem: (props: ListItemProps) => JSX.Element;

package/esm/ListItem/ListItem.js

@@ -1,17 +1,5 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 import { StyledListItem } from './styles';
-export const ListItem = (_a) => {
-    var props = __rest(_a, []);
+export const ListItem = (props) => {
     return _jsx(StyledListItem, Object.assign({}, props));
 };

package/esm/MenuGroup/MenuGroup.d.ts

@@ -1,3 +1,9 @@
-/// <reference types="react" />
-import { MenuGroupProps } from './types';
+import { ReactNode } from 'react';
+export type MenuGroupProps = {
+    children: ReactNode;
+    /**
+     * Заголовок группы
+     */
+    label: string;
+};
 export declare const MenuGroup: (props: MenuGroupProps) => JSX.Element;

package/esm/MenuGroup/MenuGroup.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useMemo } from 'react';
-import { StyledContentWrapper, StyledLabel } from './styled';
+import { MenuGroupContent, MenuGroupLabel } from './styles';
 export const MenuGroup = (props) => {
     const { children, label } = props;
     const upperCasedLabel = useMemo(() => label.toUpperCase(), [label]);
-    return (_jsxs(_Fragment, { children: [_jsx(StyledLabel, Object.assign({ variant: "h7" }, { children: upperCasedLabel })), _jsx(StyledContentWrapper, { children: children })] }));
+    return (_jsxs(_Fragment, { children: [_jsx(MenuGroupLabel, Object.assign({ component: "li", variant: "h7" }, { children: upperCasedLabel })), _jsx(MenuGroupContent, { children: _jsx("ul", { children: children }) })] }));
 };

package/esm/MenuGroup/stories/styled.d.ts

@@ -35,4 +35,4 @@ export declare const StyledLabel: import("@emotion/styled").StyledComponent<Pick
 export declare const StyledMenuWrapper: import("@emotion/styled").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any> | undefined;
-}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
+}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLUListElement>, HTMLUListElement>, {}>;

package/esm/MenuGroup/stories/styled.js

@@ -7,6 +7,6 @@ export const StyledMenuItem = styled(MenuItem) `
 export const StyledLabel = styled(Typography) `
   font-size: ${({ theme }) => theme.typography.h5.fontSize};
 `;
-export const StyledMenuWrapper = styled.div `
-  padding-top: ${({ theme }) => theme.spacing(2)};
+export const StyledMenuWrapper = styled.ul `
+  padding: ${({ theme }) => theme.spacing(2, 0, 0, 0)};
 `;

package/esm/MenuGroup/styles.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+export declare const MenuGroupLabel: import("@emotion/styled").StyledComponent<Pick<import("react").PropsWithChildren<import("../Typography").TypographyProps>, string | number | symbol> & import("react").RefAttributes<HTMLElement> & {
+    theme?: import("@emotion/react").Theme | undefined;
+}, {}, {}>;
+export declare const MenuGroupContent: import("@emotion/styled").StyledComponent<{
+    theme?: import("@emotion/react").Theme | undefined;
+    as?: import("react").ElementType<any> | undefined;
+}, import("react").DetailedHTMLProps<import("react").LiHTMLAttributes<HTMLLIElement>, HTMLLIElement>, {}>;

package/esm/MenuGroup/{styled.js → styles.js}

@@ -1,14 +1,19 @@
 import { styled } from '../styles';
 import { Typography } from '../Typography';
-export const StyledLabel = styled(Typography) `
+export const MenuGroupLabel = styled(Typography) `
   display: block;
+  width: 100%;
   padding: ${({ theme }) => theme.spacing(2, 4)};
 
   color: ${({ theme }) => theme.palette.grey[700]};
   line-height: ${({ theme }) => theme.typography.pxToRem(16)};
 `;
-export const StyledContentWrapper = styled.div `
-  & > li {
-    padding-left: ${({ theme }) => theme.spacing(7)};
+export const MenuGroupContent = styled.li `
+  width: 100%;
+
+  & ul {
+    padding: 0;
+
+    list-style: none;
   }
 `;

package/esm/ProductSwitcher/ProductSwitcher.js

@@ -14,7 +14,7 @@ import { ConfigContext } from '../ConfigProvider';
 import { IconButton } from '../IconButton';
 import { useMenu } from '../hooks';
 import { ProductSwitcherContent } from './ProductSwitcherContent';
-import { ContentWrapper, WidgetMenu } from './styles';
+import { WidgetMenu } from './styles';
 export const ProductSwitcher = ({ getProducts }) => {
     const [products, setProducts] = useState([]);
     const [isLoading, setIsLoading] = useState(false);
@@ -38,5 +38,5 @@ export const ProductSwitcher = ({ getProducts }) => {
             }
         }
     });
-    return (_jsxs(_Fragment, { children: [_jsx(IconButton, Object.assign({ ref: anchorRef, selected: open, variant: "text", onClick: handleShowProducts }, { children: _jsx(ProductsFillMd, {}) })), _jsx(WidgetMenu, Object.assign({ open: open, anchorEl: anchorRef.current, onClose: handleCloseMenu }, { children: _jsx(ContentWrapper, { children: _jsx(ProductSwitcherContent, { isLoading: isLoading, isError: isError, products: products }) }) }))] }));
+    return (_jsxs(_Fragment, { children: [_jsx(IconButton, Object.assign({ ref: anchorRef, selected: open, variant: "text", onClick: handleShowProducts }, { children: _jsx(ProductsFillMd, {}) })), _jsx(WidgetMenu, Object.assign({ open: open, anchorEl: anchorRef.current, onClose: handleCloseMenu }, { children: _jsx(ProductSwitcherContent, { isLoading: isLoading, isError: isError, products: products }) }))] }));
 };

package/esm/ProductSwitcher/ProductSwitcher.stories.js

@@ -16,42 +16,49 @@ export const handleReject = () => {
 export const handleGetProducts = () => {
     return new Promise((resolve) => setTimeout(() => resolve([
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff53b1',
             url: '',
             name: 'Астрал.Отчет',
             logoUrl: 'https://identity.astral.ru/api/Files/06a5fb56-210c-4f08-bb7b-253a9103560f',
             color: '#2d77ff',
         },
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff532',
             url: '',
             name: 'Астрал.ЭДО',
             logoUrl: 'https://identity.astral.ru/api/Files/b5b06b5a-2d0e-491b-9815-043d82f104aa',
             color: 'rgb(117 90 253)',
         },
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff533',
             url: '',
             name: 'Астрал.КЭДО',
             logoUrl: 'https://identity.astral.ru/api/Files/f0519e97-7a50-4796-a8d2-877cd15c7668',
             color: 'rgb(117 90 253)',
         },
         {
-            url: '',
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff534',
+            url: 'https://ofd.astralnalog.ru/lk',
             name: 'Астрал.ОФД',
             logoUrl: 'https://identity.astral.ru/api/Files/f0519e97-7a50-4796-a8d2-877cd15c7668',
             color: 'rgb(117 90 253)',
         },
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff535',
             url: '',
             name: 'Астрал.ЭТ',
             logoUrl: 'https://identity.astral.ru/api/Files/ac497150-1926-47be-9e5f-42e739e7279c',
             color: 'rgb(55 103 152)',
         },
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff536',
             url: '',
             name: 'Личный кабинет',
             logoUrl: 'https://identity.astral.ru/api/Files/9d214f12-c518-44e2-a711-fa1bf2b89fdd',
             color: 'rgb(10, 124, 255)',
         },
         {
+            id: '49d3ce2a-d57c-4794-b659-f80e31ff537',
             url: '',
             name: 'Кабинет партнера',
             logoUrl: 'https://identity.astral.ru/api/Files/f0519e97-7a50-4796-a8d2-877cd15c7668',

package/esm/ProductSwitcher/ProductSwitcherContent/ProductSwitcherContent.js

@@ -1,13 +1,15 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { ErrorFillSm } from '@astral/icons';
 import { ContentState } from '../../ContentState';
-import { Logo, ProductItem } from './styles';
+import { MenuGroup } from '../../MenuGroup';
+import { Typography } from '../../Typography';
+import { Logo, ProductItem, TitleErrorContainer } from './styles';
 export const ProductSwitcherContent = ({ isLoading, isError, products = [], }) => {
     return (_jsx(ContentState, Object.assign({ isLoading: isLoading, isCustom: isError, customState: {
             imgAlt: 'Что-то пошло не так',
-            title: 'Что-то пошло не так',
+            title: (_jsxs(TitleErrorContainer, Object.assign({ container: true, autoFlow: "column", alignItems: "center", justifyContent: "center", component: "span" }, { children: [_jsx(ErrorFillSm, { color: "inherit" }), _jsx(Typography, Object.assign({ variant: "h6", color: "grey", colorIntensity: 900 }, { children: "\u0427\u0442\u043E-\u0442\u043E \u043F\u043E\u0448\u043B\u043E \u043D\u0435 \u0442\u0430\u043A" }))] }))),
             description: 'Произошла ошибка. Повторите попытку позже.',
-            // TODO: imgSrc обязательный параметр, а в title не засунуть текст с иконкой. Соответствующая доработка в задаче:
-            // https://astraltrack.atlassian.net/jira/software/c/projects/UIKIT/boards/142?modal=detail&selectedIssue=UIKIT-435
-            imgSrc: '',
-        } }, { children: products.map((product) => (_jsxs(ProductItem, Object.assign({}, product, { children: [_jsx(Logo, { src: product.logoUrl, color: product.color }), product.name] }), product.name))) })));
+        } }, { children: _jsx(MenuGroup, Object.assign({ label: "\u041F\u0440\u043E\u0434\u0443\u043A\u0442\u044B \u044D\u043A\u043E\u0441\u0438\u0441\u0442\u0435\u043C\u044B" }, { children: products.map((product) => {
+                return (_jsx("li", { children: _jsxs(ProductItem, Object.assign({ component: "a", href: product.url }, { children: [_jsx(Logo, { src: product.logoUrl, color: product.color }), _jsx(Typography, Object.assign({ variant: "ui", color: "grey", colorIntensity: 900 }, { children: product.name }))] })) }, product.id));
+            }) })) })));
 };

package/esm/ProductSwitcher/ProductSwitcherContent/styles.d.ts

@@ -1,35 +1,11 @@
 /// <reference types="react" />
-export declare const ProductItem: import("@emotion/styled").StyledComponent<{
-    autoFocus?: boolean | undefined;
-    classes?: Partial<import("@mui/material").MenuItemClasses> | undefined;
-    dense?: boolean | undefined;
-    disabled?: boolean | undefined;
-    disableGutters?: boolean | undefined;
-    divider?: boolean | undefined;
-    selected?: boolean | undefined;
-    sx?: import("@mui/system").SxProps<import("@mui/material").Theme> | undefined;
-} & Omit<{
-    action?: import("react").Ref<import("@mui/material").ButtonBaseActions> | undefined;
-    centerRipple?: boolean | undefined;
-    children?: import("react").ReactNode;
-    classes?: Partial<import("@mui/material").ButtonBaseClasses> | undefined;
-    disabled?: boolean | undefined;
-    disableRipple?: boolean | undefined;
-    disableTouchRipple?: boolean | undefined;
-    focusRipple?: boolean | undefined;
-    focusVisibleClassName?: string | undefined;
-    LinkComponent?: import("react").ElementType<any> | undefined;
-    onFocusVisible?: import("react").FocusEventHandler<any> | undefined;
-    sx?: import("@mui/system").SxProps<import("@mui/material").Theme> | undefined;
-    tabIndex?: number | undefined;
-    TouchRippleProps?: Partial<import("@mui/material/ButtonBase/TouchRipple").TouchRippleProps> | undefined;
-    touchRippleRef?: import("react").Ref<import("@mui/material/ButtonBase/TouchRipple").TouchRippleActions> | undefined;
-}, "classes"> & import("@mui/material/OverridableComponent").CommonProps & Omit<Pick<import("react").DetailedHTMLProps<import("react").LiHTMLAttributes<HTMLLIElement>, HTMLLIElement>, "css" | "key" | keyof import("react").LiHTMLAttributes<HTMLLIElement>> & {
-    ref?: ((instance: HTMLLIElement | null) => void) | import("react").RefObject<HTMLLIElement> | null | undefined;
-}, "disabled" | "action" | "divider" | "sx" | "onFocusVisible" | "tabIndex" | "children" | "autoFocus" | "selected" | keyof import("@mui/material/OverridableComponent").CommonProps | "centerRipple" | "disableRipple" | "disableTouchRipple" | "focusRipple" | "focusVisibleClassName" | "LinkComponent" | "TouchRippleProps" | "touchRippleRef" | "dense" | "disableGutters"> & {
-    theme?: import("@emotion/react").Theme | undefined;
-}, {}, {}>;
+export declare const ProductItem: import("@mui/material").ExtendButtonBase<import("@mui/material").MenuItemTypeMap<{}, "li">>;
 export declare const Logo: import("@emotion/styled").StyledComponent<{
     theme?: import("@emotion/react").Theme | undefined;
     as?: import("react").ElementType<any> | undefined;
 }, import("react").DetailedHTMLProps<import("react").ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>, {}>;
+export declare const TitleErrorContainer: import("@emotion/styled").StyledComponent<import("../../Grid").GridContainerProps & import("../../Grid").GridElementsProps & {
+    children?: import("react").ReactNode;
+} & import("react").RefAttributes<HTMLElement> & {
+    theme?: import("@emotion/react").Theme | undefined;
+}, {}, {}>;

package/esm/ProductSwitcher/ProductSwitcherContent/styles.js

@@ -1,15 +1,22 @@
 import { styled } from '../../styles';
 import { MenuItem } from '../../MenuItem';
+import { Grid } from '../../Grid';
+// as typeof MenuItem необходим для возможности прокинуть component
+// https://github.com/mui/material-ui/issues/15695
 export const ProductItem = styled(MenuItem) `
-  width: 100%;
-
-  border-radius: ${({ theme }) => theme.shape.small};
+  padding-left: ${({ theme }) => theme.spacing(6)};
 `;
-export const Logo = styled.img `
+export const Logo = styled('img', {
+    shouldForwardProp: (prop) => prop !== 'color',
+}) `
   width: 40px;
   height: 40px;
-  margin-right: ${({ theme }) => theme.spacing(2)};
+  margin-right: ${({ theme }) => theme.spacing(4)};
 
   background-color: ${({ color }) => color};
   border-radius: ${({ theme }) => theme.shape.small};
 `;
+export const TitleErrorContainer = styled(Grid) `
+  color: ${({ theme }) => theme.palette.error.dark};
+  column-gap: ${({ theme }) => theme.spacing(2)};
+`;

package/esm/ProductSwitcher/styles.d.ts

@@ -1,8 +1,3 @@
-/// <reference types="react" />
-export declare const ContentWrapper: import("@emotion/styled").StyledComponent<{
-    theme?: import("@emotion/react").Theme | undefined;
-    as?: import("react").ElementType<any> | undefined;
-}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;
 export declare const WidgetMenu: import("@emotion/styled").StyledComponent<import("../Menu").MenuProps & {
     theme?: import("@emotion/react").Theme | undefined;
 }, {}, {}>;

package/esm/ProductSwitcher/styles.js

@@ -1,17 +1,13 @@
 import { styled } from '../styles';
 import { Menu } from '../Menu';
-export const ContentWrapper = styled.div `
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  min-width: 240px;
-  max-width: 280px;
-  min-height: 150px;
-  padding: ${({ theme }) => theme.spacing(2)};
-`;
 export const WidgetMenu = styled(Menu) `
-  .MuiList-root {
-    padding: 0;
+  .MuiPaper-root > .MuiList-root {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    width: 285px;
+    min-height: 124px;
+    padding: ${({ theme }) => theme.spacing(3, 0)};
   }
 `;

package/esm/ProductSwitcher/types.d.ts

@@ -1,4 +1,5 @@
 export type WidgetProduct = {
+    id: string;
     url: string;
     name: string;
     logoUrl: string;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@astral/ui",
-  "version": "1.50.0",
+  "version": "1.50.1",
   "browser": "./esm/index.js",
   "main": "./index.js",
   "dependencies": {
-    "@astral/icons": "^1.50.0",
+    "@astral/icons": "^1.50.1",
     "@emotion/cache": "11.7.1",
     "@emotion/react": "11.9.0",
     "@emotion/server": "11.4.0",

package/MenuGroup/styled.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-export declare const StyledLabel: import("@emotion/styled").StyledComponent<Pick<import("react").PropsWithChildren<import("../Typography").TypographyProps>, string | number | symbol> & import("react").RefAttributes<HTMLElement> & {
-    theme?: import("@emotion/react").Theme | undefined;
-}, {}, {}>;
-export declare const StyledContentWrapper: import("@emotion/styled").StyledComponent<{
-    theme?: import("@emotion/react").Theme | undefined;
-    as?: import("react").ElementType<any> | undefined;
-}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;

package/MenuGroup/types.d.ts

@@ -1,8 +0,0 @@
-import { ReactNode } from 'react';
-export type MenuGroupProps = {
-    children: ReactNode;
-    /**
-     * Заголовок группы
-     */
-    label: string;
-};

package/MenuGroup/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/esm/MenuGroup/styled.d.ts

@@ -1,8 +0,0 @@
-/// <reference types="react" />
-export declare const StyledLabel: import("@emotion/styled").StyledComponent<Pick<import("react").PropsWithChildren<import("../Typography").TypographyProps>, string | number | symbol> & import("react").RefAttributes<HTMLElement> & {
-    theme?: import("@emotion/react").Theme | undefined;
-}, {}, {}>;
-export declare const StyledContentWrapper: import("@emotion/styled").StyledComponent<{
-    theme?: import("@emotion/react").Theme | undefined;
-    as?: import("react").ElementType<any> | undefined;
-}, import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {}>;

package/esm/MenuGroup/types.d.ts

@@ -1,8 +0,0 @@
-import { ReactNode } from 'react';
-export type MenuGroupProps = {
-    children: ReactNode;
-    /**
-     * Заголовок группы
-     */
-    label: string;
-};

package/esm/MenuGroup/types.js

@@ -1 +0,0 @@
-export {};