@automattic/vip-design-system 0.25.0 → 0.25.1

package/build/system/NewForm/FormAutocomplete.css

@@ -0,0 +1,166 @@
+.autocomplete__wrapper {
+  position: relative;
+}
+
+.autocomplete__hint,
+.autocomplete__input {
+  -webkit-appearance: none;
+  border: 2px solid #0b0c0c;
+  border-radius: 0; /* Safari 10 on iOS adds implicit border rounding. */
+  box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  margin-bottom: 0; /* BUG: Safari 10 on macOS seems to add an implicit margin. */
+  width: 100%;
+}
+
+.autocomplete__input {
+  background-color: transparent;
+  position: relative;
+}
+
+.autocomplete__hint {
+  color: #b1b4b6;
+  position: absolute;
+}
+
+.autocomplete__input--default {
+  padding: 5px;
+}
+.autocomplete__input--focused {
+  outline: 3px solid #fd0;
+  outline-offset: 0;
+  box-shadow: inset 0 0 0 2px;
+}
+
+.autocomplete__input--show-all-values {
+  padding: 5px 34px 5px 5px; /* Space for arrow. Other padding should match .autocomplete__input--default. */
+  cursor: pointer;
+}
+
+.autocomplete__dropdown-arrow-down {
+  z-index: -1;
+  display: inline-block;
+  position: absolute;
+  right: 8px;
+  width: 24px;
+  height: 24px;
+  top: 10px;
+}
+
+.autocomplete__menu {
+  background-color: #fff;
+  border: 2px solid #0B0C0C;
+  border-top: 0;
+  color: #0B0C0C;
+  margin: 0;
+  max-height: 342px;
+  overflow-x: hidden;
+  padding: 0;
+  width: 100%;
+  width: calc(100% - 4px);
+}
+
+.autocomplete__menu--visible {
+  display: block;
+}
+
+.autocomplete__menu--hidden {
+  display: none;
+}
+
+.autocomplete__menu--overlay {
+  box-shadow: rgba(0, 0, 0, 0.256863) 0px 2px 6px;
+  left: 0;
+  position: absolute;
+  top: 100%;
+  z-index: 100;
+}
+
+.autocomplete__menu--inline {
+  position: relative;
+}
+
+.autocomplete__option {
+  border-bottom: solid #b1b4b6;
+  border-width: 1px 0;
+  cursor: pointer;
+  display: block;
+  position: relative;
+}
+
+.autocomplete__option > * {
+  pointer-events: none;
+}
+
+.autocomplete__option:first-of-type {
+  border-top-width: 0;
+}
+
+.autocomplete__option:last-of-type {
+  border-bottom-width: 0;
+}
+
+.autocomplete__option--odd {
+  background-color: #FAFAFA;
+}
+
+.autocomplete__option--focused,
+.autocomplete__option:hover {
+  background-color: #1d70b8;
+  border-color: #1d70b8;
+  color: white;
+  outline: none;
+}
+
+@media (-ms-high-contrast: active), (forced-colors: active) {
+  .autocomplete__menu {
+    border-color: FieldText;
+  }
+
+  .autocomplete__option {
+    background-color: Field;
+    color: FieldText;
+  }
+
+  .autocomplete__option--focused,
+  .autocomplete__option:hover {
+    forced-color-adjust: none; /* prevent backplate from obscuring text */
+    background-color: Highlight;
+    border-color: Highlight;
+    color: HighlightText;
+
+    /* Prefer SelectedItem / SelectedItemText in browsers that support it */
+    background-color: SelectedItem;
+    border-color: SelectedItem;
+    color: SelectedItemText;
+    outline-color: SelectedItemText;
+  }
+}
+
+.autocomplete__option--no-results {
+  background-color: #FAFAFA;
+  color: #646b6f;
+  cursor: not-allowed;
+}
+
+.autocomplete__hint,
+.autocomplete__input,
+.autocomplete__option {
+  font-size: 16px;
+  line-height: 1.25;
+}
+
+.autocomplete__hint,
+.autocomplete__option {
+  padding: 5px;
+}
+
+@media (min-width: 641px) {
+  .autocomplete__hint,
+  .autocomplete__input,
+  .autocomplete__option {
+    font-size: 19px;
+    line-height: 1.31579;
+  }
+}

