@atlaskit/editor-common 78.9.4 → 78.10.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-common
 
+## 78.10.0
+
+### Minor Changes
+
+- [#77821](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/77821) [`41dfb88ade75`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/41dfb88ade75) - [ux] Adds lozenge design update to inline macros if macroInteractionDesignUpdate flag is true
+
+### Patch Changes
+
+- [#78224](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/78224) [`6b4c9dd4ad34`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6b4c9dd4ad34) - ED-22219: adf-schema updated to 35.5.2
+- Updated dependencies
+
 ## 78.9.4
 
 ### Patch Changes

package/dist/cjs/extensibility/Extension/InlineExtension/index.js

@@ -37,7 +37,11 @@ var InlineExtension = exports.default = /*#__PURE__*/function (_Component) {
         isNodeSelected = _this$props.isNodeSelected;
       var hasChildren = !!children;
       var className = hasChildren ? 'with-overlay with-children' : 'with-overlay';
-      return (0, _react2.jsx)("div", {
+      return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && (0, _react2.jsx)(_Lozenge.default, {
+        node: node,
+        isNodeSelected: isNodeSelected,
+        showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
+      }), (0, _react2.jsx)("div", {
         css: _styles2.wrapperStyle,
         className: "extension-container inline ".concat(className)
       }, (0, _react2.jsx)("div", {
@@ -47,7 +51,7 @@ var InlineExtension = exports.default = /*#__PURE__*/function (_Component) {
         node: node,
         isNodeSelected: isNodeSelected,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-      }));
+      })));
     }
   }]);
   return InlineExtension;

package/dist/cjs/extensibility/ExtensionNodeWrapper.js

@@ -6,9 +6,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ExtensionNodeWrapper = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@emotion/react");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("../utils");
+/** @jsx jsx */
+
+var styles = (0, _react2.css)({
+  '&.inline-extension': {
+    display: 'inline-block'
+  }
+});
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
+ * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
@@ -16,6 +26,13 @@ var _utils = require("../utils");
  */
 var ExtensionNodeWrapper = exports.ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
   var children = _ref.children,
-    nodeType = _ref.nodeType;
-  return /*#__PURE__*/_react.default.createElement("span", null, children, nodeType === 'inlineExtension' && _utils.ZERO_WIDTH_SPACE);
+    nodeType = _ref.nodeType,
+    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
+  var wrapperClassNames = (0, _classnames.default)({
+    'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates
+  });
+  return (0, _react2.jsx)("span", {
+    className: wrapperClassNames,
+    css: styles
+  }, children, nodeType === 'inlineExtension' && _utils.ZERO_WIDTH_SPACE);
 };

package/dist/cjs/extensibility/extensionNodeView.js

@@ -55,7 +55,8 @@ var ExtensionNode = exports.ExtensionNode = /*#__PURE__*/function (_ReactNodeVie
     value: function render(props, forwardRef) {
       var _props$extensionNodeV;
       return /*#__PURE__*/_react.default.createElement(_ExtensionNodeWrapper.ExtensionNodeWrapper, {
-        nodeType: this.node.type.name
+        nodeType: this.node.type.name,
+        showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
       }, /*#__PURE__*/_react.default.createElement(_Extension.Extension, {
         editorView: this.view,
         node: this.node,

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.9.4";
+var packageVersion = "78.10.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/ui/DropList/index.js

@@ -22,7 +22,7 @@ var _templateObject, _templateObject2, _templateObject3;
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.9.4";
+var packageVersion = "78.10.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/es2019/extensibility/Extension/InlineExtension/index.js

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { jsx } from '@emotion/react';
 import ExtensionLozenge from '../Lozenge';
 import { overlay } from '../styles';
@@ -14,7 +14,11 @@ export default class InlineExtension extends Component {
     } = this.props;
     const hasChildren = !!children;
     const className = hasChildren ? 'with-overlay with-children' : 'with-overlay';
-    return jsx("div", {
+    return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
+      node: node,
+      isNodeSelected: isNodeSelected,
+      showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
+    }), jsx("div", {
       css: wrapperStyle,
       className: `extension-container inline ${className}`
     }, jsx("div", {
@@ -24,6 +28,6 @@ export default class InlineExtension extends Component {
       node: node,
       isNodeSelected: isNodeSelected,
       showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-    }));
+    })));
   }
 }

package/dist/es2019/extensibility/ExtensionNodeWrapper.js

@@ -1,7 +1,16 @@
+/** @jsx jsx */
 import React from 'react';
+import { css, jsx } from '@emotion/react';
+import classnames from 'classnames';
 import { ZERO_WIDTH_SPACE } from '../utils';
