@astral/ui 4.48.0 → 4.48.1

package/components/PageHeader/HeaderContent/HeaderContent.js

@@ -14,5 +14,5 @@ export const HeaderContent = ({ backButton, description, subheader, breadcrumbs,
         }
         return (_jsx(BreadcrumbsWrapper, { children: Array.isArray(breadcrumbs) ? (_jsx(Breadcrumbs, { children: breadcrumbs })) : (breadcrumbs) }));
     };
-    return (_jsxs(_Fragment, { children: [renderBreadcrumbs(), _jsx(DesktopTitleWrapper, { children: _jsx(Title, { backButton: backButton, title: title, isLoading: isLoading, hasDescription: Boolean(description), hasBreadcrumbs: Boolean(breadcrumbs) }) }), _jsx(Description, { description: description, isLoading: isLoading }), actions && (_jsx(PageActions, { className: classNames(pageHeaderClassnames.pageHeaderActions), isLoading: isLoading, size: "medium", withCollapseOnLaptop: Boolean(filters), ...actions })), filters && (_jsx(FormFiltersProvider, { filtersClassName: pageHeaderClassnames.filters, quickFiltersClassName: pageHeaderClassnames.quickFilters, children: filters })), subheader && _jsx(PageSubheader, { children: subheader })] }));
+    return (_jsxs(_Fragment, { children: [renderBreadcrumbs(), _jsx(DesktopTitleWrapper, { children: _jsx(Title, { backButton: backButton, title: title, isLoading: isLoading, hasDescription: Boolean(description), hasBreadcrumbs: Boolean(breadcrumbs) }) }), _jsx(Description, { description: description, isLoading: isLoading }), actions && (_jsx(PageActions, { className: classNames(pageHeaderClassnames.pageHeaderActions), isLoading: isLoading, size: "medium", withCollapseOnLaptop: Boolean(filters), ...actions })), filters && (_jsx(FormFiltersProvider, { filtersClassName: pageHeaderClassnames.filters, quickFiltersClassName: pageHeaderClassnames.quickFilters, children: filters })), subheader && (_jsx(PageSubheader, { className: pageHeaderClassnames.subheader, children: subheader }))] }));
 };

package/components/PageHeader/HeaderContent/styles.js

@@ -17,6 +17,8 @@ export const PageSubheader = styled.div `
 
   ${({ theme }) => theme.breakpoints.down('sm')} {
     padding: ${({ theme }) => theme.spacing(0, 4, 4, 4)};
+
+    border-bottom: 1px solid ${({ theme }) => theme.palette.grey[300]};
   }
 `;
 export const DesktopTitleWrapper = styled.div `

package/components/PageHeader/PageHeader.js

@@ -1,13 +1,27 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { classNames } from '../utils/classNames';
+import { cva } from '../utils/cva';
 import { pageHeaderClassnames } from './constants';
 import { HeaderContent } from './HeaderContent';
 import { MobilePageActions } from './MobilePageActions';
 import { MobileTitleWrapper, Wrapper } from './styles';
 import { Title } from './Title';
 import { useLogic } from './useLogic';
+const mobilePageHeader = cva(pageHeaderClassnames.pageHeaderMobileTitle, {
+    variants: {
+        hasTitle: {
+            true: pageHeaderClassnames.hasTitle,
+        },
+        hasBackButton: {
+            true: pageHeaderClassnames.hasBackButton,
+        },
+    },
+});
 export const PageHeader = (props) => {
     const { title, description, subheader, breadcrumbs, actions, backButton, className, filters, } = props;
-    const { isLoading, mobileTitleActions, isShowMobileActions, mobileClassnames, } = useLogic(props);
-    return (_jsxs(_Fragment, { children: [_jsxs(MobileTitleWrapper, { className: mobileClassnames, children: [_jsx(Title, { backButton: backButton, title: title, isLoading: isLoading }), mobileTitleActions && mobileTitleActions] }), _jsx(Wrapper, { className: className, children: _jsx(HeaderContent, { breadcrumbs: breadcrumbs, backButton: backButton, title: title, description: description, actions: actions, subheader: subheader, filters: filters, isLoading: isLoading }) }), isShowMobileActions && (_jsx(MobilePageActions, { className: classNames(pageHeaderClassnames.pageHeaderActions), isLoading: isLoading, ...actions }))] }));
+    const { isLoading, mobileTitleActions, isShowMobileActions } = useLogic(props);
+    return (_jsxs(_Fragment, { children: [_jsxs(MobileTitleWrapper, { className: mobilePageHeader({
+                    hasTitle: Boolean(title) || isLoading,
+                    hasBackButton: Boolean(backButton),
+                }), children: [_jsx(Title, { backButton: backButton, title: title, isLoading: isLoading }), mobileTitleActions && mobileTitleActions] }), _jsx(Wrapper, { className: classNames(pageHeaderClassnames.root, className), children: _jsx(HeaderContent, { breadcrumbs: breadcrumbs, backButton: backButton, title: title, description: description, actions: actions, subheader: subheader, filters: filters, isLoading: isLoading }) }), isShowMobileActions && (_jsx(MobilePageActions, { className: classNames(pageHeaderClassnames.pageHeaderActions), isLoading: isLoading, ...actions }))] }));
 };

package/components/PageHeader/constants.d.ts

@@ -1,10 +1,13 @@
 export declare const pageHeaderClassnames: {
+    root: string;
     pageHeaderMobileTitle: string;
     pageHeaderActions: string;
     hasBackButton: string;
     hasTitle: string;
     filters: string;
+    subheader: string;
     quickFilters: string;
     hasFilters: string;
+    hasSubheader: string;
 };
 export declare const PAGE_HEADER_HEIGHT_MOBILE = "48px";

package/components/PageHeader/constants.js

@@ -1,11 +1,14 @@
 import { createUIKitClassname } from '../utils/createUIKitClassname';
 export const pageHeaderClassnames = {
+    root: createUIKitClassname('page-header'),
     pageHeaderMobileTitle: createUIKitClassname('page-header__mobile-title'),
     pageHeaderActions: createUIKitClassname('page-header__actions'),
     hasBackButton: createUIKitClassname('page-header_has-back-button'),
     hasTitle: createUIKitClassname('page-header_has-title'),
     filters: createUIKitClassname('page-header__filters'),
+    subheader: createUIKitClassname('page-header__subheader'),
     quickFilters: createUIKitClassname('page-header__quick-filters'),
     hasFilters: createUIKitClassname('page-header_has-filters'),
+    hasSubheader: createUIKitClassname('page-header_has-subheader'),
 };
 export const PAGE_HEADER_HEIGHT_MOBILE = '48px';

package/components/PageHeader/styles.js

@@ -69,10 +69,16 @@ export const MobileTitleWrapper = styled.div `
     
     background-color: ${({ theme }) => theme.palette.background.default};
 
