Skip to content

Commit

Permalink
feat(progressbar): expose k-progressbar-value class
Browse files Browse the repository at this point in the history
BREAKING CHANGE: The following changes are introduced:

* added `k-progressbar-value` class

* renamed css variable name from `--kendo-progressbar-progress` to `--kendo-progressbar-value`
  • Loading branch information
epetrow authored and joneff committed Dec 12, 2022
1 parent 48bb6c0 commit 52e7882
Show file tree
Hide file tree
Showing 12 changed files with 97 additions and 67 deletions.
18 changes: 10 additions & 8 deletions packages/bootstrap/scss/progressbar/_variables.scss
Expand Up @@ -12,15 +12,17 @@ $progressbar-text: k-contrast-color( $gray-200 ) !default;
$progressbar-border: null !default;
$progressbar-gradient: null !default;

$progressbar-fill-bg: $selected-bg !default;
$progressbar-fill-text: $selected-text !default;
$progressbar-fill-border: null !default;
$progressbar-fill-gradient: null !default;
/// Progress background color of the progressbar.
/// @group progressbar
$kendo-progressbar-value-bg: $selected-bg !default;

$progressbar-indeterminate-bg: $progressbar-bg !default;
$progressbar-indeterminate-text: $progressbar-text !default;
$progressbar-indeterminate-border: $progressbar-border !default;
$progressbar-indeterminate-gradient: null !default;
$kendo-progressbar-value-text: $selected-text !default;
/// Progress text color of the progressbar.
/// @group progressbar
$kendo-progressbar-value-border: null !default;
/// Progress background gradient of the progressbar.
/// @group progressbar
$kendo-progressbar-value-gradient: null !default;

$progressbar-chunk-border: $body-bg !default;

Expand Down
16 changes: 12 additions & 4 deletions packages/classic/scss/progressbar/_variables.scss
Expand Up @@ -12,10 +12,18 @@ $progressbar-text: $component-text !default;
$progressbar-border: $component-border !default;
$progressbar-gradient: null !default;

$progressbar-fill-bg: $primary !default;
$progressbar-fill-text: contrast-wcag( $progressbar-fill-bg ) !default;
$progressbar-fill-border: k-try-shade( $progressbar-fill-bg ) !default;
$progressbar-fill-gradient: null !default;
/// Progress background color of the progressbar.
/// @group progressbar
$kendo-progressbar-value-bg: $primary !default;
/// Progress text color of the progressbar.
/// @group progressbar
$kendo-progressbar-value-text: contrast-wcag( $kendo-progressbar-value-bg ) !default;
/// Progress border color of the progressbar.
/// @group progressbar
$kendo-progressbar-value-border: k-try-shade( $kendo-progressbar-value-bg ) !default;
/// Progress background gradient of the progressbar.
/// @group progressbar
$kendo-progressbar-value-gradient: null !default;

