-
Notifications
You must be signed in to change notification settings - Fork 3
Fix: correction for not inheriting styles inside box and stack #247
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -148,10 +148,10 @@ export function Stack({ | |
| const paddingRight = (props.paddingEnd && direction === Direction.Horizontal) ? props.paddingEnd : undefined; | ||
| const height = props.height ?? props.heightResponsive?.base ?? (isFullHeight ? '100%' : 'auto'); | ||
| const width = props.width ?? props.widthResponsive?.base ?? (isFullWidth ? '100%' : 'auto'); | ||
|
Comment on lines
149
to
150
|
||
| const maxHeight = props.maxHeight ?? null; | ||
| const maxWidth = props.maxWidth ?? null; | ||
| const minHeight = props.minHeight ?? null; | ||
| const minWidth = props.minWidth ?? null; | ||
| const maxHeight = props.maxHeight ?? props.maxHeightResponsive?.base ?? null; | ||
| const maxWidth = props.maxWidth ?? props.maxWidthResponsive?.base ?? null; | ||
| const minHeight = props.minHeight ?? props.minHeightResponsive?.base ?? null; | ||
| const minWidth = props.minWidth ?? props.minWidthResponsive?.base ?? null; | ||
| const maxHeightResponsive = props.maxHeightResponsive || maxHeight ? { base: (maxHeight || undefined), ...props.maxHeightResponsive } : null; | ||
| const maxWidthResponsive = props.maxWidthResponsive || maxWidth ? { base: (maxWidth || undefined), ...props.maxWidthResponsive } : null; | ||
| const minHeightResponsive = props.minHeightResponsive || minHeight ? { base: (minHeight || undefined), ...props.minHeightResponsive } : null; | ||
|
|
@@ -161,23 +161,19 @@ export function Stack({ | |
| const shouldWrapItems = props.shouldWrapItems || false; | ||
| const stackStyles: React.CSSProperties = { | ||
| '--kiba-stack-direction-base': getDirectionValue(direction), | ||
| ...responsiveValueToCss(props.directionResponsive, '--kiba-stack-direction', getDirectionValue, true), | ||
| ...responsiveValueToCss(props.directionResponsive, '--kiba-stack-direction', getDirectionValue), | ||
| '--kiba-stack-child-alignment-base': getFlexItemAlignment(childAlignment), | ||
| ...responsiveValueToCss(props.childAlignmentResponsive, '--kiba-stack-child-alignment', getFlexItemAlignment, true), | ||
| ...responsiveValueToCss(props.childAlignmentResponsive, '--kiba-stack-child-alignment', getFlexItemAlignment), | ||
| '--kiba-stack-content-alignment-base': getFlexContentAlignment(contentAlignment), | ||
| ...responsiveValueToCss(props.contentAlignmentResponsive, '--kiba-stack-content-alignment', getFlexContentAlignment, true), | ||
| ...responsiveValueToCss(props.contentAlignmentResponsive, '--kiba-stack-content-alignment', getFlexContentAlignment), | ||
| '--kiba-stack-height-base': height, | ||
| ...responsiveValueToCss(props.heightResponsive, '--kiba-stack-height', undefined, true), | ||
| ...responsiveValueToCss(props.heightResponsive, '--kiba-stack-height'), | ||
| '--kiba-stack-width-base': width, | ||
| ...responsiveValueToCss(props.widthResponsive, '--kiba-stack-width', undefined, true), | ||
| '--kiba-stack-max-height-base': maxHeightResponsive?.base ?? 'none', | ||
| ...responsiveValueToCss(maxHeightResponsive, '--kiba-stack-max-height', undefined, true), | ||
| '--kiba-stack-max-width-base': maxWidthResponsive?.base ?? 'none', | ||
| ...responsiveValueToCss(maxWidthResponsive, '--kiba-stack-max-width', undefined, true), | ||
| '--kiba-stack-min-height-base': minHeightResponsive?.base ?? '0', | ||
| ...responsiveValueToCss(minHeightResponsive, '--kiba-stack-min-height', undefined, true), | ||
| '--kiba-stack-min-width-base': minWidthResponsive?.base ?? '0', | ||
| ...responsiveValueToCss(minWidthResponsive, '--kiba-stack-min-width', undefined, true), | ||
| ...responsiveValueToCss(props.widthResponsive, '--kiba-stack-width'), | ||
| ...(maxHeightResponsive ? { '--kiba-stack-max-height-base': maxHeightResponsive.base ?? 'none', ...responsiveValueToCss(maxHeightResponsive, '--kiba-stack-max-height') } : {}), | ||
| ...(maxWidthResponsive ? { '--kiba-stack-max-width-base': maxWidthResponsive.base ?? 'none', ...responsiveValueToCss(maxWidthResponsive, '--kiba-stack-max-width') } : {}), | ||
| ...(minHeightResponsive ? { '--kiba-stack-min-height-base': minHeightResponsive.base ?? '0', ...responsiveValueToCss(minHeightResponsive, '--kiba-stack-min-height') } : {}), | ||
| ...(minWidthResponsive ? { '--kiba-stack-min-width-base': minWidthResponsive.base ?? '0', ...responsiveValueToCss(minWidthResponsive, '--kiba-stack-min-width') } : {}), | ||
| ...(shouldWrapItems && innerShouldAddGutters ? { '--kiba-stack-gap': getPaddingSizeCss(defaultGutter) } : {}), | ||
| ...props.style, | ||
| } as React.CSSProperties; | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -40,43 +40,43 @@ export function Box({ | |||||||||
| isFullWidth = true, | ||||||||||
| ...props | ||||||||||
| }: IBoxProps): React.ReactElement { | ||||||||||
| const height = props.height ?? props.heightResponsive?.base ?? (props.isFullHeight ? '100%' : undefined); | ||||||||||
| const width = props.width ?? props.widthResponsive?.base ?? (isFullWidth ? '100%' : undefined); | ||||||||||
| const height = props.height ?? props.heightResponsive?.base ?? (props.isFullHeight ? '100%' : 'auto'); | ||||||||||
| const width = props.width ?? props.widthResponsive?.base ?? (isFullWidth ? '100%' : 'auto'); | ||||||||||
|
Comment on lines
+43
to
+44
|
||||||||||
| const height = props.height ?? props.heightResponsive?.base ?? (props.isFullHeight ? '100%' : 'auto'); | |
| const width = props.width ?? props.widthResponsive?.base ?? (isFullWidth ? '100%' : 'auto'); | |
| const height = props.height || props.heightResponsive?.base || (props.isFullHeight ? '100%' : 'auto'); | |
| const width = props.width || props.widthResponsive?.base || (isFullWidth ? '100%' : 'auto'); |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,41 +88,41 @@ | |
| &.scrollableVertically { overflow-y: auto; } | ||
| &.scrollableHorizontally { overflow-x: auto; } | ||
|
|
||
| // Responsive breakpoints - only use responsive variables if explicitly set (not initial) | ||
| // Responsive breakpoints | ||
| @include screen-small { | ||
| width: var(--kiba-box-width-sm, var(--kiba-box-width, 100%)); | ||
| height: var(--kiba-box-height-sm, var(--kiba-box-height, auto)); | ||
| max-width: var(--kiba-box-max-width-sm, var(--kiba-box-max-width, none)); | ||
| max-height: var(--kiba-box-max-height-sm, var(--kiba-box-max-height, none)); | ||
| min-width: var(--kiba-box-min-width-sm, var(--kiba-box-min-width, 0)); | ||
| min-height: var(--kiba-box-min-height-sm, var(--kiba-box-min-height, 0)); | ||
| max-width: var(--kiba-box-max-width-sm, var(--kiba-box-max-width)); | ||
| max-height: var(--kiba-box-max-height-sm, var(--kiba-box-max-height)); | ||
| min-width: var(--kiba-box-min-width-sm, var(--kiba-box-min-width)); | ||
| min-height: var(--kiba-box-min-height-sm, var(--kiba-box-min-height)); | ||
|
Comment on lines
+95
to
+98
|
||
| } | ||
|
|
||
| @include screen-medium { | ||
| width: var(--kiba-box-width-md, var(--kiba-box-width-sm, var(--kiba-box-width, 100%))); | ||
| height: var(--kiba-box-height-md, var(--kiba-box-height-sm, var(--kiba-box-height, auto))); | ||
| max-width: var(--kiba-box-max-width-md, var(--kiba-box-max-width-sm, var(--kiba-box-max-width, none))); | ||
| max-height: var(--kiba-box-max-height-md, var(--kiba-box-max-height-sm, var(--kiba-box-max-height, none))); | ||
| min-width: var(--kiba-box-min-width-md, var(--kiba-box-min-width-sm, var(--kiba-box-min-width, 0))); | ||
| min-height: var(--kiba-box-min-height-md, var(--kiba-box-min-height-sm, var(--kiba-box-min-height, 0))); | ||
| max-width: var(--kiba-box-max-width-md, var(--kiba-box-max-width-sm, var(--kiba-box-max-width))); | ||
| max-height: var(--kiba-box-max-height-md, var(--kiba-box-max-height-sm, var(--kiba-box-max-height))); | ||
| min-width: var(--kiba-box-min-width-md, var(--kiba-box-min-width-sm, var(--kiba-box-min-width))); | ||
| min-height: var(--kiba-box-min-height-md, var(--kiba-box-min-height-sm, var(--kiba-box-min-height))); | ||
|
Comment on lines
+104
to
+107
|
||
| } | ||
|
|
||
| @include screen-large { | ||
| width: var(--kiba-box-width-lg, var(--kiba-box-width-md, var(--kiba-box-width-sm, var(--kiba-box-width, 100%)))); | ||
| height: var(--kiba-box-height-lg, var(--kiba-box-height-md, var(--kiba-box-height-sm, var(--kiba-box-height, auto)))); | ||
| max-width: var(--kiba-box-max-width-lg, var(--kiba-box-max-width-md, var(--kiba-box-max-width-sm, var(--kiba-box-max-width, none)))); | ||
| max-height: var(--kiba-box-max-height-lg, var(--kiba-box-max-height-md, var(--kiba-box-max-height-sm, var(--kiba-box-max-height, none)))); | ||
| min-width: var(--kiba-box-min-width-lg, var(--kiba-box-min-width-md, var(--kiba-box-min-width-sm, var(--kiba-box-min-width, 0)))); | ||
| min-height: var(--kiba-box-min-height-lg, var(--kiba-box-min-height-md, var(--kiba-box-min-height-sm, var(--kiba-box-min-height, 0)))); | ||
| max-width: var(--kiba-box-max-width-lg, var(--kiba-box-max-width-md, var(--kiba-box-max-width-sm, var(--kiba-box-max-width)))); | ||
| max-height: var(--kiba-box-max-height-lg, var(--kiba-box-max-height-md, var(--kiba-box-max-height-sm, var(--kiba-box-max-height)))); | ||
| min-width: var(--kiba-box-min-width-lg, var(--kiba-box-min-width-md, var(--kiba-box-min-width-sm, var(--kiba-box-min-width)))); | ||
| min-height: var(--kiba-box-min-height-lg, var(--kiba-box-min-height-md, var(--kiba-box-min-height-sm, var(--kiba-box-min-height)))); | ||
|
Comment on lines
+113
to
+116
|
||
| } | ||
|
|
||
| @include screen-extra-large { | ||
| width: var(--kiba-box-width-xl, var(--kiba-box-width-lg, var(--kiba-box-width-md, var(--kiba-box-width-sm, var(--kiba-box-width, 100%))))); | ||
| height: var(--kiba-box-height-xl, var(--kiba-box-height-lg, var(--kiba-box-height-md, var(--kiba-box-height-sm, var(--kiba-box-height, auto))))); | ||
| max-width: var(--kiba-box-max-width-xl, var(--kiba-box-max-width-lg, var(--kiba-box-max-width-md, var(--kiba-box-max-width-sm, var(--kiba-box-max-width, none))))); | ||
| max-height: var(--kiba-box-max-height-xl, var(--kiba-box-max-height-lg, var(--kiba-box-max-height-md, var(--kiba-box-max-height-sm, var(--kiba-box-max-height, none))))); | ||
| min-width: var(--kiba-box-min-width-xl, var(--kiba-box-min-width-lg, var(--kiba-box-min-width-md, var(--kiba-box-min-width-sm, var(--kiba-box-min-width, 0))))); | ||
| min-height: var(--kiba-box-min-height-xl, var(--kiba-box-min-height-lg, var(--kiba-box-min-height-md, var(--kiba-box-min-height-sm, var(--kiba-box-min-height, 0))))); | ||
| max-width: var(--kiba-box-max-width-xl, var(--kiba-box-max-width-lg, var(--kiba-box-max-width-md, var(--kiba-box-max-width-sm, var(--kiba-box-max-width))))); | ||
| max-height: var(--kiba-box-max-height-xl, var(--kiba-box-max-height-lg, var(--kiba-box-max-height-md, var(--kiba-box-max-height-sm, var(--kiba-box-max-height))))); | ||
| min-width: var(--kiba-box-min-width-xl, var(--kiba-box-min-width-lg, var(--kiba-box-min-width-md, var(--kiba-box-min-width-sm, var(--kiba-box-min-width))))); | ||
| min-height: var(--kiba-box-min-height-xl, var(--kiba-box-min-height-lg, var(--kiba-box-min-height-md, var(--kiba-box-min-height-sm, var(--kiba-box-min-height))))); | ||
|
Comment on lines
+122
to
+125
|
||
| } | ||
| } | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The CHANGELOG entry doesn't mention the core purpose of this PR - fixing CSS custom property inheritance issues in Box and Stack components. Consider updating to explain that this PR prevents child components from inheriting parent sizing variables by using CSS @Property declarations with inherits: false and removing 'initial' value assignments.