@atlaskit/renderer 136.1.7 → 136.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,27 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 136.2.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [`67cb56528e699`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/67cb56528e699) -
8
+ Add emojiProviderLookupOrder as an optional override for the shortName-only emoji lookup priority
9
+ - [`d82e6f76528ab`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d82e6f76528ab) -
10
+ Add direct subpath package exports as part of the linking-platform, search, media, and
11
+ design-system barrel-removal (de-barrel) migration.
12
+
13
+ These packages now expose their individual modules via explicit `package.json` `exports` subpaths
14
+ so that consumers can import directly from the leaf module (e.g. `@atlaskit/pkg/thing`) instead of
15
+ the package barrel/index. This adds new public entry points without changing or removing any
16
+ existing exports, so it is a backwards-compatible additive change.
17
+
18
+ No runtime behaviour changes; this is an API-surface (entry-point) addition to support
19
+ tree-shaking and to unblock removal of the barrel index files.
20
+
21
+ ### Patch Changes
22
+
23
+ - Updated dependencies
24
+
3
25
  ## 136.1.7
4
26
 
5
27
  ### Patch Changes
@@ -49,6 +49,9 @@
49
49
  {
50
50
  "path": "../../../design-system/css/afm-cc/tsconfig.json"
51
51
  },
52
+ {
53
+ "path": "../../editor-card-provider/afm-cc/tsconfig.json"
54
+ },
52
55
  {
53
56
  "path": "../../editor-json-transformer/afm-cc/tsconfig.json"
54
57
  },
@@ -49,6 +49,9 @@
49
49
  {
50
50
  "path": "../../../design-system/css/afm-products/tsconfig.json"
51
51
  },
52
+ {
53
+ "path": "../../editor-card-provider/afm-products/tsconfig.json"
54
+ },
52
55
  {
53
56
  "path": "../../editor-json-transformer/afm-products/tsconfig.json"
54
57
  },
@@ -213,6 +213,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
213
213
  this.surroundTextNodesWithTextWrapper = Boolean(init.surroundTextNodesWithTextWrapper);
214
214
  this.media = init.media;
215
215
  this.mentionNodeDataProvider = init.mentionNodeDataProvider;
216
+ this.emojiProviderLookupOrder = init.emojiProviderLookupOrder;
216
217
  this.emojiResourceConfig = init.emojiResourceConfig;
217
218
  this.smartLinks = init.smartLinks;
218
219
  this.extensionViewportSizes = init.extensionViewportSizes;
@@ -563,6 +564,7 @@ var ReactSerializer = exports.default = /*#__PURE__*/function () {
563
564
  value: function getEmojiProps(node) {
564
565
  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
565
566
  return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
567
+ emojiProviderLookupOrder: (0, _platformFeatureFlags.fg)('platform_bitbucket_fix_shortname_and_ordering') ? this.emojiProviderLookupOrder : undefined,
566
568
  resourceConfig: this.emojiResourceConfig
567
569
  });
568
570
  }
@@ -53,6 +53,7 @@ var EmojiNode = /*#__PURE__*/function (_PureComponent) {
53
53
  fallback = _this$props.fallback,
54
54
  fitToHeight = _this$props.fitToHeight,
55
55
  showTooltip = _this$props.showTooltip,
56
+ emojiProviderLookupOrder = _this$props.emojiProviderLookupOrder,
56
57
  resourceConfig = _this$props.resourceConfig;
57
58
  if (allowTextFallback && !providers.emojiProvider) {
58
59
  // When the gate is enabled and the fallback text is not a single
@@ -84,6 +85,7 @@ var EmojiNode = /*#__PURE__*/function (_PureComponent) {
84
85
  fallback: fallback,
85
86
  shortName: shortName
86
87
  },
88
+ emojiProviderLookupOrder: emojiProviderLookupOrder,
87
89
  emojiProvider: providers.emojiProvider,
88
90
  showTooltip: showTooltip,
89
91
  fitToHeight: fitToHeight,
@@ -135,6 +137,7 @@ var EmojiItemComponent = exports.EmojiItemComponent = function EmojiItemComponen
135
137
  shortName = props.shortName,
136
138
  text = props.text,
137
139
  fitToHeight = props.fitToHeight,
140
+ emojiProviderLookupOrder = props.emojiProviderLookupOrder,
138
141
  resourceConfig = props.resourceConfig;
139
142
  var inlineAnnotationProps = (0, _useInlineAnnotationProps.useInlineAnnotationProps)(props);
140
143
  if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
@@ -148,6 +151,7 @@ var EmojiItemComponent = exports.EmojiItemComponent = function EmojiItemComponen
148
151
  fallback: text,
149
152
  providers: providers,
150
153
  fitToHeight: fitToHeight,
154
+ emojiProviderLookupOrder: emojiProviderLookupOrder,
151
155
  resourceConfig: resourceConfig
152
156
  }))
153
157
  );
@@ -159,6 +163,7 @@ var EmojiItemComponent = exports.EmojiItemComponent = function EmojiItemComponen
159
163
  fallback: text,
160
164
  providers: providers,
161
165
  fitToHeight: fitToHeight,
166
+ emojiProviderLookupOrder: emojiProviderLookupOrder,
162
167
  resourceConfig: resourceConfig
163
168
  });
164
169
  };
@@ -179,13 +179,12 @@ var _table = _interopRequireDefault(require("./table"));
179
179
  var _tableCell = require("./tableCell");
180
180
  var _tableRow = _interopRequireDefault(require("./tableRow"));
181
181
  var _unknownBlock = _interopRequireDefault(require("./unknownBlock"));
182
- var _nodes = require("./nodes");
183
- var _isExperimentEnabled = require("@atlaskit/platform-feature-experiments/is-experiment-enabled");
184
182
  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; }
