@atlaskit/renderer 112.7.8 → 112.7.9

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 (10) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/cjs/actions/index.js +6 -2
  3. package/dist/cjs/ui/Renderer/index.js +6 -9
  4. package/dist/es2019/actions/index.js +6 -2
  5. package/dist/es2019/ui/Renderer/index.js +6 -9
  6. package/dist/esm/actions/index.js +6 -2
  7. package/dist/esm/ui/Renderer/index.js +6 -9
  8. package/dist/types/actions/index.d.ts +1 -1
  9. package/dist/types-ts4.5/actions/index.d.ts +1 -1
  10. package/package.json +7 -4
package/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 112.7.9
4
+
5
+ ### Patch Changes
6
+
7
+ - [#181096](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/181096)
8
+ [`bb4dfee4e6379`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bb4dfee4e6379) -
9
+ ED-26079 Fix double renderer validation
10
+
3
11
  ## 112.7.8
4
12
 
5
13
  ### Patch Changes
package/dist/cjs/actions/index.js CHANGED
@@ -38,13 +38,17 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
38
38
  //#region private
39
39
  return (0, _createClass2.default)(RendererActions, [{
40
40
  key: "_privateRegisterRenderer",
41
- value: function _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent, skipValidation) {
41
+ value: function _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent) {
42
42
  if (!this.initFromContext) {
43
43
  return;
44
44
  } else if (!this.ref) {
45
45
  this.ref = ref;
46
46
  } else if (this.ref !== ref) {
47
- if (!skipValidation) {
47
+ if ((0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro')) {
48
+ if (this.ref.current !== ref.current) {
49
+ throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
50
+ }
51
+ } else {
48
52
  throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
49
53
  }
50
54
  }
package/dist/cjs/ui/Renderer/index.js CHANGED
@@ -64,7 +64,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
64
64
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
65
65
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
66
66
  var packageName = "@atlaskit/renderer";
67
- var packageVersion = "112.7.8";
67
+ var packageVersion = "112.7.9";
68
68
  var setAsQueryContainerStyles = (0, _react2.css)({
69
69
  containerName: 'ak-renderer-wrapper',
70
70
  containerType: 'inline-size',
@@ -400,8 +400,7 @@ var __RendererClassComponent = exports.__RendererClassComponent = /*#__PURE__*/f
400
400
  }, enableSsrInlineScripts ? (0, _react2.jsx)(_breakoutSsr.BreakoutSSRInlineScript, null) : null, (0, _react2.jsx)(RendererActionsInternalUpdater, {
401
401
  doc: pmDoc,
402
402
  schema: schema,
403
- onAnalyticsEvent: this.fireAnalyticsEvent,
404
- skipValidation: skipValidation
403
+ onAnalyticsEvent: this.fireAnalyticsEvent
405
404
  }, result)))))));
406
405
  var rendererResult = truncated ? (0, _react2.jsx)(_truncatedWrapper.TruncatedWrapper, {
407
406
  height: maxHeight,
@@ -752,8 +751,7 @@ var RendererFunctionalComponent = function RendererFunctionalComponent(props) {
752
751
  }, props.enableSsrInlineScripts ? (0, _react2.jsx)(_breakoutSsr.BreakoutSSRInlineScript, null) : null, (0, _react2.jsx)(RendererActionsInternalUpdater, {
753
752
  doc: pmDoc,
754
753
  schema: schema,
755
- onAnalyticsEvent: _fireAnalyticsEvent,
756
- skipValidation: props.skipValidation
754
+ onAnalyticsEvent: _fireAnalyticsEvent
757
755
  }, result)))))));
