@atlaskit/editor-core 155.0.0 → 158.0.1

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaskit/editor-core
 
+## 158.0.1
+
+### Patch Changes
+
+- [`c7a3ccf95cd`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c7a3ccf95cd) - Patching versions to no longer reference localid from adf or smart-cards
+
+## 158.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 157.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
+## 156.0.0
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 155.0.0
 
 ### Major Changes

package/dist/cjs/plugins/card/nodeviews/blockCard.js

@@ -35,6 +35,8 @@ var _rafSchd = _interopRequireDefault(require("raf-schd"));
 
 var _genericCard = require("./genericCard");
 
+var _nodeviews = require("../../../nodeviews/");
+
 var _actions = require("../pm-plugins/actions");
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -140,8 +142,8 @@ exports.BlockCardComponent = BlockCardComponent;
 });
 var WrappedBlockCard = (0, _genericCard.Card)(BlockCardComponent, _ui.UnsupportedBlock);
 
-var BlockCard = /*#__PURE__*/function (_GenericCard) {
-  (0, _inherits2.default)(BlockCard, _GenericCard);
+var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
+  (0, _inherits2.default)(BlockCard, _ReactNodeView);
 
   var _super2 = _createSuper(BlockCard);
 
@@ -176,6 +178,6 @@ var BlockCard = /*#__PURE__*/function (_GenericCard) {
     }
   }]);
   return BlockCard;
-}(_genericCard.GenericCard);
+}(_nodeviews.ReactNodeView);
 
 exports.BlockCard = BlockCard;

package/dist/cjs/plugins/card/nodeviews/embedCard.js

@@ -41,8 +41,6 @@ var _utils = require("@atlaskit/editor-common/utils");
 
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 
-var _adfSchema = require("@atlaskit/adf-schema");
-
 var _nodeviews = require("../../../nodeviews/");
 
 var _actions = require("../pm-plugins/actions");
@@ -368,14 +366,6 @@ var EmbedCard = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   }
 
   (0, _createClass2.default)(EmbedCard, [{
-    key: "init",
-    value: function init() {
-      (0, _get2.default)((0, _getPrototypeOf2.default)(EmbedCard.prototype), "init", this).call(this); // localId exists to distinguish between different smart cards for the purpose of analytics
-
-      this.node.attrs.localId = this.node.attrs.localId || _adfSchema.uuid.generate();
-      return this;
-    }
-  }, {
     key: "viewShouldUpdate",
     value: function viewShouldUpdate(nextNode) {
       if (this.node.attrs !== nextNode.attrs) {

package/dist/cjs/plugins/card/nodeviews/genericCard.js

@@ -6,9 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Card = Card;
-exports.GenericCard = void 0;
-
-var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -32,8 +29,6 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _adfSchema = require("@atlaskit/adf-schema");
 
-var _ReactNodeView2 = _interopRequireDefault(require("../../../nodeviews/ReactNodeView"));
-
 var _utils = require("../utils");
 
 var _doc = require("../pm-plugins/doc");
@@ -119,7 +114,7 @@ function Card(SmartCardComponent, UnsupportedComponent) {
             return;
           }
 
-          (0, _doc.changeSelectedCardToLinkFallback)(undefined, url, true, node, getPos())(view.state, view.dispatch);
+          (0, _doc.changeSelectedCardToLink)(undefined, url, true, node, getPos())(view.state, view.dispatch);
           return null;
         } else {
           // Otherwise, render a blue link as fallback (above in render()).
@@ -133,28 +128,4 @@ function Card(SmartCardComponent, UnsupportedComponent) {
   }(_react.default.Component), (0, _defineProperty2.default)(_class, "contextTypes", {
     contextAdapter: _propTypes.default.object
   }), _temp;
-}
-
-var GenericCard = /*#__PURE__*/function (_ReactNodeView) {
-  (0, _inherits2.default)(GenericCard, _ReactNodeView);
-
-  var _super2 = _createSuper(GenericCard);
-
-  function GenericCard() {
-    (0, _classCallCheck2.default)(this, GenericCard);
-    return _super2.apply(this, arguments);
-  }
-
-  (0, _createClass2.default)(GenericCard, [{
-    key: "init",
-    value: function init() {
-      (0, _get2.default)((0, _getPrototypeOf2.default)(GenericCard.prototype), "init", this).call(this); // localId exists to distinguish between different smart cards for the purpose of analytics
-
-      this.node.attrs.localId = this.node.attrs.localId || _adfSchema.uuid.generate();
-      return this;
-    }
-  }]);
-  return GenericCard;
-}(_ReactNodeView2.default);
-
-exports.GenericCard = GenericCard;
+}

package/dist/cjs/plugins/card/nodeviews/inlineCard.js

@@ -37,6 +37,8 @@ var _rafSchd = _interopRequireDefault(require("raf-schd"));
 
 var _genericCard = require("./genericCard");
 
+var _ReactNodeView2 = _interopRequireDefault(require("../../../nodeviews/ReactNodeView"));
+
 var _actions = require("../pm-plugins/actions");
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -130,8 +132,8 @@ exports.InlineCardComponent = InlineCardComponent;
 });
 var WrappedInlineCard = (0, _genericCard.Card)(InlineCardComponent, _ui.UnsupportedInline);
 
-var InlineCard = /*#__PURE__*/function (_GenericCard) {
-  (0, _inherits2.default)(InlineCard, _GenericCard);
+var InlineCard = /*#__PURE__*/function (_ReactNodeView) {
+  (0, _inherits2.default)(InlineCard, _ReactNodeView);
 
   var _super2 = _createSuper(InlineCard);
 
@@ -160,6 +162,6 @@ var InlineCard = /*#__PURE__*/function (_GenericCard) {
     }
   }]);
   return InlineCard;
