@atlaskit/editor-common 87.6.1 → 87.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 87.6.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [#128785](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/128785)
8
+ [`175fd06e412c2`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/175fd06e412c2) -
9
+ [ux] Increase bodied macro padding to account for new editor resize controller future feature
10
+ - [#128413](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/128413)
11
+ [`2df8a92126a8d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2df8a92126a8d) -
12
+ [ux] We are testing input behavior change inside of an extension body. Now when attempting to
13
+ register inputs, like typing, from an element inside an extension body, it should not accidently
14
+ instead register in the editor body. If this fix is successful it will be available in a later
15
+ release.
16
+
3
17
  ## 87.6.1
4
18
 
5
19
  ### Patch Changes
@@ -83,7 +83,8 @@ function ExtensionWithPluginState(props) {
83
83
  'without-frame': removeBorder
84
84
  });
85
85
  var newContentClassNames = (0, _classnames2.default)({
86
- 'with-padding-styles': showMacroInteractionDesignUpdates
86
+ 'with-padding-styles': showMacroInteractionDesignUpdates,
87
+ 'with-bodied-padding-styles': hasBody && showMacroInteractionDesignUpdates
87
88
  });
88
89
  var contentClassNames = (0, _classnames2.default)('extension-content', 'block', {
89
90
  'remove-border': showMacroInteractionDesignUpdates
@@ -74,6 +74,10 @@ var contentWrapper = exports.contentWrapper = (0, _react.css)({
74
74
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
75
75
  '&.with-padding-styles': {
76
76
  padding: "var(--ds-space-100, 8px)"
77
+ },
78
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
79
+ '&.with-bodied-padding-styles': {
80
+ padding: "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-250, 20px)") // account for upcoming editor elements drag & drop feature
77
81
  }
78
82
  });
79
83
 
@@ -44,7 +44,7 @@ var mbeExtensionWrapperCSSStyles = exports.mbeExtensionWrapperCSSStyles = (0, _r
44
44
  },
45
45
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
46
46
  '&.with-padding-background-styles': {
47
- padding: "var(--ds-space-100, 8px)",
47
+ padding: "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-250, 20px)"),
48
48
  background: 'transparent'
49
49
  }
50
50
  });
@@ -12,6 +12,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
12
12
  var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
13
13
  var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
14
14
  var _react = _interopRequireDefault(require("react"));
15
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
15
16
  var _reactNodeView = _interopRequireDefault(require("../react-node-view"));
16
17
  var _Extension = require("./Extension");
17
18
  var _ExtensionNodeWrapper = require("./ExtensionNodeWrapper");
@@ -38,6 +39,18 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
38
39
  // children a chance to recalc
39
40
  return this.node.type.isAtom || mutation.type !== 'selection' && mutation.attributeName !== 'data-layout';
40
41
  }
42
+
43
+ // When interacting with input elements inside an extension's body, the events
44
+ // bubble up to the editor and get handled by it. This almost always gets in the way
45
+ // of being able to actually interact with said input in the extension, i.e.
46
+ // typing inside a text field (in an extension body) will print the text in the editor
47
+ // content area instead. This change prevents the editor view from trying to handle these events,
48
+ // when the target of the event is an input element, so the extension can.
49
+ }, {
50
+ key: "stopEvent",
51
+ value: function stopEvent(event) {
52
+ return event.target instanceof HTMLInputElement && (0, _platformFeatureFlags.fg)('cc_page_experiences_live_search_wysiwyg');
53
+ }
41
54
  }, {
42
55
  key: "getContentDOM",
43
56
  value: function getContentDOM() {
@@ -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 && Object.prototype.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 = "87.6.1";
20
+ var packageVersion = "87.6.2";
21
21
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
22
22
  // Remove URL as it has UGC
23
23
  // TODO: Sanitise the URL instead of just removing it
@@ -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 = "87.6.1";
26
+ var packageVersion = "87.6.2";
27
27
  var halfFocusRing = 1;
28
28
  var dropOffset = '0, 8';
29
29
  var DropList = /*#__PURE__*/function (_Component) {
@@ -75,7 +75,8 @@ function ExtensionWithPluginState(props) {
75
75
  'without-frame': removeBorder
76
76
  });
77
77
  const newContentClassNames = classnames({
78
- 'with-padding-styles': showMacroInteractionDesignUpdates
78
+ 'with-padding-styles': showMacroInteractionDesignUpdates,
79
+ 'with-bodied-padding-styles': hasBody && showMacroInteractionDesignUpdates
79
80
  });
80
81
  const contentClassNames = classnames('extension-content', 'block', {
81
82
  'remove-border': showMacroInteractionDesignUpdates
@@ -67,6 +67,10 @@ export const contentWrapper = css({
67
67
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
68
68
  '&.with-padding-styles': {
69
69
  padding: "var(--ds-space-100, 8px)"
70
+ },
71
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
72
+ '&.with-bodied-padding-styles': {
73
+ padding: `${"var(--ds-space-100, 8px)"} ${"var(--ds-space-250, 20px)"}` // account for upcoming editor elements drag & drop feature
70
74
  }
71
75
  });
72
76
 
@@ -38,7 +38,7 @@ export const mbeExtensionWrapperCSSStyles = css(wrapperDefault, {
38
38
  },
39
39
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
40
40
  '&.with-padding-background-styles': {
41
- padding: "var(--ds-space-100, 8px)",
41
+ padding: `${"var(--ds-space-100, 8px)"} ${"var(--ds-space-250, 20px)"}`,
42
42
  background: 'transparent'
43
43
  }
44
44
  });
@@ -1,4 +1,5 @@
1
1
  import React from 'react';
2
+ import { fg } from '@atlaskit/platform-feature-flags';
2
3
  import ReactNodeView from '../react-node-view';
3
4
  import { Extension } from './Extension';
4
5
  import { ExtensionNodeWrapper } from './ExtensionNodeWrapper';
@@ -15,6 +16,16 @@ export class ExtensionNode extends ReactNodeView {
15
16
  // children a chance to recalc
16
17
  return this.node.type.isAtom || mutation.type !== 'selection' && mutation.attributeName !== 'data-layout';
17
18
  }
19
+
20
+ // When interacting with input elements inside an extension's body, the events
21
+ // bubble up to the editor and get handled by it. This almost always gets in the way
22
+ // of being able to actually interact with said input in the extension, i.e.
23
+ // typing inside a text field (in an extension body) will print the text in the editor
24
+ // content area instead. This change prevents the editor view from trying to handle these events,
25
+ // when the target of the event is an input element, so the extension can.
26
+ stopEvent(event) {
27
+ return event.target instanceof HTMLInputElement && fg('cc_page_experiences_live_search_wysiwyg');
28
+ }
18
29
  getContentDOM() {
19
30
  if (this.node.isInline) {
20
31
  return;
@@ -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 = "87.6.1";
4
+ const packageVersion = "87.6.2";
5
5
  const sanitiseSentryEvents = (data, _hint) => {
6
6
  // Remove URL as it has UGC
7
7
  // TODO: Sanitise the URL instead of just removing it
@@ -12,7 +12,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
12
12
  import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
13
13
  import Layer from '../Layer';
14
14
  const packageName = "@atlaskit/editor-common";
15
- const packageVersion = "87.6.1";
15
+ const packageVersion = "87.6.2";
16
16
  const halfFocusRing = 1;
17
17
  const dropOffset = '0, 8';
18
18
  class DropList extends Component {
@@ -75,7 +75,8 @@ function ExtensionWithPluginState(props) {
75
75
  'without-frame': removeBorder
76
76
  });
77
77
  var newContentClassNames = classnames({
78
- 'with-padding-styles': showMacroInteractionDesignUpdates
78
+ 'with-padding-styles': showMacroInteractionDesignUpdates,
79
+ 'with-bodied-padding-styles': hasBody && showMacroInteractionDesignUpdates
79
80
  });
80
81
  var contentClassNames = classnames('extension-content', 'block', {
81
82
  'remove-border': showMacroInteractionDesignUpdates
@@ -67,6 +67,10 @@ export var contentWrapper = css({
67
67
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
68
68
  '&.with-padding-styles': {
69
69
  padding: "var(--ds-space-100, 8px)"
70
+ },
71
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
72
+ '&.with-bodied-padding-styles': {
73
+ padding: "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-250, 20px)") // account for upcoming editor elements drag & drop feature
70
74
  }
71
75
  });
72
76
 
@@ -38,7 +38,7 @@ export var mbeExtensionWrapperCSSStyles = css(wrapperDefault, {
38
38
  },
39
39
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
40
40
  '&.with-padding-background-styles': {
41
- padding: "var(--ds-space-100, 8px)",
41
+ padding: "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-250, 20px)"),
42
42
  background: 'transparent'
43
43
  }
44
44
  });
@@ -6,6 +6,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
6
6
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
7
7
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
8
8
  import React from 'react';
9
+ import { fg } from '@atlaskit/platform-feature-flags';
9
10
  import ReactNodeView from '../react-node-view';
10
11
  import { Extension } from './Extension';
11
12
  import { ExtensionNodeWrapper } from './ExtensionNodeWrapper';
@@ -30,6 +31,18 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
30
31
  // children a chance to recalc
31
32
  return this.node.type.isAtom || mutation.type !== 'selection' && mutation.attributeName !== 'data-layout';
32
33
  }
34
+
35
+ // When interacting with input elements inside an extension's body, the events
36
+ // bubble up to the editor and get handled by it. This almost always gets in the way
37
+ // of being able to actually interact with said input in the extension, i.e.
38
+ // typing inside a text field (in an extension body) will print the text in the editor
39
+ // content area instead. This change prevents the editor view from trying to handle these events,
40
+ // when the target of the event is an input element, so the extension can.
41
+ }, {
42
+ key: "stopEvent",
43
+ value: function stopEvent(event) {
44
+ return event.target instanceof HTMLInputElement && fg('cc_page_experiences_live_search_wysiwyg');
45
+ }
33
46
  }, {
34
47
  key: "getContentDOM",
35
48
  value: function getContentDOM() {
@@ -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 = "87.6.1";
10
+ var packageVersion = "87.6.2";
11
11
  var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
12
12
  // Remove URL as it has UGC
13
13
  // TODO: Sanitise the URL instead of just removing it
@@ -20,7 +20,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
20
20
  import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
21
21
  import Layer from '../Layer';
22
22
  var packageName = "@atlaskit/editor-common";
23
- var packageVersion = "87.6.1";
23
+ var packageVersion = "87.6.2";
24
24
  var halfFocusRing = 1;
25
25
  var dropOffset = '0, 8';
26
26
  var DropList = /*#__PURE__*/function (_Component) {
@@ -17,6 +17,7 @@ export declare class ExtensionNode extends ReactNodeView {
17
17
  type: 'selection';
18
18
  target: Element;
19
19
  }): boolean;
20
+ stopEvent(event: Event): boolean;
20
21
  getContentDOM(): {
21
22
  dom: HTMLDivElement;
22
23
  } | undefined;
@@ -17,6 +17,7 @@ export declare class ExtensionNode extends ReactNodeView {
17
17
  type: 'selection';
18
18
  target: Element;
19
19
  }): boolean;
20
+ stopEvent(event: Event): boolean;
20
21
  getContentDOM(): {
21
22
  dom: HTMLDivElement;
22
23
  } | undefined;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "87.6.1",
3
+ "version": "87.6.2",
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/"
@@ -268,6 +268,9 @@
268
268
  },
269
269
  "platform_editor_migration_icon_and_typography": {
270
270
  "type": "boolean"
271
+ },
272
+ "cc_page_experiences_live_search_wysiwyg": {
273
+ "type": "boolean"
271
274
  }
272
275
  }
273
276
  }