@sb1/ffe-form-react 11.0.10 → 12.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,9 +1,12 @@
1
- var _excluded = ["children", "className", "element", "type"];
1
+ var _excluded = ["children", "className", "element", "type", "role"];
2
2
  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); }
3
3
  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; }
4
4
  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; }
5
5
  import React from 'react';
6
6
  import { node, string, oneOf } from 'prop-types';
7
+ import InfoIkon from "@sb1/ffe-icons-react/es/info-ikon";
8
+ import HakeIkon from "@sb1/ffe-icons-react/es/hake-ikon";
9
+ import UtropstegnIkon from "@sb1/ffe-icons-react/es/utropstegn-ikon";
7
10
  import classNames from 'classnames';
8
11
 
9
12
  /**
@@ -15,18 +18,47 @@ var BaseFieldMessage = function BaseFieldMessage(props) {
15
18
  className = props.className,
16
19
  Element = props.element,
17
20
  type = props.type,
21
+ role = props.role,
18
22
  rest = _objectWithoutProperties(props, _excluded);
19
23
  return /*#__PURE__*/React.createElement(Element, _extends({
20
- className: classNames("ffe-field-".concat(type, "-message"), className)
21
- }, rest), children);
24
+ className: classNames("ffe-field-message", "ffe-field-message--".concat(type), className),
25
+ role: role
26
+ }, rest), /*#__PURE__*/React.createElement("span", {
27
+ className: classNames("ffe-field-message__icon", "ffe-field-message__icon--".concat(type, "'"))
28
+ }, function () {
29
+ switch (type) {
30
+ case 'error':
31
+ return /*#__PURE__*/React.createElement(UtropstegnIkon, {
32
+ role: "img",
33
+ title: "utropstegn-ikon"
34
+ });
35
+ case 'success':
36
+ return /*#__PURE__*/React.createElement(HakeIkon, {
37
+ role: "img",
38
+ title: "hake-ikon"
39
+ });
40
+ case 'info':
41
+ return /*#__PURE__*/React.createElement(InfoIkon, {
42
+ role: "img",
43
+ title: "info-ikon"
44
+ });
45
+ default:
46
+ return /*#__PURE__*/React.createElement(InfoIkon, {
47
+ role: "img",
48
+ title: "info-ikon"
49
+ });
50
+ }
51
+ }()), children);
22
52
  };
23
53
  BaseFieldMessage.defaultProps = {
24
- element: 'div'
54
+ element: 'div',
55
+ role: 'status'
25
56
  };
26
57
  BaseFieldMessage.propTypes = {
27
58
  children: node.isRequired,
28
59
  className: string,
29
60
  element: string,
61
+ role: oneOf(['status', 'alert', 'none']),
30
62
  type: oneOf(['success', 'info', 'error']).isRequired
31
63
  };
32
64
  export default BaseFieldMessage;
@@ -3,8 +3,10 @@ import React from 'react';
3
3
  import BaseFieldMessage from './BaseFieldMessage';
4
4
  var ErrorFieldMessage = function ErrorFieldMessage(props) {
5
5
  return /*#__PURE__*/React.createElement(BaseFieldMessage, _extends({}, props, {
6
- type: "error",
7
- role: "alert"
6
+ type: "error"
8
7
  }));
9
8
  };
9
+ ErrorFieldMessage.defaultProps = {
10
+ role: 'alert'
11
+ };
10
12
  export default ErrorFieldMessage;
package/es/RadioBlock.js CHANGED
@@ -59,7 +59,7 @@ var RadioBlock = /*#__PURE__*/function (_Component) {
59
59
  type: "radio",
60
60
  name: name,
61
61
  value: value,
62
- "aria-describedby": children ? "".concat(this.id, "-described") : undefined
62
+ "aria-describedby": children && showChildren || children && isSelected ? "".concat(this.id, "-described") : undefined
63
63
  }, inputProps)), /*#__PURE__*/React.createElement("div", {
64
64
  className: "ffe-radio-block__content"
65
65
  }, /*#__PURE__*/React.createElement("label", {
@@ -6,8 +6,11 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  var _react = _interopRequireDefault(require("react"));
8
8
  var _propTypes = require("prop-types");
9
+ var _infoIkon = _interopRequireDefault(require("@sb1/ffe-icons-react/lib/info-ikon"));
10
+ var _hakeIkon = _interopRequireDefault(require("@sb1/ffe-icons-react/lib/hake-ikon"));
11
+ var _utropstegnIkon = _interopRequireDefault(require("@sb1/ffe-icons-react/lib/utropstegn-ikon"));
9
12
  var _classnames = _interopRequireDefault(require("classnames"));
10
- var _excluded = ["children", "className", "element", "type"];
13
+ var _excluded = ["children", "className", "element", "type", "role"];
11
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
15
  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); }
13
16
  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; }
