arui-feather - npm Package Compare versions

Comparing version 9.8.0 to 9.8.1

AUTHORS.md

@@ -35,1 +35,2 @@ ## Maintainers
 * Zar Zakharov ([@Severenit](//github.com/Severenit))
+* Timur Gurbanov ([@hexbooster](//github.com/hexbooster))

CHANGELOG.md

@@ -0,1 +1,11 @@
+<a name="9.8.1"></a>
+## [9.8.1](https://github.com/alfa-laboratory/arui-feather/compare/v9.8.0...v9.8.1) (2017-09-15)
+
+
+### Bug Fixes
+
+* **select:** fix select opened state toggling & styles ([#243](https://github.com/alfa-laboratory/arui-feather/issues/243)) ([f79e441](https://github.com/alfa-laboratory/arui-feather/commit/f79e441))
+
+
+
 <a name="9.8.0"></a>
@@ -2,0 +12,0 @@ # [9.8.0](https://github.com/alfa-laboratory/arui-feather/compare/v9.7.0...v9.8.0) (2017-09-14)

package.json

 {
   "name": "arui-feather",
-  "version": "9.8.0",
+  "version": "9.8.1",
   "description": "Alfa-Bank UI lightweight library",
@@ -5,0 +5,0 @@ "repository": {

select/select.js

@@ -156,5 +156,3 @@ 'use strict';
         return _ret = (_temp = (_this2 = _possibleConstructorReturn(this, (_ref = Select.__proto__ || Object.getPrototypeOf(Select)).call.apply(_ref, [this].concat(args))), _this2), _this2.state = {
-            buttonFocused: false,
             hasGroup: false,
-            nativeFocused: false,
             isMobile: false,
@@ -199,4 +197,6 @@ opened: !!_this2.props.opened,
         value: function componentDidMount() {
-            this.popup.setTarget(this.button.getNode());
-            this.updatePopupStyles();
+            if (this.popup) {
+                this.setPopupTarget();
+                this.updatePopupStyles();
+            }
         }
@@ -206,2 +206,7 @@ }, {
         value: function componentWillReceiveProps(nextProps) {
+            if (this.popup) {
+                this.setPopupTarget();
+                this.updatePopupStyles();
+            }
+
             if (this.state.opened && nextProps.disabled) {
@@ -231,8 +236,8 @@ this.toggleOpened();
                         width: this.props.width,
+                        checked: value.length > 0,
                         disabled: this.props.disabled,
-                        checked: value.length > 0,
-                        focused: this.getFocused(),
                         'has-label': !!this.props.label,
                         'has-value': !!value,
-                        invalid: !!this.props.error
+                        invalid: !!this.props.error,
+                        opened: this.getOpened()
                     }),
@@ -272,3 +277,3 @@ ref: function ref(root) {
                     ),
-                    this.renderPopup(cn, Popup)
+                    (!this.state.isMobile || this.state.isMobile && this.props.mobileMenuMode === 'popup') && this.renderPopup(cn, Popup)
                 )
@@ -288,2 +293,3 @@ );
                 disabled: this.props.disabled,
+                focused: this.getOpened(),
                 text: this.renderButtonContent(),
@@ -506,4 +512,2 @@ rightAddons: [_react2.default.createElement(_icon2.default, {
         value: function handleButtonFocus(event) {
-            this.setState({ buttonFocused: true });
-
             if (this.props.onButtonFocus) {
@@ -516,4 +520,2 @@ this.props.onButtonFocus(this.getRevisedEvent(event));
         value: function handleButtonBlur(event) {
-            this.setState({ buttonFocused: false });
-
             if (this.props.onButtonBlur) {
@@ -539,8 +541,10 @@ this.props.onButtonBlur(this.getRevisedEvent(event));
         value: function handleMenuBlur(event) {
-            this.setState({
-                opened: false
-            });
-
             event.target.value = this.getValue();
 
+            if (event.relatedTarget !== this.button.getNode()) {
+                this.setState({
+                    opened: false
+                });
+            }
+
             if (this.props.onBlur) {
@@ -616,9 +620,2 @@ this.props.onBlur(event);
     }, {
-        key: 'handleNativeClick',
-        value: function handleNativeClick(event) {
-            if (this.props.onClick) {
-                this.props.onClick(event);
-            }
-        }
-    }, {
         key: 'handleClickOutside',
@@ -669,5 +666,5 @@ value: function handleClickOutside() {
         value: function handleNativeFocus(event) {
-            this.setState({
-                nativeFocused: true
-            });
+            if (!this.props.disabled) {
+                this.toggleOpened();
+            }
 
@@ -681,5 +678,5 @@ if (this.props.onFocus) {
         value: function handleNativeBlur(event) {
-            this.setState({
-                nativeFocused: false
-            });
+            if (!this.props.disabled) {
+                this.toggleOpened();
+            }
 
@@ -691,5 +688,14 @@ if (this.props.onBlur) {
     }, {
+        key: 'handleNativeClick',
+        value: function handleNativeClick(event) {
+            if (this.props.onClick) {
+                this.props.onClick(this.getRevisedEvent(event));
+            }
+        }
+    }, {
         key: 'handleMqMatchChange',
         value: function handleMqMatchChange(isMatched) {
-            this.setState({ isMobile: isMatched });
+            this.setState({
+                isMobile: isMatched
+            });
         }
@@ -804,4 +810,6 @@ }, {
 
-            this.setState({ opened: newOpenedState }, function () {
-                if (newOpenedState) {
+            this.setState({
+                opened: newOpenedState
+            }, function () {
+                if (newOpenedState && _this11.menu) {
                     _this11.focusOnMenu();
@@ -824,2 +832,7 @@ }
     }, {
+        key: 'setPopupTarget',
+        value: function setPopupTarget() {
+            this.popup.setTarget(this.button.getNode());
+        }
+    }, {
         key: 'getCheckedItems',
@@ -878,14 +891,2 @@ value: function getCheckedItems(options) {
         }
-
-        /**
-         * Возвращает `true`, если компонент находится в состоянии фокуса.
-         *
-         * @returns {Boolean}
-         */
-
-    }, {
-        key: 'getFocused',
-        value: function getFocused() {
-            return this.getOpened() || this.state.buttonFocused || this.state.nativeFocused;
-        }
     }]);
@@ -987,4 +988,4 @@
     positioningContainerElement: _propTypes3.HtmlElement
-}, _temp2), (_applyDecoratedDescriptor(_class3.prototype, 'handleButtonClick', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleButtonClick'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleButtonKeyDown', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleButtonKeyDown'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleButtonFocus', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleButtonFocus'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleButtonBlur', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleButtonBlur'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleMenuFocus', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleMenuFocus'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleMenuBlur', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleMenuBlur'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleOptionCheck', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleOptionCheck'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleNativeOptionCheck', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleNativeOptionCheck'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleNativeClick', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleNativeClick'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleClickOutside', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleClickOutside'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleMenuKeyDown', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleMenuKeyDown'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleNativeFocus', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleNativeFocus'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleNativeBlur', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleNativeBlur'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleMqMatchChange', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleMqMatchChange'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handlePopupCloseClick', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handlePopupCloseClick'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'updatePopupStyles', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'updatePopupStyles'), _class3.prototype)), _class3)) || _class2) || _class2);
+}, _temp2), (_applyDecoratedDescriptor(_class3.prototype, 'handleButtonClick', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleButtonClick'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleButtonKeyDown', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleButtonKeyDown'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleButtonFocus', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleButtonFocus'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleButtonBlur', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleButtonBlur'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleMenuFocus', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleMenuFocus'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleMenuBlur', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleMenuBlur'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleOptionCheck', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleOptionCheck'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleNativeOptionCheck', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleNativeOptionCheck'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleClickOutside', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleClickOutside'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleMenuKeyDown', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleMenuKeyDown'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleNativeFocus', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleNativeFocus'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleNativeBlur', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleNativeBlur'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleNativeClick', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleNativeClick'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handleMqMatchChange', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handleMqMatchChange'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'handlePopupCloseClick', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'handlePopupCloseClick'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'updatePopupStyles', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'updatePopupStyles'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setPopupTarget', [_coreDecorators.autobind], Object.getOwnPropertyDescriptor(_class3.prototype, 'setPopupTarget'), _class3.prototype)), _class3)) || _class2) || _class2);
 exports.default = Select;
 //# sourceMappingURL=select.js.map

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

3318029

increased by0.01%

Lines of code

33842

increased by0.03%

No dependency changes