@atlaskit/renderer 114.10.2 → 114.11.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/renderer
 
+## 114.11.1
+
+### Patch Changes
+
+- [#147372](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/147372)
+  [`9a77b2e8909a2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9a77b2e8909a2) -
+  Adding anlytics to help identify root cause of why annotaiton are not applied on some ranges
+- [#147400](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/147400)
+  [`800ff50276ed7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/800ff50276ed7) -
+  Clean up experiment platform_editor_nested_non_bodied_macros
+- Updated dependencies
+
+## 114.11.0
+
+### Minor Changes
+
+- [#143555](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/143555)
+  [`2827fa6f5b8d9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2827fa6f5b8d9) -
+  Updated embed card to support SSR
+
 ## 114.10.2
 
 ### Patch Changes

package/dist/cjs/actions/index.js

@@ -33,6 +33,54 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     // This module can only be used when wrapped with
     // the <RendererContext> component for now.
     (0, _defineProperty2.default)(this, "initFromContext", false);
+    // TODO: EDITOR-595 - This method is temporary and should be removed once the following issue
+    // has been identified and fixed: https://atlassian.slack.com/archives/C08JK0WSCH5/p1745902609966999
+    // This is a copy of the original canApplyAnnotationOnRange. If that returns false this is run to figure out exactly why
+    // the annotation cannot be applied to the range.
+    (0, _defineProperty2.default)(this, "_privateWhyCannotApplyAnnotationOnRange", function (pos, doc, schema) {
+      var from = pos.from,
+        to = pos.to;
+      if (isNaN(from + to) || to - from <= 0 || to < 0 || from < 0) {
+        return 'position invalid';
+      }
+      var reasons = [];
+      doc.nodesBetween(from, to, function (node, _pos, parent) {
+        // Special exception for hardBreak nodes
+        if (schema.nodes.hardBreak === node.type) {
+          return false;
+        }
+
+        // For block elements or text nodes, we want to check
+        // if annotations are allowed inside this tree
+        // or if we're leaf and not text
+        if ((0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
+          var isAllowedInlineNode = ['emoji', 'status', 'date', 'mention', 'inlineCard'].includes(node.type.name);
+          if (node.isInline && !node.isText && !isAllowedInlineNode) {
+            reasons.push("Err 1 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
+            return false;
+          } else if (node.isLeaf && !node.isText && !isAllowedInlineNode) {
+            reasons.push("Err 2 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
+            return false;
+          } else if (node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+            reasons.push("Err 3 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf, ", parent: ").concat(parent === null || parent === void 0 ? void 0 : parent.type.name));
+            return false;
+          }
+        } else {
+          if (node.isInline && !node.isText) {
+            reasons.push("Err 4 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
+            return false;
+          } else if (node.isLeaf && !node.isText) {
+            reasons.push("Err 5 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf));
+            return false;
+          } else if (node.isText && !(parent !== null && parent !== void 0 && parent.type.allowsMarkType(schema.marks.annotation))) {
+            reasons.push("Err 6 - type: ".concat(node.type.name, ", isInline: ").concat(node.isInline, ", isText: ").concat(node.isText, ", isLeaf: ").concat(node.isLeaf, ", parent: ").concat(parent === null || parent === void 0 ? void 0 : parent.type.name));
+            return false;
+          }
+        }
+        return true;
+      });
+      return reasons.join(', ');
+    });
     this.initFromContext = initFromContext;
     this.transformer = new _editorJsonTransformer.JSONTransformer();
   }
@@ -67,21 +115,82 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     key: "_privateValidatePositionsForAnnotation",
     value: function _privateValidatePositionsForAnnotation(from, to) {
       if (!this.doc || !this.schema) {
+        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+          this.onAnalyticsEvent({
+            // @ts-ignore
+            action: 'failed',
+            // @ts-ignore
+            actionSubject: 'applyAnnotation',
+            // @ts-ignore
+            actionSubjectId: 'inlineCommentFailureReason',
+            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              // @ts-ignore
+              reason: "Annotation Position validation failed - Missing doc or schema",
+              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
+              isDocValid: !!this.doc,
+              isSchemaValid: !!this.schema
+            }
+          });
+        }
         return false;
       }
       var currentSelection = _state.TextSelection.create(this.doc, from, to);
       if ((0, _utils.isEmptyTextSelection)(currentSelection, this.schema)) {
+        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+          this.onAnalyticsEvent({
+            // @ts-ignore
+            action: 'failed',
+            // @ts-ignore
+            actionSubject: 'applyAnnotation',
+            // @ts-ignore
+            actionSubjectId: 'inlineCommentFailureReason',
+            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              // @ts-ignore
+              reason: "Annotation Position validation - Empty Text Selection",
+              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
+              from: from,
+              to: to
+            }
+          });
+        }
         return false;
       }
-      return (0, _utils.canApplyAnnotationOnRange)({
+      var result = (0, _utils.canApplyAnnotationOnRange)({
         from: from,
         to: to
       }, this.doc, this.schema);
+      if (!result && this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+        this.onAnalyticsEvent({
+          // @ts-ignore
+          action: 'failed',
+          // @ts-ignore
+          actionSubject: 'applyAnnotation',
+          // @ts-ignore
+          actionSubjectId: 'inlineCommentFailureReason',
+          eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+          attributes: {
+            // @ts-ignore
+            reason: "Annotation canApplyAnnotationOnRange failed",
+            details: this._privateWhyCannotApplyAnnotationOnRange({
+              from: from,
+              to: to
+            }, this.doc, this.schema),
+            commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
+            from: from,
+            to: to
+          }
+        });
+      }
+      return result;
     }
-    //#endregion
   }, {
     key: "deleteAnnotation",
-    value: function deleteAnnotation(annotationId, annotationType) {
+    value:
+    //#endregion
+
+    function deleteAnnotation(annotationId, annotationType) {
       if (!this.doc || !this.schema || !this.schema.marks.annotation) {
         return false;
       }
@@ -232,6 +341,24 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     key: "isValidAnnotationPosition",
     value: function isValidAnnotationPosition(pos) {
       if (!pos || !this.doc) {
+        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+          this.onAnalyticsEvent({
+            // @ts-ignore
+            action: 'failed',
+            // @ts-ignore
+            actionSubject: 'applyAnnotation',
+            // @ts-ignore
+            actionSubjectId: 'inlineCommentFailureReason',
+            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              // @ts-ignore
+              reason: "Annotation Position validation failed - Missing doc or position",
+              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
+              isPosValid: !!pos,
+              isDocValid: !!this.doc
+            }
+          });
+        }
         return false;
       }
       return this._privateValidatePositionsForAnnotation(pos.from, pos.to);
@@ -293,6 +420,25 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
     key: "applyAnnotation",
     value: function applyAnnotation(pos, annotation) {
       if (!this.doc || !pos || !this.schema) {
+        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+          this.onAnalyticsEvent({
+            // @ts-ignore
+            action: 'failed',
+            // @ts-ignore
+            actionSubject: 'applyAnnotation',
+            // @ts-ignore
+            actionSubjectId: 'inlineCommentFailureReason',
+            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              // @ts-ignore
+              reason: "Annotation applyAnnotation failed - Missing doc, position or schema",
+              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes'),
+              isPosValid: !!pos,
+              isDocValid: !!this.doc,
+              isSchemaValid: !!this.schema
+            }
+          });
+        }
         return false;
       }
       var from = pos.from,
@@ -326,6 +472,22 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
         doc = _step$apply2.doc,
         failed = _step$apply2.failed;
       if (failed || !doc) {
+        if (this.onAnalyticsEvent && (0, _platformFeatureFlags.fg)('platform_renderer_annotations_create_debug_logging')) {
+          this.onAnalyticsEvent({
+            // @ts-ignore
+            action: 'failed',
+            // @ts-ignore
+            actionSubject: 'applyAnnotation',
+            // @ts-ignore
+            actionSubjectId: 'inlineCommentFailureReason',
+            eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+            attributes: {
+              // @ts-ignore
+              reason: "Annotation applyAnnotation failed - ".concat(failed),
+              commentsOnInlineNodesAllowed: (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')
+            }
+          });
+        }
         return false;
       }
       var originalSelection = doc.textBetween(from, to);

package/dist/cjs/react/nodes/embedCard.js

@@ -10,9 +10,11 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("@emotion/react");
 var _react2 = require("react");
 var _smartCard = require("@atlaskit/smart-card");
+var _ssr = require("@atlaskit/smart-card/ssr");
 var _linkProvider = require("@atlaskit/link-provider");
 var _ui = require("@atlaskit/editor-common/ui");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _fallback = require("./fallback");
 var _style = require("../../ui/Renderer/style");
 var _getCardClickHandler = require("../utils/getCardClickHandler");
@@ -146,6 +148,39 @@ function EmbedCard(props) {
         throw err;
       }
     };
+    var cardComponent;
+    if (smartLinks !== null && smartLinks !== void 0 && smartLinks.ssr && url && (0, _platformFeatureFlags.fg)('platform_ssr_smartlink_embeds')) {
+      var _smartLinks$frameStyl2;
+      var ssrCardProps = {
+        url: url,
+        onClick: onClick,
+        container: portal,
+        platform: platform,
+        frameStyle: (_smartLinks$frameStyl2 = smartLinks === null || smartLinks === void 0 ? void 0 : smartLinks.frameStyle) !== null && _smartLinks$frameStyl2 !== void 0 ? _smartLinks$frameStyl2 : 'show',
+        actionOptions: actionOptions
+      };
+      cardComponent = (0, _react.jsx)(_ssr.CardSSR, (0, _extends2.default)({
+        appearance: "embed"
+        // Ignored via go/ees005
+        // eslint-disable-next-line react/jsx-props-no-spreading
+      }, ssrCardProps, {
+        onResolve: onResolve,
+        inheritDimensions: true,
+        embedIframeRef: embedIframeRef,
+        onError: onError
+      }));
+    } else {
+      cardComponent = (0, _react.jsx)(_smartCard.Card, (0, _extends2.default)({
+        appearance: "embed"
+        // Ignored via go/ees005
+        // eslint-disable-next-line react/jsx-props-no-spreading
+      }, cardProps, {
+        onResolve: onResolve,
+        inheritDimensions: true,
+        embedIframeRef: embedIframeRef,
+        onError: onError
+      }));
+    }
     return (
       // Ignored via go/ees005
       // eslint-disable-next-line react/jsx-props-no-spreading
@@ -177,16 +212,7 @@ function EmbedCard(props) {
         "data-card-data": data ? JSON.stringify(data) : undefined,
         "data-card-url": url,
         "data-card-original-height": originalHeight
-      }, (0, _react.jsx)(_smartCard.Card, (0, _extends2.default)({
-        appearance: "embed"
-        // Ignored via go/ees005
-        // eslint-disable-next-line react/jsx-props-no-spreading
-      }, cardProps, {
-        onResolve: onResolve,
-        inheritDimensions: true,
-        embedIframeRef: embedIframeRef,
-        onError: onError
-      })))))))
+      }, cardComponent)))))
     );
   }));
 }

package/dist/cjs/react/nodes/tableRow.js

@@ -57,7 +57,7 @@ var TableRow = exports.default = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2.default)(_this, "addColGroupWidth", function (childrenArray) {
       var _this$state$colGroupW;
-      if ((0, _platformFeatureFlags.fg)('platform_editor_table_column_group_width_check') ? (_this$state$colGroupW = _this.state.colGroupWidths) === null || _this$state$colGroupW === void 0 ? void 0 : _this$state$colGroupW.length : _this.state.colGroupWidths) {
+      if ((0, _platformFeatureFlags.fg)('platform_editor_table_column_group_width_check_3') ? (_this$state$colGroupW = _this.state.colGroupWidths) === null || _this$state$colGroupW === void 0 ? void 0 : _this$state$colGroupW.length : _this.state.colGroupWidths) {
         childrenArray = childrenArray.map(function (child, index) {
           if ( /*#__PURE__*/_react.default.isValidElement(child)) {
             return /*#__PURE__*/_react.default.cloneElement(child, {

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

@@ -239,7 +239,7 @@ var blockquoteSharedStyles = (0, _react.css)({
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
     '> .extensionView-content-wrap:last-child': {
       // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values, @atlaskit/ui-styling-standard/no-unsafe-values -- Ignored via go/DSP-18766
-      display: "".concat((0, _experiments.editorExperiment)('platform_editor_nested_non_bodied_macros', 'test')) ? 'block' : 'inline-block'
+      display: 'block'
     }
   }
 });
@@ -472,17 +472,17 @@ var listsSharedStyles = (0, _react.css)((_css3 = {
   }
 }, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_css3, "".concat(_adfSchema.orderedListSelector, ", ").concat(_adfSchema.bulletListSelector), {
   /*
-      Ensures list item content adheres to the list's margin instead
-      of filling the entire block row. This is important to allow
-      clicking interactive elements which are floated next to a list.
-       For some history and context on this block, see PRs related to tickets.:
-      @see ED-6551 - original issue.
-      @see ED-7015 - follow up issue.
-      @see ED-7447 - flow-root change.
+   Ensures list item content adheres to the list's margin instead
+   of filling the entire block row. This is important to allow
+   clicking interactive elements which are floated next to a list.
+    For some history and context on this block, see PRs related to tickets.:
+   @see ED-6551 - original issue.
+   @see ED-7015 - follow up issue.
+   @see ED-7447 - flow-root change.
     used to have display: 'table' in tag template style but not supported in object styles
    removed display: 'table' as 'flow-root' is supported in latest browsers
-       @see https://css-tricks.com/display-flow-root/
-    */
+    @see https://css-tricks.com/display-flow-root/
+  */
   display: 'flow-root'
 }), 'ul, ul ul ul ul', {
   listStyleType: 'disc'
@@ -1365,7 +1365,7 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
   var isAdvancedLayoutsOn = (0, _experiments.editorExperiment)('advanced_layouts', true);
   if ((0, _platformFeatureFlags.fg)('platform_editor_emotion_refactor_renderer')) {
     return (
-      // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+      // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions, @atlassian/a11y/interactive-element-not-keyboard-focusable
       (0, _react.jsx)("div", {
         ref: innerRef,
         onClick: onClick,
@@ -1392,7 +1392,7 @@ var RendererStyleContainer = exports.RendererStyleContainer = function RendererS
     );
   }
   return (
-    // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
+    // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions, @atlassian/a11y/interactive-element-not-keyboard-focusable
     (0, _react.jsx)("div", {
       ref: innerRef,
       onClick: onClick,