@atlaskit/editor-plugin-panel 9.0.2 → 9.0.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-panel
 
+## 9.0.4
+
+### Patch Changes
+
+- [`549df2f66099e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/549df2f66099e) -
+  Fixed mixed HTML/Editor content copy/paste issue on Custom Panel node.
+
+## 9.0.3
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 9.0.2
 
 ### Patch Changes

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

@@ -12,6 +12,7 @@ var _editorPalette = require("@atlaskit/editor-palette");
 var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 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; }
 var findPanel = exports.findPanel = function findPanel(state, selection) {
@@ -42,6 +43,13 @@ var panelAttrsToDom = exports.panelAttrsToDom = function panelAttrsToDom(attrs,
       'data-panel-icon-text': panelIconText
     });
   }
+  // Required for parseDOM to correctly parse custom panel when NodeView DOM is copied directly
+  // Schema's parseDOM expects data-panel-icon on all custom panels, not just ones with color
+  if (isCustomPanel && (0, _expValEquals.expValEquals)('platform_editor_copy_paste_issue_fix', 'isEnabled', true)) {
+    panelAttrs = _objectSpread(_objectSpread({}, panelAttrs), {}, {
+      'data-panel-icon': panelIcon
+    });
+  }
   if ((0, _platformFeatureFlags.fg)('platform_editor_adf_with_localid')) {
     panelAttrs = _objectSpread(_objectSpread({}, panelAttrs), {}, {
       'data-local-id': attrs.localId

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

@@ -4,6 +4,7 @@ import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode, findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export const findPanel = (state, selection) => {
   const {
     panel
@@ -37,6 +38,14 @@ export const panelAttrsToDom = (attrs, allowCustomPanel) => {
       'data-panel-icon-text': panelIconText
     };
   }
+  // Required for parseDOM to correctly parse custom panel when NodeView DOM is copied directly
+  // Schema's parseDOM expects data-panel-icon on all custom panels, not just ones with color
+  if (isCustomPanel && expValEquals('platform_editor_copy_paste_issue_fix', 'isEnabled', true)) {
+    panelAttrs = {
+      ...panelAttrs,
+      'data-panel-icon': panelIcon
+    };
+  }
   if (fg('platform_editor_adf_with_localid')) {
     panelAttrs = {
       ...panelAttrs,

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

@@ -7,6 +7,7 @@ import { hexToEditorBackgroundPaletteColor } from '@atlaskit/editor-palette';
 import { NodeSelection, TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { findParentNode, findParentNodeOfType, findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 export var findPanel = function findPanel(state, selection) {
   var panel = state.schema.nodes.panel;
   return findSelectedNodeOfType(panel)(selection || state.selection) || findParentNodeOfType(panel)(selection || state.selection);
@@ -35,6 +36,13 @@ export var panelAttrsToDom = function panelAttrsToDom(attrs, allowCustomPanel) {
       'data-panel-icon-text': panelIconText
     });
   }
+  // Required for parseDOM to correctly parse custom panel when NodeView DOM is copied directly
+  // Schema's parseDOM expects data-panel-icon on all custom panels, not just ones with color
+  if (isCustomPanel && expValEquals('platform_editor_copy_paste_issue_fix', 'isEnabled', true)) {
+    panelAttrs = _objectSpread(_objectSpread({}, panelAttrs), {}, {
+      'data-panel-icon': panelIcon
+    });
+  }
   if (fg('platform_editor_adf_with_localid')) {
     panelAttrs = _objectSpread(_objectSpread({}, panelAttrs), {}, {
       'data-local-id': attrs.localId

package/dist/types/panelPluginType.d.ts

@@ -18,6 +18,7 @@ export type DomPanelAtrrs = {
     class: string;
     'data-local-id'?: string;
     'data-panel-color'?: string;
+    'data-panel-icon'?: string;
     'data-panel-icon-id'?: string;
     'data-panel-icon-text'?: string;
     'data-panel-type': string;

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

@@ -18,6 +18,7 @@ export type DomPanelAtrrs = {
     class: string;
     'data-local-id'?: string;
     'data-panel-color'?: string;
+    'data-panel-icon'?: string;
     'data-panel-icon-id'?: string;
     'data-panel-icon-text'?: string;
     'data-panel-type': string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-panel",
-	"version": "9.0.2",
+	"version": "9.0.4",
 	"description": "Panel plugin for @atlaskit/editor-core.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -42,13 +42,13 @@
 		"@atlaskit/icon": "^29.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^16.11.0",
-		"@atlaskit/tokens": "^9.1.0",
+		"@atlaskit/tmp-editor-statsig": "^16.28.0",
+		"@atlaskit/tokens": "^10.1.0",
 		"@babel/runtime": "^7.0.0",
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^111.7.0",
+		"@atlaskit/editor-common": "^111.8.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"