+const styles = css({
+  '&.inline-extension': {
+    display: 'inline-block'
+  }
+});
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
+ * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
@@ -9,5 +18,14 @@ import { ZERO_WIDTH_SPACE } from '../utils';
  */
 export const ExtensionNodeWrapper = ({
   children,
-  nodeType
-}) => /*#__PURE__*/React.createElement("span", null, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
+  nodeType,
+  showMacroInteractionDesignUpdates
+}) => {
+  const wrapperClassNames = classnames({
+    'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates
+  });
+  return jsx("span", {
+    className: wrapperClassNames,
+    css: styles
+  }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
+};

package/dist/es2019/extensibility/extensionNodeView.js

@@ -28,7 +28,8 @@ export class ExtensionNode extends ReactNodeView {
   render(props, forwardRef) {
     var _props$extensionNodeV;
     return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
-      nodeType: this.node.type.name
+      nodeType: this.node.type.name,
+      showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
     }, /*#__PURE__*/React.createElement(Extension, {
       editorView: this.view,
       node: this.node,

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "78.9.4";
+const packageVersion = "78.10.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/ui/DropList/index.js

@@ -7,7 +7,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "78.9.4";
+const packageVersion = "78.10.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/extensibility/Extension/InlineExtension/index.js

@@ -6,7 +6,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /** @jsx jsx */
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { jsx } from '@emotion/react';
 import ExtensionLozenge from '../Lozenge';
 import { overlay } from '../styles';
@@ -28,7 +28,11 @@ var InlineExtension = /*#__PURE__*/function (_Component) {
         isNodeSelected = _this$props.isNodeSelected;
       var hasChildren = !!children;
       var className = hasChildren ? 'with-overlay with-children' : 'with-overlay';
-      return jsx("div", {
+      return jsx(Fragment, null, showMacroInteractionDesignUpdates && jsx(ExtensionLozenge, {
+        node: node,
+        isNodeSelected: isNodeSelected,
+        showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
+      }), jsx("div", {
         css: wrapperStyle,
         className: "extension-container inline ".concat(className)
       }, jsx("div", {
@@ -38,7 +42,7 @@ var InlineExtension = /*#__PURE__*/function (_Component) {
         node: node,
         isNodeSelected: isNodeSelected,
         showMacroInteractionDesignUpdates: showMacroInteractionDesignUpdates
-      }));
+      })));
     }
   }]);
   return InlineExtension;

package/dist/esm/extensibility/ExtensionNodeWrapper.js

@@ -1,7 +1,16 @@
+/** @jsx jsx */
 import React from 'react';
+import { css, jsx } from '@emotion/react';
+import classnames from 'classnames';
 import { ZERO_WIDTH_SPACE } from '../utils';
+var styles = css({
+  '&.inline-extension': {
+    display: 'inline-block'
+  }
+});
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
+ * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
@@ -9,6 +18,13 @@ import { ZERO_WIDTH_SPACE } from '../utils';
  */
 export var ExtensionNodeWrapper = function ExtensionNodeWrapper(_ref) {
   var children = _ref.children,
-    nodeType = _ref.nodeType;
-  return /*#__PURE__*/React.createElement("span", null, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
+    nodeType = _ref.nodeType,
+    showMacroInteractionDesignUpdates = _ref.showMacroInteractionDesignUpdates;
+  var wrapperClassNames = classnames({
+    'inline-extension': nodeType === 'inlineExtension' && showMacroInteractionDesignUpdates
+  });
+  return jsx("span", {
+    className: wrapperClassNames,
+    css: styles
+  }, children, nodeType === 'inlineExtension' && ZERO_WIDTH_SPACE);
 };

package/dist/esm/extensibility/extensionNodeView.js

@@ -47,7 +47,8 @@ export var ExtensionNode = /*#__PURE__*/function (_ReactNodeView) {
     value: function render(props, forwardRef) {
       var _props$extensionNodeV;
       return /*#__PURE__*/React.createElement(ExtensionNodeWrapper, {
-        nodeType: this.node.type.name
+        nodeType: this.node.type.name,
+        showMacroInteractionDesignUpdates: props.showMacroInteractionDesignUpdates
       }, /*#__PURE__*/React.createElement(Extension, {
         editorView: this.view,
         node: this.node,

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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) { _defineProperty(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; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "78.9.4";
+var packageVersion = "78.10.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/ui/DropList/index.js

@@ -17,7 +17,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "78.9.4";
+var packageVersion = "78.10.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/extensibility/ExtensionNodeWrapper.d.ts

@@ -1,14 +1,18 @@
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/react';
 type Props = {
     children: React.ReactNode;
     nodeType: string;
+    showMacroInteractionDesignUpdates?: boolean;
 };
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
+ * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
  * @returns
  */
-export declare const ExtensionNodeWrapper: ({ children, nodeType }: Props) => JSX.Element;
+export declare const ExtensionNodeWrapper: ({ children, nodeType, showMacroInteractionDesignUpdates, }: Props) => jsx.JSX.Element;
 export {};

package/dist/types-ts4.5/extensibility/ExtensionNodeWrapper.d.ts

@@ -1,14 +1,18 @@
+/** @jsx jsx */
 import React from 'react';
+import { jsx } from '@emotion/react';
 type Props = {
     children: React.ReactNode;
     nodeType: string;
+    showMacroInteractionDesignUpdates?: boolean;
 };
 /**
  * If inlineExtension, add zero width space to the end of the nodes and wrap with span;
+ * Also if showMacroInteractionDesignUpdates is true, then add the inline-block style to account for the lozenge.
  * else wrap with a div (for multi bodied extensions)
  *
  * @param param0
  * @returns
  */
-export declare const ExtensionNodeWrapper: ({ children, nodeType }: Props) => JSX.Element;
+export declare const ExtensionNodeWrapper: ({ children, nodeType, showMacroInteractionDesignUpdates, }: Props) => jsx.JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "78.9.4",
+  "version": "78.10.0",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -93,7 +93,7 @@
   },
   "dependencies": {
     "@atlaskit/activity-provider": "^2.4.0",
-    "@atlaskit/adf-schema": "^35.5.1",
+    "@atlaskit/adf-schema": "^35.5.2",
     "@atlaskit/adf-utils": "^19.0.0",
     "@atlaskit/analytics-listeners": "^8.9.0",
     "@atlaskit/analytics-namespaced-context": "^6.9.0",
@@ -102,7 +102,7 @@
     "@atlaskit/button": "^17.6.0",
     "@atlaskit/code": "^15.1.0",
     "@atlaskit/codemod-utils": "^4.2.0",
-    "@atlaskit/custom-steps": "^0.0.13",
+    "@atlaskit/custom-steps": "^0.0.14",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-palette": "1.5.2",
     "@atlaskit/editor-prosemirror": "3.0.0",