@atlaskit/editor-plugin-floating-toolbar 1.19.0 → 1.20.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 1.20.1
+
+### Patch Changes
+
+- [#117370](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117370)
+  [`bdcaab521f1ee`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bdcaab521f1ee) -
+  Make logic for collapse toolbar dynamic, apply only to card elements for now
+- Updated dependencies
+
+## 1.20.0
+
+### Minor Changes
+
+- [#117197](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/117197)
+  [`d6202c120a039`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d6202c120a039) -
+  Remove @atlaskit/heading import which broke previous versions, replace with HeadingItem
+
 ## 1.19.0
 
 ### Minor Changes

package/dist/cjs/pm-plugins/contextual-toolbar/plugin.js

@@ -7,7 +7,7 @@ exports.contextualToolbarPlugin = void 0;
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _pluginKey = require("./plugin-key");
 var defaultEditState = {
-  display: 'collapsed'
+  isCollapsed: true
 };
 var contextualToolbarPlugin = exports.contextualToolbarPlugin = function contextualToolbarPlugin() {
   return new _safePlugin.SafePlugin({
@@ -17,19 +17,16 @@ var contextualToolbarPlugin = exports.contextualToolbarPlugin = function context
         return defaultEditState;
       },
       apply: function apply(tr, pluginState) {
-        if (pluginState.display === 'static') {
-          return pluginState;
-        }
         var action = tr.getMeta(_pluginKey.contextualToolbarPluginKey);
         if (action) {
           switch (action.type) {
             case 'expand-toolbar':
               return {
-                display: 'expanded'
+                isCollapsed: false
               };
             case 'collapse-toolbar':
               return {
-                display: 'collapsed'
+                isCollapsed: true
               };
             default:
               return pluginState;

package/dist/cjs/ui/DropdownMenu.js

@@ -10,7 +10,6 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
-var _heading = _interopRequireDefault(require("@atlaskit/heading"));
 var _done = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/done"));
 var _menu = require("@atlaskit/menu");
 var _colors = require("@atlaskit/theme/colors");
@@ -41,6 +40,9 @@ var separatorStyles = (0, _react2.css)({
   background: "var(--ds-border, #091E4224)",
   height: "var(--ds-space-025, 1px)"
 });
+var headingStyles = (0, _react2.css)({
+  padding: "var(--ds-space-100, 8px)".concat(" 0")
+});
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
 var menuContainerStyles = (0, _react2.css)({
@@ -268,17 +270,10 @@ var Dropdown = /*#__PURE__*/(0, _react.memo)(function (props) {
         });
       }
       if (item.type === 'overflow-dropdown-heading') {
-        return (
-          // eslint-disable-next-line react/no-array-index-key, @atlaskit/ui-styling-standard/enforce-style-prop
-          (0, _react2.jsx)("div", {
-            key: idx,
-            style: {
-              padding: '10px'
-            }
-          }, (0, _react2.jsx)(_heading.default, {
-            size: "xxsmall"
-          }, item.title))
-        );
+        return (0, _react2.jsx)("div", {
+          key: item.title,
+          css: headingStyles
+        }, (0, _react2.jsx)(_menu.HeadingItem, null, item.title));
       }
     }));
   }

package/dist/cjs/ui/Toolbar.js

@@ -41,7 +41,9 @@ var _Select = _interopRequireDefault(require("./Select"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
-function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /* eslint-disable @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation */ /**
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+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; } /* eslint-disable @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation */ /**
  * @jsxRuntime classic
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
@@ -385,40 +387,16 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
   // otherwise it causes an issue where multiple popups stays open
   return !(prevProps.node.type !== nextProps.node.type || prevProps.node.attrs.localId !== nextProps.node.attrs.localId || !(0, _floatingToolbar.areSameItems)(prevProps.items, nextProps.items) || !prevProps.mounted !== !nextProps.mounted);
 });
-var ToolbarItemsCollapsable = /*#__PURE__*/_react.default.memo(function (_ref2) {
-  var items = _ref2.items,
-    groupLabel = _ref2.groupLabel,
-    dispatchCommand = _ref2.dispatchCommand,
-    popupsMountPoint = _ref2.popupsMountPoint,
-    popupsBoundariesElement = _ref2.popupsBoundariesElement,
-    editorView = _ref2.editorView,
-    dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
-    popupsScrollableElement = _ref2.popupsScrollableElement,
-    scrollable = _ref2.scrollable,
-    providerFactory = _ref2.providerFactory,
-    extensionsProvider = _ref2.extensionsProvider,
-    node = _ref2.node,
-    setDisableScroll = _ref2.setDisableScroll,
-    mountRef = _ref2.mountRef,
-    mounted = _ref2.mounted,
-    api = _ref2.api,
-    forceStaticToolbar = _ref2.forceStaticToolbar;
-  var contextualToolbarState = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'floatingToolbar.contextualToolbar');
-  var updatedItems = items.slice();
-  if (!forceStaticToolbar && (contextualToolbarState === null || contextualToolbarState === void 0 ? void 0 : contextualToolbarState.display) === 'collapsed') {
-    var nonSeparatorItems = 0;
-    var slicedIndex = -1;
-    for (var i = items.length - 1; i > 0; i--) {
-      var item = items[i];
-      if (item.type !== 'separator') {
-        nonSeparatorItems += 1;
-        slicedIndex = i;
-      }
-      if (nonSeparatorItems > 2) {
-        break;
-      }
+var getFormattedItems = function getFormattedItems(items, isCollapsed, api) {
+  if (isCollapsed) {
+    var updatedItems = items.filter(function (item) {
+      return item.type === 'separator' || 'contextualToolbarDefaultVisibility' in item && item.contextualToolbarDefaultVisibility === 'visible' || !('contextualToolbarDefaultVisibility' in item);
+    }).filter(function (item, index, items) {
+      return item.type !== 'separator' || index > 0 && index < items.length - 1 && items[index - 1].type !== 'separator';
+    });
+    if (updatedItems[updatedItems.length - 1].type === 'separator') {
+      updatedItems.pop();
     }
-    updatedItems = updatedItems.slice(slicedIndex);
     updatedItems.unshift({
       type: 'separator'
     });
@@ -434,24 +412,55 @@ var ToolbarItemsCollapsable = /*#__PURE__*/_react.default.memo(function (_ref2)
         }
       }
     });
+    return updatedItems;
   }
-  if (!forceStaticToolbar && (contextualToolbarState === null || contextualToolbarState === void 0 ? void 0 : contextualToolbarState.display) === 'expanded') {
-    updatedItems.unshift({
-      type: 'separator'
-    });
-    updatedItems.unshift({
-      type: 'button',
-      icon: _chevronRight.default,
-      title: 'Hide items',
-      onClick: function onClick() {
-        if (api) {
-          api.core.actions.execute(api.floatingToolbar.commands.updateContextualToolbar({
-            type: 'collapse-toolbar'
-          }));
-        }
+  items.unshift({
+    type: 'separator'
+  });
+  items.unshift({
+    type: 'button',
+    icon: _chevronRight.default,
+    title: 'Hide items',
+    onClick: function onClick() {
+      if (api) {
+        api.core.actions.execute(api.floatingToolbar.commands.updateContextualToolbar({
+          type: 'collapse-toolbar'
+        }));
       }
+    }
+  });
+  return items;
+};
+var ToolbarItemsCollapsable = /*#__PURE__*/_react.default.memo(function (_ref2) {
+  var _contextualToolbarSta;
+  var items = _ref2.items,
+    groupLabel = _ref2.groupLabel,
+    dispatchCommand = _ref2.dispatchCommand,
+    popupsMountPoint = _ref2.popupsMountPoint,
+    popupsBoundariesElement = _ref2.popupsBoundariesElement,
+    editorView = _ref2.editorView,
+    dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
+    popupsScrollableElement = _ref2.popupsScrollableElement,
+    scrollable = _ref2.scrollable,
+    providerFactory = _ref2.providerFactory,
+    extensionsProvider = _ref2.extensionsProvider,
+    node = _ref2.node,
+    setDisableScroll = _ref2.setDisableScroll,
+    mountRef = _ref2.mountRef,
+    mounted = _ref2.mounted,
+    api = _ref2.api;
+  var contextualToolbarState = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'floatingToolbar.contextualToolbar');
+
+  // NOTE: Unsure if collapse/expand logic will be needed, for now hard code for cards
+  var isCard = node.type.name === 'inlineCard' || node.type.name === 'blockCard' || node.type.name === 'embedCard';
+  var updatedItems = isCard ? getFormattedItems(items.map(function (item) {
+    if ('id' in item && (item.id === 'editor.link.openLink' || item.id === 'editor.floatingToolbar.copy' || item.id === 'editor.link.commentLink')) {
+      return item;
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      contextualToolbarDefaultVisibility: 'hidden'
     });
-  }
+  }), (_contextualToolbarSta = contextualToolbarState === null || contextualToolbarState === void 0 ? void 0 : contextualToolbarState.isCollapsed) !== null && _contextualToolbarSta !== void 0 ? _contextualToolbarSta : false, api) : items;
   return (0, _react2.jsx)(ToolbarItems, {
     items: updatedItems,
     groupLabel: groupLabel,

package/dist/es2019/pm-plugins/contextual-toolbar/plugin.js

@@ -1,7 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { contextualToolbarPluginKey } from './plugin-key';
 const defaultEditState = {
-  display: 'collapsed'
+  isCollapsed: true
 };
 export const contextualToolbarPlugin = () => {
   return new SafePlugin({
@@ -11,19 +11,16 @@ export const contextualToolbarPlugin = () => {
         return defaultEditState;
       },
       apply(tr, pluginState) {
-        if (pluginState.display === 'static') {
-          return pluginState;
-        }
         const action = tr.getMeta(contextualToolbarPluginKey);
         if (action) {
           switch (action.type) {
             case 'expand-toolbar':
               return {
-                display: 'expanded'
+                isCollapsed: false
               };
             case 'collapse-toolbar':
               return {
-                display: 'collapsed'
+                isCollapsed: true
               };
             default:
               return pluginState;

package/dist/es2019/ui/DropdownMenu.js

@@ -10,9 +10,8 @@ import { css, jsx } from '@emotion/react';
 
 import { injectIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
-import Heading from '@atlaskit/heading';
 import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
-import { ButtonItem } from '@atlaskit/menu';
+import { ButtonItem, HeadingItem } from '@atlaskit/menu';
 import { B400 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
@@ -31,6 +30,9 @@ const separatorStyles = css({
   background: "var(--ds-border, #091E4224)",
   height: "var(--ds-space-025, 1px)"
 });
+const headingStyles = css({
+  padding: `${"var(--ds-space-100, 8px)"} 0`
+});
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
 const menuContainerStyles = css({
@@ -259,17 +261,10 @@ const Dropdown = /*#__PURE__*/memo(props => {
         });
       }
       if (item.type === 'overflow-dropdown-heading') {
-        return (
-          // eslint-disable-next-line react/no-array-index-key, @atlaskit/ui-styling-standard/enforce-style-prop
-          jsx("div", {
-            key: idx,
-            style: {
-              padding: '10px'
-            }
-          }, jsx(Heading, {
-            size: "xxsmall"
-          }, item.title))
-        );
+        return jsx("div", {
+          key: item.title,
+          css: headingStyles
+        }, jsx(HeadingItem, null, item.title));
       }
     }));
   }

package/dist/es2019/ui/Toolbar.js

@@ -348,6 +348,46 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
   // otherwise it causes an issue where multiple popups stays open
   return !(prevProps.node.type !== nextProps.node.type || prevProps.node.attrs.localId !== nextProps.node.attrs.localId || !areSameItems(prevProps.items, nextProps.items) || !prevProps.mounted !== !nextProps.mounted);
 });
+const getFormattedItems = (items, isCollapsed, api) => {
+  if (isCollapsed) {
+    const updatedItems = items.filter(item => item.type === 'separator' || 'contextualToolbarDefaultVisibility' in item && item.contextualToolbarDefaultVisibility === 'visible' || !('contextualToolbarDefaultVisibility' in item)).filter((item, index, items) => item.type !== 'separator' || index > 0 && index < items.length - 1 && items[index - 1].type !== 'separator');
+    if (updatedItems[updatedItems.length - 1].type === 'separator') {
+      updatedItems.pop();
+    }
+    updatedItems.unshift({
+      type: 'separator'
+    });
+    updatedItems.unshift({
+      type: 'button',
+      icon: EditIcon,
+      title: 'Show items',
+      onClick: () => {
+        if (api) {
+          api.core.actions.execute(api.floatingToolbar.commands.updateContextualToolbar({
+            type: 'expand-toolbar'
+          }));
+        }
+      }
+    });
+    return updatedItems;
+  }
+  items.unshift({
+    type: 'separator'
+  });
+  items.unshift({
+    type: 'button',
+    icon: ChevronRightIcon,
+    title: 'Hide items',
+    onClick: () => {
+      if (api) {
+        api.core.actions.execute(api.floatingToolbar.commands.updateContextualToolbar({
+          type: 'collapse-toolbar'
+        }));
+      }
+    }
+  });
+  return items;
+};
 const ToolbarItemsCollapsable = /*#__PURE__*/React.memo(({
   items,
   groupLabel,
@@ -364,58 +404,22 @@ const ToolbarItemsCollapsable = /*#__PURE__*/React.memo(({
   setDisableScroll,
   mountRef,
   mounted,
-  api,
-  forceStaticToolbar
+  api
 }) => {
+  var _contextualToolbarSta;
   const contextualToolbarState = useSharedPluginStateSelector(api, 'floatingToolbar.contextualToolbar');
-  let updatedItems = items.slice();
-  if (!forceStaticToolbar && (contextualToolbarState === null || contextualToolbarState === void 0 ? void 0 : contextualToolbarState.display) === 'collapsed') {
-    let nonSeparatorItems = 0;
-    let slicedIndex = -1;
-    for (let i = items.length - 1; i > 0; i--) {
-      const item = items[i];
-      if (item.type !== 'separator') {
-        nonSeparatorItems += 1;
-        slicedIndex = i;
-      }
-      if (nonSeparatorItems > 2) {
-        break;
-      }
+
+  // NOTE: Unsure if collapse/expand logic will be needed, for now hard code for cards
+  const isCard = node.type.name === 'inlineCard' || node.type.name === 'blockCard' || node.type.name === 'embedCard';
+  const updatedItems = isCard ? getFormattedItems(items.map(item => {
+    if ('id' in item && (item.id === 'editor.link.openLink' || item.id === 'editor.floatingToolbar.copy' || item.id === 'editor.link.commentLink')) {
+      return item;
     }
-    updatedItems = updatedItems.slice(slicedIndex);
-    updatedItems.unshift({
-      type: 'separator'
-    });
-    updatedItems.unshift({
-      type: 'button',
-      icon: EditIcon,
-      title: 'Show items',
-      onClick: () => {
-        if (api) {
-          api.core.actions.execute(api.floatingToolbar.commands.updateContextualToolbar({
-            type: 'expand-toolbar'
-          }));
-        }
-      }
-    });
-  }
-  if (!forceStaticToolbar && (contextualToolbarState === null || contextualToolbarState === void 0 ? void 0 : contextualToolbarState.display) === 'expanded') {
-    updatedItems.unshift({
-      type: 'separator'
-    });
-    updatedItems.unshift({
-      type: 'button',
-      icon: ChevronRightIcon,
-      title: 'Hide items',
-      onClick: () => {
-        if (api) {
-          api.core.actions.execute(api.floatingToolbar.commands.updateContextualToolbar({
-            type: 'collapse-toolbar'
-          }));
-        }
-      }
-    });
-  }
+    return {
+      ...item,
+      contextualToolbarDefaultVisibility: 'hidden'
+    };
+  }), (_contextualToolbarSta = contextualToolbarState === null || contextualToolbarState === void 0 ? void 0 : contextualToolbarState.isCollapsed) !== null && _contextualToolbarSta !== void 0 ? _contextualToolbarSta : false, api) : items;
   return jsx(ToolbarItems, {
     items: updatedItems,
     groupLabel: groupLabel,

package/dist/esm/pm-plugins/contextual-toolbar/plugin.js

@@ -1,7 +1,7 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { contextualToolbarPluginKey } from './plugin-key';
 var defaultEditState = {
-  display: 'collapsed'
+  isCollapsed: true
 };
 export var contextualToolbarPlugin = function contextualToolbarPlugin() {
   return new SafePlugin({
@@ -11,19 +11,16 @@ export var contextualToolbarPlugin = function contextualToolbarPlugin() {
         return defaultEditState;
       },
       apply: function apply(tr, pluginState) {
-        if (pluginState.display === 'static') {
-          return pluginState;
-        }
         var action = tr.getMeta(contextualToolbarPluginKey);
         if (action) {
           switch (action.type) {
             case 'expand-toolbar':
               return {
-                display: 'expanded'
+                isCollapsed: false
               };
             case 'collapse-toolbar':
               return {
-                display: 'collapsed'
+                isCollapsed: true
               };
             default:
               return pluginState;

package/dist/esm/ui/DropdownMenu.js

@@ -11,9 +11,8 @@ import { css, jsx } from '@emotion/react';
 
 import { injectIntl } from 'react-intl-next';
 import { messages } from '@atlaskit/editor-common/floating-toolbar';
-import Heading from '@atlaskit/heading';
 import EditorDoneIcon from '@atlaskit/icon/glyph/editor/done';
-import { ButtonItem } from '@atlaskit/menu';
+import { ButtonItem, HeadingItem } from '@atlaskit/menu';
 import { B400 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/no-deprecated-imports
 import { gridSize } from '@atlaskit/theme/constants';
@@ -32,6 +31,9 @@ var separatorStyles = css({
   background: "var(--ds-border, #091E4224)",
   height: "var(--ds-space-025, 1px)"
 });
+var headingStyles = css({
+  padding: "var(--ds-space-100, 8px)".concat(" 0")
+});
 
 // eslint-disable-next-line @atlaskit/design-system/ensure-design-token-usage/preview
 var menuContainerStyles = css({
@@ -259,17 +261,10 @@ var Dropdown = /*#__PURE__*/memo(function (props) {
         });
       }
       if (item.type === 'overflow-dropdown-heading') {
-        return (
-          // eslint-disable-next-line react/no-array-index-key, @atlaskit/ui-styling-standard/enforce-style-prop
-          jsx("div", {
-            key: idx,
-            style: {
-              padding: '10px'
-            }
-          }, jsx(Heading, {
-            size: "xxsmall"
-          }, item.title))
-        );
+        return jsx("div", {
+          key: item.title,
+          css: headingStyles
+        }, jsx(HeadingItem, null, item.title));
       }
     }));
   }

package/dist/esm/ui/Toolbar.js

@@ -7,6 +7,8 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+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) { _defineProperty(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; }
 /* eslint-disable @atlaskit/design-system/no-css-tagged-template-expression -- needs manual remediation */
 /**
  * @jsxRuntime classic
@@ -378,40 +380,16 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
   // otherwise it causes an issue where multiple popups stays open
   return !(prevProps.node.type !== nextProps.node.type || prevProps.node.attrs.localId !== nextProps.node.attrs.localId || !areSameItems(prevProps.items, nextProps.items) || !prevProps.mounted !== !nextProps.mounted);
 });
-var ToolbarItemsCollapsable = /*#__PURE__*/React.memo(function (_ref2) {
-  var items = _ref2.items,
-    groupLabel = _ref2.groupLabel,
-    dispatchCommand = _ref2.dispatchCommand,
-    popupsMountPoint = _ref2.popupsMountPoint,
-    popupsBoundariesElement = _ref2.popupsBoundariesElement,
-    editorView = _ref2.editorView,
-    dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
-    popupsScrollableElement = _ref2.popupsScrollableElement,
-    scrollable = _ref2.scrollable,
-    providerFactory = _ref2.providerFactory,
-    extensionsProvider = _ref2.extensionsProvider,
-    node = _ref2.node,
-    setDisableScroll = _ref2.setDisableScroll,
-    mountRef = _ref2.mountRef,
-    mounted = _ref2.mounted,
-    api = _ref2.api,
-    forceStaticToolbar = _ref2.forceStaticToolbar;
-  var contextualToolbarState = useSharedPluginStateSelector(api, 'floatingToolbar.contextualToolbar');
-  var updatedItems = items.slice();
-  if (!forceStaticToolbar && (contextualToolbarState === null || contextualToolbarState === void 0 ? void 0 : contextualToolbarState.display) === 'collapsed') {
-    var nonSeparatorItems = 0;
-    var slicedIndex = -1;
-    for (var i = items.length - 1; i > 0; i--) {
-      var item = items[i];
-      if (item.type !== 'separator') {
-        nonSeparatorItems += 1;
-        slicedIndex = i;
-      }
-      if (nonSeparatorItems > 2) {
-        break;
-      }
+var getFormattedItems = function getFormattedItems(items, isCollapsed, api) {
+  if (isCollapsed) {
+    var updatedItems = items.filter(function (item) {
+      return item.type === 'separator' || 'contextualToolbarDefaultVisibility' in item && item.contextualToolbarDefaultVisibility === 'visible' || !('contextualToolbarDefaultVisibility' in item);
+    }).filter(function (item, index, items) {
+      return item.type !== 'separator' || index > 0 && index < items.length - 1 && items[index - 1].type !== 'separator';
+    });
+    if (updatedItems[updatedItems.length - 1].type === 'separator') {
+      updatedItems.pop();
     }
-    updatedItems = updatedItems.slice(slicedIndex);
     updatedItems.unshift({
       type: 'separator'
     });
@@ -427,24 +405,55 @@ var ToolbarItemsCollapsable = /*#__PURE__*/React.memo(function (_ref2) {
         }
       }
     });
+    return updatedItems;
   }
-  if (!forceStaticToolbar && (contextualToolbarState === null || contextualToolbarState === void 0 ? void 0 : contextualToolbarState.display) === 'expanded') {
-    updatedItems.unshift({
-      type: 'separator'
-    });
-    updatedItems.unshift({
-      type: 'button',
-      icon: ChevronRightIcon,
-      title: 'Hide items',
-      onClick: function onClick() {
-        if (api) {
-          api.core.actions.execute(api.floatingToolbar.commands.updateContextualToolbar({
-            type: 'collapse-toolbar'
-          }));
-        }
+  items.unshift({
+    type: 'separator'
+  });
+  items.unshift({
+    type: 'button',
+    icon: ChevronRightIcon,
+    title: 'Hide items',
+    onClick: function onClick() {
+      if (api) {
+        api.core.actions.execute(api.floatingToolbar.commands.updateContextualToolbar({
+          type: 'collapse-toolbar'
+        }));
       }
+    }
+  });
+  return items;
+};
+var ToolbarItemsCollapsable = /*#__PURE__*/React.memo(function (_ref2) {
+  var _contextualToolbarSta;
+  var items = _ref2.items,
+    groupLabel = _ref2.groupLabel,
+    dispatchCommand = _ref2.dispatchCommand,
+    popupsMountPoint = _ref2.popupsMountPoint,
+    popupsBoundariesElement = _ref2.popupsBoundariesElement,
+    editorView = _ref2.editorView,
+    dispatchAnalyticsEvent = _ref2.dispatchAnalyticsEvent,
+    popupsScrollableElement = _ref2.popupsScrollableElement,
+    scrollable = _ref2.scrollable,
+    providerFactory = _ref2.providerFactory,
+    extensionsProvider = _ref2.extensionsProvider,
+    node = _ref2.node,
+    setDisableScroll = _ref2.setDisableScroll,
+    mountRef = _ref2.mountRef,
+    mounted = _ref2.mounted,
+    api = _ref2.api;
+  var contextualToolbarState = useSharedPluginStateSelector(api, 'floatingToolbar.contextualToolbar');
+
+  // NOTE: Unsure if collapse/expand logic will be needed, for now hard code for cards
+  var isCard = node.type.name === 'inlineCard' || node.type.name === 'blockCard' || node.type.name === 'embedCard';
+  var updatedItems = isCard ? getFormattedItems(items.map(function (item) {
+    if ('id' in item && (item.id === 'editor.link.openLink' || item.id === 'editor.floatingToolbar.copy' || item.id === 'editor.link.commentLink')) {
+      return item;
+    }
+    return _objectSpread(_objectSpread({}, item), {}, {
+      contextualToolbarDefaultVisibility: 'hidden'
     });
-  }
+  }), (_contextualToolbarSta = contextualToolbarState === null || contextualToolbarState === void 0 ? void 0 : contextualToolbarState.isCollapsed) !== null && _contextualToolbarSta !== void 0 ? _contextualToolbarSta : false, api) : items;
   return jsx(ToolbarItems, {
     items: updatedItems,
     groupLabel: groupLabel,

package/dist/types/pm-plugins/contextual-toolbar/plugin.d.ts

@@ -1,4 +1,3 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-export declare const contextualToolbarPlugin: () => SafePlugin<{
-    display: string;
-}>;
+import type { ContextualToolbarState } from './types';
+export declare const contextualToolbarPlugin: () => SafePlugin<ContextualToolbarState>;

package/dist/types/pm-plugins/contextual-toolbar/types.d.ts

@@ -1,5 +1,5 @@
 export type ContextualToolbarState = {
-    display: 'expanded' | 'collapsed' | 'static';
+    isCollapsed: boolean;
 };
 export type ContextualToolbarActions = {
     type: 'expand-toolbar';

package/dist/types-ts4.5/pm-plugins/contextual-toolbar/plugin.d.ts

@@ -1,4 +1,3 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-export declare const contextualToolbarPlugin: () => SafePlugin<{
-    display: string;
-}>;
+import type { ContextualToolbarState } from './types';
+export declare const contextualToolbarPlugin: () => SafePlugin<ContextualToolbarState>;

package/dist/types-ts4.5/pm-plugins/contextual-toolbar/types.d.ts

@@ -1,5 +1,5 @@
 export type ContextualToolbarState = {
-    display: 'expanded' | 'collapsed' | 'static';
+    isCollapsed: boolean;
 };
 export type ContextualToolbarActions = {
     type: 'expand-toolbar';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "1.19.0",
+	"version": "1.20.1",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -26,7 +26,7 @@
 		"@atlaskit/adf-utils": "^19.18.0",
 		"@atlaskit/button": "^20.5.0",
 		"@atlaskit/checkbox": "^15.4.0",
-		"@atlaskit/editor-common": "^99.18.0",
+		"@atlaskit/editor-common": "^99.19.0",
 		"@atlaskit/editor-palette": "1.7.0",
 		"@atlaskit/editor-plugin-block-controls": "^2.27.0",
 		"@atlaskit/editor-plugin-context-panel": "^2.1.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/editor-plugin-table": "^9.5.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/emoji": "^67.14.0",
-		"@atlaskit/icon": "^23.10.0",
+		"@atlaskit/icon": "^23.11.0",
 		"@atlaskit/menu": "^2.14.0",
 		"@atlaskit/modal-dialog": "^12.20.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",