@sebgroup/green-react 1.0.3 → 1.2.0

package/index.umd.js

@@ -1,12 +1,13 @@
 (function (global, factory) {
-	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react/jsx-runtime'), require('react'), require('@sebgroup/extract')) :
-	typeof define === 'function' && define.amd ? define(['exports', 'react/jsx-runtime', 'react', '@sebgroup/extract'], factory) :
-	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.React = {}, global.jsxRuntime, global.React, global.extract));
-})(this, (function (exports, jsxRuntime, React, extract) { 'use strict';
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('react/jsx-runtime'), require('react'), require('@sebgroup/extract'), require('classnames')) :
+	typeof define === 'function' && define.amd ? define(['exports', 'react/jsx-runtime', 'react', '@sebgroup/extract', 'classnames'], factory) :
+	(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.React = {}, global.jsxRuntime, global.React, global.extract, global.classNames));
+})(this, (function (exports, jsxRuntime, React, extract, classNames) { 'use strict';
 
 	function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 	var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+	var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
 
 	var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -1061,6 +1062,16 @@
 	                t[p[i]] = s[p[i]];
 	        }
 	    return t;
+	}
+
+	function __awaiter(thisArg, _arguments, P, generator) {
+	    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+	    return new (P || (P = Promise))(function (resolve, reject) {
+	        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+	        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+	        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+	        step((generator = generator.apply(thisArg, _arguments || [])).next());
+	    });
 	}
 
 	function Button({
@@ -1773,55 +1784,156 @@
 	  }));
 	}
 
-	const SquareExclamation = jsxRuntime.jsx("svg", Object.assign({
-	  viewBox: "0 0 24 24",
-	  fill: "none",
-	  xmlns: "http://www.w3.org/2000/svg",
-	  "aria-hidden": "true",
-	  focusable: "false"
-	}, {
-	  children: jsxRuntime.jsx("path", {
-	    fillRule: "evenodd",
-	    clipRule: "evenodd",
-	    d: "M18.2857 4H5.71429C4.7675 4 4 4.7675 4 5.71429V18.2857C4 19.2325 4.7675 20 5.71429 20H18.2857C19.2325 20 20 19.2325 20 18.2857V5.71429C20 4.7675 19.2325 4 18.2857 4ZM10.8682 7.42857H13.1318C13.3777 7.42857 13.5731 7.635 13.5597 7.8805L13.2948 12.7376C13.2824 12.9649 13.0945 13.1429 12.8669 13.1429H11.1331C10.9055 13.1429 10.7176 12.9649 10.7052 12.7376L10.4402 7.8805C10.4269 7.635 10.6223 7.42857 10.8682 7.42857ZM12 17.0714C11.0927 17.0714 10.3571 16.3359 10.3571 15.4286C10.3571 14.5213 11.0927 13.7857 12 13.7857C12.9073 13.7857 13.6429 14.5213 13.6429 15.4286C13.6429 16.3359 12.9073 17.0714 12 17.0714Z",
-	    fill: "#333333"
-	  })
-	}));
+	const Check = ({
+	  focusable: _focusable = false,
+	  title
+	}) => {
+	  let id;
+	  if (title) id = extract.randomId();
+	  return jsxRuntime.jsxs("svg", Object.assign({
+	    width: "24",
+	    height: "24",
+	    viewBox: "0 0 24 24",
+	    xmlns: "http://www.w3.org/2000/svg",
+	    focusable: _focusable,
+	    "aria-labelledby": id
+	  }, {
+	    children: ["title && ", jsxRuntime.jsx("title", Object.assign({
+	      id: id
+	    }, {
+	      children: title
+	    })), jsxRuntime.jsx("path", {
+	      d: "M17.6203 6.60836L9.40014 14.8285L6.37976 11.8081C6.23332 11.6617 5.99588 11.6617 5.84942 11.8081L4.96554 12.692C4.8191 12.8384 4.8191 13.0759 4.96554 13.2223L9.13495 17.3917C9.28138 17.5382 9.51882 17.5382 9.66529 17.3917L19.0344 8.02258C19.1809 7.87614 19.1809 7.63871 19.0344 7.49224L18.1506 6.60836C18.0041 6.46193 17.7667 6.46193 17.6203 6.60836Z",
+	      fill: "white"
+	    })]
+	  }));
+	};
 
