diff --git a/packages/components/combobox/index.js b/packages/components/combobox/index.js index 333957ea7d..1050d175fb 100644 --- a/packages/components/combobox/index.js +++ b/packages/components/combobox/index.js @@ -140,7 +140,18 @@ class ComboBox extends React.Component { let optionsCount = optionsLength; if (withAdvancedOptions) { - optionsCount = advancedOptionsCount ? advancedOptionsCount : 6; + const advancedOptionsWithoutSeparator = advancedOptions.props.children.filter( + (option) => option.key !== "s1" + ); + + const advancedOptionsWithoutSeparatorLength = + advancedOptionsWithoutSeparator.length; + + optionsCount = advancedOptionsCount + ? advancedOptionsCount + : advancedOptionsWithoutSeparatorLength + ? advancedOptionsWithoutSeparatorLength + : 6; } const disableMobileView = optionsCount < 5;