-
Notifications
You must be signed in to change notification settings - Fork 89
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
fix: refine arrowStyles
CSS
#1812
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,7 @@ | |
*/ | ||
|
||
import { css, keyframes } from 'styled-components'; | ||
import { math } from 'polished'; | ||
import { math, stripUnit } from 'polished'; | ||
import { ArrowPosition } from '../types'; | ||
|
||
type ArrowOptions = { | ||
|
@@ -15,24 +15,6 @@ type ArrowOptions = { | |
animationModifier?: string; | ||
}; | ||
|
||
// Workaround for https://github.com/styled-components/polished/issues/550 | ||
export const exponentialSymbols = { | ||
symbols: { | ||
sqrt: { | ||
func: { | ||
symbol: 'sqrt', | ||
f: (a: number) => Math.sqrt(a), | ||
notation: 'func', | ||
precedence: 0, | ||
rightToLeft: 0, | ||
argCount: 1 | ||
}, | ||
symbol: 'sqrt', | ||
regSymbol: 'sqrt\\b' | ||
} | ||
} | ||
}; | ||
|
||
const animationStyles = (position: ArrowPosition, modifier: string) => { | ||
const property = position.split('-')[0]; | ||
/** | ||
|
@@ -54,65 +36,77 @@ const animationStyles = (position: ArrowPosition, modifier: string) => { | |
|
||
const positionStyles = (position: ArrowPosition, size: string, inset: string) => { | ||
const margin = math(`${size} / -2`); | ||
const placement = math(`${margin} + ${inset}`); | ||
const placement = math(`${margin} + ${inset} - 1`); | ||
const offset = math(`${size} + 4`); | ||
let clipPath; | ||
let borderCss; | ||
let positionCss; | ||
let propertyRadius: string; | ||
|
||
if (position.startsWith('top')) { | ||
propertyRadius = 'border-bottom-right-radius'; | ||
clipPath = 'polygon(100% 0, 100% 1px, 1px 100%, 0 100%, 0 0)'; | ||
borderCss = css` | ||
border-right: none; | ||
border-bottom: none; | ||
`; | ||
positionCss = css` | ||
top: ${placement}; | ||
right: ${position === 'top-right' && size}; | ||
left: ${position === 'top' ? '50%' : position === 'top-left' && size}; | ||
right: ${position === 'top-right' && offset}; | ||
left: ${position === 'top' ? '50%' : position === 'top-left' && offset}; | ||
margin-left: ${position === 'top' && margin}; | ||
`; | ||
} else if (position.startsWith('right')) { | ||
propertyRadius = 'border-bottom-left-radius'; | ||
clipPath = 'polygon(100% 0, 100% 100%, calc(100% - 1px) 100%, 0 1px, 0 0)'; | ||
borderCss = css` | ||
border-bottom: none; | ||
border-left: none; | ||
`; | ||
positionCss = css` | ||
top: ${position === 'right' ? '50%' : position === 'right-top' && size}; | ||
top: ${position === 'right' ? '50%' : position === 'right-top' && offset}; | ||
right: ${placement}; | ||
bottom: ${position === 'right-bottom' && size}; | ||
bottom: ${position === 'right-bottom' && offset}; | ||
margin-top: ${position === 'right' && margin}; | ||
`; | ||
} else if (position.startsWith('bottom')) { | ||
propertyRadius = 'border-top-left-radius'; | ||
clipPath = 'polygon(100% 0, calc(100% - 1px) 0, 0 calc(100% - 1px), 0 100%, 100% 100%)'; | ||
borderCss = css` | ||
border-top: none; | ||
border-left: none; | ||
`; | ||
positionCss = css` | ||
right: ${position === 'bottom-right' && size}; | ||
right: ${position === 'bottom-right' && offset}; | ||
bottom: ${placement}; | ||
left: ${position === 'bottom' ? '50%' : position === 'bottom-left' && size}; | ||
left: ${position === 'bottom' ? '50%' : position === 'bottom-left' && offset}; | ||
margin-left: ${position === 'bottom' && margin}; | ||
`; | ||
} else if (position.startsWith('left')) { | ||
propertyRadius = 'border-top-right-radius'; | ||
clipPath = 'polygon(0 100%, 100% 100%, 100% calc(100% - 1px), 1px 0, 0 0)'; | ||
borderCss = css` | ||
border-top: none; | ||
border-right: none; | ||
`; | ||
positionCss = css` | ||
top: ${position === 'left' ? '50%' : position === 'left-top' && size}; | ||
bottom: ${size}; | ||
top: ${position === 'left' ? '50%' : position === 'left-top' && offset}; | ||
bottom: ${offset}; | ||
left: ${placement}; | ||
margin-top: ${position === 'left' && margin}; | ||
`; | ||
} | ||
|
||
/** | ||
* 1. Round-off portion of the foreground square opposite the arrow tip | ||
* (improved layout for IE which doesn't support 'clip-path'). | ||
* 2. Clip portion of the foreground square opposite the arrow tip so that it | ||
* 1. Clip portion of the foreground square opposite the arrow tip so that it | ||
* doesn't interfere with container content. | ||
* 2. Knock out border opposite the arrow tip. | ||
* 3. Arrow positioning on the base element. | ||
*/ | ||
return css` | ||
&::before { | ||
${propertyRadius!}: 100%; /* [1] */ | ||
clip-path: ${clipPath}; /* [2] */ | ||
clip-path: ${clipPath}; /* [1] */ | ||
${borderCss}; /* [2] */ | ||
} | ||
|
||
&::before, | ||
&::after { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We need There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
${positionCss}/* [3] */ | ||
${positionCss}; /* [3] */ | ||
} | ||
`; | ||
}; | ||
|
@@ -150,32 +144,28 @@ const positionStyles = (position: ArrowPosition, size: string, inset: string) => | |
* @component | ||
*/ | ||
export default function arrowStyles(position: ArrowPosition, options: ArrowOptions = {}) { | ||
const size = options.size || '6px'; | ||
const size = options.size === undefined ? 6 : (stripUnit(options.size) as number); | ||
const inset = options.inset || '0'; | ||
const squareSize = math(`${size} * 2 / sqrt(2)`, exponentialSymbols); | ||
const squareSize = `${Math.floor((size * 2) / Math.sqrt(2)) + 1}px`; | ||
|
||
/** | ||
* 1. Set base positioning for an element with an arrow. | ||
* 2. Allow any border inherited by `::after` to show through. | ||
* 3. Border styling and box-shadow will be automatically inherited from the | ||
* parent element. | ||
* 2. Border styling will be inherited from the parent element. | ||
* 3. Box shadow styling will be inherited from the parent element. | ||
* 4. Apply shared sizing properties to ::before and ::after. | ||
*/ | ||
return css` | ||
position: relative; /* [1] */ | ||
|
||
&::before { | ||
/* [2] */ | ||
border-width: inherit; | ||
border-style: inherit; | ||
border-color: transparent; | ||
border: inherit; | ||
background-clip: content-box; | ||
} | ||
|
||
&::after { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above. |
||
/* [3] */ | ||
z-index: -1; | ||
border: inherit; | ||
box-shadow: inherit; | ||
} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
❤️