38279 Third party libraries and scripts

plugin.php

@@ -65,6 +65,7 @@
 use onOffice\WPlugin\Utility\__String;
 use onOffice\WPlugin\Utility\Redirector;
 use onOffice\WPlugin\WP\WPQueryWrapper;
+use onOffice\WPlugin\ScriptLoader\IncludeFileModel;
 
 define('ONOFFICE_DI_CONFIG_PATH', implode(DIRECTORY_SEPARATOR, [ONOFFICE_PLUGIN_DIR, 'config', 'di-config.php']));
 
@@ -399,4 +400,16 @@ function update_status_close_action_button_option()
 	};
 }, 500);
 
+add_filter('script_loader_tag', 'filter_script_loader_tag', 10, 2);
+function filter_script_loader_tag($tag, $handle) {
+	$attributes = [IncludeFileModel::LOAD_DEFER, IncludeFileModel::LOAD_ASYNC];
+	foreach ($attributes as $attr) {
+		if (!wp_scripts()->get_data($handle, $attr)) continue;
+		if (!preg_match(":\s$attr(=|>|\s):", $tag))
+			$tag = preg_replace(':(?=></script>):', " $attr", $tag, 1);
+		break;
+	}
+	return $tag;
+}
+
 return $pDI;

plugin/ScriptLoader/IncludeFileModel.php

@@ -33,6 +33,10 @@ class IncludeFileModel
 
 	const TYPE_STYLE = 'style';
 
+	const LOAD_DEFER = 'defer';
+
+	const LOAD_ASYNC = 'async';
+
 	/** @var string */
 	private $_identifier = '';
 
@@ -48,6 +52,9 @@ class IncludeFileModel
 	/** @var string */
 	private $_type = '';
 
+    /** @var string */
+	private $_loadAsynchronous = '';
+
 
 	/**
 	 *
@@ -150,4 +157,22 @@ public function setLoadInFooter(bool $loadInFooter): self
 		$this->_loadInFooter = $loadInFooter;
 		return $this;
 	}
+
+	/**
+	 * @return string
+	 */
+	public function getLoadAsynchronous(): string
+	{
+		return $this->_loadAsynchronous;
+	}
+
+	/**
+	 * @param string $loadAsynchronous
+	 * @return $this
+	 */
+	public function setLoadAsynchronous(string $loadAsynchronous): self
+	{
+		$this->_loadAsynchronous = $loadAsynchronous;
+		return $this;
+	}
 }

plugin/ScriptLoader/ScriptLoaderGeneric.php

@@ -61,6 +61,7 @@ public function enqueue()
 		/* @var $pIncludeModel IncludeFileModel */
 		foreach ($this->getModelByType(IncludeFileModel::TYPE_SCRIPT) as $pIncludeModel) {
 			wp_enqueue_script($pIncludeModel->getIdentifier());
+			wp_script_add_data($pIncludeModel->getIdentifier(), $pIncludeModel->getLoadAsynchronous(), true);
 		}
 		foreach ($this->getModelByType(IncludeFileModel::TYPE_STYLE) as $pIncludeModel) {
 			wp_enqueue_style($pIncludeModel->getIdentifier());

plugin/ScriptLoader/ScriptLoaderGenericConfigurationDefault.php

@@ -46,10 +46,12 @@ public function getScriptLoaderGenericConfiguration(): array
 		$pluginPath = ONOFFICE_PLUGIN_DIR.'/index.php';
 		$script = IncludeFileModel::TYPE_SCRIPT;
 		$style = IncludeFileModel::TYPE_STYLE;
+		$defer = IncludeFileModel::LOAD_DEFER;
 
 		$values = [
 			(new IncludeFileModel($script, 'select2', plugins_url('/vendor/select2/select2/dist/js/select2.min.js', $pluginPath)))
-				->setLoadInFooter(true),
+				->setLoadInFooter(true)
+				->setLoadAsynchronous($defer),
 			(new IncludeFileModel($script, 'onoffice-custom-select', plugins_url('/js/onoffice-custom-select.js', $pluginPath)))
 				->setLoadInFooter(true),
 			(new IncludeFileModel($script, 'onoffice-multiselect', plugins_url('/js/onoffice-multiselect.js', $pluginPath)))

tests/TestClassIncludeFileModel.php

@@ -63,5 +63,7 @@ public function testSetter(IncludeFileModel $pIncludeFileModel)
 		$this->assertEquals(['test1', 'test2'], $pIncludeFileModel->getDependencies());
 		$this->assertSame($pIncludeFileModel, $pIncludeFileModel->setLoadInFooter(true));
 		$this->assertTrue($pIncludeFileModel->getLoadInFooter());
+		$this->assertSame($pIncludeFileModel, $pIncludeFileModel->setLoadAsynchronous('defer'));
+		$this->assertEquals('defer', $pIncludeFileModel->getLoadAsynchronous());
 	}
 }

tests/TestClassScriptLoaderGeneric.php

@@ -55,6 +55,7 @@ public function prepare()
 				$pModel1 = new IncludeFileModel(IncludeFileModel::TYPE_SCRIPT, 'script1', '/test/file.js');
 				$pModel1->setDependencies(['testdep']);
 				$pModel1->setLoadInFooter(true);
+				$pModel1->setLoadAsynchronous('defer');
 				$pModel2 = new IncludeFileModel(IncludeFileModel::TYPE_STYLE, 'style2', '/test/file.css');
 				return [$pModel1, $pModel2];
 		}));
@@ -91,5 +92,6 @@ public function testEnqueue()
 		$this->_pSubject->enqueue();
 		$this->assertEquals(['style2'], wp_styles()->queue);
 		$this->assertEquals(['script1'], wp_scripts()->queue);
+		$this->assertTrue(wp_scripts()->get_data('script1', 'defer'));
 	}
 }