@atlaskit/editor-plugin-card 6.3.1 → 6.3.3

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @atlaskit/editor-plugin-card
 
+## 6.3.3
+
+### Patch Changes
+
+- [#159655](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159655)
+  [`24f8c627d50f2`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/24f8c627d50f2) - ##
+  WHAT? Remove experimental graceful edit mode from view mode plugin and associated props.
+
+  ## WHY?
+
+  This experiment is being cleaned up and we are no longer proceeding in this direction.
+
+  ## HOW to adjust?
+
+  This experiment was only enabled for Confluence and should not have been enabled in other places.
+  If for some reason any of the following props/state/methdos were used please remove them:
+
+  - isConsumption
+  - contentMode
+  - initialContentMode
+  - updateContentMode
+
+- Updated dependencies
+
+## 6.3.2
+
+### Patch Changes
+
+- [#159351](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/159351)
+  [`8932459025c73`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8932459025c73) -
+  Move card removal to unmounting of component.
+- Updated dependencies
+
 ## 6.3.1
 
 ### Patch Changes

package/compass.yml

@@ -1,3 +1,4 @@
+id: 'ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:component/c5751cc6-3513-4070-9deb-af31e86aed34/b3ffe2fd-7f29-4a07-81cd-67c57914ec9a'
 name: '@atlaskit/editor-plugin-card'
 description: |-
   This is an editor plugin for Atlassian's rich text editor that enables support for "smart cards" and advanced linking features within the editor. It integrates with the Atlassian linking platform to allow users to insert, display, and interact with rich link previews (smart cards) directly in the editor surface.
@@ -18,11 +19,11 @@ links:
   - name: '#help-twg-linking-platform'
     type: CHAT_CHANNEL
     url: 'https://atlassian.enterprise.slack.com/archives/CFKGAQZRV'
-  - name: null
+  - name: ''
     type: ON_CALL
     url: 'https://atlassian.app.opsgenie.com/settings/schedule/detail/b9c8b313-dd6d-4a41-8eeb-d7a9df55be9d'
   - name: source code
     type: REPOSITORY
-    url: 'https://bitbucket.org/atlassian/atlassian-frontend/src/master/packages/editor/editor-plugin-card'
+    url: 'https://bitbucket.org/atlassian/atlassian-frontend-monorepo/src/master/platform/packages/editor/editor-plugin-card'
 customFields: []
 relationships: {}

package/dist/cjs/nodeviews/blockCard.js

@@ -60,6 +60,7 @@ var BlockCardComponent = exports.BlockCardComponent = /*#__PURE__*/function (_Re
         })(view.state.tr));
       })();
     });
