@financial-times/qanda-ui 0.0.2-beta.1 → 1.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/dist/cjs/components/ExpertDrawer/index.js +1 -0
- package/dist/cjs/components/FloatingActionBar/index.js +22 -1
- package/dist/cjs/components/Stream/index.js +1 -1
- package/dist/esm/components/ExpertDrawer/index.js +1 -0
- package/dist/esm/components/FloatingActionBar/index.js +23 -2
- package/dist/esm/components/Stream/index.js +1 -1
- package/dist/qanda.scss +12 -5
- package/package.json +3 -2
|
@@ -9,11 +9,30 @@ const useIsMobile_1 = require("../../hooks/useIsMobile");
|
|
|
9
9
|
const comments_api_1 = require("../../services/comments-api");
|
|
10
10
|
const updateComments_1 = require("../../store/updateComments");
|
|
11
11
|
const react_1 = require("react");
|
|
12
|
+
const o_utils_1 = require("@financial-times/o-utils");
|
|
12
13
|
const QandaProvider_1 = require("../QandaProvider");
|
|
13
14
|
const tracking_1 = require("../../utils/tracking");
|
|
14
15
|
function LiveIndicator() {
|
|
15
16
|
return ((0, jsx_runtime_1.jsx)("div", { className: "o-labels-indicator--live o3-type-label floating-action-bar__live-container", children: (0, jsx_runtime_1.jsx)("span", { className: "o-labels-indicator__status floating-action-bar__live-label", children: "Live" }) }));
|
|
16
17
|
}
|
|
18
|
+
function useAlignToQanda(ref) {
|
|
19
|
+
(0, react_1.useEffect)(() => {
|
|
20
|
+
const align = () => {
|
|
21
|
+
const container = ref.current;
|
|
22
|
+
const qandaRoot = container?.closest('.qanda-container');
|
|
23
|
+
const target = qandaRoot?.querySelector('.qanda__blocks-container');
|
|
24
|
+
if (!target || !container)
|
|
25
|
+
return;
|
|
26
|
+
const rect = target.getBoundingClientRect();
|
|
27
|
+
container.style.left = `${rect.left}px`;
|
|
28
|
+
container.style.width = `${rect.width}px`;
|
|
29
|
+
};
|
|
30
|
+
align();
|
|
31
|
+
const debounced = (0, o_utils_1.debounce)(align, 100);
|
|
32
|
+
window.addEventListener('resize', debounced);
|
|
33
|
+
return () => window.removeEventListener('resize', debounced);
|
|
34
|
+
}, [ref]);
|
|
35
|
+
}
|
|
17
36
|
function FloatingActionBar({ isLive = true }) {
|
|
18
37
|
const dispatch = (0, react_redux_1.useDispatch)();
|
|
19
38
|
const isMobile = (0, useIsMobile_1.useIsMobile)();
|
|
@@ -58,7 +77,9 @@ function FloatingActionBar({ isLive = true }) {
|
|
|
58
77
|
dataTrackable: 'open_expert_drawer',
|
|
59
78
|
};
|
|
60
79
|
const view = showExpertView ? expertConfig : userConfig;
|
|
61
|
-
|
|
80
|
+
const containerRef = (0, react_1.useRef)(null);
|
|
81
|
+
useAlignToQanda(containerRef);
|
|
82
|
+
return ((0, jsx_runtime_1.jsxs)("div", { ref: containerRef, className: "floating-action-bar__container", "data-trackable": (0, tracking_1.trackingNS)('floating-action-bar'), children: [(0, jsx_runtime_1.jsx)("div", { className: "floating-action-bar__fade-overlay" }), (0, jsx_runtime_1.jsxs)("div", { className: "floating-action-bar", "data-testid": "floating-action-bar", children: [(0, jsx_runtime_1.jsx)("span", { className: "o3-visually-hidden", "aria-live": "polite", role: "alert", children: isLive ? 'This session is now live' : '' }), isLive && (0, jsx_runtime_1.jsx)(LiveIndicator, {}), (0, jsx_runtime_1.jsxs)("div", { className: "floating-action-bar__buttons", ref: modalOpenerRef, children: [(0, jsx_runtime_1.jsx)(o3_button_1.Button, { attributes: {
|
|
62
83
|
ariaLabel: view.description,
|
|
63
84
|
'data-trackable': (0, tracking_1.trackingNS)(view.dataTrackable),
|
|
64
85
|
'data-trackable-context-action': view.description,
|
|
@@ -50,7 +50,7 @@ function Stream({ status = 'pre-live' }) {
|
|
|
50
50
|
});
|
|
51
51
|
}, [data, status]);
|
|
52
52
|
return ((0, jsx_runtime_1.jsxs)("section", { className: "qanda__stream", "data-trackable-context-trigger_action": "view qanda container", children: [data && data.qandas.length > 0 && ((0, jsx_runtime_1.jsx)("h2", { className: "o3-type-title-md qanda__stream-title", id: "qanda__stream-title", children: data.status && data.status === 'pre-live'
|
|
53
|
-
? '
|
|
53
|
+
? 'Need inspiration? A selection of reader questions so far'
|
|
54
54
|
: 'What our readers are asking' })), (0, jsx_runtime_1.jsxs)("div", { className: "qanda__blocks-container", "data-testid": "qanda__blocks-container", id: "qanda__blocks-container", "aria-busy": isLoading, children: [isLoading && ((0, jsx_runtime_1.jsx)(Loader_1.default, { theme: "dark", extraClassNames: "qanda__stream-loader" })), error && ((0, jsx_runtime_1.jsx)(ErrorMessage_1.default, { error: error, storyId: storyId, operation: "loading-stream" })), data &&
|
|
55
55
|
data.qandas &&
|
|
56
56
|
data.qandas.map((qandaBlock) => ((0, jsx_runtime_1.jsx)(index_1.default, { id: qandaBlock.id, body: qandaBlock.body, type: "comment", publishedDate: qandaBlock.publishedDate, author: qandaBlock.author, byline: qandaBlock.byline, showAnswerTime: data.status === 'live', children: qandaBlock.children }, qandaBlock.id)))] })] }));
|
|
@@ -6,12 +6,31 @@ import { openExpertForm } from '../../store/expertSlice';
|
|
|
6
6
|
import { useIsMobile } from '../../hooks/useIsMobile';
|
|
7
7
|
import { useUpdatedComments } from '../../services/comments-api';
|
|
8
8
|
import { updateComments } from '../../store/updateComments';
|
|
9
|
-
import { useContext, useRef } from 'react';
|
|
9
|
+
import { useContext, useRef, useEffect } from 'react';
|
|
10
|
+
import { debounce } from '@financial-times/o-utils';
|
|
10
11
|
import { QandaContext } from '../QandaProvider';
|
|
11
12
|
import { trackingNS } from '../../utils/tracking';
|
|
12
13
|
function LiveIndicator() {
|
|
13
14
|
return (_jsx("div", { className: "o-labels-indicator--live o3-type-label floating-action-bar__live-container", children: _jsx("span", { className: "o-labels-indicator__status floating-action-bar__live-label", children: "Live" }) }));
|
|
14
15
|
}
|
|
16
|
+
function useAlignToQanda(ref) {
|
|
17
|
+
useEffect(() => {
|
|
18
|
+
const align = () => {
|
|
19
|
+
const container = ref.current;
|
|
20
|
+
const qandaRoot = container?.closest('.qanda-container');
|
|
21
|
+
const target = qandaRoot?.querySelector('.qanda__blocks-container');
|
|
22
|
+
if (!target || !container)
|
|
23
|
+
return;
|
|
24
|
+
const rect = target.getBoundingClientRect();
|
|
25
|
+
container.style.left = `${rect.left}px`;
|
|
26
|
+
container.style.width = `${rect.width}px`;
|
|
27
|
+
};
|
|
28
|
+
align();
|
|
29
|
+
const debounced = debounce(align, 100);
|
|
30
|
+
window.addEventListener('resize', debounced);
|
|
31
|
+
return () => window.removeEventListener('resize', debounced);
|
|
32
|
+
}, [ref]);
|
|
33
|
+
}
|
|
15
34
|
function FloatingActionBar({ isLive = true }) {
|
|
16
35
|
const dispatch = useDispatch();
|
|
17
36
|
const isMobile = useIsMobile();
|
|
@@ -56,7 +75,9 @@ function FloatingActionBar({ isLive = true }) {
|
|
|
56
75
|
dataTrackable: 'open_expert_drawer',
|
|
57
76
|
};
|
|
58
77
|
const view = showExpertView ? expertConfig : userConfig;
|
|
59
|
-
|
|
78
|
+
const containerRef = useRef(null);
|
|
79
|
+
useAlignToQanda(containerRef);
|
|
80
|
+
return (_jsxs("div", { ref: containerRef, className: "floating-action-bar__container", "data-trackable": trackingNS('floating-action-bar'), children: [_jsx("div", { className: "floating-action-bar__fade-overlay" }), _jsxs("div", { className: "floating-action-bar", "data-testid": "floating-action-bar", children: [_jsx("span", { className: "o3-visually-hidden", "aria-live": "polite", role: "alert", children: isLive ? 'This session is now live' : '' }), isLive && _jsx(LiveIndicator, {}), _jsxs("div", { className: "floating-action-bar__buttons", ref: modalOpenerRef, children: [_jsx(Button, { attributes: {
|
|
60
81
|
ariaLabel: view.description,
|
|
61
82
|
'data-trackable': trackingNS(view.dataTrackable),
|
|
62
83
|
'data-trackable-context-action': view.description,
|
|
@@ -45,7 +45,7 @@ function Stream({ status = 'pre-live' }) {
|
|
|
45
45
|
});
|
|
46
46
|
}, [data, status]);
|
|
47
47
|
return (_jsxs("section", { className: "qanda__stream", "data-trackable-context-trigger_action": "view qanda container", children: [data && data.qandas.length > 0 && (_jsx("h2", { className: "o3-type-title-md qanda__stream-title", id: "qanda__stream-title", children: data.status && data.status === 'pre-live'
|
|
48
|
-
? '
|
|
48
|
+
? 'Need inspiration? A selection of reader questions so far'
|
|
49
49
|
: 'What our readers are asking' })), _jsxs("div", { className: "qanda__blocks-container", "data-testid": "qanda__blocks-container", id: "qanda__blocks-container", "aria-busy": isLoading, children: [isLoading && (_jsx(Loader, { theme: "dark", extraClassNames: "qanda__stream-loader" })), error && (_jsx(ErrorMessage, { error: error, storyId: storyId, operation: "loading-stream" })), data &&
|
|
50
50
|
data.qandas &&
|
|
51
51
|
data.qandas.map((qandaBlock) => (_jsx(QandaBlock, { id: qandaBlock.id, body: qandaBlock.body, type: "comment", publishedDate: qandaBlock.publishedDate, author: qandaBlock.author, byline: qandaBlock.byline, showAnswerTime: data.status === 'live', children: qandaBlock.children }, qandaBlock.id)))] })] }));
|
package/dist/qanda.scss
CHANGED
|
@@ -38,6 +38,7 @@ $app-header-color: #007acc;
|
|
|
38
38
|
|
|
39
39
|
.qanda-container {
|
|
40
40
|
.live-qa-calendar-container {
|
|
41
|
+
position: relative;
|
|
41
42
|
width: 100%;
|
|
42
43
|
}
|
|
43
44
|
|
|
@@ -55,6 +56,11 @@ $app-header-color: #007acc;
|
|
|
55
56
|
|
|
56
57
|
.live-qa-calendar-list {
|
|
57
58
|
display: flex;
|
|
59
|
+
position: absolute;
|
|
60
|
+
top: 100%;
|
|
61
|
+
left: 0;
|
|
62
|
+
z-index: 1000;
|
|
63
|
+
width: 100%;
|
|
58
64
|
margin-top: 0;
|
|
59
65
|
flex-direction: column;
|
|
60
66
|
align-items: flex-start;
|
|
@@ -167,9 +173,9 @@ $app-header-color: #007acc;
|
|
|
167
173
|
.floating-action-bar__container {
|
|
168
174
|
position: fixed;
|
|
169
175
|
bottom: 0;
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
176
|
+
width: auto;
|
|
177
|
+
left: auto;
|
|
178
|
+
right: auto;
|
|
173
179
|
/* Ensure FAB is on top of ...
|
|
174
180
|
1. some dinamically loaded teasers at the bottom of the article
|
|
175
181
|
2. the sharing bar on mobile
|
|
@@ -198,8 +204,9 @@ $app-header-color: #007acc;
|
|
|
198
204
|
height: 48px;
|
|
199
205
|
background: var(--o3-color-palette-white-60);
|
|
200
206
|
border-radius: 100px;
|
|
201
|
-
|
|
202
|
-
|
|
207
|
+
width: max-content;
|
|
208
|
+
max-width: 100%;
|
|
209
|
+
margin: 0 auto var(--o3-spacing-s);
|
|
203
210
|
padding: 0 var(--o3-spacing-2xs);
|
|
204
211
|
display: flex;
|
|
205
212
|
align-items: center;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@financial-times/qanda-ui",
|
|
3
|
-
"version": "0.0
|
|
3
|
+
"version": "1.0.0",
|
|
4
4
|
"description": "Components for the Live Q&A (AKA Ask an Expert) UI",
|
|
5
5
|
"main": "dist/cjs/index.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -40,6 +40,7 @@
|
|
|
40
40
|
},
|
|
41
41
|
"homepage": "https://github.com/Financial-Times/qanda-ui#readme",
|
|
42
42
|
"dependencies": {
|
|
43
|
+
"@financial-times/o-utils": "^2.2.1",
|
|
43
44
|
"@reduxjs/toolkit": "^1.9.5",
|
|
44
45
|
"classnames": "^2.5.1"
|
|
45
46
|
},
|
|
@@ -49,7 +50,6 @@
|
|
|
49
50
|
"@babel/preset-env": "^7.26.0",
|
|
50
51
|
"@babel/preset-react": "^7.26.3",
|
|
51
52
|
"@babel/preset-typescript": "^7.26.0",
|
|
52
|
-
"@types/react-redux": "^7.1.34",
|
|
53
53
|
"@dotcom-tool-kit/component": "^5.1.12",
|
|
54
54
|
"@dotcom-tool-kit/jest": "^4.3.1",
|
|
55
55
|
"@financial-times/o-colors": "^6.7.0",
|
|
@@ -59,6 +59,7 @@
|
|
|
59
59
|
"@testing-library/preact": "^3.2.4",
|
|
60
60
|
"@types/jest": "^29.5.14",
|
|
61
61
|
"@types/jest-axe": "^3.5.9",
|
|
62
|
+
"@types/react-redux": "^7.1.34",
|
|
62
63
|
"@typescript-eslint/eslint-plugin": "^8.18.0",
|
|
63
64
|
"@typescript-eslint/parser": "^8.18.0",
|
|
64
65
|
"babel-jest": "^29.7.0",
|