@atlaskit/editor-common 102.1.0 → 102.2.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 (26) hide show
  1. package/CHANGELOG.md +21 -0
  2. package/dist/cjs/collab/index.js +0 -1
  3. package/dist/cjs/messages/panel.js +5 -0
  4. package/dist/cjs/monitoring/error.js +1 -1
  5. package/dist/cjs/provider-factory/with-providers.js +7 -28
  6. package/dist/cjs/ugc-tokens/editor-ugc-token-names.js +21 -21
  7. package/dist/cjs/ui/DropList/index.js +1 -1
  8. package/dist/es2019/collab/index.js +0 -2
  9. package/dist/es2019/messages/panel.js +5 -0
  10. package/dist/es2019/monitoring/error.js +1 -1
  11. package/dist/es2019/provider-factory/with-providers.js +2 -21
  12. package/dist/es2019/ugc-tokens/editor-ugc-token-names.js +21 -21
  13. package/dist/es2019/ui/DropList/index.js +1 -1
  14. package/dist/esm/collab/index.js +0 -2
  15. package/dist/esm/messages/panel.js +5 -0
  16. package/dist/esm/monitoring/error.js +1 -1
  17. package/dist/esm/provider-factory/with-providers.js +7 -28
  18. package/dist/esm/ugc-tokens/editor-ugc-token-names.js +21 -21
  19. package/dist/esm/ui/DropList/index.js +1 -1
  20. package/dist/types/collab/index.d.ts +12 -2
  21. package/dist/types/messages/panel.d.ts +5 -0
  22. package/dist/types/provider-factory/with-providers.d.ts +0 -1
  23. package/dist/types-ts4.5/collab/index.d.ts +12 -2
  24. package/dist/types-ts4.5/messages/panel.d.ts +5 -0
  25. package/dist/types-ts4.5/provider-factory/with-providers.d.ts +0 -1
  26. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,26 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 102.2.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#122605](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122605)