+    (0, _defineProperty2.default)(_this, "removeCardDispatched", false);
     (0, _defineProperty2.default)(_this, "gapCursorSpan", function () {
       // Don't render in EdgeHTMl version <= 18 (Edge version 44)
       // as it forces the edit popup to render 24px lower than it should
@@ -84,6 +85,26 @@ var BlockCardComponent = exports.BlockCardComponent = /*#__PURE__*/function (_Re
   }
   (0, _inherits2.default)(BlockCardComponent, _React$PureComponent);
   return (0, _createClass2.default)(BlockCardComponent, [{
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if ((0, _platformFeatureFlags.fg)('platform_editor_fix_advanced_code_crash')) {
+        this.removeCard();
+      }
+    }
+  }, {
+    key: "removeCard",
+    value: function removeCard() {
+      if (this.removeCardDispatched && (0, _platformFeatureFlags.fg)('platform_editor_cards_maxcallstackfix')) {
+        return;
+      }
+      this.removeCardDispatched = true;
+      var tr = this.props.view.state.tr;
+      (0, _actions.removeCard)({
+        id: this.props.id
+      })(tr);
+      this.props.view.dispatch(tr);
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
@@ -187,7 +208,11 @@ var BlockCard = exports.BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function destroy() {
       var _this$unsubscribe;
       (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 || _this$unsubscribe.call(this);
-      this.removeCard();
+      if ((0, _platformFeatureFlags.fg)('platform_editor_fix_advanced_code_crash')) {
+        _superPropGet(BlockCard, "destroy", this, 3)([]);
+      } else {
+        this.removeCard();
+      }
     }
   }, {
     key: "removeCard",

package/dist/cjs/nodeviews/embedCard.js

@@ -273,11 +273,32 @@ var EmbedCardComponent = exports.EmbedCardComponent = /*#__PURE__*/function (_Re
         throw err;
       }
     });
+    (0, _defineProperty2.default)(_this, "removeCardDispatched", false);
     _this.scrollContainer = (0, _ui.findOverflowScrollParent)(props.view.dom) || undefined;
     return _this;
   }
   (0, _inherits2.default)(EmbedCardComponent, _React$PureComponent);
   return (0, _createClass2.default)(EmbedCardComponent, [{
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if ((0, _platformFeatureFlags.fg)('platform_editor_fix_advanced_code_crash')) {
+        this.removeCard();
+      }
+    }
+  }, {
+    key: "removeCard",
+    value: function removeCard() {
+      if (this.removeCardDispatched && (0, _platformFeatureFlags.fg)('platform_editor_cards_maxcallstackfix')) {
+        return;
+      }
+      this.removeCardDispatched = true;
+      var tr = this.props.view.state.tr;
+      (0, _actions.removeCard)({
+        id: this.props.id
+      })(tr);
+      this.props.view.dispatch(tr);
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this$props = this.props,
@@ -421,7 +442,11 @@ var EmbedCard = exports.EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function destroy() {
       var _this$unsubscribe;
       (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 || _this$unsubscribe.call(this);
-      this.removeCard();
+      if ((0, _platformFeatureFlags.fg)('platform_editor_fix_advanced_code_crash')) {
+        _superPropGet(EmbedCard, "destroy", this, 3)([]);
+      } else {
+        this.removeCard();
+      }
     }
   }, {
     key: "removeCard",

package/dist/cjs/nodeviews/inlineCard.js

@@ -21,7 +21,6 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _smartCard = require("@atlaskit/smart-card");
 var _ssr = require("@atlaskit/smart-card/ssr");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _actions = require("../pm-plugins/actions");
 var _utils = require("../pm-plugins/utils");
 var _ConfigureOverlay = _interopRequireDefault(require("../ui/ConfigureOverlay"));
@@ -230,7 +229,7 @@ function InlineCardNodeView(props) {
     appearance: "inline"
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
-  }, enableInlineUpgradeFeatures && (0, _utils.getAwarenessProps)(view.state, getPos, allowEmbeds, allowBlockCards, !(0, _experiments.editorExperiment)('live_pages_graceful_edit', 'control') ? true : mode === 'view'))), (0, _platformFeatureFlags.fg)('prompt_whiteboard_competitor_link_gate') && CompetitorPromptComponent);
+  }, enableInlineUpgradeFeatures && (0, _utils.getAwarenessProps)(view.state, getPos, allowEmbeds, allowBlockCards, mode === 'view'))), (0, _platformFeatureFlags.fg)('prompt_whiteboard_competitor_link_gate') && CompetitorPromptComponent);
 }
 var inlineCardNodeView = exports.inlineCardNodeView = function inlineCardNodeView(_ref2) {
   var inlineCardViewProducer = _ref2.inlineCardViewProducer;

package/dist/es2019/nodeviews/blockCard.js

@@ -46,6 +46,7 @@ export class BlockCardComponent extends React.PureComponent {
         })(view.state.tr));
       })();
     });
+    _defineProperty(this, "removeCardDispatched", false);
     _defineProperty(this, "gapCursorSpan", () => {
       // Don't render in EdgeHTMl version <= 18 (Edge version 44)
       // as it forces the edit popup to render 24px lower than it should
@@ -68,6 +69,24 @@ export class BlockCardComponent extends React.PureComponent {
     });
     this.scrollContainer = findOverflowScrollParent(props.view.dom) || undefined;
   }
