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

Jump to bottom

IconButtonFloating: reverting circle to squircle #3784

Merged
merged 3 commits into from
Oct 1, 2024
Merged

IconButtonFloating: reverting circle to squircle #3784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a79870e
more
AlbertCarreras Sep 30, 2024
469593b
more
AlbertCarreras Sep 30, 2024
7805b46
more
AlbertCarreras Sep 30, 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
3 changes: 0 additions & 3 deletions packages/gestalt/src/IconButton/InternalIconButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ type Props = {
zIndex?: Indexable;
};
type?: 'submit' | 'button';
variant?: 'floating' | 'default';
};

const InternalIconButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(function IconButton(
Expand All @@ -78,7 +77,6 @@ const InternalIconButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(fu
tabIndex = 0,
tooltip,
type,
variant,
}: Props,
ref,
) {
Expand Down Expand Up @@ -179,7 +177,6 @@ const InternalIconButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(fu
icon={icon}
iconColor={iconColor}
padding={padding}
rounding={variant === 'floating' ? 'circle' : undefined}
selected={selected}
size={size}
/>
Expand Down
9 changes: 7 additions & 2 deletions packages/gestalt/src/IconButtonFloating.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { forwardRef } from 'react';
import Box from './Box';
import InternalIconButton from './IconButton/InternalIconButton';
import icons from './icons/index';
import useInExperiment from './useInExperiment';
import { Indexable } from './zIndex';

type Props = {
Expand Down Expand Up @@ -84,8 +85,13 @@ const IconButtonFloatingWithForwardRef = forwardRef<HTMLButtonElement, Props>(
}: Props,
ref,
) {
const isInVRExperiment = useInExperiment({
webExperimentName: 'web_gestalt_visualRefresh',
mwebExperimentName: 'web_gestalt_visualRefresh',
});

return (
<Box borderStyle="shadow" color="default" rounding="circle">
<Box borderStyle="shadow" color="default" rounding={isInVRExperiment ? 4 : 'circle'}>
<InternalIconButton
ref={ref}
accessibilityControls={accessibilityControls}
Expand All @@ -100,7 +106,6 @@ const IconButtonFloatingWithForwardRef = forwardRef<HTMLButtonElement, Props>(
selected={selected}
size="xl"
tooltip={tooltip}
variant="floating"
/>
</Box>
);
Expand Down
Loading