@atlaskit/editor-common 82.9.2 → 82.10.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 (50) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/cjs/extensibility/Extension/Extension/index.js +5 -3
  3. package/dist/cjs/extensibility/Extension/InlineExtension/index.js +3 -1
  4. package/dist/cjs/extensibility/Extension.js +2 -2
  5. package/dist/cjs/extensibility/ExtensionComponent.js +4 -4
  6. package/dist/cjs/extensibility/ExtensionNodeWrapper.js +3 -1
  7. package/dist/cjs/extensibility/MultiBodiedExtension/index.js +5 -3
  8. package/dist/cjs/extensibility/extensionNodeView.js +4 -4
  9. package/dist/cjs/link/LinkPicker/HyperlinkAddToolbar/HyperlinkAddToolbar.js +14 -16
  10. package/dist/cjs/monitoring/error.js +1 -1
  11. package/dist/cjs/ui/DropList/index.js +1 -1
  12. package/dist/es2019/extensibility/Extension/Extension/index.js +4 -1
  13. package/dist/es2019/extensibility/Extension/InlineExtension/index.js +4 -1
  14. package/dist/es2019/extensibility/Extension.js +2 -2
  15. package/dist/es2019/extensibility/ExtensionComponent.js +4 -4
  16. package/dist/es2019/extensibility/ExtensionNodeWrapper.js +4 -1
  17. package/dist/es2019/extensibility/MultiBodiedExtension/index.js +4 -1
  18. package/dist/es2019/extensibility/extensionNodeView.js +4 -4
  19. package/dist/es2019/link/LinkPicker/HyperlinkAddToolbar/HyperlinkAddToolbar.js +15 -17
  20. package/dist/es2019/monitoring/error.js +1 -1
  21. package/dist/es2019/ui/DropList/index.js +1 -1
  22. package/dist/esm/extensibility/Extension/Extension/index.js +5 -3
  23. package/dist/esm/extensibility/Extension/InlineExtension/index.js +3 -1
  24. package/dist/esm/extensibility/Extension.js +2 -2
  25. package/dist/esm/extensibility/ExtensionComponent.js +4 -4
  26. package/dist/esm/extensibility/ExtensionNodeWrapper.js +3 -1
  27. package/dist/esm/extensibility/MultiBodiedExtension/index.js +5 -3
  28. package/dist/esm/extensibility/extensionNodeView.js +4 -4
  29. package/dist/esm/link/LinkPicker/HyperlinkAddToolbar/HyperlinkAddToolbar.js +15 -17
  30. package/dist/esm/monitoring/error.js +1 -1
  31. package/dist/esm/ui/DropList/index.js +1 -1
  32. package/dist/types/extensibility/Extension/Extension/index.d.ts +2 -2
  33. package/dist/types/extensibility/Extension/InlineExtension/index.d.ts +2 -2
  34. package/dist/types/extensibility/Extension.d.ts +2 -2
  35. package/dist/types/extensibility/ExtensionComponent.d.ts +2 -2
  36. package/dist/types/extensibility/ExtensionNodeWrapper.d.ts +3 -2
  37. package/dist/types/extensibility/MultiBodiedExtension/index.d.ts +2 -2
  38. package/dist/types/extensibility/extensionNodeView.d.ts +3 -3
  39. package/dist/types/extensibility/types.d.ts +4 -0
  40. package/dist/types/types/feature-flags.d.ts +8 -0
  41. package/dist/types-ts4.5/extensibility/Extension/Extension/index.d.ts +2 -2
  42. package/dist/types-ts4.5/extensibility/Extension/InlineExtension/index.d.ts +2 -2
  43. package/dist/types-ts4.5/extensibility/Extension.d.ts +2 -2
  44. package/dist/types-ts4.5/extensibility/ExtensionComponent.d.ts +2 -2
  45. package/dist/types-ts4.5/extensibility/ExtensionNodeWrapper.d.ts +3 -2
  46. package/dist/types-ts4.5/extensibility/MultiBodiedExtension/index.d.ts +2 -2
  47. package/dist/types-ts4.5/extensibility/extensionNodeView.d.ts +3 -3
  48. package/dist/types-ts4.5/extensibility/types.d.ts +4 -0
  49. package/dist/types-ts4.5/types/feature-flags.d.ts +8 -0
  50. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,23 @@
1
1
  # @atlaskit/editor-common
2
2
 
