Skip to content

Conversation

devongovett
Copy link
Member

@devongovett devongovett commented Oct 5, 2022

Updates all global theme colors to v6. This was scripted based on the latest @spectrum-css/vars package (v8), mapping their updated variable names to our old ones.

Known differences between what's implemented here and what's in the XD files, because the XD files have not been updated to the new token system yet:

  • TextField, Picker, ActionButton, and other field component borders are darker.
  • TextField and other field invalid state border colors are different
  • ProgressBar and Meter colors are different from the XD files
  • Tabs emphasized color does not meet contrast in XD and will be updated.

@adobe-bot
Copy link

@adobe-bot
Copy link

@adobe-bot
Copy link

@adobe-bot
Copy link

@adobe-bot
Copy link

@devongovett devongovett marked this pull request as ready for review October 19, 2022 21:23
@adobe-bot
Copy link

@adobe-bot
Copy link

@devongovett
Copy link
Member Author

To do: fix syntax highlighting in docs, especially in dark mode.

@adobe-bot
Copy link

@adobe-bot
Copy link

dannify
dannify previously approved these changes Oct 25, 2022
snowystinger
snowystinger previously approved these changes Oct 26, 2022
@devongovett devongovett dismissed stale reviews from snowystinger and dannify via 422c973 October 27, 2022 20:15
@adobe-bot
Copy link

@adobe-bot
Copy link

API Changes

undefined already in set

@react-spectrum/utils

viewStyleProps

-convertStyleProps {
-  props: ViewStyleProps
-  handlers: StyleHandlers
-  direction: Direction
-  matchedBreakpoints: Array<Breakpoint>
-  returnVal: undefined
-}
+

useMatchedBreakpoints

-
+convertStyleProps<C extends ColorVersion> {
+  props: ViewStyleProps<C>
+  handlers: StyleHandlers
+  direction: Direction
+  matchedBreakpoints: Array<Breakpoint>
+  returnVal: undefined
+}

@react-spectrum/view

View

-View {
-  UNSAFE_className?: string
-  UNSAFE_style?: CSSProperties
-  alignSelf?: Responsive<'auto' | 'normal' | 'start' | 'end' | 'center' | 'flex-start' | 'flex-end' | 'self-start' | 'self-end' | 'stretch'>
-  backgroundColor?: Responsive<BackgroundColorValue>
-  borderBottomColor?: Responsive<BorderColorValue>
-  borderBottomEndRadius?: Responsive<BorderRadiusValue>
-  borderBottomStartRadius?: Responsive<BorderRadiusValue>
-  borderBottomWidth?: Responsive<BorderSizeValue>
-  borderColor?: Responsive<BorderColorValue>
-  borderEndColor?: Responsive<BorderColorValue>
-  borderEndWidth?: Responsive<BorderSizeValue>
-  borderRadius?: Responsive<BorderRadiusValue>
-  borderStartColor?: Responsive<BorderColorValue>
-  borderStartWidth?: Responsive<BorderSizeValue>
-  borderTopColor?: Responsive<BorderColorValue>
-  borderTopEndRadius?: Responsive<BorderRadiusValue>
-  borderTopStartRadius?: Responsive<BorderRadiusValue>
-  borderTopWidth?: Responsive<BorderSizeValue>
-  borderWidth?: Responsive<BorderSizeValue>
-  borderXColor?: Responsive<BorderColorValue>
-  borderXWidth?: Responsive<BorderSizeValue>
-  borderYColor?: Responsive<BorderColorValue>
-  borderYWidth?: Responsive<BorderSizeValue>
-  bottom?: Responsive<DimensionValue>
-  children?: ReactNode
-  elementType?: string | JSXElementConstructor<any>
-  end?: Responsive<DimensionValue>
-  flex?: Responsive<string | number | boolean>
-  flexBasis?: Responsive<number | string>
-  flexGrow?: Responsive<number>
-  flexShrink?: Responsive<number>
-  gridArea?: Responsive<string>
-  gridColumn?: Responsive<string>
-  gridColumnEnd?: Responsive<string>
-  gridColumnStart?: Responsive<string>
-  gridRow?: Responsive<string>
-  gridRowEnd?: Responsive<string>
-  gridRowStart?: Responsive<string>
-  height?: Responsive<DimensionValue>
-  id?: string
-  isHidden?: Responsive<boolean>
-  justifySelf?: Responsive<'auto' | 'normal' | 'start' | 'end' | 'flex-start' | 'flex-end' | 'self-start' | 'self-end' | 'center' | 'left' | 'right' | 'stretch'>
-  left?: Responsive<DimensionValue>
-  margin?: Responsive<DimensionValue>
-  marginBottom?: Responsive<DimensionValue>
-  marginEnd?: Responsive<DimensionValue>
-  marginStart?: Responsive<DimensionValue>
-  marginTop?: Responsive<DimensionValue>
-  marginX?: Responsive<DimensionValue>
-  marginY?: Responsive<DimensionValue>
-  maxHeight?: Responsive<DimensionValue>
-  maxWidth?: Responsive<DimensionValue>
-  minHeight?: Responsive<DimensionValue>
-  minWidth?: Responsive<DimensionValue>
-  order?: Responsive<number>
-  overflow?: Responsive<string>
-  padding?: Responsive<DimensionValue>
-  paddingBottom?: Responsive<DimensionValue>
-  paddingEnd?: Responsive<DimensionValue>
-  paddingStart?: Responsive<DimensionValue>
-  paddingTop?: Responsive<DimensionValue>
-  paddingX?: Responsive<DimensionValue>
-  paddingY?: Responsive<DimensionValue>
-  position?: Responsive<'static' | 'relative' | 'absolute' | 'fixed' | 'sticky'>
-  right?: Responsive<DimensionValue>
-  start?: Responsive<DimensionValue>
-  top?: Responsive<DimensionValue>
-  width?: Responsive<DimensionValue>
-  zIndex?: Responsive<number>
-}
+

