@axinom/mosaic-ui 0.66.0-rc.13 → 0.66.0-rc.15
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/components/DynamicDataList/DynamicListHeader/DynamicListHeader.d.ts.map +1 -1
- package/dist/components/List/ListHeader/ColumnLabel/ColumnLabel.d.ts.map +1 -1
- package/dist/components/List/ListHeader/ListHeader.d.ts.map +1 -1
- package/dist/components/List/ListRow/ListRow.d.ts.map +1 -1
- package/dist/components/List/ListRow/ListRowCell/ListRowCell.d.ts +15 -0
- package/dist/components/List/ListRow/ListRowCell/ListRowCell.d.ts.map +1 -0
- package/dist/components/List/ListRow/ListRowCell/renderData.d.ts +9 -0
- package/dist/components/List/ListRow/ListRowCell/renderData.d.ts.map +1 -0
- package/dist/components/List/ListRow/Renderers/TagsRenderer/TagsRenderer.d.ts.map +1 -1
- package/dist/components/Utils/Postgraphile/CreateConnectionRenderer.d.ts +1 -1
- package/dist/components/Utils/Postgraphile/CreateConnectionRenderer.d.ts.map +1 -1
- package/dist/helpers/idleCallbackHelpers.d.ts +42 -0
- package/dist/helpers/idleCallbackHelpers.d.ts.map +1 -0
- package/dist/helpers/index.d.ts +1 -0
- package/dist/helpers/index.d.ts.map +1 -1
- package/dist/hooks/useResize/useResize.d.ts +3 -0
- package/dist/hooks/useResize/useResize.d.ts.map +1 -1
- package/dist/index.es.js +4 -4
- package/dist/index.es.js.map +1 -1
- package/dist/index.js +4 -4
- package/dist/index.js.map +1 -1
- package/package.json +2 -2
- package/src/components/DynamicDataList/DynamicDataList.scss +1 -0
- package/src/components/DynamicDataList/DynamicListHeader/DynamicListHeader.scss +10 -0
- package/src/components/DynamicDataList/DynamicListHeader/DynamicListHeader.spec.tsx +2 -0
- package/src/components/DynamicDataList/DynamicListHeader/DynamicListHeader.tsx +65 -49
- package/src/components/List/List.scss +1 -0
- package/src/components/List/ListHeader/ColumnLabel/ColumnLabel.spec.tsx +4 -4
- package/src/components/List/ListHeader/ColumnLabel/ColumnLabel.tsx +5 -1
- package/src/components/List/ListHeader/ListHeader.scss +10 -1
- package/src/components/List/ListHeader/ListHeader.spec.tsx +2 -0
- package/src/components/List/ListHeader/ListHeader.tsx +60 -50
- package/src/components/List/ListRow/ListRow.scss +0 -27
- package/src/components/List/ListRow/ListRow.spec.tsx +10 -8
- package/src/components/List/ListRow/ListRow.tsx +20 -152
- package/src/components/List/ListRow/ListRowCell/ListRowCell.scss +26 -0
- package/src/components/List/ListRow/ListRowCell/ListRowCell.spec.tsx +491 -0
- package/src/components/List/ListRow/ListRowCell/ListRowCell.tsx +57 -0
- package/src/components/List/ListRow/ListRowCell/renderData.tsx +124 -0
- package/src/components/List/ListRow/Renderers/TagsRenderer/TagsRenderer.spec.tsx +191 -80
- package/src/components/List/ListRow/Renderers/TagsRenderer/TagsRenderer.tsx +63 -34
- package/src/components/Utils/Postgraphile/CreateConnectionRenderer.spec.ts +48 -12
- package/src/components/Utils/Postgraphile/CreateConnectionRenderer.tsx +5 -4
- package/src/helpers/idleCallbackHelpers.ts +66 -0
- package/src/helpers/index.ts +5 -0
- package/src/hooks/useResize/useResize.ts +36 -4
|
@@ -1,125 +1,236 @@
|
|
|
1
1
|
import '@testing-library/jest-dom';
|
|
2
|
-
import { render, screen } from '@testing-library/react';
|
|
2
|
+
import { act, render, screen, waitFor } from '@testing-library/react';
|
|
3
3
|
import React from 'react';
|
|
4
|
+
import * as idleCallbackHelpers from '../../../../../helpers/idleCallbackHelpers';
|
|
5
|
+
import { noop } from '../../../../../helpers/utils';
|
|
4
6
|
import { TagsRenderer } from './TagsRenderer';
|
|
5
7
|
|
|
6
|
-
//
|
|
7
|
-
|
|
8
|
-
observe: jest.fn(),
|
|
9
|
-
unobserve: jest.fn(),
|
|
10
|
-
disconnect: jest.fn(),
|
|
11
|
-
}));
|
|
12
|
-
|
|
13
|
-
interface RendererWrapperProps {
|
|
14
|
-
/** Column data */
|
|
8
|
+
// Wrapper component to properly render TagsRenderer
|
|
9
|
+
interface TagsRendererWrapperProps {
|
|
15
10
|
value: unknown;
|
|
16
11
|
}
|
|
17
12
|
|
|
18
|
-
const
|
|
13
|
+
const TagsRendererWrapper: React.FC<TagsRendererWrapperProps> = ({ value }) => {
|
|
19
14
|
return <>{TagsRenderer(value)}</>;
|
|
20
15
|
};
|
|
21
16
|
|
|
22
|
-
|
|
23
|
-
|
|
17
|
+
// Helper to trigger ResizeObserver callback
|
|
18
|
+
const triggerResizeObserver = (): void => {
|
|
19
|
+
const resizeObserverCallback = (global.ResizeObserver as jest.Mock).mock
|
|
20
|
+
.calls[0]?.[0];
|
|
21
|
+
if (resizeObserverCallback) {
|
|
22
|
+
act(() => {
|
|
23
|
+
resizeObserverCallback([]);
|
|
24
|
+
});
|
|
25
|
+
}
|
|
24
26
|
};
|
|
25
27
|
|
|
26
28
|
describe('TagsRenderer', () => {
|
|
29
|
+
let mockResizeObserver: {
|
|
30
|
+
observe: jest.Mock;
|
|
31
|
+
unobserve: jest.Mock;
|
|
32
|
+
disconnect: jest.Mock;
|
|
33
|
+
};
|
|
34
|
+
let mockScheduleIdleCallback: jest.SpyInstance;
|
|
35
|
+
let mockCancelScheduledCallback: jest.SpyInstance;
|
|
36
|
+
|
|
27
37
|
beforeEach(() => {
|
|
28
|
-
//
|
|
29
|
-
|
|
38
|
+
// Setup ResizeObserver mock
|
|
39
|
+
mockResizeObserver = {
|
|
40
|
+
observe: jest.fn(),
|
|
41
|
+
unobserve: jest.fn(),
|
|
42
|
+
disconnect: jest.fn(),
|
|
43
|
+
};
|
|
44
|
+
|
|
45
|
+
global.ResizeObserver = jest
|
|
46
|
+
.fn()
|
|
47
|
+
.mockImplementation(() => mockResizeObserver);
|
|
48
|
+
|
|
49
|
+
// Setup scheduleIdleCallback mock
|
|
50
|
+
mockScheduleIdleCallback = jest
|
|
51
|
+
.spyOn(idleCallbackHelpers, 'scheduleIdleCallback')
|
|
52
|
+
.mockImplementation((callback) => {
|
|
53
|
+
callback({
|
|
54
|
+
didTimeout: false,
|
|
55
|
+
timeRemaining: () => 50,
|
|
56
|
+
} as IdleDeadline);
|
|
57
|
+
return 1;
|
|
58
|
+
});
|
|
59
|
+
|
|
60
|
+
// Setup cancelScheduledCallback mock
|
|
61
|
+
mockCancelScheduledCallback = jest
|
|
62
|
+
.spyOn(idleCallbackHelpers, 'cancelScheduledCallback')
|
|
63
|
+
.mockImplementation(noop);
|
|
64
|
+
|
|
65
|
+
// Mock window.getComputedStyle for font size calculations
|
|
66
|
+
window.getComputedStyle = jest.fn().mockReturnValue({
|
|
67
|
+
fontSize: '14px',
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
// Mock offsetWidth for container
|
|
71
|
+
Object.defineProperty(HTMLElement.prototype, 'offsetWidth', {
|
|
72
|
+
configurable: true,
|
|
73
|
+
writable: true,
|
|
74
|
+
value: 300,
|
|
75
|
+
});
|
|
30
76
|
});
|
|
31
77
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
78
|
+
afterEach(() => {
|
|
79
|
+
// Don't use jest.clearAllMocks() as it removes mock implementations
|
|
80
|
+
// Instead, manually clear just the mock call history
|
|
81
|
+
mockResizeObserver.observe.mockClear();
|
|
82
|
+
mockResizeObserver.unobserve.mockClear();
|
|
83
|
+
mockResizeObserver.disconnect.mockClear();
|
|
84
|
+
mockScheduleIdleCallback.mockClear();
|
|
85
|
+
mockCancelScheduledCallback.mockClear();
|
|
35
86
|
});
|
|
36
87
|
|
|
37
|
-
|
|
38
|
-
|
|
88
|
+
describe('rendering', () => {
|
|
89
|
+
it('should render empty container when value is empty array', () => {
|
|
90
|
+
render(<TagsRendererWrapper value={[]} />);
|
|
39
91
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
value: 300, // Assume container width of 300px
|
|
92
|
+
const container = screen.getByTestId('tags-container');
|
|
93
|
+
expect(container).toBeInTheDocument();
|
|
94
|
+
expect(container).toBeEmptyDOMElement();
|
|
44
95
|
});
|
|
45
96
|
|
|
46
|
-
render(
|
|
97
|
+
it('should render container with title attribute containing all tags', () => {
|
|
98
|
+
const tags = ['tag1', 'tag2', 'tag3'];
|
|
47
99
|
|
|
48
|
-
|
|
49
|
-
const resizeObserverCallback = (global.ResizeObserver as jest.Mock).mock
|
|
50
|
-
.calls[0]?.[0];
|
|
100
|
+
render(<TagsRendererWrapper value={tags} />);
|
|
51
101
|
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
102
|
+
const container = screen.getByTestId('tags-container');
|
|
103
|
+
expect(container).toHaveAttribute('title', 'tag1, tag2, tag3');
|
|
104
|
+
});
|
|
55
105
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
expect(container).toBeInTheDocument();
|
|
59
|
-
});
|
|
106
|
+
it('should render tags when array is provided', () => {
|
|
107
|
+
const tags = ['tag1', 'tag2', 'tag3'];
|
|
60
108
|
|
|
61
|
-
|
|
62
|
-
const mockTags = ['tag1', 'tag2', 'tag3', 'tag4', 'tag5'];
|
|
109
|
+
render(<TagsRendererWrapper value={tags} />);
|
|
63
110
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
111
|
+
const container = screen.getByTestId('tags-container');
|
|
112
|
+
expect(container).toBeInTheDocument();
|
|
113
|
+
|
|
114
|
+
triggerResizeObserver();
|
|
115
|
+
|
|
116
|
+
expect(mockScheduleIdleCallback).toHaveBeenCalled();
|
|
68
117
|
});
|
|
69
118
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
}
|
|
79
|
-
|
|
119
|
+
it('should render tags with proper text content', async () => {
|
|
120
|
+
const tags = ['JavaScript', 'React', 'Testing'];
|
|
121
|
+
Object.defineProperty(HTMLElement.prototype, 'offsetWidth', {
|
|
122
|
+
configurable: true,
|
|
123
|
+
writable: true,
|
|
124
|
+
value: 500,
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
render(<TagsRendererWrapper value={tags} />);
|
|
128
|
+
|
|
129
|
+
triggerResizeObserver();
|
|
130
|
+
|
|
131
|
+
await waitFor(() => {
|
|
132
|
+
expect(screen.getByText('JavaScript')).toBeInTheDocument();
|
|
133
|
+
expect(screen.getByText('React')).toBeInTheDocument();
|
|
134
|
+
expect(screen.getByText('Testing')).toBeInTheDocument();
|
|
135
|
+
});
|
|
80
136
|
});
|
|
137
|
+
});
|
|
81
138
|
|
|
82
|
-
|
|
139
|
+
describe('overflow behavior', () => {
|
|
140
|
+
it('should handle overflow with small container width', () => {
|
|
141
|
+
const tags = ['tag1', 'tag2', 'tag3', 'tag4', 'tag5'];
|
|
83
142
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
143
|
+
Object.defineProperty(HTMLElement.prototype, 'offsetWidth', {
|
|
144
|
+
configurable: true,
|
|
145
|
+
writable: true,
|
|
146
|
+
value: 100,
|
|
147
|
+
});
|
|
87
148
|
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
149
|
+
render(<TagsRendererWrapper value={tags} />);
|
|
150
|
+
|
|
151
|
+
const container = screen.getByTestId('tags-container');
|
|
152
|
+
expect(container).toBeInTheDocument();
|
|
91
153
|
|
|
92
|
-
|
|
93
|
-
expect(screen.getByTestId('tags-container')).toBeInTheDocument();
|
|
154
|
+
triggerResizeObserver();
|
|
94
155
|
|
|
95
|
-
|
|
96
|
-
|
|
156
|
+
expect(mockScheduleIdleCallback).toHaveBeenCalled();
|
|
157
|
+
});
|
|
158
|
+
|
|
159
|
+
it('should display overflow indicator when not all tags fit', async () => {
|
|
160
|
+
const tags = ['tag1', 'tag2', 'tag3', 'tag4', 'tag5'];
|
|
161
|
+
|
|
162
|
+
Object.defineProperty(HTMLElement.prototype, 'offsetWidth', {
|
|
163
|
+
configurable: true,
|
|
164
|
+
writable: true,
|
|
165
|
+
value: 150,
|
|
166
|
+
});
|
|
167
|
+
|
|
168
|
+
render(<TagsRendererWrapper value={tags} />);
|
|
169
|
+
|
|
170
|
+
triggerResizeObserver();
|
|
171
|
+
|
|
172
|
+
// The overflow indicator may or may not appear depending on calculations
|
|
173
|
+
// This test verifies the component handles the scenario without errors
|
|
174
|
+
const container = screen.getByTestId('tags-container');
|
|
175
|
+
expect(container).toBeInTheDocument();
|
|
176
|
+
});
|
|
177
|
+
|
|
178
|
+
it('should handle empty tag list gracefully', () => {
|
|
179
|
+
render(<TagsRendererWrapper value={[]} />);
|
|
180
|
+
|
|
181
|
+
const container = screen.getByTestId('tags-container');
|
|
182
|
+
expect(container).toBeInTheDocument();
|
|
183
|
+
});
|
|
184
|
+
|
|
185
|
+
it('should handle non-array values gracefully', () => {
|
|
186
|
+
render(<TagsRendererWrapper value={null} />);
|
|
187
|
+
|
|
188
|
+
const container = screen.getByTestId('tags-container');
|
|
189
|
+
expect(container).toBeInTheDocument();
|
|
190
|
+
});
|
|
97
191
|
});
|
|
98
192
|
|
|
99
|
-
|
|
100
|
-
|
|
193
|
+
describe('ResizeObserver integration', () => {
|
|
194
|
+
it('should observe container on mount', () => {
|
|
195
|
+
render(<TagsRendererWrapper value={['tag1', 'tag2']} />);
|
|
101
196
|
|
|
102
|
-
|
|
197
|
+
expect(mockResizeObserver.observe).toHaveBeenCalledTimes(1);
|
|
198
|
+
});
|
|
199
|
+
|
|
200
|
+
it('should trigger calculations when ResizeObserver fires', () => {
|
|
201
|
+
render(<TagsRendererWrapper value={['tag1', 'tag2', 'tag3']} />);
|
|
202
|
+
|
|
203
|
+
expect(mockScheduleIdleCallback).not.toHaveBeenCalled();
|
|
204
|
+
|
|
205
|
+
triggerResizeObserver();
|
|
103
206
|
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
expect(container).toBeInTheDocument();
|
|
207
|
+
expect(mockScheduleIdleCallback).toHaveBeenCalled();
|
|
208
|
+
});
|
|
107
209
|
});
|
|
108
210
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
disconnect: mockDisconnect,
|
|
115
|
-
}));
|
|
211
|
+
describe('cleanup', () => {
|
|
212
|
+
it('should disconnect ResizeObserver on unmount', () => {
|
|
213
|
+
const { unmount } = render(
|
|
214
|
+
<TagsRendererWrapper value={['tag1', 'tag2']} />,
|
|
215
|
+
);
|
|
116
216
|
|
|
117
|
-
|
|
118
|
-
<RendererWrapper {...defaultProps} value={['tag1', 'tag2']} />,
|
|
119
|
-
);
|
|
217
|
+
expect(mockResizeObserver.disconnect).not.toHaveBeenCalled();
|
|
120
218
|
|
|
121
|
-
|
|
219
|
+
unmount();
|
|
122
220
|
|
|
123
|
-
|
|
221
|
+
expect(mockResizeObserver.disconnect).toHaveBeenCalledTimes(1);
|
|
222
|
+
});
|
|
223
|
+
|
|
224
|
+
it('should cancel idle callback on unmount if pending', () => {
|
|
225
|
+
const { unmount } = render(
|
|
226
|
+
<TagsRendererWrapper value={['tag1', 'tag2']} />,
|
|
227
|
+
);
|
|
228
|
+
|
|
229
|
+
triggerResizeObserver();
|
|
230
|
+
|
|
231
|
+
unmount();
|
|
232
|
+
|
|
233
|
+
expect(mockCancelScheduledCallback).toHaveBeenCalled();
|
|
234
|
+
});
|
|
124
235
|
});
|
|
125
236
|
});
|
|
@@ -1,17 +1,45 @@
|
|
|
1
|
-
import React, { useEffect, useRef, useState } from 'react';
|
|
1
|
+
import React, { useCallback, useEffect, useRef, useState } from 'react';
|
|
2
|
+
import {
|
|
3
|
+
cancelScheduledCallback,
|
|
4
|
+
scheduleIdleCallback,
|
|
5
|
+
type IdleCallbackHandle,
|
|
6
|
+
} from '../../../../../helpers';
|
|
2
7
|
import classes from './TagsRenderer.scss';
|
|
3
8
|
|
|
4
9
|
export const TagsRenderer = (val: unknown): JSX.Element => {
|
|
5
10
|
const containerRef = useRef<HTMLDivElement>(null);
|
|
6
|
-
const
|
|
7
|
-
const [visibleCount, setVisibleCount] = useState<number>(0);
|
|
11
|
+
const [visibleCount, setVisibleCount] = useState<number | null>(null);
|
|
8
12
|
|
|
9
13
|
const prevValRef = useRef<string[]>([]);
|
|
10
14
|
const valRef = useRef(val);
|
|
11
15
|
valRef.current = val; // Update on every render
|
|
12
16
|
|
|
17
|
+
// Estimate tag width based on text content without DOM manipulation
|
|
18
|
+
const estimateTagWidth = useCallback((text: string): number => {
|
|
19
|
+
const container = containerRef.current;
|
|
20
|
+
if (!container) {
|
|
21
|
+
return 0;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
// Get computed font size from the container
|
|
25
|
+
const computedStyle = window.getComputedStyle(container);
|
|
26
|
+
const fontSize = parseFloat(computedStyle.fontSize) || 14;
|
|
27
|
+
|
|
28
|
+
// Average character width is approximately 0.6 of font size for typical fonts
|
|
29
|
+
// This is a reasonable approximation for most monospace and sans-serif fonts
|
|
30
|
+
const avgCharWidth = fontSize * 0.55;
|
|
31
|
+
|
|
32
|
+
// Tag padding is 5px on each side (10px total) from SCSS
|
|
33
|
+
const padding = 10;
|
|
34
|
+
|
|
35
|
+
// Estimate text width
|
|
36
|
+
const textWidth = text.length * avgCharWidth;
|
|
37
|
+
|
|
38
|
+
return textWidth + padding;
|
|
39
|
+
}, []);
|
|
40
|
+
|
|
13
41
|
// Shared calculation function that uses valRef for current value
|
|
14
|
-
const calculateVisibleItems = (): void => {
|
|
42
|
+
const calculateVisibleItems = useCallback((): void => {
|
|
15
43
|
const currentVal = valRef.current;
|
|
16
44
|
const container = containerRef.current;
|
|
17
45
|
|
|
@@ -23,26 +51,10 @@ export const TagsRenderer = (val: unknown): JSX.Element => {
|
|
|
23
51
|
const gap = 5; // Gap between items from SCSS
|
|
24
52
|
const overflowIndicatorWidth = 60; // Approximate width for "... +X"
|
|
25
53
|
|
|
26
|
-
//
|
|
27
|
-
const tagWidths: number[] = []
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
try {
|
|
31
|
-
(currentVal as string[]).forEach((item) => {
|
|
32
|
-
const tempTag = document.createElement('div');
|
|
33
|
-
tempTag.className = classes.tag;
|
|
34
|
-
tempTag.textContent = item;
|
|
35
|
-
tempTag.style.position = 'absolute';
|
|
36
|
-
tempTag.style.visibility = 'hidden';
|
|
37
|
-
tempTag.style.pointerEvents = 'none';
|
|
38
|
-
container.appendChild(tempTag);
|
|
39
|
-
tempElements.push(tempTag);
|
|
40
|
-
tagWidths.push(tempTag.offsetWidth);
|
|
41
|
-
});
|
|
42
|
-
} finally {
|
|
43
|
-
// Clean up temporary elements
|
|
44
|
-
tempElements.forEach((el) => container.removeChild(el));
|
|
45
|
-
}
|
|
54
|
+
// Estimate tag widths based on text content
|
|
55
|
+
const tagWidths: number[] = (currentVal as string[]).map((item) =>
|
|
56
|
+
estimateTagWidth(item),
|
|
57
|
+
);
|
|
46
58
|
|
|
47
59
|
// Calculate how many items can fit
|
|
48
60
|
let totalWidth = 0;
|
|
@@ -92,7 +104,7 @@ export const TagsRenderer = (val: unknown): JSX.Element => {
|
|
|
92
104
|
|
|
93
105
|
// Update state with the new visible count
|
|
94
106
|
setVisibleCount(newVisibleCount);
|
|
95
|
-
};
|
|
107
|
+
}, [estimateTagWidth]);
|
|
96
108
|
|
|
97
109
|
// Effect 1: Handle tag changes (runs when val changes)
|
|
98
110
|
useEffect(() => {
|
|
@@ -112,35 +124,52 @@ export const TagsRenderer = (val: unknown): JSX.Element => {
|
|
|
112
124
|
calculateVisibleItems();
|
|
113
125
|
prevValRef.current = [...valArray];
|
|
114
126
|
}
|
|
115
|
-
}, [val]);
|
|
127
|
+
}, [val, calculateVisibleItems]);
|
|
128
|
+
|
|
129
|
+
// Ref to store the idle callback ID
|
|
130
|
+
const idleCallbackRef = useRef<IdleCallbackHandle | null>(null);
|
|
116
131
|
|
|
117
|
-
// Effect 2: Set up ResizeObserver (runs once on mount)
|
|
132
|
+
// // Effect 2: Set up ResizeObserver (runs once on mount)
|
|
118
133
|
useEffect(() => {
|
|
119
134
|
if (!containerRef.current) {
|
|
120
135
|
return;
|
|
121
136
|
}
|
|
122
137
|
|
|
123
138
|
const debouncedCalculate = (): void => {
|
|
124
|
-
if (
|
|
125
|
-
|
|
139
|
+
if (idleCallbackRef.current) {
|
|
140
|
+
cancelScheduledCallback(idleCallbackRef.current);
|
|
126
141
|
}
|
|
127
|
-
|
|
142
|
+
idleCallbackRef.current = scheduleIdleCallback(() => {
|
|
128
143
|
calculateVisibleItems();
|
|
129
|
-
}
|
|
144
|
+
});
|
|
130
145
|
};
|
|
131
146
|
|
|
147
|
+
// const resizeObserver = new ResizeObserver(calculateVisibleItems);
|
|
132
148
|
const resizeObserver = new ResizeObserver(debouncedCalculate);
|
|
133
149
|
resizeObserver.observe(containerRef.current);
|
|
134
150
|
|
|
135
151
|
return () => {
|
|
136
|
-
if (
|
|
137
|
-
|
|
152
|
+
if (idleCallbackRef.current) {
|
|
153
|
+
cancelScheduledCallback(idleCallbackRef.current);
|
|
138
154
|
}
|
|
139
155
|
resizeObserver.disconnect();
|
|
140
156
|
};
|
|
141
|
-
}, []);
|
|
157
|
+
}, [calculateVisibleItems]);
|
|
142
158
|
|
|
143
159
|
const stringArray = Array.isArray(val) ? (val as string[]) : [];
|
|
160
|
+
|
|
161
|
+
// Don't render items until we've calculated the visible count
|
|
162
|
+
if (visibleCount === null) {
|
|
163
|
+
return (
|
|
164
|
+
<div
|
|
165
|
+
ref={containerRef}
|
|
166
|
+
className={classes.container}
|
|
167
|
+
data-testid="tags-container"
|
|
168
|
+
title={stringArray.join(', ')}
|
|
169
|
+
/>
|
|
170
|
+
);
|
|
171
|
+
}
|
|
172
|
+
|
|
144
173
|
const visibleItems = stringArray.slice(0, visibleCount);
|
|
145
174
|
const hiddenItems = stringArray.slice(visibleCount);
|
|
146
175
|
|
|
@@ -20,7 +20,10 @@ describe('createConnectionRenderer', () => {
|
|
|
20
20
|
};
|
|
21
21
|
|
|
22
22
|
const selector = (item: { id: string; name: string }) => item.name;
|
|
23
|
-
const renderer = createConnectionRenderer<TestConnection>(
|
|
23
|
+
const renderer = createConnectionRenderer<TestConnection>(
|
|
24
|
+
selector,
|
|
25
|
+
false,
|
|
26
|
+
);
|
|
24
27
|
const result = renderer(connection);
|
|
25
28
|
|
|
26
29
|
expect(result).toBe('Item 1, Item 2, Item 3');
|
|
@@ -32,7 +35,10 @@ describe('createConnectionRenderer', () => {
|
|
|
32
35
|
};
|
|
33
36
|
|
|
34
37
|
const selector = (item: string) => item;
|
|
35
|
-
const renderer = createConnectionRenderer<StringConnection>(
|
|
38
|
+
const renderer = createConnectionRenderer<StringConnection>(
|
|
39
|
+
selector,
|
|
40
|
+
false,
|
|
41
|
+
);
|
|
36
42
|
const result = renderer(connection);
|
|
37
43
|
|
|
38
44
|
expect(result).toBe('apple, banana, cherry');
|
|
@@ -48,7 +54,10 @@ describe('createConnectionRenderer', () => {
|
|
|
48
54
|
|
|
49
55
|
const selector = (item: { id: string; name: string }, index: number) =>
|
|
50
56
|
`${index + 1}. ${item.name} (${item.id})`;
|
|
51
|
-
const renderer = createConnectionRenderer<TestConnection>(
|
|
57
|
+
const renderer = createConnectionRenderer<TestConnection>(
|
|
58
|
+
selector,
|
|
59
|
+
false,
|
|
60
|
+
);
|
|
52
61
|
const result = renderer(connection);
|
|
53
62
|
|
|
54
63
|
expect(result).toBe('1. Item 1 (1), 2. Item 2 (2)');
|
|
@@ -57,7 +66,10 @@ describe('createConnectionRenderer', () => {
|
|
|
57
66
|
it('should return empty string when nodes array is empty', () => {
|
|
58
67
|
const connection: TestConnection = { nodes: [] };
|
|
59
68
|
const selector = (item: { id: string; name: string }) => item.name;
|
|
60
|
-
const renderer = createConnectionRenderer<TestConnection>(
|
|
69
|
+
const renderer = createConnectionRenderer<TestConnection>(
|
|
70
|
+
selector,
|
|
71
|
+
false,
|
|
72
|
+
);
|
|
61
73
|
const result = renderer(connection);
|
|
62
74
|
|
|
63
75
|
expect(result).toBe('');
|
|
@@ -75,7 +87,10 @@ describe('createConnectionRenderer', () => {
|
|
|
75
87
|
};
|
|
76
88
|
|
|
77
89
|
const selector = (item: { id: number; value: number }) => item.value;
|
|
78
|
-
const renderer = createConnectionRenderer<NumberConnection>(
|
|
90
|
+
const renderer = createConnectionRenderer<NumberConnection>(
|
|
91
|
+
selector,
|
|
92
|
+
false,
|
|
93
|
+
);
|
|
79
94
|
const result = renderer(connection);
|
|
80
95
|
|
|
81
96
|
expect(result).toBe('100, 200');
|
|
@@ -84,21 +99,30 @@ describe('createConnectionRenderer', () => {
|
|
|
84
99
|
it('should throw error when connection.nodes is undefined', () => {
|
|
85
100
|
const connection = { nodes: undefined } as unknown as TestConnection;
|
|
86
101
|
const selector = (item: { id: string; name: string }) => item.name;
|
|
87
|
-
const renderer = createConnectionRenderer<TestConnection>(
|
|
102
|
+
const renderer = createConnectionRenderer<TestConnection>(
|
|
103
|
+
selector,
|
|
104
|
+
false,
|
|
105
|
+
);
|
|
88
106
|
|
|
89
107
|
expect(() => renderer(connection)).toThrow();
|
|
90
108
|
});
|
|
91
109
|
|
|
92
110
|
it('should throw error when value is null', () => {
|
|
93
111
|
const selector = (item: { id: string; name: string }) => item.name;
|
|
94
|
-
const renderer = createConnectionRenderer<TestConnection>(
|
|
112
|
+
const renderer = createConnectionRenderer<TestConnection>(
|
|
113
|
+
selector,
|
|
114
|
+
false,
|
|
115
|
+
);
|
|
95
116
|
|
|
96
117
|
expect(() => renderer(null)).toThrow();
|
|
97
118
|
});
|
|
98
119
|
|
|
99
120
|
it('should throw error when value is undefined', () => {
|
|
100
121
|
const selector = (item: { id: string; name: string }) => item.name;
|
|
101
|
-
const renderer = createConnectionRenderer<TestConnection>(
|
|
122
|
+
const renderer = createConnectionRenderer<TestConnection>(
|
|
123
|
+
selector,
|
|
124
|
+
false,
|
|
125
|
+
);
|
|
102
126
|
|
|
103
127
|
expect(() => renderer(undefined)).toThrow();
|
|
104
128
|
});
|
|
@@ -111,7 +135,10 @@ describe('createConnectionRenderer', () => {
|
|
|
111
135
|
};
|
|
112
136
|
|
|
113
137
|
const selector = (item: string) => item;
|
|
114
|
-
const renderer = createConnectionRenderer<StringConnection>(
|
|
138
|
+
const renderer = createConnectionRenderer<StringConnection>(
|
|
139
|
+
selector,
|
|
140
|
+
false,
|
|
141
|
+
);
|
|
115
142
|
const result = renderer(connection);
|
|
116
143
|
|
|
117
144
|
expect(result).toBe('item, with comma, item with "quotes", normal item');
|
|
@@ -127,7 +154,10 @@ describe('createConnectionRenderer', () => {
|
|
|
127
154
|
};
|
|
128
155
|
|
|
129
156
|
const selector = (item: { id: string; name: string }) => item.name;
|
|
130
|
-
const renderer = createConnectionRenderer<TestConnection>(
|
|
157
|
+
const renderer = createConnectionRenderer<TestConnection>(
|
|
158
|
+
selector,
|
|
159
|
+
false,
|
|
160
|
+
);
|
|
131
161
|
const result = renderer(connection);
|
|
132
162
|
|
|
133
163
|
expect(result).toBe(', Item 2, ');
|
|
@@ -139,7 +169,10 @@ describe('createConnectionRenderer', () => {
|
|
|
139
169
|
};
|
|
140
170
|
|
|
141
171
|
const selector = (item: { id: string; name: string }) => item.name;
|
|
142
|
-
const renderer = createConnectionRenderer<TestConnection>(
|
|
172
|
+
const renderer = createConnectionRenderer<TestConnection>(
|
|
173
|
+
selector,
|
|
174
|
+
false,
|
|
175
|
+
);
|
|
143
176
|
const result = renderer(connection);
|
|
144
177
|
|
|
145
178
|
expect(result).toBe('Single Item');
|
|
@@ -161,7 +194,10 @@ describe('createConnectionRenderer', () => {
|
|
|
161
194
|
|
|
162
195
|
const selector = (item: { customField: number; label: string }) =>
|
|
163
196
|
`${item.label}: ${item.customField}`;
|
|
164
|
-
const renderer = createConnectionRenderer<CustomConnection>(
|
|
197
|
+
const renderer = createConnectionRenderer<CustomConnection>(
|
|
198
|
+
selector,
|
|
199
|
+
false,
|
|
200
|
+
);
|
|
165
201
|
const result = renderer(connection);
|
|
166
202
|
|
|
167
203
|
expect(result).toBe('Custom 1: 42, Custom 2: 84');
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ReactNode } from 'react';
|
|
2
|
+
import { TagsRenderer } from '../../List';
|
|
2
3
|
|
|
3
4
|
interface Connection {
|
|
4
5
|
nodes: unknown[];
|
|
@@ -18,14 +19,14 @@ export type SelectorFunction<T> = (
|
|
|
18
19
|
*/
|
|
19
20
|
export function createConnectionRenderer<T extends Connection>(
|
|
20
21
|
selector: SelectorFunction<T['nodes'][number]>,
|
|
21
|
-
|
|
22
|
+
renderAsTags = true,
|
|
22
23
|
): (val: unknown) => string | ReactNode {
|
|
23
24
|
const ConnectionRenderer = (val: unknown): string | ReactNode => {
|
|
24
25
|
const value = val as T;
|
|
25
26
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
27
|
+
if (renderAsTags) {
|
|
28
|
+
return TagsRenderer(value.nodes.map(selector));
|
|
29
|
+
}
|
|
29
30
|
|
|
30
31
|
return value.nodes.map(selector).join(', ');
|
|
31
32
|
};
|