@atlaskit/editor-plugin-card 4.5.6 → 4.5.8

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-card
 
+## 4.5.8
+
+### Patch Changes
+
+- Updated dependencies
+
+## 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

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/pm-plugins/main.js

@@ -4,14 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createPlugin = exports.ALLOW_EVENTS_CLASSNAME = void 0;
-Object.defineProperty(exports, "pluginKey", {
-  enumerable: true,
-  get: function get() {
-    return _pluginKey.pluginKey;
-  }
-});
-exports.stopEvent = void 0;
+exports.stopEvent = exports.createPlugin = exports.ALLOW_EVENTS_CLASSNAME = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _rafSchd = _interopRequireDefault(require("raf-schd"));

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/cjs/ui/toolbar.js

@@ -30,7 +30,7 @@ var _unlink = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/unlink
 var _shortcut = _interopRequireDefault(require("@atlaskit/icon/glyph/shortcut"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _doc = require("../pm-plugins/doc");
-var _main = require("../pm-plugins/main");
+var _pluginKey = require("../pm-plugins/plugin-key");
 var _utils3 = require("../pm-plugins/utils");
 var _DatasourceAppearanceButton = require("./DatasourceAppearanceButton");
 var _EditLinkToolbar = require("./EditLinkToolbar");
@@ -113,7 +113,7 @@ var floatingToolbar = exports.floatingToolbar = function floatingToolbar(cardOpt
       blockCard = _state$schema$nodes.blockCard,
       embedCard = _state$schema$nodes.embedCard;
     var nodeType = [inlineCard, blockCard, embedCard];
-    var pluginState = _main.pluginKey.getState(state);
+    var pluginState = _pluginKey.pluginKey.getState(state);
     if (!(state.selection instanceof _state.NodeSelection)) {
       return;
     }
@@ -211,7 +211,7 @@ var generateToolbarItems = function generateToolbarItems(state, intl, providerFa
     var _ref2 = (_pluginInjectionApi$d = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$d2 = pluginInjectionApi.decorations) === null || _pluginInjectionApi$d2 === void 0 ? void 0 : _pluginInjectionApi$d2.actions) !== null && _pluginInjectionApi$d !== void 0 ? _pluginInjectionApi$d : {},
       hoverDecoration = _ref2.hoverDecoration;
     var isDatasource = (0, _utils3.isDatasourceNode)(node);
-    var pluginState = _main.pluginKey.getState(state);
+    var pluginState = _pluginKey.pluginKey.getState(state);
     var annotationApiState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$a2 = pluginInjectionApi.annotation) === null || _pluginInjectionApi$a2 === void 0 ? void 0 : _pluginInjectionApi$a2.sharedState.currentState();
     var activeCommentMark = node.marks.find(function (mark) {
       return mark.type.name === 'annotation' && (annotationApiState === null || annotationApiState === void 0 ? void 0 : annotationApiState.annotations[mark.attrs.id]) === false;

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/pm-plugins/main.js

@@ -19,7 +19,6 @@ import reducer from './reducers';
 import { handleProvider, resolveWithProvider } from './util/resolve';
 import { getNewRequests, getPluginState, getPluginStateWithUpdatedPos } from './util/state';
 import { isBlockSupportedAtPosition, isEmbedSupportedAtPosition } from './utils';
-export { pluginKey } from './plugin-key';
 const LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK = 'smart-link-upgrade-pulse';
 export const ALLOW_EVENTS_CLASSNAME = 'card-plugin-element-allow-events';
 export const stopEvent = event => {

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/es2019/ui/toolbar.js

@@ -20,7 +20,7 @@ import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { changeSelectedCardToText } from '../pm-plugins/doc';
-import { pluginKey } from '../pm-plugins/main';
+import { pluginKey } from '../pm-plugins/plugin-key';
 import { appearanceForNodeType, displayInfoForCard, findCardInfo, isDatasourceNode, titleUrlPairFromNode } from '../pm-plugins/utils';
 import { DatasourceAppearanceButton } from './DatasourceAppearanceButton';
 import { buildEditLinkToolbar, editLinkToolbarConfig, getEditLinkCallback } from './EditLinkToolbar';

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/pm-plugins/main.js

@@ -23,7 +23,6 @@ import reducer from './reducers';
 import { handleProvider, resolveWithProvider } from './util/resolve';
 import { getNewRequests, getPluginState, getPluginStateWithUpdatedPos } from './util/state';
 import { isBlockSupportedAtPosition, isEmbedSupportedAtPosition } from './utils';
-export { pluginKey } from './plugin-key';
 var LOCAL_STORAGE_DISCOVERY_KEY_SMART_LINK = 'smart-link-upgrade-pulse';
 export var ALLOW_EVENTS_CLASSNAME = 'card-plugin-element-allow-events';
 export var stopEvent = function stopEvent(event) {

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/esm/ui/toolbar.js

@@ -24,7 +24,7 @@ import UnlinkIcon from '@atlaskit/icon/glyph/editor/unlink';
 import OpenIcon from '@atlaskit/icon/glyph/shortcut';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { changeSelectedCardToText } from '../pm-plugins/doc';
-import { pluginKey } from '../pm-plugins/main';
+import { pluginKey } from '../pm-plugins/plugin-key';
 import { appearanceForNodeType, displayInfoForCard, findCardInfo, isDatasourceNode, titleUrlPairFromNode } from '../pm-plugins/utils';
 import { DatasourceAppearanceButton } from './DatasourceAppearanceButton';
 import { buildEditLinkToolbar, editLinkToolbarConfig, getEditLinkCallback } from './EditLinkToolbar';

package/dist/types/pm-plugins/main.d.ts

@@ -2,7 +2,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import type { cardPlugin } from '../index';
 import type { CardPluginOptions, CardPluginState } from '../types';
-export { pluginKey } from './plugin-key';
 export declare const ALLOW_EVENTS_CLASSNAME = "card-plugin-element-allow-events";
 export declare const stopEvent: (event: Event) => boolean;
 export declare const createPlugin: (options: CardPluginOptions, pluginInjectionApi: ExtractInjectionAPI<typeof cardPlugin> | undefined) => (pmPluginFactoryParams: PMPluginFactoryParams) => SafePlugin<CardPluginState>;

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/pm-plugins/main.d.ts

@@ -2,7 +2,6 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI, PMPluginFactoryParams } from '@atlaskit/editor-common/types';
 import type { cardPlugin } from '../index';
 import type { CardPluginOptions, CardPluginState } from '../types';
-export { pluginKey } from './plugin-key';
 export declare const ALLOW_EVENTS_CLASSNAME = "card-plugin-element-allow-events";
 export declare const stopEvent: (event: Event) => boolean;
 export declare const createPlugin: (options: CardPluginOptions, pluginInjectionApi: ExtractInjectionAPI<typeof cardPlugin> | undefined) => (pmPluginFactoryParams: PMPluginFactoryParams) => SafePlugin<CardPluginState>;

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.6",
+	"version": "4.5.8",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/analytics-next": "^10.2.0",
 		"@atlaskit/custom-steps": "^0.9.0",
-		"@atlaskit/editor-common": "^96.5.0",
+		"@atlaskit/editor-common": "^97.0.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -55,10 +55,10 @@
 		"@atlaskit/menu": "2.13.7",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^13.3.0",
-		"@atlaskit/smart-card": "^32.7.0",
+		"@atlaskit/smart-card": "^32.8.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.27.0",
-		"@atlaskit/tokens": "^2.4.0",
+		"@atlaskit/tmp-editor-statsig": "^2.29.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": {

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

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "createEventsQueue", {
-  enumerable: true,
-  get: function get() {
-    return _createEventsQueue.createEventsQueue;
-  }
-});
-Object.defineProperty(exports, "eventsFromTransaction", {
-  enumerable: true,
-  get: function get() {
-    return _eventsFromTr.eventsFromTransaction;
-  }
-});
-var _createEventsQueue = require("./create-events-queue");
-var _eventsFromTr = require("./events-from-tr");

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

@@ -1,2 +0,0 @@
-export { createEventsQueue } from './create-events-queue';
-export { eventsFromTransaction } from './events-from-tr';

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

@@ -1,2 +0,0 @@
-export { createEventsQueue } from './create-events-queue';
-export { eventsFromTransaction } from './events-from-tr';

package/dist/types/ui/analytics/index.d.ts

@@ -1,2 +0,0 @@
-export { createEventsQueue } from './create-events-queue';
-export { eventsFromTransaction } from './events-from-tr';

package/dist/types-ts4.5/ui/analytics/index.d.ts

@@ -1,2 +0,0 @@
-export { createEventsQueue } from './create-events-queue';
-export { eventsFromTransaction } from './events-from-tr';