newspack-components 2.0.3 → 2.2.0

package/dist/esm/card/style.scss

@@ -2,13 +2,12 @@
  * Card
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-card {
-	border-radius: 3px;
-	border: 1px solid $gray-300;
-	color: $gray-700;
+	border-radius: 2px;
+	border: 1px solid wp-colors.$gray-300;
+	color: wp-colors.$gray-900;
 	margin: 32px 0;
 	padding: 16px 48px;
 
@@ -21,11 +20,8 @@
 	&__buttons-card {
 		display: flex;
 		flex-wrap: wrap;
-		margin: 32px -8px 16px;
-
-		.newspack-button {
-			margin: 0 8px 16px;
-		}
+		gap: 16px;
+		margin: 32px 0;
 	}
 
 	// Header Actions Card
@@ -34,6 +30,7 @@
 		align-items: center;
 		display: flex;
 		flex-wrap: wrap;
+		gap: 8px;
 		justify-content: space-between;
 		margin-bottom: -16px;
 
@@ -41,6 +38,23 @@
 			margin-bottom: 0 !important;
 			margin-top: 0 !important;
 		}
+
+		.newspack-select-control {
+			.components-base-control__field {
+				margin-bottom: 0;
+			}
+		}
+	}
+
+	// Is Narrow
+
+	&__is-narrow {
+		margin-left: auto;
+		margin-right: auto;
+
+		@media screen and ( min-width: 608px ) {
+			max-width: 576px;
+		}
 	}
 
 	// Is Small
@@ -79,65 +93,48 @@
 		}
 	}
 
-	// No Border
+	// Is White
 