package/build/system/NewForm/FormAutocomplete.js

@@ -7,6 +7,8 @@ exports.FormAutocomplete = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
+var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -25,19 +27,12 @@ var _FormSelectArrow = require("./FormSelectArrow");
 
 var _jsxRuntime = require("theme-ui/jsx-runtime");
 
+var _excluded = ["isInline", "forLabel", "options", "label", "getOptionLabel", "getOptionValue", "onChange", "value", "showAllValues", "displayMenu", "id"];
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-/** @jsxImportSource theme-ui */
-
-/**
- * External dependencies
- */
-
-/**
- * Internal dependencies
- */
 var defaultStyles = {
   width: '100%',
   py: 0,
@@ -114,15 +109,18 @@ var FormAutocomplete = /*#__PURE__*/_react["default"].forwardRef(function (_ref,
       forLabel = _ref.forLabel,
       options = _ref.options,
       label = _ref.label,
+      getOptionLabel = _ref.getOptionLabel,
       getOptionValue = _ref.getOptionValue,
-      onChange = _ref.onChange,
+      _ref$onChange = _ref.onChange,
+      onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
       value = _ref.value,
       _ref$showAllValues = _ref.showAllValues,
       showAllValues = _ref$showAllValues === void 0 ? true : _ref$showAllValues,
       _ref$displayMenu = _ref.displayMenu,
       displayMenu = _ref$displayMenu === void 0 ? 'overlay' : _ref$displayMenu,
       _ref$id = _ref.id,
-      id = _ref$id === void 0 ? 'vip-autocomplete' : _ref$id;
+      id = _ref$id === void 0 ? 'vip-autocomplete' : _ref$id,
+      props = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
 
   var SelectLabel = function SelectLabel() {
     return (0, _jsxRuntime.jsx)(_Label.Label, {
@@ -132,9 +130,9 @@ var FormAutocomplete = /*#__PURE__*/_react["default"].forwardRef(function (_ref,
   };
 
   var inlineLabel = !!(isInline && label);
-  var optionValue = (0, _react.useCallback)(function (option) {
-    return getOptionValue ? getOptionValue(option) : option.value;
-  }, [getOptionValue]);
+  var optionLabel = (0, _react.useCallback)(function (option) {
+    return getOptionLabel ? getOptionLabel(option) : option.label;
+  }, [getOptionLabel]);
   var getAllOptions = (0, _react.useMemo)(function () {
     return [].concat(options.filter(function (option) {
       return !option.options;
@@ -146,22 +144,22 @@ var FormAutocomplete = /*#__PURE__*/_react["default"].forwardRef(function (_ref,
       return a.concat(b);
     }, []);
   }, [options]);
-  var getOptionByValue = (0, _react.useCallback)(function (inputValue) {
+  var getOptionByLabel = (0, _react.useCallback)(function (inputValue) {
     return getAllOptions.find(function (option) {
-      return "" + optionValue(option) === "" + inputValue;
+      return "" + optionLabel(option) === "" + inputValue;
     });
-  }, [getAllOptions, optionValue]);
+  }, [getAllOptions, optionLabel]);
   var onValueChange = (0, _react.useCallback)(function (inputValue) {
-    if (onChange) {
-      onChange(getOptionByValue(inputValue));
+    if (inputValue) {
+      onChange(getOptionByLabel(inputValue), inputValue);
     }
-  }, [onChange, getOptionByValue]);
+  }, [onChange, getOptionByLabel]);
   var suggest = (0, _react.useCallback)(function (query, populateResults) {
     var data = options.filter(function (option) {
-      return option.label.toLowerCase().indexOf(query.toLowerCase()) >= 0;
+      return optionLabel(option).toLowerCase().indexOf(query.toLowerCase()) >= 0;
     });
     populateResults(data.map(function (option) {
-      return option.label;
+      return optionLabel(option);
     }));
   }, [options]);
   (0, _react.useEffect)(function () {
@@ -176,7 +174,7 @@ var FormAutocomplete = /*#__PURE__*/_react["default"].forwardRef(function (_ref,
       children: (0, _jsxRuntime.jsxs)(_FormSelectContent.FormSelectContent, {
         isInline: inlineLabel,
         label: inlineLabel ? (0, _jsxRuntime.jsx)(SelectLabel, {}) : null,
-        children: [(0, _jsxRuntime.jsx)(_react2["default"], {
+        children: [(0, _jsxRuntime.jsx)(_react2["default"], (0, _extends2["default"])({
           id: id,
           showAllValues: showAllValues,
           ref: forwardRef,
@@ -184,7 +182,7 @@ var FormAutocomplete = /*#__PURE__*/_react["default"].forwardRef(function (_ref,
           defaultValue: value,
           displayMenu: displayMenu,
           onConfirm: onValueChange
-        }), (0, _jsxRuntime.jsx)(_FormSelectArrow.FormSelectArrow, {})]
+        }, props)), (0, _jsxRuntime.jsx)(_FormSelectArrow.FormSelectArrow, {})]
       })
     })]
   });
@@ -200,6 +198,7 @@ FormAutocomplete.propTypes = {
   displayMenu: _propTypes["default"].string,
   label: _propTypes["default"].string,
   options: _propTypes["default"].array,
+  getOptionLabel: _propTypes["default"].func,
   getOptionValue: _propTypes["default"].func,
   onChange: _propTypes["default"].func
 };

package/build/system/NewForm/FormAutocomplete.stories.js

@@ -9,13 +9,11 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 
-var _react = require("react");
-
 var Form = _interopRequireWildcard(require("."));
 
 var _jsxRuntime = require("theme-ui/jsx-runtime");
 
-var _excluded = ["label", "width", "onChange"];
+var _excluded = ["label", "width"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -45,7 +43,7 @@ var _default = {
   }
 };
 exports["default"] = _default;
-var defaultOptions = [{
+var options = [{
   value: 'chocolate',
   label: 'Chocolate'
 }, {
@@ -54,14 +52,17 @@ var defaultOptions = [{
 }, {
   value: 'vanilla',
   label: 'Vanilla'
-}]; // eslint-disable-next-line react/prop-types
+}];
+var args = {
+  label: 'Label',
+  options: options
+}; // eslint-disable-next-line react/prop-types
 
 var DefaultComponent = function DefaultComponent(_ref) {
   var _ref$label = _ref.label,
       label = _ref$label === void 0 ? 'Label' : _ref$label,
       _ref$width = _ref.width,
       width = _ref$width === void 0 ? 250 : _ref$width,
-      onChange = _ref.onChange,
       rest = (0, _objectWithoutPropertiesLoose2["default"])(_ref, _excluded);
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: (0, _jsxRuntime.jsx)(Form.Root, {
@@ -71,8 +72,7 @@ var DefaultComponent = function DefaultComponent(_ref) {
         },
         children: (0, _jsxRuntime.jsx)(Form.Autocomplete, (0, _extends2["default"])({
           id: "form-autocomplete",
-          label: label,
-          onChange: onChange
+          label: label
         }, rest))
       })
     })
@@ -80,47 +80,19 @@ var DefaultComponent = function DefaultComponent(_ref) {
 };
 
 var Default = function Default() {
-  var _useState = (0, _react.useState)(defaultOptions),
-      options = _useState[0],
-      setOptions = _useState[1];
-
-  var onChange = (0, _react.useCallback)(function (value) {
-    setOptions(defaultOptions.filter(function (option) {
-      return !value || option.label.toLowerCase().indexOf(value.toLowerCase()) >= 0;
-    }));
-  });
-  var args = {
-    label: 'Label',
-    options: options
-  };
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-    children: (0, _jsxRuntime.jsx)(DefaultComponent, (0, _extends2["default"])({
-      onChange: onChange
-    }, args))
+    children: (0, _jsxRuntime.jsx)(DefaultComponent, (0, _extends2["default"])({}, args))
   });
 };
 
 exports.Default = Default;
 
 var Inline = function Inline() {
-  var _useState2 = (0, _react.useState)(defaultOptions),
-      options = _useState2[0],
-      setOptions = _useState2[1];
-
-  var onChange = (0, _react.useCallback)(function (value) {
-    setOptions(defaultOptions.filter(function (option) {
-      return !value || option.label.toLowerCase().indexOf(value.toLowerCase()) >= 0;
-    }));
+  var customArgs = (0, _extends2["default"])({}, args, {
+    isInline: true
   });
-  var args = {
-    label: 'Label',
-    options: options
-  };
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-    children: (0, _jsxRuntime.jsx)(DefaultComponent, (0, _extends2["default"])({
-      isInline: true,
-      onChange: onChange
-    }, args))
+    children: (0, _jsxRuntime.jsx)(DefaultComponent, (0, _extends2["default"])({}, customArgs))
   });
 };
 

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "@automattic/vip-design-system",
-	"version": "0.25.0",
+	"version": "0.25.1",
 	"main": "build/system/index.js",
 	"scripts": {
 		"build-storybook": "build-storybook",
 		"prepare": "npm run build",
-		"build": "npm run theme-update && cross-env NODE_ENV=production babel src --out-dir build && npm run theme-builder-copy",
+		"build": "npm run theme-update && cross-env NODE_ENV=production babel src --out-dir build --copy-files && npm run theme-builder-copy",
 		"format": "prettier --write \"src/**/*.{js,ts,tsx,md,mdx,json}\"",
 		"format:check": "prettier --list-different -- \"src/system/**/*.{js,ts,tsx,md,mdx,json}\"",
 		"jest": "NODE_ENV=test jest --detectOpenHandles --env=jsdom",

package/src/system/NewForm/FormAutocomplete.js

@@ -74,12 +74,14 @@ const FormAutocomplete = React.forwardRef(
 			forLabel,
 			options,
 			label,
+			getOptionLabel,
 			getOptionValue,
-			onChange,
+			onChange = () => {},
 			value,
 			showAllValues = true,
 			displayMenu = 'overlay',
 			id = 'vip-autocomplete',
+			...props
 		},
 		forwardRef
 	) => {
@@ -87,9 +89,9 @@ const FormAutocomplete = React.forwardRef(
 
 		const inlineLabel = !! ( isInline && label );
 
-		const optionValue = useCallback(
-			option => ( getOptionValue ? getOptionValue( option ) : option.value ),
-			[ getOptionValue ]
+		const optionLabel = useCallback(
+			option => ( getOptionLabel ? getOptionLabel( option ) : option.label ),
+			[ getOptionLabel ]
 		);
 
 		const getAllOptions = useMemo(
@@ -101,27 +103,27 @@ const FormAutocomplete = React.forwardRef(
 			[ options ]
 		);
 
-		const getOptionByValue = useCallback(
+		const getOptionByLabel = useCallback(
 			inputValue =>
-				getAllOptions.find( option => `${ optionValue( option ) }` === `${ inputValue }` ),
-			[ getAllOptions, optionValue ]
+				getAllOptions.find( option => `${ optionLabel( option ) }` === `${ inputValue }` ),
+			[ getAllOptions, optionLabel ]
 		);
 
 		const onValueChange = useCallback(
 			inputValue => {
-				if ( onChange ) {
-					onChange( getOptionByValue( inputValue ) );
+				if ( inputValue ) {
+					onChange( getOptionByLabel( inputValue ), inputValue );
 				}
 			},
-			[ onChange, getOptionByValue ]
+			[ onChange, getOptionByLabel ]
 		);
 
 		const suggest = useCallback(
 			( query, populateResults ) => {
 				const data = options.filter(
-					option => option.label.toLowerCase().indexOf( query.toLowerCase() ) >= 0
+					option => optionLabel( option ).toLowerCase().indexOf( query.toLowerCase() ) >= 0
 				);
-				populateResults( data.map( option => option.label ) );
+				populateResults( data.map( option => optionLabel( option ) ) );
 			},
 			[ options ]
 		);
@@ -155,6 +157,7 @@ const FormAutocomplete = React.forwardRef(
 							defaultValue={ value }
 							displayMenu={ displayMenu }
 							onConfirm={ onValueChange }
+							{ ...props }
 						/>
 						<FormSelectArrow />
 					</FormSelectContent>
@@ -173,6 +176,7 @@ FormAutocomplete.propTypes = {
 	displayMenu: PropTypes.string,
 	label: PropTypes.string,
 	options: PropTypes.array,
+	getOptionLabel: PropTypes.func,
 	getOptionValue: PropTypes.func,
 	onChange: PropTypes.func,
 };

package/src/system/NewForm/FormAutocomplete.stories.jsx

@@ -3,7 +3,6 @@
 /**
  * Internal dependencies
  */
-import { useCallback, useState } from 'react';
 import * as Form from '.';
 
 export default {
@@ -20,70 +19,45 @@ export default {
 	},
 };
 
-const defaultOptions = [
+const options = [
 	{ value: 'chocolate', label: 'Chocolate' },
 	{ value: 'strawberry', label: 'Strawberry Chocolate Vanilla Chocolate Vanilla' },
 	{ value: 'vanilla', label: 'Vanilla' },
 ];
 
+const args = {
+	label: 'Label',
+	options,
+};
+
 // eslint-disable-next-line react/prop-types
-const DefaultComponent = ( { label = 'Label', width = 250, onChange, ...rest } ) => (
+const DefaultComponent = ( { label = 'Label', width = 250, ...rest } ) => (
 	<>
 		<Form.Root>
 			<div sx={ { width } }>
-				<Form.Autocomplete
-					id="form-autocomplete"
-					label={ label }
-					onChange={ onChange }
-					{ ...rest }
-				/>
+				<Form.Autocomplete id="form-autocomplete" label={ label } { ...rest } />
 			</div>
 		</Form.Root>
 	</>
 );
 
 export const Default = () => {
-	const [ options, setOptions ] = useState( defaultOptions );
-
-	const onChange = useCallback( value => {
-		setOptions(
-			defaultOptions.filter(
-				option => ! value || option.label.toLowerCase().indexOf( value.toLowerCase() ) >= 0
-			)
-		);
-	} );
-
-	const args = {
-		label: 'Label',
-		options,
-	};
-
 	return (
 		<>
-			<DefaultComponent onChange={ onChange } { ...args } />
+			<DefaultComponent { ...args } />
 		</>
 	);
 };
 
 export const Inline = () => {
-	const [ options, setOptions ] = useState( defaultOptions );
-
-	const onChange = useCallback( value => {
-		setOptions(
-			defaultOptions.filter(
-				option => ! value || option.label.toLowerCase().indexOf( value.toLowerCase() ) >= 0
-			)
-		);
-	} );
-
-	const args = {
-		label: 'Label',
-		options,
+	const customArgs = {
+		...args,
+		isInline: true,
 	};
 
 	return (
 		<>
-			<DefaultComponent isInline={ true } onChange={ onChange } { ...args } />
+			<DefaultComponent { ...customArgs } />
 		</>
 	);
 };