@atlaskit/editor-plugin-card 1.0.3 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-plugin-card
 
+## 1.0.4
+
+### Patch Changes
+
+- [#75549](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75549) [`cdb2d5721cce`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cdb2d5721cce) - Fix an issue where view switching from toolbar was causing js error.
+- Updated dependencies
+
 ## 1.0.3
 
 ### Patch Changes

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

@@ -251,19 +251,14 @@ var convertHyperlinkToSmartCard = exports.convertHyperlinkToSmartCard = function
 };
 var changeSelectedCardToLink = exports.changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sendAnalytics, node, pos, editorAnalyticsApi) {
   return function (state, dispatch) {
+    var selectedNode = state.selection instanceof _state.NodeSelection ? state.selection.node : undefined;
     var tr;
     if (node && pos) {
       tr = cardNodeToLinkWithTransaction(state, text, href, node, pos);
     } else {
       tr = cardToLinkWithTransaction(state, text, href);
     }
-    var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node;
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode && !(0, _utils2.isDatasourceConfigEditable)(selectedNode.attrs.datasource.id)) {
-      (0, _actions.setDatasourceStash)(tr, {
-        url: selectedNode.attrs.url,
-        views: selectedNode.attrs.datasource.views
-      });
-    }
+    updateDatasourceStash(tr, selectedNode);
     if (sendAnalytics) {
       if (selectedNode) {
         editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
@@ -362,7 +357,7 @@ var changeSelectedCardToText = exports.changeSelectedCardToText = function chang
 var setSelectedCardAppearance = exports.setSelectedCardAppearance = function setSelectedCardAppearance(appearance, editorAnalyticsApi) {
   return function (state, dispatch) {
     var _previousNode$type;
-    var selectedNode = state.selection instanceof _state.NodeSelection && state.selection.node;
+    var selectedNode = state.selection instanceof _state.NodeSelection ? state.selection.node : undefined;
     if (!selectedNode) {
       // When there is no selected node, we insert a new one
       // and replace the existing blue link
@@ -395,12 +390,7 @@ var setSelectedCardAppearance = exports.setSelectedCardAppearance = function set
       to = _state$selection.to;
     var nodeType = getLinkNodeType(appearance, state.schema.nodes);
     var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode && !(0, _utils2.isDatasourceConfigEditable)(selectedNode.attrs.datasource.id)) {
-      (0, _actions.setDatasourceStash)(tr, {
-        url: selectedNode.attrs.url,
-        views: selectedNode.attrs.datasource.views
-      });
-    }
+    updateDatasourceStash(tr, selectedNode);
 
     // When the selected card is the last element in the doc we add a new paragraph after it for consistent replacement
     if (tr.doc.nodeSize - 2 === to) {
@@ -521,4 +511,13 @@ var getAttrsForAppearance = exports.getAttrsForAppearance = function getAttrsFor
     };
   }
   return selectedNode.attrs;
+};
+var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
+  var _selectedNode$attrs;
+  if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode !== null && selectedNode !== void 0 && (_selectedNode$attrs = selectedNode.attrs) !== null && _selectedNode$attrs !== void 0 && _selectedNode$attrs.datasource && !(0, _utils2.isDatasourceConfigEditable)(selectedNode.attrs.datasource.id)) {
+    (0, _actions.setDatasourceStash)(tr, {
+      url: selectedNode.attrs.url,
+      views: selectedNode.attrs.datasource.views
+    });
+  }
 };

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

@@ -228,19 +228,14 @@ export const convertHyperlinkToSmartCard = (state, source, appearance, normalize
   return queueCards(requests)(state.tr);
 };
 export const changeSelectedCardToLink = (text, href, sendAnalytics, node, pos, editorAnalyticsApi) => (state, dispatch) => {
+  const selectedNode = state.selection instanceof NodeSelection ? state.selection.node : undefined;
   let tr;
   if (node && pos) {
     tr = cardNodeToLinkWithTransaction(state, text, href, node, pos);
   } else {
     tr = cardToLinkWithTransaction(state, text, href);
   }
-  const selectedNode = state.selection instanceof NodeSelection && state.selection.node;
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id)) {
-    setDatasourceStash(tr, {
-      url: selectedNode.attrs.url,
-      views: selectedNode.attrs.datasource.views
-    });
-  }
+  updateDatasourceStash(tr, selectedNode);
   if (sendAnalytics) {
     if (selectedNode) {
       editorAnalyticsApi === null || editorAnalyticsApi === void 0 ? void 0 : editorAnalyticsApi.attachAnalyticsEvent({
@@ -335,7 +330,7 @@ export const changeSelectedCardToText = (text, editorAnalyticsApi) => (state, di
 };
 export const setSelectedCardAppearance = (appearance, editorAnalyticsApi) => (state, dispatch) => {
   var _previousNode$type;
-  const selectedNode = state.selection instanceof NodeSelection && state.selection.node;
+  const selectedNode = state.selection instanceof NodeSelection ? state.selection.node : undefined;
   if (!selectedNode) {
     // When there is no selected node, we insert a new one
     // and replace the existing blue link
@@ -370,12 +365,7 @@ export const setSelectedCardAppearance = (appearance, editorAnalyticsApi) => (st
   } = state.selection;
   const nodeType = getLinkNodeType(appearance, state.schema.nodes);
   const tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
-  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id)) {
-    setDatasourceStash(tr, {
-      url: selectedNode.attrs.url,
-      views: selectedNode.attrs.datasource.views
-    });
-  }
+  updateDatasourceStash(tr, selectedNode);
 
   // When the selected card is the last element in the doc we add a new paragraph after it for consistent replacement
   if (tr.doc.nodeSize - 2 === to) {
@@ -505,4 +495,13 @@ export const getAttrsForAppearance = (appearance, selectedNode) => {
     };
   }
   return selectedNode.attrs;
+};
+const updateDatasourceStash = (tr, selectedNode) => {
+  var _selectedNode$attrs;
+  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode !== null && selectedNode !== void 0 && (_selectedNode$attrs = selectedNode.attrs) !== null && _selectedNode$attrs !== void 0 && _selectedNode$attrs.datasource && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id)) {
+    setDatasourceStash(tr, {
+      url: selectedNode.attrs.url,
+      views: selectedNode.attrs.datasource.views
+    });
+  }
 };

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

@@ -244,19 +244,14 @@ export var convertHyperlinkToSmartCard = function convertHyperlinkToSmartCard(st
 };
 export var changeSelectedCardToLink = function changeSelectedCardToLink(text, href, sendAnalytics, node, pos, editorAnalyticsApi) {
   return function (state, dispatch) {
+    var selectedNode = state.selection instanceof NodeSelection ? state.selection.node : undefined;
     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 (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id)) {
-      setDatasourceStash(tr, {
-        url: selectedNode.attrs.url,
-        views: selectedNode.attrs.datasource.views
-      });
-    }
+    updateDatasourceStash(tr, selectedNode);
     if (sendAnalytics) {
       if (selectedNode) {
         editorAnalyticsApi === null || editorAnalyticsApi === void 0 || editorAnalyticsApi.attachAnalyticsEvent({
@@ -355,7 +350,7 @@ export var changeSelectedCardToText = function changeSelectedCardToText(text, ed
 export var setSelectedCardAppearance = function setSelectedCardAppearance(appearance, editorAnalyticsApi) {
   return function (state, dispatch) {
     var _previousNode$type;
-    var selectedNode = state.selection instanceof NodeSelection && state.selection.node;
+    var selectedNode = state.selection instanceof NodeSelection ? state.selection.node : undefined;
     if (!selectedNode) {
       // When there is no selected node, we insert a new one
       // and replace the existing blue link
@@ -388,12 +383,7 @@ export var setSelectedCardAppearance = function setSelectedCardAppearance(appear
       to = _state$selection.to;
     var nodeType = getLinkNodeType(appearance, state.schema.nodes);
     var tr = state.tr.setNodeMarkup(from, nodeType, attrs, selectedNode.marks);
-    if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id)) {
-      setDatasourceStash(tr, {
-        url: selectedNode.attrs.url,
-        views: selectedNode.attrs.datasource.views
-      });
-    }
+    updateDatasourceStash(tr, selectedNode);
 
     // When the selected card is the last element in the doc we add a new paragraph after it for consistent replacement
     if (tr.doc.nodeSize - 2 === to) {
@@ -514,4 +504,13 @@ export var getAttrsForAppearance = function getAttrsForAppearance(appearance, se
     };
   }
   return selectedNode.attrs;
+};
+var updateDatasourceStash = function updateDatasourceStash(tr, selectedNode) {
+  var _selectedNode$attrs;
+  if (getBooleanFF('platform.linking-platform.enable-datasource-appearance-toolbar') && selectedNode !== null && selectedNode !== void 0 && (_selectedNode$attrs = selectedNode.attrs) !== null && _selectedNode$attrs !== void 0 && _selectedNode$attrs.datasource && !isDatasourceConfigEditable(selectedNode.attrs.datasource.id)) {
+    setDatasourceStash(tr, {
+      url: selectedNode.attrs.url,
+      views: selectedNode.attrs.datasource.views
+    });
+  }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -35,28 +35,28 @@
     "@atlaskit/adf-schema": "^35.5.1",
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/custom-steps": "^0.0.13",
-    "@atlaskit/editor-common": "^78.2.0",
+    "@atlaskit/editor-common": "^78.4.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-decorations": "^1.0.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
-    "@atlaskit/editor-plugin-floating-toolbar": "^1.1.0",
+    "@atlaskit/editor-plugin-floating-toolbar": "^1.2.0",
     "@atlaskit/editor-plugin-grid": "^1.0.0",
     "@atlaskit/editor-plugin-hyperlink": "^1.0.0",
     "@atlaskit/editor-plugin-width": "^1.0.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
     "@atlaskit/frontend-utilities": "^2.7.0",
-    "@atlaskit/icon": "^22.0.0",
+    "@atlaskit/icon": "^22.1.0",
     "@atlaskit/link-analytics": "^8.3.0",
     "@atlaskit/link-client-extension": "^1.8.0",
     "@atlaskit/link-datasource": "^1.22.0",
     "@atlaskit/linking-common": "^5.3.0",
     "@atlaskit/linking-types": "^8.6.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/primitives": "^2.0.0",
+    "@atlaskit/primitives": "^2.1.0",
     "@atlaskit/smart-card": "^26.47.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.37.0",
+    "@atlaskit/tokens": "^1.38.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "lodash": "^4.17.21",