+  componentWillUnmount() {
+    if (fg('platform_editor_fix_advanced_code_crash')) {
+      this.removeCard();
+    }
+  }
+  removeCard() {
+    if (this.removeCardDispatched && fg('platform_editor_cards_maxcallstackfix')) {
+      return;
+    }
+    this.removeCardDispatched = true;
+    const {
+      tr
+    } = this.props.view.state;
+    removeCard({
+      id: this.props.id
+    })(tr);
+    this.props.view.dispatch(tr);
+  }
   render() {
     const {
       node,
@@ -151,7 +170,11 @@ export class BlockCard extends ReactNodeView {
   destroy() {
     var _this$unsubscribe;
     (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 ? void 0 : _this$unsubscribe.call(this);
-    this.removeCard();
+    if (fg('platform_editor_fix_advanced_code_crash')) {
+      super.destroy();
+    } else {
+      this.removeCard();
+    }
   }
   removeCard() {
     if (this.removeCardDispatched && fg('platform_editor_cards_maxcallstackfix')) {

package/dist/es2019/nodeviews/embedCard.js

@@ -268,8 +268,27 @@ export class EmbedCardComponent extends React.PureComponent {
         throw err;
       }
     });
+    _defineProperty(this, "removeCardDispatched", false);
     this.scrollContainer = findOverflowScrollParent(props.view.dom) || undefined;
   }
+  componentWillUnmount() {
+    if (fg('platform_editor_fix_advanced_code_crash')) {
+      this.removeCard();
+    }
+  }
+  removeCard() {
+    if (this.removeCardDispatched && fg('platform_editor_cards_maxcallstackfix')) {
+      return;
+    }
+    this.removeCardDispatched = true;
+    const {
+      tr
+    } = this.props.view.state;
+    removeCard({
+      id: this.props.id
+    })(tr);
+    this.props.view.dispatch(tr);
+  }
   render() {
     const {
       node,
@@ -397,7 +416,11 @@ export class EmbedCard extends ReactNodeView {
   destroy() {
     var _this$unsubscribe;
     (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 ? void 0 : _this$unsubscribe.call(this);
-    this.removeCard();
+    if (fg('platform_editor_fix_advanced_code_crash')) {
+      super.destroy();
+    } else {
+      this.removeCard();
+    }
   }
   removeCard() {
     if (this.removeCardDispatched && fg('platform_editor_cards_maxcallstackfix')) {

package/dist/es2019/nodeviews/inlineCard.js

@@ -10,7 +10,6 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
 import { CardSSR } from '@atlaskit/smart-card/ssr';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { registerCard, removeCard } from '../pm-plugins/actions';
 import { getAwarenessProps } from '../pm-plugins/utils';
 import OverlayWrapper from '../ui/ConfigureOverlay';
@@ -224,7 +223,7 @@ export function InlineCardNodeView(props) {
     appearance: "inline"
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
-  }, enableInlineUpgradeFeatures && getAwarenessProps(view.state, getPos, allowEmbeds, allowBlockCards, !editorExperiment('live_pages_graceful_edit', 'control') ? true : mode === 'view'))), fg('prompt_whiteboard_competitor_link_gate') && CompetitorPromptComponent);
+  }, enableInlineUpgradeFeatures && getAwarenessProps(view.state, getPos, allowEmbeds, allowBlockCards, mode === 'view'))), fg('prompt_whiteboard_competitor_link_gate') && CompetitorPromptComponent);
 }
 export const inlineCardNodeView = ({
   inlineCardViewProducer

package/dist/esm/nodeviews/blockCard.js

@@ -54,6 +54,7 @@ export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         })(view.state.tr));
       })();
     });
