@atlaskit/editor-common 78.8.2 → 78.8.4

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 (35) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/card/MediaAndEmbedsToolbar/index.js +1 -1
  3. package/dist/cjs/messages/insert-block.js +2 -2
  4. package/dist/cjs/messages/table.js +1 -1
  5. package/dist/cjs/monitoring/error.js +1 -1
  6. package/dist/cjs/node-width/index.js +4 -1
  7. package/dist/cjs/styles/index.js +6 -0
  8. package/dist/cjs/styles/shared/extension.js +3 -2
  9. package/dist/cjs/ui/DropList/index.js +1 -1
  10. package/dist/cjs/ui/MultiBodiedExtension/index.js +65 -6
  11. package/dist/es2019/card/MediaAndEmbedsToolbar/index.js +1 -1
  12. package/dist/es2019/messages/insert-block.js +2 -2
  13. package/dist/es2019/messages/table.js +1 -1
  14. package/dist/es2019/monitoring/error.js +1 -1
  15. package/dist/es2019/node-width/index.js +4 -1
  16. package/dist/es2019/styles/index.js +2 -1
  17. package/dist/es2019/styles/shared/extension.js +2 -1
  18. package/dist/es2019/ui/DropList/index.js +1 -1
  19. package/dist/es2019/ui/MultiBodiedExtension/index.js +62 -74
  20. package/dist/esm/card/MediaAndEmbedsToolbar/index.js +1 -1
  21. package/dist/esm/messages/insert-block.js +2 -2
  22. package/dist/esm/messages/table.js +1 -1
  23. package/dist/esm/monitoring/error.js +1 -1
  24. package/dist/esm/node-width/index.js +4 -1
  25. package/dist/esm/styles/index.js +2 -1
  26. package/dist/esm/styles/shared/extension.js +2 -1
  27. package/dist/esm/ui/DropList/index.js +1 -1
  28. package/dist/esm/ui/MultiBodiedExtension/index.js +65 -5
  29. package/dist/types/node-width/index.d.ts +2 -2
  30. package/dist/types/styles/index.d.ts +1 -0
  31. package/dist/types/styles/shared/extension.d.ts +1 -0
  32. package/dist/types-ts4.5/node-width/index.d.ts +2 -2
  33. package/dist/types-ts4.5/styles/index.d.ts +1 -0
  34. package/dist/types-ts4.5/styles/shared/extension.d.ts +1 -0
  35. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 78.8.4