758
756
  var rendererResult = props.truncated ? (0, _react2.jsx)(_truncatedWrapper.TruncatedWrapper, {
759
757
  height: props.maxHeight,
@@ -934,8 +932,7 @@ function RendererActionsInternalUpdater(_ref) {
934
932
  var children = _ref.children,
935
933
  doc = _ref.doc,
936
934
  schema = _ref.schema,
937
- onAnalyticsEvent = _ref.onAnalyticsEvent,
938
- skipValidation = _ref.skipValidation;
935
+ onAnalyticsEvent = _ref.onAnalyticsEvent;
939
936
  var rootRendererContextValue = _react.default.useContext(RootRendererContext);
940
937
  var actions = (0, _react.useContext)(_RendererActionsContext.RendererContext);
941
938
  var rendererRef = (0, _react.useRef)(null);
@@ -957,14 +954,14 @@ function RendererActionsInternalUpdater(_ref) {
957
954
  }
958
955
  (0, _react.useLayoutEffect)(function () {
959
956
  if (_doc) {
960
- actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent, skipValidation);
957
+ actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent);
961
958
  } else {
962
959
  actions._privateUnregisterRenderer();
963
960
  }
964
961
  return function () {
965
962
  return actions._privateUnregisterRenderer();
966
963
  };
967
- }, [actions, schema, _doc, onAnalyticsEvent, skipValidation]);
964
+ }, [actions, schema, _doc, onAnalyticsEvent]);
968
965
  if ((0, _experiments.editorExperiment)('comment_on_bodied_extensions', true)) {
969
966
  return (0, _react2.jsx)(RootRendererContext.Provider, {
970
967
  value: {
package/dist/es2019/actions/index.js CHANGED
@@ -22,13 +22,17 @@ export default class RendererActions {
22
22
  }
23
23
 
24
24
  //#region private
25
- _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent, skipValidation) {
25
+ _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent) {
26
26
  if (!this.initFromContext) {
27
27
  return;
28
28
  } else if (!this.ref) {
29
29
  this.ref = ref;
30
30
  } else if (this.ref !== ref) {
31
- if (!skipValidation) {
31
+ if (fg('platform_editor_legacy_content_macro')) {
32
+ if (this.ref.current !== ref.current) {
33
+ throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
34
+ }
35
+ } else {
32
36
  throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
33
37
  }
34
38
  }
package/dist/es2019/ui/Renderer/index.js CHANGED
@@ -45,7 +45,7 @@ import { TruncatedWrapper } from './truncated-wrapper';
45
45
  export const NORMAL_SEVERITY_THRESHOLD = 2000;
46
46
  export const DEGRADED_SEVERITY_THRESHOLD = 3000;
47
47
  const packageName = "@atlaskit/renderer";
48
- const packageVersion = "112.7.8";
48
+ const packageVersion = "112.7.9";
49
49
  const setAsQueryContainerStyles = css({
50
50
  containerName: 'ak-renderer-wrapper',
51
51
  containerType: 'inline-size',
@@ -377,8 +377,7 @@ export class __RendererClassComponent extends PureComponent {
377
377
  }, enableSsrInlineScripts ? jsx(BreakoutSSRInlineScript, null) : null, jsx(RendererActionsInternalUpdater, {
378
378
  doc: pmDoc,
379
379
  schema: schema,
380
- onAnalyticsEvent: this.fireAnalyticsEvent,
381
- skipValidation: skipValidation
380
+ onAnalyticsEvent: this.fireAnalyticsEvent
382
381
  }, result)))))));
383
382
  let rendererResult = truncated ? jsx(TruncatedWrapper, {
384
383
  height: maxHeight,
@@ -728,8 +727,7 @@ const RendererFunctionalComponent = props => {
728
727
  }, props.enableSsrInlineScripts ? jsx(BreakoutSSRInlineScript, null) : null, jsx(RendererActionsInternalUpdater, {
729
728
  doc: pmDoc,
730
729
  schema: schema,
731
- onAnalyticsEvent: fireAnalyticsEvent,
732
- skipValidation: props.skipValidation
730
+ onAnalyticsEvent: fireAnalyticsEvent
733
731
  }, result)))))));
