Merge branch '2.3' into 2

silverstripe · Nov 19, 2024 · 8c1861c · 8c1861c
2 parents 0517656 + 1229d0f
commit 8c1861c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/TreeDropdownField/TreeDropdownField.js b/client/src/components/TreeDropdownField/TreeDropdownField.js
@@ -774,6 +774,7 @@ class TreeDropdownField extends Component {
           classNames={{
             option: () => 'fill-width',
           }}
+          isOptionDisabled={(option) => option.disabled}
         />
       </EmotionCssCacheProvider>
     );