185
183
  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; }
186
184
  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" != (0, _typeof2.default)(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); } /* eslint-disable @atlaskit/editor/no-re-export */ // Mapping file
187
185
  // Ignored via go/ees005
188
186
  // eslint-disable-next-line import/no-named-as-default
187
+
189
188
  var WindowedCodeBlock = exports.WindowedCodeBlock = (0, _reactLoadable.default)({
190
189
  loader: function loader() {
191
190
  return Promise.resolve().then(function () {
@@ -516,7 +515,7 @@ var toReact = exports.toReact = function toReact(node, flags, nodeComponents
516
515
  }
517
516
 
518
517
  // Allowing custom components to override those provided in nodeToReact
519
- var nodes = _objectSpread(_objectSpread({}, (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_remove_react-loadable_renderer') ? _nodes.nodeToReact : nodeToReact), nodeComponents);
518
+ var nodes = _objectSpread(_objectSpread({}, nodeToReact), nodeComponents);
520
519
  if (node.type.name === 'codeBlock') {
521
520
  var _nodes$codeBlock;
522
521
  if ((flags === null || flags === void 0 ? void 0 : flags.allowWindowedCodeBlock) === true) {
@@ -73,7 +73,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
73
73
  var TABLE_INFO_TIMEOUT = 10000;
74
74
  var RENDER_EVENT_SAMPLE_RATE = 0.1;
75
75
  var packageName = "@atlaskit/renderer";
76
- var packageVersion = "136.1.6";
76
+ var packageVersion = "136.1.7";
77
77
  var setAsQueryContainerStyles = (0, _react2.css)({
78
78
  containerName: 'ak-renderer-wrapper',
79
79
  containerType: 'inline-size'
@@ -262,6 +262,7 @@ var RendererFunctionalComponent = exports.RendererFunctionalComponent = function
262
262
  surroundTextNodesWithTextWrapper: allowAnnotationsDraftMode,
263
263
  media: props.media,
264
264
  mentionNodeDataProvider: props.mentionNodeDataProvider,
265
+ emojiProviderLookupOrder: props.emojiProviderLookupOrder,
265
266
  emojiResourceConfig: props.emojiResourceConfig,
266
267
  smartLinks: props.smartLinks,
267
268
  extensionViewportSizes: props.extensionViewportSizes,
@@ -200,6 +200,7 @@ export default class ReactSerializer {
200
200
  this.surroundTextNodesWithTextWrapper = Boolean(init.surroundTextNodesWithTextWrapper);
201
201
  this.media = init.media;
202
202
  this.mentionNodeDataProvider = init.mentionNodeDataProvider;
203
+ this.emojiProviderLookupOrder = init.emojiProviderLookupOrder;
203
204
  this.emojiResourceConfig = init.emojiResourceConfig;
204
205
  this.smartLinks = init.smartLinks;
205
206
  this.extensionViewportSizes = init.extensionViewportSizes;
@@ -509,6 +510,7 @@ export default class ReactSerializer {
509
510
  getEmojiProps(node, path = []) {
510
511
  return {
511
512
  ...this.getProps(node, path),
513
+ emojiProviderLookupOrder: fg('platform_bitbucket_fix_shortname_and_ordering') ? this.emojiProviderLookupOrder : undefined,
512
514
  resourceConfig: this.emojiResourceConfig
513
515
  };
514
516
  }
@@ -39,6 +39,7 @@ class EmojiNode extends PureComponent {
39
39
  fallback,
40
40
  fitToHeight,
41
41
  showTooltip,
42
+ emojiProviderLookupOrder,
42
43
  resourceConfig
43
44
  } = this.props;
44
45
  if (allowTextFallback && !providers.emojiProvider) {
@@ -71,6 +72,7 @@ class EmojiNode extends PureComponent {
71
72
  fallback,
72
73
  shortName
73
74
  },
75
+ emojiProviderLookupOrder: emojiProviderLookupOrder,
74
76
  emojiProvider: providers.emojiProvider,
75
77
  showTooltip: showTooltip,
76
78
  fitToHeight: fitToHeight,
@@ -116,6 +118,7 @@ export const EmojiItemComponent = props => {
116
118
  shortName,
117
119
  text,
118
120
  fitToHeight,
121
+ emojiProviderLookupOrder,
119
122
  resourceConfig
120
123
  } = props;
121
124
  const inlineAnnotationProps = useInlineAnnotationProps(props);
@@ -130,6 +133,7 @@ export const EmojiItemComponent = props => {
130
133
  fallback: text,
131
134
  providers: providers,
132
135
  fitToHeight: fitToHeight,
136
+ emojiProviderLookupOrder: emojiProviderLookupOrder,
133
137
  resourceConfig: resourceConfig
134
138
  }))
135
139
  );
@@ -141,6 +145,7 @@ export const EmojiItemComponent = props => {
141
145
  fallback: text,
142
146
  providers: providers,
143
147
  fitToHeight: fitToHeight,
148
+ emojiProviderLookupOrder: emojiProviderLookupOrder,
144
149
  resourceConfig: resourceConfig
145
150
  });
146
151
  };
@@ -29,8 +29,6 @@ import UnknownBlock from './unknownBlock';
29
29
  // Ignored via go/ees005
30
30
  // eslint-disable-next-line import/no-named-as-default
31
31
 
32
- import { nodeToReact as nodeToReactNew } from './nodes';
33
- import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
34
32
  const WindowedCodeBlock = Loadable({
35
33
  loader: () => import( /* webpackChunkName: "@atlaskit-internal_renderer-node_WindowedCodeBlock" */
36
34
  './codeBlock/windowedCodeBlock').then(mod => mod.default),
@@ -194,7 +192,7 @@ export const toReact = (node, flags, nodeComponents
194
192
 
195
193
  // Allowing custom components to override those provided in nodeToReact
196
194
  const nodes = {
197
- ...(isExperimentEnabled('platform_editor_remove_react-loadable_renderer') ? nodeToReactNew : nodeToReact),
195
+ ...nodeToReact,
198
196
  ...nodeComponents
199
197
  };
200
198
  if (node.type.name === 'codeBlock') {
@@ -59,7 +59,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
59
59
  const TABLE_INFO_TIMEOUT = 10000;
60
60
  const RENDER_EVENT_SAMPLE_RATE = 0.1;
61
61
  const packageName = "@atlaskit/renderer";
62
- const packageVersion = "136.1.6";
62
+ const packageVersion = "136.1.7";
63
63
  const setAsQueryContainerStyles = css({
64
64
  containerName: 'ak-renderer-wrapper',
65
65
  containerType: 'inline-size'
@@ -254,6 +254,7 @@ export const RendererFunctionalComponent = props => {
254
254
  surroundTextNodesWithTextWrapper: allowAnnotationsDraftMode,
255
255
  media: props.media,
256
256
  mentionNodeDataProvider: props.mentionNodeDataProvider,
257
+ emojiProviderLookupOrder: props.emojiProviderLookupOrder,
257
258
  emojiResourceConfig: props.emojiResourceConfig,
258
259
  smartLinks: props.smartLinks,
259
260
  extensionViewportSizes: props.extensionViewportSizes,
@@ -206,6 +206,7 @@ var ReactSerializer = /*#__PURE__*/function () {
206
206
  this.surroundTextNodesWithTextWrapper = Boolean(init.surroundTextNodesWithTextWrapper);
207
207
  this.media = init.media;
208
208
  this.mentionNodeDataProvider = init.mentionNodeDataProvider;
209
+ this.emojiProviderLookupOrder = init.emojiProviderLookupOrder;
209
210
  this.emojiResourceConfig = init.emojiResourceConfig;
210
211
  this.smartLinks = init.smartLinks;
211
212
  this.extensionViewportSizes = init.extensionViewportSizes;
@@ -556,6 +557,7 @@ var ReactSerializer = /*#__PURE__*/function () {
556
557
  value: function getEmojiProps(node) {
557
558
  var path = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
558
559
  return _objectSpread(_objectSpread({}, this.getProps(node, path)), {}, {
560
+ emojiProviderLookupOrder: fg('platform_bitbucket_fix_shortname_and_ordering') ? this.emojiProviderLookupOrder : undefined,
559
561
  resourceConfig: this.emojiResourceConfig
560
562
  });
561
563
  }
@@ -48,6 +48,7 @@ var EmojiNode = /*#__PURE__*/function (_PureComponent) {
48
48
  fallback = _this$props.fallback,
49
49
  fitToHeight = _this$props.fitToHeight,
50
50
  showTooltip = _this$props.showTooltip,
51
+ emojiProviderLookupOrder = _this$props.emojiProviderLookupOrder,
51
52
  resourceConfig = _this$props.resourceConfig;
52
53
  if (allowTextFallback && !providers.emojiProvider) {
53
54
  // When the gate is enabled and the fallback text is not a single
@@ -79,6 +80,7 @@ var EmojiNode = /*#__PURE__*/function (_PureComponent) {
79
80
  fallback: fallback,
80
81
  shortName: shortName
81
82
  },
83
+ emojiProviderLookupOrder: emojiProviderLookupOrder,
82
84
  emojiProvider: providers.emojiProvider,
83
85
  showTooltip: showTooltip,
84
86
  fitToHeight: fitToHeight,
@@ -130,6 +132,7 @@ export var EmojiItemComponent = function EmojiItemComponent(props) {
130
132
  shortName = props.shortName,
131
133
  text = props.text,
132
134
  fitToHeight = props.fitToHeight,
135
+ emojiProviderLookupOrder = props.emojiProviderLookupOrder,
133
136
  resourceConfig = props.resourceConfig;
134
137
  var inlineAnnotationProps = useInlineAnnotationProps(props);
135
138
  if (fg('editor_inline_comments_on_inline_nodes')) {
@@ -143,6 +146,7 @@ export var EmojiItemComponent = function EmojiItemComponent(props) {
143
146
  fallback: text,
144
147
  providers: providers,
145
148
  fitToHeight: fitToHeight,
149
+ emojiProviderLookupOrder: emojiProviderLookupOrder,
146
150
  resourceConfig: resourceConfig
147
151
  }))
148
152
  );
@@ -154,6 +158,7 @@ export var EmojiItemComponent = function EmojiItemComponent(props) {
154
158
  fallback: text,
155
159
  providers: providers,
156
160
  fitToHeight: fitToHeight,
161
+ emojiProviderLookupOrder: emojiProviderLookupOrder,
157
162
  resourceConfig: resourceConfig
158
163
  });
159
164
  };
@@ -32,8 +32,6 @@ import UnknownBlock from './unknownBlock';
32
32
  // Ignored via go/ees005
33
33
  // eslint-disable-next-line import/no-named-as-default
34
34
 
35
- import { nodeToReact as nodeToReactNew } from './nodes';
36
- import { isExperimentEnabled } from '@atlaskit/platform-feature-experiments/is-experiment-enabled';
37
35
  var WindowedCodeBlock = Loadable({
38
36
  loader: function loader() {
39
37
  return import( /* webpackChunkName: "@atlaskit-internal_renderer-node_WindowedCodeBlock" */
@@ -322,7 +320,7 @@ export var toReact = function toReact(node, flags, nodeComponents
322
320
  }
323
321
 
324
322
  // Allowing custom components to override those provided in nodeToReact
325
- var nodes = _objectSpread(_objectSpread({}, isExperimentEnabled('platform_editor_remove_react-loadable_renderer') ? nodeToReactNew : nodeToReact), nodeComponents);
323
+ var nodes = _objectSpread(_objectSpread({}, nodeToReact), nodeComponents);
326
324
  if (node.type.name === 'codeBlock') {
327
325
  var _nodes$codeBlock;
328
326
  if ((flags === null || flags === void 0 ? void 0 : flags.allowWindowedCodeBlock) === true) {
@@ -64,7 +64,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
64
64
  var TABLE_INFO_TIMEOUT = 10000;
65
65
  var RENDER_EVENT_SAMPLE_RATE = 0.1;
66
66
  var packageName = "@atlaskit/renderer";
67
- var packageVersion = "136.1.6";
67
+ var packageVersion = "136.1.7";
68
68
  var setAsQueryContainerStyles = css({
69
69
  containerName: 'ak-renderer-wrapper',
70
70
  containerType: 'inline-size'
@@ -253,6 +253,7 @@ export var RendererFunctionalComponent = function RendererFunctionalComponent(pr
253
253
  surroundTextNodesWithTextWrapper: allowAnnotationsDraftMode,
254
254
  media: props.media,
255
255
  mentionNodeDataProvider: props.mentionNodeDataProvider,
256
+ emojiProviderLookupOrder: props.emojiProviderLookupOrder,
256
257
  emojiResourceConfig: props.emojiResourceConfig,
257
258
  smartLinks: props.smartLinks,
258
259
  extensionViewportSizes: props.extensionViewportSizes,
@@ -7,7 +7,7 @@ import type { ExtensionHandlers, ExtensionParams, Parameters } from '@atlaskit/e
7
7
  import type { MentionNodeDataProvider } from '@atlaskit/editor-common/mention';
8
8
  import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
9
9
  import type { EventHandlers } from '@atlaskit/editor-common/ui';
10
- import type { EmojiResourceConfig } from '@atlaskit/emoji/resource';
10
+ import type { EmojiProviderLookupOrder, EmojiResourceConfig } from '@atlaskit/emoji/resource';
11
11
  import type { MediaOptions } from '../types/mediaOptions';
12
12
  import type { SmartLinksOptions } from '../types/smartLinksOptions';
13
13
  import type { ExtensionViewportSize, RendererContext, TextHighlighter } from './types';
@@ -32,6 +32,7 @@ export interface ReactSerializerInit {
32
32
  disableActions?: boolean;
33
33
  disableHeadingIDs?: boolean;
34
34
  disableTableOverflowShadow?: boolean;
35
+ emojiProviderLookupOrder?: EmojiProviderLookupOrder;
35
36
  emojiResourceConfig?: EmojiResourceConfig;
36
37
  eventHandlers?: EventHandlers;
37
38
  extensionHandlers?: ExtensionHandlers;
@@ -105,6 +106,7 @@ export default class ReactSerializer implements Serializer<JSX.Element> {
105
106
  private surroundTextNodesWithTextWrapper;
106
107
  private media?;
107
108
  private mentionNodeDataProvider?;
109
+ private emojiProviderLookupOrder?;
108
110
  private emojiResourceConfig?;
109
111
  private smartLinks?;
110
112
  private extensionViewportSizes?;
@@ -1,11 +1,12 @@
1
1
  import type { EmojiResourceConfig } from '@atlaskit/emoji/resource';
2
2
  import type { FC, NamedExoticComponent } from 'react';
3
3
  import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
4
- import type { EmojiId } from '@atlaskit/emoji/types';
4
+ import type { EmojiId, EmojiProviderLookupOrder } from '@atlaskit/emoji/types';
5
5
  import type { MarkDataAttributes } from '../../ui/annotations/element/useInlineAnnotationProps';
6
6
  import type { EmojiAttributes } from '@atlaskit/adf-schema';
7
7
  export interface EmojiProps extends EmojiId, EmojiAttributes, MarkDataAttributes {
8
8
  allowTextFallback?: boolean;
9
+ emojiProviderLookupOrder?: EmojiProviderLookupOrder;
9
10
  fitToHeight?: number;
10
11
  providers?: ProviderFactory;
11
12
  resourceConfig?: EmojiResourceConfig;
@@ -9,7 +9,7 @@ import type { EventHandlers } from '@atlaskit/editor-common/ui';
9
9
  import type { UnsupportedContentLevelsTracking } from '@atlaskit/editor-common/utils';
10
10
  import type { ADFStage } from '@atlaskit/editor-common/validator';
11
11
  import type { Schema } from '@atlaskit/editor-prosemirror/model';
12
- import type { EmojiResourceConfig } from '@atlaskit/emoji/resource';
12
+ import type { EmojiProviderLookupOrder, EmojiResourceConfig } from '@atlaskit/emoji/resource';
13
13
  import type { ReactSerializerInit, RendererContext, Serializer } from '../';
14
14
  import type { TextHighlighter, ExtensionViewportSize } from '../react/types';
15
15
  import type { RenderOutputStat } from '../render-document';
@@ -98,6 +98,11 @@ export interface RendererProps {
98
98
  */
99
99
  disableTableOverflowShadow?: boolean;
100
100
  document: DocNode;
101
+ /**
102
+ * Preferred emoji provider type order when resolving shortName-only emoji.
103
+ * The first matching type wins.
104
+ */
105
+ emojiProviderLookupOrder?: EmojiProviderLookupOrder;
101
106
  emojiResourceConfig?: EmojiResourceConfig;
102
107
  enableSsrInlineScripts?: boolean;
103
108
  eventHandlers?: EventHandlers;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "136.1.7",
3
+ "version": "136.2.0",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -37,42 +37,43 @@
37
37
  "@atlaskit/analytics-namespaced-context": "^8.1.0",
38
38
  "@atlaskit/analytics-next": "^12.3.0",
39
39
  "@atlaskit/browser-apis": "^1.2.0",
40
- "@atlaskit/button": "^25.1.0",
41
- "@atlaskit/code": "^19.0.0",
40
+ "@atlaskit/button": "^25.2.0",
41
+ "@atlaskit/code": "^19.1.0",
42
42
  "@atlaskit/css": "^1.0.0",
43
- "@atlaskit/editor-json-transformer": "^9.5.0",
43
+ "@atlaskit/editor-card-provider": "^7.1.0",
44
+ "@atlaskit/editor-json-transformer": "^9.6.0",
44
45
  "@atlaskit/editor-palette": "^3.4.0",
45
46
  "@atlaskit/editor-prosemirror": "^8.0.0",
46
47
  "@atlaskit/editor-shared-styles": "^4.0.0",
47
48
  "@atlaskit/editor-smart-link-draggable": "^1.2.0",
48
- "@atlaskit/emoji": "^72.0.0",
49
+ "@atlaskit/emoji": "^72.1.0",
49
50
  "@atlaskit/feature-gate-js-client": "^6.0.0",
50
- "@atlaskit/icon": "^37.4.0",
51
- "@atlaskit/link": "^5.0.0",
52
- "@atlaskit/link-datasource": "^6.4.0",
53
- "@atlaskit/link-extractors": "^4.0.0",
54
- "@atlaskit/linking-common": "^11.2.0",
55
- "@atlaskit/media-card": "^81.6.0",
56
- "@atlaskit/media-client": "^37.4.0",
57
- "@atlaskit/media-client-react": "^6.1.0",
58
- "@atlaskit/media-common": "^14.4.0",
59
- "@atlaskit/media-filmstrip": "^52.2.0",
60
- "@atlaskit/media-ui": "^30.11.0",
61
- "@atlaskit/media-viewer": "^54.5.0",
51
+ "@atlaskit/icon": "^37.5.0",
52
+ "@atlaskit/link": "^5.1.0",
53
+ "@atlaskit/link-datasource": "^6.6.0",
54
+ "@atlaskit/link-extractors": "^4.1.0",
55
+ "@atlaskit/linking-common": "^12.0.0",
56
+ "@atlaskit/media-card": "^81.7.0",
57
+ "@atlaskit/media-client": "^37.5.0",
58
+ "@atlaskit/media-client-react": "^6.2.0",
59
+ "@atlaskit/media-common": "^14.5.0",
60
+ "@atlaskit/media-filmstrip": "^52.3.0",
61
+ "@atlaskit/media-ui": "^30.12.0",
62
+ "@atlaskit/media-viewer": "^54.6.0",
62
63
  "@atlaskit/platform-feature-experiments": "^0.3.0",
63
64
  "@atlaskit/platform-feature-flags": "^2.1.0",
64
65
  "@atlaskit/platform-feature-flags-react": "^1.1.0",
65
66
  "@atlaskit/pragmatic-drag-and-drop": "^3.0.0",
66
67
  "@atlaskit/react-compiler-gating": "^0.2.0",
67
- "@atlaskit/react-ufo": "^7.6.0",
68
- "@atlaskit/smart-card": "^45.17.0",
68
+ "@atlaskit/react-ufo": "^7.7.0",
69
+ "@atlaskit/smart-card": "^45.18.0",
69
70
  "@atlaskit/status": "^5.8.0",
70
71
  "@atlaskit/task-decision": "^21.8.0",
71
- "@atlaskit/theme": "^28.0.0",
72
- "@atlaskit/tmp-editor-statsig": "^156.0.0",
73
- "@atlaskit/tokens": "^16.7.0",
74
- "@atlaskit/tooltip": "^24.1.0",
75
- "@atlaskit/visually-hidden": "^4.2.0",
72
+ "@atlaskit/theme": "^28.1.0",
73
+ "@atlaskit/tmp-editor-statsig": "^157.0.0",
74
+ "@atlaskit/tokens": "^16.8.0",
75
+ "@atlaskit/tooltip": "^24.2.0",
76
+ "@atlaskit/visually-hidden": "^4.3.0",
76
77
  "@babel/runtime": "^7.0.0",
77
78
  "@compiled/react": "^1.0.2",
78
79
  "@emotion/react": "^11.7.1",
@@ -84,8 +85,8 @@
84
85
  "uuid": "^3.1.0"
85
86
  },
86
87
  "peerDependencies": {
87
- "@atlaskit/editor-common": "^119.12.0",
88
- "@atlaskit/link-provider": "^5.3.0",
88
+ "@atlaskit/editor-common": "^119.13.0",
89
+ "@atlaskit/link-provider": "^5.4.0",
89
90
  "@atlaskit/media-core": "^38.0.0",
90
91
  "react": "^18.2.0",
91
92
  "react-dom": "^18.2.0",
@@ -95,16 +96,15 @@
95
96
  "@af/integration-testing": "workspace:^",
96
97
  "@af/visual-regression": "workspace:^",
97
98
  "@atlaskit/analytics-gas-types": "^6.0.0",
98
- "@atlaskit/checkbox": "^19.0.0",
99
- "@atlaskit/editor-card-provider": "^7.1.0",
100
- "@atlaskit/link-provider": "^5.3.0",
101
- "@atlaskit/link-test-helpers": "^11.0.0",
99
+ "@atlaskit/checkbox": "^19.1.0",
100
+ "@atlaskit/link-provider": "^5.4.0",
101
+ "@atlaskit/link-test-helpers": "^11.1.0",
102
102
  "@atlaskit/media-core": "^38.0.0",
103
103
  "@atlaskit/media-integration-test-helpers": "workspace:^",
104
- "@atlaskit/media-test-helpers": "^42.2.0",
104
+ "@atlaskit/media-test-helpers": "^42.3.0",
105
105
  "@atlaskit/mention": "^27.18.0",
106
- "@atlaskit/modal-dialog": "^16.4.0",
107
- "@atlaskit/navigation-system": "^10.15.0",
106
+ "@atlaskit/modal-dialog": "^16.5.0",
107
+ "@atlaskit/navigation-system": "^10.16.0",
108
108
  "@atlaskit/profilecard": "^26.18.0",
109
109
  "@atlaskit/side-nav-items": "^2.3.0",
110
110
  "@atlaskit/util-data-test": "^19.1.0",
@@ -193,6 +193,10 @@
193
193
  "type": "boolean",
194
194
  "referenceOnly": true
195
195
  },
196
+ "platform_bitbucket_fix_shortname_and_ordering": {
197
+ "type": "boolean",
198
+ "referenceOnly": true
199
+ },
196
200
  "platform_editor_renderer_rm_usespecbasedvalidator": {
197
201
  "type": "boolean"
198
202
  },
package/report.api.md CHANGED
@@ -26,6 +26,7 @@ import type { AnnotationProviders } from '@atlaskit/editor-common/types';
26
26
  import type { CardProps } from '@atlaskit/smart-card';
27
27
  import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
28
28
  import type { DocNode } from '@atlaskit/adf-schema';
29
+ import type { EmojiProviderLookupOrder } from '@atlaskit/emoji/resource';
29
30
  import type { EmojiResourceConfig } from '@atlaskit/emoji/resource';
30
31
  import { EVENT_TYPE } from '@atlaskit/editor-common/analytics';
31
32
  import type { EventHandlers } from '@atlaskit/editor-common/ui';
@@ -345,6 +346,8 @@ interface ReactSerializerInit {
345
346
  // (undocumented)
346
347
  disableHeadingIDs?: boolean;
347
348
  // (undocumented)
349
+ emojiProviderLookupOrder?: EmojiProviderLookupOrder;
350
+ // (undocumented)
348
351
  emojiResourceConfig?: EmojiResourceConfig;
349
352
  // (undocumented)
350
353
  eventHandlers?: EventHandlers;
@@ -446,6 +449,8 @@ export interface RendererProps {
446
449
  // (undocumented)
447
450
  document: DocNode;
448
451
  // (undocumented)
452
+ emojiProviderLookupOrder?: EmojiProviderLookupOrder;
453
+ // (undocumented)
449
454
  emojiResourceConfig?: EmojiResourceConfig;
450
455
  // (undocumented)
451
456
  enableSsrInlineScripts?: boolean;
@@ -1,104 +0,0 @@
1
- "use strict";
2
-
3
- var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
- Object.defineProperty(exports, "__esModule", {
5
- value: true
6
- });
7
- exports.nodeToReact = void 0;
8
- var _ui = require("@atlaskit/editor-common/ui");
9
- var _Expand = _interopRequireDefault(require("../../ui/Expand"));
10
- var _blockCard = _interopRequireDefault(require("./blockCard"));
11
- var _blockquote = _interopRequireDefault(require("./blockquote"));
12
- var _bodiedExtension = _interopRequireDefault(require("./bodiedExtension"));
13
- var _bodiedSyncBlock = _interopRequireDefault(require("./bodiedSyncBlock"));
14
- var _bulletList = _interopRequireDefault(require("./bulletList"));
15
- var _caption = _interopRequireDefault(require("./caption"));
16
- var _codeBlock = _interopRequireDefault(require("./codeBlock/codeBlock"));
17
- var _windowedCodeBlock = _interopRequireDefault(require("./codeBlock/windowedCodeBlock"));
18
- var _date = _interopRequireDefault(require("./date"));
19
- var _decisionItem = _interopRequireDefault(require("./decisionItem"));
20
- var _decisionList = _interopRequireDefault(require("./decisionList"));
21
- var _doc = _interopRequireDefault(require("./doc"));
22
- var _embedCard = _interopRequireDefault(require("./embedCard"));
23
- var _emoji = _interopRequireDefault(require("./emoji"));
24
- var _extension = _interopRequireDefault(require("./extension"));
25
- var _extensionFrame = _interopRequireDefault(require("./extensionFrame"));
26
- var _hardBreak = _interopRequireDefault(require("./hardBreak"));
27
- var _heading = _interopRequireDefault(require("./heading"));
28
- var _inlineCard = _interopRequireDefault(require("./inlineCard"));
29
- var _inlineExtension = _interopRequireDefault(require("./inlineExtension"));
30
- var _layoutColumn = _interopRequireDefault(require("./layoutColumn"));
31
- var _layoutSection = _interopRequireDefault(require("./layoutSection"));
32
- var _listItem = _interopRequireDefault(require("./listItem"));
33
- var _media = _interopRequireDefault(require("./media"));
34
- var _mediaGroup = _interopRequireDefault(require("./mediaGroup"));
35
- var _mediaInline = _interopRequireDefault(require("./mediaInline"));
36
- var _mediaSingle = _interopRequireDefault(require("./mediaSingle"));
37
- var _mention = _interopRequireDefault(require("./mention"));
38
- var _multiBodiedExtension = _interopRequireDefault(require("./multiBodiedExtension"));
39
- var _orderedList = _interopRequireDefault(require("./orderedList"));
40
- var _panel = _interopRequireDefault(require("./panel"));
41
- var _paragraph = _interopRequireDefault(require("./paragraph"));
42
- var _placeholder = _interopRequireDefault(require("./placeholder"));
43
- var _rule = _interopRequireDefault(require("./rule"));
44
- var _status = _interopRequireDefault(require("./status"));
45
- var _syncBlock = _interopRequireDefault(require("./syncBlock"));
46
- var _table = _interopRequireDefault(require("./table"));
47
- var _tableCell = require("./tableCell");
48
- var _tableRow = _interopRequireDefault(require("./tableRow"));
49
- var _taskItem = _interopRequireDefault(require("./taskItem"));
50
- var _taskList = _interopRequireDefault(require("./taskList"));
51
- var _unknownBlock = _interopRequireDefault(require("./unknownBlock"));
52
- /* eslint-disable @atlaskit/editor/no-re-export */
53
-
54
- var nodeToReact = exports.nodeToReact = {
55
- blockCard: _blockCard.default,
56
- blockquote: _blockquote.default,
57
- blockTaskItem: _taskItem.default,
58
- bodiedExtension: _bodiedExtension.default,
59
- bodiedSyncBlock: _bodiedSyncBlock.default,
60
- bulletList: _bulletList.default,
61
- caption: _caption.default,
62
- codeBlock: _codeBlock.default,
63
- date: _date.default,
64
- decisionItem: _decisionItem.default,
65
- decisionList: _decisionList.default,
66
- doc: _doc.default,
67
- embedCard: _embedCard.default,
68
- emoji: _emoji.default,
69
- expand: _Expand.default,
70
- extension: _extension.default,
71
- extensionFrame: _extensionFrame.default,
72
- hardBreak: _hardBreak.default,
73
- heading: _heading.default,
74
- inlineCard: _inlineCard.default,
75
- inlineExtension: _inlineExtension.default,
76
- layoutColumn: _layoutColumn.default,
77
- layoutSection: _layoutSection.default,
78
- listItem: _listItem.default,
79
- media: _media.default,
80
- mediaGroup: _mediaGroup.default,
81
- mediaInline: _mediaInline.default,
82
- mediaSingle: _mediaSingle.default,
83
- mention: _mention.default,
84
- multiBodiedExtension: _multiBodiedExtension.default,
85
- nestedExpand: _Expand.default,
86
- orderedList: _orderedList.default,
87
- panel: _panel.default,
88
- panel_c1: _panel.default,
89
- paragraph: _paragraph.default,
90
- placeholder: _placeholder.default,
91
- rule: _rule.default,
92
- status: _status.default,
93
- syncBlock: _syncBlock.default,
94
- table: _table.default,
95
- tableCell: _tableCell.TableCell,
96
- tableHeader: _tableCell.TableHeader,
97
- tableRow: _tableRow.default,
98
- taskItem: _taskItem.default,
99
- taskList: _taskList.default,
100
- unknownBlock: _unknownBlock.default,
101
- unsupportedBlock: _ui.UnsupportedBlock,
102
- unsupportedInline: _ui.UnsupportedInline,
103
- windowedCodeBlock: _windowedCodeBlock.default
104
- };
@@ -1,97 +0,0 @@
1
- /* eslint-disable @atlaskit/editor/no-re-export */
2
-
3
- import { UnsupportedBlock, UnsupportedInline } from '@atlaskit/editor-common/ui';
4
- import Expand from '../../ui/Expand';
5
- import BlockCard from './blockCard';
6
- import Blockquote from './blockquote';
7
- import BodiedExtension from './bodiedExtension';
8
- import BodiedSyncBlock from './bodiedSyncBlock';
9
- import BulletList from './bulletList';
10
- import Caption from './caption';
11
- import CodeBlock from './codeBlock/codeBlock';
12
- import WindowedCodeBlock from './codeBlock/windowedCodeBlock';
13
- import DateNode from './date';
14
- import DecisionItem from './decisionItem';
15
- import DecisionList from './decisionList';
16
- import Doc from './doc';
17
- import EmbedCard from './embedCard';
18
- import Emoji from './emoji';
19
- import Extension from './extension';
20
- import ExtensionFrame from './extensionFrame';
21
- import HardBreak from './hardBreak';
22
- import Heading from './heading';
23
- import InlineCard from './inlineCard';
24
- import InlineExtension from './inlineExtension';
25
- import LayoutColumn from './layoutColumn';
26
- import LayoutSection from './layoutSection';
27
- import ListItem from './listItem';
28
- import Media from './media';
29
- import MediaGroup from './mediaGroup';
30
- import MediaInline from './mediaInline';
31
- import MediaSingle from './mediaSingle';
32
- import Mention from './mention';
33
- import MultiBodiedExtension from './multiBodiedExtension';
34
- import OrderedList from './orderedList';
35
- import Panel from './panel';
36
- import Paragraph from './paragraph';
37
- import Placeholder from './placeholder';
38
- import Rule from './rule';
39
- import Status from './status';
40
- import SyncBlock from './syncBlock';
41
- import Table from './table';
42
- import { TableCell, TableHeader } from './tableCell';
43
- import TableRow from './tableRow';
44
- import TaskItem from './taskItem';
45
- import TaskList from './taskList';
46
- import UnknownBlock from './unknownBlock';
47
- export const nodeToReact = {
48
- blockCard: BlockCard,
49
- blockquote: Blockquote,
50
- blockTaskItem: TaskItem,
51
- bodiedExtension: BodiedExtension,
52
- bodiedSyncBlock: BodiedSyncBlock,
53
- bulletList: BulletList,
54
- caption: Caption,
55
- codeBlock: CodeBlock,
56
- date: DateNode,
57
- decisionItem: DecisionItem,
58
- decisionList: DecisionList,
59
- doc: Doc,
60
- embedCard: EmbedCard,
61
- emoji: Emoji,
62
- expand: Expand,
63
- extension: Extension,
64
- extensionFrame: ExtensionFrame,
65
- hardBreak: HardBreak,
66
- heading: Heading,
67
- inlineCard: InlineCard,
68
- inlineExtension: InlineExtension,
69
- layoutColumn: LayoutColumn,
70
- layoutSection: LayoutSection,
71
- listItem: ListItem,
72
- media: Media,
73
- mediaGroup: MediaGroup,
74
- mediaInline: MediaInline,
75
- mediaSingle: MediaSingle,
76
- mention: Mention,
77
- multiBodiedExtension: MultiBodiedExtension,
78
- nestedExpand: Expand,
79
- orderedList: OrderedList,
80
- panel: Panel,
81
- panel_c1: Panel,
82
- paragraph: Paragraph,
83
- placeholder: Placeholder,
84
- rule: Rule,
85
- status: Status,
86
- syncBlock: SyncBlock,
87
- table: Table,
88
- tableCell: TableCell,
89
- tableHeader: TableHeader,
90
- tableRow: TableRow,
91
- taskItem: TaskItem,
92
- taskList: TaskList,
93
- unknownBlock: UnknownBlock,
94
- unsupportedBlock: UnsupportedBlock,
95
- unsupportedInline: UnsupportedInline,
96
- windowedCodeBlock: WindowedCodeBlock
97
- };
@@ -1,97 +0,0 @@
1
- /* eslint-disable @atlaskit/editor/no-re-export */
2
-
3
- import { UnsupportedBlock, UnsupportedInline } from '@atlaskit/editor-common/ui';
4
- import Expand from '../../ui/Expand';
5
- import BlockCard from './blockCard';
6
- import Blockquote from './blockquote';
7
- import BodiedExtension from './bodiedExtension';
8
- import BodiedSyncBlock from './bodiedSyncBlock';
9
- import BulletList from './bulletList';
10
- import Caption from './caption';
11
- import CodeBlock from './codeBlock/codeBlock';
12
- import WindowedCodeBlock from './codeBlock/windowedCodeBlock';
13
- import DateNode from './date';
14
- import DecisionItem from './decisionItem';
15
- import DecisionList from './decisionList';
16
- import Doc from './doc';
17
- import EmbedCard from './embedCard';
18
- import Emoji from './emoji';
19
- import Extension from './extension';
20
- import ExtensionFrame from './extensionFrame';
21
- import HardBreak from './hardBreak';
22
- import Heading from './heading';
23
- import InlineCard from './inlineCard';
24
- import InlineExtension from './inlineExtension';
25
- import LayoutColumn from './layoutColumn';
26
- import LayoutSection from './layoutSection';
27
- import ListItem from './listItem';
28
- import Media from './media';
29
- import MediaGroup from './mediaGroup';
30
- import MediaInline from './mediaInline';
31
- import MediaSingle from './mediaSingle';
32
- import Mention from './mention';
33
- import MultiBodiedExtension from './multiBodiedExtension';
34
- import OrderedList from './orderedList';
35
- import Panel from './panel';
36
- import Paragraph from './paragraph';
37
- import Placeholder from './placeholder';
38
- import Rule from './rule';
39
- import Status from './status';
40
- import SyncBlock from './syncBlock';
41
- import Table from './table';
42
- import { TableCell, TableHeader } from './tableCell';
43
- import TableRow from './tableRow';
44
- import TaskItem from './taskItem';
45
- import TaskList from './taskList';
46
- import UnknownBlock from './unknownBlock';
47
- export var nodeToReact = {
48
- blockCard: BlockCard,
49
- blockquote: Blockquote,
50
- blockTaskItem: TaskItem,
51
- bodiedExtension: BodiedExtension,
52
- bodiedSyncBlock: BodiedSyncBlock,
53
- bulletList: BulletList,
54
- caption: Caption,
55
- codeBlock: CodeBlock,
56
- date: DateNode,
57
- decisionItem: DecisionItem,
58
- decisionList: DecisionList,
59
- doc: Doc,
60
- embedCard: EmbedCard,
61
- emoji: Emoji,
62
- expand: Expand,
63
- extension: Extension,
64
- extensionFrame: ExtensionFrame,
65
- hardBreak: HardBreak,
66
- heading: Heading,
67
- inlineCard: InlineCard,
68
- inlineExtension: InlineExtension,
69
- layoutColumn: LayoutColumn,
70
- layoutSection: LayoutSection,
71
- listItem: ListItem,
72
- media: Media,
73
- mediaGroup: MediaGroup,
74
- mediaInline: MediaInline,
75
- mediaSingle: MediaSingle,
76
- mention: Mention,
77
- multiBodiedExtension: MultiBodiedExtension,
78
- nestedExpand: Expand,
79
- orderedList: OrderedList,
80
- panel: Panel,
81
- panel_c1: Panel,
82
- paragraph: Paragraph,
83
- placeholder: Placeholder,
84
- rule: Rule,
85
- status: Status,
86
- syncBlock: SyncBlock,
87
- table: Table,
88
- tableCell: TableCell,
89
- tableHeader: TableHeader,
90
- tableRow: TableRow,
91
- taskItem: TaskItem,
92
- taskList: TaskList,
93
- unknownBlock: UnknownBlock,
94
- unsupportedBlock: UnsupportedBlock,
95
- unsupportedInline: UnsupportedInline,
96
- windowedCodeBlock: WindowedCodeBlock
97
- };
@@ -1,4 +0,0 @@
1
- import type React from 'react';
2
- export declare const nodeToReact: {
3
- [key: string]: React.ComponentType<React.PropsWithChildren<any>>;
4
- };