@atlaskit/renderer 121.1.0 → 121.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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,24 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 121.2.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`d9be3a6937275`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d9be3a6937275) -
8
+ Add the list of ancestor node types to the result of applyAnnotation, to make it easier to debug
9
+ comments errors
10
+
11
+ ### Patch Changes
12
+
13
+ - Updated dependencies
14
+
15
+ ## 121.1.1
16
+
17
+ ### Patch Changes
18
+
19
+ - [`3ab04666dacdf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3ab04666dacdf) -
20
+ fix inline style for plain text inline extension macro
21
+
3
22
  ## 121.1.0
4
23
 
5
24
  ### Minor Changes
@@ -3,6 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
+ exports.getRendererRangeAncestorNodeNames = getRendererRangeAncestorNodeNames;
6
7
  exports.getRendererRangeInlineNodeNames = getRendererRangeInlineNodeNames;
7
8
  var _utils = require("@atlaskit/editor-common/utils");
8
9
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -21,4 +22,20 @@ function getRendererRangeInlineNodeNames(_ref) {
21
22
  pos: pos
22
23
  });
23
24
  return inlineNodeNames;
25
+ }
26
+ function getRendererRangeAncestorNodeNames(_ref2) {
27
+ var actions = _ref2.actions,
28
+ pos = _ref2.pos;
29
+ if (!(0, _platformFeatureFlags.fg)('cc_comments_create_inline_experience_entry_point')) {
30
+ return undefined;
31
+ }
32
+ var doc = actions.doc;
33
+ if (!pos || !doc) {
34
+ return undefined;
35
+ }
36
+ var ancestorNodeNames = (0, _utils.getRangeAncestorNodeNames)({
37
+ doc: doc,
38
+ pos: pos
39
+ });
40
+ return ancestorNodeNames;
24
41
  }
@@ -345,6 +345,13 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
345
345
  to: to
346
346
  }
347
347
  }),
348
+ ancestorNodeTypes: (0, _getRendererRangeInlineNodeNames.getRendererRangeAncestorNodeNames)({
349
+ actions: this,
350
+ pos: {
351
+ from: from,
352
+ to: to
353
+ }
354
+ }),
348
355
  originalSelection: originalSelection,
349
356
  numMatches: numMatches,
350
357
  matchIndex: matchIndex,
@@ -17,7 +17,6 @@ var _react = _interopRequireWildcard(require("react"));
17
17
  var _mediaCard = require("@atlaskit/media-card");
18
18
  var _mediaFilmstrip = require("@atlaskit/media-filmstrip");
19
19
  var _vcMedia = require("@atlaskit/react-ufo/vc-media");
20
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
21
20
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
22
21
  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; }
23
22
  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; }
@@ -74,7 +73,6 @@ var MediaGroup = exports.default = /*#__PURE__*/function (_PureComponent) {
74
73
  value: function render() {
75
74
  var numChildren = _react.default.Children.count(this.props.children);
76
75
  var content;
77
- var mediaGroupProps = (0, _platformFeatureFlags.fg)('platform_editor_fix_vc90_bug_with_files') ? _vcMedia.VcMediaWrapperProps : {};
78
76
  if (numChildren === 1) {
79
77
  // Ignored via go/ees005
80
78
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -94,7 +92,7 @@ var MediaGroup = exports.default = /*#__PURE__*/function (_PureComponent) {
94
92
  }
95
93
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
96
94
  className: "MediaGroup"
97
- }, mediaGroupProps), content));
95
+ }, _vcMedia.VcMediaWrapperProps), content));
98
96
  }
99
97
  }, {
100
98
  key: "renderSingleFile",
@@ -13,6 +13,7 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
13
13
  var _extensions = require("@atlaskit/editor-common/extensions");
14
14
  var _providerFactory = require("@atlaskit/editor-common/provider-factory");
15
15
  var _utils = require("@atlaskit/editor-common/utils");
16
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
16
17
  /**
17
18
  * @jsxRuntime classic
18
19
  * @jsx jsx
@@ -36,6 +37,14 @@ var inlineExtensionStyle = (0, _react.css)({
36
37
  maxWidth: '100%'
37
38
  }
38
39
  });
40
+ var plainTextMacroStyle = (0, _react.css)({
41
+ display: 'inline',
42
+ verticalAlign: 'baseline',
43
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
44
+ '[data-macro-body]': {
45
+ display: 'inline'
46
+ }
47
+ });
39
48
  function ExtensionRenderer(props) {
40
49
  var extensionHandlers = props.extensionHandlers,
41
50
  rendererContext = props.rendererContext,
@@ -68,7 +77,7 @@ function ExtensionRenderer(props) {
68
77
  });
69
78
  }, []);
70
79
  var renderExtensionNode = _react2.default.useCallback(function (extensionProvider) {
71
- var _marks$find;
80
+ var _marks$find, _node$parameters;
72
81
  var fragmentLocalId = marks === null || marks === void 0 || (_marks$find = marks.find(function (m) {
73
82
  return m.type.name === 'fragment';
74
83
  })) === null || _marks$find === void 0 || (_marks$find = _marks$find.attrs) === null || _marks$find === void 0 ? void 0 : _marks$find.localId;
@@ -81,6 +90,7 @@ function ExtensionRenderer(props) {
81
90
  localId: localId,
82
91
  fragmentLocalId: fragmentLocalId
83
92
  };
93
+ var isPlainTextMacro = Boolean(node === null || node === void 0 || (_node$parameters = node.parameters) === null || _node$parameters === void 0 || (_node$parameters = _node$parameters.macroParams) === null || _node$parameters === void 0 ? void 0 : _node$parameters.__bodyContent);
84
94
  var result = null;
85
95
  try {
86
96
  if (extensionHandlers && extensionHandlers[extensionType]) {
@@ -95,9 +105,17 @@ function ExtensionRenderer(props) {
95
105
  actions: actions
96
106
  });
97
107
  } else if (node.type === 'inlineExtension') {
98
- result = (0, _react.jsx)(InlineNodeRendererWrapper, null, (0, _react.jsx)(NodeRenderer, {
99
- node: node
100
- }));
108
+ if ((0, _platformFeatureFlags.fg)('platform_editor_renderer_inline_extension_improve')) {
109
+ result = (0, _react.jsx)(InlineNodeRendererWrapper, {
110
+ isPlainTextMacro: isPlainTextMacro
111
+ }, (0, _react.jsx)(NodeRenderer, {
112
+ node: node
113
+ }));
114
+ } else {
115
+ result = (0, _react.jsx)(InlineNodeRendererWrapper, null, (0, _react.jsx)(NodeRenderer, {
116
+ node: node
117
+ }));
118
+ }
101
119
  } else {
102
120
  result = (0, _react.jsx)(NodeRenderer, {
103
121
  node: node
@@ -135,12 +153,13 @@ function ExtensionRenderer(props) {
135
153
  }
136
154
  var InlineNodeRendererWrapper = exports.InlineNodeRendererWrapper = function InlineNodeRendererWrapper(_ref) {
137
155
  var children = _ref.children,
156
+ isPlainTextMacro = _ref.isPlainTextMacro,
138
157
  ssrPlaceholder = _ref.ssrPlaceholder,
139
158
  ssrPlaceholderReplace = _ref.ssrPlaceholderReplace;
140
159
  return (0, _react.jsx)("div", {
141
160
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
142
- className: "inline-extension-renderer",
143
- css: inlineExtensionStyle,
161
+ className: "inline-extension-renderer ".concat(isPlainTextMacro ? 'plain-text-macro' : ''),
162
+ css: [inlineExtensionStyle, isPlainTextMacro && plainTextMacroStyle],
144
163
  "data-ssr-placeholder": ssrPlaceholder,
145
164
  "data-ssr-placeholder-replace": ssrPlaceholderReplace
146
165
  }, children);
@@ -63,7 +63,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
63
63
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
64
64
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
65
65
  var packageName = "@atlaskit/renderer";
66
- var packageVersion = "121.0.2";
66
+ var packageVersion = "0.0.0-development";
67
67
  var setAsQueryContainerStyles = (0, _react2.css)({
68
68
  containerName: 'ak-renderer-wrapper',
69
69
  containerType: 'inline-size'
@@ -1,4 +1,4 @@
1
- import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
1
+ import { getRangeInlineNodeNames, getRangeAncestorNodeNames } from '@atlaskit/editor-common/utils';
2
2
  import { fg } from '@atlaskit/platform-feature-flags';
3
3
  export function getRendererRangeInlineNodeNames({
4
4
  actions,
@@ -18,4 +18,23 @@ export function getRendererRangeInlineNodeNames({
18
18
  pos
19
19
  });
20
20
  return inlineNodeNames;
21
+ }
22
+ export function getRendererRangeAncestorNodeNames({
23
+ actions,
24
+ pos
25
+ }) {
26
+ if (!fg('cc_comments_create_inline_experience_entry_point')) {
27
+ return undefined;
28
+ }
29
+ const {
30
+ doc
31
+ } = actions;
32
+ if (!pos || !doc) {
33
+ return undefined;
34
+ }
35
+ const ancestorNodeNames = getRangeAncestorNodeNames({
36
+ doc,
37
+ pos
38
+ });
39
+ return ancestorNodeNames;
21
40
  }
@@ -7,7 +7,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
7
7
  import { AddNodeMarkStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
8
8
  import { fg } from '@atlaskit/platform-feature-flags';
9
9
  import { createAnnotationStep, getPosFromRange } from '../steps';
10
- import { getRendererRangeInlineNodeNames } from './get-renderer-range-inline-node-names';
10
+ import { getRendererRangeInlineNodeNames, getRendererRangeAncestorNodeNames } from './get-renderer-range-inline-node-names';
11
11
  import { getIndexMatch } from './matches-utils';
12
12
  export default class RendererActions {
13
13
  // Any kind of refence is allowed
@@ -323,6 +323,13 @@ export default class RendererActions {
323
323
  to
324
324
  }
325
325
  }),
326
+ ancestorNodeTypes: getRendererRangeAncestorNodeNames({
327
+ actions: this,
328
+ pos: {
329
+ from,
330
+ to
331
+ }
332
+ }),
326
333
  originalSelection,
327
334
  numMatches,
328
335
  matchIndex,
@@ -4,7 +4,6 @@ import React, { PureComponent } from 'react';
4
4
  import { defaultImageCardDimensions } from '@atlaskit/media-card';
5
5
  import { FilmstripView } from '@atlaskit/media-filmstrip';
6
6
  import { VcMediaWrapperProps } from '@atlaskit/react-ufo/vc-media';
7
- import { fg } from '@atlaskit/platform-feature-flags';
8
7
  // Ignored via go/ees005
9
8
  // eslint-disable-next-line @repo/internal/react/no-class-components
10
9
  export default class MediaGroup extends PureComponent {
@@ -42,7 +41,6 @@ export default class MediaGroup extends PureComponent {
42
41
  render() {
43
42
  const numChildren = React.Children.count(this.props.children);
44
43
  let content;
45
- const mediaGroupProps = fg('platform_editor_fix_vc90_bug_with_files') ? VcMediaWrapperProps : {};
46
44
  if (numChildren === 1) {
47
45
  // Ignored via go/ees005
48
46
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -62,7 +60,7 @@ export default class MediaGroup extends PureComponent {
62
60
  }
63
61
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", _extends({
64
62
  className: "MediaGroup"
65
- }, mediaGroupProps), content));
63
+ }, VcMediaWrapperProps), content));
66
64
  }
67
65
  renderSingleFile(child) {
68
66
  return /*#__PURE__*/React.cloneElement(child, {
@@ -9,6 +9,7 @@ import memoizeOne from 'memoize-one';
9
9
  import { getNodeRenderer } from '@atlaskit/editor-common/extensions';
10
10
  import { WithProviders } from '@atlaskit/editor-common/provider-factory';
11
11
  import { getExtensionRenderer } from '@atlaskit/editor-common/utils';
12
+ import { fg } from '@atlaskit/platform-feature-flags';
12
13
  const inlineExtensionStyle = css({
13
14
  display: 'inline-block',
14
15
  maxWidth: '100%',
@@ -26,6 +27,14 @@ const inlineExtensionStyle = css({
26
27
  maxWidth: '100%'
27
28
  }
28
29
  });
30
+ const plainTextMacroStyle = css({
31
+ display: 'inline',
32
+ verticalAlign: 'baseline',
33
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
34
+ '[data-macro-body]': {
35
+ display: 'inline'
36
+ }
37
+ });
29
38
  export default function ExtensionRenderer(props) {
30
39
  const {
31
40
  extensionHandlers,
@@ -55,7 +64,7 @@ export default function ExtensionRenderer(props) {
55
64
  });
56
65
  }, []);
57
66
  const renderExtensionNode = React.useCallback(extensionProvider => {
58
- var _marks$find, _marks$find$attrs;
67
+ var _marks$find, _marks$find$attrs, _node$parameters, _node$parameters$macr;
59
68
  const fragmentLocalId = marks === null || marks === void 0 ? void 0 : (_marks$find = marks.find(m => m.type.name === 'fragment')) === null || _marks$find === void 0 ? void 0 : (_marks$find$attrs = _marks$find.attrs) === null || _marks$find$attrs === void 0 ? void 0 : _marks$find$attrs.localId;
60
69
  const node = {
61
70
  type,
@@ -66,6 +75,7 @@ export default function ExtensionRenderer(props) {
66
75
  localId,
67
76
  fragmentLocalId
68
77
  };
78
+ const isPlainTextMacro = Boolean(node === null || node === void 0 ? void 0 : (_node$parameters = node.parameters) === null || _node$parameters === void 0 ? void 0 : (_node$parameters$macr = _node$parameters.macroParams) === null || _node$parameters$macr === void 0 ? void 0 : _node$parameters$macr.__bodyContent);
69
79
  let result = null;
70
80
  try {
71
81
  if (extensionHandlers && extensionHandlers[extensionType]) {
@@ -80,9 +90,17 @@ export default function ExtensionRenderer(props) {
80
90
  actions: actions
81
91
  });
82
92
  } else if (node.type === 'inlineExtension') {
83
- result = jsx(InlineNodeRendererWrapper, null, jsx(NodeRenderer, {
84
- node: node
85
- }));
93
+ if (fg('platform_editor_renderer_inline_extension_improve')) {
94
+ result = jsx(InlineNodeRendererWrapper, {
95
+ isPlainTextMacro: isPlainTextMacro
96
+ }, jsx(NodeRenderer, {
97
+ node: node
98
+ }));
99
+ } else {
100
+ result = jsx(InlineNodeRendererWrapper, null, jsx(NodeRenderer, {
101
+ node: node
102
+ }));
103
+ }
86
104
  } else {
87
105
  result = jsx(NodeRenderer, {
88
106
  node: node
@@ -120,13 +138,14 @@ export default function ExtensionRenderer(props) {
120
138
  }
121
139
  export const InlineNodeRendererWrapper = ({
122
140
  children,
141
+ isPlainTextMacro,
123
142
  ssrPlaceholder,
124
143
  ssrPlaceholderReplace
125
144
  }) => {
126
145
  return jsx("div", {
127
146
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
128
- className: "inline-extension-renderer",
129
- css: inlineExtensionStyle,
147
+ className: `inline-extension-renderer ${isPlainTextMacro ? 'plain-text-macro' : ''}`,
148
+ css: [inlineExtensionStyle, isPlainTextMacro && plainTextMacroStyle],
130
149
  "data-ssr-placeholder": ssrPlaceholder,
131
150
  "data-ssr-placeholder-replace": ssrPlaceholderReplace
132
151
  }, children);
@@ -49,7 +49,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
49
49
  export const NORMAL_SEVERITY_THRESHOLD = 2000;
50
50
  export const DEGRADED_SEVERITY_THRESHOLD = 3000;
51
51
  const packageName = "@atlaskit/renderer";
52
- const packageVersion = "121.0.2";
52
+ const packageVersion = "0.0.0-development";
53
53
  const setAsQueryContainerStyles = css({
54
54
  containerName: 'ak-renderer-wrapper',
55
55
  containerType: 'inline-size'
@@ -1,4 +1,4 @@
1
- import { getRangeInlineNodeNames } from '@atlaskit/editor-common/utils';
1
+ import { getRangeInlineNodeNames, getRangeAncestorNodeNames } from '@atlaskit/editor-common/utils';
2
2
  import { fg } from '@atlaskit/platform-feature-flags';
3
3
  export function getRendererRangeInlineNodeNames(_ref) {
4
4
  var actions = _ref.actions,
@@ -15,4 +15,20 @@ export function getRendererRangeInlineNodeNames(_ref) {
15
15
  pos: pos
16
16
  });
17
17
  return inlineNodeNames;
18
+ }
19
+ export function getRendererRangeAncestorNodeNames(_ref2) {
20
+ var actions = _ref2.actions,
21
+ pos = _ref2.pos;
22
+ if (!fg('cc_comments_create_inline_experience_entry_point')) {
23
+ return undefined;
24
+ }
25
+ var doc = actions.doc;
26
+ if (!pos || !doc) {
27
+ return undefined;
28
+ }
29
+ var ancestorNodeNames = getRangeAncestorNodeNames({
30
+ doc: doc,
31
+ pos: pos
32
+ });
33
+ return ancestorNodeNames;
18
34
  }
@@ -12,7 +12,7 @@ import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit
12
12
  import { AddNodeMarkStep, RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
13
13
  import { fg } from '@atlaskit/platform-feature-flags';
14
14
  import { createAnnotationStep, getPosFromRange } from '../steps';
15
- import { getRendererRangeInlineNodeNames } from './get-renderer-range-inline-node-names';
15
+ import { getRendererRangeInlineNodeNames, getRendererRangeAncestorNodeNames } from './get-renderer-range-inline-node-names';
16
16
  import { getIndexMatch } from './matches-utils';
17
17
  var RendererActions = /*#__PURE__*/function () {
18
18
  // Any kind of refence is allowed
@@ -338,6 +338,13 @@ var RendererActions = /*#__PURE__*/function () {
338
338
  to: to
339
339
  }
340
340
  }),
341
+ ancestorNodeTypes: getRendererRangeAncestorNodeNames({
342
+ actions: this,
343
+ pos: {
344
+ from: from,
345
+ to: to
346
+ }
347
+ }),
341
348
  originalSelection: originalSelection,
342
349
  numMatches: numMatches,
343
350
  matchIndex: matchIndex,
@@ -13,7 +13,6 @@ import React, { PureComponent } from 'react';
13
13
  import { defaultImageCardDimensions } from '@atlaskit/media-card';
14
14
  import { FilmstripView } from '@atlaskit/media-filmstrip';
15
15
  import { VcMediaWrapperProps } from '@atlaskit/react-ufo/vc-media';
16
- import { fg } from '@atlaskit/platform-feature-flags';
17
16
  // Ignored via go/ees005
18
17
  // eslint-disable-next-line @repo/internal/react/no-class-components
19
18
  var MediaGroup = /*#__PURE__*/function (_PureComponent) {
@@ -65,7 +64,6 @@ var MediaGroup = /*#__PURE__*/function (_PureComponent) {
65
64
  value: function render() {
66
65
  var numChildren = React.Children.count(this.props.children);
67
66
  var content;
68
- var mediaGroupProps = fg('platform_editor_fix_vc90_bug_with_files') ? VcMediaWrapperProps : {};
69
67
  if (numChildren === 1) {
70
68
  // Ignored via go/ees005
71
69
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -85,7 +83,7 @@ var MediaGroup = /*#__PURE__*/function (_PureComponent) {
85
83
  }
86
84
  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", _extends({
87
85
  className: "MediaGroup"
88
- }, mediaGroupProps), content));
86
+ }, VcMediaWrapperProps), content));
89
87
  }
90
88
  }, {
91
89
  key: "renderSingleFile",
@@ -10,6 +10,7 @@ import memoizeOne from 'memoize-one';
10
10
  import { getNodeRenderer } from '@atlaskit/editor-common/extensions';
11
11
  import { WithProviders } from '@atlaskit/editor-common/provider-factory';
12
12
  import { getExtensionRenderer } from '@atlaskit/editor-common/utils';
13
+ import { fg } from '@atlaskit/platform-feature-flags';
13
14
  var inlineExtensionStyle = css({
14
15
  display: 'inline-block',
15
16
  maxWidth: '100%',
@@ -27,6 +28,14 @@ var inlineExtensionStyle = css({
27
28
  maxWidth: '100%'
28
29
  }
29
30
  });
31
+ var plainTextMacroStyle = css({
32
+ display: 'inline',
33
+ verticalAlign: 'baseline',
34
+ // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
35
+ '[data-macro-body]': {
36
+ display: 'inline'
37
+ }
38
+ });
30
39
  export default function ExtensionRenderer(props) {
31
40
  var extensionHandlers = props.extensionHandlers,
32
41
  rendererContext = props.rendererContext,
@@ -59,7 +68,7 @@ export default function ExtensionRenderer(props) {
59
68
  });
60
69
  }, []);
61
70
  var renderExtensionNode = React.useCallback(function (extensionProvider) {
62
- var _marks$find;
71
+ var _marks$find, _node$parameters;
63
72
  var fragmentLocalId = marks === null || marks === void 0 || (_marks$find = marks.find(function (m) {
64
73
  return m.type.name === 'fragment';
65
74
  })) === null || _marks$find === void 0 || (_marks$find = _marks$find.attrs) === null || _marks$find === void 0 ? void 0 : _marks$find.localId;
@@ -72,6 +81,7 @@ export default function ExtensionRenderer(props) {
72
81
  localId: localId,
73
82
  fragmentLocalId: fragmentLocalId
74
83
  };
84
+ var isPlainTextMacro = Boolean(node === null || node === void 0 || (_node$parameters = node.parameters) === null || _node$parameters === void 0 || (_node$parameters = _node$parameters.macroParams) === null || _node$parameters === void 0 ? void 0 : _node$parameters.__bodyContent);
75
85
  var result = null;
76
86
  try {
77
87
  if (extensionHandlers && extensionHandlers[extensionType]) {
@@ -86,9 +96,17 @@ export default function ExtensionRenderer(props) {
86
96
  actions: actions
87
97
  });
88
98
  } else if (node.type === 'inlineExtension') {
89
- result = jsx(InlineNodeRendererWrapper, null, jsx(NodeRenderer, {
90
- node: node
91
- }));
99
+ if (fg('platform_editor_renderer_inline_extension_improve')) {
100
+ result = jsx(InlineNodeRendererWrapper, {
101
+ isPlainTextMacro: isPlainTextMacro
102
+ }, jsx(NodeRenderer, {
103
+ node: node
104
+ }));
105
+ } else {
106
+ result = jsx(InlineNodeRendererWrapper, null, jsx(NodeRenderer, {
107
+ node: node
108
+ }));
109
+ }
92
110
  } else {
93
111
  result = jsx(NodeRenderer, {
94
112
  node: node
@@ -126,12 +144,13 @@ export default function ExtensionRenderer(props) {
126
144
  }
127
145
  export var InlineNodeRendererWrapper = function InlineNodeRendererWrapper(_ref) {
128
146
  var children = _ref.children,
147
+ isPlainTextMacro = _ref.isPlainTextMacro,
129
148
  ssrPlaceholder = _ref.ssrPlaceholder,
130
149
  ssrPlaceholderReplace = _ref.ssrPlaceholderReplace;
131
150
  return jsx("div", {
132
151
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
133
- className: "inline-extension-renderer",
134
- css: inlineExtensionStyle,
152
+ className: "inline-extension-renderer ".concat(isPlainTextMacro ? 'plain-text-macro' : ''),
153
+ css: [inlineExtensionStyle, isPlainTextMacro && plainTextMacroStyle],
135
154
  "data-ssr-placeholder": ssrPlaceholder,
136
155
  "data-ssr-placeholder-replace": ssrPlaceholderReplace
137
156
  }, children);
@@ -54,7 +54,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
54
54
  export var NORMAL_SEVERITY_THRESHOLD = 2000;
55
55
  export var DEGRADED_SEVERITY_THRESHOLD = 3000;
56
56
  var packageName = "@atlaskit/renderer";
57
- var packageVersion = "121.0.2";
57
+ var packageVersion = "0.0.0-development";
58
58
  var setAsQueryContainerStyles = css({
59
59
  containerName: 'ak-renderer-wrapper',
60
60
  containerType: 'inline-size'
@@ -10,3 +10,14 @@ export declare function getRendererRangeInlineNodeNames({ actions, pos, }: {
10
10
  to: number;
11
11
  } | false;
12
12
  }): string[] | undefined;
13
+ export declare function getRendererRangeAncestorNodeNames({ actions, pos, }: {
14
+ actions: RendererActions;
15
+ /**
16
+ * documentPosition is caclulated by `actions.getPositionFromRange`
17
+ * where `false` means that the selection is not able to be calculated.
18
+ */
19
+ pos?: {
20
+ from: number;
21
+ to: number;
22
+ } | false;
23
+ }): string[] | undefined;
@@ -28,7 +28,8 @@ interface Props {
28
28
  type: 'extension' | 'inlineExtension' | 'bodiedExtension' | 'multiBodiedExtension';
29
29
  }
30
30
  export default function ExtensionRenderer(props: Props): JSX.Element;
31
- export declare const InlineNodeRendererWrapper: ({ children, ssrPlaceholder, ssrPlaceholderReplace, }: React.PropsWithChildren<{
31
+ export declare const InlineNodeRendererWrapper: ({ children, isPlainTextMacro, ssrPlaceholder, ssrPlaceholderReplace, }: React.PropsWithChildren<{
32
+ isPlainTextMacro?: boolean;
32
33
  ssrPlaceholder?: string;
33
34
  ssrPlaceholderReplace?: string;
34
35
  }>) => jsx.JSX.Element;
@@ -10,3 +10,14 @@ export declare function getRendererRangeInlineNodeNames({ actions, pos, }: {
10
10
  to: number;
11
11
  } | false;
12
12
  }): string[] | undefined;
13
+ export declare function getRendererRangeAncestorNodeNames({ actions, pos, }: {
14
+ actions: RendererActions;
15
+ /**
16
+ * documentPosition is caclulated by `actions.getPositionFromRange`
17
+ * where `false` means that the selection is not able to be calculated.
18
+ */
19
+ pos?: {
20
+ from: number;
21
+ to: number;
22
+ } | false;
23
+ }): string[] | undefined;
@@ -28,7 +28,8 @@ interface Props {
28
28
  type: 'extension' | 'inlineExtension' | 'bodiedExtension' | 'multiBodiedExtension';
29
29
  }
30
30
  export default function ExtensionRenderer(props: Props): JSX.Element;
31
- export declare const InlineNodeRendererWrapper: ({ children, ssrPlaceholder, ssrPlaceholderReplace, }: React.PropsWithChildren<{
31
+ export declare const InlineNodeRendererWrapper: ({ children, isPlainTextMacro, ssrPlaceholder, ssrPlaceholderReplace, }: React.PropsWithChildren<{
32
+ isPlainTextMacro?: boolean;
32
33
  ssrPlaceholder?: string;
33
34
  ssrPlaceholderReplace?: string;
34
35
  }>) => jsx.JSX.Element;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "121.1.0",
3
+ "version": "121.2.0",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -50,12 +50,12 @@
50
50
  "@atlaskit/platform-feature-flags": "^1.1.0",
51
51
  "@atlaskit/platform-feature-flags-react": "^0.3.0",
52
52
  "@atlaskit/react-ufo": "^4.5.0",
53
- "@atlaskit/smart-card": "^40.18.0",
53
+ "@atlaskit/smart-card": "^40.20.0",
54
54
  "@atlaskit/status": "^3.0.0",
55
55
  "@atlaskit/task-decision": "^19.2.0",
56
56
  "@atlaskit/theme": "^20.0.0",
57
- "@atlaskit/tmp-editor-statsig": "^12.3.0",
58
- "@atlaskit/tokens": "^6.1.0",
57
+ "@atlaskit/tmp-editor-statsig": "^12.5.0",
58
+ "@atlaskit/tokens": "^6.2.0",
59
59
  "@atlaskit/tooltip": "^20.4.0",
60
60
  "@atlaskit/visually-hidden": "^3.0.0",
61
61
  "@babel/runtime": "^7.0.0",
@@ -68,7 +68,7 @@
68
68
  "uuid": "^3.1.0"
69
69
  },
70
70
  "peerDependencies": {
71
- "@atlaskit/editor-common": "^108.1.0",
71
+ "@atlaskit/editor-common": "^108.4.0",
72
72
  "@atlaskit/link-provider": "^3.7.0",
73
73
  "@atlaskit/media-core": "^37.0.0",
74
74
  "react": "^18.2.0",
@@ -128,6 +128,9 @@
128
128
  "cc_comments_improve_apply_draft_errors": {
129
129
  "type": "boolean"
130
130
  },
131
+ "cc_comments_create_inline_experience_entry_point": {
132
+ "type": "boolean"
133
+ },
131
134
  "platform-ssr-table-resize": {
132
135
  "type": "boolean"
133
136
  },
@@ -158,9 +161,6 @@
158
161
  "confluence-frontend-comments-panel": {
159
162
  "type": "boolean"
160
163
  },
161
- "platform_editor_fix_vc90_bug_with_files": {
162
- "type": "boolean"
163
- },
164
164
  "use_comments_data_annotation_updater": {
165
165
  "type": "boolean"
166
166
  },
@@ -257,6 +257,9 @@
257
257
  "platform_editor_numbered_column_in_include": {
258
258
  "type": "boolean"
259
259
  },
260
+ "platform_editor_renderer_inline_extension_improve": {
261
+ "type": "boolean"
262
+ },
260
263
  "jfp-magma-ssr-iv-editor-media": {
261
264
  "type": "boolean"
262
265
  },