One option is to refactor to use the "new" export modal UIXP: https://www.xwiki.org/xwiki/bin/view/Documentation/DevGuide/ExtensionPoint/Export%20Formats/

However, this means there's a bug/regression in XWiki that would still need to be fixed