@sb1/ffe-spinner-react 6.0.7 → 7.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.
package/es/Spinner.js CHANGED
@@ -1,28 +1,35 @@
1
- var _excluded = ["className", "immediate", "large"];
1
+ var _excluded = ["className", "immediate", "large", "loadingText"];
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
- import { bool, string } from 'prop-types';
6
+ import { bool, string, node } from 'prop-types';
7
7
  import classNames from 'classnames';
8
8
  var Spinner = function Spinner(_ref) {
9
9
  var className = _ref.className,
10
10
  immediate = _ref.immediate,
11
11
  large = _ref.large,
12
+ loadingText = _ref.loadingText,
12
13
  rest = _objectWithoutProperties(_ref, _excluded);
13
- return /*#__PURE__*/React.createElement("span", _extends({
14
+ return /*#__PURE__*/React.createElement("div", _extends({
14
15
  "aria-live": "assertive",
16
+ className: className
17
+ }, rest), /*#__PURE__*/React.createElement("span", {
15
18
  className: classNames('ffe-loading-spinner', {
16
19
  'ffe-loading-spinner--immediate': immediate
17
20
  }, {
18
21
  'ffe-loading-spinner--large': large
19
- }, className)
20
- }, rest));
22
+ }),
23
+ role: "img",
24
+ "aria-label": "Vennligst vent",
25
+ "aria-hidden": !!loadingText
26
+ }), loadingText);
21
27
  };
22
28
  Spinner.propTypes = {
23
29
  className: string,
24
30
  immediate: bool,
25
- large: bool
31
+ large: bool,
32
+ loadingText: node
26
33
  };
27
34
  Spinner.defaultProps = {
28
35
  immediate: false,
package/lib/Spinner.js CHANGED
@@ -7,7 +7,7 @@ exports.default = void 0;
7
7
  var _react = _interopRequireDefault(require("react"));
8
8
  var _propTypes = require("prop-types");
9
9
  var _classnames = _interopRequireDefault(require("classnames"));
10
- var _excluded = ["className", "immediate", "large"];
10
+ var _excluded = ["className", "immediate", "large", "loadingText"];
11
11
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
12
12
  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
13
  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; }
@@ -16,20 +16,27 @@ var Spinner = function Spinner(_ref) {
16
16
  var className = _ref.className,
17
17
  immediate = _ref.immediate,
18
18
  large = _ref.large,
19
+ loadingText = _ref.loadingText,
19
20
  rest = _objectWithoutProperties(_ref, _excluded);
20
- return /*#__PURE__*/_react.default.createElement("span", _extends({
21
+ return /*#__PURE__*/_react.default.createElement("div", _extends({
21
22
  "aria-live": "assertive",
23
+ className: className
24
+ }, rest), /*#__PURE__*/_react.default.createElement("span", {
22
25
  className: (0, _classnames.default)('ffe-loading-spinner', {
23
26
  'ffe-loading-spinner--immediate': immediate
24
27
  }, {
25
28
  'ffe-loading-spinner--large': large
26
- }, className)
27
- }, rest));
29
+ }),
30
+ role: "img",
31
+ "aria-label": "Vennligst vent",
32
+ "aria-hidden": !!loadingText
33
+ }), loadingText);
28
34
  };
29
35
  Spinner.propTypes = {
30
36
  className: _propTypes.string,
31
37
  immediate: _propTypes.bool,
32
- large: _propTypes.bool
38
+ large: _propTypes.bool,
39
+ loadingText: _propTypes.node
33
40
  };
34
41
  Spinner.defaultProps = {
35
42
  immediate: false,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sb1/ffe-spinner-react",
3
- "version": "6.0.7",
3
+ "version": "7.0.0",
4
4
  "license": "MIT",
5
5
  "author": "SpareBank 1",
6
6
  "files": [
@@ -24,7 +24,7 @@
24
24
  "test:watch": "ffe-buildtool jest --watch"
25
25
  },
26
26
  "dependencies": {
27
- "@sb1/ffe-spinner": "^5.0.6",
27
+ "@sb1/ffe-spinner": "^5.0.7",
28
28
  "prop-types": "^15.7.2"
29
29
  },
30
30
  "devDependencies": {
@@ -38,5 +38,5 @@
38
38
  "publishConfig": {
39
39
  "access": "public"
40
40
  },
41
- "gitHead": "22b8ad48a07c5afca3100dfef456bb667a0dfb0e"
41
+ "gitHead": "79ea7613ddd3ecd4681094fc1a724ff2181cc87d"
42
42
  }
package/types/index.d.ts CHANGED
@@ -4,6 +4,7 @@ export interface SpinnerProps extends React.ComponentProps<'span'> {
4
4
  className?: string;
5
5
  immediate?: boolean;
6
6
  large?: boolean;
7
+ loadingText: React.ReactNode;
7
8
  }
8
9
 
9
10
  declare class Spinner extends React.Component<SpinnerProps, any> {}