Skip to content

feat: Always render single/multi selection options vertically (M2-10899) #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hotavocado wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

feat: Always render single/multi selection options vertically (M2-10899) #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
79 changes: 22 additions & 57 deletions src/entities/activity/ui/items/CheckboxItem/RegularGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { useMemo } from 'react';

import { RegularCheckboxOption } from './RegularCheckboxOption';
import { CheckboxItem } from '../../../lib/types/item';

import { Box } from '~/shared/ui';
import { splitList, useCustomMediaQuery } from '~/shared/utils';

type Props = {
options: CheckboxItem['responseValues']['options'];
Expand All @@ -24,61 +21,29 @@ export const RegularGrid = ({
options,
itemId,
}: Props) => {
const { lessThanSM } = useCustomMediaQuery();

const [evenColumn, oddColumn] = useMemo(() => {
return splitList(options);
}, [options]);

return (
<Box display="flex" flex={1} gap="16px" flexDirection={lessThanSM ? 'column' : 'row'}>
<Box display="flex" flex={1} gap="16px" flexDirection="column">
{evenColumn.map((option) => {
const isChecked = values.includes(String(option.value));
const isNoneAbove = option.isNoneAbove;

return (
<RegularCheckboxOption
key={option.id}
id={option.id}
name={itemId}
value={option.value}
label={option.text}
onChange={() => onValueChange(String(option.value), isNoneAbove)}
description={option.tooltip}
image={option.image}
disabled={isDisabled}
defaultChecked={isChecked}
color={option.color}
replaceText={replaceText}
/>
);
})}
</Box>

<Box display="flex" flex={1} gap="16px" flexDirection="column">
{oddColumn.map((option) => {
const isChecked = values.includes(String(option.value));
const isNoneAbove = option.isNoneAbove;

return (
<RegularCheckboxOption
key={option.id}
id={option.id}
name={itemId}
value={option.value}
label={option.text}
onChange={() => onValueChange(String(option.value), isNoneAbove)}
description={option.tooltip}
image={option.image}
disabled={isDisabled}
defaultChecked={isChecked}
color={option.color}
replaceText={replaceText}
/>
);
})}
</Box>
<Box display="flex" flex={1} gap="16px" flexDirection="column">
{options.map((option) => {
const isChecked = values.includes(String(option.value));
const isNoneAbove = option.isNoneAbove;

return (
<RegularCheckboxOption
key={option.id}
id={option.id}
name={itemId}
value={option.value}
label={option.text}
onChange={() => onValueChange(String(option.value), isNoneAbove)}
description={option.tooltip}
image={option.image}
disabled={isDisabled}
defaultChecked={isChecked}
color={option.color}
replaceText={replaceText}
/>
);
})}
</Box>
);
};
70 changes: 19 additions & 51 deletions src/entities/activity/ui/items/RadioItem/RegularGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import { useMemo } from 'react';

import RadioGroup from '@mui/material/RadioGroup';

import { RegularRadioOption } from './RegularRadioOption';
import { RadioItem } from '../../../lib';

import { Box } from '~/shared/ui';
import { splitList, useCustomMediaQuery } from '~/shared/utils';

type Props = {
options: RadioItem['responseValues']['options'];
Expand All @@ -26,56 +23,27 @@ export const RegularGrid = ({
replaceText,
options,
}: Props) => {
const { lessThanSM } = useCustomMediaQuery();

const [evenColumn, oddColumn] = useMemo(() => {
return splitList(options);
}, [options]);

return (
<RadioGroup name={`${itemId}-radio regular-mode`}>
<Box display="flex" flex={1} gap="16px" flexDirection={lessThanSM ? 'column' : 'row'}>
<Box display="flex" flex={1} gap="16px" flexDirection="column">
{evenColumn.map((option) => {
return (
<RegularRadioOption
key={option.id}
id={option.id}
name={itemId}
value={option.value}
label={option.text}
onChange={() => onValueChange(String(option.value))}
description={option.tooltip}
image={option.image}
disabled={isDisabled}
defaultChecked={String(option.value) === value}
color={option.color}
replaceText={replaceText}
/>
);
})}
</Box>

<Box display="flex" flex={1} gap="16px" flexDirection="column">
{oddColumn.map((option) => {
return (
<RegularRadioOption
key={option.id}
id={option.id}
name={itemId}
value={option.value}
label={option.text}
onChange={() => onValueChange(String(option.value))}
description={option.tooltip}
image={option.image}
disabled={isDisabled}
defaultChecked={String(option.value) === value}
color={option.color}
replaceText={replaceText}
/>
);
})}
</Box>
<Box display="flex" flex={1} gap="16px" flexDirection="column">
{options.map((option) => {
return (
<RegularRadioOption
key={option.id}
id={option.id}
name={itemId}
value={option.value}
label={option.text}
onChange={() => onValueChange(String(option.value))}
description={option.tooltip}
image={option.image}
disabled={isDisabled}
defaultChecked={String(option.value) === value}
color={option.color}
replaceText={replaceText}
/>
);
})}
</Box>
</RadioGroup>
);
Expand Down
1 change: 0 additions & 1 deletion src/shared/utils/helpers/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ export * from './dateTime';
export * from './invertColor';
export * from './randomizeArray';
export * from './getRandomInt';
export * from './splitList';
export * from './getInitials';
export * from './delay';
export * from './cutString';
Expand Down
6 changes: 0 additions & 6 deletions src/shared/utils/helpers/splitList.ts
View file
Open in desktop

This file was deleted.

Loading