ViewProps

-ViewProps {
-  UNSAFE_className?: string
-  UNSAFE_style?: CSSProperties
-  alignSelf?: Responsive<'auto' | 'normal' | 'start' | 'end' | 'center' | 'flex-start' | 'flex-end' | 'self-start' | 'self-end' | 'stretch'>
-  backgroundColor?: Responsive<BackgroundColorValue>
-  borderBottomColor?: Responsive<BorderColorValue>
-  borderBottomEndRadius?: Responsive<BorderRadiusValue>
-  borderBottomStartRadius?: Responsive<BorderRadiusValue>
-  borderBottomWidth?: Responsive<BorderSizeValue>
-  borderColor?: Responsive<BorderColorValue>
-  borderEndColor?: Responsive<BorderColorValue>
-  borderEndWidth?: Responsive<BorderSizeValue>
-  borderRadius?: Responsive<BorderRadiusValue>
-  borderStartColor?: Responsive<BorderColorValue>
-  borderStartWidth?: Responsive<BorderSizeValue>
-  borderTopColor?: Responsive<BorderColorValue>
-  borderTopEndRadius?: Responsive<BorderRadiusValue>
-  borderTopStartRadius?: Responsive<BorderRadiusValue>
-  borderTopWidth?: Responsive<BorderSizeValue>
-  borderWidth?: Responsive<BorderSizeValue>
-  borderXColor?: Responsive<BorderColorValue>
-  borderXWidth?: Responsive<BorderSizeValue>
-  borderYColor?: Responsive<BorderColorValue>
-  borderYWidth?: Responsive<BorderSizeValue>
-  bottom?: Responsive<DimensionValue>
-  children?: ReactNode
-  elementType?: string | JSXElementConstructor<any>
-  end?: Responsive<DimensionValue>
-  flex?: Responsive<string | number | boolean>
-  flexBasis?: Responsive<number | string>
-  flexGrow?: Responsive<number>
-  flexShrink?: Responsive<number>
-  gridArea?: Responsive<string>
-  gridColumn?: Responsive<string>
-  gridColumnEnd?: Responsive<string>
-  gridColumnStart?: Responsive<string>
-  gridRow?: Responsive<string>
-  gridRowEnd?: Responsive<string>
-  gridRowStart?: Responsive<string>
-  height?: Responsive<DimensionValue>
-  id?: string
-  isHidden?: Responsive<boolean>
-  justifySelf?: Responsive<'auto' | 'normal' | 'start' | 'end' | 'flex-start' | 'flex-end' | 'self-start' | 'self-end' | 'center' | 'left' | 'right' | 'stretch'>
-  left?: Responsive<DimensionValue>
-  margin?: Responsive<DimensionValue>
-  marginBottom?: Responsive<DimensionValue>
-  marginEnd?: Responsive<DimensionValue>
-  marginStart?: Responsive<DimensionValue>
-  marginTop?: Responsive<DimensionValue>
-  marginX?: Responsive<DimensionValue>
-  marginY?: Responsive<DimensionValue>
-  maxHeight?: Responsive<DimensionValue>
-  maxWidth?: Responsive<DimensionValue>
-  minHeight?: Responsive<DimensionValue>
-  minWidth?: Responsive<DimensionValue>
-  order?: Responsive<number>
-  overflow?: Responsive<string>
-  padding?: Responsive<DimensionValue>
-  paddingBottom?: Responsive<DimensionValue>
-  paddingEnd?: Responsive<DimensionValue>
-  paddingStart?: Responsive<DimensionValue>
-  paddingTop?: Responsive<DimensionValue>
-  paddingX?: Responsive<DimensionValue>
-  paddingY?: Responsive<DimensionValue>
-  position?: Responsive<'static' | 'relative' | 'absolute' | 'fixed' | 'sticky'>
-  right?: Responsive<DimensionValue>
-  start?: Responsive<DimensionValue>
-  top?: Responsive<DimensionValue>
-  width?: Responsive<DimensionValue>
-  zIndex?: Responsive<number>
-}
+

