@cloud-ru/ds-uikit-product-header 1.2.2 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloud-ru/ds-uikit-product-header",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Продуктовая шапка консоли — HeaderLayout, MainMenu, UserMenu, Logo, PathBreadcrumbs и PlatformLogo.",
   "repository": {
     "type": "git",
@@ -48,28 +48,28 @@
     "@cloud-ru/ds-accordion": "^1.0.6",
     "@cloud-ru/ds-adaptive": "^1.0.1",
     "@cloud-ru/ds-avatar": "^1.0.2",
-    "@cloud-ru/ds-button": "^1.0.2",
     "@cloud-ru/ds-breadcrumbs": "^1.0.13",
     "@cloud-ru/ds-divider": "^1.0.1",
-    "@cloud-ru/ds-icons": "^1.1.0",
+    "@cloud-ru/ds-drag-and-drop": "^1.1.1",
+    "@cloud-ru/ds-button": "^1.0.2",
     "@cloud-ru/ds-drawer": "^1.1.1",
     "@cloud-ru/ds-info-block": "^1.0.1",
-    "@cloud-ru/ds-drag-and-drop": "^1.1.1",
     "@cloud-ru/ds-list": "^2.1.2",
+    "@cloud-ru/ds-icons": "^1.1.0",
+    "@cloud-ru/ds-locale": "^1.0.0",
     "@cloud-ru/ds-modal": "^1.1.1",
     "@cloud-ru/ds-portal-context": "^1.0.1",
-    "@cloud-ru/ds-locale": "^1.0.0",
-    "@cloud-ru/ds-search": "^1.0.6",
     "@cloud-ru/ds-promo-tag": "^1.0.1",
+    "@cloud-ru/ds-scroll": "^1.0.2",
     "@cloud-ru/ds-segment-control": "^1.0.4",
-    "@cloud-ru/ds-skeleton": "^1.0.1",
     "@cloud-ru/ds-theme": "^1.1.0",
-    "@cloud-ru/ds-scroll": "^1.0.2",
+    "@cloud-ru/ds-search": "^1.0.6",
+    "@cloud-ru/ds-typography": "^1.0.0",
+    "@cloud-ru/ds-skeleton": "^1.0.1",
     "@cloud-ru/ds-tooltip": "^1.0.4",
-    "@cloud-ru/ds-uikit-product-card-predefined": "^3.0.4",
     "@cloud-ru/ds-uikit-product-switch-row": "^1.0.5",
+    "@cloud-ru/ds-uikit-product-card-predefined": "^3.0.4",
     "@cloud-ru/ds-uikit-product-title-clickable": "^1.0.7",
-    "@cloud-ru/ds-typography": "^1.0.0",
     "@cloud-ru/ds-utils": "^1.1.0"
   },
   "publishConfig": {

package/src/components/MainMenu/helperComponents/Content/Content.tsx

@@ -225,7 +225,7 @@ export function Content({
       return (
         <SortableContext items={visibleGroups.map(({ id }) => id)} strategy={verticalListSortingStrategy}>
           <Accordion selectionMode='multiple' expanded={expandedIds} onExpandedChange={onExpandedChange}>
-            {visibleGroups.map(({ id, label, icon, items, favoritesEnabled = true, blockColor, highlight }) => (
+            {visibleGroups.map(({ id, label, icon, items, favoritesEnabled, blockColor, highlight }) => (
               <SortableGroup
                 key={id}
                 id={id}
@@ -237,7 +237,8 @@ export function Content({
                 showDescription={showDescription}
                 isMobile={isMobile}
                 enableServiceDrag={enableServiceDrag}
-                favorite={favoritesEnabled ? favorite : undefined}
+                favorite={favorite}
+                groupFavoritesEnabled={favoritesEnabled}
                 onServiceClick={handleLinkClick}
                 highlight={highlight}
               />

package/src/components/MainMenu/helperComponents/Content/helperComponents/SortableGroup/SortableGroup.tsx

@@ -20,6 +20,8 @@ export type SortableGroupProps = Omit<SortableGroupCardsProps, 'groupId'> &
     blockColor?: LinksGroupBlockColor;
 
     highlight?: boolean;
+
+    groupFavoritesEnabled?: boolean;
   };
 
 export function SortableGroup({
@@ -32,6 +34,7 @@ export function SortableGroup({
   isMobile,
   enableServiceDrag,
   favorite,
+  groupFavoritesEnabled = true,
   onServiceClick,
   blockColor,
   highlight,
@@ -89,6 +92,7 @@ export function SortableGroup({
           isMobile={isMobile}
           enableServiceDrag={enableServiceDrag}
           favorite={favorite}
+          groupFavoritesEnabled={groupFavoritesEnabled}
           onServiceClick={onServiceClick}
         />
       </Accordion.CollapseBlockTertiary>
@@ -104,6 +108,7 @@ export function SortableGroupDragPreview({
   showDescription,
   isMobile,
   favorite,
+  groupFavoritesEnabled,
   blockColor,
   highlight,
 }: Omit<SortableGroupProps, 'enableServiceDrag'>) {
@@ -128,6 +133,7 @@ export function SortableGroupDragPreview({
             showDescription={showDescription}
             isMobile={isMobile}
             favorite={favorite}
+            groupFavoritesEnabled={groupFavoritesEnabled}
           />
         )}
       </div>

package/src/components/MainMenu/helperComponents/Content/helperComponents/SortableGroup/components/SortableGroupCards.tsx

@@ -11,6 +11,7 @@ export type SortableGroupCardsProps = Pick<
   groupId: string;
   items: InnerLink[];
   enableServiceDrag?: boolean;
+  groupFavoritesEnabled?: boolean;
 };
 
 export function SortableGroupCards({
@@ -20,6 +21,7 @@ export function SortableGroupCards({
   isMobile,
   enableServiceDrag,
   favorite,
+  groupFavoritesEnabled,
   onServiceClick,
 }: SortableGroupCardsProps) {
   return (
@@ -41,6 +43,7 @@ export function SortableGroupCards({
               isMobile={isMobile}
               dragDisabled={!enableServiceDrag}
               favorite={favorite}
+              groupFavoritesEnabled={groupFavoritesEnabled}
               onServiceClick={onServiceClick}
             />
           );

package/src/components/MainMenu/helperComponents/Content/helperComponents/SortableGroup/components/SubCategory/SubCategory.tsx

@@ -14,6 +14,7 @@ export type SubCategoryProps = Pick<
 > & {
   groupId: string;
   dragDisabled?: boolean;
+  groupFavoritesEnabled?: boolean;
 };
 
 export function SubCategory({
@@ -24,6 +25,7 @@ export function SubCategory({
   dragDisabled,
   favorite,
   onServiceClick,
+  groupFavoritesEnabled,
 }: SubCategoryProps) {
   const subcategoryId = getSubCategoryId(groupId, service.id);
   const nestedGroupId = getNestedServiceGroupId(groupId, service.id);
@@ -54,7 +56,7 @@ export function SubCategory({
               showDescription={showDescription}
               isMobile={isMobile}
               dragDisabled={dragDisabled}
-              favorite={favorite}
+              favorite={groupFavoritesEnabled ? favorite : undefined}
               onServiceClick={onServiceClick}
             />
           }

package/src/components/MainMenu/helperComponents/ServiceCard/ServiceCard.tsx

@@ -31,13 +31,14 @@ export function ServiceCard({
   expandable,
 }: ServiceCardProps) {
   const isInFavorites = favorite?.value.includes(service.id) ?? false;
+  const isFavoriteEnabled = service.favoritesEnabled ?? true;
 
   const favoriteProps: CardServiceLightProps['favorite'] =
     !dragPreview && favorite
       ? {
           checked: isInFavorites,
           onChange: favorite.onChange(service.id),
-          enabled: !service.disabled,
+          enabled: !service.disabled && isFavoriteEnabled,
         }
       : undefined;
 
@@ -83,7 +84,8 @@ export function DraggableServiceCard({
   dragDisabled,
   ...props
 }: DraggableServiceCardProps) {
-  const disabled = dragDisabled || service.disabled || favorite?.value.includes(service.id);
+  const isFavoriteEnabled = service.favoritesEnabled ?? true;
+  const disabled = dragDisabled || service.disabled || favorite?.value.includes(service.id) || !isFavoriteEnabled;
 
   const { attributes, listeners, setNodeRef, isDragging } = useDraggable({
     id: getServiceSourceDragId(groupId, service.id),

package/src/components/MainMenu/index.ts

@@ -1,4 +1,5 @@
 export * from './MainMenu';
+export { MenuMobile } from './helperComponents/MenuMobile';
 export * from './helperComponents/Banners';
 export * from './helperComponents/Favorites';
 export * from './types';

package/src/components/MainMenu/types.ts

@@ -36,6 +36,8 @@ export type InnerLink = {
   disabled?: boolean;
   hidden?: boolean;
   badge?: CardServiceLightProps['promoTag'];
+  /** Разрешено ли добавление карточки в избранное. default=true - разрешено */
+  favoritesEnabled?: boolean;
   /**
    * Вложенные сервисы подкатегории.
    *