-	const SquareInfo = jsxRuntime.jsx("svg", Object.assign({
-	  viewBox: "0 0 24 24",
-	  fill: "none",
-	  xmlns: "http://www.w3.org/2000/svg"
-	}, {
-	  children: jsxRuntime.jsx("path", {
-	    d: "M18.2857 4H5.71429C4.7675 4 4 4.7675 4 5.71429V18.2857C4 19.2325 4.7675 20 5.71429 20H18.2857C19.2325 20 20 19.2325 20 18.2857V5.71429C20 4.7675 19.2325 4 18.2857 4ZM12 7.07143C12.8284 7.07143 13.5 7.743 13.5 8.57143C13.5 9.39986 12.8284 10.0714 12 10.0714C11.1716 10.0714 10.5 9.39986 10.5 8.57143C10.5 7.743 11.1716 7.07143 12 7.07143ZM14 16.1429C14 16.3795 13.8081 16.5714 13.5714 16.5714H10.4286C10.1919 16.5714 10 16.3795 10 16.1429V15.2857C10 15.049 10.1919 14.8571 10.4286 14.8571H10.8571V12.5714H10.4286C10.1919 12.5714 10 12.3795 10 12.1429V11.2857C10 11.049 10.1919 10.8571 10.4286 10.8571H12.7143C12.951 10.8571 13.1429 11.049 13.1429 11.2857V14.8571H13.5714C13.8081 14.8571 14 15.049 14 15.2857V16.1429Z",
-	    fill: "#333333"
-	  })
-	}));
+	const ChevronDown = ({
+	  focusable: _focusable = false,
+	  title
+	}) => {
+	  let id;
+	  if (title) id = extract.randomId();
+	  return jsxRuntime.jsxs("svg", Object.assign({
+	    xmlns: "http://www.w3.org/2000/svg",
+	    width: "24",
+	    height: "24",
+	    viewBox: "0 0 448 512",
+	    focusable: _focusable,
+	    "aria-labelledby": id
+	  }, {
+	    children: ["title && ", jsxRuntime.jsx("title", Object.assign({
+	      id: id
+	    }, {
+	      children: title
+	    })), jsxRuntime.jsx("path", {
+	      d: "M441.9 167.3l-19.8-19.8c-4.7-4.7-12.3-4.7-17 0L224 328.2 42.9 147.5c-4.7-4.7-12.3-4.7-17 0L6.1 167.3c-4.7 4.7-4.7 12.3 0 17l209.4 209.4c4.7 4.7 12.3 4.7 17 0l209.4-209.4c4.7-4.7 4.7-12.3 0-17z"
+	    })]
+	  }));
+	};
 
-	const Check = jsxRuntime.jsx("svg", Object.assign({
-	  width: "24",
-	  height: "24",
-	  viewBox: "0 0 24 24",
-	  fill: "none",
-	  xmlns: "http://www.w3.org/2000/svg"
-	}, {
-	  children: jsxRuntime.jsx("path", {
-	    d: "M17.6203 6.60836L9.40014 14.8285L6.37976 11.8081C6.23332 11.6617 5.99588 11.6617 5.84942 11.8081L4.96554 12.692C4.8191 12.8384 4.8191 13.0759 4.96554 13.2223L9.13495 17.3917C9.28138 17.5382 9.51882 17.5382 9.66529 17.3917L19.0344 8.02258C19.1809 7.87614 19.1809 7.63871 19.0344 7.49224L18.1506 6.60836C18.0041 6.46193 17.7667 6.46193 17.6203 6.60836Z",
-	    fill: "white"
-	  })
-	}));
+	const SquareExclamation = _a => {
+	  var {
+	    focusable = false,
+	    title
+	  } = _a,
+	      props = __rest(_a, ["focusable", "title"]);
+
+	  let id;
+	  if (title) id = extract.randomId();
+	  return jsxRuntime.jsxs("svg", Object.assign({
+	    viewBox: "0 0 24 24",
+	    fill: "none",
+	    xmlns: "http://www.w3.org/2000/svg",
+	    "aria-hidden": props['aria-hidden'],
+	    focusable: focusable,
+	    "aria-labelledby": id
+	  }, {
+	    children: [title && jsxRuntime.jsx("title", Object.assign({
+	      id: id
+	    }, {
+	      children: title
+	    })), jsxRuntime.jsx("path", {
+	      fillRule: "evenodd",
+	      clipRule: "evenodd",
+	      d: "M18.2857 4H5.71429C4.7675 4 4 4.7675 4 5.71429V18.2857C4 19.2325 4.7675 20 5.71429 20H18.2857C19.2325 20 20 19.2325 20 18.2857V5.71429C20 4.7675 19.2325 4 18.2857 4ZM10.8682 7.42857H13.1318C13.3777 7.42857 13.5731 7.635 13.5597 7.8805L13.2948 12.7376C13.2824 12.9649 13.0945 13.1429 12.8669 13.1429H11.1331C10.9055 13.1429 10.7176 12.9649 10.7052 12.7376L10.4402 7.8805C10.4269 7.635 10.6223 7.42857 10.8682 7.42857ZM12 17.0714C11.0927 17.0714 10.3571 16.3359 10.3571 15.4286C10.3571 14.5213 11.0927 13.7857 12 13.7857C12.9073 13.7857 13.6429 14.5213 13.6429 15.4286C13.6429 16.3359 12.9073 17.0714 12 17.0714Z",
+	      fill: "#333333"
+	    })]
+	  }));
+	};
 
