@atlaskit/react-select 3.4.3 → 3.4.4

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/react-select
 
+## 3.4.4
+
+### Patch Changes
+
+- [`4129d4df5bb4d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4129d4df5bb4d) -
+  Revert the changes done to add prop hasOtherFocusableElements flag
+
 ## 3.4.3
 
 ### Patch Changes

package/async/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/async.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/async.d.ts"
       ]

package/async-creatable/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/async-creatable.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/async-creatable.d.ts"
       ]

package/base/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/select.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/select.d.ts"
       ]

package/creatable/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/creatable.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/creatable.d.ts"
       ]

package/dist/cjs/select.js

@@ -52,7 +52,6 @@ var defaultProps = exports.defaultProps = {
   isMulti: false,
   isRtl: false,
   isSearchable: true,
-  hasOtherFocusableElements: false,
   isOptionDisabled: _builtins.isOptionDisabled,
   loadingMessage: function loadingMessage() {
     return 'Loading...';
@@ -258,7 +257,6 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
     (0, _defineProperty2.default)(_this, "initialTouchY", 0);
     (0, _defineProperty2.default)(_this, "openAfterFocus", false);
     (0, _defineProperty2.default)(_this, "scrollToFocusedOptionOnUpdate", false);
-    (0, _defineProperty2.default)(_this, "lastPressedKey", '');
     // Refs
     // ------------------------------
     (0, _defineProperty2.default)(_this, "controlRef", null);
@@ -640,9 +638,7 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
         return;
       }
       if (_this.props.onBlur) {
-        if (!_this.props.hasOtherFocusableElements || _this.props.hasOtherFocusableElements && _this.lastPressedKey !== 'Tab') {
-          _this.props.onBlur(event);
-        }
+        _this.props.onBlur(event);
       }
       _this.onInputChange('', {
         action: 'input-blur',
@@ -708,9 +704,6 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
           return;
         }
       }
-      if (_this.props.hasOtherFocusableElements) {
-        _this.lastPressedKey = event.key;
-      }
 
       // Block option hover events when the user has just pressed a key
       _this.blockOptionHover = true;
@@ -936,15 +929,11 @@ var Select = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "onMenuClose",
     value: function onMenuClose() {
-      if (!this.props.hasOtherFocusableElements || this.props.hasOtherFocusableElements && this.lastPressedKey !== 'Tab') {
-        this.onInputChange('', {
-          action: 'menu-close',
-          prevInputValue: this.props.inputValue
-        });
-        this.props.onMenuClose();
-      } else {
-        this.lastPressedKey = '';
-      }
+      this.onInputChange('', {
+        action: 'menu-close',
+        prevInputValue: this.props.inputValue
+      });
+      this.props.onMenuClose();
     }
   }, {
     key: "onInputChange",

package/dist/es2019/select.js

@@ -31,7 +31,6 @@ export const defaultProps = {
   isMulti: false,
   isRtl: false,
   isSearchable: true,
-  hasOtherFocusableElements: false,
   isOptionDisabled: isOptionDisabledBuiltin,
   loadingMessage: () => 'Loading...',
   maxMenuHeight: 300,
@@ -227,7 +226,6 @@ export default class Select extends Component {
     _defineProperty(this, "initialTouchY", 0);
     _defineProperty(this, "openAfterFocus", false);
     _defineProperty(this, "scrollToFocusedOptionOnUpdate", false);
-    _defineProperty(this, "lastPressedKey", '');
     // Refs
     // ------------------------------
     _defineProperty(this, "controlRef", null);
@@ -613,9 +611,7 @@ export default class Select extends Component {
         return;
       }
       if (this.props.onBlur) {
-        if (!this.props.hasOtherFocusableElements || this.props.hasOtherFocusableElements && this.lastPressedKey !== 'Tab') {
-          this.props.onBlur(event);
-        }
+        this.props.onBlur(event);
       }
       this.onInputChange('', {
         action: 'input-blur',
@@ -683,9 +679,6 @@ export default class Select extends Component {
           return;
         }
       }
-      if (this.props.hasOtherFocusableElements) {
-        this.lastPressedKey = event.key;
-      }
 
       // Block option hover events when the user has just pressed a key
       this.blockOptionHover = true;
@@ -968,15 +961,11 @@ export default class Select extends Component {
     this.props.onMenuOpen();
   }
   onMenuClose() {
-    if (!this.props.hasOtherFocusableElements || this.props.hasOtherFocusableElements && this.lastPressedKey !== 'Tab') {
-      this.onInputChange('', {
-        action: 'menu-close',
-        prevInputValue: this.props.inputValue
-      });
-      this.props.onMenuClose();
-    } else {
-      this.lastPressedKey = '';
-    }
+    this.onInputChange('', {
+      action: 'menu-close',
+      prevInputValue: this.props.inputValue
+    });
+    this.props.onMenuClose();
   }
   onInputChange(newValue, actionMeta) {
     this.props.onInputChange(newValue, actionMeta);

package/dist/esm/select.js

@@ -43,7 +43,6 @@ export var defaultProps = {
   isMulti: false,
   isRtl: false,
   isSearchable: true,
-  hasOtherFocusableElements: false,
   isOptionDisabled: isOptionDisabledBuiltin,
   loadingMessage: function loadingMessage() {
     return 'Loading...';
@@ -249,7 +248,6 @@ var Select = /*#__PURE__*/function (_Component) {
     _defineProperty(_this, "initialTouchY", 0);
     _defineProperty(_this, "openAfterFocus", false);
     _defineProperty(_this, "scrollToFocusedOptionOnUpdate", false);
-    _defineProperty(_this, "lastPressedKey", '');
     // Refs
     // ------------------------------
     _defineProperty(_this, "controlRef", null);
@@ -631,9 +629,7 @@ var Select = /*#__PURE__*/function (_Component) {
         return;
       }
       if (_this.props.onBlur) {
-        if (!_this.props.hasOtherFocusableElements || _this.props.hasOtherFocusableElements && _this.lastPressedKey !== 'Tab') {
-          _this.props.onBlur(event);
-        }
+        _this.props.onBlur(event);
       }
       _this.onInputChange('', {
         action: 'input-blur',
@@ -699,9 +695,6 @@ var Select = /*#__PURE__*/function (_Component) {
           return;
         }
       }
-      if (_this.props.hasOtherFocusableElements) {
-        _this.lastPressedKey = event.key;
-      }
 
       // Block option hover events when the user has just pressed a key
       _this.blockOptionHover = true;
@@ -927,15 +920,11 @@ var Select = /*#__PURE__*/function (_Component) {
   }, {
     key: "onMenuClose",
     value: function onMenuClose() {
-      if (!this.props.hasOtherFocusableElements || this.props.hasOtherFocusableElements && this.lastPressedKey !== 'Tab') {
-        this.onInputChange('', {
-          action: 'menu-close',
-          prevInputValue: this.props.inputValue
-        });
-        this.props.onMenuClose();
-      } else {
-        this.lastPressedKey = '';
-      }
+      this.onInputChange('', {
+        action: 'menu-close',
+        prevInputValue: this.props.inputValue
+      });
+      this.props.onMenuClose();
     }
   }, {
     key: "onInputChange",

package/dist/types/select.d.ts

@@ -240,10 +240,6 @@ export interface SelectProps<Option, IsMulti extends boolean, Group extends Grou
      * Whether to enable search functionality
      */
     isSearchable: boolean;
-    /**
-     * Indicate whether menu contains other focusable elements, like footer or header
-     */
-    hasOtherFocusableElements?: boolean;
     /**
      * This sets the aria-label attribute. It sets an accessible name for the select, for people who use assistive technology. Use of a visible label is highly recommended for greater accessibility support.
      */
@@ -453,7 +449,6 @@ export declare const defaultProps: {
     isMulti: boolean;
     isRtl: boolean;
     isSearchable: boolean;
-    hasOtherFocusableElements: boolean;
     isOptionDisabled: <Option>(option: Option) => boolean;
     loadingMessage: () => string;
     maxMenuHeight: number;
@@ -533,7 +528,6 @@ export default class Select<Option = unknown, IsMulti extends boolean = false, G
         isMulti: boolean;
         isRtl: boolean;
         isSearchable: boolean;
-        hasOtherFocusableElements: boolean;
         isOptionDisabled: <Option_1>(option: Option_1) => boolean;
         loadingMessage: () => string;
         maxMenuHeight: number;
@@ -566,7 +560,6 @@ export default class Select<Option = unknown, IsMulti extends boolean = false, G
     openAfterFocus: boolean;
     scrollToFocusedOptionOnUpdate: boolean;
     userIsDragging?: boolean;
-    lastPressedKey?: string;
     controlRef: HTMLDivElement | null;
     getControlRef: RefCallback<HTMLDivElement>;
     focusedOptionRef: HTMLDivElement | null;

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

@@ -240,10 +240,6 @@ export interface SelectProps<Option, IsMulti extends boolean, Group extends Grou
      * Whether to enable search functionality
      */
     isSearchable: boolean;
-    /**
-     * Indicate whether menu contains other focusable elements, like footer or header
-     */
-    hasOtherFocusableElements?: boolean;
     /**
      * This sets the aria-label attribute. It sets an accessible name for the select, for people who use assistive technology. Use of a visible label is highly recommended for greater accessibility support.
      */
@@ -453,7 +449,6 @@ export declare const defaultProps: {
     isMulti: boolean;
     isRtl: boolean;
     isSearchable: boolean;
-    hasOtherFocusableElements: boolean;
     isOptionDisabled: <Option>(option: Option) => boolean;
     loadingMessage: () => string;
     maxMenuHeight: number;
@@ -533,7 +528,6 @@ export default class Select<Option = unknown, IsMulti extends boolean = false, G
         isMulti: boolean;
         isRtl: boolean;
         isSearchable: boolean;
-        hasOtherFocusableElements: boolean;
         isOptionDisabled: <Option_1>(option: Option_1) => boolean;
         loadingMessage: () => string;
         maxMenuHeight: number;
@@ -566,7 +560,6 @@ export default class Select<Option = unknown, IsMulti extends boolean = false, G
     openAfterFocus: boolean;
     scrollToFocusedOptionOnUpdate: boolean;
     userIsDragging?: boolean;
-    lastPressedKey?: string;
     controlRef: HTMLDivElement | null;
     getControlRef: RefCallback<HTMLDivElement>;
     focusedOptionRef: HTMLDivElement | null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-select",
-	"version": "3.4.3",
+	"version": "3.4.4",
 	"description": "A forked version of react-select to only be used in atlaskit/select",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",

package/types/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/types.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/types.d.ts"
       ]