@atlaskit/editor-plugin-block-type 3.14.8 → 3.15.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # @atlaskit/editor-plugin-block-type
 
+## 3.15.0
+
+### Minor Changes
+
+- [#142806](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/142806)
+  [`f73667130fb7d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f73667130fb7d) -
+  [ux] Update styles for nested dnd to only apply to full page editor. Removed
+  blockquoteSharedStylesNew export.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.14.9
+
+### Patch Changes
+
+- [#141778](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/141778)
+  [`1c6f578277694`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1c6f578277694) -
+  ED-24870 & ED-24864 - Add the logic to gate the nested media in quotes functionality behind the
+  nest-media-and-codeblock-in-quote experiment. Also adjust the logic so the nested expands are now
+  behind the nested-expand-in-expand experiment.
+
 ## 3.14.8
 
 ### Patch Changes

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

@@ -4,12 +4,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.pluginKey = exports.createPlugin = void 0;
+exports.pluginKey = exports.handleBlockQuoteDND = 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 _commands = require("../commands");
 var _consts = require("../consts");
@@ -145,7 +146,44 @@ 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/cjs/plugin/styles.js

@@ -12,5 +12,5 @@ var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _templateObject; // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Imports are not safe in an object syntax
 var blocktypeStyles = exports.blocktypeStyles = function blocktypeStyles() {
-  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror {\n\t\t", ";\n\t\t", ";\n\t}\n"])), (0, _experiments.editorExperiment)('nested-dnd', true) ? _styles.blockquoteSharedStylesNew : _styles.blockquoteSharedStyles, (0, _styles.headingsSharedStyles)());
+  return (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t.ProseMirror {\n\t\t", ";\n\t\t", ";\n\t}\n\n\t", "\n"])), _styles.blockquoteSharedStyles, (0, _styles.headingsSharedStyles)(), (0, _experiments.editorExperiment)('nested-dnd', true) && ".ak-editor-content-area.appearance-full-page .ProseMirror blockquote {\n\t\tpadding-left: ".concat("var(--ds-space-250, 20px)", ";\n\t}\n\n\t/* Don't want extra padding for inline editor (nested) */\n\t.ak-editor-content-area .ak-editor-content-area .ProseMirror blockquote {\n\t\tpadding-left: ", "var(--ds-space-200, 16px)", ";\n\t}"));
 };

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

@@ -2,6 +2,7 @@ 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 } from '../block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from '../commands';
 import { HEADING_KEYS } from '../consts';
@@ -133,7 +134,48 @@ export const createPlugin = (editorAPI, dispatch, lastNodeMustBeParagraph) => {
           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/es2019/plugin/styles.js

@@ -1,12 +1,20 @@
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
-import { blockquoteSharedStyles, blockquoteSharedStylesNew, headingsSharedStyles } from '@atlaskit/editor-common/styles';
+import { blockquoteSharedStyles, headingsSharedStyles } from '@atlaskit/editor-common/styles';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Imports are not safe in an object syntax
 export const blocktypeStyles = () => css`
 	.ProseMirror {
-		${editorExperiment('nested-dnd', true) ? blockquoteSharedStylesNew : blockquoteSharedStyles};
+		${blockquoteSharedStyles};
 		${headingsSharedStyles()};
 	}
+
+	${editorExperiment('nested-dnd', true) && `.ak-editor-content-area.appearance-full-page .ProseMirror blockquote {
+		padding-left: ${"var(--ds-space-250, 20px)"};
+	}
+
+	/* Don't want extra padding for inline editor (nested) */
+	.ak-editor-content-area .ak-editor-content-area .ProseMirror blockquote {
+		padding-left: ${"var(--ds-space-200, 16px)"};
+	}`}
 `;

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

@@ -5,6 +5,7 @@ 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 } from '../block-types';
 import { setHeadingWithAnalytics, setNormalTextWithAnalytics } from '../commands';
 import { HEADING_KEYS } from '../consts';
@@ -138,7 +139,44 @@ 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/esm/plugin/styles.js

@@ -2,10 +2,9 @@ import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral
 var _templateObject;
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css } from '@emotion/react';
-import { blockquoteSharedStyles, blockquoteSharedStylesNew, headingsSharedStyles } from '@atlaskit/editor-common/styles';
+import { blockquoteSharedStyles, headingsSharedStyles } from '@atlaskit/editor-common/styles';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Imports are not safe in an object syntax
 export var blocktypeStyles = function blocktypeStyles() {
-  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t.ProseMirror {\n\t\t", ";\n\t\t", ";\n\t}\n"])), editorExperiment('nested-dnd', true) ? blockquoteSharedStylesNew : blockquoteSharedStyles, headingsSharedStyles());
+  return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t.ProseMirror {\n\t\t", ";\n\t\t", ";\n\t}\n\n\t", "\n"])), blockquoteSharedStyles, headingsSharedStyles(), editorExperiment('nested-dnd', true) && ".ak-editor-content-area.appearance-full-page .ProseMirror blockquote {\n\t\tpadding-left: ".concat("var(--ds-space-250, 20px)", ";\n\t}\n\n\t/* Don't want extra padding for inline editor (nested) */\n\t.ak-editor-content-area .ak-editor-content-area .ProseMirror blockquote {\n\t\tpadding-left: ", "var(--ds-space-200, 16px)", ";\n\t}"));
 };

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

@@ -1,6 +1,8 @@
 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 '../index';
 import type { BlockType } from '../types';
 export type BlockTypeState = {
@@ -16,3 +18,4 @@ export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlug
     availableBlockTypes: BlockType[];
     availableWrapperBlockTypes: BlockType[];
 }>;
+export declare const handleBlockQuoteDND: (view: EditorView, event: DragEvent, slice: Slice) => boolean;

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

@@ -1,6 +1,8 @@
 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 '../index';
 import type { BlockType } from '../types';
 export type BlockTypeState = {
@@ -16,3 +18,4 @@ export declare const createPlugin: (editorAPI: ExtractInjectionAPI<BlockTypePlug
     availableBlockTypes: BlockType[];
     availableWrapperBlockTypes: BlockType[];
 }>;
+export declare const handleBlockQuoteDND: (view: EditorView, event: DragEvent, slice: Slice) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-type",
-	"version": "3.14.8",
+	"version": "3.15.0",
 	"description": "BlockType plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,7 +34,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
-		"@atlaskit/editor-common": "^89.2.0",
+		"@atlaskit/editor-common": "^90.0.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^2.0.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
@@ -56,7 +56,7 @@
 	"devDependencies": {
 		"@af/visual-regression": "*",
 		"@atlaskit/analytics-next": "^10.1.0",
-		"@atlaskit/editor-plugin-quick-insert": "^1.3.0",
+		"@atlaskit/editor-plugin-quick-insert": "^1.4.0",
 		"@atlaskit/editor-plugin-type-ahead": "^1.8.0",
 		"@atlaskit/ssr": "*",
 		"@atlaskit/visual-regression": "*",