-	&__no-border {
-		border-radius: 0;
+	&__is-white {
+		background: white;
 		border: 0;
-		padding: 0;
 	}
 
-	// Typography
+	// No Border
 
-	h2,
-	h3,
-	p {
-		line-height: 24px;
-		margin: 32px 0;
+	&__no-border {
+		border-radius: 0;
+		border: 0;
 		padding: 0;
 	}
 
-	h2 {
-		color: $gray-900;
-		font-size: 17px;
-		font-weight: bold;
-	}
+	// Margin
 
-	h3 {
-		color: $gray-900;
-		font-size: 14px;
-		font-weight: bold;
+	&.mt64 {
+		margin-top: 64px;
 	}
 
-	p {
-		font-size: 14px;
-
-		&.is-dark {
-			color: $gray-900;
-		}
+	&.mt16 {
+		margin-top: 16px;
 	}
 
-	strong {
-		font-weight: bold;
-	}
+	// Typography
 
 	small {
 		font-size: 12px;
-		line-height: 16px;
+		line-height: 1.4;
 	}
 
 	code {
-		background: $gray-100;
-		color: $gray-700;
-		font-size: 12px;
-		line-height: 16px;
-		padding: 4px 8px;
+		background: wp-colors.$gray-100;
+		color: wp-colors.$gray-900;
+		padding: 0 0.5em;
 	}
 
 	// Thematic Break
 
 	hr {
-		background: $gray-300;
+		background: wp-colors.$gray-300;
 		border: 0;
 		height: 1px;
 		margin: 48px 0;
@@ -150,7 +147,7 @@
 	// Separator
 
 	.sep {
-		background: $gray-300;
+		background: wp-colors.$gray-300;
 		height: 1px;
 		margin-left: 8px;
 		margin-right: 8px;
@@ -158,27 +155,14 @@
 
 		&__inline {
 			display: inline-block;
-			line-height: 24px;
+			line-height: 1.5;
 			vertical-align: middle;
 		}
 	}
 
-	// Links
-
-	a {
-		color: $primary-500;
+	// Error
 
-		&:active,
-		&:focus,
-		&:hover {
-			color: $primary-600;
-			text-decoration: none;
-		}
-
-		&:focus {
-			box-shadow: none;
-			outline: 2px solid $primary-500;
-			outline-offset: 2px;
-		}
+	.newspack-error {
+		color: wp-colors.$alert-red;
 	}
 }

package/dist/esm/category-autocomplete/index.js

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
 /**
  * Category Autocomplete
  */
@@ -8,55 +7,85 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
  * WordPress dependencies.
  */
 import apiFetch from '@wordpress/api-fetch';
+import { Spinner } from '@wordpress/components';
 import { Component } from '@wordpress/element';
 import { addQueryArgs } from '@wordpress/url';
+
 /**
  * Internal dependencies.
  */
-
 import { FormTokenField } from '../';
 import './style.scss';
+
 /**
  * External dependencies
  */
-
-import { debounce, find } from 'lodash';
+import debounce from 'lodash/debounce';
+import find from 'lodash/find';
+import filter from 'lodash/filter';
 import classnames from 'classnames';
+
 /**
  * Category autocomplete field component.
  */
-
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
-
+import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 class CategoryAutocomplete extends Component {
   /**
    * Class constructor.
    */
   constructor(props) {
     super(props);
-
     _defineProperty(this, "state", {
       suggestions: {},
-      allCategories: {}
+      allCategories: {},
+      isLoading: false
     });
-
+    /**
+     * Prepare categories data for the API endpoint, call the change handler.
+     *
+     * @param {Array} tokens An array of category tokens.
+     */
     _defineProperty(this, "handleOnChange", tokens => {
       const {
         onChange
       } = this.props;
       const {
         suggestions
-      } = this.state; // Categories that are already will be objects, while new additions will be strings (the name).
+      } = this.state;
+      // Categories that are already will be objects, while new additions will be strings (the name).
       // allValues nomalizes the array so that they are all objects.
-
-      const allValues = tokens.map(token => typeof token === 'string' ? suggestions[token] : token);
+      const allValues = tokens.filter(token => 'undefined' !== typeof token) // Ensure each token is a valid value.
+      .map(token => 'string' === typeof token ? suggestions[token] : token).filter(Boolean);
       onChange(allValues);
     });
-
+    _defineProperty(this, "getAvailableSuggestions", () => {
+      const {
+        value
+      } = this.props;
+      const {
+        suggestions
+      } = this.state;
+      const selectedIds = value.reduce((acc, item) => {
+        if (item?.id) {
+          acc.push(item.id);
+        }
+        return acc;
+      }, []);
+      const availableSuggestions = filter(suggestions, _ref => {
+        let {
+          id
+        } = _ref;
+        return selectedIds.indexOf(id) === -1;
+      });
+      return availableSuggestions.map(v => v.name);
+    });
     this.debouncedUpdateSuggestions = debounce(this.updateSuggestions, 100);
   }
-
   componentDidMount() {
+    this.setState({
+      isLoading: true
+    });
     apiFetch({
       path: addQueryArgs(`/wp/v2/${this.props.taxonomy}`, {
         per_page: -1,
@@ -64,24 +93,27 @@ class CategoryAutocomplete extends Component {
       })
     }).then(categories => this.setState({
       allCategories: categories
+    })).finally(() => this.setState({
+      isLoading: false
     }));
   }
+
   /**
    * Clean up debounced suggestions method.
    */
-
-
   componentWillUnmount() {
     this.debouncedUpdateSuggestions.cancel();
   }
+
   /**
    * Refresh the autocomplete UI based on text that was typed.
    *
    * @param {string} search The typed text to search for.
    */
-
-
   updateSuggestions(search) {
+    this.setState({
+      isLoading: true
+    });
     apiFetch({
       path: addQueryArgs(`/wp/v2/${this.props.taxonomy}`, {
         search,
@@ -92,19 +124,15 @@ class CategoryAutocomplete extends Component {
       })
     }).then(categories => {
       this.setState({
-        suggestions: categories.reduce((accumulator, category) => ({ ...accumulator,
+        suggestions: categories.reduce((accumulator, category) => ({
+          ...accumulator,
           [category.name]: category
         }), {})
       });
-    });
+    }).finally(() => this.setState({
+      isLoading: false
+    }));
   }
-  /**
-   * Prepare categories data for the API endpoint, call the change handler.
-   *
-   * @param {Array} tokens An array of category tokens.
-   */
-
-
   /**
    * Render the component.
    */
@@ -119,39 +147,38 @@ class CategoryAutocomplete extends Component {
       value
     } = this.props;
     const {
-      suggestions,
-      allCategories
+      allCategories,
+      isLoading
     } = this.state;
     const classes = classnames('newspack-category-autocomplete', className);
-    return _jsx("div", {
+    return _jsxs("div", {
       className: classes,
-      children: _jsx(FormTokenField, {
+      children: [_jsx(FormTokenField, {
         onInputChange: input => this.debouncedUpdateSuggestions(input),
         value: value.reduce((acc, item) => {
-          const category = typeof item === 'number' ? find(allCategories, ['id', item]) : item;
-
-          if (category) {
+          const categoryOrItem = typeof item === 'number' ? find(allCategories, ['id', item]) : item;
+          if (categoryOrItem) {
             acc.push({
-              id: category.term_id || category.id,
-              value: category.name
+              id: categoryOrItem.term_id || categoryOrItem.id,
+              value: categoryOrItem.value || categoryOrItem.name
             });
           }
-
           return acc;
         }, []),
-        suggestions: Object.keys(suggestions),
+        suggestions: this.getAvailableSuggestions(),
         onChange: this.handleOnChange,
         label: label,
         disabled: disabled,
         description: description,
         hideHelpFromVision: hideHelpFromVision,
         hideLabelFromVision: hideLabelFromVision
-      })
+      }), isLoading ? _jsx("span", {
+        className: "newspack-category-autocomplete__suggestions-spinner",
+        children: _jsx(Spinner, {})
+      }) : null]
     });
   }
-
 }
-
 CategoryAutocomplete.defaultProps = {
   taxonomy: 'categories'
 };

package/dist/esm/category-autocomplete/style.scss

@@ -2,37 +2,33 @@
  * Category Autocomplete
  */
 
-@import '../../../shared/scss/colors';
-
 .newspack-category-autocomplete {
+	position: relative;
+
 	.components-form-token-field__help {
 		display: none;
 	}
 
-	.components-button:focus:not( :disabled ) {
-		box-shadow: inset 0 0 0 2px $primary-500;
-	}
-
-	// Multiple Select Controls
-
-	& + & {
-		margin-bottom: 32px;
-		margin-top: -16px;
-	}
-
-	// Multiple Controls
-
-	+ .newspack-select-control,
-	+ .newspack-text-control,
-	+ .newspack-textarea-control,
-	+ .newspack-toggle-control {
-		margin-bottom: 32px;
-		margin-top: -16px;
-	}
-
 	// Within a Grid
 
-	.newspack-grid & .newspack-form-token-field {
+	.newspack-grid & .newspack-form-token-field__input-container {
 		margin: 0;
 	}
+
+	// Loading state spinner
+	&__suggestions-spinner {
+		position: absolute;
+		right: 1px;
+		top: calc( 1.4em + 8px );
+		z-index: 2;
+
+		[class*='--label-hidden'] + & {
+			top: 0;
+		}
+
+		.components-spinner {
+			display: block;
+			margin: 7px;
+		}
+	}
 }

package/dist/esm/color-picker/index.js

@@ -3,25 +3,26 @@
  */
 import { ColorPicker as ColorPickerComponent } from '@wordpress/components';
 import { useState, useRef } from '@wordpress/element';
-import { Icon, chevronDown } from '@wordpress/icons';
+
 /**
  * External dependencies.
  */
-
 import classnames from 'classnames';
+import { colord, extend } from 'colord';
+import a11yPlugin from 'colord/plugins/a11y';
+
 /**
  * Internal dependencies.
  */
-
 import hooks from '../hooks';
 import utils from '../utils';
 import './style.scss';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
+extend([a11yPlugin]);
 const {
   InteractiveDiv
 } = utils;
-
 const ColorPicker = _ref => {
   let {
     label,
@@ -31,52 +32,30 @@ const ColorPicker = _ref => {
   } = _ref;
   const [isExpanded, setIsExpanded] = useState(false);
   const ref = useRef();
+  const colordColor = colord(color);
   hooks.useOnClickOutside(ref, () => setIsExpanded(false));
   return _jsxs("div", {
     className: classnames('newspack-color-picker', className),
     children: [_jsx("div", {
       className: "newspack-color-picker__label",
       children: label
-    }), _jsxs("div", {
+    }), _jsx(InteractiveDiv, {
+      className: 'newspack-color-picker__expander',
+      onClick: () => setIsExpanded(!isExpanded),
+      style: {
+        backgroundColor: color,
+        color: colordColor.contrast() > colordColor.contrast('#000') ? '#fff' : '#000'
+      },
+      children: color
+    }), _jsx("div", {
       className: "newspack-color-picker__main",
       ref: ref,
-      children: [_jsxs(InteractiveDiv, {
-        className: classnames('newspack-color-picker__expander', {
-          'newspack-color-picker__expander--expanded': isExpanded
-        }),
-        onClick: () => setIsExpanded(!isExpanded),
-        children: [_jsxs("div", {
-          children: [_jsx("div", {
-            className: "newspack-color-picker__indicator",
-            style: {
-              backgroundColor: color
-            }
-          }), _jsx("div", {
-            children: color
-          })]
-        }), _jsx(Icon, {
-          icon: chevronDown,
-          size: 18,
-          style: isExpanded ? {
-            transform: 'rotate(180deg)'
-          } : {}
-        })]
-      }), isExpanded && _jsx(ColorPickerComponent, {
+      children: isExpanded && _jsx(ColorPickerComponent, {
         color: color,
-        onChangeComplete: _ref2 => {
-          let {
-            hex
-          } = _ref2;
-          return onChange(hex);
-        } // Prop will be deprecated in favor of onChange, which expects a string hex value.
-        ,
-        disableAlpha: true // Prop will be deprecated in favor of enableAlpha, which behaves in the opposite manner.
-        ,
         onChange: hex => onChange(hex),
         enableAlpha: false
-      })]
+      })
     })]
   });
 };
-
 export default ColorPicker;