-     &:not(.${pageHeaderClassnames.hasFilters}) {
+    /* Причина игнора: прогрессивное улучшение */
+    /* stylelint-disable plugin/no-unsupported-browser-features */
+    &:not(:has(+ .${pageHeaderClassnames.root} :is(
+      .${pageHeaderClassnames.filters},
+      .${pageHeaderClassnames.subheader}
+    ))) {
       border-bottom: 1px solid ${({ theme }) => theme.palette.grey[300]};
     }
-    
+    /* stylelint-enable plugin/no-unsupported-browser-features */
+
     &.${pageHeaderClassnames.hasTitle} {
       display: flex;
 

package/components/PageHeader/useLogic/useLogic.d.ts

@@ -1,10 +1,9 @@
 import { type ElementType } from 'react';
 import type { PageHeaderProps } from '../types';
 type UseLogicParams<TMainActionComponent extends ElementType = ElementType, TSecondaryActionComponent extends ElementType = ElementType, TBackButtonComponent extends ElementType = ElementType> = PageHeaderProps<TMainActionComponent, TSecondaryActionComponent, TBackButtonComponent>;
-export declare const useLogic: <TMainActionComponent extends ElementType = ElementType, TSecondaryActionComponent extends ElementType = ElementType, TBackButtonComponent extends ElementType = ElementType>({ shouldUpdateDocumentTitle, title, actions, htmlTitle, backButton, filters, }: UseLogicParams<TMainActionComponent, TSecondaryActionComponent, TBackButtonComponent>) => {
+export declare const useLogic: <TMainActionComponent extends ElementType = ElementType, TSecondaryActionComponent extends ElementType = ElementType, TBackButtonComponent extends ElementType = ElementType>({ shouldUpdateDocumentTitle, title, actions, htmlTitle, }: UseLogicParams<TMainActionComponent, TSecondaryActionComponent, TBackButtonComponent>) => {
     isShowMobileActions: boolean | undefined;
     isLoading: boolean | undefined;
     mobileTitleActions: import("react").ReactNode;
-    mobileClassnames: string;
 };
 export {};

package/components/PageHeader/useLogic/useLogic.js

@@ -1,22 +1,14 @@
-import { useContext, useMemo } from 'react';
+import { useContext } from 'react';
 import { PageContext } from '../../PageContext';
-import { classNames } from '../../utils/classNames';
-import { pageHeaderClassnames } from '../constants';
 import { usePageTitle } from '../hooks/usePageTitle';
-export const useLogic = ({ shouldUpdateDocumentTitle, title, actions, htmlTitle, backButton, filters, }) => {
+export const useLogic = ({ shouldUpdateDocumentTitle, title, actions, htmlTitle, }) => {
     //Переопределение Html title на title из параметров
     usePageTitle({ shouldUpdateDocumentTitle, htmlTitle, title });
     const { mobileTitleActions, isLoading } = useContext(PageContext);
     const isShowMobileActions = actions && !mobileTitleActions;
-    const mobileClassnames = useMemo(() => classNames(pageHeaderClassnames.pageHeaderMobileTitle, {
-        [pageHeaderClassnames.hasTitle]: Boolean(title) || isLoading,
-        [pageHeaderClassnames.hasBackButton]: Boolean(backButton),
-        [pageHeaderClassnames.hasFilters]: Boolean(filters),
-    }), [title, backButton, isLoading]);
     return {
         isShowMobileActions,
         isLoading,
         mobileTitleActions,
-        mobileClassnames,
     };
 };

package/node/components/PageHeader/HeaderContent/HeaderContent.js

@@ -17,6 +17,6 @@ const HeaderContent = ({ backButton, description, subheader, breadcrumbs, action
         }
         return ((0, jsx_runtime_1.jsx)(styles_1.BreadcrumbsWrapper, { children: Array.isArray(breadcrumbs) ? ((0, jsx_runtime_1.jsx)(Breadcrumbs_1.Breadcrumbs, { children: breadcrumbs })) : (breadcrumbs) }));
     };
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [renderBreadcrumbs(), (0, jsx_runtime_1.jsx)(styles_1.DesktopTitleWrapper, { children: (0, jsx_runtime_1.jsx)(Title_1.Title, { backButton: backButton, title: title, isLoading: isLoading, hasDescription: Boolean(description), hasBreadcrumbs: Boolean(breadcrumbs) }) }), (0, jsx_runtime_1.jsx)(Description_1.Description, { description: description, isLoading: isLoading }), actions && ((0, jsx_runtime_1.jsx)(PageActions_1.PageActions, { className: (0, classNames_1.classNames)(constants_1.pageHeaderClassnames.pageHeaderActions), isLoading: isLoading, size: "medium", withCollapseOnLaptop: Boolean(filters), ...actions })), filters && ((0, jsx_runtime_1.jsx)(FormFiltersProvider_1.FormFiltersProvider, { filtersClassName: constants_1.pageHeaderClassnames.filters, quickFiltersClassName: constants_1.pageHeaderClassnames.quickFilters, children: filters })), subheader && (0, jsx_runtime_1.jsx)(styles_1.PageSubheader, { children: subheader })] }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [renderBreadcrumbs(), (0, jsx_runtime_1.jsx)(styles_1.DesktopTitleWrapper, { children: (0, jsx_runtime_1.jsx)(Title_1.Title, { backButton: backButton, title: title, isLoading: isLoading, hasDescription: Boolean(description), hasBreadcrumbs: Boolean(breadcrumbs) }) }), (0, jsx_runtime_1.jsx)(Description_1.Description, { description: description, isLoading: isLoading }), actions && ((0, jsx_runtime_1.jsx)(PageActions_1.PageActions, { className: (0, classNames_1.classNames)(constants_1.pageHeaderClassnames.pageHeaderActions), isLoading: isLoading, size: "medium", withCollapseOnLaptop: Boolean(filters), ...actions })), filters && ((0, jsx_runtime_1.jsx)(FormFiltersProvider_1.FormFiltersProvider, { filtersClassName: constants_1.pageHeaderClassnames.filters, quickFiltersClassName: constants_1.pageHeaderClassnames.quickFilters, children: filters })), subheader && ((0, jsx_runtime_1.jsx)(styles_1.PageSubheader, { className: constants_1.pageHeaderClassnames.subheader, children: subheader }))] }));
 };
 exports.HeaderContent = HeaderContent;

