@atlaskit/editor-plugin-expand 3.3.5 → 4.0.0

package/CHANGELOG.md

@@ -1,5 +1,58 @@
 # @atlaskit/editor-plugin-expand
 
+## 4.0.0
+
+### Major Changes
+
+- [#181024](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/181024)
+  [`8e80c487ca307`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8e80c487ca307) - ##
+  Make `@atlaskit/editor-common` a peer dependency
+
+  **WHAT:** `@atlaskit/editor-common` has been moved from `dependencies` to `peerDependencies` in
+  all editor plugin packages.
+
+  **WHY:** This change ensures that only a single version of `@atlaskit/editor-common` is used in
+  consuming applications, preventing issues caused by multiple versions of singleton libraries (such
+  as context mismatches or duplicated state). This is especially important for packages that rely on
+  shared context or singletons.
+
+  **HOW TO ADJUST:**
+
+  - Consumers must now explicitly install `@atlaskit/editor-common` in their own project if they use
+    any of these editor plugins.
+  - Ensure the version you install matches the version required by the plugins.
+  - You can use the
+    [`check-peer-dependencies`](https://www.npmjs.com/package/check-peer-dependencies) package to
+    verify that all required peer dependencies are installed and compatible.
+  - Example install command:
+    ```
+    npm install @atlaskit/editor-common
+    ```
+    or
+    ```
+    yarn add @atlaskit/editor-common
+    ```
+
+  **Note:** This is a breaking change. If `@atlaskit/editor-common` is not installed at the
+  application level, you may see errors or unexpected behavior.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.4.0
+
+### Minor Changes
+
+- [#175370](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/175370)
+  [`fb5f9531ef9d8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fb5f9531ef9d8) -
+  [ux] [ED-27956] this PR is adding support for Find with expand titles and updating the search
+  match styles behind the experiment `platform_editor_find_and_replace_improvements`
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 3.3.5
 
 ### Patch Changes

package/dist/cjs/singlePlayerExpand/node-views/index.js

@@ -24,6 +24,7 @@ var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _commands = require("../commands");
 var _ExpandButton = require("../ui/ExpandButton");
 var _NodeView = require("../ui/NodeView");
+var _utils2 = require("../utils");
 var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
   function ExpandNodeView(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI) {
     var _this = this,
@@ -508,7 +509,16 @@ var ExpandNodeView = exports.ExpandNodeView = /*#__PURE__*/function () {
       var expanded = _expand.expandedState.get(node) ? _expand.expandedState.get(node) : false;
       if (this.dom && expanded !== undefined) {
         var _expandedState$get;
-        this.dom.className = (0, _NodeView.buildExpandClassName)(node.type.name, expanded);
+        if ((0, _expValEquals.expValEquals)('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
+          var classes = this.dom.className.split(' ');
+          // find & replace styles might be applied to the expand title and we need to keep them
+          var findReplaceDecorationsApplied = classes.filter(function (className) {
+            return _utils2.findReplaceExpandDecorations.includes(className);
+          }).join(' ');
+          this.dom.className = findReplaceDecorationsApplied ? (0, _NodeView.buildExpandClassName)(node.type.name, expanded) + " ".concat(findReplaceDecorationsApplied) : (0, _NodeView.buildExpandClassName)(node.type.name, expanded);
+        } else {
+          this.dom.className = (0, _NodeView.buildExpandClassName)(node.type.name, expanded);
+        }
         // Re-render the icon to update the aria-expanded attribute
         this.renderIcon(this.icon ? this.icon : null, (_expandedState$get = _expand.expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false);
       }

package/dist/cjs/singlePlayerExpand/utils.js

@@ -3,8 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.findParentExpandNode = void 0;
+exports.findReplaceExpandDecorations = exports.findParentExpandNode = void 0;
+var _styles = require("@atlaskit/editor-plugin-find-replace/styles");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var findParentExpandNode = exports.findParentExpandNode = function findParentExpandNode(state) {
   return (0, _utils.findParentNodeOfType)(state.schema.nodes.nestedExpand)(state.selection) || (0, _utils.findParentNodeOfType)(state.schema.nodes.expand)(state.selection);
-};
+};
+var findReplaceExpandDecorations = exports.findReplaceExpandDecorations = [_styles.darkModeSearchMatchClass, _styles.searchMatchExpandTitleClass, _styles.selectedSearchMatchClass];

package/dist/es2019/singlePlayerExpand/node-views/index.js

@@ -14,6 +14,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandButton } from '../ui/ExpandButton';
 import { buildExpandClassName, toDOM } from '../ui/NodeView';
+import { findReplaceExpandDecorations } from '../utils';
 export class ExpandNodeView {
   constructor(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI, allowInteractiveExpand = true, __livePage = false, cleanUpEditorDisabledOnChange) {
     var _api$editorDisabled, _api$editorDisabled$s, _this$api6;
@@ -499,7 +500,14 @@ export class ExpandNodeView {
     const expanded = expandedState.get(node) ? expandedState.get(node) : false;
     if (this.dom && expanded !== undefined) {
       var _expandedState$get;
-      this.dom.className = buildExpandClassName(node.type.name, expanded);
+      if (expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
+        const classes = this.dom.className.split(' ');
+        // find & replace styles might be applied to the expand title and we need to keep them
+        const findReplaceDecorationsApplied = classes.filter(className => findReplaceExpandDecorations.includes(className)).join(' ');
+        this.dom.className = findReplaceDecorationsApplied ? buildExpandClassName(node.type.name, expanded) + ` ${findReplaceDecorationsApplied}` : buildExpandClassName(node.type.name, expanded);
+      } else {
+        this.dom.className = buildExpandClassName(node.type.name, expanded);
+      }
       // Re-render the icon to update the aria-expanded attribute
       this.renderIcon(this.icon ? this.icon : null, (_expandedState$get = expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false);
     }

package/dist/es2019/singlePlayerExpand/utils.js

@@ -1,4 +1,6 @@
+import { darkModeSearchMatchClass, searchMatchExpandTitleClass, selectedSearchMatchClass } from '@atlaskit/editor-plugin-find-replace/styles';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export const findParentExpandNode = state => {
   return findParentNodeOfType(state.schema.nodes.nestedExpand)(state.selection) || findParentNodeOfType(state.schema.nodes.expand)(state.selection);
-};
+};
+export const findReplaceExpandDecorations = [darkModeSearchMatchClass, searchMatchExpandTitleClass, selectedSearchMatchClass];

package/dist/esm/singlePlayerExpand/node-views/index.js

@@ -16,6 +16,7 @@ import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { deleteExpand, setSelectionInsideExpand, toggleExpandExpanded, updateExpandTitle } from '../commands';
 import { ExpandButton } from '../ui/ExpandButton';
 import { buildExpandClassName, toDOM } from '../ui/NodeView';
+import { findReplaceExpandDecorations } from '../utils';
 export var ExpandNodeView = /*#__PURE__*/function () {
   function ExpandNodeView(_node, view, getPos, getIntl, isMobile, selectNearNode, api, nodeViewPortalProviderAPI) {
     var _this = this,
@@ -500,7 +501,16 @@ export var ExpandNodeView = /*#__PURE__*/function () {
       var expanded = expandedState.get(node) ? expandedState.get(node) : false;
       if (this.dom && expanded !== undefined) {
         var _expandedState$get;
-        this.dom.className = buildExpandClassName(node.type.name, expanded);
+        if (expValEquals('platform_editor_find_and_replace_improvements', 'isEnabled', true)) {
+          var classes = this.dom.className.split(' ');
+          // find & replace styles might be applied to the expand title and we need to keep them
+          var findReplaceDecorationsApplied = classes.filter(function (className) {
+            return findReplaceExpandDecorations.includes(className);
+          }).join(' ');
+          this.dom.className = findReplaceDecorationsApplied ? buildExpandClassName(node.type.name, expanded) + " ".concat(findReplaceDecorationsApplied) : buildExpandClassName(node.type.name, expanded);
+        } else {
+          this.dom.className = buildExpandClassName(node.type.name, expanded);
+        }
         // Re-render the icon to update the aria-expanded attribute
         this.renderIcon(this.icon ? this.icon : null, (_expandedState$get = expandedState.get(node)) !== null && _expandedState$get !== void 0 ? _expandedState$get : false);
       }

package/dist/esm/singlePlayerExpand/utils.js

@@ -1,4 +1,6 @@
+import { darkModeSearchMatchClass, searchMatchExpandTitleClass, selectedSearchMatchClass } from '@atlaskit/editor-plugin-find-replace/styles';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export var findParentExpandNode = function findParentExpandNode(state) {
   return findParentNodeOfType(state.schema.nodes.nestedExpand)(state.selection) || findParentNodeOfType(state.schema.nodes.expand)(state.selection);
-};
+};
+export var findReplaceExpandDecorations = [darkModeSearchMatchClass, searchMatchExpandTitleClass, selectedSearchMatchClass];

package/dist/types/singlePlayerExpand/utils.d.ts

@@ -1,3 +1,4 @@
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export declare const findParentExpandNode: (state: EditorState) => ReturnType<ReturnType<typeof findParentNodeOfType>>;
+export declare const findReplaceExpandDecorations: string[];

package/dist/types-ts4.5/singlePlayerExpand/utils.d.ts

@@ -1,3 +1,4 @@
 import type { EditorState } from '@atlaskit/editor-prosemirror/state';
 import { findParentNodeOfType } from '@atlaskit/editor-prosemirror/utils';
 export declare const findParentExpandNode: (state: EditorState) => ReturnType<ReturnType<typeof findParentNodeOfType>>;
+export declare const findReplaceExpandDecorations: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "3.3.5",
+	"version": "4.0.0",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -9,8 +9,7 @@
 	},
 	"atlassian": {
 		"team": "Editor: Jenga",
-		"singleton": true,
-		"runReact18": true
+		"singleton": true
 	},
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"main": "dist/cjs/index.js",
@@ -35,20 +34,20 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/button": "^23.2.0",
-		"@atlaskit/editor-common": "^107.0.0",
-		"@atlaskit/editor-plugin-analytics": "^2.3.0",
-		"@atlaskit/editor-plugin-decorations": "^2.0.0",
-		"@atlaskit/editor-plugin-editor-disabled": "^2.1.0",
-		"@atlaskit/editor-plugin-editor-viewmode": "^4.0.0",
-		"@atlaskit/editor-plugin-selection": "^2.2.0",
-		"@atlaskit/editor-plugin-selection-marker": "^2.5.0",
+		"@atlaskit/editor-plugin-analytics": "^3.0.0",
+		"@atlaskit/editor-plugin-decorations": "^3.0.0",
+		"@atlaskit/editor-plugin-editor-disabled": "^3.0.0",
+		"@atlaskit/editor-plugin-editor-viewmode": "^5.0.0",
+		"@atlaskit/editor-plugin-find-replace": "^3.0.0",
+		"@atlaskit/editor-plugin-selection": "^3.0.0",
+		"@atlaskit/editor-plugin-selection-marker": "^3.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/icon": "^27.0.0",
+		"@atlaskit/icon": "^27.2.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tmp-editor-statsig": "^8.0.0",
-		"@atlaskit/tokens": "^5.3.0",
+		"@atlaskit/tmp-editor-statsig": "^8.7.0",
+		"@atlaskit/tokens": "^5.4.0",
 		"@atlaskit/tooltip": "^20.3.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -56,18 +55,19 @@
 		"w3c-keyname": "^2.1.8"
 	},
 	"peerDependencies": {
+		"@atlaskit/editor-common": "^107.6.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"devDependencies": {
 		"@atlaskit/analytics-next": "^11.1.0",
-		"@atlaskit/editor-plugin-content-insertion": "^2.1.0",
-		"@atlaskit/editor-plugin-guideline": "^2.0.0",
-		"@atlaskit/editor-plugin-quick-insert": "^2.6.0",
-		"@atlaskit/editor-plugin-table": "^10.12.0",
-		"@atlaskit/editor-plugin-type-ahead": "^2.7.0",
-		"@atlaskit/editor-plugin-width": "^3.0.0",
+		"@atlaskit/editor-plugin-content-insertion": "^3.0.0",
+		"@atlaskit/editor-plugin-guideline": "^3.0.0",
+		"@atlaskit/editor-plugin-quick-insert": "^3.0.0",
+		"@atlaskit/editor-plugin-table": "^11.0.0",
+		"@atlaskit/editor-plugin-type-ahead": "^3.0.0",
+		"@atlaskit/editor-plugin-width": "^4.0.0",
 		"@testing-library/react": "^13.4.0",
 		"react-test-renderer": "^18.2.0",
 		"typescript": "~5.4.2"