@atlaskit/editor-plugin-card 6.3.1 → 6.3.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-card
 
+## 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/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/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/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/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.2",
 	"description": "Card plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -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"
 		},