Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,50 @@ export function App() {
}
```

### Сегменты только с иконкой

Свойство `label` принимает ReactNode. Можно передать собственный элемент, в том числе и иконку

```tsx live
import React from 'react';
import { IconPlasma } from '@salutejs/plasma-icons'
import { SegmentGroup, SegmentItem, SegmentProvider, useSegment } from '@salutejs/{{ package }}';

export function App() {
const items = Array(4).fill(0);

const SegmentTemplate = () => {
const {selectedSegmentItems} = useSegment();

return (
<>
<div>Выбранный элемент: {selectedSegmentItems.join(', ')}</div>
<br />
<SegmentGroup hasBackground pilled clip={false}>
{items.map((_, i) => (
<SegmentItem
label={<IconPlasma size="xs" color="inherit"/>}
value={`label_${i}`}
key={`label_${i}`}
view='default'
pilled
/>
))}
</SegmentGroup>
</>
)
}

return (
<div style=\{{ display: "block" }} >
<SegmentProvider defaultSelected={['label_1']} singleSelectedRequired>
<SegmentTemplate/>
</SegmentProvider>
</div>
);
}
```

## Таблица свойств

### SegmentGroup
Expand Down
11 changes: 9 additions & 2 deletions packages/plasma-new-hope/src/components/Segment/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
export { segmentItemConfig, segmentItemRoot, segmentGroupConfig, segmentGroupRoot } from './ui';
export type { SegmentItemProps, SegmentGroupProps } from './ui';
export {
segmentItemConfig,
segmentItemRoot,
segmentGroupConfig,
segmentGroupRoot,
segmentIconItemConfig,
segmentIconItemRoot,
} from './ui';
export type { SegmentItemProps, SegmentGroupProps, SegmentIconItemProps } from './ui';

export { SegmentProvider, useSegment } from './SegmentProvider';
export type { SegmentProviderProps } from './SegmentProvider';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const tokens = {
itemPilledPadding: '--plasma-segment-item-pilled-padding',
itemMarginLeft: '--plasma-segment-item-margin-left',
itemContentPadding: '--plasma-segment-item-content-padding',
iconItemContentPadding: '--plasma-segment-icon-item-content-padding',
itemIconMargin: '--plasma-segment-item-content-icon-margin',

itemColor: '--plasma-segment-item-color',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { styled } from '@linaria/react';
import { css } from '@linaria/core';

import { addFocus } from '../../../../mixins';
import { tokens } from '../../tokens';

export const StyledIcon = styled.div`
display: inline-flex;
align-items: center;
justify-content: center;
width: fit-content;
padding: var(${tokens.iconItemContentPadding});
`;

export const base = css`
position: relative;
display: inline-flex;
align-items: center;
justify-content: center;
box-sizing: border-box;
min-width: 0;
white-space: nowrap;

appearance: none;
border: none;
outline: none;
cursor: pointer;
margin-left: var(${tokens.itemMarginLeft});
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);

&:first-child {
margin-left: 0;
}

${addFocus({
outlineSize: '0.063rem',
outlineOffset: 'var(--plasma_private-clip-outline-offset)',
outlineColor: `var(${tokens.outlineFocusColor})`,
outlineRadius: 'calc(var(--plasma_private-outline-radius) + var(--plasma_private-clip-outline-radius))',
customFocusRules: `
&.focus-visible:focus,
&[data-focus-visible-added] {
&::before {
z-index: 1;
outline: none;
box-shadow: 0 0 0 0.063rem var(${tokens.outlineFocusColor});
}
}
`,
})};
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
import React, { forwardRef } from 'react';
import type { MouseEvent } from 'react';
import type { RootProps } from 'src/engines/types';
import { cx, safeUseId } from 'src/utils';

import { classes } from '../../tokens';
import { useSegmentInner } from '../../SegmentProvider/SegmentProvider';

import { base as sizeCSS } from './variations/_size/base';
import { base as viewCSS } from './variations/_view/base';
import { base as disabledCSS } from './variations/_disabled/base';
import { base as pilledCSS } from './variations/_pilled/base';
import type { SegmentIconItemProps } from './SegmentIconItem.types';
import { StyledIcon, base } from './SegmentIconItem.styles';

export const segmentIconItemRoot = (Root: RootProps<HTMLButtonElement, SegmentIconItemProps>) =>
forwardRef<HTMLButtonElement, SegmentIconItemProps>((props, outerRef) => {
const {
style,
size,
view = 'default',
className,
id,
icon,
value,
pilled,
customHandleSelect,
'aria-label': ariaLabelExternal,
...rest
} = props;
const { disabledGroup, handleSelect, selectedSegmentItems } = useSegmentInner();

const uniqId = safeUseId();
const segmentId = id || `label-${uniqId}`;

const pilledClass = pilled ? classes.segmentPilled : undefined;

const isSelected = selectedSegmentItems?.includes(value);
const selectedClass = isSelected ? classes.selectedSegmentItem : undefined;

const handleSelectSegment = (event: MouseEvent<HTMLButtonElement>) => {
if (disabledGroup) {
return;
}

customHandleSelect?.(event);
handleSelect?.(value);
};

return (
<Root
view={view}
size={size}
id={segmentId}
ref={outerRef}
aria-label={ariaLabelExternal || value}
value={value}
pilled={pilled}
className={cx(selectedClass, pilledClass, className)}
onClick={handleSelectSegment}
tabIndex={disabledGroup ? -1 : 0}
disabled={disabledGroup}
style={style}
{...rest}
>
<StyledIcon>{icon}</StyledIcon>
</Root>
);
});

