Merge branch 'master' into next

radimvaculik · radimvaculik · commit 976291a41786 · 2024-03-11T09:28:59.000+01:00
diff --git a/assets/css/datagrid.css b/assets/css/datagrid.css
@@ -79,14 +79,18 @@
 	display: inline-block
 }
 
-[data-datagrid-name] .datagrid-toolbar > span {
+[data-datagrid-name] .datagrid-toolbar > div > span {
 	margin-left: 1em
 }
 
-[data-datagrid-name] .datagrid-toolbar > span > a {
+[data-datagrid-name] .datagrid-toolbar > div > span > a {
 	margin-left: 0.5em
 }
 
+[data-datagrid-name] .datagrid-toolbar > div {
+	display: inline-block
+}
+
 .datagrid-toolbar .fa-square, .datagrid-toolbar .fa-check-square {
 	font-weight: normal;
 }
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
 		"nette/di": "^3.0.0",
 		"nette/forms": "^3.1.3",
 		"nette/utils": "^3.0.1 || ^4.0.0",
-		"symfony/property-access": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
+		"symfony/property-access": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
 	},
 	"require-dev": {
 		"contributte/qa": "^0.3.0",
diff --git a/phpstan.neon b/phpstan.neon
@@ -46,6 +46,10 @@ parameters:
 			message: '#string\\|Stringable#'
 			count: 1
 			path: src/Column/Action.php
+		- # In PHP 8+, the Stringable typehint should be used, and this can be removed.
+			message: '#string\\|Stringable#'
+			count: 1
+			path: src/DataGrid.php
 		- # In PHP 8+, the Stringable typehint should be used, and this can be removed.
 			message: '#string\\|Stringable#'
 			count: 3
diff --git a/src/Datagrid.php b/src/Datagrid.php
@@ -284,8 +284,6 @@ public function __construct(?IContainer $parent = null, ?string $name = null)
 			$parent->addComponent($this, $name);
 		}
 
-		$this->monitor(Presenter::class);
-
 		/**
 		 * Try to find previous filters, pagination, perPage and other values in session
 		 */

Original file line number	Diff line number	Diff line change
`@@ -79,14 +79,18 @@`
`79`	`79`	`display: inline-block`
`80`	`80`	`}`
`81`	`81`
`82`		`-[data-datagrid-name] .datagrid-toolbar > span {`
	`82`	`+[data-datagrid-name] .datagrid-toolbar > div > span {`
`83`	`83`	`margin-left: 1em`
`84`	`84`	`}`
`85`	`85`
`86`		`-[data-datagrid-name] .datagrid-toolbar > span > a {`
	`86`	`+[data-datagrid-name] .datagrid-toolbar > div > span > a {`
`87`	`87`	`margin-left: 0.5em`
`88`	`88`	`}`
`89`	`89`
	`90`	`+[data-datagrid-name] .datagrid-toolbar > div {`
	`91`	`+ display: inline-block`
	`92`	`+}`
	`93`	`+`
`90`	`94`	`.datagrid-toolbar .fa-square, .datagrid-toolbar .fa-check-square {`
`91`	`95`	`font-weight: normal;`
`92`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,8 +284,6 @@ public function __construct(?IContainer $parent = null, ?string $name = null)`
`284`	`284`	`$parent->addComponent($this, $name);`
`285`	`285`	`}`
`286`	`286`
`287`		`- $this->monitor(Presenter::class);`
`288`		`-`
`289`	`287`	`/**`
`290`	`288`	`* Try to find previous filters, pagination, perPage and other values in session`
`291`	`289`	`*/`