Skip to content

Added toggle gradient and cleaned up the size #14518

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

Closed
wants to merge 5 commits into from
Closed

Added toggle gradient and cleaned up the size #14518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
68a7821
added toggle gradient and cleaned up the size
annadoesdesign Aug 20, 2025
b055446
fixed icon issue once changed the size
annadoesdesign Aug 21, 2025
bb3673d
Merge branch 'master' into ae--DES-425-switch-design-update
annadoesdesign Aug 21, 2025
c9d8326
Merge branch 'master' into ae--DES-425-switch-design-update
annadoesdesign Aug 22, 2025
8968b2f
Merge branch 'master' into ae--DES-425-switch-design-update
annadoesdesign Aug 22, 2025
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
15 changes: 4 additions & 11 deletions datahub-web-react/src/alchemy-components/components/Switch/Switch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { Tooltip } from '@components';
import React, { useEffect, useState } from 'react';

import {
IconContainer,
Label,
Required,
Slider,
StyledIcon,
StyledInput,
SwitchContainer,
ToggleButton,
} from '@components/components/Switch/components';
import { SwitchProps } from '@components/components/Switch/types';

Expand Down Expand Up @@ -66,16 +66,9 @@ export const Switch = ({
/>
<Tooltip title={isDisabled && disabledHoverText ? disabledHoverText : undefined} showArrow={false}>
<Slider size={size} isSquare={isSquare} isDisabled={isDisabled}>
<IconContainer>
{icon && (
<StyledIcon
icon={icon}
color={checked ? colorScheme || 'violet' : 'inherit'}
size={size || 'md'}
checked={checked}
/>
)}
</IconContainer>
<ToggleButton checked={checked} isDisabled={isDisabled}>
{icon && <StyledIcon icon={icon} size={size || 'md'} checked={checked} />}
</ToggleButton>
</Slider>
</Tooltip>
</SwitchContainer>
Expand Down
88 changes: 39 additions & 49 deletions datahub-web-react/src/alchemy-components/components/Switch/components.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ import styled from 'styled-components';

import { Icon } from '@components/components/Icon';
import type { SwitchLabelPosition } from '@components/components/Switch/types';
import {
getIconTransformPositionLeft,
getIconTransformPositionTop,
getInputHeight,
getSliderTransformPosition,
getToggleSize,
} from '@components/components/Switch/utils';
import { formLabelTextStyles } from '@components/components/commonStyles';
import { borders, colors, shadows, spacing, transition } from '@components/theme';
import { ColorOptions, SizeOptions } from '@components/theme/config';
Expand All @@ -32,40 +25,41 @@ export const SwitchContainer = styled.label<{ labelPosition: SwitchLabelPosition
);

export const Slider = styled.div<{ size?: SizeOptions; isSquare?: boolean; isDisabled?: boolean }>(
Copy link
Collaborator

Choose a reason for hiding this comment

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

size isn't used anymore right? should we remove that prop?

({ size, isSquare, isDisabled }) => ({
'&:before': {
transition: `${transition.duration.normal} all`,
content: '""',
position: 'absolute',
minWidth: getToggleSize(size || 'md', 'slider'), // sliders width and height must be same
minHeight: getToggleSize(size || 'md', 'slider'),
borderRadius: !isSquare ? '35px' : '0px',
top: '50%',
left: spacing.xxsm,
transform: 'translate(0, -50%)',
backgroundColor: !isDisabled ? colors.white : colors.gray[200],
boxShadow: `
0px 1px 2px 0px rgba(16, 24, 40, 0.06),
0px 1px 3px 0px rgba(16, 24, 40, 0.12)
`,
},
borderRadius: !isSquare ? '32px' : '0px',
minWidth: getToggleSize(size || 'md', 'input'),
minHeight: getInputHeight(size || 'md'),
}),
{
({ isSquare, isDisabled }) => ({
borderRadius: isSquare ? '0px' : '200px',
width: '34px',
height: '20px',
minWidth: '34px',
minHeight: '20px',
position: 'relative',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
position: 'relative',

backgroundColor: colors.gray[100],
padding: spacing.xxsm,
backgroundColor: isDisabled ? colors.gray[100] : colors.gray[100],
padding: '0px',
transition: `${transition.duration.normal} all`,
boxSizing: 'content-box',
},
}),
);

export const ToggleButton = styled.div<{ checked?: boolean; isDisabled?: boolean }>`
position: absolute;
width: 18px;
height: 18px;
border-radius: 200px;
background-color: ${({ isDisabled }) => (!isDisabled ? colors.white : colors.gray[1500])};
box-shadow:
0px 1px 2px 0px rgba(16, 24, 40, 0.06),
0px 1px 3px 0px rgba(16, 24, 40, 0.12);
transition: ${transition.duration.normal} all;
left: ${({ checked }) => (checked ? '15px' : '1px')};
top: 50%;
transform: translateY(-50%);
display: flex;
align-items: center;
justify-content: center;
`;

export const Required = styled.span({
color: colors.red[500],
marginLeft: spacing.xxsm,
Expand All @@ -81,12 +75,13 @@ export const StyledInput = styled.input<{
position: absolute;

&:checked + ${Slider} {
background-color: ${(props) =>
!props.disabled ? getColor(props.colorScheme, 500, props.theme) : colors.gray[100]};

&:before {
transform: ${({ customSize }) => getSliderTransformPosition(customSize || 'md')};
}
background: ${(props) => {
if (props.disabled) return colors.gray[100];
if (props.colorScheme === 'violet' || props.colorScheme === 'primary') {
return 'linear-gradient(180deg, rgba(255, 255, 255, 0.20) 0%, rgba(83.44, 63, 209, 0.20) 100%), #533FD1';
}
return getColor(props.colorScheme, 500, props.theme);
}};
}

&:focus-within + ${Slider} {
Expand All @@ -98,20 +93,15 @@ export const StyledInput = styled.input<{
`;

export const StyledIcon = styled(Icon)<{ checked?: boolean; size: SizeOptions }>(
({ checked, size }) => ({
left: getIconTransformPositionLeft(size, checked || false),
top: getIconTransformPositionTop(size),
({ checked }) => ({
color: checked ? colors.violet[500] : colors.gray[500],
width: '14px',
height: '14px',
}),
{
transition: `${transition.duration.normal} all`,
position: 'absolute',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
color: colors.gray[500],
},
);

export const IconContainer = styled.div({
position: 'relative',
});
Loading