@atlaskit/editor-plugin-card 4.5.5 → 4.5.7

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-card
 
+## 4.5.7
+
+### Patch Changes
+
+- [#179137](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/179137)
+  [`163478624d145`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/163478624d145) -
+  Update embedCard component to avoid rerenderings when editor gets disabled
+- Updated dependencies
+
+## 4.5.6
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 4.5.5
 
 ### Patch Changes

package/dist/cjs/nodeviews/embedCard.js

@@ -57,7 +57,8 @@ var CardInner = function CardInner(_ref) {
   }
   var lineLength = getLineLength(view, pos, widthStateLineLength);
   var containerWidth = (0, _utils.isRichMediaInsideOfBlockNode)(view, pos) ? lineLength : widthStateWidth;
-  if (!allowResizing || !hasPreview || editorDisabledState !== null && editorDisabledState !== void 0 && editorDisabledState.editorDisabled) {
+  var editorDisabledWhenGateDisabled = (editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled) && !(0, _platformFeatureFlags.fg)('platform_fix_embedded_card_re-rendering');
+  if (!allowResizing || !hasPreview || editorDisabledWhenGateDisabled) {
     // There are two ways `width` and `height` can be defined here:
     // 1) Either as `heightAlone` as height value and no width
     // 2) or as `1` for height and aspectRation (defined or a default one) as a width
@@ -97,6 +98,8 @@ var CardInner = function CardInner(_ref) {
     displayGrid: displayGrid,
     updateSize: updateSize,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent
+  }, (0, _platformFeatureFlags.fg)('platform_fix_embedded_card_re-rendering') && {
+    isResizeDisabled: editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled
   }), smartCard);
 };
 // eslint-disable-next-line @repo/internal/react/no-class-components

package/dist/cjs/ui/ResizableEmbedCard.js

