@atlaskit/editor-plugin-block-type 4.2.1 → 4.2.2

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-block-type
 
+## 4.2.2
+
+### Patch Changes
+
+- [#107782](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107782)
+  [`bc422d0adbbb5`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/bc422d0adbbb5) -
+  [ux] ED-26378 remove editor_nest_media_and_codeblock_in_quotes_jira
+- [#107782](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/107782)
+  [`cccc7a8347929`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cccc7a8347929) -
+  [ux] ED-26378 Remove editor_nest_media_and_codeblock_in_quotes_jira and
+  nestMediaAndCodeblockInQuote
+- Updated dependencies
+
 ## 4.2.1
 
 ### Patch Changes

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

@@ -4,13 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pluginKey = exports.handleBlockQuoteDND = exports.createPlugin = void 0;
+exports.pluginKey = exports.createPlugin = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _browser = require("@atlaskit/editor-common/browser");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _state = require("@atlaskit/editor-prosemirror/state");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _blockTypes = require("./block-types");
 var _blockType = require("./commands/block-type");
 var _consts = require("./consts");
@@ -157,44 +156,7 @@ var createPlugin = exports.createPlugin = function createPlugin(editorAPI, dispa
           altKeyLocation = 0;
         }
         return false;
-      },
-      handleDrop: function handleDrop(view, event, slice, moved) {
-        return handleBlockQuoteDND(view, event, slice);
       }
     }
   });
-};
-var handleBlockQuoteDND = exports.handleBlockQuoteDND = function handleBlockQuoteDND(view, event, slice) {
-  // Throwaway code for the sake of the expiriment. handleDrop can be removed after experiment complete.
-  if ((0, _experiments.editorExperiment)('nest-media-and-codeblock-in-quote', false)) {
-    var sliceContainsCodeBlockOrMedia = false;
-    slice.content.forEach(function (node) {
-      if (node.type === view.state.schema.nodes.codeBlock) {
-        sliceContainsCodeBlockOrMedia = true;
-      } else if (node.type === view.state.schema.nodes.mediaSingle) {
-        sliceContainsCodeBlockOrMedia = true;
-      } else if (node.type === view.state.schema.nodes.mediaGroup) {
-        sliceContainsCodeBlockOrMedia = true;
-      }
-    });
-    if (sliceContainsCodeBlockOrMedia) {
-      var state = view.state;
-      var schema = state.schema;
-      var dropPos = view.posAtCoords({
-        left: event.clientX,
-        top: event.clientY
-      });
-      if (!dropPos) {
-        return false;
-      }
-      var resolvedPos = state.doc.resolve(dropPos.pos);
-      var dropLocationNodeType = resolvedPos.node().type;
-      var dropLocationParentNodeType = resolvedPos.depth > 0 ? resolvedPos.node(resolvedPos.depth - 1).type : dropLocationNodeType;
-      if (dropLocationNodeType === schema.nodes.blockquote || dropLocationParentNodeType === schema.nodes.blockquote) {
-        event.preventDefault();
-        return true;
-      }
-    }
-  }
-  return false;
 };

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

@@ -2,7 +2,6 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { browser } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { BLOCK_QUOTE, CODE_BLOCK, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, HEADINGS_BY_LEVEL, NORMAL_TEXT, OTHER, PANEL, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES, getBlockTypesInDropdown } from './block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from './commands/block-type';
 import { HEADING_KEYS } from './consts';
@@ -143,48 +142,7 @@ export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph, inclu
           altKeyLocation = 0;
         }
         return false;
-      },
-      handleDrop(view, event, slice, moved) {
-        return handleBlockQuoteDND(view, event, slice);
       }
     }
   });
