Web: Components: Combobox: added displaySelectedOption prop

packages/asc-web-components/calendar/index.js

@@ -511,6 +511,7 @@ class Calendar extends Component {
                 options={optionsMonth}
                 isDisabled={false}
                 name="month-button"
+                displaySelectedOption
               />
             </ComboBoxMonthStyle>
             <ComboBoxDateStyle>
@@ -525,6 +526,7 @@ class Calendar extends Component {
                 isDisabled={false}
                 showDisabledItems
                 name="year-button"
+                displaySelectedOption
               />
             </ComboBoxDateStyle>
           </ComboBoxStyle>

packages/asc-web-components/combobox/index.js

@@ -94,6 +94,7 @@ class ComboBox extends React.Component {
       manualX,
       isDefaultMode,
       manualWidth,
+      displaySelectedOption,
     } = this.props;
     const { isOpen, selectedOption } = this.state;
 
@@ -161,17 +162,22 @@ class ComboBox extends React.Component {
           >
             {advancedOptions
               ? advancedOptions
-              : options.map((option) => (
+              : options.map((option) => {
-                  <DropDownItem
+                  const disabled =
-                    {...option}
+                    option.disabled ||
-                    textOverflow={textOverflow}
+                    (!displaySelectedOption &&
-                    key={option.key}
+                      option.label === selectedOption.label);
-                    disabled={
+
-                      option.disabled || option.label === selectedOption.label
+                  return (
-                    }
+                    <DropDownItem
-                    onClick={this.optionClick.bind(this, option)}
+                      {...option}
-                  />
+                      textOverflow={textOverflow}
-                ))}
+                      key={option.key}
+                      disabled={disabled}
+                      onClick={this.optionClick.bind(this, option)}
+                    />
+                  );
+                })}
           </DropDown>
         )}
       </StyledComboBox>
@@ -233,6 +239,7 @@ ComboBox.propTypes = {
   manualX: PropTypes.string,
   //** Dropdown manual width */
   manualWidth: PropTypes.string,
+  displaySelectedOption: PropTypes.bool,
 };
 
 ComboBox.defaultProps = {
@@ -247,6 +254,7 @@ ComboBox.defaultProps = {
   manualY: "102%",
   isDefaultMode: true,
   manualWidth: "200px",
+  displaySelectedOption: false,
 };
 
 export default ComboBox;