@atlaskit/renderer 124.1.5 → 124.1.7

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/renderer
 
+## 124.1.7
+
+### Patch Changes
+
+- [`8cfc5fed7dc74`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8cfc5fed7dc74) -
+  Cleanup annotations_defensive_node_name_calculations
+
+## 124.1.6
+
+### Patch Changes
+
+- [`6b08c3a8cde08`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6b08c3a8cde08) -
+  Construct confluence url from smart card embed preview href when smart card url is short
+  confluence url, in the form "{host}/wiki/x/{hash}"
+- Updated dependencies
+
 ## 124.1.5
 
 ### Patch Changes

package/afm-cc/tsconfig.json

@@ -71,6 +71,9 @@
 		{
 			"path": "../../../linking-platform/link-datasource/afm-cc/tsconfig.json"
 		},
+		{
+			"path": "../../../linking-platform/link-extractors/afm-cc/tsconfig.json"
+		},
 		{
 			"path": "../../../media/media-card/afm-cc/tsconfig.json"
 		},

package/afm-dev-agents/tsconfig.json

@@ -71,6 +71,9 @@
 		{
 			"path": "../../../linking-platform/link-datasource/afm-dev-agents/tsconfig.json"
 		},
+		{
+			"path": "../../../linking-platform/link-extractors/afm-dev-agents/tsconfig.json"
+		},
 		{
 			"path": "../../../media/media-card/afm-dev-agents/tsconfig.json"
 		},

package/afm-jira/tsconfig.json

@@ -71,6 +71,9 @@
 		{
 			"path": "../../../linking-platform/link-datasource/afm-jira/tsconfig.json"
 		},
+		{
+			"path": "../../../linking-platform/link-extractors/afm-jira/tsconfig.json"
+		},
 		{
 			"path": "../../../media/media-card/afm-jira/tsconfig.json"
 		},

package/afm-passionfruit/tsconfig.json

@@ -71,6 +71,9 @@
 		{
 			"path": "../../../linking-platform/link-datasource/afm-passionfruit/tsconfig.json"
 		},
+		{
+			"path": "../../../linking-platform/link-extractors/afm-passionfruit/tsconfig.json"
+		},
 		{
 			"path": "../../../media/media-card/afm-passionfruit/tsconfig.json"
 		},

package/afm-post-office/tsconfig.json

@@ -71,6 +71,9 @@
 		{
 			"path": "../../../linking-platform/link-datasource/afm-post-office/tsconfig.json"
 		},
+		{
+			"path": "../../../linking-platform/link-extractors/afm-post-office/tsconfig.json"
+		},
 		{
 			"path": "../../../media/media-card/afm-post-office/tsconfig.json"
 		},

package/afm-rovo-extension/tsconfig.json

@@ -71,6 +71,9 @@
 		{
 			"path": "../../../linking-platform/link-datasource/afm-rovo-extension/tsconfig.json"
 		},
+		{
+			"path": "../../../linking-platform/link-extractors/afm-rovo-extension/tsconfig.json"
+		},
 		{
 			"path": "../../../media/media-card/afm-rovo-extension/tsconfig.json"
 		},

package/afm-townsquare/tsconfig.json

@@ -71,6 +71,9 @@
 		{
 			"path": "../../../linking-platform/link-datasource/afm-townsquare/tsconfig.json"
 		},
+		{
+			"path": "../../../linking-platform/link-extractors/afm-townsquare/tsconfig.json"
+		},
 		{
 			"path": "../../../media/media-card/afm-townsquare/tsconfig.json"
 		},

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

@@ -25,6 +25,7 @@ var _SmartCardStorage = require("../../ui/SmartCardStorage");
 var _getCardClickHandler = require("../utils/getCardClickHandler");
 var _useInlineAnnotationProps = require("../../ui/annotations/element/useInlineAnnotationProps");
 var _PortalContext = require("../../ui/Renderer/PortalContext");