undefined

-
+View<C extends ColorVersion> {
+  UNSAFE_className?: string
+  UNSAFE_style?: CSSProperties
+  alignSelf?: Responsive<'auto' | 'normal' | 'start' | 'end' | 'center' | 'flex-start' | 'flex-end' | 'self-start' | 'self-end' | 'stretch'>
+  backgroundColor?: Responsive<BackgroundColor[ColorVersion]>
+  borderBottomColor?: Responsive<BorderColor[ColorVersion]>
+  borderBottomEndRadius?: Responsive<BorderRadiusValue>
+  borderBottomStartRadius?: Responsive<BorderRadiusValue>
+  borderBottomWidth?: Responsive<BorderSizeValue>
+  borderColor?: Responsive<BorderColor[ColorVersion]>
+  borderEndColor?: Responsive<BorderColor[ColorVersion]>
+  borderEndWidth?: Responsive<BorderSizeValue>
+  borderRadius?: Responsive<BorderRadiusValue>
+  borderStartColor?: Responsive<BorderColor[ColorVersion]>
+  borderStartWidth?: Responsive<BorderSizeValue>
+  borderTopColor?: Responsive<BorderColor[ColorVersion]>
+  borderTopEndRadius?: Responsive<BorderRadiusValue>
+  borderTopStartRadius?: Responsive<BorderRadiusValue>
+  borderTopWidth?: Responsive<BorderSizeValue>
+  borderWidth?: Responsive<BorderSizeValue>
+  borderXColor?: Responsive<BorderColor[ColorVersion]>
+  borderXWidth?: Responsive<BorderSizeValue>
+  borderYColor?: Responsive<BorderColor[ColorVersion]>
+  borderYWidth?: Responsive<BorderSizeValue>
+  bottom?: Responsive<DimensionValue>
+  children?: ReactNode
+  colorVersion?: ColorVersion = 5
+  elementType?: string | JSXElementConstructor<any>
+  end?: Responsive<DimensionValue>
+  flex?: Responsive<string | number | boolean>
+  flexBasis?: Responsive<number | string>
+  flexGrow?: Responsive<number>
+  flexShrink?: Responsive<number>
+  gridArea?: Responsive<string>
+  gridColumn?: Responsive<string>
+  gridColumnEnd?: Responsive<string>
+  gridColumnStart?: Responsive<string>
+  gridRow?: Responsive<string>
+  gridRowEnd?: Responsive<string>
+  gridRowStart?: Responsive<string>
+  height?: Responsive<DimensionValue>
+  id?: string
+  isHidden?: Responsive<boolean>
+  justifySelf?: Responsive<'auto' | 'normal' | 'start' | 'end' | 'flex-start' | 'flex-end' | 'self-start' | 'self-end' | 'center' | 'left' | 'right' | 'stretch'>
+  left?: Responsive<DimensionValue>
+  margin?: Responsive<DimensionValue>
+  marginBottom?: Responsive<DimensionValue>
+  marginEnd?: Responsive<DimensionValue>
+  marginStart?: Responsive<DimensionValue>
+  marginTop?: Responsive<DimensionValue>
+  marginX?: Responsive<DimensionValue>
+  marginY?: Responsive<DimensionValue>
+  maxHeight?: Responsive<DimensionValue>
+  maxWidth?: Responsive<DimensionValue>
+  minHeight?: Responsive<DimensionValue>
+  minWidth?: Responsive<DimensionValue>
+  order?: Responsive<number>
+  overflow?: Responsive<string>
+  padding?: Responsive<DimensionValue>
+  paddingBottom?: Responsive<DimensionValue>
+  paddingEnd?: Responsive<DimensionValue>
+  paddingStart?: Responsive<DimensionValue>
+  paddingTop?: Responsive<DimensionValue>
+  paddingX?: Responsive<DimensionValue>
+  paddingY?: Responsive<DimensionValue>
+  position?: Responsive<'static' | 'relative' | 'absolute' | 'fixed' | 'sticky'>
+  right?: Responsive<DimensionValue>
+  start?: Responsive<DimensionValue>
+  top?: Responsive<DimensionValue>
+  width?: Responsive<DimensionValue>
+  zIndex?: Responsive<number>
+}

