@atlaskit/editor-common 95.11.0 → 96.0.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 +13 -0
- package/dist/cjs/extensibility/Extension.js +4 -2
- package/dist/cjs/extensibility/ExtensionComponent.js +4 -4
- package/dist/cjs/extensibility/extensionNodeView.js +5 -3
- package/dist/cjs/monitoring/error.js +1 -1
- package/dist/cjs/ui/DropList/index.js +1 -1
- package/dist/es2019/extensibility/Extension.js +4 -2
- package/dist/es2019/extensibility/ExtensionComponent.js +5 -5
- package/dist/es2019/extensibility/extensionNodeView.js +5 -3
- package/dist/es2019/monitoring/error.js +1 -1
- package/dist/es2019/ui/DropList/index.js +1 -1
- package/dist/esm/extensibility/Extension.js +4 -2
- package/dist/esm/extensibility/ExtensionComponent.js +5 -5
- package/dist/esm/extensibility/extensionNodeView.js +5 -3
- package/dist/esm/monitoring/error.js +1 -1
- package/dist/esm/ui/DropList/index.js +1 -1
- package/dist/types/extensibility/Extension.d.ts +3 -1
- package/dist/types/extensibility/ExtensionComponent.d.ts +3 -1
- package/dist/types/extensibility/extensionNodeView.d.ts +4 -2
- package/dist/types/types/feature-flags.d.ts +0 -8
- package/dist/types-ts4.5/extensibility/Extension.d.ts +3 -1
- package/dist/types-ts4.5/extensibility/ExtensionComponent.d.ts +3 -1
- package/dist/types-ts4.5/extensibility/extensionNodeView.d.ts +4 -2
- package/dist/types-ts4.5/types/feature-flags.d.ts +0 -8
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @atlaskit/editor-common
|
|
2
2
|
|
|
3
|
+
## 96.0.0
|
|
4
|
+
|
|
5
|
+
### Major Changes
|
|
6
|
+
|
|
7
|
+
- [#166906](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/166906)
|
|
8
|
+
[`aac76c4a54baf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/aac76c4a54baf) -
|
|
9
|
+
added **rendererExtensionOptions option to pass renderer extension handlers to extensions in
|
|
10
|
+
editor to allow displaying of renderer view for bodiedExtensions—optional not required. To use for
|
|
11
|
+
extension plugin, pass **rendererExtensionOptions to universal preset via its
|
|
12
|
+
initialPluginConfiguration prop. To use for referentialityPlugin, use \_\_rendererExtensionOptions
|
|
13
|
+
option. In a future release, changes will be added to use this new option. Note: option is not
|
|
14
|
+
fully supported currently and is intended for use for confluence live pages
|
|
15
|
+
|
|
3
16
|
## 95.11.0
|
|
4
17
|
|
|
5
18
|
### Minor Changes
|
|
@@ -40,7 +40,8 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
|
|
|
40
40
|
pluginInjectionApi = _this$props.pluginInjectionApi,
|
|
41
41
|
eventDispatcher = _this$props.eventDispatcher,
|
|
42
42
|
macroInteractionDesignFeatureFlags = _this$props.macroInteractionDesignFeatureFlags,
|
|
43
|
-
showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView
|
|
43
|
+
showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView,
|
|
44
|
+
rendererExtensionHandlers = _this$props.rendererExtensionHandlers;
|
|
44
45
|
return /*#__PURE__*/_react.default.createElement(_ExtensionComponent.ExtensionComponent, {
|
|
45
46
|
editorView: editorView,
|
|
46
47
|
node: node,
|
|
@@ -53,7 +54,8 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
|
|
|
53
54
|
pluginInjectionApi: pluginInjectionApi,
|
|
54
55
|
eventDispatcher: eventDispatcher,
|
|
55
56
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
56
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView
|
|
57
|
+
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
58
|
+
rendererExtensionHandlers: rendererExtensionHandlers
|
|
57
59
|
});
|
|
58
60
|
});
|
|
59
61
|
_this.providerFactory = props.providerFactory || new _providerFactory.ProviderFactory();
|
|
@@ -199,7 +199,7 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
|
|
|
199
199
|
node = _this$props2.node,
|
|
200
200
|
showLivePagesBodiedMacrosRendererView = _this$props2.showLivePagesBodiedMacrosRendererView;
|
|
201
201
|
// We only care about this empty state on first page load or insertion to determine the view
|
|
202
|
-
if (showLivePagesBodiedMacrosRendererView && !isEmptyBodiedMacro(node)) {
|
|
202
|
+
if (!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !isEmptyBodiedMacro(node)) {
|
|
203
203
|
this.setState({
|
|
204
204
|
showBodiedExtensionRendererView: true
|
|
205
205
|
});
|
|
@@ -287,7 +287,7 @@ var ExtensionComponentOld = exports.ExtensionComponentOld = /*#__PURE__*/functio
|
|
|
287
287
|
isNodeHovered: this.state.isNodeHovered,
|
|
288
288
|
isNodeNested: isNodeNested,
|
|
289
289
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
290
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
290
|
+
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))),
|
|
291
291
|
showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
|
|
292
292
|
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
|
|
293
293
|
}, extensionHandlerResult);
|
|
@@ -333,7 +333,7 @@ var ExtensionComponentNew = exports.ExtensionComponentNew = function ExtensionCo
|
|
|
333
333
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
334
334
|
extensionProvider = _useState2[0],
|
|
335
335
|
setExtensionProvider = _useState2[1];
|
|
336
|
-
var _useState3 = (0, _react.useState)(!!(showLivePagesBodiedMacrosRendererView && !isEmptyBodiedMacro(node))
|
|
336
|
+
var _useState3 = (0, _react.useState)(!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))) && !isEmptyBodiedMacro(node)),
|
|
337
337
|
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
338
338
|
showBodiedExtensionRendererView = _useState4[0],
|
|
339
339
|
setShowBodiedExtensionRendererView = _useState4[1];
|
|
@@ -551,7 +551,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
551
551
|
isNodeHovered: this.state.isNodeHovered,
|
|
552
552
|
isNodeNested: isNodeNested,
|
|
553
553
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
554
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
554
|
+
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView((0, _utils.nodeToJSON)(node))),
|
|
555
555
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
556
556
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
557
557
|
}, extensionHandlerResult);
|
|
@@ -75,13 +75,14 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
|
|
|
75
75
|
editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
|
|
76
76
|
pluginInjectionApi: props.pluginInjectionApi,
|
|
77
77
|
macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
|
|
78
|
-
showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView
|
|
78
|
+
showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
|
|
79
|
+
rendererExtensionHandlers: props.rendererExtensionHandlers
|
|
79
80
|
}));
|
|
80
81
|
}
|
|
81
82
|
}]);
|
|
82
83
|
return ExtensionNode;
|
|
83
84
|
}(_reactNodeView.default);
|
|
84
|
-
function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView) {
|
|
85
|
+
function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, rendererExtensionHandlers) {
|
|
85
86
|
return function (node, view, getPos) {
|
|
86
87
|
return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
|
|
87
88
|
providerFactory: providerFactory,
|
|
@@ -89,7 +90,8 @@ function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory,
|
|
|
89
90
|
extensionNodeViewOptions: extensionNodeViewOptions,
|
|
90
91
|
pluginInjectionApi: pluginInjectionApi,
|
|
91
92
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
92
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView
|
|
93
|
+
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
94
|
+
rendererExtensionHandlers: rendererExtensionHandlers
|
|
93
95
|
}).init();
|
|
94
96
|
};
|
|
95
97
|
}
|
|
@@ -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 && {}.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 = "
|
|
20
|
+
var packageVersion = "96.0.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
|
|
@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
|
|
|
24
24
|
* @jsx jsx
|
|
25
25
|
*/ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
|
|
26
26
|
var packageName = "@atlaskit/editor-common";
|
|
27
|
-
var packageVersion = "
|
|
27
|
+
var packageVersion = "96.0.0";
|
|
28
28
|
var halfFocusRing = 1;
|
|
29
29
|
var dropOffset = '0, 8';
|
|
30
30
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -19,7 +19,8 @@ export class Extension extends Component {
|
|
|
19
19
|
pluginInjectionApi,
|
|
20
20
|
eventDispatcher,
|
|
21
21
|
macroInteractionDesignFeatureFlags,
|
|
22
|
-
showLivePagesBodiedMacrosRendererView
|
|
22
|
+
showLivePagesBodiedMacrosRendererView,
|
|
23
|
+
rendererExtensionHandlers
|
|
23
24
|
} = this.props;
|
|
24
25
|
return /*#__PURE__*/React.createElement(ExtensionComponent, {
|
|
25
26
|
editorView: editorView,
|
|
@@ -33,7 +34,8 @@ export class Extension extends Component {
|
|
|
33
34
|
pluginInjectionApi: pluginInjectionApi,
|
|
34
35
|
eventDispatcher: eventDispatcher,
|
|
35
36
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
36
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView
|
|
37
|
+
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
38
|
+
rendererExtensionHandlers: rendererExtensionHandlers
|
|
37
39
|
});
|
|
38
40
|
});
|
|
39
41
|
this.providerFactory = props.providerFactory || new ProviderFactory();
|
|
@@ -6,7 +6,7 @@ import memoizeOne from 'memoize-one';
|
|
|
6
6
|
import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
|
|
7
7
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
8
8
|
import { getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensions';
|
|
9
|
-
import { getExtensionRenderer } from '../utils';
|
|
9
|
+
import { getExtensionRenderer, nodeToJSON } from '../utils';
|
|
10
10
|
import Extension from './Extension/Extension';
|
|
11
11
|
import InlineExtension from './Extension/InlineExtension';
|
|
12
12
|
import MultiBodiedExtension from './MultiBodiedExtension';
|
|
@@ -159,7 +159,7 @@ export class ExtensionComponentOld extends Component {
|
|
|
159
159
|
showLivePagesBodiedMacrosRendererView
|
|
160
160
|
} = this.props;
|
|
161
161
|
// We only care about this empty state on first page load or insertion to determine the view
|
|
162
|
-
if (showLivePagesBodiedMacrosRendererView && !isEmptyBodiedMacro(node)) {
|
|
162
|
+
if (!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))) && !isEmptyBodiedMacro(node)) {
|
|
163
163
|
this.setState({
|
|
164
164
|
showBodiedExtensionRendererView: true
|
|
165
165
|
});
|
|
@@ -244,7 +244,7 @@ export class ExtensionComponentOld extends Component {
|
|
|
244
244
|
isNodeHovered: this.state.isNodeHovered,
|
|
245
245
|
isNodeNested: isNodeNested,
|
|
246
246
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
247
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
247
|
+
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
248
248
|
showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
|
|
249
249
|
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
|
|
250
250
|
}, extensionHandlerResult);
|
|
@@ -287,7 +287,7 @@ export const ExtensionComponentNew = props => {
|
|
|
287
287
|
...restProps
|
|
288
288
|
} = props;
|
|
289
289
|
const [extensionProvider, setExtensionProvider] = useState(undefined);
|
|
290
|
-
const [showBodiedExtensionRendererView, setShowBodiedExtensionRendererView] = useState(!!(showLivePagesBodiedMacrosRendererView && !isEmptyBodiedMacro(node))
|
|
290
|
+
const [showBodiedExtensionRendererView, setShowBodiedExtensionRendererView] = useState(!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))) && !isEmptyBodiedMacro(node));
|
|
291
291
|
const mountedRef = useRef(true);
|
|
292
292
|
useLayoutEffect(() => {
|
|
293
293
|
mountedRef.current = true;
|
|
@@ -479,7 +479,7 @@ class ExtensionComponentInner extends Component {
|
|
|
479
479
|
isNodeHovered: this.state.isNodeHovered,
|
|
480
480
|
isNodeNested: isNodeNested,
|
|
481
481
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
482
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
482
|
+
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
483
483
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
484
484
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
485
485
|
}, extensionHandlerResult);
|
|
@@ -48,11 +48,12 @@ export class ExtensionNode extends ReactNodeView {
|
|
|
48
48
|
editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
|
|
49
49
|
pluginInjectionApi: props.pluginInjectionApi,
|
|
50
50
|
macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
|
|
51
|
-
showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView
|
|
51
|
+
showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
|
|
52
|
+
rendererExtensionHandlers: props.rendererExtensionHandlers
|
|
52
53
|
}));
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
|
-
export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView) {
|
|
56
|
+
export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, rendererExtensionHandlers) {
|
|
56
57
|
return (node, view, getPos) => {
|
|
57
58
|
return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
|
|
58
59
|
providerFactory,
|
|
@@ -60,7 +61,8 @@ export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, pr
|
|
|
60
61
|
extensionNodeViewOptions,
|
|
61
62
|
pluginInjectionApi,
|
|
62
63
|
macroInteractionDesignFeatureFlags,
|
|
63
|
-
showLivePagesBodiedMacrosRendererView
|
|
64
|
+
showLivePagesBodiedMacrosRendererView,
|
|
65
|
+
rendererExtensionHandlers
|
|
64
66
|
}).init();
|
|
65
67
|
};
|
|
66
68
|
}
|
|
@@ -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 = "
|
|
4
|
+
const packageVersion = "96.0.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
|
|
@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
13
13
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
14
14
|
import Layer from '../Layer';
|
|
15
15
|
const packageName = "@atlaskit/editor-common";
|
|
16
|
-
const packageVersion = "
|
|
16
|
+
const packageVersion = "96.0.0";
|
|
17
17
|
const halfFocusRing = 1;
|
|
18
18
|
const dropOffset = '0, 8';
|
|
19
19
|
class DropList extends Component {
|
|
@@ -30,7 +30,8 @@ export var Extension = /*#__PURE__*/function (_Component) {
|
|
|
30
30
|
pluginInjectionApi = _this$props.pluginInjectionApi,
|
|
31
31
|
eventDispatcher = _this$props.eventDispatcher,
|
|
32
32
|
macroInteractionDesignFeatureFlags = _this$props.macroInteractionDesignFeatureFlags,
|
|
33
|
-
showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView
|
|
33
|
+
showLivePagesBodiedMacrosRendererView = _this$props.showLivePagesBodiedMacrosRendererView,
|
|
34
|
+
rendererExtensionHandlers = _this$props.rendererExtensionHandlers;
|
|
34
35
|
return /*#__PURE__*/React.createElement(ExtensionComponent, {
|
|
35
36
|
editorView: editorView,
|
|
36
37
|
node: node,
|
|
@@ -43,7 +44,8 @@ export var Extension = /*#__PURE__*/function (_Component) {
|
|
|
43
44
|
pluginInjectionApi: pluginInjectionApi,
|
|
44
45
|
eventDispatcher: eventDispatcher,
|
|
45
46
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
46
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView
|
|
47
|
+
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
48
|
+
rendererExtensionHandlers: rendererExtensionHandlers
|
|
47
49
|
});
|
|
48
50
|
});
|
|
49
51
|
_this.providerFactory = props.providerFactory || new ProviderFactory();
|
|
@@ -19,7 +19,7 @@ import memoizeOne from 'memoize-one';
|
|
|
19
19
|
import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
|
|
20
20
|
import { fg } from '@atlaskit/platform-feature-flags';
|
|
21
21
|
import { getExtensionModuleNodePrivateProps, getNodeRenderer } from '../extensions';
|
|
22
|
-
import { getExtensionRenderer } from '../utils';
|
|
22
|
+
import { getExtensionRenderer, nodeToJSON } from '../utils';
|
|
23
23
|
import Extension from './Extension/Extension';
|
|
24
24
|
import InlineExtension from './Extension/InlineExtension';
|
|
25
25
|
import MultiBodiedExtension from './MultiBodiedExtension';
|
|
@@ -191,7 +191,7 @@ export var ExtensionComponentOld = /*#__PURE__*/function (_Component) {
|
|
|
191
191
|
node = _this$props2.node,
|
|
192
192
|
showLivePagesBodiedMacrosRendererView = _this$props2.showLivePagesBodiedMacrosRendererView;
|
|
193
193
|
// We only care about this empty state on first page load or insertion to determine the view
|
|
194
|
-
if (showLivePagesBodiedMacrosRendererView && !isEmptyBodiedMacro(node)) {
|
|
194
|
+
if (!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))) && !isEmptyBodiedMacro(node)) {
|
|
195
195
|
this.setState({
|
|
196
196
|
showBodiedExtensionRendererView: true
|
|
197
197
|
});
|
|
@@ -279,7 +279,7 @@ export var ExtensionComponentOld = /*#__PURE__*/function (_Component) {
|
|
|
279
279
|
isNodeHovered: this.state.isNodeHovered,
|
|
280
280
|
isNodeNested: isNodeNested,
|
|
281
281
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
282
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
282
|
+
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
283
283
|
showBodiedExtensionRendererView: this.state.showBodiedExtensionRendererView,
|
|
284
284
|
setShowBodiedExtensionRendererView: this.setShowBodiedExtensionRendererView
|
|
285
285
|
}, extensionHandlerResult);
|
|
@@ -325,7 +325,7 @@ export var ExtensionComponentNew = function ExtensionComponentNew(props) {
|
|
|
325
325
|
_useState2 = _slicedToArray(_useState, 2),
|
|
326
326
|
extensionProvider = _useState2[0],
|
|
327
327
|
setExtensionProvider = _useState2[1];
|
|
328
|
-
var _useState3 = useState(!!(showLivePagesBodiedMacrosRendererView && !isEmptyBodiedMacro(node))
|
|
328
|
+
var _useState3 = useState(!!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))) && !isEmptyBodiedMacro(node)),
|
|
329
329
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
330
330
|
showBodiedExtensionRendererView = _useState4[0],
|
|
331
331
|
setShowBodiedExtensionRendererView = _useState4[1];
|
|
@@ -543,7 +543,7 @@ var ExtensionComponentInner = /*#__PURE__*/function (_Component2) {
|
|
|
543
543
|
isNodeHovered: this.state.isNodeHovered,
|
|
544
544
|
isNodeNested: isNodeNested,
|
|
545
545
|
setIsNodeHovered: this.setIsNodeHovered,
|
|
546
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
546
|
+
showLivePagesBodiedMacrosRendererView: !!(showLivePagesBodiedMacrosRendererView !== null && showLivePagesBodiedMacrosRendererView !== void 0 && showLivePagesBodiedMacrosRendererView(nodeToJSON(node))),
|
|
547
547
|
showBodiedExtensionRendererView: showBodiedExtensionRendererView,
|
|
548
548
|
setShowBodiedExtensionRendererView: setShowBodiedExtensionRendererView
|
|
549
549
|
}, extensionHandlerResult);
|
|
@@ -67,13 +67,14 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
|
|
|
67
67
|
editorAppearance: (_props$extensionNodeV = props.extensionNodeViewOptions) === null || _props$extensionNodeV === void 0 ? void 0 : _props$extensionNodeV.appearance,
|
|
68
68
|
pluginInjectionApi: props.pluginInjectionApi,
|
|
69
69
|
macroInteractionDesignFeatureFlags: props.macroInteractionDesignFeatureFlags,
|
|
70
|
-
showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView
|
|
70
|
+
showLivePagesBodiedMacrosRendererView: props.showLivePagesBodiedMacrosRendererView,
|
|
71
|
+
rendererExtensionHandlers: props.rendererExtensionHandlers
|
|
71
72
|
}));
|
|
72
73
|
}
|
|
73
74
|
}]);
|
|
74
75
|
return ExtensionNode;
|
|
75
76
|
}(ReactNodeView);
|
|
76
|
-
export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView) {
|
|
77
|
+
export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, providerFactory, extensionHandlers, extensionNodeViewOptions, pluginInjectionApi, macroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView, rendererExtensionHandlers) {
|
|
77
78
|
return function (node, view, getPos) {
|
|
78
79
|
return new ExtensionNode(node, view, getPos, portalProviderAPI, eventDispatcher, {
|
|
79
80
|
providerFactory: providerFactory,
|
|
@@ -81,7 +82,8 @@ export default function ExtensionNodeView(portalProviderAPI, eventDispatcher, pr
|
|
|
81
82
|
extensionNodeViewOptions: extensionNodeViewOptions,
|
|
82
83
|
pluginInjectionApi: pluginInjectionApi,
|
|
83
84
|
macroInteractionDesignFeatureFlags: macroInteractionDesignFeatureFlags,
|
|
84
|
-
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView
|
|
85
|
+
showLivePagesBodiedMacrosRendererView: showLivePagesBodiedMacrosRendererView,
|
|
86
|
+
rendererExtensionHandlers: rendererExtensionHandlers
|
|
85
87
|
}).init();
|
|
86
88
|
};
|
|
87
89
|
}
|
|
@@ -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 = "
|
|
10
|
+
var packageVersion = "96.0.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
|
|
@@ -21,7 +21,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
|
|
|
21
21
|
import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
|
|
22
22
|
import Layer from '../Layer';
|
|
23
23
|
var packageName = "@atlaskit/editor-common";
|
|
24
|
-
var packageVersion = "
|
|
24
|
+
var packageVersion = "96.0.0";
|
|
25
25
|
var halfFocusRing = 1;
|
|
26
26
|
var dropOffset = '0, 8';
|
|
27
27
|
var DropList = /*#__PURE__*/function (_Component) {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Component } from 'react';
|
|
2
|
+
import { type ADFEntity } from '@atlaskit/adf-utils/types';
|
|
2
3
|
import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
|
|
3
4
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
4
5
|
import type { EventDispatcher } from '../event-dispatcher';
|
|
@@ -19,7 +20,8 @@ export interface Props {
|
|
|
19
20
|
pluginInjectionApi: ExtensionsPluginInjectionAPI;
|
|
20
21
|
eventDispatcher?: EventDispatcher;
|
|
21
22
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
22
|
-
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
23
|
+
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
24
|
+
rendererExtensionHandlers?: ExtensionHandlers;
|
|
23
25
|
}
|
|
24
26
|
export declare class Extension extends Component<Props, any> {
|
|
25
27
|
static displayName: string;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Component } from 'react';
|
|
2
|
+
import type { ADFEntity } from '@atlaskit/adf-utils/types';
|
|
2
3
|
import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
|
|
3
4
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
4
5
|
import type { EventDispatcher } from '../event-dispatcher';
|
|
@@ -19,7 +20,8 @@ export interface Props {
|
|
|
19
20
|
pluginInjectionApi: ExtensionsPluginInjectionAPI;
|
|
20
21
|
eventDispatcher?: EventDispatcher;
|
|
21
22
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
22
|
-
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
23
|
+
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
24
|
+
rendererExtensionHandlers?: ExtensionHandlers;
|
|
23
25
|
}
|
|
24
26
|
export interface State {
|
|
25
27
|
extensionProvider?: ExtensionProvider;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
+
import { type ADFEntity } from '@atlaskit/adf-utils/types';
|
|
2
3
|
import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
|
|
3
4
|
import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
|
|
4
5
|
import type { EventDispatcher } from '../event-dispatcher';
|
|
@@ -26,8 +27,9 @@ export declare class ExtensionNode extends ReactNodeView {
|
|
|
26
27
|
extensionNodeViewOptions?: ExtensionNodeViewOptions;
|
|
27
28
|
pluginInjectionApi: ExtensionsPluginInjectionAPI;
|
|
28
29
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
29
|
-
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
30
|
+
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
31
|
+
rendererExtensionHandlers?: ExtensionHandlers;
|
|
30
32
|
}, forwardRef: ForwardRef): JSX.Element;
|
|
31
33
|
}
|
|
32
|
-
export default function ExtensionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView?: boolean): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
|
|
34
|
+
export default function ExtensionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean, rendererExtensionHandlers?: ExtensionHandlers): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
|
|
33
35
|
export {};
|
|
@@ -238,14 +238,6 @@ export type FeatureFlags = {
|
|
|
238
238
|
* @default false
|
|
239
239
|
*/
|
|
240
240
|
macroInteractionButtonUpdates?: boolean;
|
|
241
|
-
/**
|
|
242
|
-
* @description
|
|
243
|
-
* Enables renderer node view of bodied macros in live pages
|
|
244
|
-
*
|
|
245
|
-
* @see https://product-fabric.atlassian.net/browse/PGXT-5931
|
|
246
|
-
* @default false
|
|
247
|
-
*/
|
|
248
|
-
livePagesBodiedMacrosRendererView?: boolean;
|
|
249
241
|
/**
|
|
250
242
|
* @description
|
|
251
243
|
* Enables extra analytics to be added for comments on media
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Component } from 'react';
|
|
2
|
+
import { type ADFEntity } from '@atlaskit/adf-utils/types';
|
|
2
3
|
import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
|
|
3
4
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
4
5
|
import type { EventDispatcher } from '../event-dispatcher';
|
|
@@ -19,7 +20,8 @@ export interface Props {
|
|
|
19
20
|
pluginInjectionApi: ExtensionsPluginInjectionAPI;
|
|
20
21
|
eventDispatcher?: EventDispatcher;
|
|
21
22
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
22
|
-
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
23
|
+
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
24
|
+
rendererExtensionHandlers?: ExtensionHandlers;
|
|
23
25
|
}
|
|
24
26
|
export declare class Extension extends Component<Props, any> {
|
|
25
27
|
static displayName: string;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Component } from 'react';
|
|
2
|
+
import type { ADFEntity } from '@atlaskit/adf-utils/types';
|
|
2
3
|
import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
|
|
3
4
|
import type { EditorView } from '@atlaskit/editor-prosemirror/view';
|
|
4
5
|
import type { EventDispatcher } from '../event-dispatcher';
|
|
@@ -19,7 +20,8 @@ export interface Props {
|
|
|
19
20
|
pluginInjectionApi: ExtensionsPluginInjectionAPI;
|
|
20
21
|
eventDispatcher?: EventDispatcher;
|
|
21
22
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
22
|
-
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
23
|
+
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
24
|
+
rendererExtensionHandlers?: ExtensionHandlers;
|
|
23
25
|
}
|
|
24
26
|
export interface State {
|
|
25
27
|
extensionProvider?: ExtensionProvider;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
|
+
import { type ADFEntity } from '@atlaskit/adf-utils/types';
|
|
2
3
|
import type { Node as PmNode } from '@atlaskit/editor-prosemirror/model';
|
|
3
4
|
import type { EditorView, NodeView } from '@atlaskit/editor-prosemirror/view';
|
|
4
5
|
import type { EventDispatcher } from '../event-dispatcher';
|
|
@@ -26,8 +27,9 @@ export declare class ExtensionNode extends ReactNodeView {
|
|
|
26
27
|
extensionNodeViewOptions?: ExtensionNodeViewOptions;
|
|
27
28
|
pluginInjectionApi: ExtensionsPluginInjectionAPI;
|
|
28
29
|
macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags;
|
|
29
|
-
showLivePagesBodiedMacrosRendererView?: boolean;
|
|
30
|
+
showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean;
|
|
31
|
+
rendererExtensionHandlers?: ExtensionHandlers;
|
|
30
32
|
}, forwardRef: ForwardRef): JSX.Element;
|
|
31
33
|
}
|
|
32
|
-
export default function ExtensionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView?: boolean): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
|
|
34
|
+
export default function ExtensionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, providerFactory: ProviderFactory, extensionHandlers: ExtensionHandlers, extensionNodeViewOptions: ExtensionNodeViewOptions, pluginInjectionApi: ExtensionsPluginInjectionAPI, macroInteractionDesignFeatureFlags?: MacroInteractionDesignFeatureFlags, showLivePagesBodiedMacrosRendererView?: (node: ADFEntity) => boolean, rendererExtensionHandlers?: ExtensionHandlers): (node: PmNode, view: EditorView, getPos: getPosHandler) => NodeView;
|
|
33
35
|
export {};
|
|
@@ -238,14 +238,6 @@ export type FeatureFlags = {
|
|
|
238
238
|
* @default false
|
|
239
239
|
*/
|
|
240
240
|
macroInteractionButtonUpdates?: boolean;
|
|
241
|
-
/**
|
|
242
|
-
* @description
|
|
243
|
-
* Enables renderer node view of bodied macros in live pages
|
|
244
|
-
*
|
|
245
|
-
* @see https://product-fabric.atlassian.net/browse/PGXT-5931
|
|
246
|
-
* @default false
|
|
247
|
-
*/
|
|
248
|
-
livePagesBodiedMacrosRendererView?: boolean;
|
|
249
241
|
/**
|
|
250
242
|
* @description
|
|
251
243
|
* Enables extra analytics to be added for comments on media
|
package/package.json
CHANGED