+    _defineProperty(_this, "removeCardDispatched", false);
     _defineProperty(_this, "gapCursorSpan", function () {
       // Don't render in EdgeHTMl version <= 18 (Edge version 44)
       // as it forces the edit popup to render 24px lower than it should
@@ -78,6 +79,26 @@ export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
   }
   _inherits(BlockCardComponent, _React$PureComponent);
   return _createClass(BlockCardComponent, [{
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if (fg('platform_editor_fix_advanced_code_crash')) {
+        this.removeCard();
+      }
+    }
+  }, {
+    key: "removeCard",
+    value: function removeCard() {
+      if (this.removeCardDispatched && fg('platform_editor_cards_maxcallstackfix')) {
+        return;
+      }
+      this.removeCardDispatched = true;
+      var tr = this.props.view.state.tr;
+      _removeCard({
+        id: this.props.id
+      })(tr);
+      this.props.view.dispatch(tr);
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
@@ -181,7 +202,11 @@ export var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function destroy() {
       var _this$unsubscribe;
       (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 || _this$unsubscribe.call(this);
-      this.removeCard();
+      if (fg('platform_editor_fix_advanced_code_crash')) {
+        _superPropGet(BlockCard, "destroy", this, 3)([]);
+      } else {
+        this.removeCard();
+      }
     }
   }, {
     key: "removeCard",

package/dist/esm/nodeviews/embedCard.js

@@ -266,11 +266,32 @@ export var EmbedCardComponent = /*#__PURE__*/function (_React$PureComponent) {
         throw err;
       }
     });
+    _defineProperty(_this, "removeCardDispatched", false);
     _this.scrollContainer = findOverflowScrollParent(props.view.dom) || undefined;
     return _this;
   }
   _inherits(EmbedCardComponent, _React$PureComponent);
   return _createClass(EmbedCardComponent, [{
+    key: "componentWillUnmount",
+    value: function componentWillUnmount() {
+      if (fg('platform_editor_fix_advanced_code_crash')) {
+        this.removeCard();
+      }
+    }
+  }, {
+    key: "removeCard",
+    value: function removeCard() {
+      if (this.removeCardDispatched && fg('platform_editor_cards_maxcallstackfix')) {
+        return;
+      }
+      this.removeCardDispatched = true;
+      var tr = this.props.view.state.tr;
+      _removeCard({
+        id: this.props.id
+      })(tr);
+      this.props.view.dispatch(tr);
+    }
+  }, {
     key: "render",
     value: function render() {
       var _this$props = this.props,
@@ -414,7 +435,11 @@ export var EmbedCard = /*#__PURE__*/function (_ReactNodeView) {
     value: function destroy() {
       var _this$unsubscribe;
       (_this$unsubscribe = this.unsubscribe) === null || _this$unsubscribe === void 0 || _this$unsubscribe.call(this);
-      this.removeCard();
+      if (fg('platform_editor_fix_advanced_code_crash')) {
+        _superPropGet(EmbedCard, "destroy", this, 3)([]);
+      } else {
+        this.removeCard();
+      }
     }
   }, {
     key: "removeCard",

package/dist/esm/nodeviews/inlineCard.js

@@ -11,7 +11,6 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { Card as SmartCard } from '@atlaskit/smart-card';
 import { CardSSR } from '@atlaskit/smart-card/ssr';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { registerCard, removeCard } from '../pm-plugins/actions';
 import { getAwarenessProps } from '../pm-plugins/utils';
 import OverlayWrapper from '../ui/ConfigureOverlay';
@@ -218,7 +217,7 @@ export function InlineCardNodeView(props) {
     appearance: "inline"
     // Ignored via go/ees005
     // eslint-disable-next-line react/jsx-props-no-spreading
-  }, enableInlineUpgradeFeatures && getAwarenessProps(view.state, getPos, allowEmbeds, allowBlockCards, !editorExperiment('live_pages_graceful_edit', 'control') ? true : mode === 'view'))), fg('prompt_whiteboard_competitor_link_gate') && CompetitorPromptComponent);
+  }, enableInlineUpgradeFeatures && getAwarenessProps(view.state, getPos, allowEmbeds, allowBlockCards, mode === 'view'))), fg('prompt_whiteboard_competitor_link_gate') && CompetitorPromptComponent);
 }
 export var inlineCardNodeView = function inlineCardNodeView(_ref2) {
   var inlineCardViewProducer = _ref2.inlineCardViewProducer;

package/dist/types/nodeviews/blockCard.d.ts

@@ -16,6 +16,9 @@ export declare class BlockCardComponent extends React.PureComponent<SmartCardPro
         url?: string | undefined;
         title?: string | undefined;
     }) => void;