-}(_genericCard.GenericCard);
+}(_ReactNodeView2.default);
 
 exports.InlineCard = InlineCard;

package/dist/cjs/plugins/card/pm-plugins/doc.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.handleFallbackWithAnalytics = exports.convertHyperlinkToSmartCard = exports.changeSelectedCardToText = exports.changeSelectedCardToLinkFallback = exports.changeSelectedCardToLink = void 0;
+exports.handleFallbackWithAnalytics = exports.convertHyperlinkToSmartCard = exports.changeSelectedCardToText = exports.changeSelectedCardToLink = void 0;
 exports.insertCard = insertCard;
 exports.updateCard = exports.setSelectedCardAppearance = exports.replaceQueuedUrlWithCard = exports.queueCardsFromChangedTr = void 0;
 
@@ -41,8 +41,6 @@ var _analytics2 = require("../../../plugins/hyperlink/analytics");
 
 var _linkingUtils = require("../../../utils/linking-utils");
 
-var _featureFlagsContext = require("../../feature-flags-context");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -254,47 +252,6 @@ var convertHyperlinkToSmartCard = function convertHyperlinkToSmartCard(state, so
 exports.convertHyperlinkToSmartCard = convertHyperlinkToSmartCard;
 
 var changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sendAnalytics, node, pos) {
-  return function (state, dispatch) {
-    var tr;
-
-    if (node && pos) {
-      tr = cardNodeToLinkWithTransaction(state, text, href, node, pos);
-    } else {
-      tr = cardToLinkWithTransaction(state, text, href);
-    }
-
-    var selectedNode = state.selection instanceof _prosemirrorState.NodeSelection && state.selection.node;
-
-    if (sendAnalytics) {
-      if (selectedNode) {
-        var _getFeatureFlags = (0, _featureFlagsContext.getFeatureFlags)(state),
-            viewChangingExperimentToolbarStyle = _getFeatureFlags.viewChangingExperimentToolbarStyle;
-
-        (0, _analytics.addAnalytics)(state, tr, {
-          action: _analytics.ACTION.CHANGED_TYPE,
-          actionSubject: _analytics.ACTION_SUBJECT.SMART_LINK,
-          eventType: _analytics.EVENT_TYPE.TRACK,
-          attributes: {
-            newType: _nodeEvents.SMART_LINK_TYPE.URL,
-            previousType: (0, _utils.appearanceForNodeType)(selectedNode.type),
-            localId: selectedNode.attrs.localId,
-            featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
-          }
-        });
-      }
-    }
-
-    if (dispatch) {
-      dispatch(tr.scrollIntoView());
-    }
-
-    return true;
-  };
-};
-
-exports.changeSelectedCardToLink = changeSelectedCardToLink;
-
-var changeSelectedCardToLinkFallback = function changeSelectedCardToLinkFallback(text, href, sendAnalytics, node, pos) {
   return function (state, dispatch) {
     var tr;
 
@@ -306,11 +263,11 @@ var changeSelectedCardToLinkFallback = function changeSelectedCardToLinkFallback
 
     if (sendAnalytics) {
       (0, _analytics.addAnalytics)(state, tr, {
-        action: _analytics.ACTION.ERRORED,
+        action: _analytics.ACTION.CHANGED_TYPE,
         actionSubject: _analytics.ACTION_SUBJECT.SMART_LINK,
-        eventType: _analytics.EVENT_TYPE.OPERATIONAL,
+        eventType: _analytics.EVENT_TYPE.TRACK,
         attributes: {
-          error: 'Smart card falling back to link.'
+          newType: _nodeEvents.SMART_LINK_TYPE.URL
         }
       });
     }
@@ -323,7 +280,7 @@ var changeSelectedCardToLinkFallback = function changeSelectedCardToLinkFallback
   };
 };
 
