@atlaskit/renderer 84.0.0 → 86.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 +100 -0
- package/dist/cjs/actions/index.js +3 -3
- package/dist/cjs/analytics/enums.js +2 -0
- package/dist/cjs/analytics/unsupported-content.js +3 -3
- package/dist/cjs/messages.js +47 -1
- package/dist/cjs/react/hooks/use-observed-width.js +94 -0
- package/dist/cjs/react/index.js +15 -9
- package/dist/cjs/react/marks/annotation.js +2 -2
- package/dist/cjs/react/marks/breakout.js +5 -3
- package/dist/cjs/react/marks/textColor.js +15 -4
- package/dist/cjs/react/nodes/blockCard.js +2 -2
- package/dist/cjs/react/nodes/caption.js +2 -2
- package/dist/cjs/react/nodes/copy-text-provider.js +2 -1
- package/dist/cjs/react/nodes/date.js +6 -4
- package/dist/cjs/react/nodes/embedCard.js +5 -5
- package/dist/cjs/react/nodes/emoji.js +2 -2
- package/dist/cjs/react/nodes/extension.js +6 -4
- package/dist/cjs/react/nodes/heading-anchor.js +11 -3
- package/dist/cjs/react/nodes/index.js +80 -55
- package/dist/cjs/react/nodes/inlineCard.js +14 -3
- package/dist/cjs/react/nodes/layoutColumn.js +2 -2
- package/dist/cjs/react/nodes/media.js +5 -3
- package/dist/cjs/react/nodes/mediaGroup.js +2 -2
- package/dist/cjs/react/nodes/mediaInline.js +2 -2
- package/dist/cjs/react/nodes/mediaSingle/index.js +146 -152
- package/dist/cjs/react/nodes/mediaSingle/styles.js +2 -2
- package/dist/cjs/react/nodes/mention.js +2 -4
- package/dist/cjs/react/nodes/panel.js +18 -20
- package/dist/cjs/react/nodes/status.js +2 -1
- package/dist/cjs/react/nodes/table/colgroup.js +2 -2
- package/dist/cjs/react/nodes/table/sticky.js +4 -4
- package/dist/cjs/react/nodes/table.js +19 -13
- package/dist/cjs/react/nodes/tableCell.js +34 -21
- package/dist/cjs/react/nodes/tableRow.js +6 -4
- package/dist/cjs/react/nodes/task-item-with-providers.js +6 -2
- package/dist/cjs/react/nodes/taskItem.js +4 -3
- package/dist/cjs/render-document.js +40 -4
- package/dist/cjs/text/nodes/date.js +3 -3
- package/dist/cjs/types/smartLinksOptions.js +5 -0
- package/dist/cjs/ui/Expand.js +9 -9
- package/dist/cjs/ui/ExtensionRenderer.js +8 -4
- package/dist/cjs/ui/MediaCard.js +4 -4
- package/dist/cjs/ui/Renderer/breakout-ssr.js +50 -7
- package/dist/cjs/ui/Renderer/index.js +23 -18
- package/dist/cjs/ui/Renderer/style.js +8 -6
- package/dist/cjs/ui/SortingIcon.js +30 -17
- package/dist/cjs/ui/annotations/draft/component.js +2 -2
- package/dist/cjs/ui/annotations/element/index.js +2 -2
- package/dist/cjs/ui/annotations/element/mark.js +4 -4
- package/dist/cjs/ui/annotations/hooks/use-events.js +11 -11
- package/dist/cjs/ui/annotations/hooks/use-load-annotations.js +4 -4
- package/dist/cjs/utils.js +4 -3
- package/dist/cjs/version.json +1 -1
- package/dist/es2019/actions/index.js +1 -1
- package/dist/es2019/analytics/enums.js +2 -0
- package/dist/es2019/analytics/unsupported-content.js +1 -1
- package/dist/es2019/messages.js +44 -0
- package/dist/es2019/react/hooks/use-observed-width.js +59 -0
- package/dist/es2019/react/index.js +4 -1
- package/dist/es2019/react/marks/breakout.js +2 -1
- package/dist/es2019/react/marks/textColor.js +7 -4
- package/dist/es2019/react/nodes/blockCard.js +1 -1
- package/dist/es2019/react/nodes/caption.js +1 -1
- package/dist/es2019/react/nodes/copy-text-provider.js +2 -1
- package/dist/es2019/react/nodes/date.js +2 -1
- package/dist/es2019/react/nodes/embedCard.js +1 -1
- package/dist/es2019/react/nodes/emoji.js +1 -1
- package/dist/es2019/react/nodes/extension.js +2 -1
- package/dist/es2019/react/nodes/heading-anchor.js +11 -2
- package/dist/es2019/react/nodes/index.js +32 -7
- package/dist/es2019/react/nodes/inlineCard.js +12 -2
- package/dist/es2019/react/nodes/layoutColumn.js +1 -1
- package/dist/es2019/react/nodes/media.js +2 -1
- package/dist/es2019/react/nodes/mediaInline.js +1 -1
- package/dist/es2019/react/nodes/mediaSingle/index.js +132 -112
- package/dist/es2019/react/nodes/mediaSingle/styles.js +1 -1
- package/dist/es2019/react/nodes/mention.js +1 -3
- package/dist/es2019/react/nodes/panel.js +14 -12
- package/dist/es2019/react/nodes/status.js +2 -1
- package/dist/es2019/react/nodes/table/colgroup.js +1 -1
- package/dist/es2019/react/nodes/table/sticky.js +1 -1
- package/dist/es2019/react/nodes/table.js +4 -1
- package/dist/es2019/react/nodes/tableCell.js +22 -10
- package/dist/es2019/react/nodes/tableRow.js +2 -1
- package/dist/es2019/react/nodes/task-item-with-providers.js +3 -1
- package/dist/es2019/react/nodes/taskItem.js +2 -1
- package/dist/es2019/render-document.js +37 -3
- package/dist/es2019/text/nodes/date.js +1 -1
- package/dist/es2019/types/smartLinksOptions.js +1 -0
- package/dist/es2019/ui/Expand.js +1 -1
- package/dist/es2019/ui/ExtensionRenderer.js +3 -1
- package/dist/es2019/ui/MediaCard.js +1 -1
- package/dist/es2019/ui/Renderer/breakout-ssr.js +46 -5
- package/dist/es2019/ui/Renderer/index.js +4 -1
- package/dist/es2019/ui/Renderer/style.js +3 -1
- package/dist/es2019/ui/SortingIcon.js +23 -11
- package/dist/es2019/ui/annotations/draft/component.js +1 -1
- package/dist/es2019/ui/annotations/element/index.js +1 -1
- package/dist/es2019/ui/annotations/element/mark.js +1 -1
- package/dist/es2019/ui/annotations/hooks/use-events.js +1 -1
- package/dist/es2019/ui/annotations/hooks/use-load-annotations.js +1 -1
- package/dist/es2019/version.json +1 -1
- package/dist/esm/actions/index.js +1 -1
- package/dist/esm/analytics/enums.js +2 -0
- package/dist/esm/analytics/unsupported-content.js +1 -1
- package/dist/esm/messages.js +44 -0
- package/dist/esm/react/hooks/use-observed-width.js +80 -0
- package/dist/esm/react/index.js +8 -4
- package/dist/esm/react/marks/annotation.js +2 -2
- package/dist/esm/react/marks/breakout.js +2 -1
- package/dist/esm/react/marks/textColor.js +8 -4
- package/dist/esm/react/nodes/blockCard.js +1 -1
- package/dist/esm/react/nodes/caption.js +1 -1
- package/dist/esm/react/nodes/copy-text-provider.js +2 -1
- package/dist/esm/react/nodes/date.js +2 -1
- package/dist/esm/react/nodes/embedCard.js +1 -1
- package/dist/esm/react/nodes/emoji.js +1 -1
- package/dist/esm/react/nodes/extension.js +2 -1
- package/dist/esm/react/nodes/heading-anchor.js +12 -3
- package/dist/esm/react/nodes/index.js +62 -7
- package/dist/esm/react/nodes/inlineCard.js +12 -2
- package/dist/esm/react/nodes/layoutColumn.js +1 -1
- package/dist/esm/react/nodes/media.js +2 -1
- package/dist/esm/react/nodes/mediaGroup.js +2 -2
- package/dist/esm/react/nodes/mediaInline.js +1 -1
- package/dist/esm/react/nodes/mediaSingle/index.js +140 -141
- package/dist/esm/react/nodes/mediaSingle/styles.js +1 -1
- package/dist/esm/react/nodes/mention.js +1 -3
- package/dist/esm/react/nodes/panel.js +14 -12
- package/dist/esm/react/nodes/status.js +2 -1
- package/dist/esm/react/nodes/table/colgroup.js +1 -1
- package/dist/esm/react/nodes/table/sticky.js +1 -1
- package/dist/esm/react/nodes/table.js +4 -1
- package/dist/esm/react/nodes/tableCell.js +19 -9
- package/dist/esm/react/nodes/tableRow.js +2 -1
- package/dist/esm/react/nodes/task-item-with-providers.js +5 -2
- package/dist/esm/react/nodes/taskItem.js +2 -1
- package/dist/esm/render-document.js +36 -3
- package/dist/esm/text/nodes/date.js +1 -1
- package/dist/esm/types/smartLinksOptions.js +1 -0
- package/dist/esm/ui/Expand.js +1 -1
- package/dist/esm/ui/ExtensionRenderer.js +3 -1
- package/dist/esm/ui/MediaCard.js +3 -3
- package/dist/esm/ui/Renderer/breakout-ssr.js +48 -5
- package/dist/esm/ui/Renderer/index.js +6 -3
- package/dist/esm/ui/Renderer/style.js +4 -3
- package/dist/esm/ui/SortingIcon.js +21 -11
- package/dist/esm/ui/annotations/draft/component.js +1 -1
- package/dist/esm/ui/annotations/element/index.js +1 -1
- package/dist/esm/ui/annotations/element/mark.js +3 -3
- package/dist/esm/ui/annotations/hooks/use-events.js +3 -3
- package/dist/esm/ui/annotations/hooks/use-load-annotations.js +3 -3
- package/dist/esm/utils.js +3 -2
- package/dist/esm/version.json +1 -1
- package/dist/types/actions/index.d.ts +1 -1
- package/dist/types/analytics/enums.d.ts +3 -1
- package/dist/types/analytics/events.d.ts +9 -2
- package/dist/types/analytics/unsupported-content.d.ts +1 -1
- package/dist/types/messages.d.ts +44 -0
- package/dist/types/react/hooks/use-observed-width.d.ts +3 -0
- package/dist/types/react/index.d.ts +6 -1
- package/dist/types/react/nodes/blockCard.d.ts +1 -1
- package/dist/types/react/nodes/bodiedExtension.d.ts +2 -1
- package/dist/types/react/nodes/codeBlock.d.ts +3 -3
- package/dist/types/react/nodes/embedCard.d.ts +1 -1
- package/dist/types/react/nodes/emoji.d.ts +1 -1
- package/dist/types/react/nodes/extension.d.ts +14 -13
- package/dist/types/react/nodes/index.d.ts +39 -15
- package/dist/types/react/nodes/inlineCard.d.ts +23 -21
- package/dist/types/react/nodes/inlineExtension.d.ts +2 -1
- package/dist/types/react/nodes/media.d.ts +2 -2
- package/dist/types/react/nodes/mediaGroup.d.ts +1 -1
- package/dist/types/react/nodes/mediaInline.d.ts +1 -1
- package/dist/types/react/nodes/mediaSingle/index.d.ts +3 -7
- package/dist/types/react/nodes/mediaSingle/styles.d.ts +1 -1
- package/dist/types/react/nodes/mention.d.ts +2 -2
- package/dist/types/react/nodes/panel.d.ts +3 -1
- package/dist/types/react/nodes/table/sticky.d.ts +1 -1
- package/dist/types/react/nodes/table.d.ts +22 -21
- package/dist/types/react/nodes/tableCell.d.ts +7 -60
- package/dist/types/react/nodes/tableRow.d.ts +1 -1
- package/dist/types/react/nodes/task-item-with-providers.d.ts +2 -1
- package/dist/types/react/nodes/taskItem.d.ts +1 -1
- package/dist/types/react/types.d.ts +3 -1
- package/dist/types/react/utils/getCardClickHandler.d.ts +1 -1
- package/dist/types/render-document.d.ts +1 -1
- package/dist/types/types/smartLinksOptions.d.ts +3 -0
- package/dist/types/ui/ExtensionRenderer.d.ts +3 -1
- package/dist/types/ui/MediaCard.d.ts +3 -2
- package/dist/types/ui/SortingIcon.d.ts +7 -4
- package/dist/types/ui/annotations/context.d.ts +1 -1
- package/dist/types/ui/annotations/element/mark.d.ts +1 -1
- package/dist/types/ui/annotations/hooks/use-events.d.ts +2 -1
- package/dist/types/ui/annotations/hooks/use-inline-comment-subscriber.d.ts +1 -1
- package/dist/types/ui/annotations/selection/mounter.d.ts +1 -1
- package/dist/types/ui/annotations/selection/range-validator.d.ts +1 -1
- package/dist/types/ui/annotations/types.d.ts +1 -1
- package/dist/types/ui/renderer-props.d.ts +8 -1
- package/dist/types/utils.d.ts +3 -1
- package/package.json +21 -22
|
@@ -2,50 +2,28 @@
|
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
4
|
|
|
5
|
-
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
-
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
8
6
|
value: true
|
|
9
7
|
});
|
|
10
8
|
exports.getMediaContainerWidth = exports.default = void 0;
|
|
11
9
|
|
|
12
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
13
|
-
|
|
14
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
15
|
-
|
|
16
|
-
var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
|
|
17
|
-
|
|
18
|
-
var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
|
|
19
|
-
|
|
20
|
-
var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
|
|
21
|
-
|
|
22
|
-
var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
|
|
23
|
-
|
|
24
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
25
|
-
|
|
26
10
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
27
11
|
|
|
28
|
-
var
|
|
29
|
-
|
|
30
|
-
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
31
|
-
|
|
32
|
-
var _react = _interopRequireWildcard(require("react"));
|
|
12
|
+
var _react = _interopRequireDefault(require("react"));
|
|
33
13
|
|
|
34
14
|
var _reactIntlNext = require("react-intl-next");
|
|
35
15
|
|
|
36
|
-
var _style = require("../../../ui/Renderer/style");
|
|
37
|
-
|
|
38
|
-
var _styles = require("./styles");
|
|
39
|
-
|
|
40
16
|
var _mediaCommon = require("@atlaskit/media-common");
|
|
41
17
|
|
|
42
|
-
|
|
18
|
+
var _ui = require("@atlaskit/editor-common/ui");
|
|
43
19
|
|
|
44
|
-
|
|
20
|
+
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
45
21
|
|
|
46
|
-
|
|
22
|
+
var _style = require("../../../ui/Renderer/style");
|
|
47
23
|
|
|
48
|
-
|
|
24
|
+
var _useObservedWidth2 = require("../../hooks/use-observed-width");
|
|
25
|
+
|
|
26
|
+
var _styles = require("./styles");
|
|
49
27
|
|
|
50
28
|
var DEFAULT_WIDTH = 250;
|
|
51
29
|
var DEFAULT_HEIGHT = 200;
|
|
@@ -84,144 +62,160 @@ var getMediaContainerWidth = function getMediaContainerWidth(currentContainerWid
|
|
|
84
62
|
|
|
85
63
|
exports.getMediaContainerWidth = getMediaContainerWidth;
|
|
86
64
|
|
|
87
|
-
var MediaSingle =
|
|
88
|
-
|
|
65
|
+
var MediaSingle = function MediaSingle(props) {
|
|
66
|
+
var _ref$current;
|
|
67
|
+
|
|
68
|
+
var rendererAppearance = props.rendererAppearance,
|
|
69
|
+
featureFlags = props.featureFlags,
|
|
70
|
+
isInsideOfBlockNode = props.isInsideOfBlockNode,
|
|
71
|
+
allowDynamicTextSizing = props.allowDynamicTextSizing,
|
|
72
|
+
layout = props.layout,
|
|
73
|
+
children = props.children,
|
|
74
|
+
pctWidth = props.width;
|
|
75
|
+
var isCaptionsFlaggedOn = (0, _mediaCommon.getMediaFeatureFlag)('captions', featureFlags);
|
|
76
|
+
|
|
77
|
+
var _React$useState = _react.default.useState({
|
|
78
|
+
width: 0,
|
|
79
|
+
height: 0
|
|
80
|
+
}),
|
|
81
|
+
_React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
|
|
82
|
+
externalImageDimensions = _React$useState2[0],
|
|
83
|
+
setExternalImageDimensions = _React$useState2[1];
|
|
84
|
+
|
|
85
|
+
var ref = _react.default.useRef(null);
|
|
86
|
+
|
|
87
|
+
var onExternalImageLoaded = _react.default.useCallback(function (_ref2) {
|
|
88
|
+
var width = _ref2.width,
|
|
89
|
+
height = _ref2.height;
|
|
90
|
+
setExternalImageDimensions({
|
|
91
|
+
width: width,
|
|
92
|
+
height: height
|
|
93
|
+
});
|
|
94
|
+
}, []);
|
|
89
95
|
|
|
90
|
-
var
|
|
96
|
+
var observedWidthFlag = (0, _mediaCommon.getMediaFeatureFlag)('observedWidth', featureFlags);
|
|
91
97
|
|
|
92
|
-
|
|
93
|
-
|
|
98
|
+
var _useObservedWidth = (0, _useObservedWidth2.useObservedWidth)((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.parentElement, observedWidthFlag),
|
|
99
|
+
observedWidth = _useObservedWidth.width;
|
|
94
100
|
|
|
95
|
-
|
|
96
|
-
_this = _super.call(this, props);
|
|
97
|
-
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onExternalImageLoaded", function (_ref2) {
|
|
98
|
-
var width = _ref2.width,
|
|
99
|
-
height = _ref2.height;
|
|
101
|
+
var media;
|
|
100
102
|
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
});
|
|
106
|
-
(0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isCaptionsFlaggedOn", (0, _mediaCommon.getMediaFeatureFlag)('captions', _this.props.featureFlags));
|
|
107
|
-
_this.state = {}; // Need to initialize with empty state.
|
|
103
|
+
var _React$Children$toArr3 = _react.default.Children.toArray(children),
|
|
104
|
+
_React$Children$toArr4 = (0, _slicedToArray2.default)(_React$Children$toArr3, 2),
|
|
105
|
+
node = _React$Children$toArr4[0],
|
|
106
|
+
caption = _React$Children$toArr4[1];
|
|
108
107
|
|
|
109
|
-
|
|
110
|
-
|
|
108
|
+
if (!isMediaElement(node)) {
|
|
109
|
+
var mediaElement = checkForMediaElement(node.props.children);
|
|
110
|
+
|
|
111
|
+
if (!mediaElement) {
|
|
112
|
+
return node;
|
|
113
|
+
}
|
|
111
114
|
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
115
|
+
media = mediaElement;
|
|
116
|
+
} else {
|
|
117
|
+
media = node;
|
|
118
|
+
}
|
|
116
119
|
|
|
117
|
-
|
|
118
|
-
|
|
120
|
+
var _media$props = media.props,
|
|
121
|
+
_media$props$width = _media$props.width,
|
|
122
|
+
width = _media$props$width === void 0 ? DEFAULT_WIDTH : _media$props$width,
|
|
123
|
+
_media$props$height = _media$props.height,
|
|
124
|
+
height = _media$props$height === void 0 ? DEFAULT_HEIGHT : _media$props$height,
|
|
125
|
+
type = _media$props.type;
|
|
119
126
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
caption = _React$Children$toArr4[1];
|
|
127
|
+
if (type === 'external') {
|
|
128
|
+
var stateWidth = externalImageDimensions.width,
|
|
129
|
+
stateHeight = externalImageDimensions.height;
|
|
124
130
|
|
|
125
|
-
|
|
126
|
-
|
|
131
|
+
if (width === null) {
|
|
132
|
+
width = stateWidth || DEFAULT_WIDTH;
|
|
133
|
+
}
|
|
127
134
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
135
|
+
if (height === null) {
|
|
136
|
+
height = stateHeight || DEFAULT_HEIGHT;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
131
139
|
|
|
132
|
-
|
|
140
|
+
if (width === null) {
|
|
141
|
+
width = DEFAULT_WIDTH;
|
|
142
|
+
height = DEFAULT_HEIGHT;
|
|
143
|
+
} // TODO: put appearance-based padding into theme instead
|
|
144
|
+
|
|
145
|
+
|
|
146
|
+
var padding = rendererAppearance === 'full-page' ? _style.FullPagePadding * 2 : 0;
|
|
147
|
+
var isFullWidth = rendererAppearance === 'full-width';
|
|
148
|
+
|
|
149
|
+
var calcDimensions = function calcDimensions(mediaContainerWidth, mediaBreakpoint) {
|
|
150
|
+
var containerWidth = getMediaContainerWidth(mediaContainerWidth, layout);
|
|
151
|
+
var breakpoint = mediaBreakpoint || (0, _ui.getBreakpoint)(containerWidth);
|
|
152
|
+
var maxWidth = containerWidth;
|
|
153
|
+
var maxHeight = height / width * maxWidth;
|
|
154
|
+
var cardDimensions = {
|
|
155
|
+
width: "".concat(maxWidth, "px"),
|
|
156
|
+
height: "".concat(maxHeight, "px")
|
|
157
|
+
};
|
|
158
|
+
var nonFullWidthSize = containerWidth;
|
|
159
|
+
|
|
160
|
+
if (!isInsideOfBlockNode && rendererAppearance !== 'comment') {
|
|
161
|
+
var isContainerSizeGreaterThanMaxFullPageWidth = containerWidth - padding >= (0, _editorSharedStyles.getAkEditorFullPageMaxWidth)(allowDynamicTextSizing);
|
|
162
|
+
|
|
163
|
+
if (isContainerSizeGreaterThanMaxFullPageWidth && allowDynamicTextSizing) {
|
|
164
|
+
nonFullWidthSize = (0, _ui.mapBreakpointToLayoutMaxWidth)(breakpoint);
|
|
165
|
+
} else if (isContainerSizeGreaterThanMaxFullPageWidth) {
|
|
166
|
+
nonFullWidthSize = (0, _editorSharedStyles.getAkEditorFullPageMaxWidth)(allowDynamicTextSizing);
|
|
133
167
|
} else {
|
|
134
|
-
|
|
168
|
+
nonFullWidthSize = containerWidth - padding;
|
|
135
169
|
}
|
|
170
|
+
}
|
|
136
171
|
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
172
|
+
var minWidth = Math.min(_editorSharedStyles.akEditorFullWidthLayoutWidth, containerWidth - padding);
|
|
173
|
+
var lineLength = isFullWidth ? minWidth : nonFullWidthSize;
|
|
174
|
+
return {
|
|
175
|
+
cardDimensions: cardDimensions,
|
|
176
|
+
lineLength: lineLength,
|
|
177
|
+
containerWidth: containerWidth
|
|
178
|
+
};
|
|
179
|
+
};
|
|
180
|
+
|
|
181
|
+
var originalDimensions = {
|
|
182
|
+
height: height,
|
|
183
|
+
width: width
|
|
184
|
+
};
|
|
185
|
+
|
|
186
|
+
var renderMediaSingle = function renderMediaSingle(renderWidth, mediaBreakpoint) {
|
|
187
|
+
var _calcDimensions = calcDimensions(renderWidth, mediaBreakpoint),
|
|
188
|
+
cardDimensions = _calcDimensions.cardDimensions,
|
|
189
|
+
lineLength = _calcDimensions.lineLength,
|
|
190
|
+
containerWidth = _calcDimensions.containerWidth;
|
|
191
|
+
|
|
192
|
+
var mediaComponent = /*#__PURE__*/_react.default.cloneElement(media, {
|
|
193
|
+
resizeMode: 'stretchy-fit',
|
|
194
|
+
cardDimensions: cardDimensions,
|
|
195
|
+
originalDimensions: originalDimensions,
|
|
196
|
+
onExternalImageLoaded: onExternalImageLoaded,
|
|
197
|
+
disableOverlay: true,
|
|
198
|
+
featureFlags: featureFlags
|
|
199
|
+
});
|
|
157
200
|
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
var maxHeight = height / width * maxWidth;
|
|
177
|
-
var cardDimensions = {
|
|
178
|
-
width: "".concat(maxWidth, "px"),
|
|
179
|
-
height: "".concat(maxHeight, "px")
|
|
180
|
-
};
|
|
181
|
-
var isFullWidth = rendererAppearance === 'full-width';
|
|
182
|
-
var nonFullWidthSize = containerWidth;
|
|
183
|
-
|
|
184
|
-
if (!isInsideOfBlockNode && rendererAppearance !== 'comment') {
|
|
185
|
-
var isContainerSizeGreaterThanMaxFullPageWidth = containerWidth - padding >= (0, _editorSharedStyles.getAkEditorFullPageMaxWidth)(allowDynamicTextSizing);
|
|
186
|
-
|
|
187
|
-
if (isContainerSizeGreaterThanMaxFullPageWidth && allowDynamicTextSizing) {
|
|
188
|
-
nonFullWidthSize = (0, _editorCommon.mapBreakpointToLayoutMaxWidth)(breakpoint);
|
|
189
|
-
} else if (isContainerSizeGreaterThanMaxFullPageWidth) {
|
|
190
|
-
nonFullWidthSize = (0, _editorSharedStyles.getAkEditorFullPageMaxWidth)(allowDynamicTextSizing);
|
|
191
|
-
} else {
|
|
192
|
-
nonFullWidthSize = containerWidth - padding;
|
|
193
|
-
}
|
|
194
|
-
}
|
|
195
|
-
|
|
196
|
-
var lineLength = isFullWidth ? Math.min(_editorSharedStyles.akEditorFullWidthLayoutWidth, containerWidth - padding) : nonFullWidthSize;
|
|
197
|
-
var originalDimensions = {
|
|
198
|
-
height: height,
|
|
199
|
-
width: width
|
|
200
|
-
};
|
|
201
|
-
|
|
202
|
-
var mediaComponent = /*#__PURE__*/_react.default.cloneElement(media, {
|
|
203
|
-
resizeMode: 'stretchy-fit',
|
|
204
|
-
cardDimensions: cardDimensions,
|
|
205
|
-
originalDimensions: originalDimensions,
|
|
206
|
-
onExternalImageLoaded: _this2.onExternalImageLoaded,
|
|
207
|
-
disableOverlay: true,
|
|
208
|
-
featureFlags: featureFlags
|
|
209
|
-
});
|
|
210
|
-
|
|
211
|
-
return /*#__PURE__*/_react.default.createElement(_styles.ExtendedUIMediaSingle, {
|
|
212
|
-
layout: props.layout,
|
|
213
|
-
width: width,
|
|
214
|
-
height: height,
|
|
215
|
-
lineLength: isInsideOfBlockNode ? containerWidth : lineLength,
|
|
216
|
-
containerWidth: containerWidth,
|
|
217
|
-
pctWidth: props.width,
|
|
218
|
-
fullWidthMode: isFullWidth
|
|
219
|
-
}, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, mediaComponent), _this2.isCaptionsFlaggedOn && caption);
|
|
220
|
-
});
|
|
221
|
-
}
|
|
222
|
-
}]);
|
|
223
|
-
return MediaSingle;
|
|
224
|
-
}(_react.Component);
|
|
201
|
+
return /*#__PURE__*/_react.default.createElement(_styles.ExtendedUIMediaSingle, {
|
|
202
|
+
handleMediaSingleRef: ref,
|
|
203
|
+
layout: layout,
|
|
204
|
+
width: width,
|
|
205
|
+
height: height,
|
|
206
|
+
lineLength: isInsideOfBlockNode ? containerWidth : lineLength,
|
|
207
|
+
containerWidth: containerWidth,
|
|
208
|
+
pctWidth: pctWidth,
|
|
209
|
+
fullWidthMode: isFullWidth
|
|
210
|
+
}, /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, mediaComponent), isCaptionsFlaggedOn && caption);
|
|
211
|
+
};
|
|
212
|
+
|
|
213
|
+
return observedWidthFlag ? renderMediaSingle(observedWidth || document.body.offsetWidth) : /*#__PURE__*/_react.default.createElement(_ui.WidthConsumer, null, function (_ref3) {
|
|
214
|
+
var width = _ref3.width,
|
|
215
|
+
breakpoint = _ref3.breakpoint;
|
|
216
|
+
return renderMediaSingle(width, breakpoint);
|
|
217
|
+
});
|
|
218
|
+
};
|
|
225
219
|
|
|
226
220
|
var _default = (0, _reactIntlNext.injectIntl)(MediaSingle);
|
|
227
221
|
|
|
@@ -11,11 +11,11 @@ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/hel
|
|
|
11
11
|
|
|
12
12
|
var _styledComponents = _interopRequireDefault(require("styled-components"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _ui = require("@atlaskit/editor-common/ui");
|
|
15
15
|
|
|
16
16
|
var _templateObject;
|
|
17
17
|
|
|
18
|
-
var ExtendedUIMediaSingle = (0, _styledComponents.default)(
|
|
18
|
+
var ExtendedUIMediaSingle = (0, _styledComponents.default)(_ui.MediaSingle)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n ", " transition: all 0.1s linear;\n"])), function (_ref) {
|
|
19
19
|
var layout = _ref.layout;
|
|
20
20
|
return layout === 'full-width' || layout === 'wide' ? "\n margin-left: 50%;\n transform: translateX(-50%);\n " : "";
|
|
21
21
|
});
|
|
@@ -21,7 +21,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
|
|
|
21
21
|
|
|
22
22
|
var _react = _interopRequireWildcard(require("react"));
|
|
23
23
|
|
|
24
|
-
var
|
|
24
|
+
var _mention = require("@atlaskit/editor-common/mention");
|
|
25
25
|
|
|
26
26
|
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); }
|
|
27
27
|
|
|
@@ -47,16 +47,14 @@ var MentionItem = /*#__PURE__*/function (_PureComponent) {
|
|
|
47
47
|
var _this$props = this.props,
|
|
48
48
|
eventHandlers = _this$props.eventHandlers,
|
|
49
49
|
id = _this$props.id,
|
|
50
|
-
portal = _this$props.portal,
|
|
51
50
|
providers = _this$props.providers,
|
|
52
51
|
text = _this$props.text,
|
|
53
52
|
accessLevel = _this$props.accessLevel;
|
|
54
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
53
|
+
return /*#__PURE__*/_react.default.createElement(_mention.Mention, {
|
|
55
54
|
id: id,
|
|
56
55
|
text: text,
|
|
57
56
|
accessLevel: accessLevel,
|
|
58
57
|
providers: providers,
|
|
59
|
-
portal: portal,
|
|
60
58
|
eventHandlers: eventHandlers && eventHandlers.mention
|
|
61
59
|
});
|
|
62
60
|
}
|
|
@@ -13,21 +13,11 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
13
13
|
|
|
14
14
|
var _styledComponents = _interopRequireDefault(require("styled-components"));
|
|
15
15
|
|
|
16
|
-
var _info = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/info"));
|
|
17
|
-
|
|
18
16
|
var _hint = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/hint"));
|
|
19
17
|
|
|
20
|
-
var _success = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/success"));
|
|
21
|
-
|
|
22
|
-
var _error = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/error"));
|
|
23
|
-
|
|
24
|
-
var _note = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/note"));
|
|
25
|
-
|
|
26
|
-
var _warning = _interopRequireDefault(require("@atlaskit/icon/glyph/warning"));
|
|
27
|
-
|
|
28
18
|
var _adfSchema = require("@atlaskit/adf-schema");
|
|
29
19
|
|
|
30
|
-
var
|
|
20
|
+
var _styles = require("@atlaskit/editor-common/styles");
|
|
31
21
|
|
|
32
22
|
var _emoji = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/emoji"));
|
|
33
23
|
|
|
@@ -35,6 +25,8 @@ var _emoji2 = _interopRequireDefault(require("./emoji"));
|
|
|
35
25
|
|
|
36
26
|
var _theme = require("@atlaskit/theme");
|
|
37
27
|
|
|
28
|
+
var _icons = require("@atlaskit/editor-common/icons");
|
|
29
|
+
|
|
38
30
|
var _templateObject;
|
|
39
31
|
|
|
40
32
|
var PanelStyled = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n ", "\n"])), function (props) {
|
|
@@ -44,17 +36,17 @@ var PanelStyled = _styledComponents.default.div(_templateObject || (_templateObj
|
|
|
44
36
|
|
|
45
37
|
|
|
46
38
|
return "\n &[data-panel-type=".concat(_adfSchema.PanelType.CUSTOM, "] {\n background-color: ").concat(props.backgroundColor, ";\n ").concat((0, _theme.themed)({
|
|
47
|
-
dark:
|
|
39
|
+
dark: _styles.getPanelBackgroundDarkModeColors
|
|
48
40
|
}), ";\n }\n ");
|
|
49
41
|
});
|
|
50
42
|
|
|
51
43
|
var panelIcons = {
|
|
52
|
-
info:
|
|
53
|
-
success:
|
|
54
|
-
note:
|
|
44
|
+
info: _icons.PanelInfoIcon,
|
|
45
|
+
success: _icons.PanelSuccessIcon,
|
|
46
|
+
note: _icons.PanelNoteIcon,
|
|
55
47
|
tip: _hint.default,
|
|
56
|
-
warning:
|
|
57
|
-
error:
|
|
48
|
+
warning: _icons.PanelWarningIcon,
|
|
49
|
+
error: _icons.PanelErrorIcon,
|
|
58
50
|
custom: _emoji.default
|
|
59
51
|
};
|
|
60
52
|
|
|
@@ -63,6 +55,8 @@ var Panel = function Panel(props) {
|
|
|
63
55
|
type = props.panelType,
|
|
64
56
|
panelColor = props.panelColor,
|
|
65
57
|
panelIcon = props.panelIcon,
|
|
58
|
+
panelIconId = props.panelIconId,
|
|
59
|
+
panelIconText = props.panelIconText,
|
|
66
60
|
providers = props.providers,
|
|
67
61
|
children = props.children; // only allow custom panel type if flag is set
|
|
68
62
|
// otherwise fall back to info if custom panel is given
|
|
@@ -73,6 +67,8 @@ var Panel = function Panel(props) {
|
|
|
73
67
|
if (panelType === _adfSchema.PanelType.CUSTOM) {
|
|
74
68
|
if (panelIcon && providers) {
|
|
75
69
|
return /*#__PURE__*/_react.default.createElement(_emoji2.default, {
|
|
70
|
+
id: panelIconId,
|
|
71
|
+
text: panelIconText,
|
|
76
72
|
shortName: panelIcon,
|
|
77
73
|
providers: providers
|
|
78
74
|
});
|
|
@@ -92,19 +88,21 @@ var Panel = function Panel(props) {
|
|
|
92
88
|
|
|
93
89
|
if (icon) {
|
|
94
90
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
95
|
-
className:
|
|
91
|
+
className: _styles.PanelSharedCssClassName.icon
|
|
96
92
|
}, icon);
|
|
97
93
|
}
|
|
98
94
|
};
|
|
99
95
|
|
|
100
96
|
return /*#__PURE__*/_react.default.createElement(PanelStyled, {
|
|
101
|
-
className:
|
|
97
|
+
className: _styles.PanelSharedCssClassName.prefix,
|
|
102
98
|
"data-panel-type": panelType,
|
|
103
99
|
"data-panel-color": panelColor,
|
|
104
100
|
"data-panel-icon": panelIcon,
|
|
101
|
+
"data-panel-icon-id": panelIconId,
|
|
102
|
+
"data-panel-icon-text": panelIconText,
|
|
105
103
|
backgroundColor: panelColor
|
|
106
104
|
}, renderIcon(), /*#__PURE__*/_react.default.createElement("div", {
|
|
107
|
-
className:
|
|
105
|
+
className: _styles.PanelSharedCssClassName.content
|
|
108
106
|
}, children));
|
|
109
107
|
};
|
|
110
108
|
|
|
@@ -9,7 +9,7 @@ exports.calcScalePercent = exports.Colgroup = void 0;
|
|
|
9
9
|
|
|
10
10
|
var _react = _interopRequireDefault(require("react"));
|
|
11
11
|
|
|
12
|
-
var
|
|
12
|
+
var _styles = require("@atlaskit/editor-common/styles");
|
|
13
13
|
|
|
14
14
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
15
15
|
|
|
@@ -54,7 +54,7 @@ var fixColumnWidth = function fixColumnWidth(columnWidth, _tableWidth, _layoutWi
|
|
|
54
54
|
}
|
|
55
55
|
|
|
56
56
|
return Math.max( // We need to take tableCellBorderWidth, to avoid unneccesary overflow.
|
|
57
|
-
columnWidth -
|
|
57
|
+
columnWidth - _styles.tableCellBorderWidth, zeroWidthColumnsCount ? _editorSharedStyles.akEditorTableLegacyCellMinWidth : _styles.tableCellMinWidth);
|
|
58
58
|
};
|
|
59
59
|
|
|
60
60
|
var calcScalePercent = function calcScalePercent(_ref2) {
|
|
@@ -19,7 +19,7 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
19
19
|
|
|
20
20
|
var _styledComponents = _interopRequireDefault(require("styled-components"));
|
|
21
21
|
|
|
22
|
-
var
|
|
22
|
+
var _styles = require("@atlaskit/editor-common/styles");
|
|
23
23
|
|
|
24
24
|
var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
|
|
25
25
|
|
|
@@ -67,7 +67,7 @@ var FixedTableDiv = _styledComponents.default.div.attrs({
|
|
|
67
67
|
return props.mode === 'pin-bottom' ? 'position: absolute' : '';
|
|
68
68
|
}, function (props) {
|
|
69
69
|
return props.mode === 'none' ? 'display: none' : '';
|
|
70
|
-
}, _editorSharedStyles.akEditorStickyHeaderZIndex,
|
|
70
|
+
}, _editorSharedStyles.akEditorStickyHeaderZIndex, _styles.TableSharedCssClassName.TABLE_CONTAINER, _styles.TableSharedCssClassName.TABLE_STICKY_WRAPPER, tableStickyPadding, N40A, _styles.TableSharedCssClassName.TABLE_CONTAINER, _styles.TableSharedCssClassName.TABLE_CONTAINER);
|
|
71
71
|
|
|
72
72
|
exports.FixedTableDiv = FixedTableDiv;
|
|
73
73
|
|
|
@@ -96,14 +96,14 @@ var StickyTable = function StickyTable(_ref3) {
|
|
|
96
96
|
mode: rowHeight > 300 ? 'none' : mode,
|
|
97
97
|
wrapperWidth: wrapperWidth
|
|
98
98
|
}, /*#__PURE__*/_react.default.createElement(StyledDiv, {
|
|
99
|
-
className: "".concat(
|
|
99
|
+
className: "".concat(_styles.TableSharedCssClassName.TABLE_CONTAINER, " ").concat(shadowClassNames),
|
|
100
100
|
"data-layout": layout,
|
|
101
101
|
style: {
|
|
102
102
|
width: tableWidth
|
|
103
103
|
}
|
|
104
104
|
}, /*#__PURE__*/_react.default.createElement(StyledDiv, {
|
|
105
105
|
innerRef: innerRef,
|
|
106
|
-
className: "".concat(
|
|
106
|
+
className: "".concat(_styles.TableSharedCssClassName.TABLE_STICKY_WRAPPER),
|
|
107
107
|
style: {
|
|
108
108
|
overflow: 'hidden'
|
|
109
109
|
}
|
|
@@ -29,7 +29,13 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
29
29
|
|
|
30
30
|
var _styledComponents = _interopRequireDefault(require("styled-components"));
|
|
31
31
|
|
|
32
|
-
var
|
|
32
|
+
var _styles = require("@atlaskit/editor-common/styles");
|
|
33
|
+
|
|
34
|
+
var _ui = require("@atlaskit/editor-common/ui");
|
|
35
|
+
|
|
36
|
+
var _utils = require("@atlaskit/editor-common/utils");
|
|
37
|
+
|
|
38
|
+
var _types = require("@atlaskit/editor-common/types");
|
|
33
39
|
|
|
34
40
|
var _style = require("../../ui/Renderer/style");
|
|
35
41
|
|
|
@@ -50,13 +56,13 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
|
|
|
50
56
|
function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
|
|
51
57
|
|
|
52
58
|
var orderChildren = function orderChildren(children, tableNode, smartCardStorage, tableOrderStatus) {
|
|
53
|
-
if (!tableOrderStatus || tableOrderStatus.order ===
|
|
59
|
+
if (!tableOrderStatus || tableOrderStatus.order === _types.SortOrder.NO_ORDER) {
|
|
54
60
|
return children;
|
|
55
61
|
}
|
|
56
62
|
|
|
57
63
|
var order = tableOrderStatus.order,
|
|
58
64
|
columnIndex = tableOrderStatus.columnIndex;
|
|
59
|
-
var compareNodesInOrder = (0,
|
|
65
|
+
var compareNodesInOrder = (0, _utils.createCompareNodes)({
|
|
60
66
|
getInlineCardTextFromStore: function getInlineCardTextFromStore(attrs) {
|
|
61
67
|
var _ref = attrs,
|
|
62
68
|
url = _ref.url;
|
|
@@ -68,7 +74,7 @@ var orderChildren = function orderChildren(children, tableNode, smartCardStorage
|
|
|
68
74
|
return smartCardStorage.get(url) || null;
|
|
69
75
|
}
|
|
70
76
|
}, order);
|
|
71
|
-
var tableArray = (0,
|
|
77
|
+
var tableArray = (0, _utils.convertProsemirrorTableNodeToArrayOfRows)(tableNode);
|
|
72
78
|
var tableArrayWithChildren = tableArray.map(function (rowNodes, index) {
|
|
73
79
|
return {
|
|
74
80
|
rowNodes: rowNodes,
|
|
@@ -281,7 +287,7 @@ var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
281
287
|
return;
|
|
282
288
|
}
|
|
283
289
|
|
|
284
|
-
return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight +
|
|
290
|
+
return this.tableRef.current.offsetHeight - this.stickyHeaderRef.current.offsetHeight + _styles.tableMarginTop - _sticky.tableStickyPadding;
|
|
285
291
|
}
|
|
286
292
|
}, {
|
|
287
293
|
key: "stickyTop",
|
|
@@ -314,7 +320,7 @@ var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
314
320
|
stickyHeaders = _this$props.stickyHeaders,
|
|
315
321
|
tableNode = _this$props.tableNode;
|
|
316
322
|
var stickyMode = this.state.stickyMode;
|
|
317
|
-
var tableWidth = (0,
|
|
323
|
+
var tableWidth = (0, _styles.calcTableWidth)(layout, renderWidth, false);
|
|
318
324
|
var lineLength = (0, _breakoutSsr.calcLineLength)(renderWidth, allowDynamicTextSizing);
|
|
319
325
|
var left;
|
|
320
326
|
|
|
@@ -343,7 +349,7 @@ var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
343
349
|
rowHeight: this.headerRowHeight,
|
|
344
350
|
allowDynamicTextSizing: allowDynamicTextSizing
|
|
345
351
|
}, [children && children[0]]), /*#__PURE__*/_react.default.createElement(MainTableContainer, {
|
|
346
|
-
className: "".concat(
|
|
352
|
+
className: "".concat(_styles.TableSharedCssClassName.TABLE_CONTAINER, " ").concat(this.props.shadowClassNames),
|
|
347
353
|
"data-layout": layout,
|
|
348
354
|
innerRef: this.props.handleRef,
|
|
349
355
|
style: {
|
|
@@ -351,7 +357,7 @@ var TableContainer = /*#__PURE__*/function (_React$Component) {
|
|
|
351
357
|
left: left && left < 0 ? left : undefined
|
|
352
358
|
}
|
|
353
359
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
354
|
-
className:
|
|
360
|
+
className: _styles.TableSharedCssClassName.TABLE_NODE_WRAPPER,
|
|
355
361
|
ref: this.wrapperRef,
|
|
356
362
|
onScroll: this.props.stickyHeaders && this.onWrapperScrolled
|
|
357
363
|
}, /*#__PURE__*/_react.default.createElement(_table.Table, {
|
|
@@ -394,7 +400,7 @@ var TableProcessor = /*#__PURE__*/function (_React$Component2) {
|
|
|
394
400
|
smartCardStorage = _this2$props.smartCardStorage;
|
|
395
401
|
var tableOrderStatus = _this2.state.tableOrderStatus;
|
|
396
402
|
|
|
397
|
-
if (allowColumnSorting && isHeaderRowEnabled(childrenArray) && tableNode && !(0,
|
|
403
|
+
if (allowColumnSorting && isHeaderRowEnabled(childrenArray) && tableNode && !(0, _utils.hasMergedCell)(tableNode)) {
|
|
398
404
|
return addSortableColumn(orderChildren(childrenArray, tableNode, smartCardStorage, tableOrderStatus), tableOrderStatus, _this2.changeSortOrder);
|
|
399
405
|
}
|
|
400
406
|
|
|
@@ -432,7 +438,7 @@ var TableProcessor = /*#__PURE__*/function (_React$Component2) {
|
|
|
432
438
|
|
|
433
439
|
var childrenArray = _react.default.Children.toArray(children);
|
|
434
440
|
|
|
435
|
-
var orderedChildren = (0,
|
|
441
|
+
var orderedChildren = (0, _utils.compose)(this.addNumberColumnIndexes, this.addSortableColumn)(childrenArray);
|
|
436
442
|
return /*#__PURE__*/_react.default.createElement(TableContainer, this.props, orderedChildren);
|
|
437
443
|
} // adds sortable + re-orders children
|
|
438
444
|
|
|
@@ -441,12 +447,12 @@ var TableProcessor = /*#__PURE__*/function (_React$Component2) {
|
|
|
441
447
|
}(_react.default.Component);
|
|
442
448
|
|
|
443
449
|
exports.TableProcessor = TableProcessor;
|
|
444
|
-
var TableWithShadows = (0,
|
|
445
|
-
overflowSelector: ".".concat(
|
|
450
|
+
var TableWithShadows = (0, _ui.overflowShadow)(TableProcessor, {
|
|
451
|
+
overflowSelector: ".".concat(_styles.TableSharedCssClassName.TABLE_NODE_WRAPPER)
|
|
446
452
|
});
|
|
447
453
|
|
|
448
454
|
var TableWithWidth = function TableWithWidth(props) {
|
|
449
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
455
|
+
return /*#__PURE__*/_react.default.createElement(_ui.WidthConsumer, null, function (_ref2) {
|
|
450
456
|
var width = _ref2.width;
|
|
451
457
|
var renderWidth = props.rendererAppearance === 'full-page' ? width - _style.FullPagePadding * 2 : width;
|
|
452
458
|
return /*#__PURE__*/_react.default.createElement(TableWithShadows, (0, _extends2.default)({
|