@atlaskit/editor-plugin-block-type 4.0.8 → 4.0.10

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-plugin-block-type
 
+## 4.0.10
+
+### Patch Changes
+
+- [#176005](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/176005)
+  [`d4348ed45eed7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d4348ed45eed7) -
+  [ux] When text selection is inside media caption or decision nodes, Main and Floating toolbars
+  should have Lists and Text styles options disabled.
+
+## 4.0.9
+
+### Patch Changes
+
+- [#172933](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/172933)
+  [`8323af2381d00`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8323af2381d00) -
+  [ux] Arranges items in the Selection toolbar under the Contextual toolbar experiment flag
+- Updated dependencies
+
 ## 4.0.8
 
 ### Patch Changes

package/dist/cjs/blockTypePlugin.js

@@ -204,7 +204,9 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
     primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined,
     pluginsOptions: {
       selectionToolbar: function selectionToolbar() {
-        if ((0, _experiments.editorExperiment)('contextual_formatting_toolbar', true)) {
+        if ((0, _experiments.editorExperiment)('contextual_formatting_toolbar', true, {
+          exposure: true
+        })) {
           var toolbarCustom = {
             type: 'custom',
             render: function render(view, _idx, _dispatchAnalyticsEvent) {
@@ -219,7 +221,8 @@ var blockTypePlugin = exports.blockTypePlugin = function blockTypePlugin(_ref3)
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 8
           };
         } else {
           return undefined;

package/dist/cjs/pm-plugins/ui/FloatingToolbarComponent.js

@@ -9,7 +9,6 @@ exports.FloatingToolbarComponent = FloatingToolbarComponent;
 var _react = _interopRequireWildcard(require("react"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _hooks = require("@atlaskit/editor-common/hooks");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _ToolbarBlockType = _interopRequireDefault(require("./ToolbarBlockType"));
 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; }
@@ -23,11 +22,6 @@ function FloatingToolbarComponent(_ref) {
   var api = _ref.api;
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['blockType']),
     blockTypeState = _useSharedPluginState.blockTypeState;
-  (0, _react.useEffect)(function () {
-    (0, _experiments.editorExperiment)('contextual_formatting_toolbar', true, {
-      exposure: true
-    });
-  }, []);
   var boundSetBlockType = (0, _react.useCallback)(function (name) {
     var _api$core, _api$blockType;
     return api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(name, _analytics.INPUT_METHOD.FLOATING_TB));

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.areBlockTypesDisabled = areBlockTypesDisabled;
 exports.isNodeAWrappingBlockNode = exports.createWrappingTextBlockRule = exports.createJoinNodesRule = void 0;
 var _utils = require("@atlaskit/editor-common/utils");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _blockTypes = require("./block-types");
 var isNodeAWrappingBlockNode = exports.isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   if (!node) {
@@ -57,13 +58,18 @@ function getSelectedWrapperNodes(state) {
       orderedList = _state$schema$nodes.orderedList,
       bulletList = _state$schema$nodes.bulletList,
       listItem = _state$schema$nodes.listItem,
+      caption = _state$schema$nodes.caption,
       codeBlock = _state$schema$nodes.codeBlock,
       decisionItem = _state$schema$nodes.decisionItem,
       decisionList = _state$schema$nodes.decisionList,
       taskItem = _state$schema$nodes.taskItem,
       taskList = _state$schema$nodes.taskList;
+    var wrapperNodes = [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList];
+    if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_fix_for_disabled_options')) {
+      wrapperNodes.push(caption);
+    }
     state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-      if (node.isBlock && [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList].indexOf(node.type) >= 0) {
+      if (node.isBlock && wrapperNodes.indexOf(node.type) >= 0) {
         nodes.push(node.type);
       }
     });

package/dist/es2019/blockTypePlugin.js

@@ -189,7 +189,9 @@ const blockTypePlugin = ({
     primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined,
     pluginsOptions: {
       selectionToolbar: () => {
-        if (editorExperiment('contextual_formatting_toolbar', true)) {
+        if (editorExperiment('contextual_formatting_toolbar', true, {
+          exposure: true
+        })) {
           const toolbarCustom = {
             type: 'custom',
             render: (view, _idx, _dispatchAnalyticsEvent) => {
@@ -204,7 +206,8 @@ const blockTypePlugin = ({
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 8
           };
         } else {
           return undefined;

package/dist/es2019/pm-plugins/ui/FloatingToolbarComponent.js

@@ -1,7 +1,6 @@
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback } from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import ToolbarBlockType from './ToolbarBlockType';
 const FloatingToolbarSettings = {
   isSmall: true,
@@ -15,11 +14,6 @@ export function FloatingToolbarComponent({
   const {
     blockTypeState
   } = useSharedPluginState(api, ['blockType']);
-  useEffect(() => {
-    editorExperiment('contextual_formatting_toolbar', true, {
-      exposure: true
-    });
-  }, []);
   const boundSetBlockType = useCallback(name => {
     var _api$core, _api$blockType, _api$blockType$comman;
     return api === null || api === void 0 ? void 0 : (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 ? void 0 : (_api$blockType = api.blockType) === null || _api$blockType === void 0 ? void 0 : (_api$blockType$comman = _api$blockType.commands) === null || _api$blockType$comman === void 0 ? void 0 : _api$blockType$comman.setTextLevel(name, INPUT_METHOD.FLOATING_TB));

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

@@ -1,4 +1,5 @@
 import { createRule, createWrappingJoinRule } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { WRAPPER_BLOCK_TYPES } from './block-types';
 export const isNodeAWrappingBlockNode = node => {
   if (!node) {
@@ -48,14 +49,19 @@ function getSelectedWrapperNodes(state) {
       orderedList,
       bulletList,
       listItem,
+      caption,
       codeBlock,
       decisionItem,
       decisionList,
       taskItem,
       taskList
     } = state.schema.nodes;
+    const wrapperNodes = [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList];
+    if (fg('platform_editor_toolbar_fix_for_disabled_options')) {
+      wrapperNodes.push(caption);
+    }
     state.doc.nodesBetween($from.pos, $to.pos, node => {
-      if (node.isBlock && [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList].indexOf(node.type) >= 0) {
+      if (node.isBlock && wrapperNodes.indexOf(node.type) >= 0) {
         nodes.push(node.type);
       }
     });

package/dist/esm/blockTypePlugin.js

@@ -191,7 +191,9 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
     primaryToolbarComponent: !(api !== null && api !== void 0 && api.primaryToolbar) ? primaryToolbarComponent : undefined,
     pluginsOptions: {
       selectionToolbar: function selectionToolbar() {
-        if (editorExperiment('contextual_formatting_toolbar', true)) {
+        if (editorExperiment('contextual_formatting_toolbar', true, {
+          exposure: true
+        })) {
           var toolbarCustom = {
             type: 'custom',
             render: function render(view, _idx, _dispatchAnalyticsEvent) {
@@ -206,7 +208,8 @@ var blockTypePlugin = function blockTypePlugin(_ref3) {
           };
           return {
             isToolbarAbove: true,
-            items: [toolbarCustom]
+            items: [toolbarCustom],
+            rank: 8
           };
         } else {
           return undefined;

package/dist/esm/pm-plugins/ui/FloatingToolbarComponent.js

@@ -1,7 +1,6 @@
-import React, { useCallback, useEffect } from 'react';
+import React, { useCallback } from 'react';
 import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import ToolbarBlockType from './ToolbarBlockType';
 var FloatingToolbarSettings = {
   isSmall: true,
@@ -13,11 +12,6 @@ export function FloatingToolbarComponent(_ref) {
   var api = _ref.api;
   var _useSharedPluginState = useSharedPluginState(api, ['blockType']),
     blockTypeState = _useSharedPluginState.blockTypeState;
-  useEffect(function () {
-    editorExperiment('contextual_formatting_toolbar', true, {
-      exposure: true
-    });
-  }, []);
   var boundSetBlockType = useCallback(function (name) {
     var _api$core, _api$blockType;
     return api === null || api === void 0 || (_api$core = api.core) === null || _api$core === void 0 ? void 0 : _api$core.actions.execute(api === null || api === void 0 || (_api$blockType = api.blockType) === null || _api$blockType === void 0 || (_api$blockType = _api$blockType.commands) === null || _api$blockType === void 0 ? void 0 : _api$blockType.setTextLevel(name, INPUT_METHOD.FLOATING_TB));

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

@@ -1,4 +1,5 @@
 import { createRule, createWrappingJoinRule } from '@atlaskit/editor-common/utils';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { WRAPPER_BLOCK_TYPES } from './block-types';
 export var isNodeAWrappingBlockNode = function isNodeAWrappingBlockNode(node) {
   if (!node) {
@@ -50,13 +51,18 @@ function getSelectedWrapperNodes(state) {
       orderedList = _state$schema$nodes.orderedList,
       bulletList = _state$schema$nodes.bulletList,
       listItem = _state$schema$nodes.listItem,
+      caption = _state$schema$nodes.caption,
       codeBlock = _state$schema$nodes.codeBlock,
       decisionItem = _state$schema$nodes.decisionItem,
       decisionList = _state$schema$nodes.decisionList,
       taskItem = _state$schema$nodes.taskItem,
       taskList = _state$schema$nodes.taskList;
+    var wrapperNodes = [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList];
+    if (fg('platform_editor_toolbar_fix_for_disabled_options')) {
+      wrapperNodes.push(caption);
+    }
     state.doc.nodesBetween($from.pos, $to.pos, function (node) {
-      if (node.isBlock && [blockquote, panel, orderedList, bulletList, listItem, codeBlock, decisionItem, decisionList, taskItem, taskList].indexOf(node.type) >= 0) {
+      if (node.isBlock && wrapperNodes.indexOf(node.type) >= 0) {
         nodes.push(node.type);
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "4.0.8",
+	"version": "4.0.10",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,18 +34,18 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^96.0.0",
+		"@atlaskit/editor-common": "^96.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^23.0.0",
+		"@atlaskit/icon": "^23.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^13.3.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tmp-editor-statsig": "^2.22.0",
+		"@atlaskit/tmp-editor-statsig": "^2.23.0",
 		"@atlaskit/tokens": "^2.4.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
@@ -58,7 +58,7 @@
 	"devDependencies": {
 		"@af/visual-regression": "*",
 		"@atlaskit/analytics-next": "^10.1.0",
-		"@atlaskit/editor-plugin-quick-insert": "^1.7.0",
+		"@atlaskit/editor-plugin-quick-insert": "^1.8.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.11.0",
 		"@atlaskit/ssr": "*",
 		"@atlaskit/visual-regression": "*",
@@ -112,6 +112,9 @@
 		},
 		"platform_editor_nest_in_quotes_adf_change": {
 			"type": "boolean"
+		},
+		"platform_editor_toolbar_fix_for_disabled_options": {
+			"type": "boolean"
 		}
 	}
 }