Merge pull request #1811 from system-ui/autofill-input-bg

system-ui · Jun 12, 2021 · aeb44b8 · aeb44b8 · vercel · Jun 12, 2021
2 parents 3374dff + f4482c1
commit aeb44b8
Show file tree

Hide file tree

Showing 9 changed files with 178 additions and 31 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -11,5 +11,6 @@ module.exports = {
   rules: {
     'no-use-before-define': 'off',
     'react/react-in-jsx-scope': 'off',
+    '@typescript-eslint/no-redeclare': 'off',
   },
 }
diff --git a/packages/color-modes/src/index.tsx b/packages/color-modes/src/index.tsx
@@ -146,7 +146,7 @@ export function useColorMode<T extends string = string>(): [
   }
 
   // We're allowing the user to specify a narrower type for its color mode name.
-  return ([colorMode, setColorMode] as unknown) as [
+  return [colorMode, setColorMode] as unknown as [
     T,
     Dispatch<SetStateAction<T>>
   ]

diff --git a/packages/components/src/Input.js b/packages/components/src/Input.js
@@ -1,26 +1,52 @@
 import React from 'react'
 import Box from './Box'
 
-export const Input = React.forwardRef(function Input(props, ref) {
+import { get } from '@theme-ui/css'
+
+/** @type {import('theme-ui').ThemeUIStyleObject} */
+const autofillStyles = {
+  boxShadow: 'inset 0 0 0 1000px var(--theme-ui-input-autofill-bg)',
+  fontSize: 'inherit',
+  ':first-line': {
+    fontSize: '1rem',
+  },
+}
+
+/** @type {import('theme-ui').ThemeUIStyleObject} */
+const defaultInputStyles = {
+  display: 'block',
+  width: '100%',
+  p: 2,
+  appearance: 'none',
+  fontSize: 'inherit',
+  lineHeight: 'inherit',
+  border: '1px solid',
+  borderRadius: 4,
+  color: 'inherit',
+  bg: 'transparent',
+
+  ':autofill, :autofill:hover, :autofill:focus': autofillStyles,
+  ':-webkit-autofill, :-webkit-autofill:hover, :-webkit-autofill:focus':
+    autofillStyles,
+}
+
+export const Input = React.forwardRef(function Input(
+  { sx, autofillBackgroundColor = 'background', ...rest },
+  ref
+) {
   return (
     <Box
       ref={ref}
       as="input"
       variant="input"
-      {...props}
-      __themeKey="forms"
-      __css={{
-        display: 'block',
-        width: '100%',
-        p: 2,
-        appearance: 'none',
-        fontSize: 'inherit',
-        lineHeight: 'inherit',
-        border: '1px solid',
-        borderRadius: 4,
-        color: 'inherit',
-        bg: 'transparent',
+      sx={{
+        '--theme-ui-input-autofill-bg': (theme) =>
+          get(theme.colors, autofillBackgroundColor, null),
+        ...sx,
       }}
+      {...rest}
+      __themeKey="forms"
+      __css={defaultInputStyles}
     />
   )
 })
diff --git a/packages/components/test/__snapshots__/index.js.snap b/packages/components/test/__snapshots__/index.js.snap
@@ -617,6 +617,32 @@ exports[`Field renders 1`] = `
   background-color: transparent;
 }
 
+.emotion-2:autofill,
+.emotion-2:autofill:hover,
+.emotion-2:autofill:focus {
+  box-shadow: inset 0 0 0 1000px var(--theme-ui-input-autofill-bg);
+  font-size: inherit;
+}
+
+.emotion-2:autofill:first-line,
+.emotion-2:autofill:hover:first-line,
+.emotion-2:autofill:focus:first-line {
+  font-size: 1rem;
+}
+
+.emotion-2:-webkit-autofill,
+.emotion-2:-webkit-autofill:hover,
+.emotion-2:-webkit-autofill:focus {
+  box-shadow: inset 0 0 0 1000px var(--theme-ui-input-autofill-bg);
+  font-size: inherit;
+}
+
+.emotion-2:-webkit-autofill:first-line,
+.emotion-2:-webkit-autofill:hover:first-line,
+.emotion-2:-webkit-autofill:focus:first-line {
+  font-size: 1rem;
+}
+
 <div
   className="emotion-0"
 >
@@ -666,6 +692,32 @@ exports[`Field renders with id prop 1`] = `
   background-color: transparent;
 }
 
+.emotion-2:autofill,
+.emotion-2:autofill:hover,
+.emotion-2:autofill:focus {
+  box-shadow: inset 0 0 0 1000px var(--theme-ui-input-autofill-bg);
+  font-size: inherit;
+}
+
+.emotion-2:autofill:first-line,
+.emotion-2:autofill:hover:first-line,
+.emotion-2:autofill:focus:first-line {
+  font-size: 1rem;
+}
+
+.emotion-2:-webkit-autofill,
+.emotion-2:-webkit-autofill:hover,
+.emotion-2:-webkit-autofill:focus {
+  box-shadow: inset 0 0 0 1000px var(--theme-ui-input-autofill-bg);
+  font-size: inherit;
+}
+
+.emotion-2:-webkit-autofill:first-line,
+.emotion-2:-webkit-autofill:hover:first-line,
+.emotion-2:-webkit-autofill:focus:first-line {
+  font-size: 1rem;
+}
+
 <div
   className="emotion-0"
 >
@@ -947,6 +999,32 @@ exports[`Input renders 1`] = `
   background-color: transparent;
 }
 
+.emotion-0:autofill,
+.emotion-0:autofill:hover,
+.emotion-0:autofill:focus {
+  box-shadow: inset 0 0 0 1000px var(--theme-ui-input-autofill-bg);
+  font-size: inherit;
+}
+
+.emotion-0:autofill:first-line,
+.emotion-0:autofill:hover:first-line,
+.emotion-0:autofill:focus:first-line {
+  font-size: 1rem;
+}
+
+.emotion-0:-webkit-autofill,
+.emotion-0:-webkit-autofill:hover,
+.emotion-0:-webkit-autofill:focus {
+  box-shadow: inset 0 0 0 1000px var(--theme-ui-input-autofill-bg);
+  font-size: inherit;
+}
+
+.emotion-0:-webkit-autofill:first-line,
+.emotion-0:-webkit-autofill:hover:first-line,
+.emotion-0:-webkit-autofill:focus:first-line {
+  font-size: 1rem;
+}
+
 <input
   className="emotion-0"
 />

diff --git a/packages/docs/src/components/head.js b/packages/docs/src/components/head.js
@@ -13,7 +13,9 @@ export default (props) => {
     .filter(Boolean)
     .join(' – ')
 
-  const { theme } = useThemeUI()
+  const { theme, colorMode } = useThemeUI()
+
+  const isColorModeDark = ['dark', 'deep'].includes(colorMode)
 
   return (
     <Helmet htmlAttributes={{ lang: 'en-US' }}>
@@ -32,7 +34,10 @@ export default (props) => {
       <meta name="twitter:image" content="https://theme-ui.com/card.png" />
       <meta name="twitter:title" content={title} />
       <meta name="twitter:description" content={pkg.description} />
+
       <meta name="theme-color" content={theme.colors.background} />
+      <meta name="color-scheme" content={isColorModeDark ? 'dark' : 'light'} />
+
       <script
         src="https://unpkg.com/favicon-switcher@1.2.2/dist/index.js"
         crossOrigin="anonymous"

diff --git a/packages/docs/src/pages/components/input.mdx b/packages/docs/src/pages/components/input.mdx
@@ -16,4 +16,14 @@ import { Input } from 'theme-ui'
 
 ## Variants
 
-Input variants can be defined in `theme.forms` and the component uses the `theme.forms.input` variant by default.
+Input variants can be defined in `theme.forms` and the component uses the
+`theme.forms.input` variant by default.
+
+## Autocomplete styles
+
+Background color of autofilled inputs defaults to `background`, and can be
+changed by setting `autofillBackgroundColor` prop.
+
+```js live=true
+<Input autoComplete="given-name" autofillBackgroundColor="highlight" />
+```
diff --git a/packages/docs/src/pages/components/select.mdx b/packages/docs/src/pages/components/select.mdx
@@ -19,6 +19,11 @@ import { Select, Box } from 'theme-ui'
 </Select>
 ```
 
+## Variants
+
+Select variants can be defined in `theme.forms` and the component uses the
+`theme.forms.select` variant by default.
+
 ## Custom arrow icon
 
 ```jsx live=true
@@ -46,7 +51,3 @@ import { Select, Box } from 'theme-ui'
   <option>Boop</option>
 </Select>
 ```
-
-## Variants
-
-Select variants can be defined in `theme.forms` and the component uses the `theme.forms.select` variant by default.
diff --git a/packages/editor/test/__snapshots__/Combobox.tsx.snap b/packages/editor/test/__snapshots__/Combobox.tsx.snap
@@ -46,6 +46,32 @@ exports[`renders 1`] = `
   background-color: transparent;
 }
 
+.emotion-3:autofill,
+.emotion-3:autofill:hover,
+.emotion-3:autofill:focus {
+  box-shadow: inset 0 0 0 1000px var(--theme-ui-input-autofill-bg);
+  font-size: inherit;
+}
+
+.emotion-3:autofill:first-line,
+.emotion-3:autofill:hover:first-line,
+.emotion-3:autofill:focus:first-line {
+  font-size: 1rem;
+}
+
+.emotion-3:-webkit-autofill,
+.emotion-3:-webkit-autofill:hover,
+.emotion-3:-webkit-autofill:focus {
+  box-shadow: inset 0 0 0 1000px var(--theme-ui-input-autofill-bg);
+  font-size: inherit;
+}
+
+.emotion-3:-webkit-autofill:first-line,
+.emotion-3:-webkit-autofill:hover:first-line,
+.emotion-3:-webkit-autofill:focus:first-line {
+  font-size: 1rem;
+}
+
 .emotion-4 {
   -webkit-appearance: none;
   -moz-appearance: none;

diff --git a/packages/theme-ui/test/color-modes.tsx b/packages/theme-ui/test/color-modes.tsx
@@ -193,11 +193,11 @@ test('converts color modes to css custom properties', () => {
 test('uses default mode', () => {
   let mode
   const Button = () => {
-    const [colorMode, setMode] = useColorMode()
+    const [colorMode] = useColorMode()
     mode = colorMode
     return <button children="test" />
   }
-  const tree = render(
+  render(
     <ThemeProvider theme={{}}>
       <Button />
     </ThemeProvider>
@@ -209,11 +209,11 @@ test('initializes mode based on localStorage', () => {
   window.localStorage.setItem(STORAGE_KEY, 'dark')
   let mode
   const Button = () => {
-    const [colorMode, setMode] = useColorMode()
+    const [colorMode] = useColorMode()
     mode = colorMode
     return <button children="test" />
   }
-  const tree = render(
+  render(
     <ThemeProvider theme={{}}>
       <Button />
     </ThemeProvider>
@@ -351,7 +351,7 @@ test('does not initialize mode from prefers-color-scheme media query when useCol
 test('useColorMode throws when there is no theme context', () => {
   expect(() => {
     const Consumer = () => {
-      const _ = useColorMode()
+      useColorMode()
       return null
     }
     render(<Consumer />)
@@ -367,7 +367,7 @@ test('useThemeUI returns current color mode colors', () => {
     colors = theme.colors
     return null
   }
-  const root = render(
+  render(
     <ThemeProvider
       theme={{
         config: {
@@ -392,7 +392,7 @@ test('useThemeUI returns current color mode colors', () => {
 })
 
 test('warns when initialColorModeName matches a key in theme.colors.modes', () => {
-  const root = render(
+  render(
     <ThemeProvider
       theme={{
         config: {
@@ -416,7 +416,7 @@ test('warns when initialColorModeName matches a key in theme.colors.modes', () =
 
 test('dot notation works with color modes', () => {
   const Button = () => {
-    const [colorMode, setMode] = useColorMode()
+    const [, setMode] = useColorMode()
     return (
       <button
         sx={{
@@ -458,7 +458,7 @@ test('dot notation works with color modes', () => {
 
 test('dot notation works with color modes and custom properties', () => {
   const Button = () => {
-    const [colorMode, setMode] = useColorMode()
+    const [, setMode] = useColorMode()
     return (
       <button
         sx={{
@@ -509,7 +509,7 @@ test('raw color values are passed to theme-ui context when custom properties are
     color = context.theme.rawColors!.primary
     return null
   }
-  const root = render(
+  render(
     <ThemeProvider
       theme={{
         colors: {