@atlaskit/renderer 121.0.2 → 121.1.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/renderer
 
+## 121.1.1
+
+### Patch Changes
+
+- [`3ab04666dacdf`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3ab04666dacdf) -
+  fix inline style for plain text inline extension macro
+
+## 121.1.0
+
+### Minor Changes
+
+- [`7992070df7ee6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7992070df7ee6) -
+  Add functionality to enable resolving sharepoint hyperlinks on the renderer
+
+### Patch Changes
+
+- [`d166c84c76a50`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d166c84c76a50) -
+  Feature gate cleanup: cc_comments_more_complete_empty_text_check
+- Updated dependencies
+
 ## 121.0.2
 
 ### Patch Changes

package/dist/cjs/actions/index.js

@@ -69,9 +69,8 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
       if (!this.doc || !this.schema) {
         return false;
       }
-      var isEmptyTextSelectionCheck = (0, _platformFeatureFlags.fg)('cc_comments_more_complete_empty_text_check') ? _utils.isEmptyTextSelectionRenderer : _utils.isEmptyTextSelection;
       var currentSelection = _state.TextSelection.create(this.doc, from, to);
-      if (isEmptyTextSelectionCheck(currentSelection, this.schema)) {
+      if ((0, _utils.isEmptyTextSelectionRenderer)(currentSelection, this.schema)) {
         return false;
       }
       var result = (0, _utils.canApplyAnnotationOnRange)({

package/dist/cjs/react/marks/link.js

@@ -82,6 +82,7 @@ function Link(props) {
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
   }, anchorProps, dataAttributes, {
-    isLinkComponent: true
+    isLinkComponent: true,
+    enableResolve: true
   }), props.children));
 }

package/dist/cjs/ui/ExtensionRenderer.js

@@ -13,6 +13,7 @@ var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _extensions = require("@atlaskit/editor-common/extensions");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _utils = require("@atlaskit/editor-common/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -36,6 +37,14 @@ var inlineExtensionStyle = (0, _react.css)({
     maxWidth: '100%'
   }
 });
+var plainTextMacroStyle = (0, _react.css)({
+  display: 'inline',
+  verticalAlign: 'baseline',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '[data-macro-body]': {
+    display: 'inline'
+  }
+});
 function ExtensionRenderer(props) {
   var extensionHandlers = props.extensionHandlers,
     rendererContext = props.rendererContext,
@@ -68,7 +77,7 @@ function ExtensionRenderer(props) {
     });
   }, []);
   var renderExtensionNode = _react2.default.useCallback(function (extensionProvider) {
-    var _marks$find;
+    var _marks$find, _node$parameters;
     var fragmentLocalId = marks === null || marks === void 0 || (_marks$find = marks.find(function (m) {
       return m.type.name === 'fragment';
     })) === null || _marks$find === void 0 || (_marks$find = _marks$find.attrs) === null || _marks$find === void 0 ? void 0 : _marks$find.localId;
@@ -81,6 +90,7 @@ function ExtensionRenderer(props) {
       localId: localId,
       fragmentLocalId: fragmentLocalId
     };
+    var isPlainTextMacro = Boolean(node === null || node === void 0 || (_node$parameters = node.parameters) === null || _node$parameters === void 0 || (_node$parameters = _node$parameters.macroParams) === null || _node$parameters === void 0 ? void 0 : _node$parameters.__bodyContent);
     var result = null;
     try {
       if (extensionHandlers && extensionHandlers[extensionType]) {
@@ -95,9 +105,17 @@ function ExtensionRenderer(props) {
             actions: actions
           });
         } else if (node.type === 'inlineExtension') {
-          result = (0, _react.jsx)(InlineNodeRendererWrapper, null, (0, _react.jsx)(NodeRenderer, {
-            node: node
-          }));
+          if ((0, _platformFeatureFlags.fg)('platform_editor_renderer_inline_extension_improve')) {
+            result = (0, _react.jsx)(InlineNodeRendererWrapper, {
+              isPlainTextMacro: isPlainTextMacro
+            }, (0, _react.jsx)(NodeRenderer, {
+              node: node
+            }));
+          } else {
+            result = (0, _react.jsx)(InlineNodeRendererWrapper, null, (0, _react.jsx)(NodeRenderer, {
+              node: node
+            }));
+          }
         } else {
           result = (0, _react.jsx)(NodeRenderer, {
             node: node
@@ -135,12 +153,13 @@ function ExtensionRenderer(props) {
 }
 var InlineNodeRendererWrapper = exports.InlineNodeRendererWrapper = function InlineNodeRendererWrapper(_ref) {
   var children = _ref.children,
+    isPlainTextMacro = _ref.isPlainTextMacro,
     ssrPlaceholder = _ref.ssrPlaceholder,
     ssrPlaceholderReplace = _ref.ssrPlaceholderReplace;
   return (0, _react.jsx)("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: "inline-extension-renderer",
-    css: inlineExtensionStyle,
+    className: "inline-extension-renderer ".concat(isPlainTextMacro ? 'plain-text-macro' : ''),
+    css: [inlineExtensionStyle, isPlainTextMacro && plainTextMacroStyle],
     "data-ssr-placeholder": ssrPlaceholder,
     "data-ssr-placeholder-replace": ssrPlaceholderReplace
   }, children);

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

@@ -63,7 +63,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "0.0.0-development";
+var packageVersion = "121.1.0";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/actions/index.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { AnnotationTypes } from '@atlaskit/adf-schema';
-import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, isEmptyTextSelection, isEmptyTextSelectionRenderer } from '@atlaskit/editor-common/utils';
+import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, isEmptyTextSelectionRenderer } from '@atlaskit/editor-common/utils';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
@@ -49,9 +49,8 @@ export default class RendererActions {
     if (!this.doc || !this.schema) {
       return false;
     }
-    const isEmptyTextSelectionCheck = fg('cc_comments_more_complete_empty_text_check') ? isEmptyTextSelectionRenderer : isEmptyTextSelection;
     const currentSelection = TextSelection.create(this.doc, from, to);
-    if (isEmptyTextSelectionCheck(currentSelection, this.schema)) {
+    if (isEmptyTextSelectionRenderer(currentSelection, this.schema)) {
       return false;
     }
     const result = canApplyAnnotationOnRange({

package/dist/es2019/react/marks/link.js

@@ -73,6 +73,7 @@ export default function Link(props) {
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
   }, anchorProps, dataAttributes, {
-    isLinkComponent: true
+    isLinkComponent: true,
+    enableResolve: true
   }), props.children));
 }

package/dist/es2019/ui/ExtensionRenderer.js

@@ -9,6 +9,7 @@ import memoizeOne from 'memoize-one';
 import { getNodeRenderer } from '@atlaskit/editor-common/extensions';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { getExtensionRenderer } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 const inlineExtensionStyle = css({
   display: 'inline-block',
   maxWidth: '100%',
@@ -26,6 +27,14 @@ const inlineExtensionStyle = css({
     maxWidth: '100%'
   }
 });
+const plainTextMacroStyle = css({
+  display: 'inline',
+  verticalAlign: 'baseline',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '[data-macro-body]': {
+    display: 'inline'
+  }
+});
 export default function ExtensionRenderer(props) {
   const {
     extensionHandlers,
@@ -55,7 +64,7 @@ export default function ExtensionRenderer(props) {
     });
   }, []);
   const renderExtensionNode = React.useCallback(extensionProvider => {
-    var _marks$find, _marks$find$attrs;
+    var _marks$find, _marks$find$attrs, _node$parameters, _node$parameters$macr;
     const fragmentLocalId = marks === null || marks === void 0 ? void 0 : (_marks$find = marks.find(m => m.type.name === 'fragment')) === null || _marks$find === void 0 ? void 0 : (_marks$find$attrs = _marks$find.attrs) === null || _marks$find$attrs === void 0 ? void 0 : _marks$find$attrs.localId;
     const node = {
       type,
@@ -66,6 +75,7 @@ export default function ExtensionRenderer(props) {
       localId,
       fragmentLocalId
     };
+    const isPlainTextMacro = Boolean(node === null || node === void 0 ? void 0 : (_node$parameters = node.parameters) === null || _node$parameters === void 0 ? void 0 : (_node$parameters$macr = _node$parameters.macroParams) === null || _node$parameters$macr === void 0 ? void 0 : _node$parameters$macr.__bodyContent);
     let result = null;
     try {
       if (extensionHandlers && extensionHandlers[extensionType]) {
@@ -80,9 +90,17 @@ export default function ExtensionRenderer(props) {
             actions: actions
           });
         } else if (node.type === 'inlineExtension') {
-          result = jsx(InlineNodeRendererWrapper, null, jsx(NodeRenderer, {
-            node: node
-          }));
+          if (fg('platform_editor_renderer_inline_extension_improve')) {
+            result = jsx(InlineNodeRendererWrapper, {
+              isPlainTextMacro: isPlainTextMacro
+            }, jsx(NodeRenderer, {
+              node: node
+            }));
+          } else {
+            result = jsx(InlineNodeRendererWrapper, null, jsx(NodeRenderer, {
+              node: node
+            }));
+          }
         } else {
           result = jsx(NodeRenderer, {
             node: node
@@ -120,13 +138,14 @@ export default function ExtensionRenderer(props) {
 }
 export const InlineNodeRendererWrapper = ({
   children,
+  isPlainTextMacro,
   ssrPlaceholder,
   ssrPlaceholderReplace
 }) => {
   return jsx("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: "inline-extension-renderer",
-    css: inlineExtensionStyle,
+    className: `inline-extension-renderer ${isPlainTextMacro ? 'plain-text-macro' : ''}`,
+    css: [inlineExtensionStyle, isPlainTextMacro && plainTextMacroStyle],
     "data-ssr-placeholder": ssrPlaceholder,
     "data-ssr-placeholder-replace": ssrPlaceholderReplace
   }, children);

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

@@ -49,7 +49,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "0.0.0-development";
+const packageVersion = "121.1.0";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/actions/index.js

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
 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; }
 import { AnnotationTypes } from '@atlaskit/adf-schema';
-import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, isEmptyTextSelection, isEmptyTextSelectionRenderer } from '@atlaskit/editor-common/utils';
+import { canApplyAnnotationOnRange, getAnnotationIdsFromRange, getAnnotationInlineNodeTypes, isEmptyTextSelectionRenderer } from '@atlaskit/editor-common/utils';
 import { JSONTransformer } from '@atlaskit/editor-json-transformer';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
@@ -62,9 +62,8 @@ var RendererActions = /*#__PURE__*/function () {
       if (!this.doc || !this.schema) {
         return false;
       }
-      var isEmptyTextSelectionCheck = fg('cc_comments_more_complete_empty_text_check') ? isEmptyTextSelectionRenderer : isEmptyTextSelection;
       var currentSelection = TextSelection.create(this.doc, from, to);
-      if (isEmptyTextSelectionCheck(currentSelection, this.schema)) {
+      if (isEmptyTextSelectionRenderer(currentSelection, this.schema)) {
         return false;
       }
       var result = canApplyAnnotationOnRange({

package/dist/esm/react/marks/link.js

@@ -71,6 +71,7 @@ export default function Link(props) {
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
   }, anchorProps, dataAttributes, {
-    isLinkComponent: true
+    isLinkComponent: true,
+    enableResolve: true
   }), props.children));
 }

package/dist/esm/ui/ExtensionRenderer.js

@@ -10,6 +10,7 @@ import memoizeOne from 'memoize-one';
 import { getNodeRenderer } from '@atlaskit/editor-common/extensions';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { getExtensionRenderer } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 var inlineExtensionStyle = css({
   display: 'inline-block',
   maxWidth: '100%',
@@ -27,6 +28,14 @@ var inlineExtensionStyle = css({
     maxWidth: '100%'
   }
 });
+var plainTextMacroStyle = css({
+  display: 'inline',
+  verticalAlign: 'baseline',
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '[data-macro-body]': {
+    display: 'inline'
+  }
+});
 export default function ExtensionRenderer(props) {
   var extensionHandlers = props.extensionHandlers,
     rendererContext = props.rendererContext,
@@ -59,7 +68,7 @@ export default function ExtensionRenderer(props) {
     });
   }, []);
   var renderExtensionNode = React.useCallback(function (extensionProvider) {
-    var _marks$find;
+    var _marks$find, _node$parameters;
     var fragmentLocalId = marks === null || marks === void 0 || (_marks$find = marks.find(function (m) {
       return m.type.name === 'fragment';
     })) === null || _marks$find === void 0 || (_marks$find = _marks$find.attrs) === null || _marks$find === void 0 ? void 0 : _marks$find.localId;
@@ -72,6 +81,7 @@ export default function ExtensionRenderer(props) {
       localId: localId,
       fragmentLocalId: fragmentLocalId
     };
+    var isPlainTextMacro = Boolean(node === null || node === void 0 || (_node$parameters = node.parameters) === null || _node$parameters === void 0 || (_node$parameters = _node$parameters.macroParams) === null || _node$parameters === void 0 ? void 0 : _node$parameters.__bodyContent);
     var result = null;
     try {
       if (extensionHandlers && extensionHandlers[extensionType]) {
@@ -86,9 +96,17 @@ export default function ExtensionRenderer(props) {
             actions: actions
           });
         } else if (node.type === 'inlineExtension') {
-          result = jsx(InlineNodeRendererWrapper, null, jsx(NodeRenderer, {
-            node: node
-          }));
+          if (fg('platform_editor_renderer_inline_extension_improve')) {
+            result = jsx(InlineNodeRendererWrapper, {
+              isPlainTextMacro: isPlainTextMacro
+            }, jsx(NodeRenderer, {
+              node: node
+            }));
+          } else {
+            result = jsx(InlineNodeRendererWrapper, null, jsx(NodeRenderer, {
+              node: node
+            }));
+          }
         } else {
           result = jsx(NodeRenderer, {
             node: node
@@ -126,12 +144,13 @@ export default function ExtensionRenderer(props) {
 }
 export var InlineNodeRendererWrapper = function InlineNodeRendererWrapper(_ref) {
   var children = _ref.children,
+    isPlainTextMacro = _ref.isPlainTextMacro,
     ssrPlaceholder = _ref.ssrPlaceholder,
     ssrPlaceholderReplace = _ref.ssrPlaceholderReplace;
   return jsx("div", {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-    className: "inline-extension-renderer",
-    css: inlineExtensionStyle,
+    className: "inline-extension-renderer ".concat(isPlainTextMacro ? 'plain-text-macro' : ''),
+    css: [inlineExtensionStyle, isPlainTextMacro && plainTextMacroStyle],
     "data-ssr-placeholder": ssrPlaceholder,
     "data-ssr-placeholder-replace": ssrPlaceholderReplace
   }, children);

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

@@ -54,7 +54,7 @@ import { expValEqualsNoExposure } from '@atlaskit/tmp-editor-statsig/exp-val-equ
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "0.0.0-development";
+var packageVersion = "121.1.0";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/types/ui/ExtensionRenderer.d.ts

@@ -28,7 +28,8 @@ interface Props {
     type: 'extension' | 'inlineExtension' | 'bodiedExtension' | 'multiBodiedExtension';
 }
 export default function ExtensionRenderer(props: Props): JSX.Element;
-export declare const InlineNodeRendererWrapper: ({ children, ssrPlaceholder, ssrPlaceholderReplace, }: React.PropsWithChildren<{
+export declare const InlineNodeRendererWrapper: ({ children, isPlainTextMacro, ssrPlaceholder, ssrPlaceholderReplace, }: React.PropsWithChildren<{
+    isPlainTextMacro?: boolean;
     ssrPlaceholder?: string;
     ssrPlaceholderReplace?: string;
 }>) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/ExtensionRenderer.d.ts

@@ -28,7 +28,8 @@ interface Props {
     type: 'extension' | 'inlineExtension' | 'bodiedExtension' | 'multiBodiedExtension';
 }
 export default function ExtensionRenderer(props: Props): JSX.Element;
-export declare const InlineNodeRendererWrapper: ({ children, ssrPlaceholder, ssrPlaceholderReplace, }: React.PropsWithChildren<{
+export declare const InlineNodeRendererWrapper: ({ children, isPlainTextMacro, ssrPlaceholder, ssrPlaceholderReplace, }: React.PropsWithChildren<{
+    isPlainTextMacro?: boolean;
     ssrPlaceholder?: string;
     ssrPlaceholderReplace?: string;
 }>) => jsx.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "121.0.2",
+	"version": "121.1.1",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -50,11 +50,11 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
 		"@atlaskit/react-ufo": "^4.5.0",
-		"@atlaskit/smart-card": "^40.17.0",
+		"@atlaskit/smart-card": "^40.18.0",
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/theme": "^20.0.0",
-		"@atlaskit/tmp-editor-statsig": "^12.2.0",
+		"@atlaskit/tmp-editor-statsig": "^12.3.0",
 		"@atlaskit/tokens": "^6.1.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
@@ -128,9 +128,6 @@
 		"cc_comments_improve_apply_draft_errors": {
 			"type": "boolean"
 		},
-		"cc_comments_more_complete_empty_text_check": {
-			"type": "boolean"
-		},
 		"platform-ssr-table-resize": {
 			"type": "boolean"
 		},
@@ -260,6 +257,9 @@
 		"platform_editor_numbered_column_in_include": {
 			"type": "boolean"
 		},
+		"platform_editor_renderer_inline_extension_improve": {
+			"type": "boolean"
+		},
 		"jfp-magma-ssr-iv-editor-media": {
 			"type": "boolean"
 		},