@atlaskit/renderer 92.0.1 → 93.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.
Files changed (87) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/dist/cjs/analytics/enums.js +1 -0
  3. package/dist/cjs/react/marks/alignment.js +11 -12
  4. package/dist/cjs/react/marks/breakout.js +7 -9
  5. package/dist/cjs/react/marks/link.js +13 -6
  6. package/dist/cjs/react/nodes/codeBlock.js +1 -1
  7. package/dist/cjs/react/nodes/codeBlockCopyButton.js +13 -11
  8. package/dist/cjs/react/nodes/embedCard.js +25 -33
  9. package/dist/cjs/react/nodes/heading-anchor.js +7 -6
  10. package/dist/cjs/react/nodes/mediaSingle/index.js +15 -4
  11. package/dist/cjs/react/nodes/mediaSingle/styles.js +7 -10
  12. package/dist/cjs/react/nodes/panel.js +26 -16
  13. package/dist/cjs/react/nodes/table/sticky.js +51 -54
  14. package/dist/cjs/react/nodes/table.js +2 -10
  15. package/dist/cjs/react/utils/performance/RenderTracking.js +52 -0
  16. package/dist/cjs/ui/Expand.js +40 -20
  17. package/dist/cjs/ui/MediaCard.js +4 -14
  18. package/dist/cjs/ui/Renderer/index.js +37 -48
  19. package/dist/cjs/ui/Renderer/style.js +58 -63
  20. package/dist/cjs/ui/Renderer/truncated-wrapper.js +19 -21
  21. package/dist/cjs/ui/SortingIcon.js +8 -9
  22. package/dist/cjs/ui/renderer-props.js +1 -3
  23. package/dist/cjs/version.json +1 -1
  24. package/dist/es2019/analytics/enums.js +1 -0
  25. package/dist/es2019/react/marks/alignment.js +15 -7
  26. package/dist/es2019/react/marks/breakout.js +6 -5
  27. package/dist/es2019/react/marks/link.js +8 -5
  28. package/dist/es2019/react/nodes/codeBlock.js +1 -1
  29. package/dist/es2019/react/nodes/codeBlockCopyButton.js +12 -9
  30. package/dist/es2019/react/nodes/embedCard.js +16 -16
  31. package/dist/es2019/react/nodes/heading-anchor.js +9 -6
  32. package/dist/es2019/react/nodes/mediaSingle/index.js +10 -6
  33. package/dist/es2019/react/nodes/mediaSingle/styles.js +6 -7
  34. package/dist/es2019/react/nodes/panel.js +23 -16
  35. package/dist/es2019/react/nodes/table/sticky.js +48 -41
  36. package/dist/es2019/react/nodes/table.js +2 -5
  37. package/dist/es2019/react/utils/performance/RenderTracking.js +37 -0
  38. package/dist/es2019/ui/Expand.js +52 -28
  39. package/dist/es2019/ui/MediaCard.js +3 -6
  40. package/dist/es2019/ui/Renderer/index.js +37 -42
  41. package/dist/es2019/ui/Renderer/style.js +363 -336
  42. package/dist/es2019/ui/Renderer/truncated-wrapper.js +26 -15
  43. package/dist/es2019/ui/SortingIcon.js +9 -7
  44. package/dist/es2019/ui/renderer-props.js +1 -1
  45. package/dist/es2019/version.json +1 -1
  46. package/dist/esm/analytics/enums.js +1 -0
  47. package/dist/esm/react/marks/alignment.js +13 -6
  48. package/dist/esm/react/marks/breakout.js +6 -5
  49. package/dist/esm/react/marks/link.js +7 -5
  50. package/dist/esm/react/nodes/codeBlock.js +1 -1
  51. package/dist/esm/react/nodes/codeBlockCopyButton.js +10 -7
  52. package/dist/esm/react/nodes/embedCard.js +19 -19
  53. package/dist/esm/react/nodes/heading-anchor.js +8 -6
  54. package/dist/esm/react/nodes/mediaSingle/index.js +11 -6
  55. package/dist/esm/react/nodes/mediaSingle/styles.js +5 -7
  56. package/dist/esm/react/nodes/panel.js +27 -15
  57. package/dist/esm/react/nodes/table/sticky.js +53 -52
  58. package/dist/esm/react/nodes/table.js +2 -8
  59. package/dist/esm/react/utils/performance/RenderTracking.js +39 -0
  60. package/dist/esm/ui/Expand.js +45 -21
  61. package/dist/esm/ui/MediaCard.js +3 -9
  62. package/dist/esm/ui/Renderer/index.js +38 -46
  63. package/dist/esm/ui/Renderer/style.js +55 -56
  64. package/dist/esm/ui/Renderer/truncated-wrapper.js +20 -14
  65. package/dist/esm/ui/SortingIcon.js +9 -7
  66. package/dist/esm/ui/renderer-props.js +1 -1
  67. package/dist/esm/version.json +1 -1
  68. package/dist/types/analytics/enums.d.ts +1 -0
  69. package/dist/types/analytics/events.d.ts +7 -2
  70. package/dist/types/react/marks/alignment.d.ts +2 -2
  71. package/dist/types/react/marks/breakout.d.ts +4 -3
  72. package/dist/types/react/marks/link.d.ts +2 -2
  73. package/dist/types/react/nodes/embedCard.d.ts +3 -2
  74. package/dist/types/react/nodes/heading-anchor.d.ts +1 -0
  75. package/dist/types/react/nodes/mediaSingle/index.d.ts +1 -0
  76. package/dist/types/react/nodes/mediaSingle/styles.d.ts +2 -3
  77. package/dist/types/react/nodes/panel.d.ts +3 -1
  78. package/dist/types/react/nodes/table/sticky.d.ts +4 -2
  79. package/dist/types/react/utils/performance/RenderTracking.d.ts +15 -0
  80. package/dist/types/ui/Expand.d.ts +2 -2
  81. package/dist/types/ui/MediaCard.d.ts +1 -3
  82. package/dist/types/ui/Renderer/index.d.ts +0 -25
  83. package/dist/types/ui/Renderer/style.d.ts +1 -4
  84. package/dist/types/ui/Renderer/truncated-wrapper.d.ts +3 -1
  85. package/dist/types/ui/SortingIcon.d.ts +3 -3
  86. package/dist/types/ui/renderer-props.d.ts +14 -2
  87. package/package.json +17 -19