-};
-export const handleBlockQuoteDND = (view, event, slice) => {
-  // Throwaway code for the sake of the expiriment. handleDrop can be removed after experiment complete.
-  if (editorExperiment('nest-media-and-codeblock-in-quote', false)) {
-    let sliceContainsCodeBlockOrMedia = false;
-    slice.content.forEach(node => {
-      if (node.type === view.state.schema.nodes.codeBlock) {
-        sliceContainsCodeBlockOrMedia = true;
-      } else if (node.type === view.state.schema.nodes.mediaSingle) {
-        sliceContainsCodeBlockOrMedia = true;
-      } else if (node.type === view.state.schema.nodes.mediaGroup) {
-        sliceContainsCodeBlockOrMedia = true;
-      }
-    });
-    if (sliceContainsCodeBlockOrMedia) {
-      const {
-        state
-      } = view;
-      const {
-        schema
-      } = state;
-      const dropPos = view.posAtCoords({
-        left: event.clientX,
-        top: event.clientY
-      });
-      if (!dropPos) {
-        return false;
-      }
-      const resolvedPos = state.doc.resolve(dropPos.pos);
-      const dropLocationNodeType = resolvedPos.node().type;
-      const dropLocationParentNodeType = resolvedPos.depth > 0 ? resolvedPos.node(resolvedPos.depth - 1).type : dropLocationNodeType;
-      if (dropLocationNodeType === schema.nodes.blockquote || dropLocationParentNodeType === schema.nodes.blockquote) {
-        event.preventDefault();
-        return true;
-      }
-    }
-  }
-  return false;
 };

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

@@ -5,7 +5,6 @@ import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { browser } from '@atlaskit/editor-common/browser';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { BLOCK_QUOTE, CODE_BLOCK, HEADING_1, HEADING_2, HEADING_3, HEADING_4, HEADING_5, HEADING_6, HEADINGS_BY_LEVEL, NORMAL_TEXT, OTHER, PANEL, TEXT_BLOCK_TYPES, WRAPPER_BLOCK_TYPES, getBlockTypesInDropdown } from './block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from './commands/block-type';
 import { HEADING_KEYS } from './consts';
@@ -150,44 +149,7 @@ export var createPlugin = function createPlugin(editorAPI, dispatch, lastNodeMus
           altKeyLocation = 0;
         }
         return false;
-      },
-      handleDrop: function handleDrop(view, event, slice, moved) {
-        return handleBlockQuoteDND(view, event, slice);
       }
     }
   });
-};
-export var handleBlockQuoteDND = function handleBlockQuoteDND(view, event, slice) {
-  // Throwaway code for the sake of the expiriment. handleDrop can be removed after experiment complete.
-  if (editorExperiment('nest-media-and-codeblock-in-quote', false)) {
-    var sliceContainsCodeBlockOrMedia = false;
-    slice.content.forEach(function (node) {
-      if (node.type === view.state.schema.nodes.codeBlock) {
-        sliceContainsCodeBlockOrMedia = true;
-      } else if (node.type === view.state.schema.nodes.mediaSingle) {
-        sliceContainsCodeBlockOrMedia = true;
-      } else if (node.type === view.state.schema.nodes.mediaGroup) {
-        sliceContainsCodeBlockOrMedia = true;
-      }
-    });
-    if (sliceContainsCodeBlockOrMedia) {
-      var state = view.state;
-      var schema = state.schema;
-      var dropPos = view.posAtCoords({
-        left: event.clientX,
-        top: event.clientY
-      });
-      if (!dropPos) {
-        return false;
-      }
-      var resolvedPos = state.doc.resolve(dropPos.pos);
-      var dropLocationNodeType = resolvedPos.node().type;
-      var dropLocationParentNodeType = resolvedPos.depth > 0 ? resolvedPos.node(resolvedPos.depth - 1).type : dropLocationNodeType;
-      if (dropLocationNodeType === schema.nodes.blockquote || dropLocationParentNodeType === schema.nodes.blockquote) {
-        event.preventDefault();
-        return true;
-      }
-    }
-  }
-  return false;
 };

package/dist/types/pm-plugins/main.d.ts

@@ -1,8 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { Slice } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { BlockTypePlugin } from '../blockTypePluginType';
 import type { BlockType } from './types';
 export type BlockTypeState = {
@@ -15,4 +13,3 @@ export type BlockTypeState = {
 };
 export declare const pluginKey: PluginKey<BlockTypeState>;
 export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean, includeBlockQuoteAsTextstyleOption?: boolean) => SafePlugin<BlockTypeState>;
-export declare const handleBlockQuoteDND: (view: EditorView, event: DragEvent, slice: Slice) => boolean;

package/dist/types/pm-plugins/ui/FloatingToolbarComponent.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import React from 'react';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { BlockTypePlugin } from '../../blockTypePluginType';
 interface FloatingToolbarComponentProps {
     api: ExtractInjectionAPI<BlockTypePlugin> | undefined;
 }
