Skip to content

Commit

Permalink
revert default to 'none'
Browse files Browse the repository at this point in the history
  • Loading branch information
AllanOXDi committed Aug 1, 2024
1 parent 0dba8bb commit 3f3f9d6
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 22 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ Changelog is rather internal in nature. See release notes for the public overvie

## Upcoming version 5.x.x (`develop` branch)

[#707]
- **Description:** Card Validations
- **Products impact:**
- **Addresses:** [#695](https://github.com/learningequality/kolibri-design-system/issues/695)
- **Components:** `KCard`
- **Breaking:** No
- **Impacts a11y:** No
- **Guidance:**
[#707] https://github.com/learningequality/kolibri-design-system/pull/707

[#709]
- **Description:** Update spaces to the latest design`KCard`
- **Products impact:** Card updates
Expand Down
48 changes: 26 additions & 22 deletions lib/KCard/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,27 @@
const Layouts = {
HORIZONTAL: 'horizontal',
VERTICAL: 'vertical'
VERTICAL: 'vertical',
};
const Thumbnail_Displays = {
NONE: 'none',
SMALL: 'small',
LARGE: 'large'
LARGE: 'large',
};
function cardValidator(allowedValues, propName) {
return function(value) {
if (!Object.values(allowedValues).includes(value)) {
throw new Error(`Invalid ${propName} value: '${value}'. Allowed values are: ${Object.values(allowedValues).join(', ')}`);
}
return true;
return function(value) {
if (!Object.values(allowedValues).includes(value)) {
throw new Error(
`Invalid ${propName} value: '${value}'. Allowed values are: ${Object.values(
allowedValues
).join(', ')}`
);
}
return true;
};
}
}
export default {
name: 'KCard',
Expand Down Expand Up @@ -127,20 +131,20 @@
* @param {String} value - The layout value.
* @returns {Boolean} - True if the value is not empty, false otherwise.
*/
layout: {
type: String,
default: Layouts .HORIZONTAL,
validator: cardValidator(Layouts, 'layout')
layout: {
type: String,
default: 'horizontal',
validator: cardValidator(Layouts, 'layout'),
},
/**
* Controls how the thumbnail appears in the card.
* Expected Options: 'none' (default), 'small', or 'large'.
* */
thumbnailDisplay: {
type: String,
default: Thumbnail_Displays.NONE,
validator: cardValidator(Thumbnail_Displays, 'thumbnailDisplay')
},
thumbnailDisplay: {
type: String,
default: 'none',
validator: cardValidator(Thumbnail_Displays, 'thumbnailDisplay'),
},
/**
* Sets the thumbnail path.
* Defaults to null if not provided.
Expand Down Expand Up @@ -181,13 +185,13 @@
return this.stylesAndClasses.thumbnailStyles;
},
/*
Returns dynamic classes and few style-like data that CSS was cumbersome/impossible to use for ,or are in need of using theme, grouped by all possible combinations of layouts.
Returns dynamic classes and few style-like data that CSS was cumbersome/impossible to use for ,or are in need of using theme, grouped by all possible combinations of layouts.
New styles and classes are meant to be added to this single-source-of-truth object so
that we can easily locate all styling being applied to a particular layout
New styles and classes are meant to be added to this single-source-of-truth object so
that we can easily locate all styling being applied to a particular layout
Could be further simplified by using solely dynamic styles, but that would have detrimental effects on our auto RTL machinery and we would need to take care manually of more places.
*/
Could be further simplified by using solely dynamic styles, but that would have detrimental effects on our auto RTL machinery and we would need to take care manually of more places.
*/
stylesAndClasses() {
/* In px. Needs to be the same as $spacer variable in styles part */
const SPACER = 24;
Expand Down

0 comments on commit 3f3f9d6

Please sign in to comment.