-exports.changeSelectedCardToLinkFallback = changeSelectedCardToLinkFallback;
+exports.changeSelectedCardToLink = changeSelectedCardToLink;
 
 var updateCard = function updateCard(href) {
   return function (state, dispatch) {
@@ -416,19 +373,13 @@ var setSelectedCardAppearance = function setSelectedCardAppearance(appearance) {
     var from = state.selection.from;
     var nodeType = getLinkNodeType(appearance, state.schema.nodes);
     var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
-
-    var _getFeatureFlags2 = (0, _featureFlagsContext.getFeatureFlags)(state),
-        viewChangingExperimentToolbarStyle = _getFeatureFlags2.viewChangingExperimentToolbarStyle;
-
     (0, _analytics.addAnalytics)(state, tr, {
       action: _analytics.ACTION.CHANGED_TYPE,
       actionSubject: _analytics.ACTION_SUBJECT.SMART_LINK,
       eventType: _analytics.EVENT_TYPE.TRACK,
       attributes: {
         newType: appearance,
-        previousType: (0, _utils.appearanceForNodeType)(selectedNode.type),
-        localId: selectedNode.attrs.localId,
-        featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
+        previousType: (0, _utils.appearanceForNodeType)(selectedNode.type)
       }
     });
 

package/dist/cjs/version-wrapper.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.version = exports.nextMajorVersion = exports.name = void 0;
 var name = "@atlaskit/editor-core";
 exports.name = name;
-var version = "155.0.0";
+var version = "158.0.1";
 exports.version = version;
 
 var nextMajorVersion = function nextMajorVersion() {

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "155.0.0",
+	"version": "158.0.1",
 	"sideEffects": false
 }

package/dist/es2019/plugins/card/nodeviews/blockCard.js

@@ -5,7 +5,8 @@ import { UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { browser } from '@atlaskit/editor-common/utils';
 import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
-import { Card, GenericCard } from './genericCard';
+import { Card } from './genericCard';
+import { ReactNodeView } from '../../../nodeviews/';
 import { registerCard } from '../pm-plugins/actions';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 export class BlockCardComponent extends React.PureComponent {
@@ -95,7 +96,7 @@ _defineProperty(BlockCardComponent, "contextTypes", {
 });
 
 const WrappedBlockCard = Card(BlockCardComponent, UnsupportedBlock);
-export class BlockCard extends GenericCard {
+export class BlockCard extends ReactNodeView {
   createDomRef() {
     const domRef = document.createElement('div');
 

package/dist/es2019/plugins/card/nodeviews/embedCard.js

@@ -8,7 +8,6 @@ import { Card } from './genericCard';
 import { UnsupportedBlock, MediaSingle as RichMediaWrapper, findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { browser } from '@atlaskit/editor-common/utils';
 import { DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
-import { uuid } from '@atlaskit/adf-schema';
 import { SelectionBasedNodeView } from '../../../nodeviews/';
 import { registerCard } from '../pm-plugins/actions';
 import ResizableEmbedCard from '../ui/ResizableEmbedCard';
@@ -303,13 +302,6 @@ _defineProperty(EmbedCardComponent, "contextTypes", {
 
 const WrappedBlockCard = Card(EmbedCardComponent, UnsupportedBlock);
 export class EmbedCard extends SelectionBasedNodeView {
-  init() {
-    super.init(); // localId exists to distinguish between different smart cards for the purpose of analytics
-
-    this.node.attrs.localId = this.node.attrs.localId || uuid.generate();
-    return this;
-  }
-
   viewShouldUpdate(nextNode) {
     if (this.node.attrs !== nextNode.attrs) {
       return true;

package/dist/es2019/plugins/card/nodeviews/genericCard.js

@@ -3,10 +3,8 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import PropTypes from 'prop-types';
 import { isSafeUrl } from '@atlaskit/adf-schema';
-import ReactNodeView from '../../../nodeviews/ReactNodeView';
 import { titleUrlPairFromNode } from '../utils';
-import { changeSelectedCardToLinkFallback } from '../pm-plugins/doc';
-import { uuid } from '@atlaskit/adf-schema';
+import { changeSelectedCardToLink } from '../pm-plugins/doc';
 export function Card(SmartCardComponent, UnsupportedComponent) {
   var _class, _temp;
 
@@ -71,7 +69,7 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
           return;
         }
 
-        changeSelectedCardToLinkFallback(undefined, url, true, node, getPos())(view.state, view.dispatch);
+        changeSelectedCardToLink(undefined, url, true, node, getPos())(view.state, view.dispatch);
         return null;
       } else {
         // Otherwise, render a blue link as fallback (above in render()).
@@ -84,13 +82,4 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
   }, _defineProperty(_class, "contextTypes", {
     contextAdapter: PropTypes.object
   }), _temp;
-}
-export class GenericCard extends ReactNodeView {
-  init() {
-    super.init(); // localId exists to distinguish between different smart cards for the purpose of analytics
-
-    this.node.attrs.localId = this.node.attrs.localId || uuid.generate();
-    return this;
-  }
-
 }

package/dist/es2019/plugins/card/nodeviews/inlineCard.js

@@ -6,7 +6,8 @@ import { UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import rafSchedule from 'raf-schd';
-import { Card, GenericCard } from './genericCard';
+import { Card } from './genericCard';
+import ReactNodeView from '../../../nodeviews/ReactNodeView';
 import { registerCard } from '../pm-plugins/actions';
 export class InlineCardComponent extends React.PureComponent {
   constructor(...args) {
@@ -82,7 +83,7 @@ _defineProperty(InlineCardComponent, "contextTypes", {
 });
 
 const WrappedInlineCard = Card(InlineCardComponent, UnsupportedInline);
-export class InlineCard extends GenericCard {
+export class InlineCard extends ReactNodeView {
   createDomRef() {
     return super.createDomRef({
       displayInlineBlockForInlineNodes: false

package/dist/es2019/plugins/card/pm-plugins/doc.js

@@ -12,7 +12,6 @@ import { shouldReplaceLink } from './shouldReplaceLink';
 import { SMART_LINK_TYPE } from '../../../plugins/analytics/types/node-events';
 import { getLinkCreationAnalyticsEvent } from '../../../plugins/hyperlink/analytics';
 import { unlinkPayload } from '../../../utils/linking-utils';
-import { getFeatureFlags } from '../../feature-flags-context';
 export function insertCard(tr, cardAdf, schema) {
   const {
     inlineCard
@@ -208,49 +207,13 @@ export const changeSelectedCardToLink = (text, href, sendAnalytics, node, pos) =
     tr = cardToLinkWithTransaction(state, text, href);
   }
 
-  const selectedNode = state.selection instanceof NodeSelection && state.selection.node;
-
-  if (sendAnalytics) {
-    if (selectedNode) {
-      const {
-        viewChangingExperimentToolbarStyle
-      } = getFeatureFlags(state);
-      addAnalytics(state, tr, {
-        action: ACTION.CHANGED_TYPE,
-        actionSubject: ACTION_SUBJECT.SMART_LINK,
-        eventType: EVENT_TYPE.TRACK,
-        attributes: {
-          newType: SMART_LINK_TYPE.URL,
-          previousType: appearanceForNodeType(selectedNode.type),
-          localId: selectedNode.attrs.localId,
-          featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
-        }
-      });
-    }
-  }
-
-  if (dispatch) {
-    dispatch(tr.scrollIntoView());
-  }
-
-  return true;
-};
-export const changeSelectedCardToLinkFallback = (text, href, sendAnalytics, node, pos) => (state, dispatch) => {
-  let tr;
-
-  if (node && pos) {
-    tr = cardNodeToLinkWithTransaction(state, text, href, node, pos);
-  } else {
-    tr = cardToLinkWithTransaction(state, text, href);
-  }
-
   if (sendAnalytics) {
     addAnalytics(state, tr, {
-      action: ACTION.ERRORED,
+      action: ACTION.CHANGED_TYPE,
       actionSubject: ACTION_SUBJECT.SMART_LINK,
-      eventType: EVENT_TYPE.OPERATIONAL,
+      eventType: EVENT_TYPE.TRACK,
       attributes: {
-        error: 'Smart card falling back to link.'
+        newType: SMART_LINK_TYPE.URL
       }
     });
   }
@@ -348,18 +311,13 @@ export const setSelectedCardAppearance = appearance => (state, dispatch) => {
   } = state.selection;
   const nodeType = getLinkNodeType(appearance, state.schema.nodes);
   const tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
-  const {
-    viewChangingExperimentToolbarStyle
-  } = getFeatureFlags(state);
   addAnalytics(state, tr, {
     action: ACTION.CHANGED_TYPE,
     actionSubject: ACTION_SUBJECT.SMART_LINK,
     eventType: EVENT_TYPE.TRACK,
     attributes: {
       newType: appearance,
-      previousType: appearanceForNodeType(selectedNode.type),
-      localId: selectedNode.attrs.localId,
-      featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
+      previousType: appearanceForNodeType(selectedNode.type)
     }
   });
 

package/dist/es2019/version-wrapper.js

@@ -1,5 +1,5 @@
 export const name = "@atlaskit/editor-core";
-export const version = "155.0.0";
+export const version = "158.0.1";
 export const nextMajorVersion = () => {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/es2019/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "155.0.0",
+	"version": "158.0.1",
 	"sideEffects": false
 }

package/dist/esm/plugins/card/nodeviews/blockCard.js

@@ -16,7 +16,8 @@ import { UnsupportedBlock } from '@atlaskit/editor-common/ui';
 import { browser } from '@atlaskit/editor-common/utils';
 import PropTypes from 'prop-types';
 import rafSchedule from 'raf-schd';
-import { Card, GenericCard } from './genericCard';
+import { Card } from './genericCard';
+import { ReactNodeView } from '../../../nodeviews/';
 import { registerCard } from '../pm-plugins/actions';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 export var BlockCardComponent = /*#__PURE__*/function (_React$PureComponent) {
@@ -120,8 +121,8 @@ _defineProperty(BlockCardComponent, "contextTypes", {
 });
 
 var WrappedBlockCard = Card(BlockCardComponent, UnsupportedBlock);
-export var BlockCard = /*#__PURE__*/function (_GenericCard) {
-  _inherits(BlockCard, _GenericCard);
+export var BlockCard = /*#__PURE__*/function (_ReactNodeView) {
+  _inherits(BlockCard, _ReactNodeView);
 
   var _super2 = _createSuper(BlockCard);
 
@@ -158,4 +159,4 @@ export var BlockCard = /*#__PURE__*/function (_GenericCard) {
   }]);
 
   return BlockCard;
-}(GenericCard);
+}(ReactNodeView);

package/dist/esm/plugins/card/nodeviews/embedCard.js

@@ -24,7 +24,6 @@ import { Card } from './genericCard';
 import { UnsupportedBlock, MediaSingle as RichMediaWrapper, findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import { browser } from '@atlaskit/editor-common/utils';
 import { DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
-import { uuid } from '@atlaskit/adf-schema';
 import { SelectionBasedNodeView } from '../../../nodeviews/';
 import { registerCard } from '../pm-plugins/actions';
 import ResizableEmbedCard from '../ui/ResizableEmbedCard';
@@ -340,15 +339,6 @@ export var EmbedCard = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   }
 
   _createClass(EmbedCard, [{
-    key: "init",
-    value: function init() {
-      _get(_getPrototypeOf(EmbedCard.prototype), "init", this).call(this); // localId exists to distinguish between different smart cards for the purpose of analytics
-
-
-      this.node.attrs.localId = this.node.attrs.localId || uuid.generate();
-      return this;
-    }
-  }, {
     key: "viewShouldUpdate",
     value: function viewShouldUpdate(nextNode) {
       if (this.node.attrs !== nextNode.attrs) {

package/dist/esm/plugins/card/nodeviews/genericCard.js

@@ -1,4 +1,3 @@
-import _get from "@babel/runtime/helpers/get";
 import _extends from "@babel/runtime/helpers/extends";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
@@ -15,10 +14,8 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import React from 'react';
 import PropTypes from 'prop-types';
 import { isSafeUrl } from '@atlaskit/adf-schema';
-import ReactNodeView from '../../../nodeviews/ReactNodeView';
 import { titleUrlPairFromNode } from '../utils';
-import { changeSelectedCardToLinkFallback } from '../pm-plugins/doc';
-import { uuid } from '@atlaskit/adf-schema';
+import { changeSelectedCardToLink } from '../pm-plugins/doc';
 export function Card(SmartCardComponent, UnsupportedComponent) {
   var _class, _temp;
 
@@ -98,7 +95,7 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
             return;
           }
 
-          changeSelectedCardToLinkFallback(undefined, url, true, node, getPos())(view.state, view.dispatch);
+          changeSelectedCardToLink(undefined, url, true, node, getPos())(view.state, view.dispatch);
           return null;
         } else {
           // Otherwise, render a blue link as fallback (above in render()).
@@ -113,28 +110,4 @@ export function Card(SmartCardComponent, UnsupportedComponent) {
   }(React.Component), _defineProperty(_class, "contextTypes", {
     contextAdapter: PropTypes.object
   }), _temp;
-}
-export var GenericCard = /*#__PURE__*/function (_ReactNodeView) {
-  _inherits(GenericCard, _ReactNodeView);
-
-  var _super2 = _createSuper(GenericCard);
-
-  function GenericCard() {
-    _classCallCheck(this, GenericCard);
-
-    return _super2.apply(this, arguments);
-  }
-
-  _createClass(GenericCard, [{
-    key: "init",
-    value: function init() {
-      _get(_getPrototypeOf(GenericCard.prototype), "init", this).call(this); // localId exists to distinguish between different smart cards for the purpose of analytics
-
-
-      this.node.attrs.localId = this.node.attrs.localId || uuid.generate();
-      return this;
-    }
-  }]);
-
-  return GenericCard;
-}(ReactNodeView);
+}

package/dist/esm/plugins/card/nodeviews/inlineCard.js

@@ -18,7 +18,8 @@ import { UnsupportedInline } from '@atlaskit/editor-common/ui';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/utils';
 import { findOverflowScrollParent } from '@atlaskit/editor-common/ui';
 import rafSchedule from 'raf-schd';
-import { Card, GenericCard } from './genericCard';
+import { Card } from './genericCard';
+import ReactNodeView from '../../../nodeviews/ReactNodeView';
 import { registerCard } from '../pm-plugins/actions';
 export var InlineCardComponent = /*#__PURE__*/function (_React$PureComponent) {
   _inherits(InlineCardComponent, _React$PureComponent);
@@ -108,8 +109,8 @@ _defineProperty(InlineCardComponent, "contextTypes", {
 });
 
 var WrappedInlineCard = Card(InlineCardComponent, UnsupportedInline);
-export var InlineCard = /*#__PURE__*/function (_GenericCard) {
-  _inherits(InlineCard, _GenericCard);
+export var InlineCard = /*#__PURE__*/function (_ReactNodeView) {
+  _inherits(InlineCard, _ReactNodeView);
 
   var _super2 = _createSuper(InlineCard);
 
@@ -140,4 +141,4 @@ export var InlineCard = /*#__PURE__*/function (_GenericCard) {
   }]);
 
   return InlineCard;
-}(GenericCard);
+}(ReactNodeView);

package/dist/esm/plugins/card/pm-plugins/doc.js

@@ -19,7 +19,6 @@ import { shouldReplaceLink } from './shouldReplaceLink';
 import { SMART_LINK_TYPE } from '../../../plugins/analytics/types/node-events';
 import { getLinkCreationAnalyticsEvent } from '../../../plugins/hyperlink/analytics';
 import { unlinkPayload } from '../../../utils/linking-utils';
-import { getFeatureFlags } from '../../feature-flags-context';
 export function insertCard(tr, cardAdf, schema) {
   var inlineCard = schema.nodes.inlineCard; // ED-5638: add an extra space after inline cards to avoid re-rendering them
 
@@ -214,44 +213,6 @@ export var convertHyperlinkToSmartCard = function convertHyperlinkToSmartCard(st
   return queueCards(requests)(state.tr);
 };
 export var changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sendAnalytics, node, pos) {
-  return function (state, dispatch) {
-    var tr;
-
-    if (node && pos) {
-      tr = cardNodeToLinkWithTransaction(state, text, href, node, pos);
-    } else {
-      tr = cardToLinkWithTransaction(state, text, href);
-    }
-
-    var selectedNode = state.selection instanceof NodeSelection && state.selection.node;
-
-    if (sendAnalytics) {
-      if (selectedNode) {
-        var _getFeatureFlags = getFeatureFlags(state),
-            viewChangingExperimentToolbarStyle = _getFeatureFlags.viewChangingExperimentToolbarStyle;
-
-        addAnalytics(state, tr, {
-          action: ACTION.CHANGED_TYPE,
-          actionSubject: ACTION_SUBJECT.SMART_LINK,
-          eventType: EVENT_TYPE.TRACK,
-          attributes: {
-            newType: SMART_LINK_TYPE.URL,
-            previousType: appearanceForNodeType(selectedNode.type),
-            localId: selectedNode.attrs.localId,
-            featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
-          }
-        });
-      }
-    }
-
-    if (dispatch) {
-      dispatch(tr.scrollIntoView());
-    }
-
-    return true;
-  };
-};
-export var changeSelectedCardToLinkFallback = function changeSelectedCardToLinkFallback(text, href, sendAnalytics, node, pos) {
   return function (state, dispatch) {
     var tr;
 
@@ -263,11 +224,11 @@ export var changeSelectedCardToLinkFallback = function changeSelectedCardToLinkF
 
     if (sendAnalytics) {
       addAnalytics(state, tr, {
-        action: ACTION.ERRORED,
+        action: ACTION.CHANGED_TYPE,
         actionSubject: ACTION_SUBJECT.SMART_LINK,
-        eventType: EVENT_TYPE.OPERATIONAL,
+        eventType: EVENT_TYPE.TRACK,
         attributes: {
-          error: 'Smart card falling back to link.'
+          newType: SMART_LINK_TYPE.URL
         }
       });
     }
@@ -365,19 +326,13 @@ export var setSelectedCardAppearance = function setSelectedCardAppearance(appear
     var from = state.selection.from;
     var nodeType = getLinkNodeType(appearance, state.schema.nodes);
     var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
-
-    var _getFeatureFlags2 = getFeatureFlags(state),
-        viewChangingExperimentToolbarStyle = _getFeatureFlags2.viewChangingExperimentToolbarStyle;
-
     addAnalytics(state, tr, {
       action: ACTION.CHANGED_TYPE,
       actionSubject: ACTION_SUBJECT.SMART_LINK,
       eventType: EVENT_TYPE.TRACK,
       attributes: {
         newType: appearance,
-        previousType: appearanceForNodeType(selectedNode.type),
-        localId: selectedNode.attrs.localId,
-        featureFlag: viewChangingExperimentToolbarStyle || 'noChange'
+        previousType: appearanceForNodeType(selectedNode.type)
       }
     });
 

package/dist/esm/version-wrapper.js

@@ -1,5 +1,5 @@
 export var name = "@atlaskit/editor-core";
-export var version = "155.0.0";
+export var version = "158.0.1";
 export var nextMajorVersion = function nextMajorVersion() {
   return [Number(version.split('.')[0]) + 1, 0, 0].join('.');
 };

package/dist/esm/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "155.0.0",
+	"version": "158.0.1",
 	"sideEffects": false
 }

package/dist/types/plugins/analytics/types/events.d.ts

@@ -99,9 +99,5 @@ declare type ComponentCrashAdditionalInfoErrorAEP = OperationalAEP<ACTION.EDITOR
     errorStack: string;
     errorId: string;
 }, undefined>;
-declare type SmartLinkErrorAEP = OperationalAEP<ACTION.ERRORED, ACTION_SUBJECT.SMART_LINK, undefined, {
-    error: string;
-    errorStack?: string;
-}, undefined>;
-export declare type ErrorEventPayload = InvalidTransactionErrorAEP | InvalidTransactionStepErrorAEP | FailedToUnmountErrorAEP | SynchronyErrorAEP | InvalidDocumentEncounteredAEP | SynchronyEntityErrorAEP | ContentComponentErrorAEP | ComponentCrashErrorAEP | ComponentCrashAdditionalInfoErrorAEP | SmartLinkErrorAEP;
+export declare type ErrorEventPayload = InvalidTransactionErrorAEP | InvalidTransactionStepErrorAEP | FailedToUnmountErrorAEP | SynchronyErrorAEP | InvalidDocumentEncounteredAEP | SynchronyEntityErrorAEP | ContentComponentErrorAEP | ComponentCrashErrorAEP | ComponentCrashAdditionalInfoErrorAEP;
 export {};

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

@@ -2,8 +2,8 @@ import React from 'react';
 import { Node as PMNode } from 'prosemirror-model';
 import PropTypes from 'prop-types';
 import { EditorView } from 'prosemirror-view';
-import { SmartCardProps, GenericCard } from './genericCard';
-import { getPosHandler } from '../../../nodeviews/';
+import { SmartCardProps } from './genericCard';
+import { ReactNodeView, getPosHandler } from '../../../nodeviews/';
 export interface Props {
     children?: React.ReactNode;
     node: PMNode;
@@ -25,7 +25,7 @@ export declare class BlockCardComponent extends React.PureComponent<SmartCardPro
     render(): JSX.Element;
 }
 export declare type BlockCardNodeViewProps = Pick<SmartCardProps, 'platform'>;
-export declare class BlockCard extends GenericCard<BlockCardNodeViewProps> {
+export declare class BlockCard extends ReactNodeView<BlockCardNodeViewProps> {
     createDomRef(): HTMLElement;
     render(): JSX.Element;
 }

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

@@ -37,7 +37,6 @@ export declare class EmbedCardComponent extends React.PureComponent<SmartCardPro
 }
 export declare type EmbedCardNodeViewProps = Pick<SmartCardProps, 'eventDispatcher' | 'allowResizing' | 'platform' | 'fullWidthMode' | 'dispatchAnalyticsEvent'>;
 export declare class EmbedCard extends SelectionBasedNodeView<EmbedCardNodeViewProps> {
-    init(): this;
     viewShouldUpdate(nextNode: PMNode): boolean;
     createDomRef(): HTMLElement;
     render(): JSX.Element;

package/dist/types/plugins/card/nodeviews/genericCard.d.ts

@@ -3,7 +3,6 @@ import { Node as PMNode } from 'prosemirror-model';
 import { EditorView } from 'prosemirror-view';
 import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { Context as SmartCardContext, CardPlatform } from '@atlaskit/smart-card';
-import ReactNodeView from '../../../nodeviews/ReactNodeView';
 import { getPosHandler, ReactComponentProps } from '../../../nodeviews';
 import { EventDispatcher } from '../../../event-dispatcher';
 import { DispatchAnalyticsEvent } from '../../../plugins/analytics';
@@ -31,6 +30,3 @@ export interface SmartCardProps extends CardProps {
     cardContext?: EditorContext<typeof SmartCardContext>;
 }
 export declare function Card(SmartCardComponent: React.ComponentType<SmartCardProps>, UnsupportedComponent: React.ComponentType): React.ComponentType<CardProps>;
-export declare class GenericCard<A> extends ReactNodeView<A> {
-    init(): this;
-}

package/dist/types/plugins/card/nodeviews/inlineCard.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { SmartCardProps, GenericCard } from './genericCard';
+import { SmartCardProps } from './genericCard';
+import ReactNodeView from '../../../nodeviews/ReactNodeView';
 export declare class InlineCardComponent extends React.PureComponent<SmartCardProps> {
     private scrollContainer?;
     private onClick;
@@ -15,7 +16,7 @@ export declare class InlineCardComponent extends React.PureComponent<SmartCardPr
     render(): JSX.Element | null;
 }
 export declare type InlineCardNodeViewProps = Pick<SmartCardProps, 'useAlternativePreloader'>;
-export declare class InlineCard extends GenericCard<InlineCardNodeViewProps> {
+export declare class InlineCard extends ReactNodeView<InlineCardNodeViewProps> {
     createDomRef(): HTMLElement;
     render(): JSX.Element;
 }

package/dist/types/plugins/card/pm-plugins/doc.d.ts

@@ -11,7 +11,6 @@ export declare const handleFallbackWithAnalytics: (url: string, source: InputMet
 export declare const queueCardsFromChangedTr: (state: EditorState, tr: Transaction, source: CardReplacementInputMethod, normalizeLinkText?: boolean) => Transaction;
 export declare const convertHyperlinkToSmartCard: (state: EditorState, source: CardReplacementInputMethod, appearance: CardAppearance, normalizeLinkText?: boolean) => Transaction;
 export declare const changeSelectedCardToLink: (text?: string | undefined, href?: string | undefined, sendAnalytics?: boolean | undefined, node?: Node<any> | undefined, pos?: number | undefined) => Command;
-export declare const changeSelectedCardToLinkFallback: (text?: string | undefined, href?: string | undefined, sendAnalytics?: boolean | undefined, node?: Node<any> | undefined, pos?: number | undefined) => Command;
 export declare const updateCard: (href: string) => Command;
 export declare const changeSelectedCardToText: (text: string) => Command;
 export declare const setSelectedCardAppearance: (appearance: CardAppearance) => Command;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "155.0.0",
+  "version": "158.0.1",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -78,7 +78,7 @@
     "@atlaskit/theme": "^12.1.0",
     "@atlaskit/toggle": "^12.4.0",
     "@atlaskit/tooltip": "^17.5.0",
-    "@atlaskit/user-picker": "^8.5.0",
+    "@atlaskit/user-picker": "^8.6.0",
     "@atlaskit/util-service-support": "^6.1.0",
     "@atlaskit/width-detector": "^3.0.0",
     "@babel/runtime": "^7.0.0",
@@ -129,7 +129,7 @@
   },
   "peerDependencies": {
     "@atlaskit/media-core": "^32.2.0",
-    "@atlaskit/smart-card": "^17.1.0",
+    "@atlaskit/smart-card": "^17.4.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
     "react-intl": "^2.6.0",
@@ -140,7 +140,7 @@
     "@atlaskit/atlassian-navigation": "^2.1.0",
     "@atlaskit/breadcrumbs": "11.5.3",
     "@atlaskit/code": "^14.3.0",
-    "@atlaskit/collab-provider": "7.1.5",
+    "@atlaskit/collab-provider": "7.1.6",
     "@atlaskit/docs": "*",
     "@atlaskit/drawer": "^7.1.0",
     "@atlaskit/dropdown-menu": "^11.1.0",
@@ -155,17 +155,17 @@
     "@atlaskit/media-test-helpers": "^29.1.0",
     "@atlaskit/menu": "^1.2.0",
     "@atlaskit/page-layout": "^1.0.1",
-    "@atlaskit/profilecard": "^16.2.0",
+    "@atlaskit/profilecard": "^16.3.0",
     "@atlaskit/pubsub": "^6.0.0",
-    "@atlaskit/renderer": "^86.0.0",
+    "@atlaskit/renderer": "^89.0.0",
     "@atlaskit/section-message": "^6.1.0",
     "@atlaskit/share": "*",
-    "@atlaskit/smart-card": "^17.1.0",
+    "@atlaskit/smart-card": "^17.4.0",
     "@atlaskit/synchrony-test-helpers": "^2.3.0",
     "@atlaskit/textarea": "^4.3.0",
     "@atlaskit/toggle": "^12.4.0",
     "@atlaskit/ufo": "^0.1.0",
-    "@atlaskit/user-picker": "^8.5.0",
+    "@atlaskit/user-picker": "^8.6.0",
     "@atlaskit/util-data-test": "^17.2.0",
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",