@@ -21,18 +24,47 @@ var BaseFieldMessage = function BaseFieldMessage(props) {
21
24
  className = props.className,
22
25
  Element = props.element,
23
26
  type = props.type,
27
+ role = props.role,
24
28
  rest = _objectWithoutProperties(props, _excluded);
25
29
  return /*#__PURE__*/_react.default.createElement(Element, _extends({
26
- className: (0, _classnames.default)("ffe-field-".concat(type, "-message"), className)
27
- }, rest), children);
30
+ className: (0, _classnames.default)("ffe-field-message", "ffe-field-message--".concat(type), className),
31
+ role: role
32
+ }, rest), /*#__PURE__*/_react.default.createElement("span", {
33
+ className: (0, _classnames.default)("ffe-field-message__icon", "ffe-field-message__icon--".concat(type, "'"))
34
+ }, function () {
35
+ switch (type) {
36
+ case 'error':
37
+ return /*#__PURE__*/_react.default.createElement(_utropstegnIkon.default, {
38
+ role: "img",
39
+ title: "utropstegn-ikon"
40
+ });
41
+ case 'success':
42
+ return /*#__PURE__*/_react.default.createElement(_hakeIkon.default, {
43
+ role: "img",
44
+ title: "hake-ikon"
45
+ });
46
+ case 'info':
47
+ return /*#__PURE__*/_react.default.createElement(_infoIkon.default, {
48
+ role: "img",
49
+ title: "info-ikon"
50
+ });
51
+ default:
52
+ return /*#__PURE__*/_react.default.createElement(_infoIkon.default, {
53
+ role: "img",
54
+ title: "info-ikon"
55
+ });
56
+ }
57
+ }()), children);
28
58
  };
29
59
  BaseFieldMessage.defaultProps = {
30
- element: 'div'
60
+ element: 'div',
61
+ role: 'status'
31
62
  };
32
63
  BaseFieldMessage.propTypes = {
33
64
  children: _propTypes.node.isRequired,
34
65
  className: _propTypes.string,
35
66
  element: _propTypes.string,
67
+ role: (0, _propTypes.oneOf)(['status', 'alert', 'none']),
36
68
  type: (0, _propTypes.oneOf)(['success', 'info', 'error']).isRequired
37
69
  };
38
70
  var _default = BaseFieldMessage;
@@ -10,9 +10,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
10
10
  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); }
11
11
  var ErrorFieldMessage = function ErrorFieldMessage(props) {
12
12
  return /*#__PURE__*/_react.default.createElement(_BaseFieldMessage.default, _extends({}, props, {
13
- type: "error",
14
- role: "alert"
13
+ type: "error"
15
14
  }));
16
15
  };
16
+ ErrorFieldMessage.defaultProps = {
17
+ role: 'alert'
18
+ };
17
19
  var _default = ErrorFieldMessage;
18
20
  exports.default = _default;
package/lib/RadioBlock.js CHANGED
@@ -68,7 +68,7 @@ var RadioBlock = /*#__PURE__*/function (_Component) {
68
68
  type: "radio",
69
69
  name: name,
70
70
  value: value,
71
- "aria-describedby": children ? "".concat(this.id, "-described") : undefined
71
+ "aria-describedby": children && showChildren || children && isSelected ? "".concat(this.id, "-described") : undefined
72
72
  }, inputProps)), /*#__PURE__*/_react.default.createElement("div", {
73
73
  className: "ffe-radio-block__content"
74
74
  }, /*#__PURE__*/_react.default.createElement("label", {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sb1/ffe-form-react",
3
- "version": "11.0.10",
3
+ "version": "12.0.0",
4
4
  "description": "React component for form elements in ffe",
5
5
  "license": "MIT",
6
6
  "author": "SpareBank 1",
@@ -26,7 +26,8 @@
26
26
  },
27
27
  "dependencies": {
28
28
  "@sb1/ffe-collapse-react": "^2.0.3",
29
- "@sb1/ffe-form": "^23.0.7",
29
+ "@sb1/ffe-form": "^24.0.0",
30
+ "@sb1/ffe-icons-react": "^7.3.5",
30
31
  "classnames": "^2.3.1",
31
32
  "uuid": "^9.0.0"
32
33
  },
@@ -44,5 +45,5 @@
44
45
  "publishConfig": {
45
46
  "access": "public"
46
47
  },
47
- "gitHead": "0406a4c06677215a066552c558c9ad394d64bd79"
48
+ "gitHead": "cddb926ce3d1487b0307cba35bfbdfaae5ce5604"
48
49
  }
package/types/index.d.ts CHANGED
@@ -18,6 +18,7 @@ export interface BaseFieldMessageProps extends React.ComponentProps<'div'> {
18
18
  children: React.ReactNode;
19
19
  className?: string;
20
20
  element?: string;
21
+ role?: 'status' | 'alert' | 'none';
21
22
  }
22
23
 
23
24
  export interface InputProps extends React.ComponentProps<'input'> {