$progressbar-indeterminate-bg: $progressbar-bg !default;
$progressbar-indeterminate-text: $progressbar-text !default;
Expand Down
36 changes: 18 additions & 18 deletions packages/default/scss/progressbar/_layout.scss
Expand Up @@ -3,8 +3,8 @@
// Base
.k-progressbar {
@include border-radius( $kendo-border-radius );
--kendo-progressbar-progress: 0;
border-width: $progressbar-border-width;
--kendo-progressbar-value: 0;
border-width: $kendo-progressbar-border-width;
border-style: solid;
box-sizing: border-box;
outline: 0;
Expand All @@ -26,7 +26,7 @@


// Selection
> .k-selected {
> .k-progressbar-value {
border-width: 0;
border-style: solid;
display: flex;
Expand Down Expand Up @@ -93,12 +93,12 @@
flex-direction: row;
}

> .k-selected {
width: calc( var( --kendo-progressbar-progress, 0 ) * 1% ); // sass-lint:disable-line no-duplicate-properties
> .k-progressbar-value {
width: calc( var( --kendo-progressbar-value, 0 ) * 1% ); // sass-lint:disable-line no-duplicate-properties
flex-direction: row;

> .k-progress-status-wrap {
width: calc( 100% * ( 100 / var( --kendo-progressbar-progress, 1 ) ) );
width: calc( 100% * ( 100 / var( --kendo-progressbar-value, 1 ) ) );
}
}

Expand All @@ -111,7 +111,7 @@
// Horizontal reverse
&.k-progressbar-reverse {

> .k-selected {
> .k-progressbar-value {
flex-direction: row-reverse;
justify-self: flex-end;
}
Expand All @@ -138,14 +138,14 @@
writing-mode: vertical-lr;
}

> .k-selected {
height: calc( var( --kendo-progressbar-progress, 0 ) * 1% ); // sass-lint:disable-line no-duplicate-properties
> .k-progressbar-value {
height: calc( var( --kendo-progressbar-value, 0 ) * 1% ); // sass-lint:disable-line no-duplicate-properties
flex-direction: column-reverse;
align-self: flex-end;
align-items: flex-end;

> .k-progress-status-wrap {
height: calc( 100% * ( 100 / var( --kendo-progressbar-progress, 1 ) ) ); // sass-lint:disable-line no-duplicate-properties
height: calc( 100% * ( 100 / var( --kendo-progressbar-value, 1 ) ) ); // sass-lint:disable-line no-duplicate-properties
}
}

Expand All @@ -159,7 +159,7 @@
&.k-progressbar-reverse {
flex-direction: column;

> .k-selected {
> .k-progressbar-value {
flex-direction: column;
align-self: flex-start;
}
Expand All @@ -174,7 +174,7 @@
// Indeterminate
.k-progressbar-indeterminate {
.k-progress-status-wrap,
.k-selected,
.k-progressbar-value,
.k-progressbar-chunk {
display: none;
}
Expand All @@ -184,8 +184,8 @@
// Blazor specific
.telerik-blazor.k-progressbar-horizontal {

> .k-selected,
> .k-selected > .k-progress-status-wrap {
> .k-progressbar-value,
> .k-progressbar-value > .k-progress-status-wrap {
transition: width .1s ease-in-out;
}
}
Expand Down Expand Up @@ -213,7 +213,7 @@
display: -ms-inline-grid;

> .k-progress-status-wrap,
> .k-selected {
> .k-progressbar-value {
-ms-grid-column: 1;
-ms-grid-row: 1;
}
Expand All @@ -222,19 +222,19 @@
-ms-grid-columns: 1fr;
-ms-grid-rows: $progressbar-height;

&.k-progressbar-reverse > .k-selected {
&.k-progressbar-reverse > .k-progressbar-value {
-ms-grid-column-align: end;
}
}
.k-progressbar-vertical {
-ms-grid-columns: $progressbar-height;
-ms-grid-rows: 1fr;

> .k-selected {
> .k-progressbar-value {
-ms-grid-row-align: end;
}

&.k-progressbar-reverse > .k-selected {
&.k-progressbar-reverse > .k-progressbar-value {
-ms-grid-row-align: start;
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/default/scss/progressbar/_theme.scss
Expand Up @@ -9,7 +9,7 @@
@include fill( $progressbar-text, $progressbar-bg, $progressbar-border, $progressbar-gradient );

.k-selected {
@include fill( $progressbar-fill-text, $progressbar-fill-bg, $progressbar-fill-border, $progressbar-fill-gradient );
@include fill( $kendo-progressbar-value-text, $kendo-progressbar-value-bg, $kendo-progressbar-value-border, $kendo-progressbar-value-gradient );
}
}

Expand All @@ -23,7 +23,7 @@
background-color: $progressbar-bg;

.k-selected {
background-color: $progressbar-fill-bg;
background-color: $kendo-progressbar-value-bg;
}
}

Expand Down
16 changes: 12 additions & 4 deletions packages/default/scss/progressbar/_variables.scss
Expand Up @@ -12,10 +12,18 @@ $progressbar-text: $component-text !default;
$progressbar-border: $component-border !default;
$progressbar-gradient: null !default;

$progressbar-fill-bg: $primary !default;
$progressbar-fill-text: contrast-wcag( $progressbar-fill-bg ) !default;
$progressbar-fill-border: try-shade( $progressbar-fill-bg ) !default;
$progressbar-fill-gradient: null !default;
/// Progress background color of the progressbar.
/// @group progressbar
$kendo-progressbar-value-bg: $primary !default;
/// Progress text color of the progressbar.
/// @group progressbar
$kendo-progressbar-value-text: contrast-wcag( $kendo-progressbar-value-bg ) !default;
/// Progress border color of the progressbar.
/// @group progressbar
$kendo-progressbar-value-border: try-shade( $kendo-progressbar-value-bg ) !default;
/// Progress background gradient of the progressbar.
/// @group progressbar
$kendo-progressbar-value-gradient: null !default;

$progressbar-indeterminate-bg: $progressbar-bg !default;
$progressbar-indeterminate-text: $progressbar-text !default;
Expand Down
26 changes: 13 additions & 13 deletions packages/fluent/scss/progressbar/_layout.scss
Expand Up @@ -7,7 +7,7 @@
// Base
.k-progressbar {
@include border-radius( var( --kendo-progressbar-border-radius, #{$kendo-progressbar-border-radius} ) );
--kendo-progressbar-progress: 0;
--kendo-progressbar-value: 0;
border-width: var( --kendo-progressbar-border-width, #{$kendo-progressbar-border-width} );
border-style: solid;
box-sizing: border-box;
Expand All @@ -29,7 +29,7 @@


// Selection
> .k-selected {
> .k-progressbar-value {
border-width: 0;
border-style: solid;
display: flex;
Expand Down Expand Up @@ -96,13 +96,13 @@
margin-block-start: var( --kendo-progressbar-offset-y, #{$kendo-progressbar-offset-y} );
}

> .k-selected {
> .k-progressbar-value {
width: 0;
width: calc( var( --kendo-progressbar-progress, 0 ) * 1% ); // sass-lint:disable-line no-duplicate-properties
width: calc( var( --kendo-progressbar-value, 0 ) * 1% ); // sass-lint:disable-line no-duplicate-properties
flex-direction: row;

> .k-progress-status-wrap {
width: calc( 100% * ( 100 / var( --kendo-progressbar-progress, 1 ) ) );
width: calc( 100% * ( 100 / var( --kendo-progressbar-value, 1 ) ) );
}
}

Expand All @@ -115,7 +115,7 @@
// Horizontal reverse
&.k-progressbar-reverse {

> .k-selected {
> .k-progressbar-value {
flex-direction: row-reverse;
justify-self: flex-end;
}
Expand Down Expand Up @@ -146,14 +146,14 @@
writing-mode: vertical-lr;
}

> .k-selected {
height: calc( var( --kendo-progressbar-progress, 0 ) * 1% ); // sass-lint:disable-line no-duplicate-properties
> .k-progressbar-value {
height: calc( var( --kendo-progressbar-value, 0 ) * 1% ); // sass-lint:disable-line no-duplicate-properties
flex-direction: column-reverse;
align-self: flex-end;
align-items: flex-end;

> .k-progress-status-wrap {
height: calc( 100% * ( 100 / var( --kendo-progressbar-progress, 1 ) ) ); // sass-lint:disable-line no-duplicate-properties
height: calc( 100% * ( 100 / var( --kendo-progressbar-value, 1 ) ) ); // sass-lint:disable-line no-duplicate-properties
}

.k-progress-status {
Expand All @@ -174,7 +174,7 @@
flex-direction: column-reverse;
}

> .k-selected {
> .k-progressbar-value {
flex-direction: column;
align-self: flex-start;
}
Expand Down Expand Up @@ -212,7 +212,7 @@

.k-reset,
.k-progress-status-wrap,
.k-selected,
.k-progressbar-value,
.k-progress-chunk {
display: none;
}
Expand All @@ -225,8 +225,8 @@
// Blazor specific
.telerik-blazor.k-progressbar-horizontal {

> .k-selected,
> .k-selected > .k-progress-status-wrap {
> .k-progressbar-value,
> .k-progressbar-value > .k-progress-status-wrap {
transition: width .1s ease-in-out;
}
}
Expand Down
12 changes: 6 additions & 6 deletions packages/fluent/scss/progressbar/_theme.scss
Expand Up @@ -33,10 +33,10 @@

.k-selected {
@include fill(
var( --kendo-progressbar-fill-text, #{$kendo-progressbar-fill-text} ),
var( --kendo-progressbar-fill-bg, #{$kendo-progressbar-fill-bg} ),
var( --kendo-progressbar-fill-border, #{$kendo-progressbar-fill-border} ),
var( --kendo-progressbar-fill-gradient, #{$kendo-progressbar-fill-gradient} )
var( --kendo-progressbar-value-text, #{$kendo-progressbar-value-text} ),
var( --kendo-progressbar-value-bg, #{$kendo-progressbar-value-bg} ),
var( --kendo-progressbar-value-border, #{$kendo-progressbar-value-border} ),
var( --kendo-progressbar-value-gradient, #{$kendo-progressbar-value-gradient} )
);
}

Expand All @@ -50,7 +50,7 @@
);

.k-selected {
background-color: var( --kendo-progressbar-fill-disabled-bg, #{$kendo-progressbar-fill-disabled-bg} );
background-color: var( --kendo-progressbar-value-disabled-bg, #{$kendo-progressbar-value-disabled-bg} );
}
}
}
Expand All @@ -63,7 +63,7 @@
background-color: var( --kendo-progressbar-bg, #{$kendo-progressbar-bg} );

.k-selected {
background-color: var( --kendo-progressbar-fill-bg, #{$kendo-progressbar-fill-bg} );
background-color: var( --kendo-progressbar-value-bg, #{$kendo-progressbar-value-bg} );
}
}

Expand Down
10 changes: 5 additions & 5 deletions packages/fluent/scss/progressbar/_variables.scss
Expand Up @@ -59,16 +59,16 @@ $kendo-progressbar-disabled-border: $kendo-progressbar-disabled-bg !default;

/// Progress background color of the progressbar.
/// @group progressbar
$kendo-progressbar-fill-bg: get-theme-color-var( primary-100 ) !default;
$kendo-progressbar-value-bg: get-theme-color-var( primary-100 ) !default;
/// Progress text color of the progressbar.
/// @group progressbar
$kendo-progressbar-fill-text: var( --kendo-component-text, initial ) !default;
$kendo-progressbar-value-text: var( --kendo-component-text, initial ) !default;
/// Progress border color of the progressbar.
/// @group progressbar
$kendo-progressbar-fill-border: $kendo-progressbar-fill-bg !default;
$kendo-progressbar-value-border: $kendo-progressbar-value-bg !default;
/// Progress background gradient of the progressbar.
/// @group progressbar
$kendo-progressbar-fill-gradient: null !default;
$kendo-progressbar-value-gradient: null !default;

/// Progress status offset of the progressbar.
/// @group progressbar
Expand All @@ -79,7 +79,7 @@ $kendo-progressbar-vertical-status-offset: calc( (#{$kendo-progressbar-font-size

/// Progress background color of the disabled progressbar.
/// @group progressbar
$kendo-progressbar-fill-disabled-bg: get-theme-color-var( primary-30 ) !default;
$kendo-progressbar-value-disabled-bg: get-theme-color-var( primary-30 ) !default;

/// Chunk order color of the progressbar.
/// @group progressbar
Expand Down
4 changes: 2 additions & 2 deletions packages/html/src/progressbar/progressbar.tsx
Expand Up @@ -53,7 +53,7 @@ export class ProgressBar extends React.Component<ProgressBarProps> {
'k-progressbar-reverse': reverse,
'k-disabled': disabled
},
)} style={ orientation === "horizontal" ? { "--kendo-progressbar-progress": value, height: height } as React.CSSProperties : { "--kendo-progressbar-progress": value, width: width } as React.CSSProperties } >
)} style={ orientation === "horizontal" ? { "--kendo-progressbar-value": value, height: height } as React.CSSProperties : { "--kendo-progressbar-value": value, width: width } as React.CSSProperties } >
<span className={classNames(
'k-progress-status-wrap',
{
Expand All @@ -63,7 +63,7 @@ export class ProgressBar extends React.Component<ProgressBarProps> {
{label && <span className="k-progress-status">{this.props.value}%</span>}
</span>
{!indeterminate &&
<div className="k-selected">
<div className="k-progressbar-value k-selected">
<span className={classNames(
'k-progress-status-wrap',
{
Expand Down
1 change: 0 additions & 1 deletion packages/material/scss/progressbar/_layout.scss
Expand Up @@ -40,7 +40,6 @@
display: block;
width: 100%;
height: 100%;
background: $progressbar-fill-bg;
position: absolute;
transform-origin: 0 0;
}
Expand Down

0 comments on commit 52e7882

Please sign in to comment.