-	const ChevronDown = jsxRuntime.jsx("svg", Object.assign({
-	  xmlns: "http://www.w3.org/2000/svg",
-	  width: "24",
-	  height: "24",
-	  viewBox: "0 0 448 512"
-	}, {
-	  children: jsxRuntime.jsx("path", {
-	    d: "M441.9 167.3l-19.8-19.8c-4.7-4.7-12.3-4.7-17 0L224 328.2 42.9 147.5c-4.7-4.7-12.3-4.7-17 0L6.1 167.3c-4.7 4.7-4.7 12.3 0 17l209.4 209.4c4.7 4.7 12.3 4.7 17 0l209.4-209.4c4.7-4.7 4.7-12.3 0-17z"
-	  })
-	}));
+	const SquareInfo = _a => {
+	  var {
+	    focusable = false,
+	    title
+	  } = _a,
+	      props = __rest(_a, ["focusable", "title"]);
+
+	  let id;
+	  if (title) id = extract.randomId();
+	  return jsxRuntime.jsx("svg", Object.assign({
+	    viewBox: "0 0 24 24",
+	    fill: "none",
+	    xmlns: "http://www.w3.org/2000/svg",
+	    "aria-labelledby": id,
+	    "aria-hidden": props['aria-hidden'],
+	    focusable: focusable
+	  }, {
+	    children: jsxRuntime.jsx("path", {
+	      d: "M18.2857 4H5.71429C4.7675 4 4 4.7675 4 5.71429V18.2857C4 19.2325 4.7675 20 5.71429 20H18.2857C19.2325 20 20 19.2325 20 18.2857V5.71429C20 4.7675 19.2325 4 18.2857 4ZM12 7.07143C12.8284 7.07143 13.5 7.743 13.5 8.57143C13.5 9.39986 12.8284 10.0714 12 10.0714C11.1716 10.0714 10.5 9.39986 10.5 8.57143C10.5 7.743 11.1716 7.07143 12 7.07143ZM14 16.1429C14 16.3795 13.8081 16.5714 13.5714 16.5714H10.4286C10.1919 16.5714 10 16.3795 10 16.1429V15.2857C10 15.049 10.1919 14.8571 10.4286 14.8571H10.8571V12.5714H10.4286C10.1919 12.5714 10 12.3795 10 12.1429V11.2857C10 11.049 10.1919 10.8571 10.4286 10.8571H12.7143C12.951 10.8571 13.1429 11.049 13.1429 11.2857V14.8571H13.5714C13.8081 14.8571 14 15.049 14 15.2857V16.1429Z",
+	      fill: "#333333"
+	    })
+	  }));
+	};
+
+	const Times = ({
+	  focusable: _focusable = false,
+	  title
+	}) => {
+	  let id;
+	  if (title) id = extract.randomId();
+	  return jsxRuntime.jsxs("svg", Object.assign({
+	    xmlns: "http://www.w3.org/2000/svg",
+	    viewBox: "0 0 320 512",
+	    focusable: _focusable,
+	    "aria-labelledby": id
+	  }, {
+	    children: [title && jsxRuntime.jsx("title", Object.assign({
+	      id: id
+	    }, {
+	      children: title
+	    })), jsxRuntime.jsx("path", {
+	      d: "M207.6 256l107.72-107.72c6.23-6.23 6.23-16.34 0-22.58l-25.03-25.03c-6.23-6.23-16.34-6.23-22.58 0L160 208.4 52.28 100.68c-6.23-6.23-16.34-6.23-22.58 0L4.68 125.7c-6.23 6.23-6.23 16.34 0 22.58L112.4 256 4.68 363.72c-6.23 6.23-6.23 16.34 0 22.58l25.03 25.03c6.23 6.23 16.34 6.23 22.58 0L160 303.6l107.72 107.72c6.23 6.23 16.34 6.23 22.58 0l25.03-25.03c6.23-6.23 6.23-16.34 0-22.58L207.6 256z"
+	    })]
+	  }));
+	};
+
+	const InfoCircle = _a => {
+	  var {
+	    focusable = false,
+	    title
+	  } = _a,
+	      props = __rest(_a, ["focusable", "title"]);
+
+	  let id;
+	  if (title) id = extract.randomId();
+	  return jsxRuntime.jsxs("svg", Object.assign({
+	    xmlns: "http://www.w3.org/2000/svg",
+	    viewBox: "0 0 512 512",
+	    "aria-labelledby": id,
+	    "aria-hidden": props['aria-hidden'],
+	    focusable: focusable
+	  }, {
+	    children: [title && jsxRuntime.jsx("title", Object.assign({
+	      id: id
+	    }, {
+	      children: title
+	    })), jsxRuntime.jsx("path", {
+	      d: "M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 448c-110.532 0-200-89.431-200-200 0-110.495 89.472-200 200-200 110.491 0 200 89.471 200 200 0 110.53-89.431 200-200 200zm0-338c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"
+	    })]
+	  }));
+	};
 
 	function AlertRibbon({
 	  type,
@@ -1832,7 +1944,7 @@
 	  isCloseable = true,
 	  onClose,
 	  role,
-	  "aria-live": ariaLive,
+	  'aria-live': ariaLive,
 	  closeAriaLabel
 	}) {
 	  const [closeButton, setCloseButton] = React.useState();
@@ -1862,15 +1974,21 @@
 
 	  const renderIcon = () => {
 	    switch (type) {
-	      case "danger":
-	      case "warning":
-	        return SquareExclamation;
+	      case 'danger':
+	      case 'warning':
+	        return jsxRuntime.jsx(SquareExclamation, {
+	          "aria-hidden": true
+	        });
 
-	      case "success":
-	        return Check;
+	      case 'success':
+	        return jsxRuntime.jsx(Check, {
+	          "aria-hidden": true
+	        });
 
 	      default:
-	        return SquareInfo;
+	        return jsxRuntime.jsx(SquareInfo, {
+	          "aria-hidden": true
+	        });
 	    }
 	  };
 
@@ -1896,7 +2014,7 @@
 	    })), closeButton && jsxRuntime.jsx("button", Object.assign({
 	      className: "close",
 	      type: "button",
-	      "aria-label": closeAriaLabel !== null && closeAriaLabel !== void 0 ? closeAriaLabel : "Close alert",
+	      "aria-label": closeAriaLabel !== null && closeAriaLabel !== void 0 ? closeAriaLabel : 'Close alert',
 	      onClick: event => {
 	        onClose && onClose(event);
 	      }
@@ -1910,6 +2028,23 @@
 	  }));
 	}
 