3
+ ## 82.10.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#112575](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/112575)
8
+ [`63dcaae87255b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/63dcaae87255b) -
9
+ Passes new FF for new experiment to macro code and updates type to be object from boolean to
10
+ account for multiple FFs
11
+
12
+ ### Patch Changes
13
+
14
+ - [#113192](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113192)
15
+ [`80dfa651ba955`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/80dfa651ba955) -
16
+ Migration of native HTML buttons to new Pressable primitive.
17
+ - [#113192](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113192)
18
+ [`80dfa651ba955`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/80dfa651ba955) -
19
+ Migration of native HTML buttons to new Pressable primitive.
20
+
3
21
  ## 82.9.2
4
22
 
5
23
  ### Patch Changes
@@ -38,11 +38,13 @@ function ExtensionWithPluginState(props) {
38
38
  shadowClassNames = props.shadowClassNames,
39
39
  hideFrame = props.hideFrame,
40
40
  editorAppearance = props.editorAppearance,
41
- showMacroInteractionDesignUpdates = props.showMacroInteractionDesignUpdates,
41
+ macroInteractionDesignFeatureFlags = props.macroInteractionDesignFeatureFlags,
42
42
  isNodeSelected = props.isNodeSelected,
43
43
  isNodeHovered = props.isNodeHovered,
44
44
  isNodeNested = props.isNodeNested,
45
45
  setIsNodeHovered = props.setIsNodeHovered;
46
+ var _ref = macroInteractionDesignFeatureFlags || {},
47
+ showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
46
48
  var hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
47
49
  var isMobile = editorAppearance === 'mobile';
48
50
  var hasChildren = !!children;
@@ -199,8 +201,8 @@ var ExtensionDeprecated = function ExtensionDeprecated(props) {
199
201
  plugins: {
200
202
  widthState: widthPluginKey
201
203
  },
202
- render: function render(_ref) {
203
- var widthState = _ref.widthState;
204
+ render: function render(_ref2) {
205
+ var widthState = _ref2.widthState;
204
206
  return (0, _react2.jsx)(ExtensionWithPluginState, (0, _extends2.default)({
205
207
  widthState: widthState
206
208
  }, props));
@@ -25,11 +25,13 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
25
25
  var InlineExtension = function InlineExtension(props) {
26
26
  var node = props.node,
27
27
  pluginInjectionApi = props.pluginInjectionApi,
28
- showMacroInteractionDesignUpdates = props.showMacroInteractionDesignUpdates,
28
+ macroInteractionDesignFeatureFlags = props.macroInteractionDesignFeatureFlags,
29
29
  isNodeSelected = props.isNodeSelected,
30
30
  children = props.children,
31
31
  isNodeHovered = props.isNodeHovered,
32
32
  setIsNodeHovered = props.setIsNodeHovered;
33
+ var _ref = macroInteractionDesignFeatureFlags || {},
34
+ showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
33
35
  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['width']),
34
36
  widthState = _useSharedPluginState.widthState;
35
37
  var hasChildren = !!children;
@@ -39,7 +39,7 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
39
39
  editorAppearance = _this$props.editorAppearance,
40
40
  pluginInjectionApi = _this$props.pluginInjectionApi,
41
41
  eventDispatcher = _this$props.eventDispatcher,
42
- showMacroInteractionDesignUpdates = _this$props.showMacroInteractionDesignUpdates;
42
+ macroInteractionDesignFeatureFlags = _this$props.macroInteractionDesignFeatureFlags;
43
43
  return /*#__PURE__*/_react.default.createElement(_ExtensionComponent.ExtensionComponent, {
44
44
  editorView: editorView,
45
45
  node: node,
@@ -51,7 +51,7 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
51
51
  editorAppearance: editorAppearance,
52
52
  pluginInjectionApi: pluginInjectionApi,
53
53
  eventDispatcher: eventDispatcher,
54
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
54
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags
55
55
  });
56
56
  });
57
57
  _this.providerFactory = props.providerFactory || new _providerFactory.ProviderFactory();
@@ -200,7 +200,7 @@ var ExtensionComponent = exports.ExtensionComponent = /*#__PURE__*/function (_Co
200
200
  pluginInjectionApi = _this$props2.pluginInjectionApi,
201
201
  getPos = _this$props2.getPos,
202
202
  eventDispatcher = _this$props2.eventDispatcher,
203
- showMacroInteractionDesignUpdates = _this$props2.showMacroInteractionDesignUpdates;
203
+ macroInteractionDesignFeatureFlags = _this$props2.macroInteractionDesignFeatureFlags;
204
204
  var selection = editorView.state.selection;
205
205
  var selectedNode = selection instanceof _state.NodeSelection && selection.node;
206
206
  var position = typeof getPos === 'function' && getPos();
@@ -216,7 +216,7 @@ var ExtensionComponent = exports.ExtensionComponent = /*#__PURE__*/function (_Co
216
216
  eventDispatcher: eventDispatcher,
217
217
  pluginInjectionApi: pluginInjectionApi,
218
218
  editorAppearance: editorAppearance,
219
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
219
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
220
220
  isNodeSelected: selectedNode === node,
221
221
  isNodeNested: isNodeNested,
222
222
  isNodeHovered: this.state.isNodeHovered,
@@ -237,7 +237,7 @@ var ExtensionComponent = exports.ExtensionComponent = /*#__PURE__*/function (_Co
237
237
  editorAppearance: editorAppearance,
238
238
  hideFrame: (_this$state$_privateP = this.state._privateProps) === null || _this$state$_privateP === void 0 ? void 0 : _this$state$_privateP.__hideFrame,
239
239
  pluginInjectionApi: pluginInjectionApi,
240
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
240
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
241
241
  isNodeSelected: selectedNode === node,
242
242
  isNodeHovered: this.state.isNodeHovered,
243
243
  isNodeNested: isNodeNested,
@@ -246,7 +246,7 @@ var ExtensionComponent = exports.ExtensionComponent = /*#__PURE__*/function (_Co
246
246
  case 'inlineExtension':
247
247
  return /*#__PURE__*/_react.default.createElement(_InlineExtension.default, {
248
248
  node: node,
249
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
249
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
250
250
  isNodeSelected: selectedNode === node,
251
251
  pluginInjectionApi: pluginInjectionApi,
252
252
  isNodeHovered: this.state.isNodeHovered,
@@ -34,7 +34,9 @@ var styles = (0, _react2.css)({
34
34
  var ExtensionNodeWrapper = exports.ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
35
35
  var children = _ref.children,
36
36
  nodeType = _ref.nodeType,
37
- showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
37
+ macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags;
38
+ var _ref2 = macroInteractionDesignFeatureFlags || {},
39
+ showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
38
40
  var wrapperClassNames = (0, _classnames.default)({
39
41
  'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates,
40
42
  relative: showMacroInteractionDesignUpdates
@@ -81,11 +81,13 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
81
81
  eventDispatcher = _ref.eventDispatcher,
82
82
  widthState = _ref.widthState,
83
83
  editorAppearance = _ref.editorAppearance,
84
- showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
84
+ macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags,
85
85
  isNodeSelected = _ref.isNodeSelected,
86
86
  isNodeHovered = _ref.isNodeHovered,
87
87
  isNodeNested = _ref.isNodeNested,
88
88
  setIsNodeHovered = _ref.setIsNodeHovered;
89
+ var _ref2 = macroInteractionDesignFeatureFlags || {},
90
+ showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
89
91
  var _node$attrs = node.attrs,
90
92
  parameters = _node$attrs.parameters,
91
93
  extensionKey = _node$attrs.extensionKey;
@@ -250,8 +252,8 @@ var MultiBodiedExtensionDeprecated = function MultiBodiedExtensionDeprecated(pro
250
252
  plugins: {
251
253
  widthState: widthPluginKey
252
254
  },
253
- render: function render(_ref2) {
254
- var widthState = _ref2.widthState;
255
+ render: function render(_ref3) {
256
+ var widthState = _ref3.widthState;
255
257
  return (0, _react2.jsx)(MultiBodiedExtensionWithWidth, (0, _extends2.default)({
256
258
  widthState: widthState
257
259
  }, props));
@@ -56,7 +56,7 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
56
56
  var _props$extensionNodeV;
57
57
  return /*#__PURE__*/_react.default.createElement(_ExtensionNodeWrapper.ExtensionNodeWrapper, {
58
58
  nodeType: this.node.type.name,
59
- showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
59
+ macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
60
60
  }, /*#__PURE__*/_react.default.createElement(_Extension.Extension, {
61
61
  editorView: this.view,
62
62
  node: this.node,
@@ -74,13 +74,13 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
74
74
  extensionHandlers: props.extensionHandlers,
75
75
  editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
76
76
  pluginInjectionApi: props.pluginInjectionApi,
77
- showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
77
+ macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
78
78
  }));
79
79
  }
80
80
  }]);
81
81
  return ExtensionNode;
82
82
  }(_reactNodeView.default);
83
- function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, showMacroInteractionDesignUpdates) {
83
+ function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags) {
84
84
  return function (node, view, getPos) {
85
85
  var hasIntlContext = true;
86
86
  return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
@@ -88,7 +88,7 @@ function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory,
88
88
  extensionHandlers: extensionHandlers,
89
89
  extensionNodeViewOptions: extensionNodeViewOptions,
90
90
  pluginInjectionApi: pluginInjectionApi,
91
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
91
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags
92
92
  }, undefined, undefined, undefined, hasIntlContext).init();
93
93
  };
94
94
  }
@@ -26,6 +26,7 @@ var _adfSchema = require("@atlaskit/adf-schema");
26
26
  var _analyticsNext = require("@atlaskit/analytics-next");
27
27
  var _ = _interopRequireDefault(require("@atlaskit/icon-object/glyph/page/16"));
28
28
  var _crossCircle = _interopRequireDefault(require("@atlaskit/icon/glyph/cross-circle"));
29
+ var _primitives = require("@atlaskit/primitives");
29
30
  var _colors = require("@atlaskit/theme/colors");
30
31
  var _constants = require("@atlaskit/theme/constants");
31
32
  var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
@@ -56,12 +57,10 @@ var visuallyHiddenStyles = exports.visuallyHiddenStyles = (0, _react2.css)({
56
57
  position: 'absolute'
57
58
  });
58
59
  var RECENT_SEARCH_LIST_SIZE = exports.RECENT_SEARCH_LIST_SIZE = 5;
59
- var clearText = (0, _react2.css)({
60
- cursor: 'pointer',
61
- padding: 0,
62
- marginRight: "var(--ds-space-100, 8px)",
63
- color: "var(--ds-icon-subtle, ".concat(_colors.N90, ")"),
64
- background: 'transparent',
60
+ var clearTextButtonStyles = (0, _primitives.xcss)({
61
+ padding: 'space.0',
62
+ marginRight: 'space.100',
63
+ backgroundColor: 'color.background.neutral.subtle',
65
64
  border: 'none'
66
65
  });
67
66
  var clearTextWrapper = (0, _react2.css)({
@@ -888,13 +887,12 @@ var HyperlinkLinkAddToolbar = exports.HyperlinkLinkAddToolbar = /*#__PURE__*/fun
888
887
  css: clearTextWrapper
889
888
  }, (0, _react2.jsx)(_tooltip.default, {
890
889
  content: formatClearLinkText
891
- }, (0, _react2.jsx)("button", {
892
- type: "button",
893
- css: clearText,
894
- onClick: this.handleClearText,
895
- tabIndex: 0
890
+ }, (0, _react2.jsx)(_primitives.Pressable, {
891
+ xcss: clearTextButtonStyles,
892
+ onClick: this.handleClearText
896
893
  }, (0, _react2.jsx)(_crossCircle.default, {
897
- label: formatClearLinkText
894
+ label: formatClearLinkText,
895
+ primaryColor: "var(--ds-icon-subtle, #626F86)"
898
896
  }))))), (0, _react2.jsx)("label", {
899
897
  htmlFor: displayTextInputId,
900
898
  css: [inputLabel, textLabelMargin]
@@ -915,13 +913,13 @@ var HyperlinkLinkAddToolbar = exports.HyperlinkLinkAddToolbar = /*#__PURE__*/fun
915
913
  css: clearTextWrapper
916
914
  }, (0, _react2.jsx)(_tooltip.default, {
917
915
  content: formatMessage(messages.clearText)
918
- }, (0, _react2.jsx)("button", {
919
- type: "button",
920
- css: clearText,
916
+ }, (0, _react2.jsx)(_primitives.Pressable, {
917
+ xcss: clearTextButtonStyles,
921
918
  onClick: this.handleClearDisplayText,
922
919
  onKeyDown: this.handleClearTextKeyDown
923
920
  }, (0, _react2.jsx)(_crossCircle.default, {
924
- label: formatMessage(messages.clearText)
921
+ label: formatMessage(messages.clearText),
922
+ primaryColor: "var(--ds-icon-subtle, #626F86)"
925
923
  }))))), (0, _react2.jsx)("div", {
926
924
  css: visuallyHiddenStyles,
927
925
  "aria-live": "polite",
@@ -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 = "82.9.2";
20
+ var packageVersion = "82.10.0";
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
@@ -20,7 +20,7 @@ var _Layer = _interopRequireDefault(require("../Layer"));
20
20
  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); }; }
21
21
  function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /** @jsx jsx */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
22
22
  var packageName = "@atlaskit/editor-common";
23
- var packageVersion = "82.9.2";
23
+ var packageVersion = "82.10.0";
24
24
  var halfFocusRing = 1;
25
25
  var dropOffset = '0, 8';
26
26
  var DropList = /*#__PURE__*/function (_Component) {
@@ -25,12 +25,15 @@ function ExtensionWithPluginState(props) {
25
25
  shadowClassNames,
26
26
  hideFrame,
27
27
  editorAppearance,
28
- showMacroInteractionDesignUpdates,
28
+ macroInteractionDesignFeatureFlags,
29
29
  isNodeSelected,
30
30
  isNodeHovered,
31
31
  isNodeNested,
32
32
  setIsNodeHovered
33
33
  } = props;
34
+ const {
35
+ showMacroInteractionDesignUpdates
36
+ } = macroInteractionDesignFeatureFlags || {};
34
37
  const hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
35
38
  const isMobile = editorAppearance === 'mobile';
36
39
  const hasChildren = !!children;
@@ -15,12 +15,15 @@ const InlineExtension = props => {
15
15
  const {
16
16
  node,
17
17
  pluginInjectionApi,
18
- showMacroInteractionDesignUpdates,
18
+ macroInteractionDesignFeatureFlags,
19
19
  isNodeSelected,
20
20
  children,
21
21
  isNodeHovered,
22
22
  setIsNodeHovered
23
23
  } = props;
24
+ const {
25
+ showMacroInteractionDesignUpdates
26
+ } = macroInteractionDesignFeatureFlags || {};
24
27
  const {
25
28
  widthState
26
29
  } = useSharedPluginState(pluginInjectionApi, ['width']);
@@ -18,7 +18,7 @@ export class Extension extends Component {
18
18
  editorAppearance,
19
19
  pluginInjectionApi,
20
20
  eventDispatcher,
21
- showMacroInteractionDesignUpdates
21
+ macroInteractionDesignFeatureFlags
22
22
  } = this.props;
23
23
  return /*#__PURE__*/React.createElement(ExtensionComponent, {
24
24
  editorView: editorView,
@@ -31,7 +31,7 @@ export class Extension extends Component {
31
31
  editorAppearance: editorAppearance,
32
32
  pluginInjectionApi: pluginInjectionApi,
33
33
  eventDispatcher: eventDispatcher,
34
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
34
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags
35
35
  });
36
36
  });
37
37
  this.providerFactory = props.providerFactory || new ProviderFactory();
@@ -152,7 +152,7 @@ export class ExtensionComponent extends Component {
152
152
  pluginInjectionApi,
153
153
  getPos,
154
154
  eventDispatcher,
155
- showMacroInteractionDesignUpdates
155
+ macroInteractionDesignFeatureFlags
156
156
  } = this.props;
157
157
  const {
158
158
  selection
@@ -171,7 +171,7 @@ export class ExtensionComponent extends Component {
171
171
  eventDispatcher: eventDispatcher,
172
172
  pluginInjectionApi: pluginInjectionApi,
173
173
  editorAppearance: editorAppearance,
174
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
174
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
175
175
  isNodeSelected: selectedNode === node,
176
176
  isNodeNested: isNodeNested,
177
177
  isNodeHovered: this.state.isNodeHovered,
@@ -192,7 +192,7 @@ export class ExtensionComponent extends Component {
192
192
  editorAppearance: editorAppearance,
193
193
  hideFrame: (_this$state$_privateP = this.state._privateProps) === null || _this$state$_privateP === void 0 ? void 0 : _this$state$_privateP.__hideFrame,
194
194
  pluginInjectionApi: pluginInjectionApi,
195
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
195
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
196
196
  isNodeSelected: selectedNode === node,
197
197
  isNodeHovered: this.state.isNodeHovered,
198
198
  isNodeNested: isNodeNested,
@@ -201,7 +201,7 @@ export class ExtensionComponent extends Component {
201
201
  case 'inlineExtension':
202
202
  return /*#__PURE__*/React.createElement(InlineExtension, {
203
203
  node: node,
204
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
204
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
205
205
  isNodeSelected: selectedNode === node,
206
206
  pluginInjectionApi: pluginInjectionApi,
207
207
  isNodeHovered: this.state.isNodeHovered,
@@ -26,8 +26,11 @@ const styles = css({
26
26
  export const ExtensionNodeWrapper = ({
27
27
  children,
28
28
  nodeType,
29
- showMacroInteractionDesignUpdates
29
+ macroInteractionDesignFeatureFlags
30
30
  }) => {
31
+ const {
32
+ showMacroInteractionDesignUpdates
33
+ } = macroInteractionDesignFeatureFlags || {};
31
34
  const wrapperClassNames = classnames({
32
35
  'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates,
33
36
  relative: showMacroInteractionDesignUpdates
@@ -70,12 +70,15 @@ const MultiBodiedExtensionWithWidth = ({
70
70
  eventDispatcher,
71
71
  widthState,
72
72
  editorAppearance,
73
- showMacroInteractionDesignUpdates,
73
+ macroInteractionDesignFeatureFlags,
74
74
  isNodeSelected,
75
75
  isNodeHovered,
76
76
  isNodeNested,
77
77
  setIsNodeHovered
78
78
  }) => {
79
+ const {
80
+ showMacroInteractionDesignUpdates
81
+ } = macroInteractionDesignFeatureFlags || {};
79
82
  const {
80
83
  parameters,
81
84
  extensionKey
@@ -29,7 +29,7 @@ export class ExtensionNode extends ReactNodeView {
29
29
  var _props$extensionNodeV;
30
30
  return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
31
31
  nodeType: this.node.type.name,
32
- showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
32
+ macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
33
33
  }, /*#__PURE__*/React.createElement(Extension, {
34
34
  editorView: this.view,
35
35
  node: this.node,
@@ -47,11 +47,11 @@ export class ExtensionNode extends ReactNodeView {
47
47
  extensionHandlers: props.extensionHandlers,
48
48
  editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
49
49
  pluginInjectionApi: props.pluginInjectionApi,
50
- showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
50
+ macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
51
51
  }));
52
52
  }
53
53
  }
54
- export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, showMacroInteractionDesignUpdates) {
54
+ export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags) {
55
55
  return (node, view, getPos) => {
56
56
  const hasIntlContext = true;
57
57
  return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
@@ -59,7 +59,7 @@ export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, pr
59
59
  extensionHandlers,
60
60
  extensionNodeViewOptions,
61
61
  pluginInjectionApi,
62
- showMacroInteractionDesignUpdates
62
+ macroInteractionDesignFeatureFlags
63
63
  }, undefined, undefined, undefined, hasIntlContext).init();
64
64
  };
65
65
  }
@@ -12,7 +12,8 @@ import { isSafeUrl } from '@atlaskit/adf-schema';
12
12
  import { withAnalyticsEvents } from '@atlaskit/analytics-next';
13
13
  import Page16Icon from '@atlaskit/icon-object/glyph/page/16';
14
14
  import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
15
- import { N200, N90 } from '@atlaskit/theme/colors';
15
+ import { Pressable, xcss } from '@atlaskit/primitives';
16
+ import { N200 } from '@atlaskit/theme/colors';
16
17
  import { fontSizeSmall } from '@atlaskit/theme/constants';
17
18
  import Tooltip from '@atlaskit/tooltip';
18
19
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent, INPUT_METHOD } from '../../../analytics';
@@ -39,12 +40,10 @@ export const visuallyHiddenStyles = css({
39
40
  position: 'absolute'
40
41
  });
41
42
  export const RECENT_SEARCH_LIST_SIZE = 5;
42
- const clearText = css({
43
- cursor: 'pointer',
44
- padding: 0,
45
- marginRight: "var(--ds-space-100, 8px)",
46
- color: `var(--ds-icon-subtle, ${N90})`,
47
- background: 'transparent',
43
+ const clearTextButtonStyles = xcss({
44
+ padding: 'space.0',
45
+ marginRight: 'space.100',
46
+ backgroundColor: 'color.background.neutral.subtle',
48
47
  border: 'none'
49
48
  });
50
49
  const clearTextWrapper = css({
@@ -728,13 +727,12 @@ export class HyperlinkLinkAddToolbar extends PureComponent {
728
727
  css: clearTextWrapper
729
728
  }, jsx(Tooltip, {
730
729
  content: formatClearLinkText
731
- }, jsx("button", {
732
- type: "button",
733
- css: clearText,
734
- onClick: this.handleClearText,
735
- tabIndex: 0
730
+ }, jsx(Pressable, {
731
+ xcss: clearTextButtonStyles,
732
+ onClick: this.handleClearText
736
733
  }, jsx(CrossCircleIcon, {
737
- label: formatClearLinkText
734
+ label: formatClearLinkText,
735
+ primaryColor: "var(--ds-icon-subtle, #626F86)"
738
736
  }))))), jsx("label", {
739
737
  htmlFor: displayTextInputId,
740
738
  css: [inputLabel, textLabelMargin]
@@ -753,13 +751,13 @@ export class HyperlinkLinkAddToolbar extends PureComponent {
753
751
  css: clearTextWrapper
754
752
  }, jsx(Tooltip, {
755
753
  content: formatMessage(messages.clearText)
756
- }, jsx("button", {
757
- type: "button",
758
- css: clearText,
754
+ }, jsx(Pressable, {
755
+ xcss: clearTextButtonStyles,
759
756
  onClick: this.handleClearDisplayText,
760
757
  onKeyDown: this.handleClearTextKeyDown
761
758
  }, jsx(CrossCircleIcon, {
762
- label: formatMessage(messages.clearText)
759
+ label: formatMessage(messages.clearText),
760
+ primaryColor: "var(--ds-icon-subtle, #626F86)"
763
761
  }))))), jsx("div", {
764
762
  css: visuallyHiddenStyles,
765
763
  "aria-live": "polite",
@@ -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 = "82.9.2";
4
+ const packageVersion = "82.10.0";
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
@@ -9,7 +9,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
9
9
  import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
10
10
  import Layer from '../Layer';
11
11
  const packageName = "@atlaskit/editor-common";
12
- const packageVersion = "82.9.2";
12
+ const packageVersion = "82.10.0";
13
13
  const halfFocusRing = 1;
14
14
  const dropOffset = '0, 8';
15
15
  class DropList extends Component {
@@ -30,11 +30,13 @@ function ExtensionWithPluginState(props) {
30
30
  shadowClassNames = props.shadowClassNames,
31
31
  hideFrame = props.hideFrame,
32
32
  editorAppearance = props.editorAppearance,
33
- showMacroInteractionDesignUpdates = props.showMacroInteractionDesignUpdates,
33
+ macroInteractionDesignFeatureFlags = props.macroInteractionDesignFeatureFlags,
34
34
  isNodeSelected = props.isNodeSelected,
35
35
  isNodeHovered = props.isNodeHovered,
36
36
  isNodeNested = props.isNodeNested,
37
37
  setIsNodeHovered = props.setIsNodeHovered;
38
+ var _ref = macroInteractionDesignFeatureFlags || {},
39
+ showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
38
40
  var hasBody = ['bodiedExtension', 'multiBodiedExtension'].includes(node.type.name);
39
41
  var isMobile = editorAppearance === 'mobile';
40
42
  var hasChildren = !!children;
@@ -191,8 +193,8 @@ var ExtensionDeprecated = function ExtensionDeprecated(props) {
191
193
  plugins: {
192
194
  widthState: widthPluginKey
193
195
  },
194
- render: function render(_ref) {
195
- var widthState = _ref.widthState;
196
+ render: function render(_ref2) {
197
+ var widthState = _ref2.widthState;
196
198
  return jsx(ExtensionWithPluginState, _extends({
197
199
  widthState: widthState
198
200
  }, props));
@@ -14,11 +14,13 @@ import { inlineWrapperStyles, wrapperStyle } from './styles';
14
14
  var InlineExtension = function InlineExtension(props) {
15
15
  var node = props.node,
16
16
  pluginInjectionApi = props.pluginInjectionApi,
17
- showMacroInteractionDesignUpdates = props.showMacroInteractionDesignUpdates,
17
+ macroInteractionDesignFeatureFlags = props.macroInteractionDesignFeatureFlags,
18
18
  isNodeSelected = props.isNodeSelected,
19
19
  children = props.children,
20
20
  isNodeHovered = props.isNodeHovered,
21
21
  setIsNodeHovered = props.setIsNodeHovered;
22
+ var _ref = macroInteractionDesignFeatureFlags || {},
23
+ showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
22
24
  var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['width']),
23
25
  widthState = _useSharedPluginState.widthState;
24
26
  var hasChildren = !!children;
@@ -29,7 +29,7 @@ export var Extension = /*#__PURE__*/function (_Component) {
29
29
  editorAppearance = _this$props.editorAppearance,
30
30
  pluginInjectionApi = _this$props.pluginInjectionApi,
31
31
  eventDispatcher = _this$props.eventDispatcher,
32
- showMacroInteractionDesignUpdates = _this$props.showMacroInteractionDesignUpdates;
32
+ macroInteractionDesignFeatureFlags = _this$props.macroInteractionDesignFeatureFlags;
33
33
  return /*#__PURE__*/React.createElement(ExtensionComponent, {
34
34
  editorView: editorView,
35
35
  node: node,
@@ -41,7 +41,7 @@ export var Extension = /*#__PURE__*/function (_Component) {
41
41
  editorAppearance: editorAppearance,
42
42
  pluginInjectionApi: pluginInjectionApi,
43
43
  eventDispatcher: eventDispatcher,
44
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
44
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags
45
45
  });
46
46
  });
47
47
  _this.providerFactory = props.providerFactory || new ProviderFactory();
@@ -190,7 +190,7 @@ export var ExtensionComponent = /*#__PURE__*/function (_Component) {
190
190
  pluginInjectionApi = _this$props2.pluginInjectionApi,
191
191
  getPos = _this$props2.getPos,
192
192
  eventDispatcher = _this$props2.eventDispatcher,
193
- showMacroInteractionDesignUpdates = _this$props2.showMacroInteractionDesignUpdates;
193
+ macroInteractionDesignFeatureFlags = _this$props2.macroInteractionDesignFeatureFlags;
194
194
  var selection = editorView.state.selection;
195
195
  var selectedNode = selection instanceof NodeSelection && selection.node;
196
196
  var position = typeof getPos === 'function' && getPos();
@@ -206,7 +206,7 @@ export var ExtensionComponent = /*#__PURE__*/function (_Component) {
206
206
  eventDispatcher: eventDispatcher,
207
207
  pluginInjectionApi: pluginInjectionApi,
208
208
  editorAppearance: editorAppearance,
209
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
209
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
210
210
  isNodeSelected: selectedNode === node,
211
211
  isNodeNested: isNodeNested,
212
212
  isNodeHovered: this.state.isNodeHovered,
@@ -227,7 +227,7 @@ export var ExtensionComponent = /*#__PURE__*/function (_Component) {
227
227
  editorAppearance: editorAppearance,
228
228
  hideFrame: (_this$state$_privateP = this.state._privateProps) === null || _this$state$_privateP === void 0 ? void 0 : _this$state$_privateP.__hideFrame,
229
229
  pluginInjectionApi: pluginInjectionApi,
230
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
230
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
231
231
  isNodeSelected: selectedNode === node,
232
232
  isNodeHovered: this.state.isNodeHovered,
233
233
  isNodeNested: isNodeNested,
@@ -236,7 +236,7 @@ export var ExtensionComponent = /*#__PURE__*/function (_Component) {
236
236
  case 'inlineExtension':
237
237
  return /*#__PURE__*/React.createElement(InlineExtension, {
238
238
  node: node,
239
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates,
239
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
240
240
  isNodeSelected: selectedNode === node,
241
241
  pluginInjectionApi: pluginInjectionApi,
242
242
  isNodeHovered: this.state.isNodeHovered,
@@ -26,7 +26,9 @@ var styles = css({
26
26
  export var ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
27
27
  var children = _ref.children,
28
28
  nodeType = _ref.nodeType,
29
- showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
29
+ macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags;
30
+ var _ref2 = macroInteractionDesignFeatureFlags || {},
31
+ showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
30
32
  var wrapperClassNames = classnames({
31
33
  'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates,
32
34
  relative: showMacroInteractionDesignUpdates
@@ -73,11 +73,13 @@ var MultiBodiedExtensionWithWidth = function MultiBodiedExtensionWithWidth(_ref)
73
73
  eventDispatcher = _ref.eventDispatcher,
74
74
  widthState = _ref.widthState,
75
75
  editorAppearance = _ref.editorAppearance,
76
- showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates,
76
+ macroInteractionDesignFeatureFlags = _ref.macroInteractionDesignFeatureFlags,
77
77
  isNodeSelected = _ref.isNodeSelected,
78
78
  isNodeHovered = _ref.isNodeHovered,
79
79
  isNodeNested = _ref.isNodeNested,
80
80
  setIsNodeHovered = _ref.setIsNodeHovered;
81
+ var _ref2 = macroInteractionDesignFeatureFlags || {},
82
+ showMacroInteractionDesignUpdates = _ref2.showMacroInteractionDesignUpdates;
81
83
  var _node$attrs = node.attrs,
82
84
  parameters = _node$attrs.parameters,
83
85
  extensionKey = _node$attrs.extensionKey;
@@ -242,8 +244,8 @@ var MultiBodiedExtensionDeprecated = function MultiBodiedExtensionDeprecated(pro
242
244
  plugins: {
243
245
  widthState: widthPluginKey
244
246
  },
245
- render: function render(_ref2) {
246
- var widthState = _ref2.widthState;
247
+ render: function render(_ref3) {
248
+ var widthState = _ref3.widthState;
247
249
  return jsx(MultiBodiedExtensionWithWidth, _extends({
248
250
  widthState: widthState
249
251
  }, props));
@@ -48,7 +48,7 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
48
48
  var _props$extensionNodeV;
49
49
  return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
50
50
  nodeType: this.node.type.name,
51
- showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
51
+ macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
52
52
  }, /*#__PURE__*/React.createElement(Extension, {
53
53
  editorView: this.view,
54
54
  node: this.node,
@@ -66,13 +66,13 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
66
66
  extensionHandlers: props.extensionHandlers,
67
67
  editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
68
68
  pluginInjectionApi: props.pluginInjectionApi,
69
- showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
69
+ macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags
70
70
  }));
71
71
  }
72
72
  }]);
73
73
  return ExtensionNode;
74
74
  }(ReactNodeView);
75
- export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, showMacroInteractionDesignUpdates) {
75
+ export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags) {
76
76
  return function (node, view, getPos) {
77
77
  var hasIntlContext = true;
78
78
  return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
@@ -80,7 +80,7 @@ export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, pr
80
80
  extensionHandlers: extensionHandlers,
81
81
  extensionNodeViewOptions: extensionNodeViewOptions,
82
82
  pluginInjectionApi: pluginInjectionApi,
83
- showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
83
+ macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags
84
84
  }, undefined, undefined, undefined, hasIntlContext).init();
85
85
  };
86
86
  }
@@ -24,7 +24,8 @@ import { isSafeUrl } from '@atlaskit/adf-schema';
24
24
  import { withAnalyticsEvents } from '@atlaskit/analytics-next';
25
25
  import Page16Icon from '@atlaskit/icon-object/glyph/page/16';
26
26
  import CrossCircleIcon from '@atlaskit/icon/glyph/cross-circle';
27
- import { N200, N90 } from '@atlaskit/theme/colors';
27
+ import { Pressable, xcss } from '@atlaskit/primitives';
28
+ import { N200 } from '@atlaskit/theme/colors';
28
29
  import { fontSizeSmall } from '@atlaskit/theme/constants';
29
30
  import Tooltip from '@atlaskit/tooltip';
30
31
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, fireAnalyticsEvent, INPUT_METHOD } from '../../../analytics';
@@ -51,12 +52,10 @@ export var visuallyHiddenStyles = css({
51
52
  position: 'absolute'
52
53
  });
53
54
  export var RECENT_SEARCH_LIST_SIZE = 5;
54
- var clearText = css({
55
- cursor: 'pointer',
56
- padding: 0,
57
- marginRight: "var(--ds-space-100, 8px)",
58
- color: "var(--ds-icon-subtle, ".concat(N90, ")"),
59
- background: 'transparent',
55
+ var clearTextButtonStyles = xcss({
56
+ padding: 'space.0',
57
+ marginRight: 'space.100',
58
+ backgroundColor: 'color.background.neutral.subtle',
60
59
  border: 'none'
61
60
  });
62
61
  var clearTextWrapper = css({
@@ -883,13 +882,12 @@ export var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
883
882
  css: clearTextWrapper
884
883
  }, jsx(Tooltip, {
885
884
  content: formatClearLinkText
886
- }, jsx("button", {
887
- type: "button",
888
- css: clearText,
889
- onClick: this.handleClearText,
890
- tabIndex: 0
885
+ }, jsx(Pressable, {
886
+ xcss: clearTextButtonStyles,
887
+ onClick: this.handleClearText
891
888
  }, jsx(CrossCircleIcon, {
892
- label: formatClearLinkText
889
+ label: formatClearLinkText,
890
+ primaryColor: "var(--ds-icon-subtle, #626F86)"
893
891
  }))))), jsx("label", {
894
892
  htmlFor: displayTextInputId,
895
893
  css: [inputLabel, textLabelMargin]
@@ -910,13 +908,13 @@ export var HyperlinkLinkAddToolbar = /*#__PURE__*/function (_PureComponent) {
910
908
  css: clearTextWrapper
911
909
  }, jsx(Tooltip, {
912
910
  content: formatMessage(messages.clearText)
913
- }, jsx("button", {
914
- type: "button",
915
- css: clearText,
911
+ }, jsx(Pressable, {
912
+ xcss: clearTextButtonStyles,
916
913
  onClick: this.handleClearDisplayText,
917
914
  onKeyDown: this.handleClearTextKeyDown
918
915
  }, jsx(CrossCircleIcon, {
919
- label: formatMessage(messages.clearText)
916
+ label: formatMessage(messages.clearText),
917
+ primaryColor: "var(--ds-icon-subtle, #626F86)"
920
918
  }))))), jsx("div", {
921
919
  css: visuallyHiddenStyles,
922
920
  "aria-live": "polite",
@@ -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 = "82.9.2";
10
+ var packageVersion = "82.10.0";
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
@@ -17,7 +17,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
17
17
  import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
18
18
  import Layer from '../Layer';
19
19
  var packageName = "@atlaskit/editor-common";
20
- var packageVersion = "82.9.2";
20
+ var packageVersion = "82.10.0";
21
21
  var halfFocusRing = 1;
22
22
  var dropOffset = '0, 8';
23
23
  var DropList = /*#__PURE__*/function (_Component) {
@@ -4,7 +4,7 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
4
4
  import type { ExtensionProvider, ReferenceEntity } from '../../../extensions';
5
5
  import type { ProsemirrorGetPosHandler } from '../../../react-node-view';
6
6
  import type { EditorAppearance } from '../../../types';
7
- import type { ExtensionsPluginInjectionAPI } from '../../types';
7
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from '../../types';
8
8
  export interface Props {
9
9
  node: PmNode;
10
10
  getPos: ProsemirrorGetPosHandler;
@@ -16,7 +16,7 @@ export interface Props {
16
16
  hideFrame?: boolean;
17
17
  editorAppearance?: EditorAppearance;
18
18
  pluginInjectionApi: ExtensionsPluginInjectionAPI;
19
- showMacroInteractionDesignUpdates?: boolean;
19
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
20
20
  isNodeSelected?: boolean;
21
21
  isNodeHovered?: boolean;
22
22
  isNodeNested?: boolean;
@@ -2,12 +2,12 @@
2
2
  import React from 'react';
3
3
  import { jsx } from '@emotion/react';
4
4
  import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
5
- import type { ExtensionsPluginInjectionAPI } from '../../types';
5
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from '../../types';
6
6
  export interface Props {
7
7
  node: PmNode;
8
8
  pluginInjectionApi: ExtensionsPluginInjectionAPI;
9
9
  children?: React.ReactNode;
10
- showMacroInteractionDesignUpdates?: boolean;
10
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
11
11
  isNodeSelected?: boolean;
12
12
  isNodeHovered?: boolean;
13
13
  setIsNodeHovered?: (isHovered: boolean) => void;
@@ -6,7 +6,7 @@ import type { ExtensionHandlers, ReferenceEntity } from '../extensions';
6
6
  import { ProviderFactory } from '../provider-factory';
7
7
  import type { ProsemirrorGetPosHandler } from '../react-node-view';
8
8
  import type { EditorAppearance } from '../types';
9
- import type { ExtensionsPluginInjectionAPI } from './types';
9
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from './types';
10
10
  export interface Props {
11
11
  editorView: EditorView;
12
12
  node: PMNode;
@@ -18,7 +18,7 @@ export interface Props {
18
18
  editorAppearance?: EditorAppearance;
19
19
  pluginInjectionApi: ExtensionsPluginInjectionAPI;
20
20
  eventDispatcher?: EventDispatcher;
21
- showMacroInteractionDesignUpdates?: boolean;
21
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
22
22
  }
23
23
  export declare class Extension extends Component<Props, any> {
24
24
  static displayName: string;
@@ -6,7 +6,7 @@ import { getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensio
6
6
  import type { ExtensionHandlers, ExtensionProvider, ReferenceEntity } from '../extensions';
7
7
  import type { ProsemirrorGetPosHandler } from '../react-node-view';
8
8
  import type { EditorAppearance } from '../types';
9
- import type { ExtensionsPluginInjectionAPI } from './types';
9
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from './types';
10
10
  export interface Props {
11
11
  editorView: EditorView;
12
12
  node: PMNode;
@@ -18,7 +18,7 @@ export interface Props {
18
18
  editorAppearance?: EditorAppearance;
19
19
  pluginInjectionApi: ExtensionsPluginInjectionAPI;
20
20
  eventDispatcher?: EventDispatcher;
21
- showMacroInteractionDesignUpdates?: boolean;
21
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
22
22
  }
23
23
  export interface State {
24
24
  extensionProvider?: ExtensionProvider;
@@ -1,10 +1,11 @@
1
1
  /** @jsx jsx */
2
2
  import React from 'react';
3
3
  import { jsx } from '@emotion/react';
4
+ import type { MacroInteractionDesignFeatureFlags } from "./types";
4
5
  type Props = {
5
6
  children: React.ReactNode;
6
7
  nodeType: string;
7
- showMacroInteractionDesignUpdates?: boolean;
8
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
8
9
  };
9
10
  /**
10
11
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
@@ -14,5 +15,5 @@ type Props = {
14
15
  * @param param0
15
16
  * @returns
16
17
  */
17
- export declare const ExtensionNodeWrapper: ({ children, nodeType, showMacroInteractionDesignUpdates, }: Props) => jsx.JSX.Element;
18
+ export declare const ExtensionNodeWrapper: ({ children, nodeType, macroInteractionDesignFeatureFlags, }: Props) => jsx.JSX.Element;
18
19
  export {};
@@ -7,7 +7,7 @@ import type { EventDispatcher } from '../../event-dispatcher';
7
7
  import type { MultiBodiedExtensionActions } from '../../extensions';
8
8
  import type { EditorAppearance } from '../../types';
9
9
  import type { OverflowShadowProps } from '../../ui';
10
- import type { ExtensionsPluginInjectionAPI } from '../types';
10
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from '../types';
11
11
  export type TryExtensionHandlerType = (actions: MultiBodiedExtensionActions | undefined) => React.ReactElement | null;
12
12
  type Props = {
13
13
  node: PmNode;
@@ -18,7 +18,7 @@ type Props = {
18
18
  eventDispatcher?: EventDispatcher;
19
19
  pluginInjectionApi?: ExtensionsPluginInjectionAPI;
20
20
  editorAppearance?: EditorAppearance;
21
- showMacroInteractionDesignUpdates?: boolean;
21
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
22
22
  isNodeSelected?: boolean;
23
23
  isNodeHovered?: boolean;
24
24
  isNodeNested?: boolean;
@@ -9,7 +9,7 @@ import type { ForwardRef, getPosHandler } from '../react-node-view';
9
9
  import ReactNodeView from '../react-node-view';
10
10
  import type { EditorAppearance } from '../types';
11
11
  import type { LegacyPortalProviderAPI } from '../ui/PortalProvider';
12
- import type { ExtensionsPluginInjectionAPI } from './types';
12
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from './types';
13
13
  interface ExtensionNodeViewOptions {
14
14
  appearance?: EditorAppearance;
15
15
  }
@@ -26,8 +26,8 @@ export declare class ExtensionNode extends ReactNodeView {
26
26
  extensionHandlers: ExtensionHandlers;
27
27
  extensionNodeViewOptions?: ExtensionNodeViewOptions;
28
28
  pluginInjectionApi: ExtensionsPluginInjectionAPI;
29
- showMacroInteractionDesignUpdates: boolean;
29
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
30
30
  }, forwardRef: ForwardRef): JSX.Element;
31
31
  }
32
- export default function ExtensionNodeView(portalProviderAPI: LegacyPortalProviderAPI | PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, showMacroInteractionDesignUpdates?: boolean): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
32
+ export default function ExtensionNodeView(portalProviderAPI: LegacyPortalProviderAPI | PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
33
33
  export {};
@@ -3,4 +3,8 @@ type WidthPluginType = NextEditorPlugin<'width', {
3
3
  sharedState: EditorContainerWidth | undefined;
4
4
  }>;
5
5
  export type ExtensionsPluginInjectionAPI = PublicPluginAPI<[WidthPluginType]> | undefined;
6
+ export type MacroInteractionDesignFeatureFlags = {
7
+ showMacroInteractionDesignUpdates?: boolean;
8
+ showMacroButtonUpdates?: boolean;
9
+ };
6
10
  export {};
@@ -269,6 +269,14 @@ export type FeatureFlags = {
269
269
  * @default false
270
270
  */
271
271
  macroInteractionUpdates?: boolean;
272
+ /**
273
+ * @description
274
+ * Enables macro interaction visual button updates
275
+ *
276
+ * @see https://product-fabric.atlassian.net/browse/PGXT-5513
277
+ * @default false
278
+ */
279
+ macroInteractionButtonUpdates?: boolean;
272
280
  /**
273
281
  * @description
274
282
  * Enables bug fix on media comments
@@ -4,7 +4,7 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
4
4
  import type { ExtensionProvider, ReferenceEntity } from '../../../extensions';
5
5
  import type { ProsemirrorGetPosHandler } from '../../../react-node-view';
6
6
  import type { EditorAppearance } from '../../../types';
7
- import type { ExtensionsPluginInjectionAPI } from '../../types';
7
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from '../../types';
8
8
  export interface Props {
9
9
  node: PmNode;
10
10
  getPos: ProsemirrorGetPosHandler;
@@ -16,7 +16,7 @@ export interface Props {
16
16
  hideFrame?: boolean;
17
17
  editorAppearance?: EditorAppearance;
18
18
  pluginInjectionApi: ExtensionsPluginInjectionAPI;
19
- showMacroInteractionDesignUpdates?: boolean;
19
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
20
20
  isNodeSelected?: boolean;
21
21
  isNodeHovered?: boolean;
22
22
  isNodeNested?: boolean;
@@ -2,12 +2,12 @@
2
2
  import React from 'react';
3
3
  import { jsx } from '@emotion/react';
4
4
  import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
5
- import type { ExtensionsPluginInjectionAPI } from '../../types';
5
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from '../../types';
6
6
  export interface Props {
7
7
  node: PmNode;
8
8
  pluginInjectionApi: ExtensionsPluginInjectionAPI;
9
9
  children?: React.ReactNode;
10
- showMacroInteractionDesignUpdates?: boolean;
10
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
11
11
  isNodeSelected?: boolean;
12
12
  isNodeHovered?: boolean;
13
13
  setIsNodeHovered?: (isHovered: boolean) => void;
@@ -6,7 +6,7 @@ import type { ExtensionHandlers, ReferenceEntity } from '../extensions';
6
6
  import { ProviderFactory } from '../provider-factory';
7
7
  import type { ProsemirrorGetPosHandler } from '../react-node-view';
8
8
  import type { EditorAppearance } from '../types';
9
- import type { ExtensionsPluginInjectionAPI } from './types';
9
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from './types';
10
10
  export interface Props {
11
11
  editorView: EditorView;
12
12
  node: PMNode;
@@ -18,7 +18,7 @@ export interface Props {
18
18
  editorAppearance?: EditorAppearance;
19
19
  pluginInjectionApi: ExtensionsPluginInjectionAPI;
20
20
  eventDispatcher?: EventDispatcher;
21
- showMacroInteractionDesignUpdates?: boolean;
21
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
22
22
  }
23
23
  export declare class Extension extends Component<Props, any> {
24
24
  static displayName: string;
@@ -6,7 +6,7 @@ import { getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensio
6
6
  import type { ExtensionHandlers, ExtensionProvider, ReferenceEntity } from '../extensions';
7
7
  import type { ProsemirrorGetPosHandler } from '../react-node-view';
8
8
  import type { EditorAppearance } from '../types';
9
- import type { ExtensionsPluginInjectionAPI } from './types';
9
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from './types';
10
10
  export interface Props {
11
11
  editorView: EditorView;
12
12
  node: PMNode;
@@ -18,7 +18,7 @@ export interface Props {
18
18
  editorAppearance?: EditorAppearance;
19
19
  pluginInjectionApi: ExtensionsPluginInjectionAPI;
20
20
  eventDispatcher?: EventDispatcher;
21
- showMacroInteractionDesignUpdates?: boolean;
21
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
22
22
  }
23
23
  export interface State {
24
24
  extensionProvider?: ExtensionProvider;
@@ -1,10 +1,11 @@
1
1
  /** @jsx jsx */
2
2
  import React from 'react';
3
3
  import { jsx } from '@emotion/react';
4
+ import type { MacroInteractionDesignFeatureFlags } from "./types";
4
5
  type Props = {
5
6
  children: React.ReactNode;
6
7
  nodeType: string;
7
- showMacroInteractionDesignUpdates?: boolean;
8
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
8
9
  };
9
10
  /**
10
11
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
@@ -14,5 +15,5 @@ type Props = {
14
15
  * @param param0
15
16
  * @returns
16
17
  */
17
- export declare const ExtensionNodeWrapper: ({ children, nodeType, showMacroInteractionDesignUpdates, }: Props) => jsx.JSX.Element;
18
+ export declare const ExtensionNodeWrapper: ({ children, nodeType, macroInteractionDesignFeatureFlags, }: Props) => jsx.JSX.Element;
18
19
  export {};
@@ -7,7 +7,7 @@ import type { EventDispatcher } from '../../event-dispatcher';
7
7
  import type { MultiBodiedExtensionActions } from '../../extensions';
8
8
  import type { EditorAppearance } from '../../types';
9
9
  import type { OverflowShadowProps } from '../../ui';
10
- import type { ExtensionsPluginInjectionAPI } from '../types';
10
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from '../types';
11
11
  export type TryExtensionHandlerType = (actions: MultiBodiedExtensionActions | undefined) => React.ReactElement | null;
12
12
  type Props = {
13
13
  node: PmNode;
@@ -18,7 +18,7 @@ type Props = {
18
18
  eventDispatcher?: EventDispatcher;
19
19
  pluginInjectionApi?: ExtensionsPluginInjectionAPI;
20
20
  editorAppearance?: EditorAppearance;
21
- showMacroInteractionDesignUpdates?: boolean;
21
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
22
22
  isNodeSelected?: boolean;
23
23
  isNodeHovered?: boolean;
24
24
  isNodeNested?: boolean;
@@ -9,7 +9,7 @@ import type { ForwardRef, getPosHandler } from '../react-node-view';
9
9
  import ReactNodeView from '../react-node-view';
10
10
  import type { EditorAppearance } from '../types';
11
11
  import type { LegacyPortalProviderAPI } from '../ui/PortalProvider';
12
- import type { ExtensionsPluginInjectionAPI } from './types';
12
+ import type { ExtensionsPluginInjectionAPI, MacroInteractionDesignFeatureFlags } from './types';
13
13
  interface ExtensionNodeViewOptions {
14
14
  appearance?: EditorAppearance;
15
15
  }
@@ -26,8 +26,8 @@ export declare class ExtensionNode extends ReactNodeView {
26
26
  extensionHandlers: ExtensionHandlers;
27
27
  extensionNodeViewOptions?: ExtensionNodeViewOptions;
28
28
  pluginInjectionApi: ExtensionsPluginInjectionAPI;
29
- showMacroInteractionDesignUpdates: boolean;
29
+ macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
30
30
  }, forwardRef: ForwardRef): JSX.Element;
31
31
  }
32
- export default function ExtensionNodeView(portalProviderAPI: LegacyPortalProviderAPI | PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, showMacroInteractionDesignUpdates?: boolean): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
32
+ export default function ExtensionNodeView(portalProviderAPI: LegacyPortalProviderAPI | PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
33
33
  export {};
@@ -5,4 +5,8 @@ type WidthPluginType = NextEditorPlugin<'width', {
5
5
  export type ExtensionsPluginInjectionAPI = PublicPluginAPI<[
6
6
  WidthPluginType
7
7
  ]> | undefined;
8
+ export type MacroInteractionDesignFeatureFlags = {
9
+ showMacroInteractionDesignUpdates?: boolean;
10
+ showMacroButtonUpdates?: boolean;
11
+ };
8
12
  export {};
@@ -269,6 +269,14 @@ export type FeatureFlags = {
269
269
  * @default false
270
270
  */
271
271
  macroInteractionUpdates?: boolean;
272
+ /**
273
+ * @description
274
+ * Enables macro interaction visual button updates
275
+ *
276
+ * @see https://product-fabric.atlassian.net/browse/PGXT-5513
277
+ * @default false
278
+ */
279
+ macroInteractionButtonUpdates?: boolean;
272
280
  /**
273
281
  * @description
274
282
  * Enables bug fix on media comments
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-common",
3
- "version": "82.9.2",
3
+ "version": "82.10.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/"
@@ -102,7 +102,7 @@
102
102
  "@atlaskit/analytics-namespaced-context": "^6.10.0",
103
103
  "@atlaskit/analytics-next": "^9.3.0",
104
104
  "@atlaskit/analytics-next-stable-react-context": "1.0.1",
105
- "@atlaskit/button": "^17.22.0",
105
+ "@atlaskit/button": "^17.23.0",
106
106
  "@atlaskit/code": "^15.3.0",
107
107
  "@atlaskit/codemod-utils": "^4.2.0",
108
108
  "@atlaskit/custom-steps": "^0.2.0",
@@ -135,7 +135,7 @@
135
135
  "@atlaskit/spinner": "^16.2.0",
136
136
  "@atlaskit/task-decision": "^17.10.0",
137
137
  "@atlaskit/textfield": "^6.4.0",
138
- "@atlaskit/theme": "^12.10.0",
138
+ "@atlaskit/theme": "^12.11.0",
139
139
  "@atlaskit/tokens": "^1.51.0",
140
140
  "@atlaskit/tooltip": "^18.5.0",
141
141
  "@atlaskit/ufo": "^0.2.0",