diff --git a/packages/components/src/components/progress-bar/__snapshots__/progress-bar.spec.ts.snap b/packages/components/src/components/progress-bar/__snapshots__/progress-bar.spec.ts.snap index d711d24359..e67926bd43 100644 --- a/packages/components/src/components/progress-bar/__snapshots__/progress-bar.spec.ts.snap +++ b/packages/components/src/components/progress-bar/__snapshots__/progress-bar.spec.ts.snap @@ -4,13 +4,13 @@ exports[`ProgressBar should contain progress-bar-inner-text css class when text -
-
-
-
- undefined% +
+
+
+
+ 0%
@@ -72,13 +72,13 @@ exports[`ProgressBar should contain progress-bar-text css class when show text i -
-
-
+
+
+
-
- undefined% +
+ 0%
@@ -139,13 +139,13 @@ exports[`ProgressBar should have css property width 24px when stroke width is se -
-
-
+
+
+
@@ -255,7 +255,7 @@ exports[`ProgressBar should match snapshot 1`] = `
-
+
diff --git a/packages/components/src/components/progress-bar/progress-bar.tsx b/packages/components/src/components/progress-bar/progress-bar.tsx index f0c837bca0..e8b071baf1 100644 --- a/packages/components/src/components/progress-bar/progress-bar.tsx +++ b/packages/components/src/components/progress-bar/progress-bar.tsx @@ -14,7 +14,7 @@ export class ProgressBar implements Base { /** (optional) Progress bar class */ @Prop() customClass?: string = ''; /** (required) Progress bar percentage */ - @Prop() percentage: number; + @Prop() percentage: number = 0; /** (optional) Progress bar variant */ @Prop() variant?: string; /** (optional) Progress bar stroke width */ diff --git a/packages/components/src/components/progress-bar/readme.md b/packages/components/src/components/progress-bar/readme.md index ea80598fdd..afb1482684 100644 --- a/packages/components/src/components/progress-bar/readme.md +++ b/packages/components/src/components/progress-bar/readme.md @@ -10,7 +10,7 @@ | Property | Attribute | Description | Type | Default | | ------------- | -------------- | ------------------------------------------- | ---------------------------------------- | ----------- | | `customClass` | `custom-class` | (optional) Progress bar class | `string` | `''` | -| `percentage` | `percentage` | (required) Progress bar percentage | `number` | `undefined` | +| `percentage` | `percentage` | (required) Progress bar percentage | `number` | `0` | | `showText` | `show-text` | (optional) Progress bar percentage text | `boolean` | `undefined` | | `strokeWidth` | `stroke-width` | (optional) Progress bar stroke width | `number` | `6` | | `styles` | -- | (optional) Injected jss styles | `StyleSheet` | `undefined` | diff --git a/packages/components/src/utils/css-in-js.tsx b/packages/components/src/utils/css-in-js.tsx index fb009461b3..9c35736a14 100644 --- a/packages/components/src/utils/css-in-js.tsx +++ b/packages/components/src/utils/css-in-js.tsx @@ -13,16 +13,11 @@ declare type CssInJsDecorator = ( ) => void; const getKeys = obj => { - const blackListedProps = ['stylesheet', 'value', 'key']; - const whiteListedTypes = ['boolean', 'string', 'object']; + const whitelistedProps = ['styles']; const keys = []; for (const key in obj) { - if ( - obj[key] && - whiteListedTypes.includes(typeof obj[key]) && - !blackListedProps.includes(key) - ) { + if (obj[key] && !whitelistedProps.includes(key)) { keys.push(key); } }