diff --git a/src/components/volume/_volume.scss b/src/components/volume/_volume.scss index b78a37d27..aa0eb7c72 100644 --- a/src/components/volume/_volume.scss +++ b/src/components/volume/_volume.scss @@ -6,6 +6,7 @@ &.hover { .volume-control-bar { display: block !important; + opacity: 1; } } @@ -28,6 +29,7 @@ &.dragging-active { .volume-control-bar { display: block; + opacity: 1; } } @@ -70,7 +72,7 @@ box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.3); background-color: #333333; padding: 6px; - display: none; + opacity: 0; &:before { position: absolute; diff --git a/src/components/volume/volume.tsx b/src/components/volume/volume.tsx index c701c0ebd..bdc36eb5f 100644 --- a/src/components/volume/volume.tsx +++ b/src/components/volume/volume.tsx @@ -209,7 +209,7 @@ class Volume extends Component { * @returns {void} * @memberof Volume */ - handleKeydown(event: KeyboardEvent): void { + handleKeydown(event: KeyboardEvent, preventMute = false): void { const {player} = this.props; /** * Change volume operations. @@ -246,7 +246,9 @@ class Volume extends Component { break; case KeyMap.ENTER: case KeyMap.SPACE: - this.toggleMute(); + if (!preventMute) { + this.toggleMute(); + } break; default: break; @@ -419,7 +421,7 @@ class Volume extends Component { default: event.preventDefault(); event.stopPropagation(); - this.handleKeydown(event); + this.handleKeydown(event, true); break; } }; @@ -447,8 +449,7 @@ class Volume extends Component { ref={c => (c ? (this._volumeControlElement = c) : undefined)} className={controlButtonClasses} onMouseOver={this.onMouseOver} - onMouseOut={this.onMouseOut} - > + onMouseOut={this.onMouseOut}>