package/node/components/PageHeader/HeaderContent/styles.js

@@ -20,6 +20,8 @@ exports.PageSubheader = styled_1.styled.div `
 
   ${({ theme }) => theme.breakpoints.down('sm')} {
     padding: ${({ theme }) => theme.spacing(0, 4, 4, 4)};
+
+    border-bottom: 1px solid ${({ theme }) => theme.palette.grey[300]};
   }
 `;
 exports.DesktopTitleWrapper = styled_1.styled.div `

package/node/components/PageHeader/PageHeader.js

@@ -3,15 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PageHeader = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const classNames_1 = require("../utils/classNames");
+const cva_1 = require("../utils/cva");
 const constants_1 = require("./constants");
 const HeaderContent_1 = require("./HeaderContent");
 const MobilePageActions_1 = require("./MobilePageActions");
 const styles_1 = require("./styles");
 const Title_1 = require("./Title");
 const useLogic_1 = require("./useLogic");
+const mobilePageHeader = (0, cva_1.cva)(constants_1.pageHeaderClassnames.pageHeaderMobileTitle, {
+    variants: {
+        hasTitle: {
+            true: constants_1.pageHeaderClassnames.hasTitle,
+        },
+        hasBackButton: {
+            true: constants_1.pageHeaderClassnames.hasBackButton,
+        },
+    },
+});
 const PageHeader = (props) => {
     const { title, description, subheader, breadcrumbs, actions, backButton, className, filters, } = props;
-    const { isLoading, mobileTitleActions, isShowMobileActions, mobileClassnames, } = (0, useLogic_1.useLogic)(props);
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(styles_1.MobileTitleWrapper, { className: mobileClassnames, children: [(0, jsx_runtime_1.jsx)(Title_1.Title, { backButton: backButton, title: title, isLoading: isLoading }), mobileTitleActions && mobileTitleActions] }), (0, jsx_runtime_1.jsx)(styles_1.Wrapper, { className: className, children: (0, jsx_runtime_1.jsx)(HeaderContent_1.HeaderContent, { breadcrumbs: breadcrumbs, backButton: backButton, title: title, description: description, actions: actions, subheader: subheader, filters: filters, isLoading: isLoading }) }), isShowMobileActions && ((0, jsx_runtime_1.jsx)(MobilePageActions_1.MobilePageActions, { className: (0, classNames_1.classNames)(constants_1.pageHeaderClassnames.pageHeaderActions), isLoading: isLoading, ...actions }))] }));
+    const { isLoading, mobileTitleActions, isShowMobileActions } = (0, useLogic_1.useLogic)(props);
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(styles_1.MobileTitleWrapper, { className: mobilePageHeader({
+                    hasTitle: Boolean(title) || isLoading,
+                    hasBackButton: Boolean(backButton),
+                }), children: [(0, jsx_runtime_1.jsx)(Title_1.Title, { backButton: backButton, title: title, isLoading: isLoading }), mobileTitleActions && mobileTitleActions] }), (0, jsx_runtime_1.jsx)(styles_1.Wrapper, { className: (0, classNames_1.classNames)(constants_1.pageHeaderClassnames.root, className), children: (0, jsx_runtime_1.jsx)(HeaderContent_1.HeaderContent, { breadcrumbs: breadcrumbs, backButton: backButton, title: title, description: description, actions: actions, subheader: subheader, filters: filters, isLoading: isLoading }) }), isShowMobileActions && ((0, jsx_runtime_1.jsx)(MobilePageActions_1.MobilePageActions, { className: (0, classNames_1.classNames)(constants_1.pageHeaderClassnames.pageHeaderActions), isLoading: isLoading, ...actions }))] }));
 };
 exports.PageHeader = PageHeader;

package/node/components/PageHeader/constants.d.ts

@@ -1,10 +1,13 @@
 export declare const pageHeaderClassnames: {
+    root: string;
     pageHeaderMobileTitle: string;
     pageHeaderActions: string;
     hasBackButton: string;
     hasTitle: string;
     filters: string;
+    subheader: string;
     quickFilters: string;
     hasFilters: string;
+    hasSubheader: string;
 };
 export declare const PAGE_HEADER_HEIGHT_MOBILE = "48px";

package/node/components/PageHeader/constants.js

@@ -3,12 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PAGE_HEADER_HEIGHT_MOBILE = exports.pageHeaderClassnames = void 0;
 const createUIKitClassname_1 = require("../utils/createUIKitClassname");
 exports.pageHeaderClassnames = {
+    root: (0, createUIKitClassname_1.createUIKitClassname)('page-header'),
     pageHeaderMobileTitle: (0, createUIKitClassname_1.createUIKitClassname)('page-header__mobile-title'),
     pageHeaderActions: (0, createUIKitClassname_1.createUIKitClassname)('page-header__actions'),
     hasBackButton: (0, createUIKitClassname_1.createUIKitClassname)('page-header_has-back-button'),
     hasTitle: (0, createUIKitClassname_1.createUIKitClassname)('page-header_has-title'),
     filters: (0, createUIKitClassname_1.createUIKitClassname)('page-header__filters'),
+    subheader: (0, createUIKitClassname_1.createUIKitClassname)('page-header__subheader'),
     quickFilters: (0, createUIKitClassname_1.createUIKitClassname)('page-header__quick-filters'),
     hasFilters: (0, createUIKitClassname_1.createUIKitClassname)('page-header_has-filters'),
+    hasSubheader: (0, createUIKitClassname_1.createUIKitClassname)('page-header_has-subheader'),
 };
 exports.PAGE_HEADER_HEIGHT_MOBILE = '48px';

package/node/components/PageHeader/styles.js

@@ -72,10 +72,16 @@ exports.MobileTitleWrapper = styled_1.styled.div `
     
     background-color: ${({ theme }) => theme.palette.background.default};
 