4
+
5
+ ### Patch Changes
6
+
7
+ - [#75087](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75087) [`ede66b0fc1d5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ede66b0fc1d5) - [ux] ED-22045 Removing custom logic for MBE floating toolbar.
8
+
9
+ ## 78.8.3
10
+
11
+ ### Patch Changes
12
+
13
+ - [#77599](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/77599) [`a7b1a6b762eb`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a7b1a6b762eb) - [ux] Table picker popup displays text using column x rows pattern and table picker button uses label column by row.
14
+ - [#75436](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75436) [`bfcf32bb4fa3`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bfcf32bb4fa3) - [ux] ED-21941 Disable resize/layout options for table, media and extension when added to MBE. Table rendering fixed for Confluence editor
15
+ - [#77543](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/77543) [`5b4b40dddddf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5b4b40dddddf) - Updates default message of Background color option in table's menus
16
+
3
17
  ## 78.8.2
4
18
 
5
19
  ### Patch Changes
@@ -145,7 +145,7 @@ var mapIconsToToolbarItem = function mapIconsToToolbarItem(icons, layout, intl,
145
145
  };
146
146
  var shouldHideLayoutToolbar = function shouldHideLayoutToolbar(selection, _ref2, allowResizingInTables) {
147
147
  var nodes = _ref2.nodes;
148
- return (0, _utils.hasParentNodeOfType)([nodes.bodiedExtension, nodes.listItem, nodes.expand, nodes.nestedExpand].concat((0, _toConsumableArray2.default)(allowResizingInTables ? [] : [nodes.table])).filter(Boolean))(selection);
148
+ return (0, _utils.hasParentNodeOfType)([nodes.bodiedExtension, nodes.extensionFrame, nodes.listItem, nodes.expand, nodes.nestedExpand].concat((0, _toConsumableArray2.default)(allowResizingInTables ? [] : [nodes.table])).filter(Boolean))(selection);
149
149
  };
150
150
  var buildLayoutButtons = function buildLayoutButtons(state, intl, nodeType, widthPluginDependencyApi, analyticsApi, allowResizing, allowResizingInTables) {
151
151
  var allowWrapping = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
@@ -88,8 +88,8 @@ var toolbarInsertBlockMessages = exports.toolbarInsertBlockMessages = (0, _react
88
88
  },
89
89
  tableSizeSelectorButton: {
90
90
  id: 'fabric.editor.tableSizeSelectorButton',
91
- defaultMessage: 'Create table of size',
92
- description: 'Creates table popup grid of defined size'
91
+ defaultMessage: '{numberOfColumns} by {numberOfRows}',
92
+ description: 'Creates a table of custom size'
93
93
  },
94
94
  tableSizeSelectorPopup: {
95
95
  id: 'fabric.editor.tableSizeSelectorPopup',
@@ -173,7 +173,7 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
173
173
  },
174
174
  backgroundColor: {
175
175
  id: 'fabric.editor.backgroundColor',
176
- defaultMessage: 'Background Color',
176
+ defaultMessage: 'Background color',
177
177
  description: 'Change the background color of a table cell.'
178
178
  },
179
179
  mergeCells: {
@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
16
16
  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; }
17
17
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
18
18
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
19
- var packageVersion = "78.8.2";
19
+ var packageVersion = "78.8.4";
20
20
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
21
21
  // Remove URL as it has UGC
22
22
  // TODO: Sanitise the URL instead of just removing it
@@ -73,6 +73,9 @@ var getParentNodeWidth = exports.getParentNodeWidth = function getParentNodeWidt
73
73
  case schema.nodes.bodiedExtension:
74
74
  parentWidth -= _extension.BODIED_EXT_PADDING * 2;
75
75
  break;
76
+ case schema.nodes.extensionFrame:
77
+ parentWidth -= _extension.BODIED_EXT_PADDING * 2;
78
+ break;
76
79
 
77
80
  // TODO: Migrate away from gridSize
78
81
  // Recommendation: Replace gridSize with 8
@@ -96,7 +99,7 @@ var getNestedParentNode = function getNestedParentNode(tablePos, state) {
96
99
  return null;
97
100
  }
98
101
  var $pos = state.doc.resolve(tablePos);
99
- var parent = (0, _utils.findParentNodeOfTypeClosestToPos)($pos, [state.schema.nodes.bodiedExtension, state.schema.nodes.layoutSection, state.schema.nodes.expand]);
102
+ var parent = (0, _utils.findParentNodeOfTypeClosestToPos)($pos, [state.schema.nodes.bodiedExtension, state.schema.nodes.extensionFrame, state.schema.nodes.layoutSection, state.schema.nodes.expand]);
100
103
  return parent ? parent.node : null;
101
104
  };
102
105
  var calcBreakoutNodeWidth = function calcBreakoutNodeWidth(layout, containerWidth, isFullWidthModeEnabled) {
@@ -15,6 +15,12 @@ Object.defineProperty(exports, "AnnotationSharedClassNames", {
15
15
  return _annotation.AnnotationSharedClassNames;
16
16
  }
17
17
  });
18
+ Object.defineProperty(exports, "BODIED_EXT_MBE_MARGIN_TOP", {
19
+ enumerable: true,
20
+ get: function get() {
21
+ return _extension.BODIED_EXT_MBE_MARGIN_TOP;
22
+ }
23
+ });
18
24
  Object.defineProperty(exports, "BODIED_EXT_PADDING", {
19
25
  enumerable: true,
20
26
  get: function get() {
@@ -3,11 +3,12 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.EXTENSION_PADDING = exports.BODIED_EXT_PADDING = void 0;
6
+ exports.EXTENSION_PADDING = exports.BODIED_EXT_PADDING = exports.BODIED_EXT_MBE_MARGIN_TOP = void 0;
7
7
  var _constants = require("@atlaskit/theme/constants");
8
8
  // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
9
9
 
10
10
  // TODO: Migrate away from gridSize
11
11
  // Recommendation: Replace gridSize with 8
12
12
  var EXTENSION_PADDING = exports.EXTENSION_PADDING = (0, _constants.gridSize)();
13
- var BODIED_EXT_PADDING = exports.BODIED_EXT_PADDING = EXTENSION_PADDING * 2;
13
+ var BODIED_EXT_PADDING = exports.BODIED_EXT_PADDING = EXTENSION_PADDING * 2;
14
+ var BODIED_EXT_MBE_MARGIN_TOP = exports.BODIED_EXT_MBE_MARGIN_TOP = 12;
@@ -22,7 +22,7 @@ var _templateObject, _templateObject2, _templateObject3;
22
22
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
23
23
  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; } } /** @jsx jsx */
24
24
  var packageName = "@atlaskit/editor-common";
25
- var packageVersion = "78.8.2";
25
+ var packageVersion = "78.8.4";
26
26
  var halfFocusRing = 1;
27
27
  var dropOffset = '0, 8';
28
28
  var DropList = /*#__PURE__*/function (_Component) {
@@ -1,19 +1,78 @@
1
1
  "use strict";
2
2
 
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
3
  Object.defineProperty(exports, "__esModule", {
5
4
  value: true
6
5
  });
7
6
  exports.sharedMultiBodiedExtensionStyles = void 0;
8
- var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
9
7
  var _react = require("@emotion/react");
10
8
  var _colors = require("@atlaskit/theme/colors");
11
- var _templateObject, _templateObject2, _templateObject3;
9
+ var _styles = require("../../styles");
12
10
  /** @jsx jsx */
11
+
13
12
  // Wraps the navigation bar and extensionFrames
14
- var mbeExtensionContainer = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n background: transpaent !important;\n padding: {\n bottom: ", " !important;\n left: ", " !important;\n right: ", " !important;\n }\n padding-bottom: ", ";\n position: relative;\n vertical-align: middle;\n cursor: pointer;\n\n .multiBodiedExtension-handler-result {\n margin-left: ", ";\n }\n\n .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'],\n .multiBodiedExtension--frames > [data-extension-frame='true'] {\n display: none;\n background: ", ";\n }\n\n .multiBodiedExtension-content-dom-wrapper,\n .multiBodiedExtension--frames {\n [data-extension-frame='true'] > :not(style):first-child,\n [data-extension-frame='true'] > style:first-child + * {\n margin-top: 0;\n }\n }\n"])), "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-surface, white)");
15
- var mbeNavigation = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n // make sure the user can't see a range selection inside the navigation\n // This is really important to keep the navigation working properly\n border-top-left-radius: ", ";\n border-top-right-radius: ", ";\n\n user-select: none;\n -webkit-user-modify: read-only;\n border: 1px solid ", ";\n border-bottom: none !important;\n background: ", ";\n margin-left: ", ";\n margin-right: ", ";\n"])), "var(--ds-border-radius, 3px)", "var(--ds-border-radius, 3px)", "var(--ds-border, ".concat(_colors.N40, ")"), "var(--ds-surface, white)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)");
16
- var extensionFrameContent = (0, _react.css)(_templateObject3 || (_templateObject3 = (0, _taggedTemplateLiteral2.default)(["\n padding: ", " !important;\n border: 1px solid ", ";\n display: block;\n min-height: 100px;\n background: ", ";\n border-bottom-left-radius: ", ";\n border-bottom-right-radius: ", ";\n\n margin-left: ", ";\n margin-right: ", ";\n cursor: initial;\n\n .pm-table-with-controls {\n margin-left: ", " !important;\n padding-right: ", " !important;\n }\n .bodiedExtensionView-content-wrap {\n margin-top: ", " !important;\n }\n // Extension wrap have an additional margin on all four borders, so we need to adjust the spacing\n // compared to the bodiedExtensionView-content-wrap\n .extensionView-content-wrap {\n margin-top: ", " !important;\n }\n .decisionItemView-content-wrap {\n margin-top: 0px !important;\n }\n\n .decisionItemView-content-wrap > [data-decision-wrapper] {\n margin-top: 0px !important;\n }\n"])), "var(--ds-space-100, 8px)", "var(--ds-border, ".concat(_colors.N30, ")"), "var(--ds-surface, white)", "var(--ds-border-radius, 3px)", "var(--ds-border-radius, 3px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-space-150, 12px)", "var(--ds-space-150, 12px)", "var(--ds-space-150, 12px)", "var(--ds-space-100, 8px)");
13
+ var mbeExtensionContainer = (0, _react.css)({
14
+ background: 'transpaent !important',
15
+ 'padding:': {
16
+ bottom: "var(--ds-space-100, 8px)".concat(" !important"),
17
+ left: "var(--ds-space-100, 8px)".concat(" !important"),
18
+ right: "var(--ds-space-100, 8px)".concat(" !important")
19
+ },
20
+ paddingBottom: "var(--ds-space-100, 8px)",
21
+ position: 'relative',
22
+ verticalAlign: 'middle',
23
+ cursor: 'pointer',
24
+ '.multiBodiedExtension-handler-result': {
25
+ marginLeft: "var(--ds-space-100, 8px)"
26
+ },
27
+ ".multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'], .multiBodiedExtension--frames > [data-extension-frame='true']": {
28
+ display: 'none',
29
+ background: "var(--ds-surface, white)"
30
+ },
31
+ '.multiBodiedExtension-content-dom-wrapper, .multiBodiedExtension--frames': {
32
+ "[data-extension-frame='true'] > :not(style):first-child, [data-extension-frame='true'] > style:first-child + *": {
33
+ marginTop: 0
34
+ }
35
+ }
36
+ });
37
+ var mbeNavigation = (0, _react.css)({
38
+ borderTopLeftRadius: "var(--ds-border-radius, 3px)",
39
+ borderTopRightRadius: "var(--ds-border-radius, 3px)",
40
+ userSelect: 'none',
41
+ WebkitUserModify: 'read-only',
42
+ border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")")),
43
+ borderBottom: 'none !important',
44
+ background: "var(--ds-surface, white)",
45
+ marginLeft: "var(--ds-space-100, 8px)",
46
+ marginRight: "var(--ds-space-100, 8px)"
47
+ });
48
+ var extensionFrameContent = (0, _react.css)({
49
+ padding: "var(--ds-space-100, 8px)".concat(" !important"),
50
+ border: "1px solid ".concat("var(--ds-border, ".concat(_colors.N30, ")")),
51
+ display: 'block',
52
+ minHeight: '100px',
53
+ background: "var(--ds-surface, white)",
54
+ borderBottomLeftRadius: "var(--ds-border-radius, 3px)",
55
+ borderBottomRightRadius: "var(--ds-border-radius, 3px)",
56
+ marginLeft: "var(--ds-space-100, 8px)",
57
+ marginRight: "var(--ds-space-100, 8px)",
58
+ cursor: 'initial',
59
+ '.pm-table-with-controls': {
60
+ marginLeft: "var(--ds-space-150, 12px)".concat(" !important"),
61
+ paddingRight: "var(--ds-space-150, 12px)".concat(" !important")
62
+ },
63
+ '.bodiedExtensionView-content-wrap': {
64
+ marginTop: "".concat(_styles.BODIED_EXT_MBE_MARGIN_TOP, "px !important")
65
+ },
66
+ '.extensionView-content-wrap': {
67
+ marginTop: "var(--ds-space-100, 8px)".concat(" !important")
68
+ },
69
+ '.decisionItemView-content-wrap': {
70
+ marginTop: '0px !important'
71
+ },
72
+ '.decisionItemView-content-wrap > [data-decision-wrapper]': {
73
+ marginTop: '0px !important'
74
+ }
75
+ });
17
76
  var sharedMultiBodiedExtensionStyles = exports.sharedMultiBodiedExtensionStyles = {
18
77
  mbeExtensionContainer: mbeExtensionContainer,
19
78
  mbeNavigation: mbeNavigation,
@@ -152,7 +152,7 @@ const mapIconsToToolbarItem = (icons, layout, intl, nodeType, widthPluginDepende
152
152
  const shouldHideLayoutToolbar = (selection, {
153
153
  nodes
154
154
  }, allowResizingInTables) => {
155
- return hasParentNodeOfType([nodes.bodiedExtension, nodes.listItem, nodes.expand, nodes.nestedExpand, ...(allowResizingInTables ? [] : [nodes.table])].filter(Boolean))(selection);
155
+ return hasParentNodeOfType([nodes.bodiedExtension, nodes.extensionFrame, nodes.listItem, nodes.expand, nodes.nestedExpand, ...(allowResizingInTables ? [] : [nodes.table])].filter(Boolean))(selection);
156
156
  };
157
157
  const buildLayoutButtons = (state, intl, nodeType, widthPluginDependencyApi, analyticsApi, allowResizing, allowResizingInTables, allowWrapping = true, allowAlignment = true, isChangingLayoutDisabled) => {
158
158
  const {
@@ -82,8 +82,8 @@ export const toolbarInsertBlockMessages = defineMessages({
82
82
  },
83
83
  tableSizeSelectorButton: {
84
84
  id: 'fabric.editor.tableSizeSelectorButton',
85
- defaultMessage: 'Create table of size',
86
- description: 'Creates table popup grid of defined size'
85
+ defaultMessage: '{numberOfColumns} by {numberOfRows}',
86
+ description: 'Creates a table of custom size'
87
87
  },
88
88
  tableSizeSelectorPopup: {
89
89
  id: 'fabric.editor.tableSizeSelectorPopup',
@@ -167,7 +167,7 @@ export const messages = defineMessages({
167
167
  },
168
168
  backgroundColor: {
169
169
  id: 'fabric.editor.backgroundColor',
170
- defaultMessage: 'Background Color',
170
+ defaultMessage: 'Background color',
171
171
  description: 'Change the background color of a table cell.'
172
172
  },
173
173
  mergeCells: {
@@ -1,6 +1,6 @@
1
1
  const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
2
2
  const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
3
- const packageVersion = "78.8.2";
3
+ const packageVersion = "78.8.4";
4
4
  const sanitiseSentryEvents = (data, _hint) => {
5
5
  // Remove URL as it has UGC
6
6
  // TODO: Sanitise the URL instead of just removing it
@@ -68,6 +68,9 @@ export const getParentNodeWidth = (pos, state, containerWidth, isFullWidthModeEn
68
68
  case schema.nodes.bodiedExtension:
69
69
  parentWidth -= BODIED_EXT_PADDING * 2;
70
70
  break;
71
+ case schema.nodes.extensionFrame:
72
+ parentWidth -= BODIED_EXT_PADDING * 2;
73
+ break;
71
74
 
72
75
  // TODO: Migrate away from gridSize
73
76
  // Recommendation: Replace gridSize with 8
@@ -91,7 +94,7 @@ const getNestedParentNode = (tablePos, state) => {
91
94
  return null;
92
95
  }
93
96
  const $pos = state.doc.resolve(tablePos);
94
- const parent = findParentNodeOfTypeClosestToPos($pos, [state.schema.nodes.bodiedExtension, state.schema.nodes.layoutSection, state.schema.nodes.expand]);
97
+ const parent = findParentNodeOfTypeClosestToPos($pos, [state.schema.nodes.bodiedExtension, state.schema.nodes.extensionFrame, state.schema.nodes.layoutSection, state.schema.nodes.expand]);
95
98
  return parent ? parent.node : null;
96
99
  };
97
100
  const calcBreakoutNodeWidth = (layout, containerWidth, isFullWidthModeEnabled) => {
@@ -30,4 +30,5 @@ export { buttonGroupStyle, separatorStyles, wrapperStyle, triggerWrapperStyles }
30
30
  export { UnsupportedSharedCssClassName, unsupportedStyles } from './shared/unsupported-content';
31
31
  export { expandIconWrapperStyle, expandClassNames } from './shared/expand';
32
32
  export { ClassNames as MediaSharedClassNames } from './shared/media';
33
- export { BreakoutCssClassName } from './shared/breakout';
33
+ export { BreakoutCssClassName } from './shared/breakout';
34
+ export { BODIED_EXT_MBE_MARGIN_TOP } from './shared/extension';
@@ -4,4 +4,5 @@ import { gridSize } from '@atlaskit/theme/constants';
4
4
  // TODO: Migrate away from gridSize
5
5
  // Recommendation: Replace gridSize with 8
6
6
  export const EXTENSION_PADDING = gridSize();
7
- export const BODIED_EXT_PADDING = EXTENSION_PADDING * 2;
7
+ export const BODIED_EXT_PADDING = EXTENSION_PADDING * 2;
8
+ export const BODIED_EXT_MBE_MARGIN_TOP = 12;
@@ -7,7 +7,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
7
7
  import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
8
8
  import Layer from '../Layer';
9
9
  const packageName = "@atlaskit/editor-common";
10
- const packageVersion = "78.8.2";
10
+ const packageVersion = "78.8.4";
11
11
  const halfFocusRing = 1;
12
12
  const dropOffset = '0, 8';
13
13
  class DropList extends Component {
@@ -2,84 +2,72 @@
2
2
 
3
3
  import { css } from '@emotion/react';
4
4
  import { N30, N40 } from '@atlaskit/theme/colors';
5
- // Wraps the navigation bar and extensionFrames
6
- const mbeExtensionContainer = css`
7
- background: transpaent !important;
8
- padding: {
9
- bottom: ${"var(--ds-space-100, 8px)"} !important;
10
- left: ${"var(--ds-space-100, 8px)"} !important;
11
- right: ${"var(--ds-space-100, 8px)"} !important;
12
- }
13
- padding-bottom: ${"var(--ds-space-100, 8px)"};
14
- position: relative;
15
- vertical-align: middle;
16
- cursor: pointer;
17
-
18
- .multiBodiedExtension-handler-result {
19
- margin-left: ${"var(--ds-space-100, 8px)"};
20
- }
5
+ import { BODIED_EXT_MBE_MARGIN_TOP } from '../../styles';
21
6
 
22
- .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'],
23
- .multiBodiedExtension--frames > [data-extension-frame='true'] {
24
- display: none;
25
- background: ${"var(--ds-surface, white)"};
26
- }
27
-
28
- .multiBodiedExtension-content-dom-wrapper,
29
- .multiBodiedExtension--frames {
30
- [data-extension-frame='true'] > :not(style):first-child,
31
- [data-extension-frame='true'] > style:first-child + * {
32
- margin-top: 0;
7
+ // Wraps the navigation bar and extensionFrames
8
+ const mbeExtensionContainer = css({
9
+ background: 'transpaent !important',
10
+ 'padding:': {
11
+ bottom: `${"var(--ds-space-100, 8px)"} !important`,
12
+ left: `${"var(--ds-space-100, 8px)"} !important`,
13
+ right: `${"var(--ds-space-100, 8px)"} !important`
14
+ },
15
+ paddingBottom: "var(--ds-space-100, 8px)",
16
+ position: 'relative',
17
+ verticalAlign: 'middle',
18
+ cursor: 'pointer',
19
+ '.multiBodiedExtension-handler-result': {
20
+ marginLeft: "var(--ds-space-100, 8px)"
21
+ },
22
+ ".multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'], .multiBodiedExtension--frames > [data-extension-frame='true']": {
23
+ display: 'none',
24
+ background: "var(--ds-surface, white)"
25
+ },
26
+ '.multiBodiedExtension-content-dom-wrapper, .multiBodiedExtension--frames': {
27
+ "[data-extension-frame='true'] > :not(style):first-child, [data-extension-frame='true'] > style:first-child + *": {
28
+ marginTop: 0
33
29
  }
34
30
  }
35
- `;
36
- const mbeNavigation = css`
37
- // make sure the user can't see a range selection inside the navigation
38
- // This is really important to keep the navigation working properly
39
- border-top-left-radius: ${"var(--ds-border-radius, 3px)"};
40
- border-top-right-radius: ${"var(--ds-border-radius, 3px)"};
41
-
42
- user-select: none;
43
- -webkit-user-modify: read-only;
44
- border: 1px solid ${`var(--ds-border, ${N40})`};
45
- border-bottom: none !important;
46
- background: ${"var(--ds-surface, white)"};
47
- margin-left: ${"var(--ds-space-100, 8px)"};
48
- margin-right: ${"var(--ds-space-100, 8px)"};
49
- `;
50
- const extensionFrameContent = css`
51
- padding: ${"var(--ds-space-100, 8px)"} !important;
52
- border: 1px solid ${`var(--ds-border, ${N30})`};
53
- display: block;
54
- min-height: 100px;
55
- background: ${"var(--ds-surface, white)"};
56
- border-bottom-left-radius: ${"var(--ds-border-radius, 3px)"};
57
- border-bottom-right-radius: ${"var(--ds-border-radius, 3px)"};
58
-
59
- margin-left: ${"var(--ds-space-100, 8px)"};
60
- margin-right: ${"var(--ds-space-100, 8px)"};
61
- cursor: initial;
62
-
63
- .pm-table-with-controls {
64
- margin-left: ${"var(--ds-space-150, 12px)"} !important;
65
- padding-right: ${"var(--ds-space-150, 12px)"} !important;
66
- }
67
- .bodiedExtensionView-content-wrap {
68
- margin-top: ${"var(--ds-space-150, 12px)"} !important;
69
- }
70
- // Extension wrap have an additional margin on all four borders, so we need to adjust the spacing
71
- // compared to the bodiedExtensionView-content-wrap
72
- .extensionView-content-wrap {
73
- margin-top: ${"var(--ds-space-100, 8px)"} !important;
74
- }
75
- .decisionItemView-content-wrap {
76
- margin-top: 0px !important;
77
- }
78
-
79
- .decisionItemView-content-wrap > [data-decision-wrapper] {
80
- margin-top: 0px !important;
31
+ });
32
+ const mbeNavigation = css({
33
+ borderTopLeftRadius: "var(--ds-border-radius, 3px)",
34
+ borderTopRightRadius: "var(--ds-border-radius, 3px)",
35
+ userSelect: 'none',
36
+ WebkitUserModify: 'read-only',
37
+ border: `1px solid ${`var(--ds-border, ${N40})`}`,
38
+ borderBottom: 'none !important',
39
+ background: "var(--ds-surface, white)",
40
+ marginLeft: "var(--ds-space-100, 8px)",
41
+ marginRight: "var(--ds-space-100, 8px)"
42
+ });
43
+ const extensionFrameContent = css({
44
+ padding: `${"var(--ds-space-100, 8px)"} !important`,
45
+ border: `1px solid ${`var(--ds-border, ${N30})`}`,
46
+ display: 'block',
47
+ minHeight: '100px',
48
+ background: "var(--ds-surface, white)",
49
+ borderBottomLeftRadius: "var(--ds-border-radius, 3px)",
50
+ borderBottomRightRadius: "var(--ds-border-radius, 3px)",
51
+ marginLeft: "var(--ds-space-100, 8px)",
52
+ marginRight: "var(--ds-space-100, 8px)",
53
+ cursor: 'initial',
54
+ '.pm-table-with-controls': {
55
+ marginLeft: `${"var(--ds-space-150, 12px)"} !important`,
56
+ paddingRight: `${"var(--ds-space-150, 12px)"} !important`
57
+ },
58
+ '.bodiedExtensionView-content-wrap': {
59
+ marginTop: `${BODIED_EXT_MBE_MARGIN_TOP}px !important`
60
+ },
61
+ '.extensionView-content-wrap': {
62
+ marginTop: `${"var(--ds-space-100, 8px)"} !important`
63
+ },
64
+ '.decisionItemView-content-wrap': {
65
+ marginTop: '0px !important'
66
+ },
67
+ '.decisionItemView-content-wrap > [data-decision-wrapper]': {
68
+ marginTop: '0px !important'
81
69
  }
82
- `;
70
+ });
83
71
  export const sharedMultiBodiedExtensionStyles = {
84
72
  mbeExtensionContainer,
85
73
  mbeNavigation,
@@ -135,7 +135,7 @@ var mapIconsToToolbarItem = function mapIconsToToolbarItem(icons, layout, intl,
135
135
  };
136
136
  var shouldHideLayoutToolbar = function shouldHideLayoutToolbar(selection, _ref2, allowResizingInTables) {
137
137
  var nodes = _ref2.nodes;
138
- return hasParentNodeOfType([nodes.bodiedExtension, nodes.listItem, nodes.expand, nodes.nestedExpand].concat(_toConsumableArray(allowResizingInTables ? [] : [nodes.table])).filter(Boolean))(selection);
138
+ return hasParentNodeOfType([nodes.bodiedExtension, nodes.extensionFrame, nodes.listItem, nodes.expand, nodes.nestedExpand].concat(_toConsumableArray(allowResizingInTables ? [] : [nodes.table])).filter(Boolean))(selection);
139
139
  };
140
140
  var buildLayoutButtons = function buildLayoutButtons(state, intl, nodeType, widthPluginDependencyApi, analyticsApi, allowResizing, allowResizingInTables) {
141
141
  var allowWrapping = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : true;
@@ -82,8 +82,8 @@ export var toolbarInsertBlockMessages = defineMessages({
82
82
  },
83
83
  tableSizeSelectorButton: {
84
84
  id: 'fabric.editor.tableSizeSelectorButton',
85
- defaultMessage: 'Create table of size',
86
- description: 'Creates table popup grid of defined size'
85
+ defaultMessage: '{numberOfColumns} by {numberOfRows}',
86
+ description: 'Creates a table of custom size'
87
87
  },
88
88
  tableSizeSelectorPopup: {
89
89
  id: 'fabric.editor.tableSizeSelectorPopup',
@@ -167,7 +167,7 @@ export var messages = defineMessages({
167
167
  },
168
168
  backgroundColor: {
169
169
  id: 'fabric.editor.backgroundColor',
170
- defaultMessage: 'Background Color',
170
+ defaultMessage: 'Background color',
171
171
  description: 'Change the background color of a table cell.'
172
172
  },
173
173
  mergeCells: {
@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
6
6
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
7
7
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
8
8
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
9
- var packageVersion = "78.8.2";
9
+ var packageVersion = "78.8.4";
10
10
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
11
11
  // Remove URL as it has UGC
12
12
  // TODO: Sanitise the URL instead of just removing it
@@ -66,6 +66,9 @@ export var getParentNodeWidth = function getParentNodeWidth(pos, state, containe
66
66
  case schema.nodes.bodiedExtension:
67
67
  parentWidth -= BODIED_EXT_PADDING * 2;
68
68
  break;
69
+ case schema.nodes.extensionFrame:
70
+ parentWidth -= BODIED_EXT_PADDING * 2;
71
+ break;
69
72
 
70
73
  // TODO: Migrate away from gridSize
71
74
  // Recommendation: Replace gridSize with 8
@@ -89,7 +92,7 @@ var getNestedParentNode = function getNestedParentNode(tablePos, state) {
89
92
  return null;
90
93
  }
91
94
  var $pos = state.doc.resolve(tablePos);
92
- var parent = findParentNodeOfTypeClosestToPos($pos, [state.schema.nodes.bodiedExtension, state.schema.nodes.layoutSection, state.schema.nodes.expand]);
95
+ var parent = findParentNodeOfTypeClosestToPos($pos, [state.schema.nodes.bodiedExtension, state.schema.nodes.extensionFrame, state.schema.nodes.layoutSection, state.schema.nodes.expand]);
93
96
  return parent ? parent.node : null;
94
97
  };
95
98
  var calcBreakoutNodeWidth = function calcBreakoutNodeWidth(layout, containerWidth, isFullWidthModeEnabled) {
@@ -30,4 +30,5 @@ export { buttonGroupStyle, separatorStyles, wrapperStyle, triggerWrapperStyles }
30
30
  export { UnsupportedSharedCssClassName, unsupportedStyles } from './shared/unsupported-content';
31
31
  export { expandIconWrapperStyle, expandClassNames } from './shared/expand';
32
32
  export { ClassNames as MediaSharedClassNames } from './shared/media';
33
- export { BreakoutCssClassName } from './shared/breakout';
33
+ export { BreakoutCssClassName } from './shared/breakout';
34
+ export { BODIED_EXT_MBE_MARGIN_TOP } from './shared/extension';
@@ -4,4 +4,5 @@ import { gridSize } from '@atlaskit/theme/constants';
4
4
  // TODO: Migrate away from gridSize
5
5
  // Recommendation: Replace gridSize with 8
6
6
  export var EXTENSION_PADDING = gridSize();
7
- export var BODIED_EXT_PADDING = EXTENSION_PADDING * 2;
7
+ export var BODIED_EXT_PADDING = EXTENSION_PADDING * 2;
8
+ export var BODIED_EXT_MBE_MARGIN_TOP = 12;
@@ -17,7 +17,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
17
17
  import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
18
18
  import Layer from '../Layer';
19
19
  var packageName = "@atlaskit/editor-common";
20
- var packageVersion = "78.8.2";
20
+ var packageVersion = "78.8.4";
21
21
  var halfFocusRing = 1;
22
22
  var dropOffset = '0, 8';
23
23
  var DropList = /*#__PURE__*/function (_Component) {
@@ -1,13 +1,73 @@
1
- import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
2
- var _templateObject, _templateObject2, _templateObject3;
3
1
  /** @jsx jsx */
4
2
 
5
3
  import { css } from '@emotion/react';
6
4
  import { N30, N40 } from '@atlaskit/theme/colors';
5
+ import { BODIED_EXT_MBE_MARGIN_TOP } from '../../styles';
6
+
7
7
  // Wraps the navigation bar and extensionFrames
8
- var mbeExtensionContainer = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n background: transpaent !important;\n padding: {\n bottom: ", " !important;\n left: ", " !important;\n right: ", " !important;\n }\n padding-bottom: ", ";\n position: relative;\n vertical-align: middle;\n cursor: pointer;\n\n .multiBodiedExtension-handler-result {\n margin-left: ", ";\n }\n\n .multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'],\n .multiBodiedExtension--frames > [data-extension-frame='true'] {\n display: none;\n background: ", ";\n }\n\n .multiBodiedExtension-content-dom-wrapper,\n .multiBodiedExtension--frames {\n [data-extension-frame='true'] > :not(style):first-child,\n [data-extension-frame='true'] > style:first-child + * {\n margin-top: 0;\n }\n }\n"])), "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-surface, white)");
9
- var mbeNavigation = css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n // make sure the user can't see a range selection inside the navigation\n // This is really important to keep the navigation working properly\n border-top-left-radius: ", ";\n border-top-right-radius: ", ";\n\n user-select: none;\n -webkit-user-modify: read-only;\n border: 1px solid ", ";\n border-bottom: none !important;\n background: ", ";\n margin-left: ", ";\n margin-right: ", ";\n"])), "var(--ds-border-radius, 3px)", "var(--ds-border-radius, 3px)", "var(--ds-border, ".concat(N40, ")"), "var(--ds-surface, white)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)");
10
- var extensionFrameContent = css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n padding: ", " !important;\n border: 1px solid ", ";\n display: block;\n min-height: 100px;\n background: ", ";\n border-bottom-left-radius: ", ";\n border-bottom-right-radius: ", ";\n\n margin-left: ", ";\n margin-right: ", ";\n cursor: initial;\n\n .pm-table-with-controls {\n margin-left: ", " !important;\n padding-right: ", " !important;\n }\n .bodiedExtensionView-content-wrap {\n margin-top: ", " !important;\n }\n // Extension wrap have an additional margin on all four borders, so we need to adjust the spacing\n // compared to the bodiedExtensionView-content-wrap\n .extensionView-content-wrap {\n margin-top: ", " !important;\n }\n .decisionItemView-content-wrap {\n margin-top: 0px !important;\n }\n\n .decisionItemView-content-wrap > [data-decision-wrapper] {\n margin-top: 0px !important;\n }\n"])), "var(--ds-space-100, 8px)", "var(--ds-border, ".concat(N30, ")"), "var(--ds-surface, white)", "var(--ds-border-radius, 3px)", "var(--ds-border-radius, 3px)", "var(--ds-space-100, 8px)", "var(--ds-space-100, 8px)", "var(--ds-space-150, 12px)", "var(--ds-space-150, 12px)", "var(--ds-space-150, 12px)", "var(--ds-space-100, 8px)");
8
+ var mbeExtensionContainer = css({
9
+ background: 'transpaent !important',
10
+ 'padding:': {
11
+ bottom: "var(--ds-space-100, 8px)".concat(" !important"),
12
+ left: "var(--ds-space-100, 8px)".concat(" !important"),
13
+ right: "var(--ds-space-100, 8px)".concat(" !important")
14
+ },
15
+ paddingBottom: "var(--ds-space-100, 8px)",
16
+ position: 'relative',
17
+ verticalAlign: 'middle',
18
+ cursor: 'pointer',
19
+ '.multiBodiedExtension-handler-result': {
20
+ marginLeft: "var(--ds-space-100, 8px)"
21
+ },
22
+ ".multiBodiedExtension-content-dom-wrapper > [data-extension-frame='true'], .multiBodiedExtension--frames > [data-extension-frame='true']": {
23
+ display: 'none',
24
+ background: "var(--ds-surface, white)"
25
+ },
26
+ '.multiBodiedExtension-content-dom-wrapper, .multiBodiedExtension--frames': {
27
+ "[data-extension-frame='true'] > :not(style):first-child, [data-extension-frame='true'] > style:first-child + *": {
28
+ marginTop: 0
29
+ }
30
+ }
31
+ });
32
+ var mbeNavigation = css({
33
+ borderTopLeftRadius: "var(--ds-border-radius, 3px)",
34
+ borderTopRightRadius: "var(--ds-border-radius, 3px)",
35
+ userSelect: 'none',
36
+ WebkitUserModify: 'read-only',
37
+ border: "1px solid ".concat("var(--ds-border, ".concat(N40, ")")),
38
+ borderBottom: 'none !important',
39
+ background: "var(--ds-surface, white)",
40
+ marginLeft: "var(--ds-space-100, 8px)",
41
+ marginRight: "var(--ds-space-100, 8px)"
42
+ });
43
+ var extensionFrameContent = css({
44
+ padding: "var(--ds-space-100, 8px)".concat(" !important"),
45
+ border: "1px solid ".concat("var(--ds-border, ".concat(N30, ")")),
46
+ display: 'block',
47
+ minHeight: '100px',
48
+ background: "var(--ds-surface, white)",
49
+ borderBottomLeftRadius: "var(--ds-border-radius, 3px)",
50
+ borderBottomRightRadius: "var(--ds-border-radius, 3px)",
51
+ marginLeft: "var(--ds-space-100, 8px)",
52
+ marginRight: "var(--ds-space-100, 8px)",
53
+ cursor: 'initial',
54
+ '.pm-table-with-controls': {
55
+ marginLeft: "var(--ds-space-150, 12px)".concat(" !important"),
56
+ paddingRight: "var(--ds-space-150, 12px)".concat(" !important")
57
+ },
58
+ '.bodiedExtensionView-content-wrap': {
59
+ marginTop: "".concat(BODIED_EXT_MBE_MARGIN_TOP, "px !important")
60
+ },
61
+ '.extensionView-content-wrap': {
62
+ marginTop: "var(--ds-space-100, 8px)".concat(" !important")
63
+ },
64
+ '.decisionItemView-content-wrap': {
65
+ marginTop: '0px !important'
66
+ },
67
+ '.decisionItemView-content-wrap > [data-decision-wrapper]': {
68
+ marginTop: '0px !important'
69
+ }
70
+ });
11
71
  export var sharedMultiBodiedExtensionStyles = {
12
72
  mbeExtensionContainer: mbeExtensionContainer,
13
73
  mbeNavigation: mbeNavigation,
@@ -1,5 +1,5 @@
1
- import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
2
- import { EditorState } from '@atlaskit/editor-prosemirror/state';
1
+ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
2
+ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
3
3
  import type { EditorContainerWidth } from '../types/editor-container-width';
4
4
  export declare const layoutToWidth: {
5
5
  default: number;
@@ -31,3 +31,4 @@ export { UnsupportedSharedCssClassName, unsupportedStyles, } from './shared/unsu
31
31
  export { expandIconWrapperStyle, expandClassNames } from './shared/expand';
32
32
  export { ClassNames as MediaSharedClassNames } from './shared/media';
33
33
  export { BreakoutCssClassName } from './shared/breakout';
34
+ export { BODIED_EXT_MBE_MARGIN_TOP } from './shared/extension';
@@ -1,2 +1,3 @@
1
1
  export declare const EXTENSION_PADDING: number;
2
2
  export declare const BODIED_EXT_PADDING: number;
3
+ export declare const BODIED_EXT_MBE_MARGIN_TOP = 12;
@@ -1,5 +1,5 @@
1
- import { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
2
- import { EditorState } from '@atlaskit/editor-prosemirror/state';
1
+ import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
2
+ import type { EditorState } from '@atlaskit/editor-prosemirror/state';
3
3
  import type { EditorContainerWidth } from '../types/editor-container-width';
4
4
  export declare const layoutToWidth: {
5
5
  default: number;
@@ -31,3 +31,4 @@ export { UnsupportedSharedCssClassName, unsupportedStyles, } from './shared/unsu
31
31
  export { expandIconWrapperStyle, expandClassNames } from './shared/expand';
32
32
  export { ClassNames as MediaSharedClassNames } from './shared/media';
33
33
  export { BreakoutCssClassName } from './shared/breakout';
34
+ export { BODIED_EXT_MBE_MARGIN_TOP } from './shared/extension';
@@ -1,2 +1,3 @@
1
1
  export declare const EXTENSION_PADDING: number;
2
2
  export declare const BODIED_EXT_PADDING: number;
3
+ export declare const BODIED_EXT_MBE_MARGIN_TOP = 12;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "78.8.2",
3
+ "version": "78.8.4",
4
4
  "description": "A package that contains common classes and components for editor and renderer",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"