@uncinc/uncinc-react-kitchen-sink 2.8.23 → 2.8.25

package/dist/components/Form/Select/Input/index.js

@@ -1,3 +1,7 @@
+var _excluded = ["fieldName", "id", "validation", "defaultValue", "onChange", "options", "placeholder", "disabled", "className", "wrapperClassName", "isClearable", "isSearchable", "multiple", "size", "required"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from 'react';
 import SelectStyled from 'react-select';
 import c from 'classnames';
@@ -34,7 +38,8 @@ var SelectInput = function SelectInput(props) {
     _props$multiple = props.multiple,
     multiple = _props$multiple === void 0 ? false : _props$multiple,
     size = props.size,
-    required = props.required;
+    required = props.required,
+    restProps = _objectWithoutProperties(props, _excluded);
   var selectedOption = props.selectedOption;
   var _useExtendedFormikCon = useExtendedFormikContext(),
     values = _useExtendedFormikCon.values,
@@ -83,7 +88,7 @@ var SelectInput = function SelectInput(props) {
     value: value,
     validate: handleValidation
   }, function () {
-    return /*#__PURE__*/React.createElement(SelectStyled, {
+    return /*#__PURE__*/React.createElement(SelectStyled, _extends({}, restProps, {
       id: id,
       inputId: fieldName,
       className: c('Select__select', className),
@@ -146,7 +151,7 @@ var SelectInput = function SelectInput(props) {
           primary75: 'hsla(0,0%,0%, 0)'
         }
       }
-    });
+    }));
   });
 };
 export default SelectInput;

package/dist/components/Form/TextField/index.js

@@ -48,9 +48,24 @@ export var TextField = function TextField(props) {
     errors = _useExtendedFormikCon.errors,
     touched = _useExtendedFormikCon.touched,
     displayRequiredIndicator = _useExtendedFormikCon.displayRequiredIndicator;
-  var isTouched = touched[fieldName];
-  var value = values[fieldName];
-  var error = errors[fieldName];
+
+  // https://www.drupal.org/project/webform_rest/issues/3093890
+
+  // Some Webform Fields (e.g. webform_address, webform_name) consist of composite fields, which are objects.
+  // drupal/webform_rest does not handle that yet. Keys and values are stringified, like so: 'address][address'
+  //
+  // So for errorhandling on composite webform fields, we need some extra logic.
+
+  var nestedFieldname = fieldName.split('][');
+  var isTouched;
+  if (Object.keys(touched).length && touched[nestedFieldname[0]]) {
+    isTouched = nestedFieldname[1] ? touched[nestedFieldname[0]][nestedFieldname[1]] : touched[fieldName];
+  }
+  var error;
+  if (Object.keys(errors).length && errors[nestedFieldname[0]]) {
+    error = nestedFieldname[1] ? errors[nestedFieldname[0]][nestedFieldname[1]] : errors[fieldName];
+  }
+  var value = nestedFieldname[1] ? values[nestedFieldname[0]][nestedFieldname[1]] : values[fieldName];
   return /*#__PURE__*/React.createElement(GenericFormElement, {
     className: c('TextField', wrapperClassName),
     title: title,

package/dist/components/Image/AdaptivePicture/index.js

@@ -80,7 +80,13 @@ var AdaptivePicture = function AdaptivePicture(_ref) {
   }, [fallbackImage, status, targetSrc, validatedSources]);
   var loadedUrl = useImageLoader(fallbackImage, targetSrc, imageRef);
   function onErrorFallback(e) {
-    if (e.target.src !== fallbackImage) {
+    // Make sure that both URLs are absolute URLs, so we can compare them.
+    // Otherwise this error callback will constantly be thrown.
+    var link = document.createElement('a');
+    link.href = e.target.src;
+    var link2 = document.createElement('a');
+    link2.href = fallbackImage;
+    if (link.href !== link2.href) {
       e.target.src = fallbackImage;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uncinc/uncinc-react-kitchen-sink",
-  "version": "2.8.23",
+  "version": "2.8.25",
   "description": "Default React components that are easily extended.",
   "author": "uncinc",
   "license": "MIT",