+    componentWillUnmount(): void;
+    private removeCardDispatched;
+    private removeCard;
     gapCursorSpan: () => React.JSX.Element | undefined;
     onError: ({ err }: {
         err?: Error | undefined;

package/dist/types/nodeviews/embedCard.d.ts

@@ -38,6 +38,9 @@ export declare class EmbedCardComponent extends React.PureComponent<SmartCardPro
     onError: ({ err }: {
         err?: Error | undefined;
     }) => void;
+    componentWillUnmount(): void;
+    private removeCardDispatched;
+    private removeCard;
     render(): React.JSX.Element;
 }
 export type EmbedCardNodeViewProps = Pick<SmartCardProps, 'eventDispatcher' | 'allowResizing' | 'fullWidthMode' | 'dispatchAnalyticsEvent' | 'pluginInjectionApi' | 'actionOptions' | 'onClickCallback'>;

package/dist/types-ts4.5/nodeviews/blockCard.d.ts

@@ -16,6 +16,9 @@ export declare class BlockCardComponent extends React.PureComponent<SmartCardPro
         url?: string | undefined;
         title?: string | undefined;
     }) => void;
+    componentWillUnmount(): void;
+    private removeCardDispatched;
+    private removeCard;
     gapCursorSpan: () => React.JSX.Element | undefined;
     onError: ({ err }: {
         err?: Error | undefined;

package/dist/types-ts4.5/nodeviews/embedCard.d.ts

@@ -38,6 +38,9 @@ export declare class EmbedCardComponent extends React.PureComponent<SmartCardPro
     onError: ({ err }: {
         err?: Error | undefined;
     }) => void;
+    componentWillUnmount(): void;
+    private removeCardDispatched;
+    private removeCard;
     render(): React.JSX.Element;
 }
 export type EmbedCardNodeViewProps = Pick<SmartCardProps, 'eventDispatcher' | 'allowResizing' | 'fullWidthMode' | 'dispatchAnalyticsEvent' | 'pluginInjectionApi' | 'actionOptions' | 'onClickCallback'>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-card",
-	"version": "6.3.1",
+	"version": "6.3.3",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -37,13 +37,13 @@
 		"@atlaskit/analytics-next": "^11.0.0",
 		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/custom-steps": "^0.11.0",
-		"@atlaskit/editor-common": "^105.8.0",
+		"@atlaskit/editor-common": "^105.10.0",
 		"@atlaskit/editor-plugin-analytics": "^2.3.0",
 		"@atlaskit/editor-plugin-base": "^3.0.0",
 		"@atlaskit/editor-plugin-connectivity": "^2.0.0",
 		"@atlaskit/editor-plugin-decorations": "^2.0.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^3.1.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^4.0.0",
 		"@atlaskit/editor-plugin-feature-flags": "^1.4.0",
 		"@atlaskit/editor-plugin-floating-toolbar": "^4.1.0",
 		"@atlaskit/editor-plugin-grid": "^2.0.0",
@@ -51,7 +51,7 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/frontend-utilities": "^3.0.0",
-		"@atlaskit/icon": "^26.1.0",
+		"@atlaskit/icon": "^26.3.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/link-analytics": "^10.0.0",
 		"@atlaskit/link-client-extension": "^5.0.0",
@@ -61,9 +61,9 @@
 		"@atlaskit/menu": "^8.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^14.8.0",
-		"@atlaskit/smart-card": "^38.4.0",
+		"@atlaskit/smart-card": "^38.5.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.24.0",
+		"@atlaskit/tmp-editor-statsig": "^5.0.0",
 		"@atlaskit/tokens": "^4.9.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -73,7 +73,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/link-provider": "^3.0.0",
+		"@atlaskit/link-provider": "^3.1.0",
 		"react": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -153,6 +153,9 @@
 		"smart_link_editor_update_toolbar_open_link": {
 			"type": "boolean"
 		},
+		"platform_editor_fix_advanced_code_crash": {
+			"type": "boolean"
+		},
 		"platform_editor_controls_patch_8": {
 			"type": "boolean"
 		},
@@ -170,5 +173,6 @@
 		"no-unused-dependencies": {
 			"checkDevDependencies": true
 		}
-	}
+	},
+	"compassUnitTestMetricSourceId": "ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:metric-source/c5751cc6-3513-4070-9deb-af31e86aed34/44b8f355-366d-4e0c-a22a-1ba5a6106330"
 }