-     &:not(.${constants_1.pageHeaderClassnames.hasFilters}) {
+    /* Причина игнора: прогрессивное улучшение */
+    /* stylelint-disable plugin/no-unsupported-browser-features */
+    &:not(:has(+ .${constants_1.pageHeaderClassnames.root} :is(
+      .${constants_1.pageHeaderClassnames.filters},
+      .${constants_1.pageHeaderClassnames.subheader}
+    ))) {
       border-bottom: 1px solid ${({ theme }) => theme.palette.grey[300]};
     }
-    
+    /* stylelint-enable plugin/no-unsupported-browser-features */
+
     &.${constants_1.pageHeaderClassnames.hasTitle} {
       display: flex;
 

package/node/components/PageHeader/useLogic/useLogic.d.ts

@@ -1,10 +1,9 @@
 import { type ElementType } from 'react';
 import type { PageHeaderProps } from '../types';
 type UseLogicParams<TMainActionComponent extends ElementType = ElementType, TSecondaryActionComponent extends ElementType = ElementType, TBackButtonComponent extends ElementType = ElementType> = PageHeaderProps<TMainActionComponent, TSecondaryActionComponent, TBackButtonComponent>;
-export declare const useLogic: <TMainActionComponent extends ElementType = ElementType, TSecondaryActionComponent extends ElementType = ElementType, TBackButtonComponent extends ElementType = ElementType>({ shouldUpdateDocumentTitle, title, actions, htmlTitle, backButton, filters, }: UseLogicParams<TMainActionComponent, TSecondaryActionComponent, TBackButtonComponent>) => {
+export declare const useLogic: <TMainActionComponent extends ElementType = ElementType, TSecondaryActionComponent extends ElementType = ElementType, TBackButtonComponent extends ElementType = ElementType>({ shouldUpdateDocumentTitle, title, actions, htmlTitle, }: UseLogicParams<TMainActionComponent, TSecondaryActionComponent, TBackButtonComponent>) => {
     isShowMobileActions: boolean | undefined;
     isLoading: boolean | undefined;
     mobileTitleActions: import("react").ReactNode;
-    mobileClassnames: string;
 };
 export {};

package/node/components/PageHeader/useLogic/useLogic.js

@@ -3,24 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useLogic = void 0;
 const react_1 = require("react");
 const PageContext_1 = require("../../PageContext");
-const classNames_1 = require("../../utils/classNames");
-const constants_1 = require("../constants");
 const usePageTitle_1 = require("../hooks/usePageTitle");
-const useLogic = ({ shouldUpdateDocumentTitle, title, actions, htmlTitle, backButton, filters, }) => {
+const useLogic = ({ shouldUpdateDocumentTitle, title, actions, htmlTitle, }) => {
     //Переопределение Html title на title из параметров
     (0, usePageTitle_1.usePageTitle)({ shouldUpdateDocumentTitle, htmlTitle, title });
     const { mobileTitleActions, isLoading } = (0, react_1.useContext)(PageContext_1.PageContext);
     const isShowMobileActions = actions && !mobileTitleActions;
-    const mobileClassnames = (0, react_1.useMemo)(() => (0, classNames_1.classNames)(constants_1.pageHeaderClassnames.pageHeaderMobileTitle, {
-        [constants_1.pageHeaderClassnames.hasTitle]: Boolean(title) || isLoading,
-        [constants_1.pageHeaderClassnames.hasBackButton]: Boolean(backButton),
-        [constants_1.pageHeaderClassnames.hasFilters]: Boolean(filters),
-    }), [title, backButton, isLoading]);
     return {
         isShowMobileActions,
         isLoading,
         mobileTitleActions,
-        mobileClassnames,
     };
 };
 exports.useLogic = useLogic;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astral/ui",
-  "version": "4.48.0",
+  "version": "4.48.1",
   "browser": "./index.js",
   "main": "./node/index.js",
   "dependencies": {