Skip to content
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

fix(SegmentedControls): allow for item in list to be disabled #1676

Merged
merged 8 commits into from
Mar 5, 2024
Merged

fix(SegmentedControls): allow for item in list to be disabled #1676

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d327409
fix(SegmentedControls): allow for item in list to be disabled
ryancarville Dec 13, 2023
7a0672f
fix(SegmentedControls): move motion div outside fieldset and update s…
ryancarville Dec 13, 2023
8a572f5
fix(SegmentedCOntrols): update styling
ryancarville Dec 13, 2023
9aef7ea
Merge branch 'main' into fix/segmented-controls-item-disabled
noahwaldner Feb 21, 2024
155e1af
add label back
noahwaldner Feb 21, 2024
3eaf311
Merge branch 'main' into fix/segmented-controls-item-disabled
noahwaldner Feb 21, 2024
606a400
added case for when all are disabled
noahwaldner Mar 1, 2024
fd8c9ef
fix linting
noahwaldner Mar 4, 2024
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
9 changes: 9 additions & 0 deletions packages/fondue/src/components/SegmentedControls/SegmentedControls.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,12 @@ IconAndText.args = {
},
],
};

export const TextWithOneItemDisabled = SegmentedControlsTemplate.bind({});
TextWithOneItemDisabled.args = {
items: [
{ id: 'a', value: 'abc', disabled: true },
{ id: 'b', value: 'def' },
{ id: 'c', value: 'ghi' },
],
};
59 changes: 36 additions & 23 deletions packages/fondue/src/components/SegmentedControls/SegmentedControls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ export type IconItem = {
icon: ReactElement<IconProps>;
value?: string;
ariaLabel: string;
disabled?: boolean;
};

export type TextOrNumberItem = {
id: string;
value: string | number;
disabled?: boolean;
};

export type SegmentSize = 'small' | 'medium';
Expand Down Expand Up @@ -88,7 +90,7 @@ const SegmentedControlsItem = forwardRef<HTMLDivElement, SegmentedControlsItemPr
ref={ref}
className={merge([
'tw-relative',
"after:tw-content-[''] after:tw-border-r after:tw-border-solid after:tw-border-line-strong after:tw-absolute after:tw-right-0 after:tw-h-full last:after:tw-hidden",
"after:tw-content-[''] after:tw-border-r after:tw-border-solid after:tw-border-line-x-strong after:tw-absolute after:tw-right-0 after:tw-h-[2.2rem] last:after:tw-hidden",
isFocusVisible && FOCUS_STYLE,
])}
>
Expand All @@ -104,9 +106,11 @@ const SegmentedControlsItem = forwardRef<HTMLDivElement, SegmentedControlsItemPr
className={merge([
'tw-relative tw-w-full tw-py-2 tw-inline-flex tw-justify-center tw-items-center tw-font-sans tw-font-normal tw-h-full tw-text-center',
size === 'small' ? 'tw-px-2' : 'tw-px-4',
isActive && !disabled ? 'tw-text-text' : 'tw-text-text-weak',
isActive && !disabled
? 'tw-transition tw-ease-in-out tw-delay-300 tw-text-text tw-bg-base'
: 'tw-text-text-weak',
disabled
? 'tw-text-box-disabled-inverse tw-bg-box-disabled hover:tw-cursor-not-allowed'
? 'tw-text-box-disabled-inverse tw-bg-box-disabled tw-h-[2.15rem] tw-rounded hover:tw-cursor-not-allowed tw-border-line-x-strong'
: 'hover:tw-text-text hover:tw-cursor-pointer',
])}
>
Expand Down Expand Up @@ -142,15 +146,24 @@ export const SegmentedControls = ({
<SegmentedControlsItem
id={id}
item={item}
disabled={disabled}
disabled={item.disabled ?? disabled}
radioGroupState={radioGroupState}
ref={(el) => (itemsRef.current[index] = el)}
key={`fondue-segmented-controls-${id}-item-${item.id}`}
size={size}
/>
));
}, [items, id, disabled, radioGroupState, size]);
const selectedIndex = items.findIndex((item) => item.id === radioGroupState.selectedValue);

const selectedIndex = items.findIndex((item, index) => {
const isActiveItem = item.id === radioGroupState.selectedValue;
if (item.disabled && isActiveItem) {
const nextIndex = index + 1;
radioGroupState.setSelectedValue(items[nextIndex].id);
Copy link
Member

@SamuelAlev SamuelAlev Feb 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Goes out of bounds in case of the last item being disabled, also a disabled item should be able to be selected by default which makes the change in this function not necessary 🤔
What do you think?

Copy link
Contributor

@noahwaldner noahwaldner Mar 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had a look at it and it is very weird when the default item is not clickable. The UX is super weird.

I fixed the function to select the item to the left when the last one is default and disabled and to collapse the "cursor/hightlight" when all are disabled

}
return isActiveItem;
});

const width = hugWidth ? '' : 'tw-w-full';
const alignment = hugWidth ? 'tw-flex' : 'tw-grid tw-grid-flow-col tw-auto-cols-fr tw-justify-evenly';
const isSmall = size === 'small';
Expand Down Expand Up @@ -195,30 +208,30 @@ export const SegmentedControls = ({
{...radioGroupProps}
data-test-id="fondue-segmented-controls"
className={merge([
'tw-relative tw-h-9 tw-p-0 tw-border tw-border-solid tw-border-line-strong tw-m-0 tw-bg-base-alt tw-rounded tw-font-sans tw-text-s tw-select-none',
'tw-relative tw-h-9 tw-p-0 tw-border tw-border-solid tw-border-line-strong tw-m-0 tw-bg-base-alt tw-rounded tw-font-sans tw-text-sm tw-select-none',
width,
alignment,
])}
>
<VisuallyHidden>
<span {...labelProps}>{ariaLabel}</span>
</VisuallyHidden>
<motion.div
aria-hidden="true"
// div border is not included in width so it must be subtracted from translation.
animate={activeBorderDimensions ?? { x: '0px', width: '0px' }}
initial={false}
transition={{ type: 'tween', duration: 0.3 }}
hidden={!activeItemId}
className={merge([
'tw-absolute tw--inset-y-px tw-h-full tw-box-content tw-border tw-rounded tw-pointer-events-none',
disabled
? 'tw-border-line-x-strong hover:tw-cursor-not-allowed'
: 'tw-border-line-xx-strong tw-bg-base',
])}
/>
{itemElements}
</fieldset>
<VisuallyHidden>
<span {...labelProps}>{ariaLabel}</span>
</VisuallyHidden>
<motion.div
aria-hidden="true"
// div border is not included in width so it must be subtracted from translation.
animate={activeBorderDimensions ?? { x: '0px', width: '0px' }}
initial={false}
transition={{ type: 'tween', duration: 0.3 }}
hidden={!activeItemId}
className={merge([
'tw-absolute tw-h-9 tw-box-content tw-border tw-rounded tw-pointer-events-none tw-top-[0.96rem]',
disabled
? 'tw-border-line-x-strong hover:tw-cursor-not-allowed'
: 'tw-border-line-xx-strong tw-bg-transparent',
])}
/>
</div>
);
};
Expand Down
Loading