8
+ [`1bf1493f744ce`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1bf1493f744ce) -
9
+ [ux] Add conflict metadata on reconnection
10
+
11
+ ### Patch Changes
12
+
13
+ - [#124036](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/124036)
14
+ [`89e5673ede364`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/89e5673ede364) -
15
+ FD-80149: cleans up platform_editor_react18_phase2_v2 in withproviders
16
+ - [#124061](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/124061)
17
+ [`5a2bf8222411a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5a2bf8222411a) -
18
+ Removed `system-ui` font family from editor UGC tokens to resolve customer issue where certain
19
+ Japanese characters do not render in Chrome on Windows.
20
+ - [#123966](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/123966)
21
+ [`980562a51a41f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/980562a51a41f) -
22
+ [ux] ED-26796 Change panel type buttons into dropdown
23
+
3
24
  ## 102.1.0
4
25
 
5
26
  ### Minor Changes
package/dist/cjs/collab/index.js CHANGED
@@ -126,7 +126,6 @@ var DisconnectReason = exports.DisconnectReason = /*#__PURE__*/function (Disconn
126
126
  // Match with ProseMirror: https://prosemirror.net/docs/ref/#transform.AttrStep
127
127
  //Intersection: NCS custom step type config in adf-schema
128
128
  //Unions
129
- // This will be extended in follow-up PRs
130
129
  var telepointerColorStyle = function telepointerColorStyle(backgroundColor, textColor, index) {
131
130
  var _getGlobalTheme = (0, _tokens.getGlobalTheme)(),
132
131
  colorMode = _getGlobalTheme.colorMode;
package/dist/cjs/messages/panel.js CHANGED
@@ -36,6 +36,11 @@ var panelMessages = exports.panelMessages = (0, _reactIntlNext.defineMessages)({
36
36
  defaultMessage: 'Add emoji',
37
37
  description: 'Select the panel icon'
38
38
  },
39
+ custom: {
40
+ id: 'fabric.editor.panel.custom',
41
+ defaultMessage: 'Custom',
42
+ description: 'Custom panels where user has selected custom emoji and background color'
43
+ },
39
44
  backgroundColor: {
40
45
  id: 'fabric.editor.panel.backgroundColor',
41
46
  defaultMessage: 'Background color',
package/dist/cjs/monitoring/error.js CHANGED
@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
17
17
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
18
18
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
19
19
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
20
- var packageVersion = "102.1.0";
20
+ var packageVersion = "102.2.0";
21
21
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
22
22
  // Remove URL as it has UGC
23
23
  // Ignored via go/ees007
package/dist/cjs/provider-factory/with-providers.js CHANGED
@@ -12,7 +12,6 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
12
12
  var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
13
13
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
14
14
  var _react = require("react");
15
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
16
15
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
17
16
  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) { (0, _defineProperty2.default)(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; }
18
17
  function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -49,12 +48,8 @@ var WithProviders = exports.WithProviders = /*#__PURE__*/function (_PureComponen
49
48
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
50
49
  var _providers = {};
51
50
  _this.props.providers.forEach(function (name) {
52
- if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2_v2')) {
53
- var providerPromise = props.providerFactory.subscribe(name, _this.handleProviderIfMounted);
54
- _providers[name] = providerPromise;
55
- } else {
56
- _providers[name] = undefined;
57
- }
51
+ var providerPromise = props.providerFactory.subscribe(name, _this.handleProviderIfMounted);
52
+ _providers[name] = providerPromise;
58
53
  });
59
54
  _this.state = {
60
55
  providers: _providers
@@ -67,31 +62,15 @@ var WithProviders = exports.WithProviders = /*#__PURE__*/function (_PureComponen
67
62
  value: function componentDidMount() {
68
63
  this.mounted = true;
69
64
  }
70
-
71
- // Ignored via go/ees005
72
- // eslint-disable-next-line react/no-unsafe
73
- }, {
74
- key: "UNSAFE_componentWillMount",
75
- value: function UNSAFE_componentWillMount() {
76
- var _this2 = this;
77
- if (!(0, _platformFeatureFlags.fg)('platform_editor_react18_phase2_v2')) {
78
- var _this$props = this.props,
79
- providers = _this$props.providers,
80
- providerFactory = _this$props.providerFactory;
81
- providers.forEach(function (name) {
82
- providerFactory.subscribe(name, _this2.handleProvider);
83
- });
84
- }
85
- }
86
65
  }, {
87
66
  key: "componentWillUnmount",
88
67
  value: function componentWillUnmount() {
89
- var _this3 = this;
90
- var _this$props2 = this.props,
91
- providers = _this$props2.providers,
92
- providerFactory = _this$props2.providerFactory;
68
+ var _this2 = this;
69
+ var _this$props = this.props,
70
+ providers = _this$props.providers,
71
+ providerFactory = _this$props.providerFactory;
93
72
  providers.forEach(function (name) {
94
- providerFactory.unsubscribe(name, _this3.handleProvider);
73
+ providerFactory.unsubscribe(name, _this2.handleProvider);
95
74
  });
96
75
  }
97
76
  }, {
package/dist/cjs/ugc-tokens/editor-ugc-token-names.js CHANGED
@@ -5,13 +5,13 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.editorUGCTokensRefreshed = exports.editorUGCTokensModernized = exports.editorUGCTokens = void 0;
7
7
  var editorUGCTokens = exports.editorUGCTokens = {
8
- 'editor.font.heading.h1': 'normal 500 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
9
- 'editor.font.heading.h2': 'normal 500 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
10
- 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
11
- 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
12
- 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
13
- 'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
14
- 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
8
+ 'editor.font.heading.h1': 'normal 500 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
9
+ 'editor.font.heading.h2': 'normal 500 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
10
+ 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
11
+ 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
12
+ 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
13
+ 'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
14
+ 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
15
15
  'editor.font.weight.heading.h1.bold': '700',
16
16
  'editor.font.weight.heading.h2.bold': '700',
17
17
  'editor.font.weight.heading.h3.bold': '700',
@@ -20,13 +20,13 @@ var editorUGCTokens = exports.editorUGCTokens = {
20
20
  'editor.font.weight.heading.h6.bold': '700'
21
21
  };
22
22
  var editorUGCTokensModernized = exports.editorUGCTokensModernized = {
23
- 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
24
- 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
25
- 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
26
- 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
27
- 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
28
- 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
29
- 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
23
+ 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
24
+ 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
25
+ 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
26
+ 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
27
+ 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
28
+ 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
29
+ 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
30
30
  'editor.font.weight.heading.h1.bold': '700',
31
31
  'editor.font.weight.heading.h2.bold': '700',
32
32
  'editor.font.weight.heading.h3.bold': '700',
@@ -35,13 +35,13 @@ var editorUGCTokensModernized = exports.editorUGCTokensModernized = {
35
35
  'editor.font.weight.heading.h6.bold': '700'
36
36
  };
37
37
  var editorUGCTokensRefreshed = exports.editorUGCTokensRefreshed = {
38
- 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
39
- 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
40
- 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
41
- 'editor.font.heading.h4': 'normal 600 1em/1.14286 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
42
- 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
43
- 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
44
- 'editor.font.body': 'normal 400 1em/1.714 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
38
+ 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
39
+ 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
40
+ 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
41
+ 'editor.font.heading.h4': 'normal 600 1em/1.14286 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
42
+ 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
43
+ 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
44
+ 'editor.font.body': 'normal 400 1em/1.714 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
45
45
  'editor.font.weight.heading.h1.bold': '700',
46
46
  'editor.font.weight.heading.h2.bold': '700',
47
47
  'editor.font.weight.heading.h3.bold': '700',
package/dist/cjs/ui/DropList/index.js CHANGED
@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
23
23
  * @jsx jsx
24
24
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
25
25
  var packageName = "@atlaskit/editor-common";
26
- var packageVersion = "102.1.0";
26
+ var packageVersion = "102.2.0";
27
27
  var halfFocusRing = 1;
28
28
  var dropOffset = '0, 8';
29
29
  // Ignored via go/ees005
package/dist/es2019/collab/index.js CHANGED
@@ -141,8 +141,6 @@ export let DisconnectReason = /*#__PURE__*/function (DisconnectReason) {
141
141
 
142
142
  //Unions
143
143
 
144
- // This will be extended in follow-up PRs
145
-
146
144
  const telepointerColorStyle = (backgroundColor, textColor, index) => {
147
145
  const {
148
146
  colorMode
package/dist/es2019/messages/panel.js CHANGED
@@ -30,6 +30,11 @@ export const panelMessages = defineMessages({
30
30
  defaultMessage: 'Add emoji',
31
31
  description: 'Select the panel icon'
32
32
  },
33
+ custom: {
34
+ id: 'fabric.editor.panel.custom',
35
+ defaultMessage: 'Custom',
36
+ description: 'Custom panels where user has selected custom emoji and background color'
37
+ },
33
38
  backgroundColor: {
34
39
  id: 'fabric.editor.panel.backgroundColor',
35
40
  defaultMessage: 'Background color',
package/dist/es2019/monitoring/error.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { isFedRamp } from './environment';
2
2
  const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
3
3
  const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
4
- const packageVersion = "102.1.0";
4
+ const packageVersion = "102.2.0";
5
5
  const sanitiseSentryEvents = (data, _hint) => {
6
6
  // Remove URL as it has UGC
7
7
  // Ignored via go/ees007
package/dist/es2019/provider-factory/with-providers.js CHANGED
@@ -1,7 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  /* eslint-disable @repo/internal/react/no-class-components */
3
3
  import { PureComponent } from 'react';
4
- import { fg } from '@atlaskit/platform-feature-flags';
5
4
  // Ignored via go/ees005
6
5
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
7
6
  export class WithProviders extends PureComponent {
@@ -36,12 +35,8 @@ export class WithProviders extends PureComponent {
36
35
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
37
36
  const _providers = {};
38
37
  this.props.providers.forEach(name => {
39
- if (fg('platform_editor_react18_phase2_v2')) {
40
- const providerPromise = props.providerFactory.subscribe(name, this.handleProviderIfMounted);
41
- _providers[name] = providerPromise;
42
- } else {
43
- _providers[name] = undefined;
44
- }
38
+ const providerPromise = props.providerFactory.subscribe(name, this.handleProviderIfMounted);
39
+ _providers[name] = providerPromise;
45
40
  });
46
41
  this.state = {
47
42
  providers: _providers
@@ -50,20 +45,6 @@ export class WithProviders extends PureComponent {
50
45
  componentDidMount() {
51
46
  this.mounted = true;
52
47
  }
53
-
54
- // Ignored via go/ees005
55
- // eslint-disable-next-line react/no-unsafe
56
- UNSAFE_componentWillMount() {
57
- if (!fg('platform_editor_react18_phase2_v2')) {
58
- const {
59
- providers,
60
- providerFactory
61
- } = this.props;
62
- providers.forEach(name => {
63
- providerFactory.subscribe(name, this.handleProvider);
64
- });
65
- }
66
- }
67
48
  componentWillUnmount() {
68
49
  const {
69
50
  providers,
package/dist/es2019/ugc-tokens/editor-ugc-token-names.js CHANGED
@@ -1,11 +1,11 @@
1
1
  export const editorUGCTokens = {
2
- 'editor.font.heading.h1': 'normal 500 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
3
- 'editor.font.heading.h2': 'normal 500 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
4
- 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
5
- 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
6
- 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
7
- 'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
8
- 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
2
+ 'editor.font.heading.h1': 'normal 500 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
3
+ 'editor.font.heading.h2': 'normal 500 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
4
+ 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
5
+ 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
6
+ 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
7
+ 'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
8
+ 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
9
9
  'editor.font.weight.heading.h1.bold': '700',
10
10
  'editor.font.weight.heading.h2.bold': '700',
11
11
  'editor.font.weight.heading.h3.bold': '700',
@@ -14,13 +14,13 @@ export const editorUGCTokens = {
14
14
  'editor.font.weight.heading.h6.bold': '700'
15
15
  };
16
16
  export const editorUGCTokensModernized = {
17
- 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
18
- 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
19
- 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
20
- 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
21
- 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
22
- 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
23
- 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
17
+ 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
18
+ 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
19
+ 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
20
+ 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
21
+ 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
22
+ 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
23
+ 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
24
24
  'editor.font.weight.heading.h1.bold': '700',
25
25
  'editor.font.weight.heading.h2.bold': '700',
26
26
  'editor.font.weight.heading.h3.bold': '700',
@@ -29,13 +29,13 @@ export const editorUGCTokensModernized = {
29
29
  'editor.font.weight.heading.h6.bold': '700'
30
30
  };
31
31
  export const editorUGCTokensRefreshed = {
32
- 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
33
- 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
34
- 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
35
- 'editor.font.heading.h4': 'normal 600 1em/1.14286 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
36
- 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
37
- 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
38
- 'editor.font.body': 'normal 400 1em/1.714 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
32
+ 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
33
+ 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
34
+ 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
35
+ 'editor.font.heading.h4': 'normal 600 1em/1.14286 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
36
+ 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
37
+ 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
38
+ 'editor.font.body': 'normal 400 1em/1.714 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
39
39
  'editor.font.weight.heading.h1.bold': '700',
40
40
  'editor.font.weight.heading.h2.bold': '700',
41
41
  'editor.font.weight.heading.h3.bold': '700',
package/dist/es2019/ui/DropList/index.js CHANGED
@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
13
13
  import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
14
14
  import Layer from '../Layer';
15
15
  const packageName = "@atlaskit/editor-common";
16
- const packageVersion = "102.1.0";
16
+ const packageVersion = "102.2.0";
17
17
  const halfFocusRing = 1;
18
18
  const dropOffset = '0, 8';
19
19
  // Ignored via go/ees005
package/dist/esm/collab/index.js CHANGED
@@ -143,8 +143,6 @@ export var DisconnectReason = /*#__PURE__*/function (DisconnectReason) {
143
143
 
144
144
  //Unions
145
145
 
146
- // This will be extended in follow-up PRs
147
-
148
146
  var telepointerColorStyle = function telepointerColorStyle(backgroundColor, textColor, index) {
149
147
  var _getGlobalTheme = getGlobalTheme(),
150
148
  colorMode = _getGlobalTheme.colorMode;
package/dist/esm/messages/panel.js CHANGED
@@ -30,6 +30,11 @@ export var panelMessages = defineMessages({
30
30
  defaultMessage: 'Add emoji',
31
31
  description: 'Select the panel icon'
32
32
  },
33
+ custom: {
34
+ id: 'fabric.editor.panel.custom',
35
+ defaultMessage: 'Custom',
36
+ description: 'Custom panels where user has selected custom emoji and background color'
37
+ },
33
38
  backgroundColor: {
34
39
  id: 'fabric.editor.panel.backgroundColor',
35
40
  defaultMessage: 'Background color',
package/dist/esm/monitoring/error.js CHANGED
@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
7
7
  import { isFedRamp } from './environment';
8
8
  var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
9
9
  var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
10
- var packageVersion = "102.1.0";
10
+ var packageVersion = "102.2.0";
11
11
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
12
12
  // Remove URL as it has UGC
13
13
  // Ignored via go/ees007
package/dist/esm/provider-factory/with-providers.js CHANGED
@@ -10,7 +10,6 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
10
10
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
11
11
  /* eslint-disable @repo/internal/react/no-class-components */
12
12
  import { PureComponent } from 'react';
13
- import { fg } from '@atlaskit/platform-feature-flags';
14
13
  // Ignored via go/ees005
15
14
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
16
15
  export var WithProviders = /*#__PURE__*/function (_PureComponent) {
@@ -43,12 +42,8 @@ export var WithProviders = /*#__PURE__*/function (_PureComponent) {
43
42
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
44
43
  var _providers = {};
45
44
  _this.props.providers.forEach(function (name) {
46
- if (fg('platform_editor_react18_phase2_v2')) {
47
- var providerPromise = props.providerFactory.subscribe(name, _this.handleProviderIfMounted);
48
- _providers[name] = providerPromise;
49
- } else {
50
- _providers[name] = undefined;
51
- }
45
+ var providerPromise = props.providerFactory.subscribe(name, _this.handleProviderIfMounted);
46
+ _providers[name] = providerPromise;
52
47
  });
53
48
  _this.state = {
54
49
  providers: _providers
@@ -61,31 +56,15 @@ export var WithProviders = /*#__PURE__*/function (_PureComponent) {
61
56
  value: function componentDidMount() {
62
57
  this.mounted = true;
63
58
  }
64
-
65
- // Ignored via go/ees005
66
- // eslint-disable-next-line react/no-unsafe
67
- }, {
68
- key: "UNSAFE_componentWillMount",
69
- value: function UNSAFE_componentWillMount() {
70
- var _this2 = this;
71
- if (!fg('platform_editor_react18_phase2_v2')) {
72
- var _this$props = this.props,
73
- providers = _this$props.providers,
74
- providerFactory = _this$props.providerFactory;
75
- providers.forEach(function (name) {
76
- providerFactory.subscribe(name, _this2.handleProvider);
77
- });
78
- }
79
- }
80
59
  }, {
81
60
  key: "componentWillUnmount",
82
61
  value: function componentWillUnmount() {
83
- var _this3 = this;
84
- var _this$props2 = this.props,
85
- providers = _this$props2.providers,
86
- providerFactory = _this$props2.providerFactory;
62
+ var _this2 = this;
63
+ var _this$props = this.props,
64
+ providers = _this$props.providers,
65
+ providerFactory = _this$props.providerFactory;
87
66
  providers.forEach(function (name) {
88
- providerFactory.unsubscribe(name, _this3.handleProvider);
67
+ providerFactory.unsubscribe(name, _this2.handleProvider);
89
68
  });
90
69
  }
91
70
  }, {
package/dist/esm/ugc-tokens/editor-ugc-token-names.js CHANGED
@@ -1,11 +1,11 @@
1
1
  export var editorUGCTokens = {
2
- 'editor.font.heading.h1': 'normal 500 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
3
- 'editor.font.heading.h2': 'normal 500 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
4
- 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
5
- 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
6
- 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
7
- 'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
8
- 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
2
+ 'editor.font.heading.h1': 'normal 500 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
3
+ 'editor.font.heading.h2': 'normal 500 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
4
+ 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
5
+ 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
6
+ 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
7
+ 'editor.font.heading.h6': 'normal 700 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
8
+ 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
9
9
  'editor.font.weight.heading.h1.bold': '700',
10
10
  'editor.font.weight.heading.h2.bold': '700',
11
11
  'editor.font.weight.heading.h3.bold': '700',
@@ -14,13 +14,13 @@ export var editorUGCTokens = {
14
14
  'editor.font.weight.heading.h6.bold': '700'
15
15
  };
16
16
  export var editorUGCTokensModernized = {
17
- 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
18
- 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
19
- 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
20
- 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
21
- 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
22
- 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
23
- 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
17
+ 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
18
+ 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
19
+ 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
20
+ 'editor.font.heading.h4': 'normal 600 1em/1.14286 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
21
+ 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
22
+ 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
23
+ 'editor.font.body': 'normal 400 1em/1.714 ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
24
24
  'editor.font.weight.heading.h1.bold': '700',
25
25
  'editor.font.weight.heading.h2.bold': '700',
26
26
  'editor.font.weight.heading.h3.bold': '700',
@@ -29,13 +29,13 @@ export var editorUGCTokensModernized = {
29
29
  'editor.font.weight.heading.h6.bold': '700'
30
30
  };
31
31
  export var editorUGCTokensRefreshed = {
32
- 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
33
- 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
34
- 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
35
- 'editor.font.heading.h4': 'normal 600 1em/1.14286 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
36
- 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
37
- 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
38
- 'editor.font.body': 'normal 400 1em/1.714 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, system-ui, "Helvetica Neue", sans-serif',
32
+ 'editor.font.heading.h1': 'normal 600 1.71429em/1.16667 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
33
+ 'editor.font.heading.h2': 'normal 600 1.42857em/1.2 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
34
+ 'editor.font.heading.h3': 'normal 600 1.14286em/1.25 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
35
+ 'editor.font.heading.h4': 'normal 600 1em/1.14286 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
36
+ 'editor.font.heading.h5': 'normal 600 0.857143em/1.33333 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
37
+ 'editor.font.heading.h6': 'normal 600 0.785714em/1.45455 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
38
+ 'editor.font.body': 'normal 400 1em/1.714 "Atlassian Sans", ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", Ubuntu, "Helvetica Neue", sans-serif',
39
39
  'editor.font.weight.heading.h1.bold': '700',
40
40
  'editor.font.weight.heading.h2.bold': '700',
41
41
  'editor.font.weight.heading.h3.bold': '700',
package/dist/esm/ui/DropList/index.js CHANGED
@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
20
20
  import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
21
21
  import Layer from '../Layer';
22
22
  var packageName = "@atlaskit/editor-common";
23
- var packageVersion = "102.1.0";
23
+ var packageVersion = "102.2.0";
24
24
  var halfFocusRing = 1;
25
25
  var dropOffset = '0, 8';
26
26
  // Ignored via go/ees005
package/dist/types/collab/index.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import type { ReactElement } from 'react';
2
2
  import { type BatchAttrsStep, type OverrideDocumentStepJSON as OverrideDocumentStep } from '@atlaskit/adf-schema/steps';
3
3
  import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
4
- import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
4
+ import type { Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/model';
5
5
  import type { EditorState, ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
6
6
  import type { Step } from '@atlaskit/editor-prosemirror/transform';
7
7
  import { token } from '@atlaskit/tokens';
@@ -409,7 +409,17 @@ export type UserPermitType = {
409
409
  isPermittedToEdit: boolean;
410
410
  };
411
411
  export type CollabPermissionEventPayload = UserPermitType;
412
- export interface CollabEventConflictPayload {
412
+ export type ConflictChange = {
413
+ from: number;
414
+ to: number;
415
+ local: Slice;
416
+ remote: Slice;
417
+ };
418
+ export type ConflictChanges = {
419
+ inserted: ConflictChange[];
420
+ deleted: ConflictChange[];
421
+ };
422
+ export interface CollabEventConflictPayload extends ConflictChanges {
413
423
  offlineDoc: PMNode;
414
424
  }
415
425
  export interface CollabEvents {
package/dist/types/messages/panel.d.ts CHANGED
@@ -29,6 +29,11 @@ export declare const panelMessages: {
29
29
  defaultMessage: string;
30
30
  description: string;
31
31
  };
32
+ custom: {
33
+ id: string;
34
+ defaultMessage: string;
35
+ description: string;
36
+ };
32
37
  backgroundColor: {
33
38
  id: string;
34
39
  defaultMessage: string;
package/dist/types/provider-factory/with-providers.d.ts CHANGED
@@ -13,7 +13,6 @@ export declare class WithProviders extends PureComponent<Props, {
13
13
  mounted: boolean;
14
14
  constructor(props: Props);
15
15
  componentDidMount(): void;
16
- UNSAFE_componentWillMount(): void;
17
16
  componentWillUnmount(): void;
18
17
  handleProviderIfMounted: (name: string, provider?: Promise<any>) => void;
19
18
  handleProvider: (name: string, provider?: Promise<any>) => void;
package/dist/types-ts4.5/collab/index.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import type { ReactElement } from 'react';
2
2
  import { type BatchAttrsStep, type OverrideDocumentStepJSON as OverrideDocumentStep } from '@atlaskit/adf-schema/steps';
3
3
  import type { JSONDocNode } from '@atlaskit/editor-json-transformer';
4
- import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
4
+ import type { Node as PMNode, Slice } from '@atlaskit/editor-prosemirror/model';
5
5
  import type { EditorState, ReadonlyTransaction, Transaction } from '@atlaskit/editor-prosemirror/state';
6
6
  import type { Step } from '@atlaskit/editor-prosemirror/transform';
7
7
  import { token } from '@atlaskit/tokens';
@@ -409,7 +409,17 @@ export type UserPermitType = {
409
409
  isPermittedToEdit: boolean;
410
410
  };
411
411
  export type CollabPermissionEventPayload = UserPermitType;
412
- export interface CollabEventConflictPayload {
412
+ export type ConflictChange = {
413
+ from: number;
414
+ to: number;
415
+ local: Slice;
416
+ remote: Slice;
417
+ };
418
+ export type ConflictChanges = {
419
+ inserted: ConflictChange[];
420
+ deleted: ConflictChange[];
421
+ };
422
+ export interface CollabEventConflictPayload extends ConflictChanges {
413
423
  offlineDoc: PMNode;
414
424
  }
415
425
  export interface CollabEvents {
package/dist/types-ts4.5/messages/panel.d.ts CHANGED
@@ -29,6 +29,11 @@ export declare const panelMessages: {
29
29
  defaultMessage: string;
30
30
  description: string;
31
31
  };
32
+ custom: {
33
+ id: string;
34
+ defaultMessage: string;
35
+ description: string;
36
+ };
32
37
  backgroundColor: {
33
38
  id: string;
34
39
  defaultMessage: string;
package/dist/types-ts4.5/provider-factory/with-providers.d.ts CHANGED
@@ -13,7 +13,6 @@ export declare class WithProviders extends PureComponent<Props, {
13
13
  mounted: boolean;
14
14
  constructor(props: Props);
15
15
  componentDidMount(): void;
16
- UNSAFE_componentWillMount(): void;
17
16
  componentWillUnmount(): void;
18
17
  handleProviderIfMounted: (name: string, provider?: Promise<any>) => void;
19
18
  handleProvider: (name: string, provider?: Promise<any>) => void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "102.1.0",
3
+ "version": "102.2.0",
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/"