Skip to content

fix(progress-bar): use correct theme colors #22957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liamdebeasi merged 3 commits into from
Feb 23, 2021
Merged

fix(progress-bar): use correct theme colors #22957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ca30e0
use correct theme
liamdebeasi Feb 22, 2021
3eed0d1
Merge remote-tracking branch 'origin/master' into progress-theme
liamdebeasi Feb 23, 2021
651ba09
fix dots overlapping progress
liamdebeasi Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions core/src/components/progress-bar/progress-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* @prop --progress-background: Color of the progress bar
* @prop --buffer-background: Color of the buffer bar
*/
--background: #{ion-color(primary, base, 0.2)};
--background: #{ion-color(primary, base, 0.3)};
--progress-background: #{ion-color(primary, base)};
--buffer-background: var(--background);
display: block;
Expand All @@ -27,7 +27,7 @@

:host(.ion-color) {
--progress-background: #{current-color(base)};
--buffer-background: #{current-color(base, 0.2)};
--buffer-background: #{current-color(base, 0.3)};
}

// indeterminate has no progress-buffer-bar, so it will be added to the host
Expand Down Expand Up @@ -72,17 +72,10 @@
}

.progress-buffer-bar {
// It's currently here because --buffer-background has an alpha
// Otherwise the buffer circles would be seen through
background: #fff;

z-index: 1; // Make it behind the progress

&:before {
background: var(--buffer-background);
background: var(--buffer-background);

content: "";
}
// Make it behind the progress
z-index: 1;
}

// MD based animation on indeterminate type
Expand All @@ -109,7 +102,7 @@
top: 0;
right: 0;
bottom: 0;
left: -54.888891%;
left: -54.888891%;
/* stylelint-enable property-blacklist */

animation: secondary-indeterminate-translate 2s infinite linear;
Expand All @@ -123,8 +116,26 @@
// Buffer style
// --------------------------------------------------

.buffer-circles.buffer-circles-reversed {
/* stylelint-disable property-blacklist */
right: unset;
left: 2px;

background-position: right;
/* stylelint-enable property-blacklist */
}

.buffer-circles {
background: radial-gradient(ellipse at center, var(--buffer-background) 0%, var(--buffer-background) 30%, transparent 30%) repeat-x 5px center;
/* stylelint-disable property-blacklist */
right: -8px;

left: unset;
/* stylelint-enable property-blacklist */

background: radial-gradient(ellipse at center, var(--buffer-background) 0%, var(--buffer-background) 30%, transparent 30%) repeat-x 5px;

/* stylelint-disable-next-line property-blacklist */
background-position: left;
background-size: 10px 10px;

z-index: 0;
Expand Down
9 changes: 5 additions & 4 deletions core/src/components/progress-bar/progress-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export class ProgressBar implements ComponentInterface {
const { color, type, reversed, value, buffer } = this;
const paused = config.getBoolean('_testing');
const mode = getIonMode(this);
const isReversed = document.dir === 'rtl' ? !reversed : reversed;
return (
<Host
role="progressbar"
Expand All @@ -64,12 +65,12 @@ export class ProgressBar implements ComponentInterface {
[mode]: true,
[`progress-bar-${type}`]: true,
'progress-paused': paused,
'progress-bar-reversed': document.dir === 'rtl' ? !reversed : reversed
'progress-bar-reversed': isReversed
})}
>
{type === 'indeterminate'
? renderIndeterminate()
: renderProgress(value, buffer)
: renderProgress(value, buffer, isReversed)
}
</Host>
);
Expand All @@ -83,13 +84,13 @@ const renderIndeterminate = () => {
];
};

const renderProgress = (value: number, buffer: number) => {
const renderProgress = (value: number, buffer: number, reversed: boolean) => {
const finalValue = clamp(0, value, 1);
const finalBuffer = clamp(0, buffer, 1);

return [
<div class="progress" style={{ transform: `scaleX(${finalValue})` }}></div>,
finalBuffer !== 1 && <div class="buffer-circles"></div>,
finalBuffer !== 1 && <div class={{ 'buffer-circles': true, 'buffer-circles-reversed': reversed }} style={{ width: `calc(${(1 - finalBuffer) * 100}%)` }}></div>,
<div class="progress-buffer-bar" style={{ transform: `scaleX(${finalBuffer})` }}></div>,
];
};
28 changes: 25 additions & 3 deletions core/src/components/progress-bar/test/basic/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet">
<script src="../../../../../scripts/testing/scripts.js"></script>
<script nomodule src="../../../../../dist/ionic/ionic.js"></script>
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script> <style>
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>

<style>
.custom-bar-background {
--buffer-background: red;
}
Expand Down Expand Up @@ -126,20 +128,40 @@
</ion-list-header>
<ion-progress-bar color="tertiary" buffer="0"></ion-progress-bar>

</ion-list>
<ion-list-header>
<ion-label>
Buffer (change buffer with slider)
</ion-label>
</ion-list-header>
<ion-progress-bar class="progressBarBuffer" value="0.20" buffer="0.4"></ion-progress-bar>
<ion-progress-bar class="progressBarBuffer" value="0.20" buffer="0.4" reversed="true"></ion-progress-bar>

<ion-item>
<ion-range pin="true" value="0" id="progressValueBuffer">
<ion-label slot="start">0</ion-label>
<ion-label slot="end">100</ion-label>
</ion-range>
</ion-item>
</ion-list>
</ion-content>

</ion-app>

<script>
// Progress Bar Value
const progressValue = document.getElementById('progressValue');
const progressBar = document.getElementById('progressBar');

progressValue.addEventListener('ionChange', function (ev) {
progressBar.value = ev.detail.value / 100;
});

// Progress Bar Buffer
const progressValueBuffer = document.getElementById('progressValueBuffer');
const progressBarBuffer = document.querySelectorAll('.progressBarBuffer');

progressValueBuffer.addEventListener('ionChange', function (ev) {
progressBarBuffer.forEach(ele => ele.buffer = ev.detail.value / 100);
});
</script>
</body>

Expand Down
19 changes: 15 additions & 4 deletions core/src/themes/test/css-variables/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@
font-size: 48px;
}

ion-progress-bar {
margin-bottom: 10px;
}
</style>
</head>

Expand Down Expand Up @@ -619,10 +622,6 @@ <h2>Street Fighter II</h2>

<section>
<p>
<ion-toolbar>
<ion-title>Default</ion-title>
</ion-toolbar>

<ion-toolbar>
<ion-buttons slot="start">
<ion-button color="danger">
Expand Down Expand Up @@ -759,6 +758,18 @@ <h2>Street Fighter II</h2>
<ion-title>Dark</ion-title>
</ion-toolbar>
</p>

<p>
<ion-progress-bar value="0.5"></ion-progress-bar>
<ion-progress-bar value="0.5" color="secondary"></ion-progress-bar>
<ion-progress-bar value="0.5" color="tertiary"></ion-progress-bar>
<ion-progress-bar type="indeterminate" color="danger"></ion-progress-bar>
<ion-progress-bar type="indeterminate" color="warning"></ion-progress-bar>
<ion-progress-bar value="0.2" buffer="0.3" color="success"></ion-progress-bar>
<ion-progress-bar value="0.5" color="light"></ion-progress-bar>
<ion-progress-bar value="0.5" color="medium"></ion-progress-bar>
<ion-progress-bar value="0.2" buffer="0.3" color="dark"></ion-progress-bar>
</p>
</section>
</div>
</ion-content>
Expand Down