@@ -17,6 +17,7 @@ var _react2 = require("@emotion/react");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _smartCard = require("@atlaskit/smart-card");
 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) { (0, _defineProperty2.default)(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; }
@@ -330,6 +331,7 @@ var ResizableEmbedCard = exports.default = /*#__PURE__*/function (_React$Compone
         pctWidth = _this$props6.pctWidth,
         containerWidth = _this$props6.containerWidth,
         fullWidthMode = _this$props6.fullWidthMode,
+        isResizeDisabled = _this$props6.isResizeDisabled,
         children = _this$props6.children;
       var resizerProps = {
         width: this.calcPxWidth(),
@@ -337,6 +339,10 @@ var ResizableEmbedCard = exports.default = /*#__PURE__*/function (_React$Compone
       };
       var enable = {};
       _ui.handleSides.forEach(function (side) {
+        if (isResizeDisabled && (0, _platformFeatureFlags.fg)('platform_fix_embedded_card_re-rendering')) {
+          enable[side] = false;
+          return;
+        }
         var oppositeSide = side === 'left' ? 'right' : 'left';
         enable[side] = ['full-width', 'wide', 'center'].concat("wrap-".concat(oppositeSide)).concat("align-".concat(_ui.imageAlignmentMap[oppositeSide])).indexOf(layout) > -1;
         if (side === 'left' && _this2.insideInlineLike) {

package/dist/es2019/nodeviews/embedCard.js

@@ -41,7 +41,8 @@ const CardInner = ({
   }
   const lineLength = getLineLength(view, pos, widthStateLineLength);
   const containerWidth = isRichMediaInsideOfBlockNode(view, pos) ? lineLength : widthStateWidth;
-  if (!allowResizing || !hasPreview || editorDisabledState !== null && editorDisabledState !== void 0 && editorDisabledState.editorDisabled) {
+  const editorDisabledWhenGateDisabled = (editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled) && !fg('platform_fix_embedded_card_re-rendering');
+  if (!allowResizing || !hasPreview || editorDisabledWhenGateDisabled) {
     // There are two ways `width` and `height` can be defined here:
     // 1) Either as `heightAlone` as height value and no width
     // 2) or as `1` for height and aspectRation (defined or a default one) as a width
@@ -81,6 +82,8 @@ const CardInner = ({
     displayGrid: displayGrid,
     updateSize: updateSize,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent
+  }, fg('platform_fix_embedded_card_re-rendering') && {
+    isResizeDisabled: editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled
   }), smartCard);
 };
 // eslint-disable-next-line @repo/internal/react/no-class-components

package/dist/es2019/ui/ResizableEmbedCard.js

@@ -11,6 +11,7 @@ import { jsx } from '@emotion/react';
 import { calcColumnsFromPx, calcMediaPxWidth, calcPctFromPx, calcPxFromColumns, handleSides, imageAlignmentMap, Resizer, snapTo, wrappedLayouts, wrapperStyle } from '@atlaskit/editor-common/ui';
 import { findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorBreakoutPadding, akEditorMediaResizeHandlerPadding, akEditorWideLayoutWidth, breakoutWideScaleRatio, DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { embedHeaderHeight } from '@atlaskit/smart-card';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 export default class ResizableEmbedCard extends React.Component {
@@ -310,6 +311,7 @@ export default class ResizableEmbedCard extends React.Component {
       pctWidth,
       containerWidth,
       fullWidthMode,
+      isResizeDisabled,
       children
     } = this.props;
     const resizerProps = {
@@ -318,6 +320,10 @@ export default class ResizableEmbedCard extends React.Component {
     };
     const enable = {};
     handleSides.forEach(side => {
+      if (isResizeDisabled && fg('platform_fix_embedded_card_re-rendering')) {
+        enable[side] = false;
+        return;
+      }
       const oppositeSide = side === 'left' ? 'right' : 'left';
       enable[side] = ['full-width', 'wide', 'center'].concat(`wrap-${oppositeSide}`).concat(`align-${imageAlignmentMap[oppositeSide]}`).indexOf(layout) > -1;
       if (side === 'left' && this.insideInlineLike) {

package/dist/esm/nodeviews/embedCard.js

@@ -50,7 +50,8 @@ var CardInner = function CardInner(_ref) {
   }
   var lineLength = getLineLength(view, pos, widthStateLineLength);
   var containerWidth = isRichMediaInsideOfBlockNode(view, pos) ? lineLength : widthStateWidth;
-  if (!allowResizing || !hasPreview || editorDisabledState !== null && editorDisabledState !== void 0 && editorDisabledState.editorDisabled) {
+  var editorDisabledWhenGateDisabled = (editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled) && !fg('platform_fix_embedded_card_re-rendering');
+  if (!allowResizing || !hasPreview || editorDisabledWhenGateDisabled) {
     // There are two ways `width` and `height` can be defined here:
     // 1) Either as `heightAlone` as height value and no width
     // 2) or as `1` for height and aspectRation (defined or a default one) as a width
@@ -90,6 +91,8 @@ var CardInner = function CardInner(_ref) {
     displayGrid: displayGrid,
     updateSize: updateSize,
     dispatchAnalyticsEvent: dispatchAnalyticsEvent
+  }, fg('platform_fix_embedded_card_re-rendering') && {
+    isResizeDisabled: editorDisabledState === null || editorDisabledState === void 0 ? void 0 : editorDisabledState.editorDisabled
   }), smartCard);
 };
 // eslint-disable-next-line @repo/internal/react/no-class-components

package/dist/esm/ui/ResizableEmbedCard.js

@@ -20,6 +20,7 @@ import { jsx } from '@emotion/react';
 import { calcColumnsFromPx, calcMediaPxWidth, calcPctFromPx, calcPxFromColumns, handleSides, imageAlignmentMap, Resizer, snapTo, wrappedLayouts, wrapperStyle } from '@atlaskit/editor-common/ui';
 import { findParentNodeOfTypeClosestToPos, hasParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { akEditorBreakoutPadding, akEditorMediaResizeHandlerPadding, akEditorWideLayoutWidth, breakoutWideScaleRatio, DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { embedHeaderHeight } from '@atlaskit/smart-card';
 // eslint-disable-next-line @repo/internal/react/no-class-components
 var ResizableEmbedCard = /*#__PURE__*/function (_React$Component) {
@@ -326,6 +327,7 @@ var ResizableEmbedCard = /*#__PURE__*/function (_React$Component) {
         pctWidth = _this$props6.pctWidth,
         containerWidth = _this$props6.containerWidth,
         fullWidthMode = _this$props6.fullWidthMode,
+        isResizeDisabled = _this$props6.isResizeDisabled,
         children = _this$props6.children;
       var resizerProps = {
         width: this.calcPxWidth(),
@@ -333,6 +335,10 @@ var ResizableEmbedCard = /*#__PURE__*/function (_React$Component) {
       };
       var enable = {};
       handleSides.forEach(function (side) {
+        if (isResizeDisabled && fg('platform_fix_embedded_card_re-rendering')) {
+          enable[side] = false;
+          return;
+        }
         var oppositeSide = side === 'left' ? 'right' : 'left';
         enable[side] = ['full-width', 'wide', 'center'].concat("wrap-".concat(oppositeSide)).concat("align-".concat(imageAlignmentMap[oppositeSide])).indexOf(layout) > -1;
         if (side === 'left' && _this2.insideInlineLike) {

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

@@ -14,6 +14,7 @@ export type Props = Omit<ResizerProps, 'height' | 'width'> & {
     width?: number;
     height?: number;
     aspectRatio: number;
+    isResizeDisabled?: boolean;
 };
 export default class ResizableEmbedCard extends React.Component<Props, State> {
     static defaultProps: {

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

@@ -14,6 +14,7 @@ export type Props = Omit<ResizerProps, 'height' | 'width'> & {
     width?: number;
     height?: number;
     aspectRatio: number;
+    isResizeDisabled?: boolean;
 };
 export default class ResizableEmbedCard extends React.Component<Props, State> {
     static defaultProps: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "4.5.5",
+	"version": "4.5.7",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -52,13 +52,13 @@
 		"@atlaskit/link-datasource": "^3.15.0",
 		"@atlaskit/linking-common": "^6.0.0",
 		"@atlaskit/linking-types": "^9.5.0",
-		"@atlaskit/menu": "2.13.6",
+		"@atlaskit/menu": "2.13.7",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/smart-card": "^32.7.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.26.0",
-		"@atlaskit/tokens": "^2.4.0",
+		"@atlaskit/tmp-editor-statsig": "^2.27.0",
+		"@atlaskit/tokens": "^2.5.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"lodash": "^4.17.21",
@@ -137,6 +137,9 @@
 		},
 		"platform_inline_node_as_valid_annotation_selection": {
 			"type": "boolean"
+		},
+		"platform_fix_embedded_card_re-rendering": {
+			"type": "boolean"
 		}
 	},
 	"stricter": {