fix of #757

pnp · Dec 13, 2020 · 0eb9159 · 0eb9159
1 parent 1c73e63
commit 0eb9159
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/controls/dateTimePicker/HoursComponent.tsx b/src/controls/dateTimePicker/HoursComponent.tsx
@@ -32,9 +32,10 @@ export default class HoursComponent extends React.Component<IHoursComponentProps
     if (renderDropdown) {
       return (
         <Dropdown
-          disabled={this.props.disabled}
+          disabled={disabled}
           label=''
           options={this._hours}
+          selectedKey={value}
           onChanged={option => {
             onChange(option.text);
           }}
@@ -121,12 +122,12 @@ export default class HoursComponent extends React.Component<IHoursComponentProps
         }
       }
 
-      let selected: boolean = false;
+      /*let selected: boolean = false;
       if (i === value) {
         selected = true;
-      }
+      }*/
 
-      hours.push({ key: i, text: digit, isSelected: selected });
+      hours.push({ key: i, text: digit });
     }
 
     this._hours = hours;

diff --git a/src/controls/dateTimePicker/SecondsComponent.tsx b/src/controls/dateTimePicker/SecondsComponent.tsx
@@ -32,9 +32,10 @@ export default class SecondsComponent extends React.Component<ITimeComponentProp
     if (renderDropdown) {
       return (
         <Dropdown
-          disabled={this.props.disabled}
+          disabled={disabled}
           label=''
           options={this._seconds}
+          selectedKey={value}
           onChanged={option => {
             onChange(option.text);
           }} />
@@ -76,11 +77,11 @@ export default class SecondsComponent extends React.Component<ITimeComponentProp
       } else {
         digitSec = k.toString();
       }
-      let selected: boolean = false;
+      /*let selected: boolean = false;
       if (k === this.props.value) {
         selected = true;
-      }
-      seconds.push({ key: k, text: digitSec, isSelected: selected });
+      }*/
+      seconds.push({ key: k, text: digitSec });
     }
 
     this._seconds = seconds;

diff --git a/src/webparts/controlsTest/components/ControlsTest.tsx b/src/webparts/controlsTest/components/ControlsTest.tsx
@@ -998,6 +998,8 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
         <PrimaryButton text={'Change Date'} onClick={() => {
           const date = this.state.dateTimeValue || new Date();
           date.setMinutes(50);
+          date.setHours(11);
+          date.setSeconds(12);
           this.setState({
             dateTimeValue: date
           });