Merge branch 'develop' into fix/form-caption-accessibility

deven-org · Feb 9, 2024 · f0e9815 · f0e9815
2 parents 95096fc + bd60858
commit f0e9815
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 44 deletions.
diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.stories.ts
@@ -156,11 +156,6 @@ export default {
         disable: true,
       },
     },
-    loadingStatus: {
-      table: {
-        disable: true,
-      },
-    },
   },
   parameters: {
     design: {
@@ -201,7 +196,6 @@ const defaultParams: BlrIconButtonType = {
   loading: false,
   arialabel: 'Icon Button',
   buttonId: 'iconButtonId',
-  loadingStatus: 'Loading',
 };
 BlrIconButton.args = defaultParams;
 

diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.test.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.test.ts
@@ -13,7 +13,6 @@ const sampleParams: BlrIconButtonType = {
   disabled: false,
   buttonId: 'button-id',
   variant: 'cta',
-  loadingStatus: 'Loading',
   theme: 'Light',
 };
 

diff --git a/packages/ui-library/src/components/actions/buttons/icon-button/index.ts b/packages/ui-library/src/components/actions/buttons/icon-button/index.ts
@@ -26,7 +26,6 @@ export class BlrIconButton extends LitElement {
   @property() buttonId?: string;
   @property() variant: ActionVariantType = 'primary';
   @property() size?: ActionSizesType = 'md';
-  @property() loadingStatus!: string;
 
   @property() theme: ThemeType = 'Light';
 
@@ -120,7 +119,6 @@ export class BlrIconButton extends LitElement {
             ? BlrLoaderRenderFunction({
                 size: loaderSizeVariant,
                 variant: loaderVariant,
-                loadingStatus: this.loadingStatus,
                 theme: this.theme,
               })
             : nothing}

diff --git a/packages/ui-library/src/components/actions/buttons/text-button/index.stories.ts b/packages/ui-library/src/components/actions/buttons/text-button/index.stories.ts
@@ -37,7 +37,6 @@ const defaultParams: BlrTextButtonType = {
   loading: false,
   buttonId: 'buttonId',
   buttonDisplay: 'inline-block',
-  loadingStatus: '',
 };
 
 export default {
@@ -179,11 +178,6 @@ export default {
         category: 'Events',
       },
     },
-    loadingStatus: {
-      table: {
-        disable: true,
-      },
-    },
   },
   parameters: {
     design: {

diff --git a/packages/ui-library/src/components/actions/buttons/text-button/index.test.ts b/packages/ui-library/src/components/actions/buttons/text-button/index.test.ts
@@ -15,7 +15,6 @@ const sampleParams: BlrTextButtonType = {
   disabled: false,
   buttonId: 'button-id',
   variant: 'cta',
-  loadingStatus: 'Loading',
   theme: 'Light',
   buttonDisplay: 'inline-block',
 };

diff --git a/packages/ui-library/src/components/actions/buttons/text-button/index.ts b/packages/ui-library/src/components/actions/buttons/text-button/index.ts
@@ -35,7 +35,6 @@ export class BlrTextButton extends LitElement {
   @property() buttonId?: string;
   @property() variant: ActionVariantType = 'primary';
   @property() size?: ActionSizesType = 'md';
-  @property() loadingStatus!: string;
   @property() buttonDisplay?: ButtonDisplayType = 'inline-block';
 
   // these are not triggered directly but allows us to map it internally and bve typesafe
@@ -167,7 +166,6 @@ export class BlrTextButton extends LitElement {
                 ${BlrLoaderRenderFunction({
                   size: loaderSizeVariant,
                   variant: loaderVariant,
-                  loadingStatus: this.loadingStatus,
                   theme: this.theme,
                 })}
                 ${labelAndIconGroup}

diff --git a/packages/ui-library/src/components/feedback/loader/index.stories.ts b/packages/ui-library/src/components/feedback/loader/index.stories.ts
@@ -24,7 +24,6 @@ const defaultParams: BlrLoaderType = {
   theme: 'Light',
   variant: 'default',
   size: 'md',
-  loadingStatus: 'Loading',
 };
 
 export default {
@@ -55,11 +54,6 @@ export default {
         category: 'Appearance',
       },
     },
-    loadingStatus: {
-      table: {
-        disable: true,
-      },
-    },
   },
   parameters: {
     design: {
@@ -101,7 +95,6 @@ export const Variant = () => {
       theme: 'Light',
       variant: 'default',
       size: 'md',
-      loadingStatus: 'Loading',
     })}
   `;
 };
@@ -116,7 +109,6 @@ export const Inverted = () => {
         ...defaultParams,
         variant: 'default',
         size: 'md',
-        loadingStatus: 'Loading',
       })}
     </div>
   `;

diff --git a/packages/ui-library/src/components/feedback/loader/index.test.ts b/packages/ui-library/src/components/feedback/loader/index.test.ts
@@ -8,7 +8,6 @@ import { querySelectorDeep } from 'query-selector-shadow-dom';
 
 const sampleParams: BlrLoaderType = {
   variant: 'default',
-  loadingStatus: 'Loading',
   theme: 'Light',
 };
 

diff --git a/packages/ui-library/src/components/feedback/loader/index.ts b/packages/ui-library/src/components/feedback/loader/index.ts
@@ -13,8 +13,6 @@ export class BlrLoader extends LitElement {
 
   @property() size?: ActionSizesType = 'md';
   @property() variant?: FeedbackVariantType;
-  @property() loadingStatus!: string;
-
   @property() theme: ThemeType = 'Light';
 
   protected render() {
@@ -31,7 +29,7 @@ export class BlrLoader extends LitElement {
           ${dynamicStyles.map((style) => style)}
         </style>
         <div class="loader-container ${this.size}">
-          <div class="${classes}" role="status" aria-live="polite" ?aria-label=${this.loadingStatus}></div>
+          <div class="${classes}" role="status" aria-live="polite"></div>
         </div>`;
     }
   }

diff --git a/...s/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts b/...s/ui-library/src/components/forms/slider/slider-single-value/range-legend-slider/index.ts
@@ -61,7 +61,6 @@ export class BlrRangeLegendSlider extends LitElement {
       buttonId: btnId,
       variant: this.btnVariant,
       size: this.size,
-      loadingStatus: 'Loading',
       theme: this.theme,
     })}`;
 

diff --git a/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts b/packages/ui-library/src/components/forms/slider/slider-single-value/range-slider/index.ts
@@ -66,7 +66,6 @@ export class BlrRangeSlider extends LitElement {
       buttonId: btnId,
       variant: this.btnVariant,
       size: this.size,
-      loadingStatus: 'Loading',
       theme: this.theme,
     })}`;
 

diff --git a/...ibrary/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts b/...ibrary/src/components/forms/slider/slider-two-values/range-legend-min-max-slider/index.ts
@@ -63,7 +63,6 @@ export class BlrRangeLegendMinMaxSlider extends LitElement {
       buttonId: btnId,
       variant: this.btnVariant,
       size: this.size,
-      loadingStatus: 'Loading',
       theme: this.theme,
     });
 

diff --git a/...es/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts b/...es/ui-library/src/components/forms/slider/slider-two-values/range-min-max-slider/index.ts
@@ -69,7 +69,6 @@ export class BlrRangeMinMaxSlider extends LitElement {
       buttonId: btnId,
       variant: this.btnVariant,
       size: this.size,
-      loadingStatus: 'Loading',
       theme: this.theme,
     })}`;
 

diff --git a/packages/ui-library/src/components/ui/button-group/index.stories.ts b/packages/ui-library/src/components/ui/button-group/index.stories.ts
@@ -84,7 +84,6 @@ export const ButtonGroup = (
       theme: 'Light',
       loading: false,
       variant: 'primary',
-      loadingStatus: 'Loading',
       disabled: false,
       buttonDisplay: 'inline-block',
     })}
@@ -94,7 +93,6 @@ export const ButtonGroup = (
       theme: 'Light',
       loading: false,
       variant: 'secondary',
-      loadingStatus: 'Loading',
       disabled: false,
       buttonDisplay: 'inline-block',
     })}
@@ -103,7 +101,6 @@ export const ButtonGroup = (
       theme: 'Light',
       loading: false,
       variant: 'silent',
-      loadingStatus: 'Loading',
       disabled: false,
       arialabel: 'button_1',
       icon: 'blr360',

diff --git a/packages/ui-library/src/components/ui/button-group/index.test.ts b/packages/ui-library/src/components/ui/button-group/index.test.ts
@@ -18,7 +18,6 @@ const testContent = BlrTextButtonRenderFunction({
   theme: 'Light',
   loading: false,
   variant: 'primary',
-  loadingStatus: 'Loading',
   disabled: false,
 });
 

diff --git a/packages/ui-library/src/components/ui/icon/icon-link/index.stories.ts b/packages/ui-library/src/components/ui/icon/icon-link/index.stories.ts
@@ -53,7 +53,6 @@ const args: BlrIconLinkType = {
   size: 'md',
   href: '#',
   target: '_self',
-  loadingStatus: 'Loading',
 };
 
 BlrIconLink.args = args;
diff --git a/packages/ui-library/src/components/ui/icon/icon-link/index.test.ts b/packages/ui-library/src/components/ui/icon/icon-link/index.test.ts
@@ -14,7 +14,6 @@ const sampleParams: BlrIconLinkType = {
   variant: 'cta',
   href: '#',
   target: '_self',
-  loadingStatus: 'Loading',
   theme: 'Light',
 };
 

diff --git a/packages/ui-library/src/components/ui/icon/icon-link/index.ts b/packages/ui-library/src/components/ui/icon/icon-link/index.ts
@@ -30,8 +30,6 @@ export class BlrIconLink extends LitElement {
   @property() variant: ActionVariantType = 'primary';
   @property() size?: ActionSizesType = 'md';
   @property() loading!: boolean;
-  @property() loadingStatus!: string;
-
   @property() theme: ThemeType = 'Light';
 
   protected render() {
@@ -76,7 +74,6 @@ export class BlrIconLink extends LitElement {
             ? BlrLoaderRenderFunction({
                 size: loaderSize,
                 variant: loaderVariant,
-                loadingStatus: this.loadingStatus,
                 theme: this.theme,
               })
             : BlrIconRenderFunction(

diff --git a/packages/ui-library/src/globals/types.ts b/packages/ui-library/src/globals/types.ts
@@ -66,7 +66,6 @@ export type ButtonOption = {
   label: string;
   variant: string;
   size: FormSizesType;
-  loadingStatus: string;
   disabled: boolean;
   buttonId: string;
   trailingIcon: string;