undefined

-
+ViewProps<C extends ColorVersion> {
+  UNSAFE_className?: string
+  UNSAFE_style?: CSSProperties
+  alignSelf?: Responsive<'auto' | 'normal' | 'start' | 'end' | 'center' | 'flex-start' | 'flex-end' | 'self-start' | 'self-end' | 'stretch'>
+  backgroundColor?: Responsive<BackgroundColor[ColorVersion]>
+  borderBottomColor?: Responsive<BorderColor[ColorVersion]>
+  borderBottomEndRadius?: Responsive<BorderRadiusValue>
+  borderBottomStartRadius?: Responsive<BorderRadiusValue>
+  borderBottomWidth?: Responsive<BorderSizeValue>
+  borderColor?: Responsive<BorderColor[ColorVersion]>
+  borderEndColor?: Responsive<BorderColor[ColorVersion]>
+  borderEndWidth?: Responsive<BorderSizeValue>
+  borderRadius?: Responsive<BorderRadiusValue>
+  borderStartColor?: Responsive<BorderColor[ColorVersion]>
+  borderStartWidth?: Responsive<BorderSizeValue>
+  borderTopColor?: Responsive<BorderColor[ColorVersion]>
+  borderTopEndRadius?: Responsive<BorderRadiusValue>
+  borderTopStartRadius?: Responsive<BorderRadiusValue>
+  borderTopWidth?: Responsive<BorderSizeValue>
+  borderWidth?: Responsive<BorderSizeValue>
+  borderXColor?: Responsive<BorderColor[ColorVersion]>
+  borderXWidth?: Responsive<BorderSizeValue>
+  borderYColor?: Responsive<BorderColor[ColorVersion]>
+  borderYWidth?: Responsive<BorderSizeValue>
+  bottom?: Responsive<DimensionValue>
+  children?: ReactNode
+  colorVersion?: ColorVersion = 5
+  elementType?: string | JSXElementConstructor<any>
+  end?: Responsive<DimensionValue>
+  flex?: Responsive<string | number | boolean>
+  flexBasis?: Responsive<number | string>
+  flexGrow?: Responsive<number>
+  flexShrink?: Responsive<number>
+  gridArea?: Responsive<string>
+  gridColumn?: Responsive<string>
+  gridColumnEnd?: Responsive<string>
+  gridColumnStart?: Responsive<string>
+  gridRow?: Responsive<string>
+  gridRowEnd?: Responsive<string>
+  gridRowStart?: Responsive<string>
+  height?: Responsive<DimensionValue>
+  id?: string
+  isHidden?: Responsive<boolean>
+  justifySelf?: Responsive<'auto' | 'normal' | 'start' | 'end' | 'flex-start' | 'flex-end' | 'self-start' | 'self-end' | 'center' | 'left' | 'right' | 'stretch'>
+  left?: Responsive<DimensionValue>
+  margin?: Responsive<DimensionValue>
+  marginBottom?: Responsive<DimensionValue>
+  marginEnd?: Responsive<DimensionValue>
+  marginStart?: Responsive<DimensionValue>
+  marginTop?: Responsive<DimensionValue>
+  marginX?: Responsive<DimensionValue>
+  marginY?: Responsive<DimensionValue>
+  maxHeight?: Responsive<DimensionValue>
+  maxWidth?: Responsive<DimensionValue>
+  minHeight?: Responsive<DimensionValue>
+  minWidth?: Responsive<DimensionValue>
+  order?: Responsive<number>
+  overflow?: Responsive<string>
+  padding?: Responsive<DimensionValue>
+  paddingBottom?: Responsive<DimensionValue>
+  paddingEnd?: Responsive<DimensionValue>
+  paddingStart?: Responsive<DimensionValue>
+  paddingTop?: Responsive<DimensionValue>
+  paddingX?: Responsive<DimensionValue>
+  paddingY?: Responsive<DimensionValue>
+  position?: Responsive<'static' | 'relative' | 'absolute' | 'fixed' | 'sticky'>
+  right?: Responsive<DimensionValue>
+  start?: Responsive<DimensionValue>
+  top?: Responsive<DimensionValue>
+  width?: Responsive<DimensionValue>
+  zIndex?: Responsive<number>
+}

@devongovett devongovett merged commit c604e69 into main Oct 27, 2022
@devongovett devongovett deleted the spectrum-color-v6 branch October 27, 2022 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants