Skip to content

Commit

Permalink
feat(Stories)!: remove deprecated StoriesItem.description, use Storie…
Browse files Browse the repository at this point in the history
…sItem.content instead
  • Loading branch information
DarkGenius committed Jan 14, 2025
1 parent a8676eb commit a00fd13
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/components/Stories/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Component for displaying stories. It looks like a carousel in a modal with given
| Field | Type | Required | Default | Description |
| --------------- | ------------------------ | -------- | ------- | ---------------------------------------- |
| title | `String` | | | Title |
| description | `String` | | | Main text |
| content | `React.ReactNode` | | | Main content |
| url | `String` | | | Link to display more information |
| media | `StoriesItemMedia` | | | Media content |
| firstAction | `ButtonProps` | | | Custom action button props |
Expand Down
30 changes: 15 additions & 15 deletions src/components/Stories/__stories__/Stories.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const items: StoriesItem[] = [
children: 'Second button',
view: 'normal',
},
description:
content:
'At the top of the panel is the service navigation for each service. ' +
'Below are common navigation elements: a component for switching between accounts ' +
'and organizations, settings, help center, search, notifications, favorites.' +
Expand All @@ -50,7 +50,7 @@ const items: StoriesItem[] = [
},
{
title: 'New navigation (2)',
description: 'A little more about the new navigation',
content: 'A little more about the new navigation',
textBlockStyle: StoriesTextBlockStyle.Transparent,
mediaBlockStyle: StoriesMediaBlockStyle.FullSize,
firstAction: {
Expand All @@ -68,7 +68,7 @@ const items: StoriesItem[] = [
},
{
title: 'New navigation (2)',
description: 'A little more about the new navigation',
content: 'A little more about the new navigation',
textBlockStyle: StoriesTextBlockStyle.Transparent,
mediaBlockStyle: StoriesMediaBlockStyle.HalfSize,
media: {
Expand All @@ -78,7 +78,7 @@ const items: StoriesItem[] = [
},
{
title: 'New navigation (2)',
description: 'A little more about the new navigation',
content: 'A little more about the new navigation',
textBlockStyle: StoriesTextBlockStyle.Card,
mediaBlockStyle: StoriesMediaBlockStyle.FullSize,
media: {
Expand All @@ -88,7 +88,7 @@ const items: StoriesItem[] = [
},
{
title: 'New navigation (3)',
description: 'Switch to the new navigation right now',
content: 'Switch to the new navigation right now',
textBlockStyle: StoriesTextBlockStyle.Transparent,
mediaBlockStyle: StoriesMediaBlockStyle.HalfSizeWithMargins,
media: {
Expand Down Expand Up @@ -130,7 +130,7 @@ const DefaultTemplate: StoryFn<StoriesProps> = () => {
title: 'Default story with simple text',
textBlockStyle: StoriesTextBlockStyle.Card,
mediaBlockStyle: StoriesMediaBlockStyle.HalfSizeWithMargins,
description:
content:
'This story has default value for props textBlockStyle = "card" and mediaBlockStyle = "half-size-with-margins" ',
media: {
type: 'image',
Expand All @@ -141,7 +141,7 @@ const DefaultTemplate: StoryFn<StoriesProps> = () => {
title: 'Story without margins in media block',
textBlockStyle: StoriesTextBlockStyle.Card,
mediaBlockStyle: StoriesMediaBlockStyle.HalfSize,
description:
content:
'Props value: textBlockStyle = "card", mediaBlockStyle = "half-size-with-margins" and media type = "image"',
media: {
type: 'image',
Expand All @@ -152,7 +152,7 @@ const DefaultTemplate: StoryFn<StoriesProps> = () => {
title: 'Story with full-size media block',
textBlockStyle: StoriesTextBlockStyle.Card,
mediaBlockStyle: StoriesMediaBlockStyle.FullSize,
description:
content:
'Props value: textBlockStyle = "card", mediaBlockStyle = "full-size" and media type = "image"',
media: {
type: 'image',
Expand All @@ -163,7 +163,7 @@ const DefaultTemplate: StoryFn<StoriesProps> = () => {
title: 'Story with full-size media block and transparent text-block',
textBlockStyle: StoriesTextBlockStyle.Transparent,
mediaBlockStyle: StoriesMediaBlockStyle.FullSize,
description:
content:
'Props value: textBlockStyle = "transparent", mediaBlockStyle = "full-size" and media type = "image"',
media: {
type: 'image',
Expand All @@ -177,7 +177,7 @@ const DefaultTemplate: StoryFn<StoriesProps> = () => {
title: 'Story with video half-size',
textBlockStyle: StoriesTextBlockStyle.Transparent,
mediaBlockStyle: StoriesMediaBlockStyle.HalfSize,
description:
content:
'Props value: textBlockStyle = "transparent", mediaBlockStyle = "half-size" and media type = "video"',
media: {
type: 'video',
Expand All @@ -196,7 +196,7 @@ const DefaultTemplate: StoryFn<StoriesProps> = () => {
children: 'Second button',
view: 'normal',
},
description:
content:
'Props value: textBlockStyle = "card", mediaBlockStyle = "half-size-with-margins" and media type = "video"',
media: {
type: 'video',
Expand All @@ -207,7 +207,7 @@ const DefaultTemplate: StoryFn<StoriesProps> = () => {
title: 'Story with video full-size',
textBlockStyle: StoriesTextBlockStyle.Card,
mediaBlockStyle: StoriesMediaBlockStyle.FullSize,
description:
content:
'Props value: textBlockStyle = "card", mediaBlockStyle = "full-size" and media type = "video"',
media: {
type: 'video',
Expand All @@ -229,7 +229,7 @@ const DefaultTemplate: StoryFn<StoriesProps> = () => {
children: 'Second button',
view: 'normal',
},
description:
content:
'Lorem ipsum odor amet, consectetuer adipiscing elit. Nunc at parturient tristique senectus class duis eget per taciti. Eu rutrum est euismod risus aliquet in. Vehicula habitant nostra enim quis blandit consequat. Blandit ex ut purus; vestibulum accumsan duis? Porttitor accumsan at molestie integer nulla habitant? Egestas urna suscipit eleifend tortor mauris montes vulputate primis?Tempor viverra vitae tempus consectetur egestas? Quam dolor dictumst pellentesque porta; pulvinar conubia placerat risus. Leo at elementum vivamus fermentum erat taciti. Turpis ipsum faucibus primis purus, montes curae eu vel. Lacus metus sagittis dictumst diam libero imperdiet rhoncus neque. Natoque nullam inceptos porttitor integer porttitor nascetur a interdum. Imperdiet scelerisque rutrum congue massa eleifend torquent nisi. Sociosqu libero volutpat nisl orci viverra. Tristique egestas auctor conubia; etiam lectus scelerisque ligula. Magnis ultrices venenatis vivamus hac taciti inceptos leo. Interdum magnis sollicitudin elementum placerat montes. Lacinia platea netus nascetur ornare sociosqu. Inceptos taciti iaculis interdum nisl sodales in eros fermentum. Justo maecenas elementum condimentum feugiat consectetur semper sollicitudin. Primis sodales posuere facilisis donec ipsum efficitur. Faucibus accumsan lectus bibendum rhoncus maecenas, eget aliquam netus. Lectus torquent ut sodales fringilla natoque.',
media: {
type: 'image',
Expand All @@ -253,7 +253,7 @@ const DefaultTemplate: StoryFn<StoriesProps> = () => {
children: 'Second button',
view: 'normal-contrast',
},
description:
content:
'Lorem ipsum odor amet, consectetuer adipiscing elit. Nunc at parturient tristique senectus class duis eget per taciti. Eu rutrum est euismod risus aliquet in. Vehicula habitant nostra enim quis blandit consequat. Blandit ex ut purus; vestibulum accumsan duis? Porttitor accumsan at molestie integer nulla habitant? Egestas urna suscipit eleifend tortor mauris montes vulputate primis?Tempor viverra vitae tempus consectetur egestas? Quam dolor dictumst pellentesque porta; pulvinar conubia placerat risus. Leo at elementum vivamus fermentum erat taciti. Turpis ipsum faucibus primis purus, montes curae eu vel. Lacus metus sagittis dictumst diam libero imperdiet rhoncus neque. Natoque nullam inceptos porttitor integer porttitor nascetur a interdum. Imperdiet scelerisque rutrum congue massa eleifend torquent nisi. Sociosqu libero volutpat nisl orci viverra. Tristique egestas auctor conubia; etiam lectus scelerisque ligula. Magnis ultrices venenatis vivamus hac taciti inceptos leo. Interdum magnis sollicitudin elementum placerat montes. Lacinia platea netus nascetur ornare sociosqu. Inceptos taciti iaculis interdum nisl sodales in eros fermentum. Justo maecenas elementum condimentum feugiat consectetur semper sollicitudin. Primis sodales posuere facilisis donec ipsum efficitur. Faucibus accumsan lectus bibendum rhoncus maecenas, eget aliquam netus. Lectus torquent ut sodales fringilla natoque.',
media: {
type: 'image',
Expand All @@ -272,7 +272,7 @@ const DefaultTemplate: StoryFn<StoriesProps> = () => {
children: 'Second button',
view: 'normal',
},
description:
content:
'Lorem ipsum odor amet, consectetuer adipiscing elit. Nunc at parturient tristique senectus class duis eget per taciti. Eu rutrum est euismod risus aliquet in. Vehicula habitant nostra enim quis blandit consequat. Blandit ex ut purus; vestibulum accumsan duis? Porttitor accumsan at molestie integer nulla habitant? Egestas urna suscipit eleifend tortor mauris montes vulputate primis?Tempor viverra vitae tempus consectetur egestas? Quam dolor dictumst pellentesque porta; pulvinar conubia placerat risus. Leo at elementum vivamus fermentum erat taciti. Turpis ipsum faucibus primis purus, montes curae eu vel. Lacus metus sagittis dictumst diam libero imperdiet rhoncus neque. Natoque nullam inceptos porttitor integer porttitor nascetur a interdum. Imperdiet scelerisque rutrum congue massa eleifend torquent nisi. Sociosqu libero volutpat nisl orci viverra. Tristique egestas auctor conubia; etiam lectus scelerisque ligula. Magnis ultrices venenatis vivamus hac taciti inceptos leo. Interdum magnis sollicitudin elementum placerat montes. Lacinia platea netus nascetur ornare sociosqu. Inceptos taciti iaculis interdum nisl sodales in eros fermentum. Justo maecenas elementum condimentum feugiat consectetur semper sollicitudin. Primis sodales posuere facilisis donec ipsum efficitur. Faucibus accumsan lectus bibendum rhoncus maecenas, eget aliquam netus. Lectus torquent ut sodales fringilla natoque.',
media: {
type: 'video',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export const StoriesLayout = ({
{currentStory.title}
</Text>
)}
{currentStory.description && (
{currentStory.content && (
<Text
variant="body-2"
className={b('text-content')}
Expand All @@ -93,7 +93,7 @@ export const StoriesLayout = ({
: undefined
}
>
{currentStory.description}
{currentStory.content}
</Text>
)}
{currentStory.url && (
Expand Down
3 changes: 2 additions & 1 deletion src/components/Stories/types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type * as React from 'react';

import {ButtonProps} from '@gravity-ui/uikit';

export type StoriesItemMedia = {url: string} & (
Expand Down Expand Up @@ -33,7 +34,7 @@ export interface StoriesItemTextColorStyles {

export interface StoriesItem {
title?: string;
description?: string;
content?: React.ReactNode;
textColorStyles?: StoriesItemTextColorStyles;
textBlockStyle: StoriesTextBlockStyle;
mediaBlockStyle: StoriesMediaBlockStyle;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const groups: StoriesGroupItem[] = [
children: 'Second button',
view: 'normal',
},
description:
content:
'At the top of the panel is the service navigation for each service. ' +
'Below are common navigation elements: a component for switching between accounts ' +
'and organizations, settings, help center, search, notifications, favorites.',
Expand All @@ -73,7 +73,7 @@ const groups: StoriesGroupItem[] = [
title: 'New navigation',
textBlockStyle: StoriesTextBlockStyle.Transparent,
mediaBlockStyle: StoriesMediaBlockStyle.FullSize,
description:
content:
'At the top of the panel is the service navigation for each service. ' +
'Below are common navigation elements: a component for switching between accounts ' +
'and organizations, settings, help center, search, notifications, favorites.',
Expand All @@ -95,7 +95,7 @@ const groups: StoriesGroupItem[] = [
children: 'Second button',
view: 'normal',
},
description: 'A little more about the new navigation',
content: 'A little more about the new navigation',
media: {
url: 'https://storage.yandexcloud.net/uikit-storybook-assets/sample_960x400_ocean_with_audio.mp4',
type: 'video',
Expand Down

0 comments on commit a00fd13

Please sign in to comment.