@sb1/ffe-feedback-react 6.0.7 → 6.0.9

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.
Files changed (4) hide show
  1. package/es/Feedback.js +22 -22
  2. package/lib/Feedback.js +22 -22
  3. package/package.json +6 -6
  4. package/types/Feedback.d.ts +8 -5
package/es/Feedback.js CHANGED
@@ -8,12 +8,12 @@ import { HighFive } from './HighFive';
8
8
  export var Feedback = function (_a) {
9
9
  var _b;
10
10
  var _c;
11
- var headingLevel = _a.headingLevel, _d = _a.locale, locale = _d === void 0 ? 'nb' : _d, onThumbClick = _a.onThumbClick, onFeedbackSend = _a.onFeedbackSend, bgColor = _a.bgColor, contactLink = _a.contactLink, texts = _a.texts, className = _a.className;
12
- var feedbackSentRef = useRef();
13
- var expandedRef = useRef();
14
- var _e = useState(), feedbackThumbClicked = _e[0], setFeedbackThumbClicked = _e[1];
15
- var _f = useState(false), expanded = _f[0], setExpanded = _f[1];
16
- var _g = useState(false), feedbackSent = _g[0], setFeedbackSent = _g[1];
11
+ var _d = _a.headingLevel, headingLevel = _d === void 0 ? 5 : _d, _e = _a.locale, locale = _e === void 0 ? 'nb' : _e, onThumbClick = _a.onThumbClick, onFeedbackSend = _a.onFeedbackSend, bgColor = _a.bgColor, contactLink = _a.contactLink, texts = _a.texts, className = _a.className;
12
+ var feedbackSentRef = useRef(null);
13
+ var expandedRef = useRef(null);
14
+ var _f = useState(), feedbackThumbClicked = _f[0], setFeedbackThumbClicked = _f[1];
15
+ var _g = useState(false), expanded = _g[0], setExpanded = _g[1];
16
+ var _h = useState(false), feedbackSent = _h[0], setFeedbackSent = _h[1];
17
17
  var headingId = useId();
18
18
  var feedbackClassnames = classNames('ffe-feedback', (_b = {},
19
19
  _b["ffe-feedback--bg-".concat(bgColor)] = bgColor,
@@ -22,7 +22,7 @@ export var Feedback = function (_a) {
22
22
  var _a;
23
23
  setFeedbackThumbClicked(thumb);
24
24
  flushSync(function () {
25
- setExpanded(function (prevState) { return !prevState; });
25
+ setExpanded(true);
26
26
  });
27
27
  (_a = expandedRef.current) === null || _a === void 0 ? void 0 : _a.focus();
28
28
  onThumbClick(thumb);
@@ -35,33 +35,33 @@ export var Feedback = function (_a) {
35
35
  (_a = feedbackSentRef.current) === null || _a === void 0 ? void 0 : _a.focus();
36
36
  onFeedbackSend(feedbackText);
37
37
  };
38
+ var renderHeading = function (level, text, options) {
39
+ var _a;
40
+ var _b = options || {}, ref = _b.ref, tabIndex = _b.tabIndex, id = _b.id, textCenter = _b.textCenter;
41
+ var headingClassName = classNames("ffe-h".concat(level), (_a = {}, _a["ffe-h".concat(level, "--text-center")] = textCenter, _a), 'ffe-feedback__heading');
42
+ return React.createElement("h".concat(level), {
43
+ ref: ref,
44
+ id: id,
45
+ tabIndex: tabIndex,
46
+ className: headingClassName,
47
+ }, text);
48
+ };
38
49
  if (feedbackSent) {
39
50
  return (React.createElement("div", { className: feedbackClassnames },
40
51
  React.createElement("div", { className: "ffe-feedback__content" },
41
- React.createElement("h".concat(headingLevel), {
42
- ref: feedbackSentRef,
43
- tabIndex: -1,
44
- className: 'ffe-h4',
45
- }, txt[locale].FEEDBACK_SENT_HEADING),
52
+ renderHeading(headingLevel, txt[locale].FEEDBACK_SENT_HEADING, { ref: feedbackSentRef, tabIndex: -1 }),
46
53
  React.createElement(HighFive, null))));
47
54
  }
48
55
  if (expanded) {
49
56
  return (React.createElement("div", { className: feedbackClassnames },
50
57
  React.createElement("div", { className: "ffe-feedback__content" },
51
- React.createElement("h".concat(headingLevel), {
52
- ref: expandedRef,
53
- tabIndex: -1,
54
- className: 'ffe-h5 ffe-feedback__heading',
55
- }, feedbackThumbClicked === 'THUMB_UP'
58
+ renderHeading(headingLevel, feedbackThumbClicked === 'THUMB_UP'
56
59
  ? txt[locale].FEEDBACK_GOOD
57
- : txt[locale].FEEDBACK_IMPROVE),
60
+ : txt[locale].FEEDBACK_IMPROVE, { ref: expandedRef, tabIndex: -1 }),
58
61
  React.createElement(FeedbackExpanded, { locale: locale, onSend: handleFeedbackSent, onCancel: function () { return setExpanded(false); }, contactLink: contactLink }))));
59
62
  }
60
63
  return (React.createElement("div", { className: feedbackClassnames },
61
64
  React.createElement("div", { className: "ffe-feedback__content" },
62
- React.createElement("h".concat(headingLevel), {
63
- id: headingId,
64
- className: 'ffe-h4 ffe-h4--text-center ffe-feedback__heading',
65
- }, (_c = texts === null || texts === void 0 ? void 0 : texts.feedbackNotSentHeading) !== null && _c !== void 0 ? _c : txt[locale].FEEDBACK_NOT_SENT_HEADING),
65
+ renderHeading(headingLevel, (_c = texts === null || texts === void 0 ? void 0 : texts.feedbackNotSentHeading) !== null && _c !== void 0 ? _c : txt[locale].FEEDBACK_NOT_SENT_HEADING, { id: headingId, textCenter: true }),
66
66
  React.createElement(FeedbackThumbs, { onClick: handleThumbClicked, locale: locale, headingId: headingId }))));
67
67
  };
package/lib/Feedback.js CHANGED
@@ -47,12 +47,12 @@ var HighFive_1 = require("./HighFive");
47
47
  var Feedback = function (_a) {
48
48
  var _b;
49
49
  var _c;
50
- var headingLevel = _a.headingLevel, _d = _a.locale, locale = _d === void 0 ? 'nb' : _d, onThumbClick = _a.onThumbClick, onFeedbackSend = _a.onFeedbackSend, bgColor = _a.bgColor, contactLink = _a.contactLink, texts = _a.texts, className = _a.className;
51
- var feedbackSentRef = (0, react_1.useRef)();
52
- var expandedRef = (0, react_1.useRef)();
53
- var _e = (0, react_1.useState)(), feedbackThumbClicked = _e[0], setFeedbackThumbClicked = _e[1];
54
- var _f = (0, react_1.useState)(false), expanded = _f[0], setExpanded = _f[1];
55
- var _g = (0, react_1.useState)(false), feedbackSent = _g[0], setFeedbackSent = _g[1];
50
+ var _d = _a.headingLevel, headingLevel = _d === void 0 ? 5 : _d, _e = _a.locale, locale = _e === void 0 ? 'nb' : _e, onThumbClick = _a.onThumbClick, onFeedbackSend = _a.onFeedbackSend, bgColor = _a.bgColor, contactLink = _a.contactLink, texts = _a.texts, className = _a.className;
51
+ var feedbackSentRef = (0, react_1.useRef)(null);
52
+ var expandedRef = (0, react_1.useRef)(null);
53
+ var _f = (0, react_1.useState)(), feedbackThumbClicked = _f[0], setFeedbackThumbClicked = _f[1];
54
+ var _g = (0, react_1.useState)(false), expanded = _g[0], setExpanded = _g[1];
55
+ var _h = (0, react_1.useState)(false), feedbackSent = _h[0], setFeedbackSent = _h[1];
56
56
  var headingId = (0, react_1.useId)();
57
57
  var feedbackClassnames = (0, classnames_1.default)('ffe-feedback', (_b = {},
58
58
  _b["ffe-feedback--bg-".concat(bgColor)] = bgColor,
@@ -61,7 +61,7 @@ var Feedback = function (_a) {
61
61
  var _a;
62
62
  setFeedbackThumbClicked(thumb);
63
63
  (0, react_dom_1.flushSync)(function () {
64
- setExpanded(function (prevState) { return !prevState; });
64
+ setExpanded(true);
65
65
  });
66
66
  (_a = expandedRef.current) === null || _a === void 0 ? void 0 : _a.focus();
67
67
  onThumbClick(thumb);
@@ -74,34 +74,34 @@ var Feedback = function (_a) {
74
74
  (_a = feedbackSentRef.current) === null || _a === void 0 ? void 0 : _a.focus();
75
75
  onFeedbackSend(feedbackText);
76
76
  };
77
+ var renderHeading = function (level, text, options) {
78
+ var _a;
79
+ var _b = options || {}, ref = _b.ref, tabIndex = _b.tabIndex, id = _b.id, textCenter = _b.textCenter;
80
+ var headingClassName = (0, classnames_1.default)("ffe-h".concat(level), (_a = {}, _a["ffe-h".concat(level, "--text-center")] = textCenter, _a), 'ffe-feedback__heading');
81
+ return react_1.default.createElement("h".concat(level), {
82
+ ref: ref,
83
+ id: id,
84
+ tabIndex: tabIndex,
85
+ className: headingClassName,
86
+ }, text);
87
+ };
77
88
  if (feedbackSent) {
78
89
  return (react_1.default.createElement("div", { className: feedbackClassnames },
79
90
  react_1.default.createElement("div", { className: "ffe-feedback__content" },
80
- react_1.default.createElement("h".concat(headingLevel), {
81
- ref: feedbackSentRef,
82
- tabIndex: -1,
83
- className: 'ffe-h4',
84
- }, texts_1.txt[locale].FEEDBACK_SENT_HEADING),
91
+ renderHeading(headingLevel, texts_1.txt[locale].FEEDBACK_SENT_HEADING, { ref: feedbackSentRef, tabIndex: -1 }),
85
92
  react_1.default.createElement(HighFive_1.HighFive, null))));
86
93
  }
87
94
  if (expanded) {
88
95
  return (react_1.default.createElement("div", { className: feedbackClassnames },
89
96
  react_1.default.createElement("div", { className: "ffe-feedback__content" },
90
- react_1.default.createElement("h".concat(headingLevel), {
91
- ref: expandedRef,
92
- tabIndex: -1,
93
- className: 'ffe-h5 ffe-feedback__heading',
94
- }, feedbackThumbClicked === 'THUMB_UP'
97
+ renderHeading(headingLevel, feedbackThumbClicked === 'THUMB_UP'
95
98
  ? texts_1.txt[locale].FEEDBACK_GOOD
96
- : texts_1.txt[locale].FEEDBACK_IMPROVE),
99
+ : texts_1.txt[locale].FEEDBACK_IMPROVE, { ref: expandedRef, tabIndex: -1 }),
97
100
  react_1.default.createElement(FeedbackExpanded_1.FeedbackExpanded, { locale: locale, onSend: handleFeedbackSent, onCancel: function () { return setExpanded(false); }, contactLink: contactLink }))));
98
101
  }
99
102
  return (react_1.default.createElement("div", { className: feedbackClassnames },
100
103
  react_1.default.createElement("div", { className: "ffe-feedback__content" },
101
- react_1.default.createElement("h".concat(headingLevel), {
102
- id: headingId,
103
- className: 'ffe-h4 ffe-h4--text-center ffe-feedback__heading',
104
- }, (_c = texts === null || texts === void 0 ? void 0 : texts.feedbackNotSentHeading) !== null && _c !== void 0 ? _c : texts_1.txt[locale].FEEDBACK_NOT_SENT_HEADING),
104
+ renderHeading(headingLevel, (_c = texts === null || texts === void 0 ? void 0 : texts.feedbackNotSentHeading) !== null && _c !== void 0 ? _c : texts_1.txt[locale].FEEDBACK_NOT_SENT_HEADING, { id: headingId, textCenter: true }),
105
105
  react_1.default.createElement(FeedbackThumbs_1.FeedbackThumbs, { onClick: handleThumbClicked, locale: locale, headingId: headingId }))));
106
106
  };
107
107
  exports.Feedback = Feedback;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sb1/ffe-feedback-react",
3
- "version": "6.0.7",
3
+ "version": "6.0.9",
4
4
  "description": "React component for ffe-feedback",
5
5
  "license": "MIT",
6
6
  "author": "SpareBank 1",
@@ -26,10 +26,10 @@
26
26
  "test:watch": "ffe-buildtool jest --watch"
27
27
  },
28
28
  "dependencies": {
29
- "@sb1/ffe-buttons-react": "^24.0.42",
30
- "@sb1/ffe-core-react": "^9.1.19",
31
- "@sb1/ffe-feedback": "^4.0.4",
32
- "@sb1/ffe-form-react": "^23.1.8",
29
+ "@sb1/ffe-buttons-react": "^24.0.43",
30
+ "@sb1/ffe-core-react": "^9.1.20",
31
+ "@sb1/ffe-feedback": "^4.0.6",
32
+ "@sb1/ffe-form-react": "^23.1.9",
33
33
  "classnames": "^2.3.1"
34
34
  },
35
35
  "devDependencies": {
@@ -44,5 +44,5 @@
44
44
  "publishConfig": {
45
45
  "access": "public"
46
46
  },
47
- "gitHead": "b0e6531049cef4a29b0f9c41c57272bb31ea1ef0"
47
+ "gitHead": "eb02ee394eb7c7835607af234e9e05bccdf097f5"
48
48
  }
package/types/Feedback.d.ts CHANGED
@@ -1,17 +1,20 @@
1
1
  import React from 'react';
2
2
  import { Thumb } from './FeedbackThumbs';
3
3
  import { FeedbackExpandedProps } from './FeedbackExpanded';
4
+ type HeadingLevel = 1 | 2 | 3 | 4 | 5 | 6;
5
+ type Locale = 'nb' | 'nn' | 'en';
6
+ type BgColor = 'primary' | 'secondary' | 'tertiary';
4
7
  export interface FeedbackProps {
5
- headingLevel: 1 | 2 | 3 | 4 | 5 | 6;
6
- locale?: 'nb' | 'nn' | 'en';
8
+ headingLevel?: HeadingLevel;
9
+ locale?: Locale;
7
10
  onThumbClick: (thumb: Thumb) => void;
8
11
  onFeedbackSend: (feedbackText: string) => void;
9
- /** Set the background color of the feedback container. */
10
- bgColor?: 'primary' | 'secondary' | 'tertiary';
12
+ bgColor?: BgColor;
11
13
  contactLink?: FeedbackExpandedProps['contactLink'];
12
14
  texts?: {
13
15
  feedbackNotSentHeading?: string;
14
16
  };
15
17
  className?: string;
16
18
  }
17
- export declare const Feedback: React.FC<FeedbackProps>;
19
+ export declare const Feedback: ({ headingLevel, locale, onThumbClick, onFeedbackSend, bgColor, contactLink, texts, className, }: FeedbackProps) => React.JSX.Element;
20
+ export {};