@@ -1,7 +1,9 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  import _extends from "@babel/runtime/helpers/extends";
3
+
4
+ /** @jsx jsx */
3
5
  import React from 'react';
4
- import styled from 'styled-components';
6
+ import { css, jsx } from '@emotion/react';
5
7
  import { N200, N500, B400 } from '@atlaskit/theme/colors';
6
8
  import LinkIcon from '@atlaskit/icon/glyph/link';
7
9
  import Tooltip from '@atlaskit/tooltip';
@@ -13,12 +15,12 @@ const CopyAnchorWrapperWithRef = /*#__PURE__*/React.forwardRef((props, ref) => {
13
15
  children,
14
16
  ...rest
15
17
  } = props;
16
- return /*#__PURE__*/React.createElement("span", _extends({}, rest, {
18
+ return jsx("span", _extends({}, rest, {
17
19
  className: HeadingAnchorWrapperClassName,
18
20
  ref: ref
19
21
  }), children);
20
22
  });
21
- const CopyAnchorButton = styled.button`
23
+ const copyAnchorButtonStyles = css`
22
24
  display: inline;
23
25
  outline: none;
24
26
  background-color: transparent;
@@ -72,11 +74,12 @@ class HeadingAnchor extends React.PureComponent {
72
74
  });
73
75
 
74
76
  _defineProperty(this, "renderAnchorButton", () => {
75
- return /*#__PURE__*/React.createElement(CopyAnchorButton, {
77
+ return jsx("button", {
78
+ css: copyAnchorButtonStyles,
76
79
  onMouseLeave: this.resetMessage,
77
80
  onClick: this.copyToClipboard,
78
81
  "aria-label": this.state.tooltipMessage
79
- }, /*#__PURE__*/React.createElement(LinkIcon, {
82
+ }, jsx(LinkIcon, {
80
83
  label: this.getCopyAriaLabel(),
81
84
  size: this.props.level > 3 ? 'small' : 'medium',
82
85
  primaryColor: this.state.isClicked ? B400 : N200
@@ -97,7 +100,7 @@ class HeadingAnchor extends React.PureComponent {
97
100
  // We set the key to the message to ensure it remounts when the message
98
101
  // changes, so that it correctly repositions.
99
102
  // @see https://ecosystem.atlassian.net/projects/AK/queues/issue/AK-6548
100
- return /*#__PURE__*/React.createElement(Tooltip, {
103
+ return jsx(Tooltip, {
101
104
  tag: CopyAnchorWrapperWithRef,
102
105
  content: tooltipMessage,
103
106
  position: "top",
@@ -1,11 +1,13 @@
1
- import { default as React } from 'react';
1
+ /** @jsx jsx */
2
+ import { default as React, Fragment } from 'react';
3
+ import { jsx } from '@emotion/react';
2
4
  import { injectIntl } from 'react-intl-next';
3
5
  import { getMediaFeatureFlag } from '@atlaskit/media-common';
4
- import { mapBreakpointToLayoutMaxWidth, getBreakpoint, WidthConsumer } from '@atlaskit/editor-common/ui';
6
+ import { mapBreakpointToLayoutMaxWidth, getBreakpoint, MediaSingle as UIMediaSingle, WidthConsumer } from '@atlaskit/editor-common/ui';
5
7
  import { akEditorFullWidthLayoutWidth, getAkEditorFullPageMaxWidth, akEditorDefaultLayoutWidth } from '@atlaskit/editor-shared-styles';
6
8
  import { FullPagePadding } from '../../../ui/Renderer/style';
7
9
  import { useObservedWidth } from '../../hooks/use-observed-width';
8
- import { ExtendedUIMediaSingle } from './styles';
10
+ import { uiMediaSingleBaseStyles, uiMediaSingleLayoutStyles } from './styles';
9
11
  const DEFAULT_WIDTH = 250;
10
12
  const DEFAULT_HEIGHT = 200;
11
13
 
@@ -166,7 +168,9 @@ const MediaSingle = props => {
166
168
  disableOverlay: true,
167
169
  featureFlags
168
170
  });
169
- return /*#__PURE__*/React.createElement(ExtendedUIMediaSingle, {
171
+ const uiMediaSingleStyles = layout === 'full-width' || layout === 'wide' ? [uiMediaSingleBaseStyles, uiMediaSingleLayoutStyles] : [uiMediaSingleBaseStyles];
172
+ return jsx(UIMediaSingle, {
173
+ css: uiMediaSingleStyles,
170
174
  handleMediaSingleRef: ref,
171
175
  layout: layout,
172
176
  width: width,
@@ -175,10 +179,10 @@ const MediaSingle = props => {
175
179
  containerWidth: containerWidth,
176
180
  pctWidth: pctWidth,
177
181
  fullWidthMode: isFullWidth
178
- }, /*#__PURE__*/React.createElement(React.Fragment, null, mediaComponent), isCaptionsFlaggedOn && caption);
182
+ }, jsx(Fragment, null, mediaComponent), isCaptionsFlaggedOn && caption);
179
183
  };
180
184
 
181
- return observedWidthFlag ? renderMediaSingle(observedWidth || document.body.offsetWidth) : /*#__PURE__*/React.createElement(WidthConsumer, null, ({
185
+ return observedWidthFlag ? renderMediaSingle(observedWidth || document.body.offsetWidth) : jsx(WidthConsumer, null, ({
182
186
  width,
183
187
  breakpoint
184
188
  }) => {
@@ -1,10 +1,9 @@
1
- import styled from 'styled-components';
2
- import { MediaSingle as UIMediaSingle } from '@atlaskit/editor-common/ui';
3
- export const ExtendedUIMediaSingle = styled(UIMediaSingle)`
4
- ${({
5
- layout
6
- }) => layout === 'full-width' || layout === 'wide' ? `
1
+ /** @jsx jsx */
2
+ import { css } from '@emotion/react';
3
+ export const uiMediaSingleBaseStyles = css`
4
+ transition: all 0.1s linear;
5
+ `;
6
+ export const uiMediaSingleLayoutStyles = css`
7
7
  margin-left: 50%;
8
8
  transform: translateX(-50%);
9
- ` : ``} transition: all 0.1s linear;
10
9
  `;
@@ -1,5 +1,8 @@
1
+ import _extends from "@babel/runtime/helpers/extends";
2
+
3
+ /** @jsx jsx */
1
4
  import React from 'react';
2
- import styled from 'styled-components';
5
+ import { css, jsx } from '@emotion/react';
3
6
  import TipIcon from '@atlaskit/icon/glyph/editor/hint';
4
7
  import { PanelType } from '@atlaskit/adf-schema';
5
8
  import { PanelSharedCssClassName } from '@atlaskit/editor-common/styles';
@@ -10,23 +13,27 @@ import EmojiItem from './emoji'; // AFP-2532 TODO: Fix automatic suppressions be
10
13
  import { themed } from '@atlaskit/theme';
11
14
  import { getPanelBackgroundDarkModeColors } from '@atlaskit/editor-common/styles';
12
15
  import { PanelInfoIcon, PanelSuccessIcon, PanelNoteIcon, PanelWarningIcon, PanelErrorIcon } from '@atlaskit/editor-common/icons';
13
- const PanelStyled = styled.div`
14
- ${props => {
15
- if (props['data-panel-type'] !== PanelType.CUSTOM || !props.backgroundColor) {
16
- return '';
17
- } // Similar to mainDynamicStyles()
18
16
 
17
+ const PanelStyled = props => {
18
+ let styles = themeProps => css``;
19
19
 
20
- return `
20
+ if (props['data-panel-type'] === PanelType.CUSTOM && props.backgroundColor) {
21
+ styles = themeProps => css`
21
22
  &[data-panel-type=${PanelType.CUSTOM}] {
22
23
  background-color: ${props.backgroundColor};
23
24
  ${themed({
24
- dark: getPanelBackgroundDarkModeColors
25
- })};
25
+ dark: getPanelBackgroundDarkModeColors
26
+ })(themeProps)};
26
27
  }
27
28
  `;
28
- }}
29
- `;
29
+ }
30
+
31
+ return jsx("div", _extends({
32
+ css: styles
33
+ }, props), props.children);
34
+ };
35
+
36
+ PanelStyled.displayName = 'PanelStyled';
30
37
  const panelIcons = {
31
38
  info: PanelInfoIcon,
32
39
  success: PanelSuccessIcon,
@@ -55,7 +62,7 @@ const Panel = props => {
55
62
  const getIcon = () => {
56
63
  if (panelType === PanelType.CUSTOM) {
57
64
  if (panelIcon && providers) {
58
- return /*#__PURE__*/React.createElement(EmojiItem, {
65
+ return jsx(EmojiItem, {
59
66
  id: panelIconId,
60
67
  text: panelIconText,
61
68
  shortName: panelIcon,
@@ -67,7 +74,7 @@ const Panel = props => {
67
74
  }
68
75
 
69
76
  const Icon = panelIcons[panelType];
70
- return /*#__PURE__*/React.createElement(Icon, {
77
+ return jsx(Icon, {
71
78
  label: `Panel ${panelType}`
72
79
  });
73
80
  };
@@ -76,13 +83,13 @@ const Panel = props => {
76
83
  const icon = getIcon();
77
84
 
78
85
  if (icon) {
79
- return /*#__PURE__*/React.createElement("div", {
86
+ return jsx("div", {
80
87
  className: PanelSharedCssClassName.icon
81
88
  }, icon);
82
89
  }
83
90
  };
84
91
 
85
- return /*#__PURE__*/React.createElement(PanelStyled, {
92
+ return jsx(PanelStyled, {
86
93
  className: PanelSharedCssClassName.prefix,
87
94
  "data-panel-type": panelType,
88
95
  "data-panel-color": panelColor,
@@ -90,7 +97,7 @@ const Panel = props => {
90
97
  "data-panel-icon-id": panelIconId,
91
98
  "data-panel-icon-text": panelIconText,
92
99
  backgroundColor: panelColor
93
- }, renderIcon(), /*#__PURE__*/React.createElement("div", {
100
+ }, renderIcon(), jsx("div", {
94
101
  className: PanelSharedCssClassName.content
95
102
  }, children));
96
103
  };
@@ -1,5 +1,6 @@
1
+ /** @jsx jsx */
1
2
  import React from 'react';
2
- import styled from 'styled-components';
3
+ import { css, jsx } from '@emotion/react';
3
4
  import { TableSharedCssClassName } from '@atlaskit/editor-common/styles';
4
5
  import { akEditorStickyHeaderZIndex } from '@atlaskit/editor-shared-styles';
5
6
  import * as colors from '@atlaskit/theme/colors';
@@ -10,38 +11,30 @@ import { findHorizontalOverflowScrollParent } from '../../../utils';
10
11
  import { Table } from './table';
11
12
  import { recursivelyInjectProps } from '../../utils/inject-props';
12
13
  export const tableStickyPadding = 8;
13
- // creates a new stacking context and places the div in the same
14
- // position as the table
15
- const RelativeTableDiv = styled.div.attrs({
16
- style: ({
17
- left,
18
- top
19
- }) => ({
20
- left: left && left < 0 ? left : undefined,
21
- top
22
- })
23
- })`
24
- position: relative;
25
- `;
26
- export const FixedTableDiv = styled.div.attrs({
27
- style: ({
28
- top,
29
- wrapperWidth
30
- }) => ({
31
- top,
32
- width: wrapperWidth
33
- })
34
- })`
35
- ${props => props.mode === 'stick' ? 'position: fixed' : ''};
36
- ${props => props.mode === 'pin-bottom' ? 'position: absolute' : ''};
37
- ${props => props.mode === 'none' ? 'display: none' : ''};
14
+ const fixedTableDivModeToPosition = {
15
+ stick: 'fixed',
16
+ 'pin-bottom': 'absolute'
17
+ };
38
18
 
39
- z-index: ${akEditorStickyHeaderZIndex};
19
+ const getModeSpecificStyles = mode => {
20
+ if (mode === 'none') {
21
+ return css`
22
+ display: none;
23
+ `;
24
+ } else {
25
+ return css`
26
+ position: ${fixedTableDivModeToPosition[mode]};
27
+ `;
28
+ }
29
+ };
40
30
 
41
- // Fix this when move we move this to use emotion
42
- &&&
31
+ const fixedTableDivStaticStyles = (top, width) => css`
32
+ top: ${top}px;
33
+ width: ${width}px;
34
+ z-index: ${akEditorStickyHeaderZIndex};
35
+ &
43
36
  .${TableSharedCssClassName.TABLE_CONTAINER},
44
- &&&
37
+ &
45
38
  .${TableSharedCssClassName.TABLE_STICKY_WRAPPER}
46
39
  > table {
47
40
  margin-top: 0;
@@ -56,15 +49,26 @@ export const FixedTableDiv = styled.div.attrs({
56
49
  display: none;
57
50
  }
58
51
 
59
- &&&
52
+ &
60
53
  .${TableSharedCssClassName.TABLE_CONTAINER}.right-shadow::after,
61
- &&&
54
+ &
62
55
  .${TableSharedCssClassName.TABLE_CONTAINER}.left-shadow::before {
63
56
  top: 0px;
64
57
  height: 100%;
65
58
  }
66
59
  `;
67
- const StyledDiv = styled.div``;
60
+
61
+ export const FixedTableDiv = props => {
62
+ const {
63
+ top,
64
+ wrapperWidth,
65
+ mode
66
+ } = props;
67
+ const fixedTableCss = [fixedTableDivStaticStyles(top, wrapperWidth), getModeSpecificStyles(mode)];
68
+ return jsx("div", {
69
+ css: fixedTableCss
70
+ }, props.children);
71
+ };
68
72
  export const StickyTable = ({
69
73
  top,
70
74
  left,
@@ -81,26 +85,29 @@ export const StickyTable = ({
81
85
  allowDynamicTextSizing,
82
86
  rowHeight
83
87
  }) => {
84
- return /*#__PURE__*/React.createElement(RelativeTableDiv, {
85
- left: left,
86
- top: mode === 'pin-bottom' ? top : undefined
87
- }, /*#__PURE__*/React.createElement(FixedTableDiv, {
88
+ return jsx("div", {
89
+ css: {
90
+ left: left && left < 0 ? left : undefined,
91
+ top: mode === 'pin-bottom' ? top : undefined,
92
+ position: 'relative'
93
+ }
94
+ }, jsx(FixedTableDiv, {
88
95
  top: mode === 'stick' ? top : undefined,
89
96
  mode: rowHeight > 300 ? 'none' : mode,
90
97
  wrapperWidth: wrapperWidth
91
- }, /*#__PURE__*/React.createElement(StyledDiv, {
98
+ }, jsx("div", {
92
99
  className: `${TableSharedCssClassName.TABLE_CONTAINER} ${shadowClassNames}`,
93
100
  "data-layout": layout,
94
101
  style: {
95
102
  width: tableWidth
96
103
  }
97
- }, /*#__PURE__*/React.createElement(StyledDiv, {
98
- innerRef: innerRef,
104
+ }, jsx("div", {
105
+ ref: innerRef,
99
106
  className: `${TableSharedCssClassName.TABLE_STICKY_WRAPPER}`,
100
107
  style: {
101
108
  overflow: 'hidden'
102
109
  }
103
- }, /*#__PURE__*/React.createElement(Table, {
110
+ }, jsx(Table, {
104
111
  columnWidths: columnWidths,
105
112
  layout: layout,
106
113
  isNumberColumnEnabled: isNumberColumnEnabled,
@@ -1,7 +1,6 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
3
  import React from 'react';
4
- import styled from 'styled-components';
5
4
  import { calcTableWidth, TableSharedCssClassName, tableMarginTop } from '@atlaskit/editor-common/styles';
6
5
  import { WidthConsumer, overflowShadow } from '@atlaskit/editor-common/ui';
7
6
  import { createCompareNodes, convertProsemirrorTableNodeToArrayOfRows, hasMergedCell, compose } from '@atlaskit/editor-common/utils';
@@ -102,8 +101,6 @@ const tableCanBeSticky = (node, children) => {
102
101
  return isHeaderRowEnabled(children) && node && node.firstChild && !hasRowspan(node.firstChild);
103
102
  };
104
103
 
105
- const MainTableContainer = styled.div``;
106
-
107
104
  const canUseLinelength = appearance => appearance === 'full-page' || appearance === 'mobile';
108
105
 
109
106
  export class TableContainer extends React.Component {
@@ -290,10 +287,10 @@ export class TableContainer extends React.Component {
290
287
  columnWidths: columnWidths,
291
288
  rowHeight: this.headerRowHeight,
292
289
  allowDynamicTextSizing: allowDynamicTextSizing
293
- }, [children && children[0]]), /*#__PURE__*/React.createElement(MainTableContainer, {
290
+ }, [children && children[0]]), /*#__PURE__*/React.createElement("div", {
294
291
  className: `${TableSharedCssClassName.TABLE_CONTAINER} ${this.props.shadowClassNames}`,
295
292
  "data-layout": layout,
296
- innerRef: this.props.handleRef,
293
+ ref: this.props.handleRef,
297
294
  style: {
298
295
  width: tableWidth,
299
296
  left: left && left < 0 ? left : undefined
@@ -0,0 +1,37 @@
1
+ import { useMemo } from 'react';
2
+ import debounce from 'lodash/debounce';
3
+ import { useComponentRenderTracking } from '@atlaskit/editor-common/utils';
4
+ import { EVENT_TYPE } from '../../../analytics/enums';
5
+ export function RenderTracking(props) {
6
+ const debouncedHandleAnalyticsEvent = useMemo(() => debounce(props.handleAnalyticsEvent, 500), [props.handleAnalyticsEvent]);
7
+ useComponentRenderTracking({
8
+ onRender: ({
9
+ renderCount,
10
+ propsDifference,
11
+ componentId
12
+ }) => {
13
+ if (!renderCount) {
14
+ return;
15
+ }
16
+
17
+ debouncedHandleAnalyticsEvent({
18
+ action: props.action,
19
+ actionSubject: props.actionSubject,
20
+ attributes: {
21
+ count: renderCount,
22
+ propsDifference: propsDifference,
23
+ componentId
24
+ },
25
+ eventType: EVENT_TYPE.OPERATIONAL
26
+ });
27
+ },
28
+ propsDiffingOptions: {
29
+ enabled: true,
30
+ props: props.componentProps,
31
+ propsToIgnore: props.propsToIgnore,
32
+ useShallow: props.useShallow
33
+ },
34
+ zeroBasedCount: true
35
+ });
36
+ return null;
37
+ }
@@ -1,20 +1,19 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
 
3
3
  /** @jsx jsx */
4
- import React, { forwardRef, useRef, useCallback } from 'react';
5
- import { jsx } from '@emotion/react';
6
- import styled from 'styled-components';
4
+ import React, { useRef, useCallback } from 'react';
5
+ import { css, jsx } from '@emotion/react';
7
6
  import { gridSize, fontSize } from '@atlaskit/theme/constants';
8
7
  import ChevronRightIcon from '@atlaskit/icon/glyph/chevron-right';
9
8
  import Tooltip from '@atlaskit/tooltip';
10
- import { expandMessages, sharedExpandStyles, WidthProvider, ExpandIconWrapper, ExpandLayoutWrapper, clearNextSiblingMarginTopStyle } from '@atlaskit/editor-common/ui';
9
+ import { expandMessages, sharedExpandStyles, WidthProvider, ExpandIconWrapper, clearNextSiblingMarginTopStyle, ExpandLayoutWrapperWithRef } from '@atlaskit/editor-common/ui';
11
10
  import { akEditorLineHeight, relativeFontSizeToBase16 } from '@atlaskit/editor-shared-styles';
12
11
  import { PLATFORM, MODE } from '../analytics/events';
13
12
  import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '../analytics/enums';
14
13
  import { injectIntl } from 'react-intl-next';
15
14
  import { ActiveHeaderIdConsumer } from './active-header-id-provider';
16
15
  import _uniqueId from 'lodash/uniqueId';
17
- const Title = styled.span`
16
+ const titleStyles = css`
18
17
  outline: none;
19
18
  border: none;
20
19
  font-size: ${relativeFontSizeToBase16(fontSize())};
@@ -26,29 +25,53 @@ const Title = styled.span`
26
25
  padding: 0 0 0 ${gridSize() / 2}px;
27
26
  text-align: left;
28
27
  `;
29
- const Container = styled.div`
30
- ${sharedExpandStyles.ContainerStyles}
31
- padding: 0;
32
- padding-bottom: ${props => props.expanded ? gridSize() : 0}px;
33
- `;
34
- const TitleContainer = styled.button`
35
- ${sharedExpandStyles.TitleContainerStyles}
36
- padding: ${gridSize()}px;
37
- padding-bottom: ${props => !props.expanded ? gridSize() : 0}px;
38
- `;
28
+
29
+ const Container = props => {
30
+ const paddingBottom = `${props.expanded ? gridSize() : 0}px`;
31
+ const sharedContainerStyles = sharedExpandStyles.containerStyles(props);
32
+
33
+ const styles = themeProps => css`
34
+ ${sharedContainerStyles(themeProps)}
35
+ padding: 0;
36
+ padding-bottom: ${paddingBottom};
37
+ `;
38
+
39
+ return jsx("div", _extends({
40
+ css: styles
41
+ }, props), props.children);
42
+ };
43
+
44
+ const TitleContainer = props => {
45
+ const paddingBottom = `${!props.expanded ? gridSize() : 0}px`;
46
+
47
+ const styles = themeProps => css`
48
+ ${sharedExpandStyles.titleContainerStyles(themeProps)}
49
+ padding: ${gridSize()}px;
50
+ padding-bottom: ${paddingBottom};
51
+ `;
52
+
53
+ return jsx("button", _extends({
54
+ css: styles
55
+ }, props), props.children);
56
+ };
57
+
39
58
  TitleContainer.displayName = 'TitleContainerButton';
40
- const ContentContainer = styled.div`
41
- ${sharedExpandStyles.ContentStyles};
42
- padding-right: ${gridSize() * 2}px;
43
- padding-left: ${gridSize() * 5 - gridSize() / 2}px;
44
- visibility: ${props => props.expanded ? 'visible' : 'hidden'};
45
- `;
46
- const ExpandLayoutWrapperWithRef = /*#__PURE__*/forwardRef(function WithRef(props, ref) {
47
- // @ts-ignore: incorrect innerRef typing
48
- return jsx(ExpandLayoutWrapper, _extends({}, props, {
49
- innerRef: ref
50
- }));
51
- });
59
+
60
+ const ContentContainer = props => {
61
+ const sharedContentStyles = sharedExpandStyles.contentStyles(props);
62
+ const visibility = props.expanded ? 'visible' : 'hidden';
63
+
64
+ const styles = themeProps => css`
65
+ ${sharedContentStyles(themeProps)};
66
+ padding-right: ${gridSize() * 2}px;
67
+ padding-left: ${gridSize() * 5 - gridSize() / 2}px;
68
+ visibility: ${visibility};
69
+ `;
70
+
71
+ return jsx("div", _extends({
72
+ css: styles
73
+ }, props), props.children);
74
+ };
52
75
 
53
76
  function fireExpandToggleAnalytics(nodeType, expanded, fireAnalyticsEvent) {
54
77
  if (!fireAnalyticsEvent) {
@@ -115,7 +138,8 @@ function Expand({
115
138
  expanded: expanded
116
139
  }, jsx(ChevronRightIcon, {
117
140
  label: label
118
- }))), jsx(Title, {
141
+ }))), jsx("span", {
142
+ css: titleStyles,
119
143
  id: id
120
144
  }, title || intl.formatMessage(expandMessages.expandDefaultTitle))), jsx(ContentContainer, {
121
145
  expanded: expanded
@@ -1,11 +1,9 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- import React from 'react';
3
- import { Component } from 'react';
2
+ import React, { Component } from 'react';
4
3
  import { filter } from '@atlaskit/adf-utils';
5
4
  import { Card, CardLoading, CardError } from '@atlaskit/media-card';
6
5
  import { getMediaClient } from '@atlaskit/media-client';
7
6
  import { withImageLoader } from '@atlaskit/editor-common/utils';
8
- import styled from 'styled-components';
9
7
  const mediaIdentifierMap = new Map();
10
8
  export const getListOfIdentifiersFromDoc = doc => {
11
9
  if (!doc) {
@@ -269,7 +267,7 @@ export class MediaCardInternal extends Component {
269
267
  collectionName: collection,
270
268
  occurrenceKey
271
269
  };
272
- return /*#__PURE__*/React.createElement(CardWrapper, getClipboardAttrs({
270
+ return /*#__PURE__*/React.createElement("div", getClipboardAttrs({
273
271
  id,
274
272
  alt,
275
273
  collection,
@@ -298,8 +296,7 @@ export class MediaCardInternal extends Component {
298
296
  }));
299
297
  }
300
298
 
301
- }
302
- export const CardWrapper = styled.div``; // Needed for copy & paste
299
+ } // Needed for copy & paste
303
300
 
304
301
  export const getClipboardAttrs = ({
305
302
  id,