+	const IconButton = _a => {
+	  var {
+	    children,
+	    onClick
+	  } = _a,
+	      props = __rest(_a, ["children", "onClick"]);
+
+	  return jsxRuntime.jsx("button", Object.assign({
+	    className: "icon",
+	    onClick: onClick,
+	    "aria-controls": props['aria-controls'],
+	    "aria-expanded": props['aria-expanded']
+	  }, {
+	    children: children
+	  }));
+	};
+
 	const ButtonGroup = ({
 	  children,
 	  selectedIndex,
@@ -2167,6 +2302,112 @@
 	  }));
 	}
 
+	const FormItem = ({
+	  expandableInfo,
+	  label,
+	  labelInformation,
+	  validator,
+	  inputId,
+	  children,
+	  expandableInfoButtonLabel,
+	  role
+	}) => {
+	  const expandableInnerRef = React.useRef(null);
+	  const expandableRef = React.useRef(null);
+	  const [expandableHeight, setExpandableHeight] = React.useState(0);
+	  const [isExpanded, setIsExpanded] = React.useState(false);
+	  const [isHidden, setIsHidden] = React.useState(false);
+	  React.useLayoutEffect(() => {
+	    expandableInnerRef.current && setExpandableHeight(expandableInnerRef.current['clientHeight']);
+	    setIsHidden(true);
+	  }, []);
+	  React.useEffect(() => {
+	    const handleResize = extract.debounce(function setExpandableHeightAfterResize() {
+	      isExpanded && expandableInnerRef.current && setExpandableHeight(expandableInnerRef.current['clientHeight']);
+	    }, 300);
+
+	    if (expandableRef.current) {
+	      window.addEventListener('resize', handleResize);
+	    }
+
+	    return () => {
+	      window.removeEventListener('resize', handleResize);
+	    };
+	  }, [isExpanded, expandableInnerRef]);
+	  if (!inputId) inputId = extract.randomId();
+	  const formItemClassNames = classNames__default["default"]('gds-form-item', validator && extract.validateClassName(validator === null || validator === void 0 ? void 0 : validator.indicator));
+	  return jsxRuntime.jsxs("div", Object.assign({
+	    className: formItemClassNames,
+	    role: role ? role : undefined,
+	    "aria-labelledby": role ? `${inputId}-label` : undefined
+	  }, {
+	    children: [expandableInfo && jsxRuntime.jsx("div", {
+	      className: "gds-form-item__backdrop"
+	    }), jsxRuntime.jsxs("div", Object.assign({
+	      className: "gds-form-item__header"
+	    }, {
+	      children: [jsxRuntime.jsxs("div", Object.assign({
+	        className: "gds-form-item__labels"
+	      }, {
+	        children: [label && jsxRuntime.jsx("label", Object.assign({
+	          id: role ? `${inputId}-label` : undefined,
+	          htmlFor: role ? undefined : inputId
+	        }, {
+	          children: label
+	        })), labelInformation && jsxRuntime.jsx("div", Object.assign({
+	          className: "form-info",
+	          id: `${inputId}_info`
+	        }, {
+	          children: labelInformation
+	        }))]
+	      })), expandableInfo && jsxRuntime.jsx(IconButton, Object.assign({
+	        "aria-expanded": isExpanded,
+	        "aria-controls": `${inputId}-expandable-info`,
+	        onClick: event => __awaiter(void 0, void 0, void 0, function* () {
+	          if (!isExpanded) {
+	            setIsHidden(false);
+	            yield extract.delay(10);
+	            expandableInnerRef.current && setExpandableHeight(expandableInnerRef.current['clientHeight']);
+	            setIsExpanded(true);
+	          } else {
+	            setIsExpanded(false);
+	            yield extract.delay(300);
+	            setIsHidden(true);
+	          }
+	        })
+	      }, {
+	        children: isExpanded ? jsxRuntime.jsx(Times, {
+	          title: expandableInfoButtonLabel
+	        }) : jsxRuntime.jsx(InfoCircle, {
+	          title: expandableInfoButtonLabel
+	        })
+	      }))]
+	    })), expandableInfo && jsxRuntime.jsx("div", Object.assign({
+	      ref: expandableRef,
+	      id: `gds-expandable-info-${inputId}`,
+	      className: "gds-form-item__expandable-info",
+	      hidden: isHidden,
+	      style: {
+	        height: isExpanded ? expandableHeight : 0
+	      }
+	    }, {
+	      children: jsxRuntime.jsxs("div", Object.assign({
+	        ref: expandableInnerRef
+	      }, {
+	        children: [" ", expandableInfo, " "]
+	      }))
+	    })), children, jsxRuntime.jsx("div", Object.assign({
+	      className: "gds-form-item__footer"
+	    }, {
+	      children: validator && jsxRuntime.jsx("span", Object.assign({
+	        className: "form-info"
+	      }, {
+	        children: validator.message
+	      }))
+	    }))]
+	  }));
+	};
+
 	const useInput = (props, onChanges, onChangeInput) => {
 	  const id = React.useMemo(() => props.id || extract.randomId(), [props.id]);
 	  const ref = React.useRef(null);
@@ -2204,7 +2445,7 @@
 	  });
 	};
 
