@sanity/ui 0.37.10 → 0.37.13

package/src/styles/font/responsiveFont.ts

@@ -1,6 +1,6 @@
 import {CSSObject} from 'styled-components'
 import {ThemeFontSize, ThemeFontKey} from '../../theme'
-import {getResponsiveProp, rem, responsive} from '../helpers'
+import {rem, _responsive} from '../helpers'
 import {ThemeProps} from '../types'
 import {ResponsiveFontStyleProps} from './types'
 
@@ -14,7 +14,7 @@ export function responsiveFont(
 ): CSSObject[] {
   const {$size, $weight, theme} = props
   const {fonts, media} = theme.sanity
-  const {family, sizes, weights, horizontalOffset} = fonts[fontKey]
+  const {family, sizes, weights} = fonts[fontKey]
   const fontWeight = ($weight && weights[$weight]) || weights.regular
 
   // @todo: make this configurable
@@ -24,7 +24,7 @@ export function responsiveFont(
     position: 'relative',
     fontFamily: family,
     fontWeight,
-    padding: '1px',
+    padding: '1px 0',
     margin: 0,
 
     '&:before': {
@@ -48,14 +48,12 @@ export function responsiveFont(
     },
   }
 
-  const resp = responsive(media, getResponsiveProp($size), (sizeIndex) =>
-    fontSize(sizes[sizeIndex] || defaultSize, horizontalOffset)
-  )
+  const resp = _responsive(media, $size, (sizeIndex) => fontSize(sizes[sizeIndex] || defaultSize))
 
   return [base, ...resp]
 }
 
-export function fontSize(size: ThemeFontSize, horizontalOffset?: number): CSSObject {
+export function fontSize(size: ThemeFontSize): CSSObject {
   const {ascenderHeight, descenderHeight, fontSize, iconSize, letterSpacing, lineHeight} = size
   const negHeight = ascenderHeight + descenderHeight
   const capHeight = lineHeight - negHeight
@@ -77,32 +75,14 @@ export function fontSize(size: ThemeFontSize, horizontalOffset?: number): CSSObj
       marginBottom: '-1px',
     },
 
-    '& > code, & > span': {
-      margin: horizontalOffset ? `0 calc(${rem(0 - horizontalOffset * fontSize)} - 1px)` : '0 -1px',
-    },
-
     '& svg:not([data-sanity-icon])': {
       fontSize: `calc(${customIconSize} / 16 * 1rem)`,
-      margin: [
-        // top & bottom
-        rem(customIconOffset),
-        // left & right
-        horizontalOffset
-          ? `calc(${rem(customIconOffset)} + ${rem(horizontalOffset * fontSize)})`
-          : rem(customIconOffset),
-      ].join(' '),
+      margin: rem(customIconOffset),
     },
 
     '& [data-sanity-icon]': {
       fontSize: `calc(${iconSize} / 16 * 1rem)`,
-      margin: [
-        // top & bottom
-        rem(iconOffset),
-        // left & right
-        horizontalOffset
-          ? `calc(${rem(iconOffset)} + ${rem(horizontalOffset * fontSize)})`
-          : rem(iconOffset),
-      ].join(' '),
+      margin: rem(iconOffset),
     },
   }
 }

package/src/styles/font/textAlignStyle.ts

@@ -1,5 +1,5 @@
 import {CSSObject} from 'styled-components'
-import {getResponsiveProp, responsive} from '../helpers'
+import {_responsive} from '../helpers'
 import {ThemeProps} from '../types'
 import {ResponsiveTextAlignStyleProps} from './types'
 