export const segmentIconItemConfig = {
name: 'SegmentIconItem',
tag: 'button',
layout: segmentIconItemRoot,
base,
variations: {
size: {
css: sizeCSS,
},
view: {
css: viewCSS,
},
disabled: {
css: disabledCSS,
attrs: true,
},
pilled: {
css: pilledCSS,
attrs: true,
},
},
defaults: {
view: 'default',
size: 'xs',
},
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import type { MouseEvent, ButtonHTMLAttributes } from 'react';

type CustomSegmentIconItemProps = {
/**
* Значение сегмента
*/
value: string;
/**
* Уникальный идентификатор контрола
*/
id?: string;
/**
* Иконка
*/
icon?: React.ReactNode;
/**
* Сегмент c округлым border-radius
*/
pilled?: boolean;
/**
* Коллбек для обработки выбора сегмента
*/
customHandleSelect?: (e: MouseEvent<HTMLButtonElement>) => void;
/**
* Размер сегмента
*/
size?: string;
/**
* Вид сегмента
* @default 'default'
*/
view?: string;
};

export type SegmentIconItemProps = ButtonHTMLAttributes<HTMLButtonElement> & CustomSegmentIconItemProps;
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { segmentIconItemConfig, segmentIconItemRoot } from './SegmentIconItem';
export type { SegmentIconItemProps } from './SegmentIconItem.types';
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { css } from '@linaria/core';

import { classes, tokens } from '../../../../tokens';

export const base = css`
&[disabled] {
cursor: not-allowed;

&:hover {
color: var(${tokens.itemColor});
background-color: var(${tokens.itemBackgroundColor});
}

&.${String(classes.selectedSegmentItem)}:hover {
color: var(${tokens.itemSelectedColor});
background-color: var(${tokens.itemSelectedBackgroundColor});
}
}
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "boolean",
"tokens": ["--plasma-segment-disabled-opacity"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { css } from '@linaria/core';

import { classes, tokens } from '../../../../tokens';

export const base = css`
&.${String(classes.segmentPilled)} {
--plasma_private-outline-radius: var(${tokens.itemPilledBorderRadius});
border-radius: var(${tokens.itemPilledBorderRadius});

padding: var(${tokens.itemPilledPadding});
}
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "boolean",
"tokens": ["--plasma-segment-item-pilled-border-radius"]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { css } from '@linaria/core';

import { classes, tokens } from '../../../../tokens';

export const base = css`
--plasma_private-outline-radius: var(${tokens.itemBorderRadius});
border-radius: var(${tokens.itemBorderRadius});

width: var(${tokens.itemWidth});
height: var(${tokens.itemHeight});

padding: var(${tokens.itemPadding});

&.${classes.selectedSegmentItem} {
font-weight: var(${tokens.fontWeightSelectedItem}, var(${tokens.fontWeight}));
}
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
"--plasma-segment-item-border-radius",
"--plasma-segment-item-width",
"--plasma-segment-item-height",
"--plasma-segment-item-padding"
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { css } from '@linaria/core';

import { classes, tokens } from '../../../../tokens';

export const base = css`
color: var(${tokens.itemColor});
background-color: var(${tokens.itemBackgroundColor});

&:hover {
color: var(${tokens.itemColorHover});
background-color: var(${tokens.itemBackgroundColorHover});
}

&.${classes.selectedSegmentItem} {
color: var(${tokens.itemSelectedColor});
background-color: var(${tokens.itemSelectedBackgroundColor});

&:hover {
color: var(${tokens.itemSelectedColorHover});
background-color: var(${tokens.itemSelectedBackgroundColorHover});
}
}
`;
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[
"--plasma-segment-item-color",
"--plasma-segment-item-background-color",
"--plasma-segment-item-color-hover",
"--plasma-segment-item-background-color-hover",
"--plasma-segment-item-selected-color",
"--plasma-segment-item-selected-background-color",
"--plasma-segment-item-selected-color-hover",
"--plasma-segment-item-selected-background-color-hover"
]
2 changes: 2 additions & 0 deletions packages/plasma-new-hope/src/components/Segment/ui/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ export { segmentGroupConfig, segmentGroupRoot } from './SegmentGroup';
export type { SegmentGroupProps } from './SegmentGroup';
export { segmentItemConfig, segmentItemRoot } from './SegmentItem';
export type { SegmentItemProps } from './SegmentItem';
export { segmentIconItemConfig, segmentIconItemRoot } from './SegmentIconItem';
export type { SegmentIconItemProps } from './SegmentIconItem';
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ import { Counter } from '../Counter/Counter';
import { WithTheme } from '../../_helpers';

import { config } from './SegmentGroup.config';
import { SegmentItem, SegmentGroup } from './Segment';
import { SegmentItem, SegmentGroup, SegmentIconItem } from './Segment';

type SegmentGroupProps = ComponentProps<typeof SegmentGroup>;

const { meta: META, Default } = getSegmentStories({
const { meta: META, Default, IconItem } = getSegmentStories({
SegmentGroup,
SegmentItem,
SegmentIconItem,
SegmentProvider,
componentConfig: config,
CounterComponent: Counter,
Expand All @@ -28,4 +29,4 @@ const meta: Meta<SegmentGroupProps> = {

export default meta;

export { Default };
export { Default, IconItem };
Loading
Loading