returnFocusOnDeactivate does not work when using active prop

Ive noticed that when you are using the active prop, there is code which ignores the returnFocusOnDeactivate option. Is this intentional?

I would of thought that the componentDidUpdate function should be this:

componentDidUpdate(prevProps) {
    if (prevProps.active && !this.props.active) {
      const { focusTrapOptions } = this.props;
      const returnFocus = focusTrapOptions.returnFocusOnDeactivate || false;
      this.focusTrap.deactivate({ returnFocus });
    } else if (!prevProps.active && this.props.active) {
      this.focusTrap.activate();
    }

    if (prevProps.paused && !this.props.paused) {
      this.focusTrap.unpause();
    } else if (!prevProps.paused && this.props.paused) {
      this.focusTrap.pause();
    }
  }

that way - when the focus trap is made inactive, then we still get the returnFocus behaviour.

Im happy to P.R this if I am correct in understanding the intended behaviour.

Cheers.

[davidtheclark]

Published as 4.0.1.

[walt-er]

I’m still seeing an issue on 6.0.0 where returnFocusOnDeactivate doesn’t seem to be respected. I’m also using the active prop. I can’t tell where the failure is, though.