@@ -12,7 +12,7 @@ export function responsiveTextAlignStyle(
 ): CSSObject[] {
   const {theme} = props
 
-  return responsive(theme.sanity.media, getResponsiveProp(props.$align), (textAlign) => {
+  return _responsive(theme.sanity.media, props.$align, (textAlign) => {
     return {textAlign}
   })
 }

package/src/styles/font/types.ts

@@ -5,7 +5,7 @@ import {TextAlign} from '../../types'
  * @internal
  */
 export interface ResponsiveFontSizeStyleProps {
-  $size?: number | number[]
+  $size: number[]
 }
 
 /**
@@ -19,7 +19,7 @@ export interface FontWeightStyleProps {
  * @internal
  */
 export interface ResponsiveTextAlignStyleProps {
-  $align?: TextAlign | TextAlign[]
+  $align: TextAlign[]
 }
 
 /**
@@ -27,7 +27,8 @@ export interface ResponsiveTextAlignStyleProps {
  */
 export interface ResponsiveFontStyleProps
   extends FontWeightStyleProps,
-    ResponsiveFontSizeStyleProps {
+    ResponsiveFontSizeStyleProps,
+    ResponsiveTextAlignStyleProps {
   $accent?: boolean
   $muted?: boolean
 }

package/src/styles/grid/gridItemStyle.ts

@@ -1,5 +1,5 @@
 import {CSSObject} from 'styled-components'
-import {getResponsiveProp, responsive} from '../helpers'
+import {_responsive} from '../helpers'
 import {ThemeProps} from '../types'
 import {ResponsiveGridItemStyleProps} from './types'
 
@@ -30,7 +30,7 @@ function responsiveGridItemRowStyle(props: ResponsiveGridItemStyleProps & ThemeP
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$row), (row) => {
+  return _responsive(media, props.$row, (row) => {
     if (typeof row === 'number') {
       return {gridRow: `span ${row} / span ${row}`}
     }
@@ -43,7 +43,7 @@ function responsiveGridItemRowStartStyle(props: ResponsiveGridItemStyleProps & T
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$rowStart), (rowStart) => ({
+  return _responsive(media, props.$rowStart, (rowStart) => ({
     gridRowStart: rowStart,
   }))
 }
@@ -52,14 +52,14 @@ function responsiveGridItemRowEndStyle(props: ResponsiveGridItemStyleProps & The
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$rowEnd), (rowEnd) => ({gridRowEnd: rowEnd}))
+  return _responsive(media, props.$rowEnd, (rowEnd) => ({gridRowEnd: rowEnd}))
 }
 
 function responsiveGridItemColumnStyle(props: ResponsiveGridItemStyleProps & ThemeProps) {
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$column), (column) => {
+  return _responsive(media, props.$column, (column) => {
     if (typeof column === 'number') {
       return {gridColumn: `span ${column} / span ${column}`}
     }
@@ -72,7 +72,7 @@ function responsiveGridItemColumnStartStyle(props: ResponsiveGridItemStyleProps
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$columnStart), (columnStart) => ({
+  return _responsive(media, props.$columnStart, (columnStart) => ({
     gridColumnStart: columnStart,
   }))
 }
@@ -81,7 +81,7 @@ function responsiveGridItemColumnEndStyle(props: ResponsiveGridItemStyleProps &
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$columnEnd), (columnEnd) => ({
+  return _responsive(media, props.$columnEnd, (columnEnd) => ({
     gridColumnEnd: columnEnd,
   }))
 }

package/src/styles/grid/gridStyle.ts

@@ -1,5 +1,5 @@
 import {CSSObject} from 'styled-components'
-import {getResponsiveProp, rem, responsive} from '../helpers'
+import {rem, _responsive} from '../helpers'
 import {ThemeProps} from '../types'
 import {ResponsiveGridStyleProps} from './types'
 
@@ -46,7 +46,7 @@ function responsiveGridAutoFlowStyle(props: ResponsiveGridStyleProps & ThemeProp
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$autoFlow), (autoFlow) => ({
+  return _responsive(media, props.$autoFlow, (autoFlow) => ({
     gridAutoFlow: autoFlow,
   }))
 }
@@ -55,7 +55,7 @@ function responsiveGridAutoRowsStyle(props: ResponsiveGridStyleProps & ThemeProp
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$autoRows), (autoRows) => ({
+  return _responsive(media, props.$autoRows, (autoRows) => ({
     gridAutoRows: autoRows && GRID_AUTO_ROWS[autoRows],
   }))
 }
@@ -64,7 +64,7 @@ function responsiveGridAutoColsStyle(props: ResponsiveGridStyleProps & ThemeProp
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$autoCols), (autoCols) => ({
+  return _responsive(media, props.$autoCols, (autoCols) => ({
     gridAutoColumns: autoCols && GRID_AUTO_COLUMS[autoCols],
   }))
 }
@@ -73,7 +73,7 @@ function responsiveGridColumnsStyle(props: ResponsiveGridStyleProps & ThemeProps
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$columns), (columns) => ({
+  return _responsive(media, props.$columns, (columns) => ({
     gridTemplateColumns: columns && `repeat(${columns},minmax(0,1fr));`,
   }))
 }
@@ -82,7 +82,7 @@ function responsiveGridRowsStyle(props: ResponsiveGridStyleProps & ThemeProps) {
   const {theme} = props
   const {media} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$rows), (rows) => ({
+  return _responsive(media, props.$rows, (rows) => ({
     gridTemplateRows: rows && `repeat(${rows},minmax(0,1fr));`,
   }))
 }
@@ -91,7 +91,7 @@ function responsiveGridGapStyle(props: ResponsiveGridStyleProps & ThemeProps) {
   const {theme} = props
   const {media, space} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$gap), (gap) => ({
+  return _responsive(media, props.$gap, (gap) => ({
     gridGap: gap ? rem(space[gap]) : undefined,
   }))
 }
@@ -100,7 +100,7 @@ function responsiveGridGapXStyle(props: ResponsiveGridStyleProps & ThemeProps) {
   const {theme} = props
   const {media, space} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$gapX), (gapX) => ({
+  return _responsive(media, props.$gapX, (gapX) => ({
     columnGap: gapX ? rem(space[gapX]) : undefined,
   }))
 }
@@ -109,7 +109,7 @@ function responsiveGridGapYStyle(props: ResponsiveGridStyleProps & ThemeProps) {
   const {theme} = props
   const {media, space} = theme.sanity
 
-  return responsive(media, getResponsiveProp(props.$gapY), (gapY) => ({
+  return _responsive(media, props.$gapY, (gapY) => ({
     rowGap: gapY ? rem(space[gapY]) : undefined,
   }))
 }

package/src/styles/grid/types.ts

@@ -14,24 +14,24 @@ import {
  * @internal
  */
 export interface ResponsiveGridStyleProps {
-  $autoRows?: GridAutoRows | GridAutoRows[]
-  $autoCols?: GridAutoCols | GridAutoCols[]
-  $autoFlow?: GridAutoFlow | GridAutoFlow[]
-  $columns?: number | number[]
-  $gap?: number | number[]
-  $gapX?: number | number[]
-  $gapY?: number | number[]
-  $rows?: number | number[]
+  $autoRows: GridAutoRows[]
+  $autoCols: GridAutoCols[]
+  $autoFlow: GridAutoFlow[]
+  $columns: number[]
+  $gap: number[]
+  $gapX: number[]
+  $gapY: number[]
+  $rows: number[]
 }
 
 /**
  * @internal
  */
 export interface ResponsiveGridItemStyleProps {
-  $column?: GridItemColumn | GridItemColumn[]
-  $columnStart?: GridItemColumnStart | GridItemColumnStart[]
-  $columnEnd?: GridItemColumnEnd | GridItemColumnEnd[]
-  $row?: GridItemRow | GridItemRow[]
-  $rowStart?: GridItemRowStart | GridItemRowStart[]
-  $rowEnd?: GridItemRowEnd | GridItemRowEnd[]
+  $column: GridItemColumn[]
+  $columnStart: GridItemColumnStart[]
+  $columnEnd: GridItemColumnEnd[]
+  $row: GridItemRow[]
+  $rowStart: GridItemRowStart[]
+  $rowEnd: GridItemRowEnd[]
 }

package/src/styles/helpers.ts

@@ -5,11 +5,11 @@ import {Theme} from '../theme'
 /**
  * @internal
  */
-export function fillCSSObject(propKeys: string[], value: unknown): CSSObject {
-  return propKeys.reduce((obj: CSSObject, propKey) => {
-    obj[propKey] = value as any
+export function _fillCSSObject(keys: string[], value: string | number | CSSObject): CSSObject {
+  return keys.reduce<CSSObject>((style, key) => {
+    style[key] = value
 
-    return obj
+    return style
   }, {})
 }
 
@@ -25,7 +25,7 @@ export function rem(pixelValue: number): string | 0 {
 /**
  * @internal
  */
-export function responsive<T>(
+export function _responsive<T>(
   media: number[],
   values: T[],
   callback: (value: T, index: number, array: T[]) => CSSObject
@@ -42,7 +42,7 @@ export function responsive<T>(
 /**
  * @internal
  */
-export function getResponsiveProp<T = number>(val: T | T[] | undefined, defaultVal?: T[]): T[] {
+export function _getArrayProp<T = number>(val: T | T[] | undefined, defaultVal?: T[]): T[] {
   if (val === undefined) return defaultVal || EMPTY_ARRAY
 
   return Array.isArray(val) ? val : [val]
@@ -51,7 +51,7 @@ export function getResponsiveProp<T = number>(val: T | T[] | undefined, defaultV
 /**
  * @internal
  */
-export function getResponsiveSpace(
+export function _getResponsiveSpace(
   theme: Theme,
   props: string[],
   spaceIndexes: number[] = EMPTY_ARRAY
@@ -64,7 +64,7 @@ export function getResponsiveSpace(
     return null
   }
 
-  return responsive(theme.sanity.media, spaceIndexes, (spaceIndex) =>
-    fillCSSObject(props, rem(theme.sanity.space[spaceIndex]))
+  return _responsive(theme.sanity.media, spaceIndexes, (spaceIndex) =>
+    _fillCSSObject(props, rem(theme.sanity.space[spaceIndex]))
   )
 }

package/src/styles/input/responsiveInputPaddingStyle.ts

@@ -1,44 +1,41 @@
 import {CSSObject} from 'styled-components'
-import {getResponsiveProp, rem, responsive} from '../helpers'
+import {rem, _responsive} from '../helpers'
 import {ThemeProps} from '../types'
 
 export interface TextInputResponsivePaddingStyleProps {
-  $fontSize?: number | number[]
+  $fontSize: number[]
   $iconLeft?: boolean
   $iconRight?: boolean
-  $padding?: number | number[]
-  $space?: number | number[]
+  $padding: number[]
+  $space: number[]
 }
 
 export function responsiveInputPaddingStyle(
   props: TextInputResponsivePaddingStyleProps & ThemeProps
 ): CSSObject[] {
-  const {$iconLeft, $iconRight, theme} = props
+  const {$fontSize, $iconLeft, $iconRight, $padding, $space, theme} = props
   const {fonts, media, space: spaceScale} = theme.sanity
-  const padding = getResponsiveProp(props.$padding, [0])
-  const space = getResponsiveProp(props.$space, [0])
-  const size = getResponsiveProp(props.$fontSize, [0])
-  const len = Math.max(padding.length, space.length, size.length)
+  const len = Math.max($padding.length, $space.length, $fontSize.length)
   const _padding: number[] = []
   const _space: number[] = []
-  const _size: number[] = []
+  const _fontSize: number[] = []
 
   for (let i = 0; i < len; i += 1) {
-    _padding[i] = padding[i] === undefined ? _padding[i - 1] : padding[i]
-    _space[i] = space[i] === undefined ? _space[i - 1] : space[i]
-    _size[i] = size[i] === undefined ? _size[i - 1] : size[i]
+    _fontSize[i] = $fontSize[i] === undefined ? _fontSize[i - 1] : $fontSize[i]
+    _padding[i] = $padding[i] === undefined ? _padding[i - 1] : $padding[i]
+    _space[i] = $space[i] === undefined ? _space[i - 1] : $space[i]
   }
 
-  return responsive(media, _padding, (_, i) => {
-    const fontSize = fonts.text.sizes[_size[i]] || fonts.text.sizes[2]
-    const emSize = fontSize.lineHeight - fontSize.ascenderHeight - fontSize.descenderHeight
+  return _responsive(media, _padding, (_, i) => {
+    const size = fonts.text.sizes[_fontSize[i]] || fonts.text.sizes[2]
+    const emSize = size.lineHeight - size.ascenderHeight - size.descenderHeight
     const p = spaceScale[_padding[i]]
     const s = spaceScale[_space[i]]
 
     const styles = {
-      paddingTop: rem(p - fontSize.ascenderHeight),
+      paddingTop: rem(p - size.ascenderHeight),
       paddingRight: rem(p),
-      paddingBottom: rem(p - fontSize.descenderHeight),
+      paddingBottom: rem(p - size.descenderHeight),
       paddingLeft: rem(p),
     }
 
@@ -51,9 +48,9 @@ export function responsiveInputPaddingStyle(
 
 export function responsiveInputPaddingIconsStyle(
   props: {
-    padding?: number | number[]
-    size?: number | number[]
-    space?: number | number[]
+    $fontSize: number[]
+    $padding: number[]
+    $space: number[]
   } & ThemeProps
 ): CSSObject[] {
   return responsiveInputPaddingStyle({...props, $iconLeft: true, $iconRight: true})
@@ -61,9 +58,9 @@ export function responsiveInputPaddingIconsStyle(
 
 export function responsiveInputPaddingIconLeftStyle(
   props: {
-    padding?: number | number[]
-    size?: number | number[]
-    space?: number | number[]
+    $fontSize: number[]
+    $padding: number[]
+    $space: number[]
   } & ThemeProps
 ): CSSObject[] {
   return responsiveInputPaddingStyle({...props, $iconLeft: true})
@@ -71,9 +68,9 @@ export function responsiveInputPaddingIconLeftStyle(
 
 export function responsiveInputPaddingIconRightStyle(
   props: {
-    padding?: number | number[]
-    size?: number | number[]
-    space?: number | number[]
+    $fontSize: number[]
+    $padding: number[]
+    $space: number[]
   } & ThemeProps
 ): CSSObject[] {
   return responsiveInputPaddingStyle({...props, $iconRight: true})