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.

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

Button: Fixing height #3990

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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
10 changes: 0 additions & 10 deletions packages/gestalt/src/Button.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,6 @@
padding: var(--sema-space-150) var(--sema-space-300);
}

a.smVr:focus {
padding: var(--sema-space-100)
calc(var(--sema-space-200) + var(--g-border-width-lg));
}

a.lgVr:focus {
padding: var(--sema-space-150)
calc(var(--sema-space-300) + var(--g-border-width-lg));
}

.lgVr {
border-radius: var(--rounding-400);
min-height: 48px;
Expand Down
1 change: 0 additions & 1 deletion packages/gestalt/src/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,6 @@ const ButtonWithForwardRef = forwardRef<HTMLButtonElement, Props>(function Butto
onTouchMove={handleTouchMove}
// @ts-expect-error - TS2322 - Type '(arg1: TouchEvent<HTMLDivElement>) => void' is not assignable to type 'TouchEventHandler<HTMLButtonElement>'.
onTouchStart={handleTouchStart}
style={isInVRExperiment ? compressStyle || undefined : undefined}
// @ts-expect-error - TS2322 - Type '0 | -1 | null' is not assignable to type 'number | undefined'.
tabIndex={disabled ? null : tabIndex}
type="button"
Expand Down
6 changes: 5 additions & 1 deletion packages/gestalt/src/Link/InternalLink.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ const InternalLinkWithForwardRef = forwardRef<HTMLAnchorElement, Props>(function
isTapArea ? getRoundingClassName(rounding || 0) : undefined,
!isTapArea && !isInVRExperiment ? getRoundingClassName('pill') : undefined,
{
[touchableStyles.tapCompress]: !disabled && tapStyle === 'compress' && isTapping,
[touchableStyles.tapCompress]:
!disabled && tapStyle === 'compress' && !isInVRExperiment && isTapping,
[focusStyles.hideOutline]: !disabled && !isFocusVisible,
[focusStyles.accessibilityOutline]: !disabled && isFocusVisible && !isInVRExperiment,
},
Expand Down Expand Up @@ -321,6 +322,9 @@ const InternalLinkWithForwardRef = forwardRef<HTMLAnchorElement, Props>(function
}
: {})}
tabIndex={disabled ? undefined : tabIndex}
{...(tapStyle === 'compress' && !isInVRExperiment && compressStyle && !disabled
? { style: compressStyle }
: {})}
target={target ? `_${target}` : undefined}
{...(download ? { download } : {})}
>
Expand Down
Loading