@atlaskit/renderer 112.3.2 → 112.4.1
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/CHANGELOG.md +22 -0
- package/afm-jira/tsconfig.json +113 -113
- package/afm-post-office/tsconfig.json +113 -113
- package/dist/cjs/react/marks/breakout.js +7 -4
- package/dist/cjs/react/nodes/table/sticky.js +14 -6
- package/dist/cjs/react/nodes/table.js +14 -6
- package/dist/cjs/ui/Renderer/index.js +1 -1
- package/dist/es2019/react/marks/breakout.js +8 -5
- package/dist/es2019/react/nodes/table/sticky.js +12 -6
- package/dist/es2019/react/nodes/table.js +12 -6
- package/dist/es2019/ui/Renderer/index.js +1 -1
- package/dist/esm/react/marks/breakout.js +8 -5
- package/dist/esm/react/nodes/table/sticky.js +14 -6
- package/dist/esm/react/nodes/table.js +14 -6
- package/dist/esm/ui/Renderer/index.js +1 -1
- package/dist/types/react/nodes/table/sticky.d.ts +2 -1
- package/dist/types/react/nodes/table.d.ts +1 -0
- package/dist/types/ui/Renderer/types.d.ts +8 -8
- package/dist/types-ts4.5/react/nodes/table/sticky.d.ts +2 -1
- package/dist/types-ts4.5/react/nodes/table.d.ts +1 -0
- package/dist/types-ts4.5/ui/Renderer/types.d.ts +8 -8
- package/package.json +9 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 112.4.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#161210](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/161210)
|
|
8
|
+
[`ffa275ccb1a59`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ffa275ccb1a59) -
|
|
9
|
+
adjust temporary sticky table config options to accept an id rather than the HTMLElement
|
|
10
|
+
- Updated dependencies
|
|
11
|
+
|
|
12
|
+
## 112.4.0
|
|
13
|
+
|
|
14
|
+
### Minor Changes
|
|
15
|
+
|
|
16
|
+
- [#159144](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/159144)
|
|
17
|
+
[`139c972d12c19`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/139c972d12c19) -
|
|
18
|
+
Add calcBreakoutWithCustomWidth function which uses width attribute on breakout mark for node
|
|
19
|
+
width calculation, defaults to mode if not present. Add support in renderer for breakout width
|
|
20
|
+
|
|
21
|
+
### Patch Changes
|
|
22
|
+
|
|
23
|
+
- Updated dependencies
|
|
24
|
+
|
|
3
25
|
## 112.3.2
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
package/afm-jira/tsconfig.json
CHANGED
|
@@ -1,114 +1,114 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
}
|
|
2
|
+
"extends": "../../../../tsconfig.entry-points.jira.json",
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"declaration": true,
|
|
5
|
+
"target": "es5",
|
|
6
|
+
"outDir": "../../../../../tsDist/@atlaskit__renderer/app",
|
|
7
|
+
"rootDir": "../",
|
|
8
|
+
"composite": true
|
|
9
|
+
},
|
|
10
|
+
"include": [
|
|
11
|
+
"../src/**/*.ts",
|
|
12
|
+
"../src/**/*.tsx"
|
|
13
|
+
],
|
|
14
|
+
"exclude": [
|
|
15
|
+
"../src/**/__tests__/*",
|
|
16
|
+
"../src/**/*.test.*",
|
|
17
|
+
"../src/**/test.*"
|
|
18
|
+
],
|
|
19
|
+
"references": [
|
|
20
|
+
{
|
|
21
|
+
"path": "../../adf-utils/afm-jira/tsconfig.json"
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
"path": "../../../analytics/analytics-listeners/afm-jira/tsconfig.json"
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
"path": "../../../analytics/analytics-namespaced-context/afm-jira/tsconfig.json"
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
"path": "../../../analytics/analytics-next/afm-jira/tsconfig.json"
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
"path": "../../../design-system/button/afm-jira/tsconfig.json"
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
"path": "../../../design-system/code/afm-jira/tsconfig.json"
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
"path": "../../editor-common/afm-jira/tsconfig.json"
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
"path": "../../editor-json-transformer/afm-jira/tsconfig.json"
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
"path": "../../editor-palette/afm-jira/tsconfig.json"
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
"path": "../../editor-shared-styles/afm-jira/tsconfig.json"
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
"path": "../../../elements/emoji/afm-jira/tsconfig.json"
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
"path": "../../../measurement/feature-gate-js-client/afm-jira/tsconfig.json"
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
"path": "../../../design-system/icon/afm-jira/tsconfig.json"
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
"path": "../../../linking-platform/link-datasource/afm-jira/tsconfig.json"
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
"path": "../../../media/media-card/afm-jira/tsconfig.json"
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
"path": "../../../media/media-client/afm-jira/tsconfig.json"
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
"path": "../../../media/media-client-react/afm-jira/tsconfig.json"
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
"path": "../../../media/media-common/afm-jira/tsconfig.json"
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
"path": "../../../media/media-filmstrip/afm-jira/tsconfig.json"
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
"path": "../../../media/media-ui/afm-jira/tsconfig.json"
|
|
79
|
+
},
|
|
80
|
+
{
|
|
81
|
+
"path": "../../../media/media-viewer/afm-jira/tsconfig.json"
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
"path": "../../../platform/feature-flags/afm-jira/tsconfig.json"
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
"path": "../../../linking-platform/smart-card/afm-jira/tsconfig.json"
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
"path": "../../../elements/status/afm-jira/tsconfig.json"
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
"path": "../../../elements/task-decision/afm-jira/tsconfig.json"
|
|
94
|
+
},
|
|
95
|
+
{
|
|
96
|
+
"path": "../../../design-system/theme/afm-jira/tsconfig.json"
|
|
97
|
+
},
|
|
98
|
+
{
|
|
99
|
+
"path": "../../tmp-editor-statsig/afm-jira/tsconfig.json"
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
"path": "../../../design-system/tokens/afm-jira/tsconfig.json"
|
|
103
|
+
},
|
|
104
|
+
{
|
|
105
|
+
"path": "../../../design-system/tooltip/afm-jira/tsconfig.json"
|
|
106
|
+
},
|
|
107
|
+
{
|
|
108
|
+
"path": "../../../linking-platform/link-provider/afm-jira/tsconfig.json"
|
|
109
|
+
},
|
|
110
|
+
{
|
|
111
|
+
"path": "../../../media/media-core/afm-jira/tsconfig.json"
|
|
112
|
+
}
|
|
113
|
+
]
|
|
114
|
+
}
|
|
@@ -1,114 +1,114 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
}
|
|
2
|
+
"extends": "../../../../tsconfig.entry-points.post-office.json",
|
|
3
|
+
"compilerOptions": {
|
|
4
|
+
"declaration": true,
|
|
5
|
+
"target": "es5",
|
|
6
|
+
"outDir": "../../../../../tsDist/@atlaskit__renderer/app",
|
|
7
|
+
"rootDir": "../",
|
|
8
|
+
"composite": true
|
|
9
|
+
},
|
|
10
|
+
"include": [
|
|
11
|
+
"../src/**/*.ts",
|
|
12
|
+
"../src/**/*.tsx"
|
|
13
|
+
],
|
|
14
|
+
"exclude": [
|
|
15
|
+
"../src/**/__tests__/*",
|
|
16
|
+
"../src/**/*.test.*",
|
|
17
|
+
"../src/**/test.*"
|
|
18
|
+
],
|
|
19
|
+
"references": [
|
|
20
|
+
{
|
|
21
|
+
"path": "../../adf-utils/afm-post-office/tsconfig.json"
|
|
22
|
+
},
|
|
23
|
+
{
|
|
24
|
+
"path": "../../../analytics/analytics-listeners/afm-post-office/tsconfig.json"
|
|
25
|
+
},
|
|
26
|
+
{
|
|
27
|
+
"path": "../../../analytics/analytics-namespaced-context/afm-post-office/tsconfig.json"
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
"path": "../../../analytics/analytics-next/afm-post-office/tsconfig.json"
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
"path": "../../../design-system/button/afm-post-office/tsconfig.json"
|
|
34
|
+
},
|
|
35
|
+
{
|
|
36
|
+
"path": "../../../design-system/code/afm-post-office/tsconfig.json"
|
|
37
|
+
},
|
|
38
|
+
{
|
|
39
|
+
"path": "../../editor-common/afm-post-office/tsconfig.json"
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
"path": "../../editor-json-transformer/afm-post-office/tsconfig.json"
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
"path": "../../editor-palette/afm-post-office/tsconfig.json"
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
"path": "../../editor-shared-styles/afm-post-office/tsconfig.json"
|
|
49
|
+
},
|
|
50
|
+
{
|
|
51
|
+
"path": "../../../elements/emoji/afm-post-office/tsconfig.json"
|
|
52
|
+
},
|
|
53
|
+
{
|
|
54
|
+
"path": "../../../measurement/feature-gate-js-client/afm-post-office/tsconfig.json"
|
|
55
|
+
},
|
|
56
|
+
{
|
|
57
|
+
"path": "../../../design-system/icon/afm-post-office/tsconfig.json"
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
"path": "../../../linking-platform/link-datasource/afm-post-office/tsconfig.json"
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
"path": "../../../media/media-card/afm-post-office/tsconfig.json"
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
"path": "../../../media/media-client/afm-post-office/tsconfig.json"
|
|
67
|
+
},
|
|
68
|
+
{
|
|
69
|
+
"path": "../../../media/media-client-react/afm-post-office/tsconfig.json"
|
|
70
|
+
},
|
|
71
|
+
{
|
|
72
|
+
"path": "../../../media/media-common/afm-post-office/tsconfig.json"
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
"path": "../../../media/media-filmstrip/afm-post-office/tsconfig.json"
|
|
76
|
+
},
|
|
77
|
+
{
|
|
78
|
+
"path": "../../../media/media-ui/afm-post-office/tsconfig.json"
|
|
79
|
+
},
|
|
80
|
+
{
|
|
81
|
+
"path": "../../../media/media-viewer/afm-post-office/tsconfig.json"
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
"path": "../../../platform/feature-flags/afm-post-office/tsconfig.json"
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
"path": "../../../linking-platform/smart-card/afm-post-office/tsconfig.json"
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
"path": "../../../elements/status/afm-post-office/tsconfig.json"
|
|
91
|
+
},
|
|
92
|
+
{
|
|
93
|
+
"path": "../../../elements/task-decision/afm-post-office/tsconfig.json"
|
|
94
|
+
},
|
|
95
|
+
{
|
|
96
|
+
"path": "../../../design-system/theme/afm-post-office/tsconfig.json"
|
|
97
|
+
},
|
|
98
|
+
{
|
|
99
|
+
"path": "../../tmp-editor-statsig/afm-post-office/tsconfig.json"
|
|
100
|
+
},
|
|
101
|
+
{
|
|
102
|
+
"path": "../../../design-system/tokens/afm-post-office/tsconfig.json"
|
|
103
|
+
},
|
|
104
|
+
{
|
|
105
|
+
"path": "../../../design-system/tooltip/afm-post-office/tsconfig.json"
|
|
106
|
+
},
|
|
107
|
+
{
|
|
108
|
+
"path": "../../../linking-platform/link-provider/afm-post-office/tsconfig.json"
|
|
109
|
+
},
|
|
110
|
+
{
|
|
111
|
+
"path": "../../../media/media-core/afm-post-office/tsconfig.json"
|
|
112
|
+
}
|
|
113
|
+
]
|
|
114
|
+
}
|
|
@@ -8,6 +8,7 @@ var _react = require("@emotion/react");
|
|
|
8
8
|
var _ui = require("@atlaskit/editor-common/ui");
|
|
9
9
|
var _utils = require("@atlaskit/editor-common/utils");
|
|
10
10
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
11
|
+
var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
|
|
11
12
|
/**
|
|
12
13
|
* @jsxRuntime classic
|
|
13
14
|
* @jsx jsx
|
|
@@ -26,11 +27,13 @@ function Breakout(props) {
|
|
|
26
27
|
var width = _ref.width;
|
|
27
28
|
return (0, _react.jsx)("div", {
|
|
28
29
|
css: wrapperStyles,
|
|
29
|
-
"data-mode": props.mode
|
|
30
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
31
|
-
,
|
|
30
|
+
"data-mode": props.mode,
|
|
32
31
|
style: {
|
|
33
|
-
width: (0,
|
|
32
|
+
width: (0, _platformFeatureFlags.fg)('platform_editor_advanced_layouts_breakout_resizing') ?
|
|
33
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
34
|
+
(0, _utils.calcBreakoutWithCustomWidth)(props.mode, 'width' in props ? props.width : null, width) :
|
|
35
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
36
|
+
(0, _utils.calcBreakoutWidth)(props.mode, width)
|
|
34
37
|
}
|
|
35
38
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
36
39
|
,
|
|
@@ -173,7 +173,7 @@ var StickyTable = exports.StickyTable = function StickyTable(_ref) {
|
|
|
173
173
|
/**
|
|
174
174
|
* Traverse DOM Tree upwards looking for table parents with "overflow: scroll".
|
|
175
175
|
*/
|
|
176
|
-
function findHorizontalOverflowScrollParent(table,
|
|
176
|
+
function findHorizontalOverflowScrollParent(table, defaultScrollRootId) {
|
|
177
177
|
var parent = table;
|
|
178
178
|
if (!parent) {
|
|
179
179
|
return null;
|
|
@@ -184,9 +184,9 @@ function findHorizontalOverflowScrollParent(table, defaultScrollRootEl) {
|
|
|
184
184
|
if (style.overflow === 'scroll' || style.overflowY === 'scroll') {
|
|
185
185
|
return parent;
|
|
186
186
|
}
|
|
187
|
-
if (!!
|
|
188
|
-
// If a
|
|
189
|
-
// use the
|
|
187
|
+
if (!!defaultScrollRootId && parent.id === defaultScrollRootId) {
|
|
188
|
+
// If a defaultScrollRootId was specified and we reached the element with this id without finding a closer
|
|
189
|
+
// scroll parent, use this element as the scroll parent
|
|
190
190
|
return parent;
|
|
191
191
|
}
|
|
192
192
|
}
|
|
@@ -203,6 +203,14 @@ var OverflowParent = exports.OverflowParent = /*#__PURE__*/function () {
|
|
|
203
203
|
get: function get() {
|
|
204
204
|
return this.ref instanceof HTMLElement;
|
|
205
205
|
}
|
|
206
|
+
}, {
|
|
207
|
+
key: "id",
|
|
208
|
+
get: function get() {
|
|
209
|
+
if (this.ref instanceof HTMLElement) {
|
|
210
|
+
return this.ref.id;
|
|
211
|
+
}
|
|
212
|
+
return '';
|
|
213
|
+
}
|
|
206
214
|
}, {
|
|
207
215
|
key: "top",
|
|
208
216
|
get: function get() {
|
|
@@ -231,8 +239,8 @@ var OverflowParent = exports.OverflowParent = /*#__PURE__*/function () {
|
|
|
231
239
|
}
|
|
232
240
|
}], [{
|
|
233
241
|
key: "fromElement",
|
|
234
|
-
value: function fromElement(el,
|
|
235
|
-
return new OverflowParent(findHorizontalOverflowScrollParent(el,
|
|
242
|
+
value: function fromElement(el, defaultScrollRootId) {
|
|
243
|
+
return new OverflowParent(findHorizontalOverflowScrollParent(el, defaultScrollRootId) || window);
|
|
236
244
|
}
|
|
237
245
|
}]);
|
|
238
246
|
return OverflowParent;
|
|
@@ -254,7 +254,7 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
254
254
|
}
|
|
255
255
|
if (this.props.stickyHeaders) {
|
|
256
256
|
var _this$props$stickyHea;
|
|
257
|
-
this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.
|
|
257
|
+
this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRootId_DO_NOT_USE);
|
|
258
258
|
this.overflowParent.addEventListener('scroll', this.onScroll);
|
|
259
259
|
}
|
|
260
260
|
if (this.wrapperRef.current && isStickyScrollbarEnabled(this.props.rendererAppearance)) {
|
|
@@ -267,7 +267,7 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
267
267
|
// toggling sticky headers visiblity
|
|
268
268
|
if (this.props.stickyHeaders && !this.overflowParent) {
|
|
269
269
|
var _this$props$stickyHea2;
|
|
270
|
-
this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.
|
|
270
|
+
this.overflowParent = _sticky.OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRootId_DO_NOT_USE);
|
|
271
271
|
} else if (!this.props.stickyHeaders && this.overflowParent) {
|
|
272
272
|
this.overflowParent.removeEventListener('scroll', this.onScroll);
|
|
273
273
|
this.overflowParent = null;
|
|
@@ -291,6 +291,15 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
291
291
|
}
|
|
292
292
|
return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight + _styles.tableMarginTop - _sticky.tableStickyPadding;
|
|
293
293
|
}
|
|
294
|
+
}, {
|
|
295
|
+
key: "shouldAddOverflowParentOffsetTop_DO_NOT_USE",
|
|
296
|
+
get: function get() {
|
|
297
|
+
// IF the StickyHeaderConfig specifies that the default scroll root offsetTop should be added
|
|
298
|
+
// AND the StickyHeaderConfig specifies a default scroll root id
|
|
299
|
+
// AND the OverflowParent is the corresponding element
|
|
300
|
+
// THEN we should add the OverflowParent offset top (RETURN TRUE)
|
|
301
|
+
return this.props.stickyHeaders && !!this.props.stickyHeaders.shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE && !!this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE && this.overflowParent && this.overflowParent.id === this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE;
|
|
302
|
+
}
|
|
294
303
|
}, {
|
|
295
304
|
key: "stickyTop",
|
|
296
305
|
get: function get() {
|
|
@@ -299,10 +308,9 @@ var TableContainer = exports.TableContainer = /*#__PURE__*/function (_React$Comp
|
|
|
299
308
|
return this.pinTop;
|
|
300
309
|
case 'stick':
|
|
301
310
|
var offsetTop = this.props.stickyHeaders && this.props.stickyHeaders.offsetTop;
|
|
302
|
-
if (typeof offsetTop === 'number') {
|
|
303
|
-
var
|
|
304
|
-
|
|
305
|
-
return offsetTop + defaultScrollRootOffsetTop;
|
|
311
|
+
if (typeof offsetTop === 'number' && this.shouldAddOverflowParentOffsetTop_DO_NOT_USE) {
|
|
312
|
+
var overflowParentOffsetTop = this.overflowParent ? this.overflowParent.top : 0;
|
|
313
|
+
return offsetTop + overflowParentOffsetTop;
|
|
306
314
|
} else {
|
|
307
315
|
return offsetTop;
|
|
308
316
|
}
|
|
@@ -65,7 +65,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
65
65
|
var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
66
66
|
var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
67
67
|
var packageName = "@atlaskit/renderer";
|
|
68
|
-
var packageVersion = "112.
|
|
68
|
+
var packageVersion = "112.4.1";
|
|
69
69
|
var setAsQueryContainerStyles = (0, _react2.css)({
|
|
70
70
|
containerName: 'ak-renderer-wrapper',
|
|
71
71
|
containerType: 'inline-size',
|
|
@@ -5,8 +5,9 @@
|
|
|
5
5
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
6
6
|
import { css, jsx } from '@emotion/react';
|
|
7
7
|
import { WidthConsumer } from '@atlaskit/editor-common/ui';
|
|
8
|
-
import { calcBreakoutWidth } from '@atlaskit/editor-common/utils';
|
|
8
|
+
import { calcBreakoutWithCustomWidth, calcBreakoutWidth } from '@atlaskit/editor-common/utils';
|
|
9
9
|
import { blockNodesVerticalMargin } from '@atlaskit/editor-shared-styles';
|
|
10
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
10
11
|
const wrapperStyles = css({
|
|
11
12
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
12
13
|
margin: `${blockNodesVerticalMargin} 0`,
|
|
@@ -19,11 +20,13 @@ export default function Breakout(props) {
|
|
|
19
20
|
width
|
|
20
21
|
}) => jsx("div", {
|
|
21
22
|
css: wrapperStyles,
|
|
22
|
-
"data-mode": props.mode
|
|
23
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
24
|
-
,
|
|
23
|
+
"data-mode": props.mode,
|
|
25
24
|
style: {
|
|
26
|
-
width:
|
|
25
|
+
width: fg('platform_editor_advanced_layouts_breakout_resizing') ?
|
|
26
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
27
|
+
calcBreakoutWithCustomWidth(props.mode, 'width' in props ? props.width : null, width) :
|
|
28
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
29
|
+
calcBreakoutWidth(props.mode, width)
|
|
27
30
|
}
|
|
28
31
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
29
32
|
,
|
|
@@ -174,7 +174,7 @@ export const StickyTable = ({
|
|
|
174
174
|
/**
|
|
175
175
|
* Traverse DOM Tree upwards looking for table parents with "overflow: scroll".
|
|
176
176
|
*/
|
|
177
|
-
function findHorizontalOverflowScrollParent(table,
|
|
177
|
+
function findHorizontalOverflowScrollParent(table, defaultScrollRootId) {
|
|
178
178
|
let parent = table;
|
|
179
179
|
if (!parent) {
|
|
180
180
|
return null;
|
|
@@ -185,9 +185,9 @@ function findHorizontalOverflowScrollParent(table, defaultScrollRootEl) {
|
|
|
185
185
|
if (style.overflow === 'scroll' || style.overflowY === 'scroll') {
|
|
186
186
|
return parent;
|
|
187
187
|
}
|
|
188
|
-
if (!!
|
|
189
|
-
// If a
|
|
190
|
-
// use the
|
|
188
|
+
if (!!defaultScrollRootId && parent.id === defaultScrollRootId) {
|
|
189
|
+
// If a defaultScrollRootId was specified and we reached the element with this id without finding a closer
|
|
190
|
+
// scroll parent, use this element as the scroll parent
|
|
191
191
|
return parent;
|
|
192
192
|
}
|
|
193
193
|
}
|
|
@@ -198,12 +198,18 @@ export class OverflowParent {
|
|
|
198
198
|
this.ref = ref;
|
|
199
199
|
this.ref = ref;
|
|
200
200
|
}
|
|
201
|
-
static fromElement(el,
|
|
202
|
-
return new OverflowParent(findHorizontalOverflowScrollParent(el,
|
|
201
|
+
static fromElement(el, defaultScrollRootId) {
|
|
202
|
+
return new OverflowParent(findHorizontalOverflowScrollParent(el, defaultScrollRootId) || window);
|
|
203
203
|
}
|
|
204
204
|
get isElement() {
|
|
205
205
|
return this.ref instanceof HTMLElement;
|
|
206
206
|
}
|
|
207
|
+
get id() {
|
|
208
|
+
if (this.ref instanceof HTMLElement) {
|
|
209
|
+
return this.ref.id;
|
|
210
|
+
}
|
|
211
|
+
return '';
|
|
212
|
+
}
|
|
207
213
|
get top() {
|
|
208
214
|
if (this.ref instanceof HTMLElement) {
|
|
209
215
|
return this.ref.getBoundingClientRect().top;
|
|
@@ -205,7 +205,7 @@ export class TableContainer extends React.Component {
|
|
|
205
205
|
}
|
|
206
206
|
if (this.props.stickyHeaders) {
|
|
207
207
|
var _this$props$stickyHea;
|
|
208
|
-
this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.
|
|
208
|
+
this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRootId_DO_NOT_USE);
|
|
209
209
|
this.overflowParent.addEventListener('scroll', this.onScroll);
|
|
210
210
|
}
|
|
211
211
|
if (this.wrapperRef.current && isStickyScrollbarEnabled(this.props.rendererAppearance)) {
|
|
@@ -216,7 +216,7 @@ export class TableContainer extends React.Component {
|
|
|
216
216
|
// toggling sticky headers visiblity
|
|
217
217
|
if (this.props.stickyHeaders && !this.overflowParent) {
|
|
218
218
|
var _this$props$stickyHea2;
|
|
219
|
-
this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.
|
|
219
|
+
this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRootId_DO_NOT_USE);
|
|
220
220
|
} else if (!this.props.stickyHeaders && this.overflowParent) {
|
|
221
221
|
this.overflowParent.removeEventListener('scroll', this.onScroll);
|
|
222
222
|
this.overflowParent = null;
|
|
@@ -238,16 +238,22 @@ export class TableContainer extends React.Component {
|
|
|
238
238
|
}
|
|
239
239
|
return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight + tableMarginTop - tableStickyPadding;
|
|
240
240
|
}
|
|
241
|
+
get shouldAddOverflowParentOffsetTop_DO_NOT_USE() {
|
|
242
|
+
// IF the StickyHeaderConfig specifies that the default scroll root offsetTop should be added
|
|
243
|
+
// AND the StickyHeaderConfig specifies a default scroll root id
|
|
244
|
+
// AND the OverflowParent is the corresponding element
|
|
245
|
+
// THEN we should add the OverflowParent offset top (RETURN TRUE)
|
|
246
|
+
return this.props.stickyHeaders && !!this.props.stickyHeaders.shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE && !!this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE && this.overflowParent && this.overflowParent.id === this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE;
|
|
247
|
+
}
|
|
241
248
|
get stickyTop() {
|
|
242
249
|
switch (this.state.stickyMode) {
|
|
243
250
|
case 'pin-bottom':
|
|
244
251
|
return this.pinTop;
|
|
245
252
|
case 'stick':
|
|
246
253
|
const offsetTop = this.props.stickyHeaders && this.props.stickyHeaders.offsetTop;
|
|
247
|
-
if (typeof offsetTop === 'number') {
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
return offsetTop + defaultScrollRootOffsetTop;
|
|
254
|
+
if (typeof offsetTop === 'number' && this.shouldAddOverflowParentOffsetTop_DO_NOT_USE) {
|
|
255
|
+
const overflowParentOffsetTop = this.overflowParent ? this.overflowParent.top : 0;
|
|
256
|
+
return offsetTop + overflowParentOffsetTop;
|
|
251
257
|
} else {
|
|
252
258
|
return offsetTop;
|
|
253
259
|
}
|
|
@@ -45,7 +45,7 @@ import { countNodes } from './count-nodes';
|
|
|
45
45
|
export const NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
46
46
|
export const DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
47
47
|
const packageName = "@atlaskit/renderer";
|
|
48
|
-
const packageVersion = "112.
|
|
48
|
+
const packageVersion = "112.4.1";
|
|
49
49
|
const setAsQueryContainerStyles = css({
|
|
50
50
|
containerName: 'ak-renderer-wrapper',
|
|
51
51
|
containerType: 'inline-size',
|
|
@@ -5,8 +5,9 @@
|
|
|
5
5
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
6
6
|
import { css, jsx } from '@emotion/react';
|
|
7
7
|
import { WidthConsumer } from '@atlaskit/editor-common/ui';
|
|
8
|
-
import { calcBreakoutWidth } from '@atlaskit/editor-common/utils';
|
|
8
|
+
import { calcBreakoutWithCustomWidth, calcBreakoutWidth } from '@atlaskit/editor-common/utils';
|
|
9
9
|
import { blockNodesVerticalMargin } from '@atlaskit/editor-shared-styles';
|
|
10
|
+
import { fg } from '@atlaskit/platform-feature-flags';
|
|
10
11
|
var wrapperStyles = css({
|
|
11
12
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
|
|
12
13
|
margin: "".concat(blockNodesVerticalMargin, " 0"),
|
|
@@ -19,11 +20,13 @@ export default function Breakout(props) {
|
|
|
19
20
|
var width = _ref.width;
|
|
20
21
|
return jsx("div", {
|
|
21
22
|
css: wrapperStyles,
|
|
22
|
-
"data-mode": props.mode
|
|
23
|
-
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
24
|
-
,
|
|
23
|
+
"data-mode": props.mode,
|
|
25
24
|
style: {
|
|
26
|
-
width:
|
|
25
|
+
width: fg('platform_editor_advanced_layouts_breakout_resizing') ?
|
|
26
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
27
|
+
calcBreakoutWithCustomWidth(props.mode, 'width' in props ? props.width : null, width) :
|
|
28
|
+
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
|
|
29
|
+
calcBreakoutWidth(props.mode, width)
|
|
27
30
|
}
|
|
28
31
|
// eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
|
|
29
32
|
,
|
|
@@ -164,7 +164,7 @@ export var StickyTable = function StickyTable(_ref) {
|
|
|
164
164
|
/**
|
|
165
165
|
* Traverse DOM Tree upwards looking for table parents with "overflow: scroll".
|
|
166
166
|
*/
|
|
167
|
-
function findHorizontalOverflowScrollParent(table,
|
|
167
|
+
function findHorizontalOverflowScrollParent(table, defaultScrollRootId) {
|
|
168
168
|
var parent = table;
|
|
169
169
|
if (!parent) {
|
|
170
170
|
return null;
|
|
@@ -175,9 +175,9 @@ function findHorizontalOverflowScrollParent(table, defaultScrollRootEl) {
|
|
|
175
175
|
if (style.overflow === 'scroll' || style.overflowY === 'scroll') {
|
|
176
176
|
return parent;
|
|
177
177
|
}
|
|
178
|
-
if (!!
|
|
179
|
-
// If a
|
|
180
|
-
// use the
|
|
178
|
+
if (!!defaultScrollRootId && parent.id === defaultScrollRootId) {
|
|
179
|
+
// If a defaultScrollRootId was specified and we reached the element with this id without finding a closer
|
|
180
|
+
// scroll parent, use this element as the scroll parent
|
|
181
181
|
return parent;
|
|
182
182
|
}
|
|
183
183
|
}
|
|
@@ -194,6 +194,14 @@ export var OverflowParent = /*#__PURE__*/function () {
|
|
|
194
194
|
get: function get() {
|
|
195
195
|
return this.ref instanceof HTMLElement;
|
|
196
196
|
}
|
|
197
|
+
}, {
|
|
198
|
+
key: "id",
|
|
199
|
+
get: function get() {
|
|
200
|
+
if (this.ref instanceof HTMLElement) {
|
|
201
|
+
return this.ref.id;
|
|
202
|
+
}
|
|
203
|
+
return '';
|
|
204
|
+
}
|
|
197
205
|
}, {
|
|
198
206
|
key: "top",
|
|
199
207
|
get: function get() {
|
|
@@ -222,8 +230,8 @@ export var OverflowParent = /*#__PURE__*/function () {
|
|
|
222
230
|
}
|
|
223
231
|
}], [{
|
|
224
232
|
key: "fromElement",
|
|
225
|
-
value: function fromElement(el,
|
|
226
|
-
return new OverflowParent(findHorizontalOverflowScrollParent(el,
|
|
233
|
+
value: function fromElement(el, defaultScrollRootId) {
|
|
234
|
+
return new OverflowParent(findHorizontalOverflowScrollParent(el, defaultScrollRootId) || window);
|
|
227
235
|
}
|
|
228
236
|
}]);
|
|
229
237
|
return OverflowParent;
|
|
@@ -247,7 +247,7 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
247
247
|
}
|
|
248
248
|
if (this.props.stickyHeaders) {
|
|
249
249
|
var _this$props$stickyHea;
|
|
250
|
-
this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.
|
|
250
|
+
this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea = this.props.stickyHeaders) === null || _this$props$stickyHea === void 0 ? void 0 : _this$props$stickyHea.defaultScrollRootId_DO_NOT_USE);
|
|
251
251
|
this.overflowParent.addEventListener('scroll', this.onScroll);
|
|
252
252
|
}
|
|
253
253
|
if (this.wrapperRef.current && isStickyScrollbarEnabled(this.props.rendererAppearance)) {
|
|
@@ -260,7 +260,7 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
260
260
|
// toggling sticky headers visiblity
|
|
261
261
|
if (this.props.stickyHeaders && !this.overflowParent) {
|
|
262
262
|
var _this$props$stickyHea2;
|
|
263
|
-
this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.
|
|
263
|
+
this.overflowParent = OverflowParent.fromElement(this.tableRef.current, (_this$props$stickyHea2 = this.props.stickyHeaders) === null || _this$props$stickyHea2 === void 0 ? void 0 : _this$props$stickyHea2.defaultScrollRootId_DO_NOT_USE);
|
|
264
264
|
} else if (!this.props.stickyHeaders && this.overflowParent) {
|
|
265
265
|
this.overflowParent.removeEventListener('scroll', this.onScroll);
|
|
266
266
|
this.overflowParent = null;
|
|
@@ -284,6 +284,15 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
284
284
|
}
|
|
285
285
|
return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight + tableMarginTop - tableStickyPadding;
|
|
286
286
|
}
|
|
287
|
+
}, {
|
|
288
|
+
key: "shouldAddOverflowParentOffsetTop_DO_NOT_USE",
|
|
289
|
+
get: function get() {
|
|
290
|
+
// IF the StickyHeaderConfig specifies that the default scroll root offsetTop should be added
|
|
291
|
+
// AND the StickyHeaderConfig specifies a default scroll root id
|
|
292
|
+
// AND the OverflowParent is the corresponding element
|
|
293
|
+
// THEN we should add the OverflowParent offset top (RETURN TRUE)
|
|
294
|
+
return this.props.stickyHeaders && !!this.props.stickyHeaders.shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE && !!this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE && this.overflowParent && this.overflowParent.id === this.props.stickyHeaders.defaultScrollRootId_DO_NOT_USE;
|
|
295
|
+
}
|
|
287
296
|
}, {
|
|
288
297
|
key: "stickyTop",
|
|
289
298
|
get: function get() {
|
|
@@ -292,10 +301,9 @@ export var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
292
301
|
return this.pinTop;
|
|
293
302
|
case 'stick':
|
|
294
303
|
var offsetTop = this.props.stickyHeaders && this.props.stickyHeaders.offsetTop;
|
|
295
|
-
if (typeof offsetTop === 'number') {
|
|
296
|
-
var
|
|
297
|
-
|
|
298
|
-
return offsetTop + defaultScrollRootOffsetTop;
|
|
304
|
+
if (typeof offsetTop === 'number' && this.shouldAddOverflowParentOffsetTop_DO_NOT_USE) {
|
|
305
|
+
var overflowParentOffsetTop = this.overflowParent ? this.overflowParent.top : 0;
|
|
306
|
+
return offsetTop + overflowParentOffsetTop;
|
|
299
307
|
} else {
|
|
300
308
|
return offsetTop;
|
|
301
309
|
}
|
|
@@ -55,7 +55,7 @@ import { countNodes } from './count-nodes';
|
|
|
55
55
|
export var NORMAL_SEVERITY_THRESHOLD = 2000;
|
|
56
56
|
export var DEGRADED_SEVERITY_THRESHOLD = 3000;
|
|
57
57
|
var packageName = "@atlaskit/renderer";
|
|
58
|
-
var packageVersion = "112.
|
|
58
|
+
var packageVersion = "112.4.1";
|
|
59
59
|
var setAsQueryContainerStyles = css({
|
|
60
60
|
containerName: 'ak-renderer-wrapper',
|
|
61
61
|
containerType: 'inline-size',
|
|
@@ -31,8 +31,9 @@ export declare const StickyTable: ({ top, left, mode, shadowClassNames, innerRef
|
|
|
31
31
|
export declare class OverflowParent {
|
|
32
32
|
private ref;
|
|
33
33
|
private constructor();
|
|
34
|
-
static fromElement(el: HTMLElement | null,
|
|
34
|
+
static fromElement(el: HTMLElement | null, defaultScrollRootId?: string): OverflowParent;
|
|
35
35
|
get isElement(): boolean;
|
|
36
|
+
get id(): string;
|
|
36
37
|
get top(): number;
|
|
37
38
|
addEventListener(type: string, cb: EventListenerOrEventListenerObject, ...args: any[]): void;
|
|
38
39
|
removeEventListener(type: string, cb: EventListenerOrEventListenerObject, ...args: any[]): void;
|
|
@@ -48,6 +48,7 @@ export declare class TableContainer extends React.Component<TableProps & Overflo
|
|
|
48
48
|
onScroll: () => void;
|
|
49
49
|
onWrapperScrolled: () => void;
|
|
50
50
|
get pinTop(): number | undefined;
|
|
51
|
+
get shouldAddOverflowParentOffsetTop_DO_NOT_USE(): boolean | null | undefined;
|
|
51
52
|
get stickyTop(): number | undefined;
|
|
52
53
|
render(): JSX.Element;
|
|
53
54
|
private grabFirstRowRef;
|
|
@@ -7,17 +7,17 @@ export type RendererAppearance = 'comment' | 'full-page' | 'full-width' | undefi
|
|
|
7
7
|
*
|
|
8
8
|
* They will be cleaned up ASAP after Confluence refactors its page layout to add an explicit scroll container (DISCO-3121)
|
|
9
9
|
*
|
|
10
|
-
* `
|
|
11
|
-
* doesn't have a parent that explicitly specifies `overflow: scroll` or `overflow-y: scroll`. When undefined,
|
|
12
|
-
* default OverflowParent will be the window
|
|
13
|
-
* `
|
|
14
|
-
*
|
|
15
|
-
* This is required
|
|
10
|
+
* `defaultScrollRootId_DO_NOT_USE` - defaults to undefined - can be used to specify the id of default OverflowParent if
|
|
11
|
+
* the table doesn't have a parent that explicitly specifies `overflow: scroll` or `overflow-y: scroll`. When undefined,
|
|
12
|
+
* the default OverflowParent will be the window
|
|
13
|
+
* `shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE` - defaults to false - can be used to specify that if the OverflowParent
|
|
14
|
+
* is the default one specificed, then the sticky table header offset should include the OverflowParent offset.
|
|
15
|
+
* This is required because the logic that determines if the header should be sticky always takes the OverflowParent.offsetTop
|
|
16
16
|
* into account. But the calculation to get the actual header offset does not.
|
|
17
17
|
*/
|
|
18
18
|
type StickyHeaderConfig_DO_NOT_USE = {
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
defaultScrollRootId_DO_NOT_USE?: string;
|
|
20
|
+
shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE?: boolean;
|
|
21
21
|
};
|
|
22
22
|
export type StickyHeaderConfig = {
|
|
23
23
|
offsetTop?: number;
|
|
@@ -31,8 +31,9 @@ export declare const StickyTable: ({ top, left, mode, shadowClassNames, innerRef
|
|
|
31
31
|
export declare class OverflowParent {
|
|
32
32
|
private ref;
|
|
33
33
|
private constructor();
|
|
34
|
-
static fromElement(el: HTMLElement | null,
|
|
34
|
+
static fromElement(el: HTMLElement | null, defaultScrollRootId?: string): OverflowParent;
|
|
35
35
|
get isElement(): boolean;
|
|
36
|
+
get id(): string;
|
|
36
37
|
get top(): number;
|
|
37
38
|
addEventListener(type: string, cb: EventListenerOrEventListenerObject, ...args: any[]): void;
|
|
38
39
|
removeEventListener(type: string, cb: EventListenerOrEventListenerObject, ...args: any[]): void;
|
|
@@ -48,6 +48,7 @@ export declare class TableContainer extends React.Component<TableProps & Overflo
|
|
|
48
48
|
onScroll: () => void;
|
|
49
49
|
onWrapperScrolled: () => void;
|
|
50
50
|
get pinTop(): number | undefined;
|
|
51
|
+
get shouldAddOverflowParentOffsetTop_DO_NOT_USE(): boolean | null | undefined;
|
|
51
52
|
get stickyTop(): number | undefined;
|
|
52
53
|
render(): JSX.Element;
|
|
53
54
|
private grabFirstRowRef;
|
|
@@ -7,17 +7,17 @@ export type RendererAppearance = 'comment' | 'full-page' | 'full-width' | undefi
|
|
|
7
7
|
*
|
|
8
8
|
* They will be cleaned up ASAP after Confluence refactors its page layout to add an explicit scroll container (DISCO-3121)
|
|
9
9
|
*
|
|
10
|
-
* `
|
|
11
|
-
* doesn't have a parent that explicitly specifies `overflow: scroll` or `overflow-y: scroll`. When undefined,
|
|
12
|
-
* default OverflowParent will be the window
|
|
13
|
-
* `
|
|
14
|
-
*
|
|
15
|
-
* This is required
|
|
10
|
+
* `defaultScrollRootId_DO_NOT_USE` - defaults to undefined - can be used to specify the id of default OverflowParent if
|
|
11
|
+
* the table doesn't have a parent that explicitly specifies `overflow: scroll` or `overflow-y: scroll`. When undefined,
|
|
12
|
+
* the default OverflowParent will be the window
|
|
13
|
+
* `shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE` - defaults to false - can be used to specify that if the OverflowParent
|
|
14
|
+
* is the default one specificed, then the sticky table header offset should include the OverflowParent offset.
|
|
15
|
+
* This is required because the logic that determines if the header should be sticky always takes the OverflowParent.offsetTop
|
|
16
16
|
* into account. But the calculation to get the actual header offset does not.
|
|
17
17
|
*/
|
|
18
18
|
type StickyHeaderConfig_DO_NOT_USE = {
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
defaultScrollRootId_DO_NOT_USE?: string;
|
|
20
|
+
shouldAddDefaultScrollRootOffsetTop_DO_NOT_USE?: boolean;
|
|
21
21
|
};
|
|
22
22
|
export type StickyHeaderConfig = {
|
|
23
23
|
offsetTop?: number;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/renderer",
|
|
3
|
-
"version": "112.
|
|
3
|
+
"version": "112.4.1",
|
|
4
4
|
"description": "Renderer component",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"registry": "https://registry.npmjs.org/"
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@atlaskit/analytics-next": "^10.1.0",
|
|
30
30
|
"@atlaskit/button": "^20.3.0",
|
|
31
31
|
"@atlaskit/code": "^15.6.0",
|
|
32
|
-
"@atlaskit/editor-common": "^94.
|
|
32
|
+
"@atlaskit/editor-common": "^94.14.0",
|
|
33
33
|
"@atlaskit/editor-json-transformer": "^8.20.0",
|
|
34
34
|
"@atlaskit/editor-palette": "1.6.3",
|
|
35
35
|
"@atlaskit/editor-prosemirror": "6.0.0",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"@atlaskit/feature-gate-js-client": "^4.22.0",
|
|
39
39
|
"@atlaskit/icon": "^22.24.0",
|
|
40
40
|
"@atlaskit/link-datasource": "^3.8.0",
|
|
41
|
-
"@atlaskit/media-card": "^78.
|
|
41
|
+
"@atlaskit/media-card": "^78.11.0",
|
|
42
42
|
"@atlaskit/media-client": "^28.0.0",
|
|
43
43
|
"@atlaskit/media-client-react": "^2.3.0",
|
|
44
44
|
"@atlaskit/media-common": "^11.7.0",
|
|
@@ -50,8 +50,8 @@
|
|
|
50
50
|
"@atlaskit/status": "^1.5.0",
|
|
51
51
|
"@atlaskit/task-decision": "^17.11.0",
|
|
52
52
|
"@atlaskit/theme": "^14.0.0",
|
|
53
|
-
"@atlaskit/tmp-editor-statsig": "^2.
|
|
54
|
-
"@atlaskit/tokens": "^2.
|
|
53
|
+
"@atlaskit/tmp-editor-statsig": "^2.12.0",
|
|
54
|
+
"@atlaskit/tokens": "^2.2.0",
|
|
55
55
|
"@atlaskit/tooltip": "^18.8.0",
|
|
56
56
|
"@babel/runtime": "^7.0.0",
|
|
57
57
|
"@emotion/react": "^11.7.1",
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
"@atlaskit/media-test-helpers": "^34.5.0",
|
|
81
81
|
"@atlaskit/mention": "^23.3.0",
|
|
82
82
|
"@atlaskit/navigation-next": "^9.0.0",
|
|
83
|
-
"@atlaskit/util-data-test": "^17.
|
|
83
|
+
"@atlaskit/util-data-test": "^17.12.0",
|
|
84
84
|
"@atlaskit/visual-regression": "*",
|
|
85
85
|
"@atlassian/feature-flags-test-utils": "*",
|
|
86
86
|
"@testing-library/react": "^12.1.5",
|
|
@@ -146,6 +146,9 @@
|
|
|
146
146
|
},
|
|
147
147
|
"platform_editor_nested_table_in_nested_parent_fix": {
|
|
148
148
|
"type": "boolean"
|
|
149
|
+
},
|
|
150
|
+
"platform_editor_advanced_layouts_breakout_resizing": {
|
|
151
|
+
"type": "boolean"
|
|
149
152
|
}
|
|
150
153
|
},
|
|
151
154
|
"af:exports": {
|