terrier-engine 4.22.0 → 4.22.2

package/package.json

@@ -4,7 +4,7 @@
   "files": [
     "*"
   ],
-  "version": "4.22.0",
+  "version": "4.22.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/Terrier-Tech/terrier-engine"

package/terrier/parts/select-field-part.ts

@@ -57,17 +57,23 @@ export class SelectFieldPart<T extends SelectFieldState> extends TerrierPart<T>
     }
 
     populateOptionIfBlank(option: SelectOption) {
-        let newValue = option.value
-        let newTitle = option.title
-
-        if (option.value == '' && option.title === undefined) {
-            newValue = null
-            newTitle = ''
-        } else if (option.value == null && option.title === undefined) {
-            newValue = ''
-            newTitle = ''
+        if (option.title === undefined) {
+            // consider option groups and flatten the options
+            const options = this.state.options.flatMap((option) => {
+                if ('group' in option) {
+                    return option.options
+                } else return option
+            })
+
+            // find the option where title is empty and use that as the blank option value
+            return options.find((opt) => {
+                if ('title' in opt) {
+                    return opt.title == ''
+                } else return false
+            }) || option
+        } else {
+            return option
         }
-        return { title: newTitle, value: newValue }
     }
 
     render(parent: PartTag) {
@@ -171,7 +177,7 @@ export class SelectOptionsDropdown extends Dropdown<SelectFieldDropdownState> {
         let scrollAmount = selectedElement.offsetTop - anchorRect.top
         let scrollTop = anchorRect.y + (anchorRect.height / 2) - (selectOptionSize.height / 2)
 
-        if (dropdown.offsetHeight > win.height - anchorRect.top) { // attempting to fill the whole window height with the dropdownContainer, so we need to adjust scroll of dropdownContainer
+        if (dropdown.offsetHeight > win.height - anchorRect.top || anchorRect.top - dropdown.offsetHeight < 0) { // attempting to fill the whole window height with the dropdownContainer, so we need to adjust scroll of dropdownContainer
             if (scrollAmount < 0) { // space above the dropdown
                 dropdown.style.marginTop = `${-scrollAmount}px`
                 scrollTop = 0