-	const RenderInput = (type, props, onChange, onChangeInput, label, info, validator) => {
+	const RenderInput = (type, props, onChange, onChangeInput, label, info, validator, expandableInfo, expandableInfoButtonLabel) => {
 	  const _a = useInput(props, onChange, onChangeInput),
 	        {
 	    value
@@ -2215,32 +2456,28 @@
 	    'aria-describedby': `${inputProps.id}_info`
 	  }) : inputProps; // Render naked
 
-	  if (!label && !info) return jsxRuntime.jsx("input", Object.assign({
+	  if (!label && !info && !expandableInfo) return jsxRuntime.jsx("input", Object.assign({
 	    type: type,
 	    value: value
 	  }, propsWithDescription));
-	  return jsxRuntime.jsxs("div", Object.assign({
-	    className: "form-group"
+	  return jsxRuntime.jsx(FormItem, Object.assign({
+	    validator: validator,
+	    labelInformation: info,
+	    label: label,
+	    expandableInfo: expandableInfo,
+	    expandableInfoButtonLabel: expandableInfoButtonLabel,
+	    inputId: inputProps.id
 	  }, {
-	    children: [label && jsxRuntime.jsx("label", Object.assign({
-	      htmlFor: inputProps.id
-	    }, {
-	      children: label
-	    })), info && jsxRuntime.jsx("span", Object.assign({
-	      className: "form-info",
-	      id: `${inputProps.id}_info`
-	    }, {
-	      children: info
-	    })), jsxRuntime.jsx("input", Object.assign({
-	      type: type,
-	      value: value
-	    }, propsWithDescription, {
-	      className: validator && extract.validateClassName(validator === null || validator === void 0 ? void 0 : validator.indicator)
-	    })), validator && jsxRuntime.jsx("span", Object.assign({
-	      className: "form-info"
+	    children: jsxRuntime.jsx("div", Object.assign({
+	      className: "gds-input-wrapper"
 	    }, {
-	      children: validator.message
-	    }))]
+	      children: jsxRuntime.jsx("input", Object.assign({
+	        type: type,
+	        value: value
+	      }, propsWithDescription, {
+	        className: validator && extract.validateClassName(validator === null || validator === void 0 ? void 0 : validator.indicator)
+	      }))
+	    }))
 	  }));
 	};
 	const TextInput = _a => {
@@ -2249,11 +2486,13 @@
 	    info,
 	    onChange,
 	    onChangeInput,
-	    validator
+	    validator,
+	    expandableInfo,
+	    expandableInfoButtonLabel
 	  } = _a,
-	      props = __rest(_a, ["label", "info", "onChange", "onChangeInput", "validator"]);
+	      props = __rest(_a, ["label", "info", "onChange", "onChangeInput", "validator", "expandableInfo", "expandableInfoButtonLabel"]);
 
-	  return RenderInput('text', props, onChange, onChangeInput, label, info, validator);
+	  return RenderInput('text', props, onChange, onChangeInput, label, info, validator, expandableInfo, expandableInfoButtonLabel);
 	};
 	const EmailInput = _a => {
 	  var {
@@ -2273,11 +2512,13 @@
 	    info,
 	    onChange,
 	    onChangeInput,
-	    validator
+	    validator,
+	    expandableInfo,
+	    expandableInfoButtonLabel
 	  } = _a,
-	      props = __rest(_a, ["label", "info", "onChange", "onChangeInput", "validator"]);
+	      props = __rest(_a, ["label", "info", "onChange", "onChangeInput", "validator", "expandableInfo", "expandableInfoButtonLabel"]);
 
-	  return RenderInput('number', props, onChange, onChangeInput, label, info, validator);
+	  return RenderInput('number', props, onChange, onChangeInput, label, info, validator, expandableInfo, expandableInfoButtonLabel);
 	};
 	const Checkbox = _a => {
 	  var {
@@ -2288,18 +2529,19 @@
 	      props = __rest(_a, ["label", "onChange", "validator"]);
 
 	  const inputProps = useInput(props, onChange);
-	  const validatorClassName = extract.validateClassName(validator === null || validator === void 0 ? void 0 : validator.indicator);
+	  const labelClassNames = classNames__default["default"]('form-control', validator && extract.validateClassName(validator === null || validator === void 0 ? void 0 : validator.indicator));
+	  const inputClassNames = classNames__default["default"](validator && extract.validateClassName(validator === null || validator === void 0 ? void 0 : validator.indicator));
 	  return jsxRuntime.jsxs("div", Object.assign({
 	    className: "form-group"
 	  }, {
 	    children: [jsxRuntime.jsxs("label", Object.assign({
 	      htmlFor: inputProps.id,
-	      className: `form-control ${validatorClassName}`
+	      className: labelClassNames
 	    }, {
 	      children: [label, jsxRuntime.jsx("input", Object.assign({
 	        type: "checkbox"
 	      }, inputProps, {
-	        className: validatorClassName
+	        className: inputClassNames
 	      })), jsxRuntime.jsx("i", {})]
 	    })), validator && jsxRuntime.jsx("span", Object.assign({
 	      className: "form-info"
@@ -2318,6 +2560,7 @@
 	  const {
 	    id
 	  } = useInput(props);
+	  const inputClassNames = classNames__default["default"](validator);
 	  return jsxRuntime.jsxs("label", Object.assign({
 	    htmlFor: id,
 	    className: "form-control"
@@ -2326,7 +2569,7 @@
 	      id: id,
 	      type: "radio"
 	    }, props, {
-	      className: validator,
+	      className: inputClassNames,
 	      ref: ref
 	    })), jsxRuntime.jsx("span", {
 	      children: label
@@ -2452,14 +2695,21 @@
 	const RadioGroup = ({
 	  defaultSelected,
 	  valueSelected,
-	  description,
+	  label,
 	  title,
+	  labelInformation,
+	  description,
+	  expandableInfo,
+	  expandableInfoButtonLabel,
 	  validator,
 	  onChangeRadio,
 	  onChange,
 	  name,
+	  horizontal,
 	  children
 	}) => {
+	  if (title) console.warn('"title" prop is deprecated. Please use "label" instead.');
+	  if (description) console.warn('"description" prop is deprecated. Please use "labelInformation" instead.');
 	  const [selected, setSelected] = React.useState(valueSelected !== null && valueSelected !== void 0 ? valueSelected : defaultSelected);
 	  const [prevValueSelected, setPrevValueSelected] = React.useState(valueSelected);
 
@@ -2468,7 +2718,7 @@
 	    setPrevValueSelected(valueSelected);
 	  }
 
-	  const validatorClassName = extract.validateClassName(validator === null || validator === void 0 ? void 0 : validator.indicator);
+	  extract.validateClassName(validator === null || validator === void 0 ? void 0 : validator.indicator);
 
 	  const handleOnChange = event => {
 	    if (event.target.value !== selected) {
@@ -2497,34 +2747,34 @@
 	    } // eslint-disable-next-line react-hooks/exhaustive-deps
 
 	  }, []);
-	  return jsxRuntime.jsxs("div", Object.assign({
-	    className: "form-group"
-	  }, {
-	    children: [jsxRuntime.jsxs("fieldset", Object.assign({
-	      className: validatorClassName
-	    }, {
-	      children: [title && jsxRuntime.jsx("legend", {
-	        children: title
-	      }), description && jsxRuntime.jsx("span", Object.assign({
-	        className: "form-info"
-	      }, {
-	        children: description
-	      })), jsxRuntime.jsx("div", {
-	        children: React__default["default"].Children.map(children, radioButton => {
-	          return /*#__PURE__*/React__default["default"].isValidElement(radioButton) ? /*#__PURE__*/React__default["default"].cloneElement(radioButton, {
-	            validator: validatorClassName,
-	            onChange: handleOnChange,
-	            checked: selected === radioButton.props.value,
-	            name,
-	            ref: radioBtnRef
-	          }) : radioButton;
-	        })
-	      })]
-	    })), (validator === null || validator === void 0 ? void 0 : validator.message) && jsxRuntime.jsx("span", Object.assign({
-	      className: "form-info"
+	  const labelFromTitle = label || title;
+	  const labelInformationFromDescription = labelInformation || description;
+	  const formItemProps = {
+	    validator,
+	    labelInformation: labelInformationFromDescription,
+	    label: labelFromTitle,
+	    expandableInfo,
+	    expandableInfoButtonLabel,
+	    role: 'radiogroup'
+	  };
+	  if (!name) name = extract.randomId();
+	  const radioGroupWrapperClassNames = classNames__default["default"]('gds-radio-group-wrapper', {
+	    'gds-radio-group-wrapper--horizontal': horizontal
+	  });
+	  return jsxRuntime.jsx(FormItem, Object.assign({}, formItemProps, {
+	    children: jsxRuntime.jsx("div", Object.assign({
+	      className: radioGroupWrapperClassNames
 	    }, {
-	      children: validator === null || validator === void 0 ? void 0 : validator.message
-	    }))]
+	      children: React__default["default"].Children.map(children, radioButton => {
+	        return /*#__PURE__*/React__default["default"].isValidElement(radioButton) ? /*#__PURE__*/React__default["default"].cloneElement(radioButton, {
+	          validator: validator && extract.validateClassName(validator === null || validator === void 0 ? void 0 : validator.indicator),
+	          onChange: handleOnChange,
+	          checked: selected === radioButton.props.value,
+	          name,
+	          ref: radioBtnRef
+	        }) : radioButton;
+	      })
+	    }))
 	  }));
 	};
 
@@ -2879,49 +3129,38 @@
 	  value,
 	  testId,
 	  onChange,
-	  onSelect
+	  onSelect,
+	  expandableInfo,
+	  expandableInfoButtonLabel
 	}, ref) => {
 	  const selectId = id !== null && id !== void 0 ? id : extract.randomId();
 	  const validatorClassName = extract.validateClassName(validator === null || validator === void 0 ? void 0 : validator.indicator);
-	  return jsxRuntime.jsx(jsxRuntime.Fragment, {
-	    children: jsxRuntime.jsx("div", Object.assign({
-	      className: `form-group ${validator && 'validated'}`
+	  return jsxRuntime.jsx(FormItem, Object.assign({
+	    label: label,
+	    labelInformation: labelInformation,
+	    expandableInfo: expandableInfo,
+	    expandableInfoButtonLabel: expandableInfoButtonLabel,
+	    inputId: selectId,
+	    validator: validator
+	  }, {
+	    children: jsxRuntime.jsxs("div", Object.assign({
+	      className: `gds-select ${validatorClassName}`
 	    }, {
-	      children: jsxRuntime.jsxs("div", Object.assign({
-	        className: "gds--select"
+	      children: [jsxRuntime.jsx("select", Object.assign({
+	        id: selectId,
+	        "data-testid": testId,
+	        className: className,
+	        defaultValue: defaultValue,
+	        value: value,
+	        ref: ref,
+	        onChange: event => {
+	          onChange && onChange(event);
+	        }
 	      }, {
-	        children: [label && jsxRuntime.jsx("label", Object.assign({
-	          htmlFor: selectId
-	        }, {
-	          children: label
-	        })), labelInformation && jsxRuntime.jsx("div", Object.assign({
-	          className: "form-info"
-	        }, {
-	          children: labelInformation
-	        })), jsxRuntime.jsxs("div", Object.assign({
-	          className: `gsd--select-wrapper ${validatorClassName}`
-	        }, {
-	          children: [jsxRuntime.jsx("select", Object.assign({
-	            id: selectId,
-	            "data-testid": testId,
-	            className: className,
-	            defaultValue: defaultValue,
-	            value: value,
-	            ref: ref,
-	            onChange: event => {
-	              onChange && onChange(event);
-	            }
-	          }, {
-	            children: children
-	          })), ChevronDown]
-	        })), (validator === null || validator === void 0 ? void 0 : validator.message) && jsxRuntime.jsx("div", Object.assign({
-	          className: "form-info"
-	        }, {
-	          children: validator.message
-	        }))]
-	      }))
+	        children: children
+	      })), jsxRuntime.jsx(ChevronDown, {})]
 	    }))
-	  });
+	  }));
 	});
 	const Option = _a => {
 	  var {
@@ -3188,11 +3427,9 @@
 	        className: "sg-fieldset-container"
 	      }, {
 	        children: jsxRuntime.jsxs("fieldset", Object.assign({}, multiSelectProps.fieldsetProps, {
-	          children: [jsxRuntime.jsx("legend", Object.assign({}, multiSelectProps.legendProps)), jsxRuntime.jsx("div", {
-	            children: (_a = multiSelectProps.checkboxes) === null || _a === void 0 ? void 0 : _a.map(checkboxItem => jsxRuntime.jsxs("label", Object.assign({}, checkboxItem.labelProps, {
-	              children: [jsxRuntime.jsx("input", Object.assign({}, checkboxItem.inputProps)), jsxRuntime.jsx("span", Object.assign({}, checkboxItem.spanProps)), jsxRuntime.jsx("i", {})]
-	            }), checkboxItem.labelProps.id))
-	          })]
+	          children: [jsxRuntime.jsx("legend", Object.assign({}, multiSelectProps.legendProps)), (_a = multiSelectProps.checkboxes) === null || _a === void 0 ? void 0 : _a.map(checkboxItem => jsxRuntime.jsxs("label", Object.assign({}, checkboxItem.labelProps, {
+	            children: [jsxRuntime.jsx("input", Object.assign({}, checkboxItem.inputProps)), jsxRuntime.jsx("span", Object.assign({}, checkboxItem.spanProps)), jsxRuntime.jsx("i", {})]
+	          }), checkboxItem.labelProps.id))]
 	        }))
 	      })) : jsxRuntime.jsx("ul", Object.assign({
 	        role: "listbox"
@@ -3391,6 +3628,7 @@
 	exports.EmailInput = EmailInput;
 	exports.Flexbox = Flexbox;
 	exports.Form = Form;
+	exports.FormItem = FormItem;
 	exports.FormItems = FormItems;
 	exports.Group = Group;
 	exports.Link = Link;