@lightningjs/solid-ui
Advanced tools
Comparing version 0.13.1 to 0.14.0
@@ -39,3 +39,3 @@ /* | ||
/* @ts-expect-error next-line themes are supplied by client applications so this setup is necessary */ | ||
const { CardContent: { defaultTone, ...cardContentthemeStyles } = { styles: {} } } = theme?.componentConfig; | ||
const { CardContent: { defaultTone, ...themeStyles } = { themeStyles: {} } } = theme?.componentConfig; | ||
@@ -58,3 +58,3 @@ const container: CardContentConfig = { | ||
tones: {}, | ||
themeStyles: cardContentthemeStyles | ||
themeStyles | ||
}; | ||
@@ -76,3 +76,3 @@ | ||
modeKeys: ['focus', 'disabled', 'collapsed'], | ||
themeStyles: cardContentthemeStyles | ||
themeStyles: themeStyles | ||
}; | ||
@@ -117,3 +117,3 @@ | ||
}, | ||
themeStyles: cardContentthemeStyles | ||
themeStyles | ||
}; | ||
@@ -120,0 +120,0 @@ |
{ | ||
"name": "@lightningjs/solid-ui", | ||
"version": "0.13.1", | ||
"version": "0.14.0", | ||
"description": "A shared library of components for the LightningJS Solid Framework.", | ||
@@ -5,0 +5,0 @@ "main": "dist/index.js", |
@@ -28,11 +28,6 @@ /* | ||
*/ | ||
export interface UIComponentProps extends IntrinsicNodeStyleProps { | ||
export interface UIComponentProps extends IntrinsicNodeProps { | ||
color?: IntrinsicNodeStyleProps['color'] & string; | ||
/** | ||
* applied to the component's root node | ||
*/ | ||
style?: IntrinsicNodeProps['style']; | ||
/** | ||
* sets the component's color palette | ||
@@ -39,0 +34,0 @@ */ |
@@ -23,3 +23,3 @@ /* | ||
// solid style name: themed style name | ||
[k in keyof BaseStyleType as keyof BaseStyleType]?: keyof ComponentStyleList; | ||
[k in keyof BaseStyleType as keyof BaseStyleType | keyof ComponentStyleList]?: keyof ComponentStyleList; | ||
}; | ||
@@ -92,8 +92,8 @@ | ||
export type FlexibleNodeStyles<AdditionalTypes = undefined> = NodeStyles & AdditionalTypes; | ||
export type FlexibleTextStyles<AdditionalTypes = undefined> = TextStyles & AdditionalTypes; | ||
export type FlexibleNodeStyles<AdditionalTypes = {}> = NodeStyles & AdditionalTypes; | ||
export type FlexibleTextStyles<AdditionalTypes = {}> = TextStyles & AdditionalTypes; | ||
// could be a nested object | ||
// eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
export type NodeStyleSet<AdditionalTypes = undefined> = { | ||
export type NodeStyleSet<AdditionalTypes = {}> = { | ||
base: Required<FlexibleNodeStyles<AdditionalTypes>> & WithModes<FlexibleNodeStyles<AdditionalTypes>>; | ||
@@ -105,3 +105,3 @@ tones: WithTonesModes<FlexibleNodeStyles<AdditionalTypes>>; // includes modes of tones | ||
// eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
export type TextStyleSet<AdditionalTypes = undefined> = { | ||
export type TextStyleSet<AdditionalTypes = {}> = { | ||
base: Required<TextStyles & AdditionalTypes> & WithModes<TextStyles & AdditionalTypes>; | ||
@@ -115,1 +115,14 @@ tones: WithTonesModes<TextStyles & AdditionalTypes>; | ||
export type NodeColor = number | string; | ||
export type TypographySet = { | ||
[key: string]: Typography; | ||
}; | ||
export type Typography = { | ||
fontFamily: string; | ||
fontSize: number; | ||
lineHeight: number; | ||
fontWeight: number; | ||
verticalAlign: string; | ||
textBaseline: string; | ||
}; |
@@ -20,7 +20,8 @@ /* | ||
import { getWidthByUpCount } from './getWidthByUpCount.js'; | ||
export function getWidthByColumnSpan(columnSpan: number) { | ||
export function getWidthByColumnSpan(columnSpan: number = 1) { | ||
const columnCount = theme.layout.columnCount; | ||
const gutterX = theme.layout.gutterX; | ||
return (getWidthByUpCount(columnCount) ?? 1) * columnSpan + gutterX * (columnSpan - 1); | ||
return getWidthByUpCount(columnCount) * columnSpan + gutterX * (columnSpan - 1); | ||
} |
@@ -25,4 +25,6 @@ /* | ||
if (upCount < 1 || upCount > columnCount) { | ||
console.error(`Column expects a number between 1 & ${columnCount}. Received ${upCount}`); | ||
return; | ||
console.error( | ||
`Column expects a number between 1 & ${columnCount}. Received ${upCount}. Defaulting to 1.` | ||
); | ||
upCount = 1; | ||
} | ||
@@ -29,0 +31,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
2169935
121
25746