@atlaskit/editor-plugin-find-replace 1.5.0 → 1.5.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/editor-plugin-find-replace
 
+## 1.5.1
+
+### Patch Changes
+
+- [#124134](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/124134)
+  [`80147d04d87b6`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/80147d04d87b6) -
+  Fix bug in React 18 concurrent mode where find input swallows characters
+- Updated dependencies
+
 ## 1.5.0
 
 ### Minor Changes

package/dist/cjs/ui/Find.js

@@ -21,6 +21,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _messages = require("@atlaskit/editor-common/messages");
 var _form = require("@atlaskit/form");
 var _keyboard = _interopRequireDefault(require("@atlaskit/icon/glyph/emoji/keyboard"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _textfield = _interopRequireDefault(require("@atlaskit/textfield"));
 var _FindReplaceTooltipButton = require("./FindReplaceTooltipButton");
 var _styles = require("./styles");
@@ -178,13 +179,24 @@ var Find = /*#__PURE__*/function (_React$Component) {
       if (this.props.findText === ((_this$state2 = this.state) === null || _this$state2 === void 0 ? void 0 : _this$state2.localFindText)) {
         this.focusFindTextfield();
       }
-      if (this.props.findText !== prevProps.findText) {
-        this.syncFindText(function () {
-          // focus after input is synced if find text provided
-          if (_this3.props.findText) {
-            _this3.focusFindTextfield();
-          }
-        });
+      if ((0, _platformFeatureFlags.fg)('react_18_find_replace_concurrent_mode')) {
+        if (this.props.findText !== prevProps.findText && this.props.shouldFocus) {
+          this.syncFindText(function () {
+            // focus after input is synced if find text provided
+            if (_this3.props.findText) {
+              _this3.focusFindTextfield();
+            }
+          });
+        }
+      } else {
+        if (this.props.findText !== prevProps.findText) {
+          this.syncFindText(function () {
+            // focus after input is synced if find text provided
+            if (_this3.props.findText) {
+              _this3.focusFindTextfield();
+            }
+          });
+        }
       }
     }
   }, {

package/dist/es2019/ui/Find.js

@@ -15,6 +15,7 @@ import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import { findReplaceMessages as messages } from '@atlaskit/editor-common/messages';
 import { Label } from '@atlaskit/form';
 import MatchCaseIcon from '@atlaskit/icon/glyph/emoji/keyboard';
+import { fg } from '@atlaskit/platform-feature-flags';
 import Textfield from '@atlaskit/textfield';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
 import { afterInputSection, countStyles, countStylesAlternateStyles, matchCaseSection, sectionWrapperStyles, sectionWrapperStylesAlternate, textFieldWrapper } from './styles';
@@ -160,13 +161,24 @@ class Find extends React.Component {
     if (this.props.findText === ((_this$state2 = this.state) === null || _this$state2 === void 0 ? void 0 : _this$state2.localFindText)) {
       this.focusFindTextfield();
     }
-    if (this.props.findText !== prevProps.findText) {
-      this.syncFindText(() => {
-        // focus after input is synced if find text provided
-        if (this.props.findText) {
-          this.focusFindTextfield();
-        }
-      });
+    if (fg('react_18_find_replace_concurrent_mode')) {
+      if (this.props.findText !== prevProps.findText && this.props.shouldFocus) {
+        this.syncFindText(() => {
+          // focus after input is synced if find text provided
+          if (this.props.findText) {
+            this.focusFindTextfield();
+          }
+        });
+      }
+    } else {
+      if (this.props.findText !== prevProps.findText) {
+        this.syncFindText(() => {
+          // focus after input is synced if find text provided
+          if (this.props.findText) {
+            this.focusFindTextfield();
+          }
+        });
+      }
     }
   }
   componentWillUnmount() {

package/dist/esm/ui/Find.js

@@ -23,6 +23,7 @@ import { TRIGGER_METHOD } from '@atlaskit/editor-common/analytics';
 import { findReplaceMessages as messages } from '@atlaskit/editor-common/messages';
 import { Label } from '@atlaskit/form';
 import MatchCaseIcon from '@atlaskit/icon/glyph/emoji/keyboard';
+import { fg } from '@atlaskit/platform-feature-flags';
 import Textfield from '@atlaskit/textfield';
 import { FindReplaceTooltipButton } from './FindReplaceTooltipButton';
 import { afterInputSection, countStyles, countStylesAlternateStyles, matchCaseSection, sectionWrapperStyles, sectionWrapperStylesAlternate, textFieldWrapper } from './styles';
@@ -175,13 +176,24 @@ var Find = /*#__PURE__*/function (_React$Component) {
       if (this.props.findText === ((_this$state2 = this.state) === null || _this$state2 === void 0 ? void 0 : _this$state2.localFindText)) {
         this.focusFindTextfield();
       }
-      if (this.props.findText !== prevProps.findText) {
-        this.syncFindText(function () {
-          // focus after input is synced if find text provided
-          if (_this3.props.findText) {
-            _this3.focusFindTextfield();
-          }
-        });
+      if (fg('react_18_find_replace_concurrent_mode')) {
+        if (this.props.findText !== prevProps.findText && this.props.shouldFocus) {
+          this.syncFindText(function () {
+            // focus after input is synced if find text provided
+            if (_this3.props.findText) {
+              _this3.focusFindTextfield();
+            }
+          });
+        }
+      } else {
+        if (this.props.findText !== prevProps.findText) {
+          this.syncFindText(function () {
+            // focus after input is synced if find text provided
+            if (_this3.props.findText) {
+              _this3.focusFindTextfield();
+            }
+          });
+        }
       }
     }
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-find-replace",
-	"version": "1.5.0",
+	"version": "1.5.1",
 	"description": "find replace plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,13 +35,14 @@
 	},
 	"dependencies": {
 		"@atlaskit/button": "^19.1.0",
-		"@atlaskit/editor-common": "^86.8.0",
+		"@atlaskit/editor-common": "^87.0.0",
 		"@atlaskit/editor-plugin-analytics": "^1.6.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^1.3.0",
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/form": "^10.4.0",
 		"@atlaskit/icon": "^22.7.0",
+		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^11.1.0",
 		"@atlaskit/textfield": "^6.4.0",
 		"@atlaskit/theme": "^12.11.0",
@@ -105,5 +106,10 @@
 				"@atlaskit/editor-plugin-analytics"
 			]
 		}
+	},
+	"platform-feature-flags": {
+		"react_18_find_replace_concurrent_mode": {
+			"type": "boolean"
+		}
 	}
 }