@atlaskit/renderer 94.0.0 → 96.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/CHANGELOG.md +48 -0
- package/dist/cjs/react/index.js +0 -2
- package/dist/cjs/react/marks/link.js +3 -1
- package/dist/cjs/react/nodes/codeBlock.js +5 -0
- package/dist/cjs/react/nodes/codeBlockCopyButton.js +3 -1
- package/dist/cjs/react/nodes/embedCard.js +2 -5
- package/dist/cjs/react/nodes/heading-anchor.js +4 -2
- package/dist/cjs/react/nodes/inlineCard.js +5 -1
- package/dist/cjs/react/nodes/mediaInline.js +41 -4
- package/dist/cjs/react/nodes/mediaSingle/index.js +3 -7
- package/dist/cjs/react/nodes/table/colgroup.js +6 -12
- package/dist/cjs/react/nodes/table/sticky.js +21 -21
- package/dist/cjs/react/nodes/table/table.js +1 -3
- package/dist/cjs/react/nodes/table.js +20 -9
- package/dist/cjs/react/nodes/tableCell.js +5 -3
- package/dist/cjs/render-document.js +142 -55
- package/dist/cjs/ui/MediaCard.js +2 -2
- package/dist/cjs/ui/Renderer/breakout-ssr.js +6 -8
- package/dist/cjs/ui/Renderer/index.js +22 -34
- package/dist/cjs/ui/Renderer/style.js +30 -28
- package/dist/cjs/ui/Renderer/truncated-wrapper.js +6 -3
- package/dist/cjs/ui/SortingIcon.js +6 -2
- package/dist/cjs/ui/annotations/draft/component.js +1 -1
- package/dist/cjs/ui/annotations/element/mark.js +1 -1
- package/dist/cjs/ui/annotations/hooks/use-events.js +4 -2
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/react/index.js +0 -2
- package/dist/es2019/react/marks/link.js +8 -3
- package/dist/es2019/react/nodes/codeBlock.js +5 -0
- package/dist/es2019/react/nodes/codeBlockCopyButton.js +7 -6
- package/dist/es2019/react/nodes/embedCard.js +4 -7
- package/dist/es2019/react/nodes/heading-anchor.js +3 -2
- package/dist/es2019/react/nodes/inlineCard.js +4 -1
- package/dist/es2019/react/nodes/mediaInline.js +36 -4
- package/dist/es2019/react/nodes/mediaSingle/index.js +5 -9
- package/dist/es2019/react/nodes/table/colgroup.js +2 -8
- package/dist/es2019/react/nodes/table/sticky.js +30 -28
- package/dist/es2019/react/nodes/table/table.js +1 -3
- package/dist/es2019/react/nodes/table.js +18 -9
- package/dist/es2019/react/nodes/tableCell.js +4 -1
- package/dist/es2019/render-document.js +117 -56
- package/dist/es2019/ui/MediaCard.js +1 -1
- package/dist/es2019/ui/Renderer/breakout-ssr.js +6 -8
- package/dist/es2019/ui/Renderer/index.js +6 -19
- package/dist/es2019/ui/Renderer/style.js +50 -32
- package/dist/es2019/ui/Renderer/truncated-wrapper.js +5 -3
- package/dist/es2019/ui/SortingIcon.js +7 -5
- package/dist/es2019/ui/annotations/draft/component.js +1 -1
- package/dist/es2019/ui/annotations/element/mark.js +1 -1
- package/dist/es2019/ui/annotations/hooks/use-events.js +2 -2
- package/dist/es2019/version.json +1 -1
- package/dist/esm/react/index.js +0 -2
- package/dist/esm/react/marks/link.js +3 -2
- package/dist/esm/react/nodes/codeBlock.js +5 -0
- package/dist/esm/react/nodes/codeBlockCopyButton.js +2 -1
- package/dist/esm/react/nodes/embedCard.js +4 -7
- package/dist/esm/react/nodes/heading-anchor.js +3 -2
- package/dist/esm/react/nodes/inlineCard.js +4 -1
- package/dist/esm/react/nodes/mediaInline.js +36 -4
- package/dist/esm/react/nodes/mediaSingle/index.js +5 -9
- package/dist/esm/react/nodes/table/colgroup.js +6 -12
- package/dist/esm/react/nodes/table/sticky.js +20 -22
- package/dist/esm/react/nodes/table/table.js +1 -3
- package/dist/esm/react/nodes/table.js +20 -9
- package/dist/esm/react/nodes/tableCell.js +5 -3
- package/dist/esm/render-document.js +137 -55
- package/dist/esm/ui/MediaCard.js +1 -1
- package/dist/esm/ui/Renderer/breakout-ssr.js +6 -8
- package/dist/esm/ui/Renderer/index.js +21 -33
- package/dist/esm/ui/Renderer/style.js +30 -28
- package/dist/esm/ui/Renderer/truncated-wrapper.js +5 -3
- package/dist/esm/ui/SortingIcon.js +5 -3
- package/dist/esm/ui/annotations/draft/component.js +1 -1
- package/dist/esm/ui/annotations/element/mark.js +1 -1
- package/dist/esm/ui/annotations/hooks/use-events.js +4 -2
- package/dist/esm/version.json +1 -1
- package/dist/types/react/index.d.ts +0 -2
- package/dist/types/react/nodes/embedCard.d.ts +0 -1
- package/dist/types/react/nodes/extension.d.ts +6 -0
- package/dist/types/react/nodes/index.d.ts +1 -2
- package/dist/types/react/nodes/media.d.ts +0 -1
- package/dist/types/react/nodes/mediaInline.d.ts +6 -3
- package/dist/types/react/nodes/mediaSingle/index.d.ts +0 -1
- package/dist/types/react/nodes/table/sticky.d.ts +1 -2
- package/dist/types/react/nodes/table/table.d.ts +1 -1
- package/dist/types/react/nodes/table/types.d.ts +0 -1
- package/dist/types/react/types.d.ts +0 -1
- package/dist/types/render-document.d.ts +1 -1
- package/dist/types/renderer-context.d.ts +1 -0
- package/dist/types/ui/MediaCard.d.ts +1 -1
- package/dist/types/ui/Renderer/breakout-ssr.d.ts +2 -4
- package/dist/types/ui/renderer-props.d.ts +1 -0
- package/package.json +27 -20
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,53 @@
|
|
|
1
1
|
# @atlaskit/renderer
|
|
2
2
|
|
|
3
|
+
## 96.0.0
|
|
4
|
+
|
|
5
|
+
### Major Changes
|
|
6
|
+
|
|
7
|
+
- [`d8b3bc73330`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d8b3bc73330) - [ED-14507] Deprecate the allowDynamicTextSizing editor prop and remove all code related to it. This feature has been unused since 2020.
|
|
8
|
+
|
|
9
|
+
### Minor Changes
|
|
10
|
+
|
|
11
|
+
- [`8949731bc6a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8949731bc6a) - ED-14608: Migrate adf-utils imports in atlassian-frontend to new child entry points to improve treeshaking
|
|
12
|
+
- [`b7b72b61dca`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b7b72b61dca) - ED-10337 Refactor overflow shadows using intersection observer to improve renderer performance on initial load and when scrolling contents of the tables and extensions horizontally.
|
|
13
|
+
This is affecting vertical shadows inside tables and extensions in renderer.
|
|
14
|
+
On the OverflowShadowOptions interface of the shadows component exported from editor-common we are also removing scrollableSelector option which is no longer used.
|
|
15
|
+
|
|
16
|
+
### Patch Changes
|
|
17
|
+
|
|
18
|
+
- [`edc63f42fbb`](https://bitbucket.org/atlassian/atlassian-frontend/commits/edc63f42fbb) - Fix: Media inline renderer sometimes stuck in loading view state
|
|
19
|
+
- [`b68e80d658f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/b68e80d658f) - add hover previews feature flag
|
|
20
|
+
- [`d15a5a556af`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d15a5a556af) - ED-15037 fixed issue with extensions not showing correctly inside tables nested in expands
|
|
21
|
+
- [`27b079fa0a5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/27b079fa0a5) - [ED-14111] Allow spaces in input field in renderer table cell header
|
|
22
|
+
- [`789b211a5e5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/789b211a5e5) - Removed the use of :first-child and nth-child selectors in CSS
|
|
23
|
+
- [`420808687d2`](https://bitbucket.org/atlassian/atlassian-frontend/commits/420808687d2) - EDM-3072: fix copy-paste of media inline stuck on loading and renderer copy-paste copying only text
|
|
24
|
+
- [`c5ef8dd9621`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c5ef8dd9621) - [ux] ED-14913 Fix expand text in renderer dark mode
|
|
25
|
+
- [`c4829f17445`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c4829f17445) - [ux] ED-10642 Fix null annotation ids in renderer
|
|
26
|
+
- Updated dependencies
|
|
27
|
+
|
|
28
|
+
## 95.0.1
|
|
29
|
+
|
|
30
|
+
### Patch Changes
|
|
31
|
+
|
|
32
|
+
- Updated dependencies
|
|
33
|
+
|
|
34
|
+
## 95.0.0
|
|
35
|
+
|
|
36
|
+
### Minor Changes
|
|
37
|
+
|
|
38
|
+
- [`bd24b9d71d2`](https://bitbucket.org/atlassian/atlassian-frontend/commits/bd24b9d71d2) - [ux] Instrumented `@atlaskit/renderer` with the new theming package, `@atlaskit/tokens`.
|
|
39
|
+
|
|
40
|
+
New tokens will be visible only in applications configured to use the new Tokens API (currently in alpha).
|
|
41
|
+
These changes are intended to be interoperable with the legacy theme implementation. Legacy dark mode users should expect no visual or breaking changes.
|
|
42
|
+
|
|
43
|
+
### Patch Changes
|
|
44
|
+
|
|
45
|
+
- [`ccde3d9eb43`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ccde3d9eb43) - [ux] ED-10335: memoize schema, validation and serialization for Renderer
|
|
46
|
+
- [`59e17ae76c1`](https://bitbucket.org/atlassian/atlassian-frontend/commits/59e17ae76c1) - [ux] ED-14961-table-sticky-header-overlap-popup
|
|
47
|
+
- [`47a59c220af`](https://bitbucket.org/atlassian/atlassian-frontend/commits/47a59c220af) - [ux] ED-10334: memoised schema.nodeFromJSON() and node.check() in Renderer.renderDocument()
|
|
48
|
+
- [`08edcd36c6f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/08edcd36c6f) - [ux] Convert RGB color usage to Design Tokens. This change is backwards compatible with existing theming
|
|
49
|
+
- Updated dependencies
|
|
50
|
+
|
|
3
51
|
## 94.0.0
|
|
4
52
|
|
|
5
53
|
### Patch Changes
|
package/dist/cjs/react/index.js
CHANGED
|
@@ -190,7 +190,6 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
190
190
|
this.appearance = init.appearance;
|
|
191
191
|
this.disableHeadingIDs = init.disableHeadingIDs;
|
|
192
192
|
this.disableActions = init.disableActions;
|
|
193
|
-
this.allowDynamicTextSizing = init.allowDynamicTextSizing;
|
|
194
193
|
this.allowHeadingAnchorLinks = init.allowHeadingAnchorLinks;
|
|
195
194
|
this.allowCopyToClipboard = init.allowCopyToClipboard;
|
|
196
195
|
this.allowPlaceholderText = init.allowPlaceholderText;
|
|
@@ -561,7 +560,6 @@ var ReactSerializer = /*#__PURE__*/function () {
|
|
|
561
560
|
rendererContext: this.rendererContext,
|
|
562
561
|
serializer: this,
|
|
563
562
|
content: node.content ? node.content.toJSON() : undefined,
|
|
564
|
-
allowDynamicTextSizing: this.allowDynamicTextSizing,
|
|
565
563
|
allowHeadingAnchorLinks: this.allowHeadingAnchorLinks,
|
|
566
564
|
allowCopyToClipboard: this.allowCopyToClipboard,
|
|
567
565
|
allowPlaceholderText: this.allowPlaceholderText,
|
|
@@ -25,13 +25,15 @@ var _events = require("../../analytics/events");
|
|
|
25
25
|
|
|
26
26
|
var _enums = require("../../analytics/enums");
|
|
27
27
|
|
|
28
|
+
var _tokens = require("@atlaskit/tokens");
|
|
29
|
+
|
|
28
30
|
var _templateObject;
|
|
29
31
|
|
|
30
32
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
31
33
|
|
|
32
34
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
33
35
|
|
|
34
|
-
var anchorStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n\n &:hover {\n color: ", ";\n text-decoration: underline;\n }\n"])), _colors.B400, _colors.B300);
|
|
36
|
+
var anchorStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n color: ", ";\n\n &:hover {\n color: ", ";\n text-decoration: underline;\n }\n\n &:active {\n color: ", ";\n }\n"])), (0, _tokens.token)('color.link', _colors.B400), (0, _tokens.token)('color.link', _colors.B300), (0, _tokens.token)('color.link.pressed', _colors.B500));
|
|
35
37
|
|
|
36
38
|
function Link(props) {
|
|
37
39
|
var href = props.href,
|
|
@@ -31,6 +31,9 @@ var _codeBlockCopyButton = _interopRequireDefault(require("./codeBlockCopyButton
|
|
|
31
31
|
|
|
32
32
|
var _templateObject;
|
|
33
33
|
|
|
34
|
+
// TODO: Quality ticket https://product-fabric.atlassian.net/browse/DSP-4118
|
|
35
|
+
|
|
36
|
+
/* eslint-disable @atlaskit/design-system/ensure-design-token-usage */
|
|
34
37
|
var codeBlockStyle = function codeBlockStyle(props) {
|
|
35
38
|
return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n tab-size: 4;\n [data-ds--code--code-block] {\n font-size: ", ";\n line-height: 1.5rem;\n background-image: ", ";\n background-attachment: local, scroll, scroll;\n background-position: 100% 0, 100% 0, 0 0;\n }\n "])), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), (0, _editorSharedStyles.overflowShadow)({
|
|
36
39
|
background: (0, _components.themed)({
|
|
@@ -40,6 +43,8 @@ var codeBlockStyle = function codeBlockStyle(props) {
|
|
|
40
43
|
width: "".concat((0, _constants.gridSize)(), "px")
|
|
41
44
|
}));
|
|
42
45
|
};
|
|
46
|
+
/* eslint-enable */
|
|
47
|
+
|
|
43
48
|
|
|
44
49
|
function CodeBlock(props) {
|
|
45
50
|
var text = props.text,
|
|
@@ -31,13 +31,15 @@ var _copyTextProvider = require("./copy-text-provider");
|
|
|
31
31
|
|
|
32
32
|
var _messages = require("../../messages");
|
|
33
33
|
|
|
34
|
+
var _tokens = require("@atlaskit/tokens");
|
|
35
|
+
|
|
34
36
|
var _templateObject;
|
|
35
37
|
|
|
36
38
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
37
39
|
|
|
38
40
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
39
41
|
|
|
40
|
-
var copyButtonWrapperStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n position: sticky;\n justify-content: flex-end;\n top: 0;\n\n button {\n position: absolute;\n display: flex;\n justify-content: center;\n height: 32px;\n width: 32px;\n right: 6px;\n top: 4px;\n padding: 2px;\n opacity: 0;\n transition: opacity 0.2s ease 0s;\n border: 2px solid
|
|
42
|
+
var copyButtonWrapperStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: flex;\n position: sticky;\n justify-content: flex-end;\n top: 0;\n\n button {\n position: absolute;\n display: flex;\n justify-content: center;\n height: 32px;\n width: 32px;\n right: 6px;\n top: 4px;\n padding: 2px;\n opacity: 0;\n transition: opacity 0.2s ease 0s;\n border: 2px solid ", ";\n border-radius: 4px;\n background-color: ", ";\n color: ", ";\n }\n\n button:hover {\n background-color: ", ";\n }\n\n button.clicked {\n background-color: ", ";\n color: ", " !important;\n }\n"])), (0, _tokens.token)('color.border.inverse', '#fff'), (0, _tokens.token)('color.background.neutral.subtle', _colors.N20), (0, _tokens.token)('color.icon', 'rgb(66, 82, 110)'), (0, _tokens.token)('color.background.neutral.hovered', _colors.N30), (0, _tokens.token)('color.background.neutral.bold.pressed', _colors.N700), (0, _tokens.token)('color.icon.inverse', '#fff'));
|
|
41
43
|
|
|
42
44
|
var CopyButton = function CopyButton(_ref) {
|
|
43
45
|
var content = _ref.content,
|
|
@@ -44,7 +44,6 @@ function EmbedCard(props) {
|
|
|
44
44
|
layout = props.layout,
|
|
45
45
|
width = props.width,
|
|
46
46
|
isInsideOfBlockNode = props.isInsideOfBlockNode,
|
|
47
|
-
allowDynamicTextSizing = props.allowDynamicTextSizing,
|
|
48
47
|
rendererAppearance = props.rendererAppearance;
|
|
49
48
|
var embedIframeRef = (0, _react2.useRef)(null);
|
|
50
49
|
var onClick = (0, _getCardClickHandler.getCardClickHandler)(eventHandlers, url);
|
|
@@ -123,10 +122,8 @@ function EmbedCard(props) {
|
|
|
123
122
|
if (!isInsideOfBlockNode && rendererAppearance !== 'comment') {
|
|
124
123
|
var isContainerSizeGreaterThanMaxFullPageWidth = containerWidth - padding >= _editorSharedStyles.akEditorDefaultLayoutWidth;
|
|
125
124
|
|
|
126
|
-
if (isContainerSizeGreaterThanMaxFullPageWidth
|
|
127
|
-
nonFullWidthSize =
|
|
128
|
-
} else if (isContainerSizeGreaterThanMaxFullPageWidth) {
|
|
129
|
-
nonFullWidthSize = (0, _editorSharedStyles.getAkEditorFullPageMaxWidth)(allowDynamicTextSizing);
|
|
125
|
+
if (isContainerSizeGreaterThanMaxFullPageWidth) {
|
|
126
|
+
nonFullWidthSize = _editorSharedStyles.akEditorDefaultLayoutWidth;
|
|
130
127
|
} else {
|
|
131
128
|
nonFullWidthSize = containerWidth - padding;
|
|
132
129
|
}
|
|
@@ -45,6 +45,8 @@ var _reactIntlNext = require("react-intl-next");
|
|
|
45
45
|
|
|
46
46
|
var _messages = require("../../messages");
|
|
47
47
|
|
|
48
|
+
var _tokens = require("@atlaskit/tokens");
|
|
49
|
+
|
|
48
50
|
var _templateObject;
|
|
49
51
|
|
|
50
52
|
var _excluded = ["children"];
|
|
@@ -65,7 +67,7 @@ var CopyAnchorWrapperWithRef = /*#__PURE__*/_react.default.forwardRef(function (
|
|
|
65
67
|
}), children);
|
|
66
68
|
});
|
|
67
69
|
|
|
68
|
-
var copyAnchorButtonStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: inline;\n outline: none;\n background-color: transparent;\n border: none;\n color: ", ";\n cursor: pointer;\n right: 0;\n"])), _colors.N500);
|
|
70
|
+
var copyAnchorButtonStyles = (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: inline;\n outline: none;\n background-color: transparent;\n border: none;\n color: ", ";\n cursor: pointer;\n right: 0;\n"])), (0, _tokens.token)('color.icon', _colors.N500));
|
|
69
71
|
|
|
70
72
|
var HeadingAnchor = /*#__PURE__*/function (_React$PureComponent) {
|
|
71
73
|
(0, _inherits2.default)(HeadingAnchor, _React$PureComponent);
|
|
@@ -148,7 +150,7 @@ var HeadingAnchor = /*#__PURE__*/function (_React$PureComponent) {
|
|
|
148
150
|
}, (0, _react2.jsx)(_link.default, {
|
|
149
151
|
label: _this.getCopyAriaLabel(),
|
|
150
152
|
size: _this.props.level > 3 ? 'small' : 'medium',
|
|
151
|
-
primaryColor: _this.state.isClicked ? _colors.B400 : _colors.N200
|
|
153
|
+
primaryColor: _this.state.isClicked ? (0, _tokens.token)('color.icon.selected', _colors.B400) : (0, _tokens.token)('color.icon.subtle', _colors.N200)
|
|
152
154
|
}));
|
|
153
155
|
});
|
|
154
156
|
return _this;
|
|
@@ -23,6 +23,8 @@ var _SmartCardStorage = require("../../ui/SmartCardStorage");
|
|
|
23
23
|
|
|
24
24
|
var _getCardClickHandler = require("../utils/getCardClickHandler");
|
|
25
25
|
|
|
26
|
+
var _useFeatureFlags = require("../../use-feature-flags");
|
|
27
|
+
|
|
26
28
|
var InlineCard = function InlineCard(props) {
|
|
27
29
|
var url = props.url,
|
|
28
30
|
data = props.data,
|
|
@@ -36,6 +38,7 @@ var InlineCard = function InlineCard(props) {
|
|
|
36
38
|
onClick: onClick,
|
|
37
39
|
container: portal
|
|
38
40
|
};
|
|
41
|
+
var featureFlags = (0, _useFeatureFlags.useFeatureFlags)();
|
|
39
42
|
|
|
40
43
|
if (smartLinks !== null && smartLinks !== void 0 && smartLinks.ssr && url) {
|
|
41
44
|
return /*#__PURE__*/_react.default.createElement(_ssr.CardSSR, {
|
|
@@ -51,7 +54,8 @@ var InlineCard = function InlineCard(props) {
|
|
|
51
54
|
}, /*#__PURE__*/_react.default.createElement(_fallback.CardErrorBoundary, (0, _extends2.default)({
|
|
52
55
|
unsupportedComponent: _ui.UnsupportedInline
|
|
53
56
|
}, cardProps), /*#__PURE__*/_react.default.createElement(_smartCard.Card, (0, _extends2.default)({
|
|
54
|
-
appearance: "inline"
|
|
57
|
+
appearance: "inline",
|
|
58
|
+
showHoverPreview: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.showHoverPreview
|
|
55
59
|
}, cardProps, {
|
|
56
60
|
onResolve: function onResolve(data) {
|
|
57
61
|
if (!data.url || !data.title) {
|
|
@@ -9,6 +9,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
9
9
|
});
|
|
10
10
|
exports.default = exports.RenderMediaInline = void 0;
|
|
11
11
|
|
|
12
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
13
|
+
|
|
12
14
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
13
15
|
|
|
14
16
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
@@ -19,8 +21,14 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
19
21
|
|
|
20
22
|
var _mediaCard = require("@atlaskit/media-card");
|
|
21
23
|
|
|
24
|
+
var _mediaUi = require("@atlaskit/media-ui");
|
|
25
|
+
|
|
22
26
|
var _providerFactory = require("@atlaskit/editor-common/provider-factory");
|
|
23
27
|
|
|
28
|
+
var _MediaCard = require("../../ui/MediaCard");
|
|
29
|
+
|
|
30
|
+
var _reactIntlNext = require("react-intl-next");
|
|
31
|
+
|
|
24
32
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
25
33
|
|
|
26
34
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
@@ -28,7 +36,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
28
36
|
var RenderMediaInline = function RenderMediaInline(props) {
|
|
29
37
|
var mediaProvider = props.mediaProvider;
|
|
30
38
|
|
|
31
|
-
var _useState = (0, _react.useState)(
|
|
39
|
+
var _useState = (0, _react.useState)(),
|
|
32
40
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
33
41
|
viewMediaClientConfigState = _useState2[0],
|
|
34
42
|
setViewMediaClientConfigState = _useState2[1];
|
|
@@ -68,6 +76,18 @@ var RenderMediaInline = function RenderMediaInline(props) {
|
|
|
68
76
|
return _ref.apply(this, arguments);
|
|
69
77
|
};
|
|
70
78
|
}();
|
|
79
|
+
/*
|
|
80
|
+
* Only show the loading view if the media provider is not ready
|
|
81
|
+
* prevents calling the media API before the provider is ready
|
|
82
|
+
*/
|
|
83
|
+
|
|
84
|
+
|
|
85
|
+
if (!viewMediaClientConfigState) {
|
|
86
|
+
return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardLoadingView, {
|
|
87
|
+
message: "",
|
|
88
|
+
isSelected: false
|
|
89
|
+
});
|
|
90
|
+
}
|
|
71
91
|
|
|
72
92
|
return /*#__PURE__*/_react.default.createElement(_mediaCard.MediaInlineCard, {
|
|
73
93
|
identifier: props.identifier,
|
|
@@ -81,17 +101,33 @@ exports.RenderMediaInline = RenderMediaInline;
|
|
|
81
101
|
var MediaInline = function MediaInline(props) {
|
|
82
102
|
var collection = props.collection,
|
|
83
103
|
id = props.id,
|
|
84
|
-
providers = props.providers
|
|
104
|
+
providers = props.providers,
|
|
105
|
+
intl = props.intl;
|
|
85
106
|
var identifier = {
|
|
86
107
|
id: id,
|
|
87
108
|
mediaItemType: 'file',
|
|
88
109
|
collectionName: collection
|
|
89
110
|
};
|
|
90
|
-
|
|
111
|
+
var defaultIntl = (0, _reactIntlNext.createIntl)({
|
|
112
|
+
locale: 'en'
|
|
113
|
+
});
|
|
114
|
+
return /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({}, (0, _MediaCard.getClipboardAttrs)({
|
|
115
|
+
id: id,
|
|
116
|
+
collection: collection
|
|
117
|
+
}), {
|
|
118
|
+
"data-node-type": "mediaInline"
|
|
119
|
+
}), /*#__PURE__*/_react.default.createElement(_providerFactory.WithProviders, {
|
|
91
120
|
providers: ['mediaProvider'],
|
|
92
121
|
providerFactory: providers,
|
|
93
122
|
renderNode: function renderNode(providers) {
|
|
94
123
|
var mediaProvider = providers.mediaProvider;
|
|
124
|
+
|
|
125
|
+
if (!mediaProvider) {
|
|
126
|
+
return /*#__PURE__*/_react.default.createElement(_mediaUi.MediaInlineCardErroredView, {
|
|
127
|
+
message: (intl || defaultIntl).formatMessage(_mediaUi.messages.couldnt_load_file)
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
|
|
95
131
|
return /*#__PURE__*/_react.default.createElement(RenderMediaInline, {
|
|
96
132
|
identifier: identifier,
|
|
97
133
|
mediaProvider: mediaProvider
|
|
@@ -100,5 +136,6 @@ var MediaInline = function MediaInline(props) {
|
|
|
100
136
|
}));
|
|
101
137
|
};
|
|
102
138
|
|
|
103
|
-
var _default = MediaInline;
|
|
139
|
+
var _default = (0, _reactIntlNext.injectIntl)(MediaInline);
|
|
140
|
+
|
|
104
141
|
exports.default = _default;
|
|
@@ -77,7 +77,6 @@ var MediaSingle = function MediaSingle(props) {
|
|
|
77
77
|
var rendererAppearance = props.rendererAppearance,
|
|
78
78
|
featureFlags = props.featureFlags,
|
|
79
79
|
isInsideOfBlockNode = props.isInsideOfBlockNode,
|
|
80
|
-
allowDynamicTextSizing = props.allowDynamicTextSizing,
|
|
81
80
|
layout = props.layout,
|
|
82
81
|
children = props.children,
|
|
83
82
|
pctWidth = props.width;
|
|
@@ -157,7 +156,6 @@ var MediaSingle = function MediaSingle(props) {
|
|
|
157
156
|
|
|
158
157
|
var calcDimensions = function calcDimensions(mediaContainerWidth, mediaBreakpoint) {
|
|
159
158
|
var containerWidth = getMediaContainerWidth(mediaContainerWidth, layout);
|
|
160
|
-
var breakpoint = mediaBreakpoint || (0, _ui.getBreakpoint)(containerWidth);
|
|
161
159
|
var maxWidth = containerWidth;
|
|
162
160
|
var maxHeight = height / width * maxWidth;
|
|
163
161
|
var cardDimensions = {
|
|
@@ -167,12 +165,10 @@ var MediaSingle = function MediaSingle(props) {
|
|
|
167
165
|
var nonFullWidthSize = containerWidth;
|
|
168
166
|
|
|
169
167
|
if (!isInsideOfBlockNode && rendererAppearance !== 'comment') {
|
|
170
|
-
var isContainerSizeGreaterThanMaxFullPageWidth = containerWidth - padding >=
|
|
168
|
+
var isContainerSizeGreaterThanMaxFullPageWidth = containerWidth - padding >= _editorSharedStyles.akEditorDefaultLayoutWidth;
|
|
171
169
|
|
|
172
|
-
if (isContainerSizeGreaterThanMaxFullPageWidth
|
|
173
|
-
nonFullWidthSize =
|
|
174
|
-
} else if (isContainerSizeGreaterThanMaxFullPageWidth) {
|
|
175
|
-
nonFullWidthSize = (0, _editorSharedStyles.getAkEditorFullPageMaxWidth)(allowDynamicTextSizing);
|
|
170
|
+
if (isContainerSizeGreaterThanMaxFullPageWidth) {
|
|
171
|
+
nonFullWidthSize = _editorSharedStyles.akEditorDefaultLayoutWidth;
|
|
176
172
|
} else {
|
|
177
173
|
nonFullWidthSize = containerWidth - padding;
|
|
178
174
|
}
|
|
@@ -27,11 +27,7 @@ var getTableLayoutWidth = function getTableLayoutWidth(layout, opts) {
|
|
|
27
27
|
return _editorSharedStyles.akEditorWideLayoutWidth;
|
|
28
28
|
|
|
29
29
|
default:
|
|
30
|
-
|
|
31
|
-
containerWidth = _ref.containerWidth,
|
|
32
|
-
isDynamicTextSizingEnabled = _ref.isDynamicTextSizingEnabled;
|
|
33
|
-
|
|
34
|
-
return (0, _breakoutSsr.calcLineLength)(containerWidth, isDynamicTextSizingEnabled);
|
|
30
|
+
return (0, _breakoutSsr.calcLineLength)();
|
|
35
31
|
}
|
|
36
32
|
};
|
|
37
33
|
|
|
@@ -57,10 +53,10 @@ var fixColumnWidth = function fixColumnWidth(columnWidth, _tableWidth, _layoutWi
|
|
|
57
53
|
columnWidth - _styles.tableCellBorderWidth, zeroWidthColumnsCount ? _editorSharedStyles.akEditorTableLegacyCellMinWidth : _styles.tableCellMinWidth);
|
|
58
54
|
};
|
|
59
55
|
|
|
60
|
-
var calcScalePercent = function calcScalePercent(
|
|
61
|
-
var renderWidth =
|
|
62
|
-
tableWidth =
|
|
63
|
-
maxScale =
|
|
56
|
+
var calcScalePercent = function calcScalePercent(_ref) {
|
|
57
|
+
var renderWidth = _ref.renderWidth,
|
|
58
|
+
tableWidth = _ref.tableWidth,
|
|
59
|
+
maxScale = _ref.maxScale;
|
|
64
60
|
var diffPercent = 1 - renderWidth / tableWidth;
|
|
65
61
|
return diffPercent < maxScale ? diffPercent : maxScale;
|
|
66
62
|
};
|
|
@@ -71,8 +67,7 @@ var Colgroup = function Colgroup(props) {
|
|
|
71
67
|
var columnWidths = props.columnWidths,
|
|
72
68
|
layout = props.layout,
|
|
73
69
|
isNumberColumnEnabled = props.isNumberColumnEnabled,
|
|
74
|
-
renderWidth = props.renderWidth
|
|
75
|
-
allowDynamicTextSizing = props.allowDynamicTextSizing;
|
|
70
|
+
renderWidth = props.renderWidth;
|
|
76
71
|
|
|
77
72
|
if (!columnWidths || !isTableResized(columnWidths)) {
|
|
78
73
|
return null;
|
|
@@ -80,7 +75,6 @@ var Colgroup = function Colgroup(props) {
|
|
|
80
75
|
|
|
81
76
|
|
|
82
77
|
var layoutWidth = getTableLayoutWidth(layout, {
|
|
83
|
-
isDynamicTextSizingEnabled: allowDynamicTextSizing,
|
|
84
78
|
containerWidth: renderWidth
|
|
85
79
|
});
|
|
86
80
|
var maxTableWidth = renderWidth < layoutWidth ? renderWidth : layoutWidth; // If table has a layout of default, it is confined by the defined column width.
|
|
@@ -13,6 +13,8 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
|
|
|
13
13
|
|
|
14
14
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
15
15
|
|
|
16
|
+
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
17
|
+
|
|
16
18
|
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
|
|
17
19
|
|
|
18
20
|
var _react = _interopRequireDefault(require("react"));
|
|
@@ -25,46 +27,46 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
|
25
27
|
|
|
26
28
|
var colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
|
|
27
29
|
|
|
30
|
+
var _tokens = require("@atlaskit/tokens");
|
|
31
|
+
|
|
28
32
|
var _utils = require("../../../utils");
|
|
29
33
|
|
|
30
34
|
var _table = require("./table");
|
|
31
35
|
|
|
32
36
|
var _injectProps = require("../../utils/inject-props");
|
|
33
37
|
|
|
34
|
-
var _templateObject, _templateObject2, _templateObject3;
|
|
38
|
+
var _templateObject, _templateObject2, _templateObject3, _templateObject4;
|
|
35
39
|
|
|
36
40
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
37
41
|
|
|
38
42
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
39
43
|
|
|
44
|
+
// eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
|
|
40
45
|
var N40A = colors.N40A;
|
|
41
46
|
var tableStickyPadding = 8;
|
|
42
47
|
exports.tableStickyPadding = tableStickyPadding;
|
|
43
|
-
var
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
var getModeSpecificStyles = function getModeSpecificStyles(mode) {
|
|
49
|
-
if (mode === 'none') {
|
|
50
|
-
return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: none;\n "])));
|
|
51
|
-
} else {
|
|
52
|
-
return (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n position: ", ";\n "])), fixedTableDivModeToPosition[mode]);
|
|
53
|
-
}
|
|
54
|
-
};
|
|
48
|
+
var modeSpecficStyles = {
|
|
49
|
+
none: (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n display: none;\n "]))),
|
|
50
|
+
stick: (0, _react2.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n position: fixed;\n "]))),
|
|
51
|
+
'pin-bottom': (0, _react2.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n position: absolute;\n "])))
|
|
52
|
+
}; // TODO: Quality ticket: https://product-fabric.atlassian.net/browse/DSP-4123
|
|
55
53
|
|
|
56
54
|
var fixedTableDivStaticStyles = function fixedTableDivStaticStyles(top, width) {
|
|
57
|
-
return (0, _react2.css)(
|
|
55
|
+
return (0, _react2.css)(_templateObject4 || (_templateObject4 = (0, _taggedTemplateLiteral2.default)(["\n ", "\n width: ", "px;\n z-index: ", ";\n &\n .", ",\n &\n .", "\n > table {\n margin-top: 0;\n margin-bottom: 0;\n }\n\n border-top: ", "px solid\n ", ";\n background: ", ";\n box-shadow: ", ";\n\n div[data-expanded='false'] & {\n display: none;\n }\n\n &\n .", ".right-shadow::after,\n &\n .", ".left-shadow::before {\n top: 0px;\n height: 100%;\n }\n"])), typeof top === 'number' && "top: ".concat(top, "px;"), width, _editorSharedStyles.akEditorStickyHeaderZIndex, _styles.TableSharedCssClassName.TABLE_CONTAINER, _styles.TableSharedCssClassName.TABLE_STICKY_WRAPPER, tableStickyPadding, (0, _tokens.token)('elevation.surface', 'white'), (0, _tokens.token)('elevation.surface.overlay', 'white'), (0, _tokens.token)('elevation.shadow.overflow', "0 6px 4px -4px ".concat(N40A)), _styles.TableSharedCssClassName.TABLE_CONTAINER, _styles.TableSharedCssClassName.TABLE_CONTAINER);
|
|
58
56
|
};
|
|
59
57
|
|
|
60
58
|
var FixedTableDiv = function FixedTableDiv(props) {
|
|
61
59
|
var top = props.top,
|
|
62
60
|
wrapperWidth = props.wrapperWidth,
|
|
63
61
|
mode = props.mode;
|
|
64
|
-
var fixedTableCss = [fixedTableDivStaticStyles(top, wrapperWidth),
|
|
65
|
-
|
|
62
|
+
var fixedTableCss = [fixedTableDivStaticStyles(top, wrapperWidth), modeSpecficStyles === null || modeSpecficStyles === void 0 ? void 0 : modeSpecficStyles[mode]];
|
|
63
|
+
var attrs = {
|
|
64
|
+
mode: mode
|
|
65
|
+
};
|
|
66
|
+
return (0, _react2.jsx)("div", (0, _extends2.default)({}, attrs, {
|
|
67
|
+
"data-testid": "sticky-table-fixed",
|
|
66
68
|
css: fixedTableCss
|
|
67
|
-
}, props.children);
|
|
69
|
+
}), props.children);
|
|
68
70
|
};
|
|
69
71
|
|
|
70
72
|
exports.FixedTableDiv = FixedTableDiv;
|
|
@@ -82,7 +84,6 @@ var StickyTable = function StickyTable(_ref) {
|
|
|
82
84
|
children = _ref.children,
|
|
83
85
|
columnWidths = _ref.columnWidths,
|
|
84
86
|
renderWidth = _ref.renderWidth,
|
|
85
|
-
allowDynamicTextSizing = _ref.allowDynamicTextSizing,
|
|
86
87
|
rowHeight = _ref.rowHeight;
|
|
87
88
|
return (0, _react2.jsx)("div", {
|
|
88
89
|
css: {
|
|
@@ -95,7 +96,7 @@ var StickyTable = function StickyTable(_ref) {
|
|
|
95
96
|
mode: rowHeight > 300 ? 'none' : mode,
|
|
96
97
|
wrapperWidth: wrapperWidth
|
|
97
98
|
}, (0, _react2.jsx)("div", {
|
|
98
|
-
className: "".concat(_styles.TableSharedCssClassName.TABLE_CONTAINER, " ").concat(shadowClassNames),
|
|
99
|
+
className: "".concat(_styles.TableSharedCssClassName.TABLE_CONTAINER, " ").concat(shadowClassNames || ''),
|
|
99
100
|
"data-layout": layout,
|
|
100
101
|
style: {
|
|
101
102
|
width: tableWidth
|
|
@@ -110,8 +111,7 @@ var StickyTable = function StickyTable(_ref) {
|
|
|
110
111
|
columnWidths: columnWidths,
|
|
111
112
|
layout: layout,
|
|
112
113
|
isNumberColumnEnabled: isNumberColumnEnabled,
|
|
113
|
-
renderWidth: renderWidth
|
|
114
|
-
allowDynamicTextSizing: allowDynamicTextSizing
|
|
114
|
+
renderWidth: renderWidth
|
|
115
115
|
},
|
|
116
116
|
/**
|
|
117
117
|
* @see https://product-fabric.atlassian.net/browse/ED-10235
|
|
@@ -17,7 +17,6 @@ var Table = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
17
17
|
columnWidths = _ref.columnWidths,
|
|
18
18
|
layout = _ref.layout,
|
|
19
19
|
renderWidth = _ref.renderWidth,
|
|
20
|
-
allowDynamicTextSizing = _ref.allowDynamicTextSizing,
|
|
21
20
|
children = _ref.children;
|
|
22
21
|
return /*#__PURE__*/_react.default.createElement("table", {
|
|
23
22
|
"data-number-column": isNumberColumnEnabled,
|
|
@@ -26,8 +25,7 @@ var Table = /*#__PURE__*/_react.default.memo(function (_ref) {
|
|
|
26
25
|
columnWidths: columnWidths,
|
|
27
26
|
layout: layout,
|
|
28
27
|
isNumberColumnEnabled: isNumberColumnEnabled,
|
|
29
|
-
renderWidth: renderWidth
|
|
30
|
-
allowDynamicTextSizing: allowDynamicTextSizing
|
|
28
|
+
renderWidth: renderWidth
|
|
31
29
|
}), /*#__PURE__*/_react.default.createElement("tbody", null, children));
|
|
32
30
|
});
|
|
33
31
|
|
|
@@ -307,13 +307,12 @@ var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
307
307
|
isNumberColumnEnabled = _this$props.isNumberColumnEnabled,
|
|
308
308
|
layout = _this$props.layout,
|
|
309
309
|
renderWidth = _this$props.renderWidth,
|
|
310
|
-
allowDynamicTextSizing = _this$props.allowDynamicTextSizing,
|
|
311
310
|
columnWidths = _this$props.columnWidths,
|
|
312
311
|
stickyHeaders = _this$props.stickyHeaders,
|
|
313
312
|
tableNode = _this$props.tableNode;
|
|
314
313
|
var stickyMode = this.state.stickyMode;
|
|
315
314
|
var tableWidth = (0, _styles.calcTableWidth)(layout, renderWidth, false);
|
|
316
|
-
var lineLength = (0, _breakoutSsr.calcLineLength)(
|
|
315
|
+
var lineLength = (0, _breakoutSsr.calcLineLength)();
|
|
317
316
|
var left;
|
|
318
317
|
|
|
319
318
|
if (canUseLinelength(this.props.rendererAppearance) && tableWidth !== 'inherit') {
|
|
@@ -338,10 +337,9 @@ var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
338
337
|
innerRef: this.stickyWrapperRef,
|
|
339
338
|
wrapperWidth: wrapperWidth,
|
|
340
339
|
columnWidths: columnWidths,
|
|
341
|
-
rowHeight: this.headerRowHeight
|
|
342
|
-
allowDynamicTextSizing: allowDynamicTextSizing
|
|
340
|
+
rowHeight: this.headerRowHeight
|
|
343
341
|
}, [children && children[0]]), /*#__PURE__*/_react.default.createElement("div", {
|
|
344
|
-
className: "".concat(_styles.TableSharedCssClassName.TABLE_CONTAINER, " ").concat(this.props.shadowClassNames),
|
|
342
|
+
className: "".concat(_styles.TableSharedCssClassName.TABLE_CONTAINER, " ").concat(this.props.shadowClassNames || ''),
|
|
345
343
|
"data-layout": layout,
|
|
346
344
|
ref: this.props.handleRef,
|
|
347
345
|
style: {
|
|
@@ -357,8 +355,7 @@ var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
357
355
|
columnWidths: columnWidths,
|
|
358
356
|
layout: layout,
|
|
359
357
|
isNumberColumnEnabled: isNumberColumnEnabled,
|
|
360
|
-
renderWidth: renderWidth
|
|
361
|
-
allowDynamicTextSizing: allowDynamicTextSizing
|
|
358
|
+
renderWidth: renderWidth
|
|
362
359
|
}, this.grabFirstRowRef(children)))));
|
|
363
360
|
}
|
|
364
361
|
}]);
|
|
@@ -440,14 +437,28 @@ var TableProcessor = /*#__PURE__*/function (_React$Component2) {
|
|
|
440
437
|
|
|
441
438
|
exports.TableProcessor = TableProcessor;
|
|
442
439
|
var TableWithShadows = (0, _ui.overflowShadow)(TableProcessor, {
|
|
443
|
-
overflowSelector: ".".concat(_styles.TableSharedCssClassName.TABLE_NODE_WRAPPER)
|
|
440
|
+
overflowSelector: ".".concat(_styles.TableSharedCssClassName.TABLE_NODE_WRAPPER),
|
|
441
|
+
useShadowObserver: true
|
|
444
442
|
});
|
|
445
443
|
|
|
446
444
|
var TableWithWidth = function TableWithWidth(props) {
|
|
447
445
|
return /*#__PURE__*/_react.default.createElement(_ui.WidthConsumer, null, function (_ref2) {
|
|
446
|
+
var _props$columnWidths;
|
|
447
|
+
|
|
448
448
|
var width = _ref2.width;
|
|
449
449
|
var renderWidth = props.rendererAppearance === 'full-page' ? width - _style.FullPagePadding * 2 : width;
|
|
450
|
-
|
|
450
|
+
var colWidthsSum = ((_props$columnWidths = props.columnWidths) === null || _props$columnWidths === void 0 ? void 0 : _props$columnWidths.reduce(function (total, val) {
|
|
451
|
+
return total + val;
|
|
452
|
+
}, 0)) || 0;
|
|
453
|
+
|
|
454
|
+
if (colWidthsSum) {
|
|
455
|
+
return /*#__PURE__*/_react.default.createElement(TableWithShadows, (0, _extends2.default)({
|
|
456
|
+
renderWidth: renderWidth
|
|
457
|
+
}, props));
|
|
458
|
+
} // there should not be a case when colWidthsSum is 0 and table is in overflow state - so no need to render shadows in this case
|
|
459
|
+
|
|
460
|
+
|
|
461
|
+
return /*#__PURE__*/_react.default.createElement(TableProcessor, (0, _extends2.default)({
|
|
451
462
|
renderWidth: renderWidth
|
|
452
463
|
}, props));
|
|
453
464
|
});
|
|
@@ -168,8 +168,10 @@ var withSortableColumn = function withSortableColumn(WrapperComponent) {
|
|
|
168
168
|
_this = _super2.call(this, props);
|
|
169
169
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onKeyPress", function (event) {
|
|
170
170
|
var keys = [' ', 'Enter', 'Spacebar'];
|
|
171
|
+
var _ref = event.target,
|
|
172
|
+
tagName = _ref.tagName; // trigger sorting if space or enter are clicked but not when in an input field (template variables)
|
|
171
173
|
|
|
172
|
-
if (keys.includes(event.key)) {
|
|
174
|
+
if (keys.includes(event.key) && !IgnoreSorting.includes(tagName)) {
|
|
173
175
|
event.preventDefault();
|
|
174
176
|
|
|
175
177
|
_this.onClick(event);
|
|
@@ -177,8 +179,8 @@ var withSortableColumn = function withSortableColumn(WrapperComponent) {
|
|
|
177
179
|
});
|
|
178
180
|
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onClick", function (event) {
|
|
179
181
|
// ignore sorting when specific elements are clicked
|
|
180
|
-
var
|
|
181
|
-
tagName =
|
|
182
|
+
var _ref2 = event.target,
|
|
183
|
+
tagName = _ref2.tagName;
|
|
182
184
|
|
|
183
185
|
if (IgnoreSorting.includes(tagName)) {
|
|
184
186
|
return;
|