+var _linkExtractors = require("@atlaskit/link-extractors");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -105,6 +106,7 @@ var OverlayWithCardContext = function OverlayWithCardContext(_ref) {
     showPanelButtonIcon: showPanelButtonIcon,
     onClick: function onClick(event) {
       if (isPreviewPanelAvailable) {
+        var _extractSmartLinkEmbe;
         // Prevent anchor default behaviour(click to open the anchor link)
         // When glance panel is available, let openPreviewPanel handle it
         event.preventDefault();
@@ -112,7 +114,10 @@ var OverlayWithCardContext = function OverlayWithCardContext(_ref) {
           url: resolvedUrl || '',
           ari: ari || '',
           name: name || '',
-          iconUrl: iconUrl
+          iconUrl: iconUrl,
+          panelData: {
+            embedUrl: (0, _expValEquals.expValEquals)('platform_hover_card_preview_panel', 'cohort', 'test') ? (_extractSmartLinkEmbe = (0, _linkExtractors.extractSmartLinkEmbed)(cardState === null || cardState === void 0 ? void 0 : cardState.details)) === null || _extractSmartLinkEmbe === void 0 ? void 0 : _extractSmartLinkEmbe.src : undefined
+          }
         });
         (0, _experiments.editorExperiment)('platform_editor_preview_panel_linking_exp', true, {
           exposure: true

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

@@ -68,7 +68,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 // we want to calculate all the table widths (which causes reflows) after the renderer has finished loading to mitigate performance impact
 var TABLE_WIDTH_INFO_TIMEOUT = 10000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "124.1.4";
+var packageVersion = "124.1.6";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/cjs/ui/annotations/selection/mounter.js

@@ -42,27 +42,13 @@ var SelectionInlineCommentMounter = exports.SelectionInlineCommentMounter = /*#_
     annotationManager = _useAnnotationManager2.annotationManager,
     dispatch = _useAnnotationManager2.dispatch;
   var inlineNodeTypes = (0, _react.useMemo)(function () {
-    if ((0, _platformFeatureFlags.fg)('annotations_defensive_node_name_calculations')) {
-      if (!actions.isRangeAnnotatable(range)) {
-        return undefined;
-      }
-      return (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
-        pos: documentPosition,
-        actions: actions
-      });
-    } else {
-      if (!(0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
-        return undefined;
-      }
-      if (actions.isValidAnnotationRange(range)) {
-        return (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
-          pos: documentPosition,
-          actions: actions
-        });
-      } else {
-        return undefined;
-      }
+    if (!actions.isRangeAnnotatable(range)) {
+      return undefined;
     }
+    return (0, _getRendererRangeInlineNodeNames.getRendererRangeInlineNodeNames)({
+      pos: documentPosition,
+      actions: actions
+    });
   }, [documentPosition, actions, range]);
   var onCreateCallback = (0, _react.useCallback)(function (annotationId) {
     // We want to support creation on a documentPosition if the user is only using ranges

package/dist/es2019/react/nodes/inlineCard.js

@@ -22,6 +22,7 @@ import { withSmartCardStorage } from '../../ui/SmartCardStorage';
 import { getCardClickHandler } from '../utils/getCardClickHandler';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
 import { usePortal } from '../../ui/Renderer/PortalContext';
+import { extractSmartLinkEmbed } from '@atlaskit/link-extractors';
 const HoverLinkOverlayNoop = props => jsx(Fragment, null, props.children);
 const HoverLinkOverlayWithCondition = componentWithCondition(() => editorExperiment('platform_editor_preview_panel_linking_exp', true, {
   exposure: true
@@ -88,6 +89,7 @@ const OverlayWithCardContext = ({
     showPanelButtonIcon: showPanelButtonIcon,
     onClick: event => {
       if (isPreviewPanelAvailable) {
+        var _extractSmartLinkEmbe;
         // Prevent anchor default behaviour(click to open the anchor link)
         // When glance panel is available, let openPreviewPanel handle it
         event.preventDefault();
@@ -95,7 +97,10 @@ const OverlayWithCardContext = ({
           url: resolvedUrl || '',
           ari: ari || '',
           name: name || '',
-          iconUrl
+          iconUrl,
+          panelData: {
+            embedUrl: expValEquals('platform_hover_card_preview_panel', 'cohort', 'test') ? (_extractSmartLinkEmbe = extractSmartLinkEmbed(cardState === null || cardState === void 0 ? void 0 : cardState.details)) === null || _extractSmartLinkEmbe === void 0 ? void 0 : _extractSmartLinkEmbe.src : undefined
+          }
         });
         editorExperiment('platform_editor_preview_panel_linking_exp', true, {
           exposure: true

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

@@ -54,7 +54,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 // we want to calculate all the table widths (which causes reflows) after the renderer has finished loading to mitigate performance impact
 const TABLE_WIDTH_INFO_TIMEOUT = 10000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "124.1.4";
+const packageVersion = "124.1.6";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/ui/annotations/selection/mounter.js

@@ -39,27 +39,13 @@ export const SelectionInlineCommentMounter = /*#__PURE__*/React.memo(props => {
     dispatch
   } = useAnnotationManagerDispatch();
   const inlineNodeTypes = useMemo(() => {
-    if (fg('annotations_defensive_node_name_calculations')) {
-      if (!actions.isRangeAnnotatable(range)) {
-        return undefined;
-      }
-      return getRendererRangeInlineNodeNames({
-        pos: documentPosition,
-        actions
-      });
-    } else {
-      if (!fg('editor_inline_comments_on_inline_nodes')) {
-        return undefined;
-      }
-      if (actions.isValidAnnotationRange(range)) {
-        return getRendererRangeInlineNodeNames({
-          pos: documentPosition,
-          actions
-        });
-      } else {
-        return undefined;
-      }
+    if (!actions.isRangeAnnotatable(range)) {
+      return undefined;
     }
+    return getRendererRangeInlineNodeNames({
+      pos: documentPosition,
+      actions
+    });
   }, [documentPosition, actions, range]);
   const onCreateCallback = useCallback(annotationId => {
     // We want to support creation on a documentPosition if the user is only using ranges

package/dist/esm/react/nodes/inlineCard.js

@@ -23,6 +23,7 @@ import { withSmartCardStorage } from '../../ui/SmartCardStorage';
 import { getCardClickHandler } from '../utils/getCardClickHandler';
 import { useInlineAnnotationProps } from '../../ui/annotations/element/useInlineAnnotationProps';
 import { usePortal } from '../../ui/Renderer/PortalContext';
+import { extractSmartLinkEmbed } from '@atlaskit/link-extractors';
 var HoverLinkOverlayNoop = function HoverLinkOverlayNoop(props) {
   return jsx(Fragment, null, props.children);
 };
@@ -96,6 +97,7 @@ var OverlayWithCardContext = function OverlayWithCardContext(_ref) {
     showPanelButtonIcon: showPanelButtonIcon,
     onClick: function onClick(event) {
       if (isPreviewPanelAvailable) {
+        var _extractSmartLinkEmbe;
         // Prevent anchor default behaviour(click to open the anchor link)
         // When glance panel is available, let openPreviewPanel handle it
         event.preventDefault();
@@ -103,7 +105,10 @@ var OverlayWithCardContext = function OverlayWithCardContext(_ref) {
           url: resolvedUrl || '',
           ari: ari || '',
           name: name || '',
-          iconUrl: iconUrl
+          iconUrl: iconUrl,
+          panelData: {
+            embedUrl: expValEquals('platform_hover_card_preview_panel', 'cohort', 'test') ? (_extractSmartLinkEmbe = extractSmartLinkEmbed(cardState === null || cardState === void 0 ? void 0 : cardState.details)) === null || _extractSmartLinkEmbe === void 0 ? void 0 : _extractSmartLinkEmbe.src : undefined
+          }
         });
         editorExperiment('platform_editor_preview_panel_linking_exp', true, {
           exposure: true

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

@@ -59,7 +59,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 // we want to calculate all the table widths (which causes reflows) after the renderer has finished loading to mitigate performance impact
 var TABLE_WIDTH_INFO_TIMEOUT = 10000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "124.1.4";
+var packageVersion = "124.1.6";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/ui/annotations/selection/mounter.js

@@ -33,27 +33,13 @@ export var SelectionInlineCommentMounter = /*#__PURE__*/React.memo(function (pro
     annotationManager = _useAnnotationManager2.annotationManager,
     dispatch = _useAnnotationManager2.dispatch;
   var inlineNodeTypes = useMemo(function () {
-    if (fg('annotations_defensive_node_name_calculations')) {
-      if (!actions.isRangeAnnotatable(range)) {
-        return undefined;
-      }
-      return getRendererRangeInlineNodeNames({
-        pos: documentPosition,
-        actions: actions
-      });
-    } else {
-      if (!fg('editor_inline_comments_on_inline_nodes')) {
-        return undefined;
-      }
-      if (actions.isValidAnnotationRange(range)) {
-        return getRendererRangeInlineNodeNames({
-          pos: documentPosition,
-          actions: actions
-        });
-      } else {
-        return undefined;
-      }
+    if (!actions.isRangeAnnotatable(range)) {
+      return undefined;
     }
+    return getRendererRangeInlineNodeNames({
+      pos: documentPosition,
+      actions: actions
+    });
   }, [documentPosition, actions, range]);
   var onCreateCallback = useCallback(function (annotationId) {
     // We want to support creation on a documentPosition if the user is only using ranges

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "124.1.5",
+	"version": "124.1.7",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -42,6 +42,7 @@
 		"@atlaskit/icon": "^28.5.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/link-datasource": "^4.25.0",
+		"@atlaskit/link-extractors": "^2.4.0",
 		"@atlaskit/media-card": "^79.5.0",
 		"@atlaskit/media-client": "^35.5.0",
 		"@atlaskit/media-client-react": "^4.1.0",
@@ -52,7 +53,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
 		"@atlaskit/react-ufo": "^4.11.0",
-		"@atlaskit/smart-card": "^43.0.0",
+		"@atlaskit/smart-card": "^43.1.0",
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/theme": "^21.0.0",
@@ -145,9 +146,6 @@
 		"platform_editor_typography_ugc": {
 			"type": "boolean"
 		},
-		"annotations_defensive_node_name_calculations": {
-			"type": "boolean"
-		},
 		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
 		},