@atlaskit/editor-plugin-floating-toolbar 1.14.16 → 1.14.18

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 1.14.18
+
+### Patch Changes
+
+- [#100802](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/100802)
+  [`1506550eef60f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1506550eef60f) -
+  [ux] [ED-25647] this PR is disabling the confluence referentiality and charts extension from the
+  floating toolbar for tables nested in tables
+
+## 1.14.17
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 1.14.16
 
 ### Patch Changes

package/dist/cjs/ui/ExtensionsPlaceholder.js

@@ -13,8 +13,10 @@ var _react = _interopRequireWildcard(require("react"));
 var _reactLoadable = _interopRequireDefault(require("react-loadable"));
 var _buttonGroup = _interopRequireDefault(require("@atlaskit/button/button-group"));
 var _extensions = require("@atlaskit/editor-common/extensions");
+var _nesting = require("@atlaskit/editor-common/nesting");
 var _ui = require("@atlaskit/editor-common/ui");
 var _utils = require("@atlaskit/editor-common/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 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; }
 var noop = function noop() {
@@ -177,9 +179,15 @@ var ExtensionsPlaceholder = exports.ExtensionsPlaceholder = function ExtensionsP
   if (separator && ['start', 'both'].includes(separator)) {
     children.push( /*#__PURE__*/_react.default.createElement(_ui.FloatingToolbarSeparator, null));
   }
+  var isNestedTable = (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes') && (0, _nesting.isSelectionTableNestedInTable)(editorView.state);
+
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   extensionItems.forEach(function (item, index) {
+    // disable the referentiality and charts extensions for nested tables
+    if (isNestedTable && ['referentiality:connections', 'chart:insert-chart'].includes(item.key)) {
+      item.disabled = true;
+    }
     children.push( /*#__PURE__*/_react.default.createElement(ExtensionButton, {
       node: node,
       item: item,

package/dist/cjs/ui/Toolbar.js

@@ -110,7 +110,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
           if (selected) {
             return "var(--ds-icon-selected, #0C66E4)";
           }
-          return "var(--ds-icon-subtle, #626F86)";
+          return 'currentColor';
         };
         return (0, _react2.jsx)(_ui.FloatingToolbarButton
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -358,6 +358,7 @@ var toolbarContainer = function toolbarContainer(scrollable, hasSelect, firstEle
     borderRadius: "var(--ds-border-radius, 3px)",
     boxShadow: "var(--ds-shadow-overlay, ".concat("0 0 1px rgba(9, 30, 66, 0.31), 0 4px 8px -2px rgba(9, 30, 66, 0.25)", ")"),
     display: 'flex',
+    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: 1,
     boxSizing: 'border-box',
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766

package/dist/es2019/ui/ExtensionsPlaceholder.js

@@ -2,8 +2,10 @@ import React, { useEffect, useState } from 'react';
 import Loadable from 'react-loadable';
 import ButtonGroup from '@atlaskit/button/button-group';
 import { getContextualToolbarItemsFromModule } from '@atlaskit/editor-common/extensions';
+import { isSelectionTableNestedInTable } from '@atlaskit/editor-common/nesting';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { nodeToJSON } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 const noop = () => null;
 const isDefaultExport = mod => {
   return mod.hasOwnProperty('default');
@@ -99,9 +101,15 @@ export const ExtensionsPlaceholder = props => {
   if (separator && ['start', 'both'].includes(separator)) {
     children.push( /*#__PURE__*/React.createElement(Separator, null));
   }
+  const isNestedTable = fg('platform_editor_use_nested_table_pm_nodes') && isSelectionTableNestedInTable(editorView.state);
+
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   extensionItems.forEach((item, index) => {
+    // disable the referentiality and charts extensions for nested tables
+    if (isNestedTable && ['referentiality:connections', 'chart:insert-chart'].includes(item.key)) {
+      item.disabled = true;
+    }
     children.push( /*#__PURE__*/React.createElement(ExtensionButton, {
       node: node,
       item: item,

package/dist/es2019/ui/Toolbar.js

@@ -99,7 +99,7 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
           if (selected) {
             return "var(--ds-icon-selected, #0C66E4)";
           }
-          return "var(--ds-icon-subtle, #626F86)";
+          return 'currentColor';
         };
         return jsx(Button
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -320,6 +320,7 @@ const toolbarContainer = (scrollable, hasSelect, firstElementIsSelect) => css({
   borderRadius: "var(--ds-border-radius, 3px)",
   boxShadow: `var(--ds-shadow-overlay, ${`0 0 1px rgba(9, 30, 66, 0.31), 0 4px 8px -2px rgba(9, 30, 66, 0.25)`})`,
   display: 'flex',
+  // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
   lineHeight: 1,
   boxSizing: 'border-box',
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766

package/dist/esm/ui/ExtensionsPlaceholder.js

@@ -5,8 +5,10 @@ import React, { useEffect, useState } from 'react';
 import Loadable from 'react-loadable';
 import ButtonGroup from '@atlaskit/button/button-group';
 import { getContextualToolbarItemsFromModule } from '@atlaskit/editor-common/extensions';
+import { isSelectionTableNestedInTable } from '@atlaskit/editor-common/nesting';
 import { FloatingToolbarButton as Button, FloatingToolbarSeparator as Separator } from '@atlaskit/editor-common/ui';
 import { nodeToJSON } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 var noop = function noop() {
   return null;
 };
@@ -167,9 +169,15 @@ export var ExtensionsPlaceholder = function ExtensionsPlaceholder(props) {
   if (separator && ['start', 'both'].includes(separator)) {
     children.push( /*#__PURE__*/React.createElement(Separator, null));
   }
+  var isNestedTable = fg('platform_editor_use_nested_table_pm_nodes') && isSelectionTableNestedInTable(editorView.state);
+
   // Ignored via go/ees005
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   extensionItems.forEach(function (item, index) {
+    // disable the referentiality and charts extensions for nested tables
+    if (isNestedTable && ['referentiality:connections', 'chart:insert-chart'].includes(item.key)) {
+      item.disabled = true;
+    }
     children.push( /*#__PURE__*/React.createElement(ExtensionButton, {
       node: node,
       item: item,

package/dist/esm/ui/Toolbar.js

@@ -103,7 +103,7 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
           if (selected) {
             return "var(--ds-icon-selected, #0C66E4)";
           }
-          return "var(--ds-icon-subtle, #626F86)";
+          return 'currentColor';
         };
         return jsx(Button
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
@@ -351,6 +351,7 @@ var toolbarContainer = function toolbarContainer(scrollable, hasSelect, firstEle
     borderRadius: "var(--ds-border-radius, 3px)",
     boxShadow: "var(--ds-shadow-overlay, ".concat("0 0 1px rgba(9, 30, 66, 0.31), 0 4px 8px -2px rgba(9, 30, 66, 0.25)", ")"),
     display: 'flex',
+    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     lineHeight: 1,
     boxSizing: 'border-box',
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766

package/dist/types/floatingToolbarPluginType.d.ts

@@ -26,18 +26,19 @@ export type ForceFocusSelector = (selector: string | null) => (tr: Transaction)
  * Floating toolbar plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.
  */
+export type FloatingToolbarPluginDependencies = [
+    DecorationsPlugin,
+    OptionalPlugin<ContextPanelPlugin>,
+    OptionalPlugin<ExtensionPlugin>,
+    CopyButtonPlugin,
+    EditorDisabledPlugin,
+    OptionalPlugin<EditorViewModePlugin>,
+    OptionalPlugin<BlockControlsPlugin>,
+    OptionalPlugin<FeatureFlagsPlugin>,
+    OptionalPlugin<EmojiPlugin>
+];
 export type FloatingToolbarPlugin = NextEditorPlugin<'floatingToolbar', {
-    dependencies: [
-        DecorationsPlugin,
-        OptionalPlugin<ContextPanelPlugin>,
-        OptionalPlugin<ExtensionPlugin>,
-        CopyButtonPlugin,
-        EditorDisabledPlugin,
-        OptionalPlugin<EditorViewModePlugin>,
-        OptionalPlugin<BlockControlsPlugin>,
-        OptionalPlugin<FeatureFlagsPlugin>,
-        OptionalPlugin<EmojiPlugin>
-    ];
+    dependencies: FloatingToolbarPluginDependencies;
     actions: {
         forceFocusSelector: ForceFocusSelector;
     };

package/dist/types-ts4.5/floatingToolbarPluginType.d.ts

@@ -26,18 +26,19 @@ export type ForceFocusSelector = (selector: string | null) => (tr: Transaction)
  * Floating toolbar plugin to be added to an `EditorPresetBuilder` and used with `ComposableEditor`
  * from `@atlaskit/editor-core`.
  */
+export type FloatingToolbarPluginDependencies = [
+    DecorationsPlugin,
+    OptionalPlugin<ContextPanelPlugin>,
+    OptionalPlugin<ExtensionPlugin>,
+    CopyButtonPlugin,
+    EditorDisabledPlugin,
+    OptionalPlugin<EditorViewModePlugin>,
+    OptionalPlugin<BlockControlsPlugin>,
+    OptionalPlugin<FeatureFlagsPlugin>,
+    OptionalPlugin<EmojiPlugin>
+];
 export type FloatingToolbarPlugin = NextEditorPlugin<'floatingToolbar', {
-    dependencies: [
-        DecorationsPlugin,
-        OptionalPlugin<ContextPanelPlugin>,
-        OptionalPlugin<ExtensionPlugin>,
-        CopyButtonPlugin,
-        EditorDisabledPlugin,
-        OptionalPlugin<EditorViewModePlugin>,
-        OptionalPlugin<BlockControlsPlugin>,
-        OptionalPlugin<FeatureFlagsPlugin>,
-        OptionalPlugin<EmojiPlugin>
-    ];
+    dependencies: FloatingToolbarPluginDependencies;
     actions: {
         forceFocusSelector: ForceFocusSelector;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "1.14.16",
+	"version": "1.14.18",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -23,12 +23,12 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-utils": "^19.14.0",
+		"@atlaskit/adf-utils": "^19.16.0",
 		"@atlaskit/button": "^20.3.0",
 		"@atlaskit/checkbox": "^15.2.0",
-		"@atlaskit/editor-common": "^98.0.0",
-		"@atlaskit/editor-palette": "1.6.3",
-		"@atlaskit/editor-plugin-block-controls": "^2.16.0",
+		"@atlaskit/editor-common": "^99.1.0",
+		"@atlaskit/editor-palette": "1.6.4",
+		"@atlaskit/editor-plugin-block-controls": "^2.19.0",
 		"@atlaskit/editor-plugin-context-panel": "^1.4.0",
 		"@atlaskit/editor-plugin-copy-button": "^1.3.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
@@ -36,18 +36,18 @@
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-emoji": "^2.7.0",
 		"@atlaskit/editor-plugin-extension": "^3.0.0",
-		"@atlaskit/editor-plugin-table": "^9.0.0",
+		"@atlaskit/editor-plugin-table": "^9.1.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
-		"@atlaskit/emoji": "^67.11.0",
-		"@atlaskit/icon": "^23.1.0",
+		"@atlaskit/emoji": "^67.12.0",
+		"@atlaskit/icon": "^23.3.0",
 		"@atlaskit/menu": "^2.13.0",
-		"@atlaskit/modal-dialog": "^12.18.0",
+		"@atlaskit/modal-dialog": "^12.19.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/select": "^18.9.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.31.0",
-		"@atlaskit/tokens": "^2.5.0",
+		"@atlaskit/tmp-editor-statsig": "^2.33.0",
+		"@atlaskit/tokens": "^3.0.0",
 		"@atlaskit/tooltip": "^19.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -119,6 +119,9 @@
 		},
 		"platform-visual-refresh-icons": {
 			"type": "boolean"
+		},
+		"platform_editor_use_nested_table_pm_nodes": {
+			"type": "boolean"
 		}
 	}
 }