-export declare function FloatingToolbarComponent({ api }: FloatingToolbarComponentProps): JSX.Element;
+export declare function FloatingToolbarComponent({ api }: FloatingToolbarComponentProps): React.JSX.Element;
 export {};

package/dist/types/pm-plugins/ui/PrimaryToolbarComponent.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { BlockTypePlugin } from '../../blockTypePluginType';
 interface PrimaryToolbarComponentProps {
@@ -11,5 +11,5 @@ interface PrimaryToolbarComponentProps {
     popupsScrollableElement?: HTMLElement;
     shouldUseDefaultRole: boolean;
 }
-export declare function PrimaryToolbarComponent({ api, isSmall, disabled, isToolbarReducedSpacing, popupsMountPoint, popupsBoundariesElement, popupsScrollableElement, shouldUseDefaultRole, }: PrimaryToolbarComponentProps): JSX.Element;
+export declare function PrimaryToolbarComponent({ api, isSmall, disabled, isToolbarReducedSpacing, popupsMountPoint, popupsBoundariesElement, popupsScrollableElement, shouldUseDefaultRole, }: PrimaryToolbarComponentProps): React.JSX.Element;
 export {};

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

@@ -1,8 +1,6 @@
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { Slice } from '@atlaskit/editor-prosemirror/model';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { BlockTypePlugin } from '../blockTypePluginType';
 import type { BlockType } from './types';
 export type BlockTypeState = {
@@ -15,4 +13,3 @@ export type BlockTypeState = {
 };
 export declare const pluginKey: PluginKey<BlockTypeState>;
 export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlugin> | undefined, dispatch: (eventName: string | PluginKey, data: any) => void, lastNodeMustBeParagraph?: boolean, includeBlockQuoteAsTextstyleOption?: boolean) => SafePlugin<BlockTypeState>;
-export declare const handleBlockQuoteDND: (view: EditorView, event: DragEvent, slice: Slice) => boolean;

package/dist/types-ts4.5/pm-plugins/ui/FloatingToolbarComponent.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import React from 'react';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { BlockTypePlugin } from '../../blockTypePluginType';
 interface FloatingToolbarComponentProps {
     api: ExtractInjectionAPI<BlockTypePlugin> | undefined;
 }
-export declare function FloatingToolbarComponent({ api }: FloatingToolbarComponentProps): JSX.Element;
+export declare function FloatingToolbarComponent({ api }: FloatingToolbarComponentProps): React.JSX.Element;
 export {};

package/dist/types-ts4.5/pm-plugins/ui/PrimaryToolbarComponent.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { BlockTypePlugin } from '../../blockTypePluginType';
 interface PrimaryToolbarComponentProps {
@@ -11,5 +11,5 @@ interface PrimaryToolbarComponentProps {
     popupsScrollableElement?: HTMLElement;
     shouldUseDefaultRole: boolean;
 }
-export declare function PrimaryToolbarComponent({ api, isSmall, disabled, isToolbarReducedSpacing, popupsMountPoint, popupsBoundariesElement, popupsScrollableElement, shouldUseDefaultRole, }: PrimaryToolbarComponentProps): JSX.Element;
+export declare function PrimaryToolbarComponent({ api, isSmall, disabled, isToolbarReducedSpacing, popupsMountPoint, popupsBoundariesElement, popupsScrollableElement, shouldUseDefaultRole, }: PrimaryToolbarComponentProps): React.JSX.Element;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "4.2.1",
+	"version": "4.2.2",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
-		"@atlaskit/editor-common": "^99.7.0",
+		"@atlaskit/editor-common": "^99.8.0",
 		"@atlaskit/editor-plugin-analytics": "^1.11.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
@@ -45,7 +45,7 @@
 		"@atlaskit/primitives": "^13.4.0",
 		"@atlaskit/prosemirror-input-rules": "^3.2.0",
 		"@atlaskit/theme": "^14.1.0",
-		"@atlaskit/tmp-editor-statsig": "^2.41.0",
+		"@atlaskit/tmp-editor-statsig": "^2.42.0",
 		"@atlaskit/tokens": "^3.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
@@ -104,9 +104,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"editor_nest_media_and_codeblock_in_quotes_jira": {
-			"type": "boolean"
-		},
 		"platform_editor_toolbar_responsive_fixes": {
 			"type": "boolean"
 		},