Fixed saveAndClose button.

Author: rvock

Classes/Backend/GetButtonsHook.php

@@ -5,10 +5,12 @@
 
 use TYPO3\CMS\Backend\Template\Components\Buttons\InputButton;
 use TYPO3\CMS\Backend\Template\Components\ModifyButtonBarEvent;
+use TYPO3\CMS\Core\Imaging\Icon;
 use TYPO3\CMS\Core\Imaging\IconFactory;
-use TYPO3\CMS\Core\Imaging\IconSize;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\CMS\Core\Localization\LanguageServiceFactory;
+use TYPO3\CMS\Core\Page\JavaScriptModuleInstruction;
+use TYPO3\CMS\Core\Page\PageRenderer;
 
 /**
  * TYPO3 7 moved all save-actions into a drop-down. Only the default save action can be reached with one click.
@@ -18,12 +20,13 @@
 class GetButtonsHook {
 
 	private IconFactory $iconFactory;
-
 	private LanguageService $languageService;
+	private PageRenderer $pageRenderer;
 
-	public function __construct(IconFactory $iconFactory, LanguageServiceFactory $languageServiceFactory) {
+	public function __construct(IconFactory $iconFactory, LanguageServiceFactory $languageServiceFactory, PageRenderer $pageRenderer) {
 		$this->iconFactory = $iconFactory;
 		$this->languageService = $languageServiceFactory->createFromUserPreferences($GLOBALS['BE_USER'] ?? null);
+		$this->pageRenderer = $pageRenderer;
 	}
 
 	public function __invoke(ModifyButtonBarEvent $event): void {
@@ -33,14 +36,16 @@ public function __invoke(ModifyButtonBarEvent $event): void {
 			return;
 		}
 
+		$this->pageRenderer->getJavaScriptRenderer()->addJavaScriptModuleInstruction(JavaScriptModuleInstruction::create('@vierwd/vierwd_base/SaveAndClose.js'));
+
 		// find the save button and replace it
 		foreach ($buttonBars['left'] as &$buttonGroup) {
 			foreach ($buttonGroup as $button) {
 				if ($button instanceof InputButton && $button->getName() === '_savedok') {
 					$saveAndClose = new InputButton();
 
 					$saveAndClose->setForm($button->getForm());
-					$saveAndClose->setIcon($this->iconFactory->getIcon('actions-document-save-close', IconSize::SMALL));
+					$saveAndClose->setIcon($this->iconFactory->getIcon('actions-document-save-close', Icon::SIZE_SMALL));
 					$saveAndClose->setName('_saveandclosedok');
 					$saveAndClose->setTitle($this->languageService->sL(
 						'LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:rm.saveCloseDoc'

Resources/Public/JavaScript/SaveAndClose.js

@@ -0,0 +1,12 @@
+/* global TYPO3: false */
+
+const saveAndCloseButton = document.querySelector('[name="_saveandclosedok"]');
+if (saveAndCloseButton) {
+	saveAndCloseButton.addEventListener('click', event => {
+		event.preventDefault();
+		event.stopPropagation();
+		event.stopImmediatePropagation();
+
+		TYPO3.FormEngine.saveAndCloseDocument();
+	});
+}