Skip to content

Commit

Permalink
Merge branch 'develop' into fix/482-add-missing-events-textinput
Browse files Browse the repository at this point in the history
  • Loading branch information
davidken91 authored Feb 12, 2024
2 parents 5de0361 + 035383b commit 1007b74
Show file tree
Hide file tree
Showing 23 changed files with 6 additions and 60 deletions.
7 changes: 4 additions & 3 deletions doc/GETSTARTED.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,14 @@ All regular B01LER team meetings are in our [B01LER Core calendar](https://myema
|Meeting Name |When |Who |Why |
|-----------------------------|----------------------------------------------------------------------|----------------------------------------------------------------------|------------------------------------------------------------------------------------|
|B01LER Daily |Wednesdays, Thursdays (beginning of Planning or Refinement) & Fridays |Complete B01LER Team |Updating eachother |
|B01LER Planning |Every 2nd Thursday (When there is no Refinement) |Complete B01LER Team |Closing the previous and planning the next iteration |
|B01LER Planning |Every 2nd Thursday (When there is no Refinement) |Complete B01LER Team |Celebrate outcome of the last iteration, present outcome of the pre-planning |
|B01LER Refinement |Every 2nd Thursday (When there is no Planning) |Complete B01LER Team |Refining issues for upcomming iterations |
|B01LER Retro |Every 4th Thursday (After Planning) |Complete B01LER Team |Looking back at the last two iterations to improve things in the future |
|B01LER Design Review |Tuesdays & Thursdays |B01LER Design Lead and every team member that needs a design review |Getting approval from design for code implementations |
|B01LER Pair Programming Hour |Fridays |Everyone from the B01LER Team that wants to join |Collaborate and learn from each other by tackling coding challanges together |
|B01LER Weekly Checkup |Thursdays |B01LER Leadership |Discuss and decide on general product topics and check the roadmap |
|B01LER Marketing Weekly |Thursdays |B01LER Leadership |Discuss and decide on general marketing topics |
|B01LER Pre-Planning |Thursdays |B01LER Leadership (and/or stand-ins) |Discuss objectives and prepare a set of issues to finish int he next iteration |
|B01LER Weekly Checkup |Thursdays |B01LER Leadership (and/or stand-ins) |Discuss and decide on general product topics and check the roadmap |
|B01LER Marketing Weekly |Thursdays |B01LER Leadership (and/or stand-ins) |Discuss and decide on general marketing topics |
|B01LER Monthly |Last Thursday of a month |Everyone who wants to join |Giving an update, answering questions and sometimes deep dives into specific topics |


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,6 @@ export default {
disable: true,
},
},
loadingStatus: {
table: {
disable: true,
},
},
},
parameters: {
design: {
Expand Down Expand Up @@ -201,7 +196,6 @@ const defaultParams: BlrIconButtonType = {
loading: false,
arialabel: 'Icon Button',
buttonId: 'iconButtonId',
loadingStatus: 'Loading',
};
BlrIconButton.args = defaultParams;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const sampleParams: BlrIconButtonType = {
disabled: false,
buttonId: 'button-id',
variant: 'cta',
loadingStatus: 'Loading',
theme: 'Light',
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -120,7 +119,6 @@ export class BlrIconButton extends LitElement {
? BlrLoaderRenderFunction({
size: loaderSizeVariant,
variant: loaderVariant,
loadingStatus: this.loadingStatus,
theme: this.theme,
})
: nothing}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ const defaultParams: BlrTextButtonType = {
loading: false,
buttonId: 'buttonId',
buttonDisplay: 'inline-block',
loadingStatus: '',
};

export default {
Expand Down Expand Up @@ -179,11 +178,6 @@ export default {
category: 'Events',
},
},
loadingStatus: {
table: {
disable: true,
},
},
},
parameters: {
design: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const sampleParams: BlrTextButtonType = {
disabled: false,
buttonId: 'button-id',
variant: 'cta',
loadingStatus: 'Loading',
theme: 'Light',
buttonDisplay: 'inline-block',
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -167,7 +166,6 @@ export class BlrTextButton extends LitElement {
${BlrLoaderRenderFunction({
size: loaderSizeVariant,
variant: loaderVariant,
loadingStatus: this.loadingStatus,
theme: this.theme,
})}
${labelAndIconGroup}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const defaultParams: BlrLoaderType = {
theme: 'Light',
variant: 'default',
size: 'md',
loadingStatus: 'Loading',
};

export default {
Expand Down Expand Up @@ -55,11 +54,6 @@ export default {
category: 'Appearance',
},
},
loadingStatus: {
table: {
disable: true,
},
},
},
parameters: {
design: {
Expand Down Expand Up @@ -101,7 +95,6 @@ export const Variant = () => {
theme: 'Light',
variant: 'default',
size: 'md',
loadingStatus: 'Loading',
})}
`;
};
Expand All @@ -116,7 +109,6 @@ export const Inverted = () => {
...defaultParams,
variant: 'default',
size: 'md',
loadingStatus: 'Loading',
})}
</div>
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { querySelectorDeep } from 'query-selector-shadow-dom';

const sampleParams: BlrLoaderType = {
variant: 'default',
loadingStatus: 'Loading',
theme: 'Light',
};

Expand Down
4 changes: 1 addition & 3 deletions packages/ui-library/src/components/feedback/loader/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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>`;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ export class BlrRangeLegendSlider extends LitElement {
buttonId: btnId,
variant: this.btnVariant,
size: this.size,
loadingStatus: 'Loading',
theme: this.theme,
})}`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ export class BlrRangeSlider extends LitElement {
buttonId: btnId,
variant: this.btnVariant,
size: this.size,
loadingStatus: 'Loading',
theme: this.theme,
})}`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export class BlrRangeLegendMinMaxSlider extends LitElement {
buttonId: btnId,
variant: this.btnVariant,
size: this.size,
loadingStatus: 'Loading',
theme: this.theme,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ export class BlrRangeMinMaxSlider extends LitElement {
buttonId: btnId,
variant: this.btnVariant,
size: this.size,
loadingStatus: 'Loading',
theme: this.theme,
})}`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const hintCaption = BlrFormCaptionRenderFunction({
icon: 'blrInfo',
size: 'md',
theme: 'Light',
arialabel: 'Form Hint',
});

const errorCaption = BlrFormCaptionRenderFunction({
Expand All @@ -27,7 +26,6 @@ const errorCaption = BlrFormCaptionRenderFunction({
icon: 'blrInfo',
size: 'md',
theme: 'Light',
arialabel: 'Form Error',
});

const mixedCaptions = html` ${hintCaption} ${errorCaption} `;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,6 @@ export default {
category: 'Content / Setting',
},
},
arialabel: {
options: [undefined, ...PureIconKeys],
description:
'Provides additional information about the elements purpose and functionality to assistive technologies, such as screen readers.',
table: {
category: 'Accessibility',
},
},
},
parameters: {
design: {
Expand Down Expand Up @@ -97,7 +89,6 @@ BlrFormCaption.storyName = 'Form Caption';
const args: BlrFormCaptionType = {
theme: 'Light',
message: 'Message-text',
arialabel: 'Hint',
icon: 'blr360',
variant: 'hint',
size: 'sm',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export class BlrFormCaption extends LitElement {
static styles = [];

@property() message?: string;
@property() arialabel?: string;
@property() icon?: SizelessIconType;
@property() variant: CaptionVariantType = 'hint';
@property() size?: FormSizesType = 'md';
Expand Down Expand Up @@ -50,7 +49,7 @@ export class BlrFormCaption extends LitElement {
<style>
${dynamicStyles}
</style>
<div class=${classes} aria-label=${this.arialabel || nothing}>
<div class=${classes}>
${this.icon
? BlrIconRenderFunction(
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ export const ButtonGroup = (
theme: 'Light',
loading: false,
variant: 'primary',
loadingStatus: 'Loading',
disabled: false,
buttonDisplay: 'inline-block',
})}
Expand All @@ -94,7 +93,6 @@ export const ButtonGroup = (
theme: 'Light',
loading: false,
variant: 'secondary',
loadingStatus: 'Loading',
disabled: false,
buttonDisplay: 'inline-block',
})}
Expand All @@ -103,7 +101,6 @@ export const ButtonGroup = (
theme: 'Light',
loading: false,
variant: 'silent',
loadingStatus: 'Loading',
disabled: false,
arialabel: 'button_1',
icon: 'blr360',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const testContent = BlrTextButtonRenderFunction({
theme: 'Light',
loading: false,
variant: 'primary',
loadingStatus: 'Loading',
disabled: false,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ const args: BlrIconLinkType = {
size: 'md',
href: '#',
target: '_self',
loadingStatus: 'Loading',
};

BlrIconLink.args = args;
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const sampleParams: BlrIconLinkType = {
variant: 'cta',
href: '#',
target: '_self',
loadingStatus: 'Loading',
theme: 'Light',
};

Expand Down
3 changes: 0 additions & 3 deletions packages/ui-library/src/components/ui/icon/icon-link/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -76,7 +74,6 @@ export class BlrIconLink extends LitElement {
? BlrLoaderRenderFunction({
size: loaderSize,
variant: loaderVariant,
loadingStatus: this.loadingStatus,
theme: this.theme,
})
: BlrIconRenderFunction(
Expand Down
1 change: 0 additions & 1 deletion packages/ui-library/src/globals/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ export type ButtonOption = {
label: string;
variant: string;
size: FormSizesType;
loadingStatus: string;
disabled: boolean;
buttonId: string;
trailingIcon: string;
Expand Down

0 comments on commit 1007b74

Please sign in to comment.