-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Copy-paste chakra's button fixing fragments chrome issue
I'm not happy at all with this, since it's just a copy-paste of the original Button component, but changing the fragments with span. Ideally this should be fixed in upstream, see: chakra-ui/chakra-ui#8238 refs #136
- Loading branch information
1 parent
d1c1ffa
commit 878ecae
Showing
9 changed files
with
185 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
packages/chakra-components/src/components/Election/VoteButton.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
165 changes: 165 additions & 0 deletions
165
packages/chakra-components/src/components/layout/Button.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| import { ButtonOptions, ButtonSpinner, useButtonGroup } from '@chakra-ui/button' | ||
| import { useMergeRefs } from '@chakra-ui/react-use-merge-refs' | ||
| import { cx, dataAttr } from '@chakra-ui/shared-utils' | ||
| import { | ||
| chakra, | ||
| forwardRef, | ||
| HTMLChakraProps, | ||
| omitThemingProps, | ||
| SystemStyleObject, | ||
| ThemingProps, | ||
| useStyleConfig, | ||
| } from '@chakra-ui/system' | ||
| import { cloneElement, isValidElement, useCallback, useMemo, useState } from 'react' | ||
|
|
||
| export interface ButtonProps extends HTMLChakraProps<'button'>, ButtonOptions, ThemingProps<'Button'> {} | ||
|
|
||
| /** | ||
| * Button component is used to trigger an action or event, such as submitting a form, opening a Dialog, canceling an action, or performing a delete operation. | ||
| * | ||
| * @see Docs https://chakra-ui.com/docs/components/button | ||
| * @see WAI-ARIA https://www.w3.org/WAI/ARIA/apg/patterns/button/ | ||
| */ | ||
| export const Button = forwardRef<ButtonProps, 'button'>((props, ref) => { | ||
| const group = useButtonGroup() | ||
| const styles = useStyleConfig('Button', { ...group, ...props }) | ||
|
|
||
| const { | ||
| isDisabled = group?.isDisabled, | ||
| isLoading, | ||
| isActive, | ||
| children, | ||
| leftIcon, | ||
| rightIcon, | ||
| loadingText, | ||
| iconSpacing = '0.5rem', | ||
| type, | ||
| spinner, | ||
| spinnerPlacement = 'start', | ||
| className, | ||
| as, | ||
| ...rest | ||
| } = omitThemingProps(props) | ||
|
|
||
| /** | ||
| * When button is used within ButtonGroup (i.e. flushed with sibling buttons), | ||
| * it is important to add a `zIndex` on focus. | ||
| * | ||
| * So let's read the component styles and then add `zIndex` to it. | ||
| */ | ||
| const buttonStyles: SystemStyleObject = useMemo(() => { | ||
| // @ts-ignore | ||
| const _focus = { ...styles?.['_focus'], zIndex: 1 } | ||
| return { | ||
| display: 'inline-flex', | ||
| appearance: 'none', | ||
| alignItems: 'center', | ||
| justifyContent: 'center', | ||
| userSelect: 'none', | ||
| position: 'relative', | ||
| whiteSpace: 'nowrap', | ||
| verticalAlign: 'middle', | ||
| outline: 'none', | ||
| ...styles, | ||
| ...(!!group && { _focus }), | ||
| } | ||
| }, [styles, group]) | ||
|
|
||
| const { ref: _ref, type: defaultType } = useButtonType(as) | ||
|
|
||
| const contentProps = { rightIcon, leftIcon, iconSpacing, children } | ||
|
|
||
| return ( | ||
| <chakra.button | ||
| ref={useMergeRefs(ref, _ref)} | ||
| as={as} | ||
| type={type ?? defaultType} | ||
| data-active={dataAttr(isActive)} | ||
| data-loading={dataAttr(isLoading)} | ||
| __css={buttonStyles} | ||
| className={cx('chakra-button', className)} | ||
| {...rest} | ||
| disabled={isDisabled || isLoading} | ||
| > | ||
| {isLoading && spinnerPlacement === 'start' && ( | ||
| <ButtonSpinner | ||
| className='chakra-button__spinner--start' | ||
| label={loadingText} | ||
| placement='start' | ||
| spacing={iconSpacing} | ||
| > | ||
| {spinner} | ||
| </ButtonSpinner> | ||
| )} | ||
|
|
||
| {isLoading ? ( | ||
| loadingText || ( | ||
| <chakra.span opacity={0}> | ||
| <ButtonContent {...contentProps} /> | ||
| </chakra.span> | ||
| ) | ||
| ) : ( | ||
| <ButtonContent {...contentProps} /> | ||
| )} | ||
|
|
||
| {isLoading && spinnerPlacement === 'end' && ( | ||
| <ButtonSpinner | ||
| className='chakra-button__spinner--end' | ||
| label={loadingText} | ||
| placement='end' | ||
| spacing={iconSpacing} | ||
| > | ||
| {spinner} | ||
| </ButtonSpinner> | ||
| )} | ||
| </chakra.button> | ||
| ) | ||
| }) | ||
|
|
||
| Button.displayName = 'Button' | ||
|
|
||
| type ButtonContentProps = Pick<ButtonProps, 'leftIcon' | 'rightIcon' | 'children' | 'iconSpacing'> | ||
|
|
||
| function ButtonContent(props: ButtonContentProps) { | ||
| const { leftIcon, rightIcon, children, iconSpacing } = props | ||
|
|
||
| // using fragments here causes google chrome to crash while using translate | ||
| return ( | ||
| <span> | ||
| {leftIcon && <ButtonIcon marginEnd={iconSpacing}>{leftIcon}</ButtonIcon>} | ||
| {children} | ||
| {rightIcon && <ButtonIcon marginStart={iconSpacing}>{rightIcon}</ButtonIcon>} | ||
| </span> | ||
| ) | ||
| } | ||
|
|
||
| export function ButtonIcon(props: HTMLChakraProps<'span'>) { | ||
| const { children, className, ...rest } = props | ||
|
|
||
| const _children = isValidElement(children) | ||
| ? cloneElement<any>(children, { | ||
| 'aria-hidden': true, | ||
| focusable: false, | ||
| }) | ||
| : children | ||
|
|
||
| const _className = cx('chakra-button__icon', className) | ||
|
|
||
| return ( | ||
| <chakra.span display='inline-flex' alignSelf='center' flexShrink={0} {...rest} className={_className}> | ||
| {_children} | ||
| </chakra.span> | ||
| ) | ||
| } | ||
|
|
||
| ButtonIcon.displayName = 'ButtonIcon' | ||
|
|
||
| export function useButtonType(value?: React.ElementType) { | ||
| const [isButton, setIsButton] = useState(!value) | ||
| const refCallback = useCallback((node: HTMLElement | null) => { | ||
| if (!node) return | ||
| setIsButton(node.tagName === 'BUTTON') | ||
| }, []) | ||
| const type = isButton ? 'button' : undefined | ||
| return { ref: refCallback, type } as const | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| export * from './Button' | ||
| export * from './ConfirmModal' | ||
| export * from './HR' | ||
| export * from './Image' | ||
|
|
||