Merge remote-tracking branch 'origin/8.2' into 8.3

neos · Jan 19, 2024 · 5b5e113 · 5b5e113
2 parents 2204bb1 + c1133f7
commit 5b5e113
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/Classes/Domain/Model/Changes/Property.php b/Classes/Domain/Model/Changes/Property.php
@@ -184,6 +184,8 @@ public function canApply()
                 if (!\is_array($validatorConfiguration)) {
                     $validatorConfiguration = [];
                 }
+                // Fixes "Unsupported validation option(s) found: validationErrorMessage" by omitting this option https://github.com/neos/neos-ui/issues/3691
+                unset($validatorConfiguration['validationErrorMessage']);
                 if ($this->nodePropertyValidationService->validate($this->value, $validatorName, $validatorConfiguration) === false) {
                     return false;
                 }

diff --git a/packages/react-ui-components/src/Tree/node.module.css b/packages/react-ui-components/src/Tree/node.module.css
@@ -3,6 +3,10 @@
     margin: 0;
     position: relative;
     line-height: 20px;
+
+    &:hover {
+        background: var(--colors-PrimaryBlueHover)25;
+    }
 }
 .header__chevron {
     composes: reset from '../reset.module.css';
@@ -18,8 +22,8 @@
 
     cursor: pointer;
 
-    &:hover {
-        color: var(--colors-PrimaryBlue);
+    &:hover > svg {
+        color: var(--colors-PrimaryBlueHover);
     }
 }
 .header__chevron--isCollapsed > svg {
@@ -43,6 +47,11 @@
     display: inline-block;
     position: absolute;
     text-align: center;
+
+    .header:hover & > svg,
+    .header__data--isActive & > svg {
+        color: var(--colors-PrimaryBlueHover);
+    }
 }
 
 .header__data {
@@ -74,6 +83,9 @@
 
 .header__data--isFocused {
     background: var(--colors-ContrastNeutral);
+    &:hover {
+        background: var(--colors-PrimaryBlue)10;
+    }
 
     &.header__data--isHiddenInIndex,
     &.header__data--isHidden {
@@ -100,9 +112,14 @@
     composes: reset from '../reset.module.css';
     margin-left: 2em;
 
+    .header:hover &,
     .header__data--isActive & {
         color: var(--colors-PrimaryBlue);
     }
+
+    &:hover {
+        color: var(--colors-PrimaryBlueHover);
+    }
 }
 
 .contents {