@atlaskit/editor-common 68.0.2 → 69.1.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 (56) hide show
  1. package/CHANGELOG.md +42 -0
  2. package/codemods/69.0.0-update-validator-imports.ts +7 -0
  3. package/codemods/migrates/entry-points.ts +37 -0
  4. package/dist/cjs/styles/index.js +15 -1
  5. package/dist/cjs/styles/shared/code-block.js +58 -0
  6. package/dist/cjs/styles/shared/emoji.js +2 -1
  7. package/dist/cjs/styles/shared/panel.js +2 -1
  8. package/dist/cjs/ui/Mention/mention-with-profilecard.js +4 -2
  9. package/dist/cjs/ui/Popup/index.js +38 -1
  10. package/dist/cjs/ui/clear-next-sibling-margin-top.js +11 -4
  11. package/dist/cjs/ui/index.js +6 -0
  12. package/dist/cjs/utils/browser.js +4 -0
  13. package/dist/cjs/utils/index.js +0 -56
  14. package/dist/cjs/utils/performance/measure-render.js +52 -5
  15. package/dist/cjs/validator.js +6 -0
  16. package/dist/cjs/version.json +1 -1
  17. package/dist/es2019/styles/index.js +2 -1
  18. package/dist/es2019/styles/shared/code-block.js +94 -0
  19. package/dist/es2019/styles/shared/emoji.js +3 -2
  20. package/dist/es2019/styles/shared/panel.js +2 -1
  21. package/dist/es2019/ui/Mention/mention-with-profilecard.js +1 -1
  22. package/dist/es2019/ui/Popup/index.js +24 -1
  23. package/dist/es2019/ui/clear-next-sibling-margin-top.js +9 -1
  24. package/dist/es2019/ui/index.js +1 -1
  25. package/dist/es2019/utils/browser.js +4 -0
  26. package/dist/es2019/utils/index.js +0 -1
  27. package/dist/es2019/utils/performance/measure-render.js +52 -5
  28. package/dist/es2019/validator.js +1 -1
  29. package/dist/es2019/version.json +1 -1
  30. package/dist/esm/styles/index.js +2 -1
  31. package/dist/esm/styles/shared/code-block.js +39 -0
  32. package/dist/esm/styles/shared/emoji.js +3 -2
  33. package/dist/esm/styles/shared/panel.js +2 -1
  34. package/dist/esm/ui/Mention/mention-with-profilecard.js +1 -1
  35. package/dist/esm/ui/Popup/index.js +40 -1
  36. package/dist/esm/ui/clear-next-sibling-margin-top.js +8 -2
  37. package/dist/esm/ui/index.js +1 -1
  38. package/dist/esm/utils/browser.js +4 -0
  39. package/dist/esm/utils/index.js +0 -1
  40. package/dist/esm/utils/performance/measure-render.js +52 -5
  41. package/dist/esm/validator.js +1 -1
  42. package/dist/esm/version.json +1 -1
  43. package/dist/types/provider-factory/card-provider.d.ts +1 -1
  44. package/dist/types/styles/index.d.ts +1 -0
  45. package/dist/types/styles/shared/code-block.d.ts +8 -0
  46. package/dist/types/styles/shared/emoji.d.ts +1 -0
  47. package/dist/types/styles/shared/panel.d.ts +1 -0
  48. package/dist/types/ui/Popup/index.d.ts +4 -0
  49. package/dist/types/ui/clear-next-sibling-margin-top.d.ts +1 -0
  50. package/dist/types/ui/index.d.ts +1 -1
  51. package/dist/types/utils/browser.d.ts +1 -12
  52. package/dist/types/utils/index.d.ts +0 -2
  53. package/dist/types/utils/performance/measure-render.d.ts +28 -1
  54. package/dist/types/validator.d.ts +1 -1
  55. package/package.json +12 -11
  56. package/report.api.md +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,47 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 69.1.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`2affe8adcfa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2affe8adcfa) - ED-14510: Generic feature flag to disable spellcheck via browser and version
8
+ - [`5020781d90a`](https://bitbucket.org/atlassian/atlassian-frontend/commits/5020781d90a) - [ux] ED-15099 added floatng toolbar copy button to Expand
9
+ - [`995991c4b11`](https://bitbucket.org/atlassian/atlassian-frontend/commits/995991c4b11) - [ux] ED-15108 added floating toolbar copy button to Layout
10
+
11
+ ### Patch Changes
12
+
13
+ - [`832e383140e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/832e383140e) - Import ProfileCardTrigger from specialized entrypoint for better tree-shaking
14
+ - [`04db970c32b`](https://bitbucket.org/atlassian/atlassian-frontend/commits/04db970c32b) - ED-14899 add attribute to render measurements and rework analytics events to prevent measurements done in background to resulting in misleading render durations.
15
+ - Updated dependencies
16
+
17
+ ## 69.0.1
18
+
19
+ ### Patch Changes
20
+
21
+ - Updated dependencies
22
+
23
+ ## 69.0.0
24
+
25
+ ### Major Changes
26
+
27
+ - [`04589993d81`](https://bitbucket.org/atlassian/atlassian-frontend/commits/04589993d81) - ED-15148: moved duplicate entrypoints from @atlaskit/editor-common/utils to @atlaskit/editor-common/validator
28
+
29
+ ### Minor Changes
30
+
31
+ - [`8ff3031db06`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8ff3031db06) - Introduce new optional argument to CardProvider.resolve
32
+ - [`07c8b0b4504`](https://bitbucket.org/atlassian/atlassian-frontend/commits/07c8b0b4504) - [ux] ED-15102 adds a copy button to nodes with floating toolbars
33
+ - [`2d979ce9877`](https://bitbucket.org/atlassian/atlassian-frontend/commits/2d979ce9877) - [ux] ED-14945: Add windowed codeblock support in renderer (This feature sits behind a flag in the featureFlags prop 'allow-windowed-code-block')
34
+ - [`04746af08f6`](https://bitbucket.org/atlassian/atlassian-frontend/commits/04746af08f6) - [ux] ED-15097 added floating toolbar copy button to table
35
+ - [`e4dba654a71`](https://bitbucket.org/atlassian/atlassian-frontend/commits/e4dba654a71) - [ux] ED-15233: Fix breakout button positioning for breakout supported nodes in scenarios where editor disabled props changes while Editor is visually hidden and redisplayed.
36
+ Fixed by skipping breakout width update work when the editorView dom element is width 0 (hidden) and deferring LayoutButton position updates to second animation frame (on window
37
+ and editor resizes).
38
+ - [`11f56527739`](https://bitbucket.org/atlassian/atlassian-frontend/commits/11f56527739) - Export emoji placeholder class name
39
+
40
+ ### Patch Changes
41
+
42
+ - [`153b80fdcda`](https://bitbucket.org/atlassian/atlassian-frontend/commits/153b80fdcda) - [ux] ED-15111: Fix aligned text and headings margin-top values in layouts in Renderer (by clearing them)
43
+ - Updated dependencies
44
+
3
45
  ## 68.0.2
4
46
 
5
47
  ### Patch Changes
@@ -0,0 +1,7 @@
1
+ import { createTransformer } from '@atlaskit/codemod-utils';
2
+
3
+ import { validatorExports, validatorTypes } from './migrates/entry-points';
4
+
5
+ const transformer = createTransformer([...validatorTypes, ...validatorExports]);
6
+
7
+ export default transformer;
@@ -0,0 +1,37 @@
1
+ import { changeImportEntryPoint } from '@atlaskit/codemod-utils';
2
+
3
+ const PACKAGE_NAME = '@atlaskit/editor-common';
4
+
5
+ export const validatorExports = [
6
+ 'getMarksByOrder',
7
+ 'getValidContent',
8
+ 'getValidDocument',
9
+ 'getValidMark',
10
+ 'getValidNode',
11
+ 'getValidUnknownNode',
12
+ 'isSameMark',
13
+ 'isSubSupType',
14
+ 'markOrder',
15
+ 'ADFStages',
16
+ ].map((name) =>
17
+ changeImportEntryPoint(
18
+ `${PACKAGE_NAME}/utils`,
19
+ name,
20
+ `${PACKAGE_NAME}/validator`,
21
+ ),
22
+ );
23
+
24
+ export const validatorTypes = [
25
+ 'ADDoc',
26
+ 'ADFStage',
27
+ 'ADMark',
28
+ 'ADMarkSimple',
29
+ 'ADNode',
30
+ ].map((name) =>
31
+ changeImportEntryPoint(
32
+ `${PACKAGE_NAME}/utils`,
33
+ name,
34
+ `${PACKAGE_NAME}/validator`,
35
+ true,
36
+ ),
37
+ );
@@ -15,6 +15,12 @@ Object.defineProperty(exports, "AnnotationSharedClassNames", {
15
15
  return _annotation.AnnotationSharedClassNames;
16
16
  }
17
17
  });
18
+ Object.defineProperty(exports, "CodeBlockSharedCssClassName", {
19
+ enumerable: true,
20
+ get: function get() {
21
+ return _codeBlock.CodeBlockSharedCssClassName;
22
+ }
23
+ });
18
24
  Object.defineProperty(exports, "DateSharedCssClassName", {
19
25
  enumerable: true,
20
26
  get: function get() {
@@ -69,6 +75,12 @@ Object.defineProperty(exports, "calcTableWidth", {
69
75
  return _table.calcTableWidth;
70
76
  }
71
77
  });
78
+ Object.defineProperty(exports, "codeBlockSharedStyles", {
79
+ enumerable: true,
80
+ get: function get() {
81
+ return _codeBlock.codeBlockSharedStyles;
82
+ }
83
+ });
72
84
  Object.defineProperty(exports, "codeMarkSharedStyles", {
73
85
  enumerable: true,
74
86
  get: function get() {
@@ -258,4 +270,6 @@ var _taskDecision = require("./shared/task-decision");
258
270
 
259
271
  var _status = require("./shared/status");
260
272
 
261
- var _smartCard = require("./shared/smart-card");
273
+ var _smartCard = require("./shared/smart-card");
274
+
275
+ var _codeBlock = require("./shared/code-block");
@@ -0,0 +1,58 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.codeBlockSharedStyles = exports.CodeBlockSharedCssClassName = void 0;
9
+
10
+ var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
11
+
12
+ var _react = require("@emotion/react");
13
+
14
+ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
15
+
16
+ var _colors = require("@atlaskit/theme/colors");
17
+
18
+ var _components = require("@atlaskit/theme/components");
19
+
20
+ var _constants = require("@atlaskit/theme/constants");
21
+
22
+ var _tokens = require("@atlaskit/tokens");
23
+
24
+ var _templateObject;
25
+
26
+ var CodeBlockSharedCssClassName = {
27
+ CODEBLOCK_CONTAINER: 'code-block',
28
+ CODEBLOCK_LINE_NUMBER_GUTTER: 'line-number-gutter',
29
+ CODEBLOCK_CONTENT: 'code-content',
30
+ DS_CODEBLOCK: '[data-ds--code--code-block]'
31
+ };
32
+ exports.CodeBlockSharedCssClassName = CodeBlockSharedCssClassName;
33
+
34
+ var codeBlockSharedStyles = function codeBlockSharedStyles(props) {
35
+ return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n .", " {\n position: relative;\n background-color: ", ";\n border-radius: ", "px;\n counter-reset: line;\n display: flex;\n overflow-x: auto;\n\n background-image: ", ";\n\n --ds--code--bg-color: transparent;\n\n background-repeat: no-repeat;\n background-attachment: local, scroll, scroll;\n background-size: 8px 100%, 8px 100%, 8px 100%;\n background-position: 100% 0, 100% 0, 0 0;\n font-family: ", ";\n margin: ", " 0 0 0;\n min-width: ", "px;\n cursor: pointer;\n\n .", " {\n flex-shrink: 0;\n text-align: right;\n background-color: ", ";\n padding: ", "px;\n\n span {\n display: block;\n line-height: 0;\n font-size: 0;\n\n ::before {\n display: inline-block;\n content: counter(line);\n counter-increment: line;\n color: ", ";\n font-size: ", ";\n line-height: 1.5rem;\n }\n }\n }\n\n .", " {\n display: flex;\n flex: 1;\n\n code {\n flex-grow: 1;\n tab-size: 4;\n cursor: text;\n color: ", ";\n border-radius: ", "px;\n margin: ", "px;\n white-space: pre;\n font-size: ", ";\n line-height: 1.5rem;\n }\n }\n }\n"])), CodeBlockSharedCssClassName.CODEBLOCK_CONTAINER, (0, _components.themed)({
36
+ light: (0, _tokens.token)('color.background.neutral', _colors.N20),
37
+ dark: (0, _tokens.token)('color.background.neutral', _colors.DN50)
38
+ })(props), (0, _constants.borderRadius)(), (0, _editorSharedStyles.overflowShadow)({
39
+ // TODO: https://product-fabric.atlassian.net/browse/DSP-4118
40
+ // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage
41
+ background: (0, _components.themed)({
42
+ light: _colors.N20,
43
+ dark: _colors.DN50
44
+ })(props),
45
+ width: '8px'
46
+ }), _editorSharedStyles.akEditorCodeFontFamily, _editorSharedStyles.blockNodesVerticalMargin, _editorSharedStyles.akEditorTableCellMinWidth, CodeBlockSharedCssClassName.CODEBLOCK_LINE_NUMBER_GUTTER, (0, _components.themed)({
47
+ light: (0, _tokens.token)('color.background.neutral', _colors.N30),
48
+ dark: (0, _tokens.token)('color.background.neutral', _colors.DN20)
49
+ })(props), (0, _constants.gridSize)(), (0, _components.themed)({
50
+ light: (0, _tokens.token)('color.text.subtlest', _colors.N400),
51
+ dark: (0, _tokens.token)('color.text.subtlest', _colors.DN400)
52
+ })(props), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()), CodeBlockSharedCssClassName.CODEBLOCK_CONTENT, (0, _components.themed)({
53
+ light: (0, _tokens.token)('color.text', _colors.N800),
54
+ dark: (0, _tokens.token)('color.text', _colors.DN800)
55
+ })(props), (0, _constants.borderRadius)(), (0, _constants.gridSize)(), (0, _editorSharedStyles.relativeFontSizeToBase16)((0, _constants.fontSize)()));
56
+ };
57
+
58
+ exports.codeBlockSharedStyles = codeBlockSharedStyles;
@@ -11,6 +11,7 @@ var EmojiSharedCssClassName = {
11
11
  EMOJI_CONTAINER: 'emojiView-content-wrap',
12
12
  EMOJI_NODE: _emoji.emojiNode,
13
13
  EMOJI_SPRITE: _emoji.emojiSprite,
14
- EMOJI_IMAGE: _emoji.emojiImage
14
+ EMOJI_IMAGE: _emoji.emojiImage,
15
+ EMOJI_PLACEHOLDER: _emoji.emojiPlaceholder
15
16
  };
16
17
  exports.EmojiSharedCssClassName = EmojiSharedCssClassName;
@@ -178,7 +178,8 @@ var PanelSharedSelectors = {
178
178
  emojiPopup: "[aria-label=\"Popup\"]",
179
179
  searchEmoji: "[aria-label=\"Search emoji\"]",
180
180
  orangeWarningIcon: "[aria-label=\":warning:\"]",
181
- yellowWarningIcon: "[aria-label=\":warning:\"] span:nth-child(1)"
181
+ yellowWarningIcon: "[aria-label=\":warning:\"] span:nth-child(1)",
182
+ copyButton: "button[aria-label=\"Copy\"]"
182
183
  };
183
184
  exports.PanelSharedSelectors = PanelSharedSelectors;
184
185
 
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
3
5
  var _typeof = require("@babel/runtime/helpers/typeof");
4
6
 
5
7
  Object.defineProperty(exports, "__esModule", {
@@ -11,7 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
11
13
 
12
14
  var _mention = require("@atlaskit/mention");
13
15
 
14
- var _profilecard = require("@atlaskit/profilecard");
16
+ var _user = _interopRequireDefault(require("@atlaskit/profilecard/user"));
15
17
 
16
18
  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); }
17
19
 
@@ -31,7 +33,7 @@ function MentionWithProfileCard(_ref) {
31
33
  var actions = (0, _react.useMemo)(function () {
32
34
  return profilecardProvider.getActions(id, text, accessLevel);
33
35
  }, [accessLevel, id, profilecardProvider, text]);
34
- return /*#__PURE__*/_react.default.createElement(_profilecard.ProfileCardTrigger, {
36
+ return /*#__PURE__*/_react.default.createElement(_user.default, {
35
37
  cloudId: cloudId,
36
38
  userId: id,
37
39
  resourceClient: resourceClient,
@@ -41,6 +41,12 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
41
41
 
42
42
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
43
43
 
44
+ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
45
+
46
+ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
47
+
48
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
49
+
44
50
  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); }; }
45
51
 
46
52
  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; } }
@@ -62,6 +68,7 @@ var Popup = /*#__PURE__*/function (_React$Component) {
62
68
  }
63
69
 
64
70
  _this = _super.call.apply(_super, [this].concat(args));
71
+ (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "rafIds", new Set());
65
72
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
66
73
  validPosition: true
67
74
  });
@@ -73,8 +80,37 @@ var Popup = /*#__PURE__*/function (_React$Component) {
73
80
 
74
81
  _this.initPopup(popup);
75
82
  });
83
+ (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "cancelRequestAnimationFrames", function () {
84
+ var _iterator = _createForOfIteratorHelper(_this.rafIds),
85
+ _step;
86
+
87
+ try {
88
+ for (_iterator.s(); !(_step = _iterator.n()).done;) {
89
+ var rafId = _step.value;
90
+ cancelAnimationFrame(rafId);
91
+ }
92
+ } catch (err) {
93
+ _iterator.e(err);
94
+ } finally {
95
+ _iterator.f();
96
+ }
97
+ });
76
98
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "scheduledUpdatePosition", (0, _rafSchd.default)(function (props) {
77
- return _this.updatePosition(props);
99
+ if (!_this.props.waitForExtraLayoutUpdates) {
100
+ _this.updatePosition(_this.props);
101
+ }
102
+
103
+ if (_this.props.scheduleExtraLayoutUpdates) {
104
+ // We need two requestAnimationFrame calls to ensure reflow/repaints
105
+ // are flushed to DOM before our popup position recalculations happen
106
+ var rafId = requestAnimationFrame(function () {
107
+ _this.updatePosition(_this.props);
108
+
109
+ _this.rafIds.delete(rafId);
110
+ });
111
+
112
+ _this.rafIds.add(rafId);
113
+ }
78
114
  }));
79
115
  (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "onResize", function () {
80
116
  return _this.scheduledUpdatePosition(_this.props);
@@ -237,6 +273,7 @@ var Popup = /*#__PURE__*/function (_React$Component) {
237
273
  }
238
274
 
239
275
  this.scheduledUpdatePosition.cancel();
276
+ this.cancelRequestAnimationFrames();
240
277
  }
241
278
  }, {
242
279
  key: "renderPopup",
@@ -5,14 +5,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.clearNextSiblingMarginTopStyle = void 0;
8
+ exports.clearNextSiblingMarginTopStyle = exports.clearNextSiblingBlockMarkMarginTopStyle = void 0;
9
9
 
10
10
  var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
11
11
 
12
12
  var _react = require("@emotion/react");
13
13
 
14
- var _templateObject;
14
+ var _templateObject, _templateObject2;
15
15
 
16
16
  // We use !important to ensure next sibling gets the margin reset no matter what
17
- var clearNextSiblingMarginTopStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n & + * {\n margin-top: 0 !important;\n }\n"])));
18
- exports.clearNextSiblingMarginTopStyle = clearNextSiblingMarginTopStyle;
17
+ var marginTopReset = "margin-top: 0 !important;";
18
+ var clearNextSiblingMarginTopStyle = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n & + * {\n ", "\n }\n"])), marginTopReset);
19
+ exports.clearNextSiblingMarginTopStyle = clearNextSiblingMarginTopStyle;
20
+ var textElements = ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6'];
21
+ var nextSiblingBlockMarkContentSelectors = textElements.map(function (elem) {
22
+ return "+ .fabric-editor-block-mark > ".concat(elem);
23
+ }).join(',');
24
+ var clearNextSiblingBlockMarkMarginTopStyle = (0, _react.css)(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n ", " {\n ", "\n }\n"])), nextSiblingBlockMarkContentSelectors, marginTopReset);
25
+ exports.clearNextSiblingBlockMarkMarginTopStyle = clearNextSiblingBlockMarkMarginTopStyle;
@@ -151,6 +151,12 @@ Object.defineProperty(exports, "calcPxFromPct", {
151
151
  return _grid.calcPxFromPct;
152
152
  }
153
153
  });
154
+ Object.defineProperty(exports, "clearNextSiblingBlockMarkMarginTopStyle", {
155
+ enumerable: true,
156
+ get: function get() {
157
+ return _clearNextSiblingMarginTop.clearNextSiblingBlockMarkMarginTopStyle;
158
+ }
159
+ });
154
160
  Object.defineProperty(exports, "clearNextSiblingMarginTopStyle", {
155
161
  enumerable: true,
156
162
  get: function get() {
@@ -9,12 +9,14 @@ var result = {
9
9
  ie: false,
10
10
  ie_version: 0,
11
11
  gecko: false,
12
+ gecko_version: 0,
12
13
  chrome: false,
13
14
  chrome_version: 0,
14
15
  android: false,
15
16
  ios: false,
16
17
  webkit: false,
17
18
  safari: false,
19
+ safari_version: 0,
18
20
  supportsIntersectionObserver: false,
19
21
  supportsResizeObserver: false
20
22
  };
@@ -27,12 +29,14 @@ if (typeof navigator !== 'undefined') {
27
29
  var ie = result.ie = !!(ieUpTo10 || ie11up || ieEdge);
28
30
  result.ie_version = ieUpTo10 ? document.documentMode || 6 : ie11up ? +ie11up[1] : ieEdge ? +ieEdge[1] : null;
29
31
  result.gecko = !ie && /gecko\/\d/i.test(navigator.userAgent);
32
+ result.gecko_version = parseInt((navigator.userAgent.match(/Firefox\/(\d+)/) || [])[1], 10);
30
33
  result.chrome = !ie && /Chrome\//.test(navigator.userAgent);
31
34
  result.chrome_version = parseInt((navigator.userAgent.match(/Chrome\/(\d+)/) || [])[1], 10);
32
35
  result.android = /Android \d/.test(navigator.userAgent);
33
36
  result.ios = !ie && /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
34
37
  result.webkit = !ie && !!document.documentElement && 'WebkitAppearance' in document.documentElement.style;
35
38
  result.safari = Boolean(navigator.vendor && navigator.vendor.indexOf('Apple') > -1 && navigator.userAgent && navigator.userAgent.indexOf('CriOS') === -1 && navigator.userAgent.indexOf('FxiOS') === -1);
39
+ result.safari_version = parseInt((navigator.userAgent.match(/Version\/([0-9\._]+).*Safari/) || [])[1], 10);
36
40
  result.supportsIntersectionObserver = typeof window !== 'undefined' && 'IntersectionObserver' in window && 'IntersectionObserverEntry' in window && 'intersectionRatio' in window.IntersectionObserverEntry.prototype;
37
41
  result.supportsResizeObserver = typeof window !== 'undefined' && 'ResizeObserver' in window && 'ResizeObserverEntry' in window;
38
42
  }
@@ -167,12 +167,6 @@ Object.defineProperty(exports, "getExtensionRenderer", {
167
167
  return _extensionHandler.getExtensionRenderer;
168
168
  }
169
169
  });
170
- Object.defineProperty(exports, "getMarksByOrder", {
171
- enumerable: true,
172
- get: function get() {
173
- return _validator.getMarksByOrder;
174
- }
175
- });
176
170
  Object.defineProperty(exports, "getModeFromTheme", {
177
171
  enumerable: true,
178
172
  get: function get() {
@@ -209,36 +203,6 @@ Object.defineProperty(exports, "getUnsupportedContentLevelData", {
209
203
  return _analytics.getUnsupportedContentLevelData;
210
204
  }
211
205
  });
212
- Object.defineProperty(exports, "getValidContent", {
213
- enumerable: true,
214
- get: function get() {
215
- return _validator.getValidContent;
216
- }
217
- });
218
- Object.defineProperty(exports, "getValidDocument", {
219
- enumerable: true,
220
- get: function get() {
221
- return _validator.getValidDocument;
222
- }
223
- });
224
- Object.defineProperty(exports, "getValidMark", {
225
- enumerable: true,
226
- get: function get() {
227
- return _validator.getValidMark;
228
- }
229
- });
230
- Object.defineProperty(exports, "getValidNode", {
231
- enumerable: true,
232
- get: function get() {
233
- return _validator.getValidNode;
234
- }
235
- });
236
- Object.defineProperty(exports, "getValidUnknownNode", {
237
- enumerable: true,
238
- get: function get() {
239
- return _validator.getValidUnknownNode;
240
- }
241
- });
242
206
  Object.defineProperty(exports, "hasMergedCell", {
243
207
  enumerable: true,
244
208
  get: function get() {
@@ -263,24 +227,6 @@ Object.defineProperty(exports, "isPerformanceObserverAvailable", {
263
227
  return _isPerformanceApiAvailable.isPerformanceObserverAvailable;
264
228
  }
265
229
  });
266
- Object.defineProperty(exports, "isSameMark", {
267
- enumerable: true,
268
- get: function get() {
269
- return _validator.isSameMark;
270
- }
271
- });
272
- Object.defineProperty(exports, "isSubSupType", {
273
- enumerable: true,
274
- get: function get() {
275
- return _validator.isSubSupType;
276
- }
277
- });
278
- Object.defineProperty(exports, "markOrder", {
279
- enumerable: true,
280
- get: function get() {
281
- return _validator.markOrder;
282
- }
283
- });
284
230
  Object.defineProperty(exports, "measureRender", {
285
231
  enumerable: true,
286
232
  get: function get() {
@@ -376,8 +322,6 @@ var _annotation = require("./annotation");
376
322
 
377
323
  var _macro = require("./macro");
378
324
 
379
- var _validator = require("./validator");
380
-
381
325
  var _browser = _interopRequireDefault(require("./browser"));
382
326
 
383
327
  var _errorReporter = _interopRequireDefault(require("./error-reporter"));
@@ -20,7 +20,23 @@ var _isPerformanceApiAvailable = require("./is-performance-api-available");
20
20
  * | javascript (framework) | style | layout | paint | composite | javascript | ...
21
21
  * | startMark + scheduling rAF | | rAF callback, endMark
22
22
  */
23
- function measureRender(measureName, onMeasureComplete) {
23
+ function measureRender(
24
+ /**
25
+ * Unique name for the measurement
26
+ *
27
+ * Important: if multiple measureRender events are fired at the same time
28
+ * with the same measure name -- the result will not be correct.
29
+ */
30
+ measureName,
31
+ /**
32
+ * Call back fired when the measurement completes.
33
+ *
34
+ * Note: when this function is called when the Document.visibilityState is not
35
+ * visible -- the duration is likely to be misleading/inaccurate. This is due
36
+ * to the measurements use of the `requestAnimationFrame` api which only fires
37
+ * when the Document.visibilityState is visible.
38
+ */
39
+ onMeasureComplete) {
24
40
  if (!(0, _isPerformanceApiAvailable.isPerformanceAPIAvailable)()) {
25
41
  return;
26
42
  }
@@ -28,10 +44,29 @@ function measureRender(measureName, onMeasureComplete) {
28
44
  var startMark = "[START]: ".concat(measureName);
29
45
  var endMark = "[END]: ".concat(measureName);
30
46
  var startTime = performance.now();
31
- performance.mark(startMark);
47
+ performance.mark(startMark); // If an editor is rendered when the document is not visible -- the callback passed to
48
+ // requestAnimationFrame will not fire until the document becomes visible again.
49
+ //
50
+ // For the purposes of using performance measurement -- this behaviour means the events
51
+ // which have been fired in the background are not useful -- and lead to other events
52
+ // being hard to draw conclusions from.
53
+ //
54
+ // To mitigate this -- we detect this state -- and fire a seperate callback when the
55
+ // measurement has occured when the render was in the backgroun
56
+
57
+ var distortedDuration = document.visibilityState !== 'visible';
58
+
59
+ function handleVisibilityChange() {
60
+ if (document.visibilityState !== 'visible') {
61
+ distortedDuration = true;
62
+ }
63
+ }
64
+
65
+ document.addEventListener('visibilitychange', handleVisibilityChange);
32
66
  requestAnimationFrame(function () {
33
67
  requestAnimationFrame(function () {
34
68
  performance.mark(endMark);
69
+ document.removeEventListener('visibilitychange', handleVisibilityChange);
35
70
  var duration = performance.now() - startTime;
36
71
 
37
72
  try {
@@ -39,12 +74,24 @@ function measureRender(measureName, onMeasureComplete) {
39
74
  var entry = performance.getEntriesByName(measureName).pop();
40
75
 
41
76
  if (!entry) {
42
- onMeasureComplete(duration, startTime);
77
+ onMeasureComplete({
78
+ duration: duration,
79
+ startTime: startTime,
80
+ distortedDuration: distortedDuration
81
+ });
43
82
  } else {
44
- onMeasureComplete(entry.duration, entry.startTime);
83
+ onMeasureComplete({
84
+ duration: entry.duration,
85
+ startTime: entry.startTime,
86
+ distortedDuration: distortedDuration
87
+ });
45
88
  }
46
89
  } catch (e) {
47
- onMeasureComplete(duration, startTime);
90
+ onMeasureComplete({
91
+ duration: duration,
92
+ startTime: startTime,
93
+ distortedDuration: distortedDuration
94
+ });
48
95
  }
49
96
 
50
97
  performance.clearMeasures(measureName);
@@ -3,6 +3,12 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
+ Object.defineProperty(exports, "ADFStages", {
7
+ enumerable: true,
8
+ get: function get() {
9
+ return _validator.ADFStages;
10
+ }
11
+ });
6
12
  Object.defineProperty(exports, "getMarksByOrder", {
7
13
  enumerable: true,
8
14
  get: function get() {
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "68.0.2",
3
+ "version": "69.1.0",
4
4
  "sideEffects": false
5
5
  }
@@ -17,4 +17,5 @@ export { shadowSharedStyle } from './shared/shadow';
17
17
  export { dateSharedStyle, DateSharedCssClassName } from './shared/date';
18
18
  export { tasksAndDecisionsStyles, TaskDecisionSharedCssClassName } from './shared/task-decision';
19
19
  export { StatusSharedCssClassName } from './shared/status';
20
- export { smartCardSharedStyles, SmartCardSharedCssClassName } from './shared/smart-card';
20
+ export { smartCardSharedStyles, SmartCardSharedCssClassName } from './shared/smart-card';
21
+ export { CodeBlockSharedCssClassName, codeBlockSharedStyles } from './shared/code-block';