baseui 10.7.2 → 10.7.3

package/es/popover/popover.js

@@ -447,14 +447,16 @@ class PopoverInner extends React.Component {
           },
           onPopperUpdate: this.onPopperUpdate,
           placement: this.state.placement
-        }, /*#__PURE__*/React.createElement(FocusLock, {
+        }, this.props.focusLock ? /*#__PURE__*/React.createElement(FocusLock, {
           disabled: !this.props.focusLock,
           noFocusGuards: false // see popover-focus-loop.scenario.js for why hover cannot return focus
           ,
           returnFocus: !this.isHoverTrigger() && this.props.returnFocus,
           autoFocus: this.state.autoFocusAfterPositioning,
           focusOptions: this.props.focusOptions
-        }, !this.props.focusLock && this.state.autoFocusAfterPositioning ? /*#__PURE__*/React.createElement(MoveFocusInside, null, this.renderPopover(renderedContent)) : this.renderPopover(renderedContent)))));
+        }, this.renderPopover(renderedContent)) : /*#__PURE__*/React.createElement(MoveFocusInside, {
+          disabled: !this.props.autoFocus && !this.state.autoFocusAfterPositioning
+        }, this.renderPopover(renderedContent)))));
       } else {
         rendered.push( /*#__PURE__*/React.createElement(Hidden, {
           key: "hidden-layer"

package/esm/popover/popover.js

@@ -510,14 +510,16 @@ var PopoverInner = /*#__PURE__*/function (_React$Component) {
             popperOptions: _objectSpread(_objectSpread({}, defaultPopperOptions), this.props.popperOptions),
             onPopperUpdate: this.onPopperUpdate,
             placement: this.state.placement
-          }, /*#__PURE__*/React.createElement(FocusLock, {
+          }, this.props.focusLock ? /*#__PURE__*/React.createElement(FocusLock, {
             disabled: !this.props.focusLock,
             noFocusGuards: false // see popover-focus-loop.scenario.js for why hover cannot return focus
             ,
             returnFocus: !this.isHoverTrigger() && this.props.returnFocus,
             autoFocus: this.state.autoFocusAfterPositioning,
             focusOptions: this.props.focusOptions
-          }, !this.props.focusLock && this.state.autoFocusAfterPositioning ? /*#__PURE__*/React.createElement(MoveFocusInside, null, this.renderPopover(renderedContent)) : this.renderPopover(renderedContent)))));
+          }, this.renderPopover(renderedContent)) : /*#__PURE__*/React.createElement(MoveFocusInside, {
+            disabled: !this.props.autoFocus && !this.state.autoFocusAfterPositioning
+          }, this.renderPopover(renderedContent)))));
         } else {
           rendered.push( /*#__PURE__*/React.createElement(Hidden, {
             key: "hidden-layer"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baseui",
-  "version": "10.7.2",
+  "version": "10.7.3",
   "description": "A React Component library implementing the Base design language",
   "keywords": [
     "react",

package/popover/popover.js

@@ -525,14 +525,16 @@ var PopoverInner = /*#__PURE__*/function (_React$Component) {
             popperOptions: _objectSpread(_objectSpread({}, defaultPopperOptions), this.props.popperOptions),
             onPopperUpdate: this.onPopperUpdate,
             placement: this.state.placement
-          }, /*#__PURE__*/React.createElement(_reactFocusLock.default, {
+          }, this.props.focusLock ? /*#__PURE__*/React.createElement(_reactFocusLock.default, {
             disabled: !this.props.focusLock,
             noFocusGuards: false // see popover-focus-loop.scenario.js for why hover cannot return focus
             ,
             returnFocus: !this.isHoverTrigger() && this.props.returnFocus,
             autoFocus: this.state.autoFocusAfterPositioning,
             focusOptions: this.props.focusOptions
-          }, !this.props.focusLock && this.state.autoFocusAfterPositioning ? /*#__PURE__*/React.createElement(_reactFocusLock.MoveFocusInside, null, this.renderPopover(renderedContent)) : this.renderPopover(renderedContent)))));
+          }, this.renderPopover(renderedContent)) : /*#__PURE__*/React.createElement(_reactFocusLock.MoveFocusInside, {
+            disabled: !this.props.autoFocus && !this.state.autoFocusAfterPositioning
+          }, this.renderPopover(renderedContent)))));
         } else {
           rendered.push( /*#__PURE__*/React.createElement(_styledComponents.Hidden, {
             key: "hidden-layer"

package/popover/popover.js.flow

@@ -470,23 +470,27 @@ class PopoverInner extends React.Component<
               onPopperUpdate={this.onPopperUpdate}
               placement={this.state.placement}
             >
-              <FocusLock
-                disabled={!this.props.focusLock}
-                noFocusGuards={false}
-                // see popover-focus-loop.scenario.js for why hover cannot return focus
-                returnFocus={!this.isHoverTrigger() && this.props.returnFocus}
-                autoFocus={this.state.autoFocusAfterPositioning}
-                focusOptions={this.props.focusOptions}
-              >
-                {!this.props.focusLock &&
-                this.state.autoFocusAfterPositioning ? (
-                  <MoveFocusInside>
-                    {this.renderPopover(renderedContent)}
-                  </MoveFocusInside>
-                ) : (
-                  this.renderPopover(renderedContent)
-                )}
-              </FocusLock>
+              {this.props.focusLock ? (
+                <FocusLock
+                  disabled={!this.props.focusLock}
+                  noFocusGuards={false}
+                  // see popover-focus-loop.scenario.js for why hover cannot return focus
+                  returnFocus={!this.isHoverTrigger() && this.props.returnFocus}
+                  autoFocus={this.state.autoFocusAfterPositioning}
+                  focusOptions={this.props.focusOptions}
+                >
+                  {this.renderPopover(renderedContent)}
+                </FocusLock>
+              ) : (
+                <MoveFocusInside
+                  disabled={
+                    !this.props.autoFocus &&
+                    !this.state.autoFocusAfterPositioning
+                  }
+                >
+                  {this.renderPopover(renderedContent)}
+                </MoveFocusInside>
+              )}
             </TetherBehavior>
           </Layer>,
         );