734
732
  let rendererResult = props.truncated ? jsx(TruncatedWrapper, {
735
733
  height: props.maxHeight,
@@ -908,8 +906,7 @@ function RendererActionsInternalUpdater({
908
906
  children,
909
907
  doc,
910
908
  schema,
911
- onAnalyticsEvent,
912
- skipValidation
909
+ onAnalyticsEvent
913
910
  }) {
914
911
  const rootRendererContextValue = React.useContext(RootRendererContext);
915
912
  const actions = useContext(ActionsContext);
@@ -932,12 +929,12 @@ function RendererActionsInternalUpdater({
932
929
  }
933
930
  useLayoutEffect(() => {
934
931
  if (_doc) {
935
- actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent, skipValidation);
932
+ actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent);
936
933
  } else {
937
934
  actions._privateUnregisterRenderer();
938
935
  }
939
936
  return () => actions._privateUnregisterRenderer();
940
- }, [actions, schema, _doc, onAnalyticsEvent, skipValidation]);
937
+ }, [actions, schema, _doc, onAnalyticsEvent]);
941
938
  if (editorExperiment('comment_on_bodied_extensions', true)) {
942
939
  return jsx(RootRendererContext.Provider, {
943
940
  value: {
package/dist/esm/actions/index.js CHANGED
@@ -31,13 +31,17 @@ var RendererActions = /*#__PURE__*/function () {
31
31
  //#region private
32
32
  return _createClass(RendererActions, [{
33
33
  key: "_privateRegisterRenderer",
34
- value: function _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent, skipValidation) {
34
+ value: function _privateRegisterRenderer(ref, doc, schema, onAnalyticsEvent) {
35
35
  if (!this.initFromContext) {
36
36
  return;
37
37
  } else if (!this.ref) {
38
38
  this.ref = ref;
39
39
  } else if (this.ref !== ref) {
40
- if (!skipValidation) {
40
+ if (fg('platform_editor_legacy_content_macro')) {
41
+ if (this.ref.current !== ref.current) {
42
+ throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
43
+ }
44
+ } else {
41
45
  throw new Error("Renderer has already been registered! It's not allowed to re-register with another new Renderer instance.");
42
46
  }
43
47
  }
package/dist/esm/ui/Renderer/index.js CHANGED
@@ -54,7 +54,7 @@ import { TruncatedWrapper } from './truncated-wrapper';
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 = "112.7.8";
57
+ var packageVersion = "112.7.9";
58
58
  var setAsQueryContainerStyles = css({
59
59
  containerName: 'ak-renderer-wrapper',
60
60
  containerType: 'inline-size',
@@ -390,8 +390,7 @@ export var __RendererClassComponent = /*#__PURE__*/function (_PureComponent) {
390
390
  }, enableSsrInlineScripts ? jsx(BreakoutSSRInlineScript, null) : null, jsx(RendererActionsInternalUpdater, {
391
391
  doc: pmDoc,
392
392
  schema: schema,
393
- onAnalyticsEvent: this.fireAnalyticsEvent,
394
- skipValidation: skipValidation
393
+ onAnalyticsEvent: this.fireAnalyticsEvent
395
394
  }, result)))))));
396
395
  var rendererResult = truncated ? jsx(TruncatedWrapper, {
397
396
  height: maxHeight,
@@ -742,8 +741,7 @@ var RendererFunctionalComponent = function RendererFunctionalComponent(props) {
742
741
  }, props.enableSsrInlineScripts ? jsx(BreakoutSSRInlineScript, null) : null, jsx(RendererActionsInternalUpdater, {
743
742
  doc: pmDoc,
744
743
  schema: schema,
745
- onAnalyticsEvent: _fireAnalyticsEvent,
746
- skipValidation: props.skipValidation
744
+ onAnalyticsEvent: _fireAnalyticsEvent
747
745
  }, result)))))));
748
746
  var rendererResult = props.truncated ? jsx(TruncatedWrapper, {
749
747
  height: props.maxHeight,
@@ -924,8 +922,7 @@ function RendererActionsInternalUpdater(_ref) {
924
922
  var children = _ref.children,
925
923
  doc = _ref.doc,
926
924
  schema = _ref.schema,
927
- onAnalyticsEvent = _ref.onAnalyticsEvent,
928
- skipValidation = _ref.skipValidation;
925
+ onAnalyticsEvent = _ref.onAnalyticsEvent;
929
926
  var rootRendererContextValue = React.useContext(RootRendererContext);
930
927
  var actions = useContext(ActionsContext);
931
928
  var rendererRef = useRef(null);
@@ -947,14 +944,14 @@ function RendererActionsInternalUpdater(_ref) {
947
944
  }
948
945
  useLayoutEffect(function () {
949
946
  if (_doc) {
950
- actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent, skipValidation);
947
+ actions._privateRegisterRenderer(rendererRef, _doc, schema, onAnalyticsEvent);
951
948
  } else {
952
949
  actions._privateUnregisterRenderer();
953
950
  }
954
951
  return function () {
955
952
  return actions._privateUnregisterRenderer();
956
953
  };
957
- }, [actions, schema, _doc, onAnalyticsEvent, skipValidation]);
954
+ }, [actions, schema, _doc, onAnalyticsEvent]);
958
955
  if (editorExperiment('comment_on_bodied_extensions', true)) {
959
956
  return jsx(RootRendererContext.Provider, {
960
957
  value: {
package/dist/types/actions/index.d.ts CHANGED
@@ -39,7 +39,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
39
39
  private ref?;
40
40
  private onAnalyticsEvent?;
41
41
  constructor(initFromContext?: boolean);
42
- _privateRegisterRenderer(ref: React.MutableRefObject<null>, doc: Node, schema: Schema, onAnalyticsEvent?: (event: AnalyticsEventPayload) => void, skipValidation?: boolean): void;
42
+ _privateRegisterRenderer(ref: React.MutableRefObject<null>, doc: Node, schema: Schema, onAnalyticsEvent?: (event: AnalyticsEventPayload) => void): void;
43
43
  _privateUnregisterRenderer(): void;
44
44
  /**
45
45
  * Validate whether we can create an annotation between two positions
package/dist/types-ts4.5/actions/index.d.ts CHANGED
@@ -39,7 +39,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
39
39
  private ref?;
40
40
  private onAnalyticsEvent?;
41
41
  constructor(initFromContext?: boolean);
42
- _privateRegisterRenderer(ref: React.MutableRefObject<null>, doc: Node, schema: Schema, onAnalyticsEvent?: (event: AnalyticsEventPayload) => void, skipValidation?: boolean): void;
42
+ _privateRegisterRenderer(ref: React.MutableRefObject<null>, doc: Node, schema: Schema, onAnalyticsEvent?: (event: AnalyticsEventPayload) => void): void;
43
43
  _privateUnregisterRenderer(): void;
44
44
  /**
45
45
  * Validate whether we can create an annotation between two positions
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "112.7.8",
3
+ "version": "112.7.9",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -29,7 +29,7 @@
29
29
  "@atlaskit/analytics-next": "^10.2.0",
30
30
  "@atlaskit/button": "^20.3.0",
31
31
  "@atlaskit/code": "^15.6.0",
32
- "@atlaskit/editor-common": "^96.6.0",
32
+ "@atlaskit/editor-common": "^96.7.0",
33
33
  "@atlaskit/editor-json-transformer": "^8.21.0",
34
34
  "@atlaskit/editor-palette": "1.6.3",
35
35
  "@atlaskit/editor-prosemirror": "6.2.1",
@@ -46,11 +46,11 @@
46
46
  "@atlaskit/media-ui": "^27.1.0",
47
47
  "@atlaskit/media-viewer": "^49.5.0",
48
48
  "@atlaskit/platform-feature-flags": "^0.3.0",
49
- "@atlaskit/smart-card": "^32.7.0",
49
+ "@atlaskit/smart-card": "^32.8.0",
50
50
  "@atlaskit/status": "^1.8.0",
51
51
  "@atlaskit/task-decision": "^17.11.0",
52
52
  "@atlaskit/theme": "^14.0.0",
53
- "@atlaskit/tmp-editor-statsig": "^2.28.0",
53
+ "@atlaskit/tmp-editor-statsig": "^2.29.0",
54
54
  "@atlaskit/tokens": "^2.5.0",
55
55
  "@atlaskit/tooltip": "^19.0.0",
56
56
  "@babel/runtime": "^7.0.0",
@@ -174,6 +174,9 @@
174
174
  },
175
175
  "platform_editor_table_col_calculation_fix": {
176
176
  "type": "boolean"
177
+ },
178
+ "platform_editor_legacy_content_macro": {
179
+ "type": "boolean"
177
180
  }
178
181
  },
179
182
  "af:exports": {