Skip to content
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.

Sign up for GitHub

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

Trim dynamic grids' collapsed extra rows/cols from the computed template #6496

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Trim dynamic grids' collapsed extra rows/cols from the computed template #6496

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cc1134
trim dynamic empty grid dimensions
ruggi Oct 8, 2024
bee4923
factor out isDynamicGridTemplate
ruggi Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 52 additions & 12 deletions editor/src/components/canvas/dom-walker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ import type {
GridContainerProperties,
GridElementProperties,
DomElementMetadata,
GridAutoOrTemplateBase,
} from '../../core/shared/element-template'
import {
specialSizeMeasurements,
gridContainerProperties,
gridElementProperties,
gridAutoOrTemplateFallback,
domElementMetadata,
gridAutoOrTemplateDimensions,
} from '../../core/shared/element-template'
import type { ElementPath } from '../../core/shared/project-file-types'
import type { ElementCanvasRectangleCache } from '../../core/shared/dom-utils'
Expand Down Expand Up @@ -52,6 +54,7 @@ import {
parseGridAutoOrTemplateBase,
parseGridAutoFlow,
isCSSKeyword,
isDynamicGridRepeat,
} from '../inspector/common/css-utils'
import type { UtopiaStoreAPI } from '../editor/store/store-hook'
import {
Expand Down Expand Up @@ -555,6 +558,10 @@ export function collectDomElementMetadataForElement(

function getGridContainerProperties(
elementStyle: CSSStyleDeclaration | null,
options?: {
dynamicCols: boolean
dynamicRows: boolean
},
): GridContainerProperties {
if (elementStyle == null) {
return {
Expand All @@ -565,14 +572,23 @@ function getGridContainerProperties(
gridAutoFlow: null,
}
}
const gridTemplateColumns = defaultEither(
gridAutoOrTemplateFallback(elementStyle.gridTemplateColumns),
parseGridAutoOrTemplateBase(elementStyle.gridTemplateColumns),

const gridTemplateColumns = trimDynamicEmptyDimensions(
defaultEither(
gridAutoOrTemplateFallback(elementStyle.gridTemplateColumns),
parseGridAutoOrTemplateBase(elementStyle.gridTemplateColumns),
),
options?.dynamicCols === true,
)
const gridTemplateRows = defaultEither(
gridAutoOrTemplateFallback(elementStyle.gridTemplateRows),
parseGridAutoOrTemplateBase(elementStyle.gridTemplateRows),

const gridTemplateRows = trimDynamicEmptyDimensions(
defaultEither(
gridAutoOrTemplateFallback(elementStyle.gridTemplateRows),
parseGridAutoOrTemplateBase(elementStyle.gridTemplateRows),
),
options?.dynamicRows === true,
)

const gridAutoColumns = defaultEither(
gridAutoOrTemplateFallback(elementStyle.gridAutoColumns),
parseGridAutoOrTemplateBase(elementStyle.gridAutoColumns),
Expand All @@ -590,6 +606,23 @@ function getGridContainerProperties(
)
}

function trimDynamicEmptyDimensions(
template: GridAutoOrTemplateBase,
isDynamic: boolean,
): GridAutoOrTemplateBase {
if (!isDynamic) {
return template
}
if (template.type !== 'DIMENSIONS') {
return template
}

const lastNonEmptyColumn = template.dimensions.findLastIndex(
(d) => d.type === 'KEYWORD' || (d.type === 'NUMBER' && d.value.value !== 0),
)
return gridAutoOrTemplateDimensions(template.dimensions.slice(0, lastNonEmptyColumn + 1))
}

function getGridElementProperties(
container: GridContainerProperties,
elementStyle: CSSStyleDeclaration,
Expand Down Expand Up @@ -882,8 +915,6 @@ function getSpecialMeasurements(

const parentContainerGridProperties = getGridContainerProperties(parentElementStyle)

const containerGridProperties = getGridContainerProperties(elementStyle)

const paddingValue = isRight(padding)
? padding.value
: sides(undefined, undefined, undefined, undefined)
Expand All @@ -898,15 +929,20 @@ function getSpecialMeasurements(
)
: null

const containerElementProperties = getGridElementProperties(
parentContainerGridProperties,
elementStyle,
)
const containerGridPropertiesFromProps = getGridContainerProperties(element.style)
const containerGridProperties = getGridContainerProperties(elementStyle, {
dynamicCols: isDynamicGridTemplate(containerGridPropertiesFromProps.gridTemplateColumns),
dynamicRows: isDynamicGridTemplate(containerGridPropertiesFromProps.gridTemplateRows),
})

const containerElementPropertiesFromProps = getGridElementProperties(
parentContainerGridProperties,
element.style,
)
const containerElementProperties = getGridElementProperties(
parentContainerGridProperties,
elementStyle,
)

return specialSizeMeasurements(
offset,
Expand Down Expand Up @@ -965,6 +1001,10 @@ function getSpecialMeasurements(
)
}

function isDynamicGridTemplate(template: GridAutoOrTemplateBase | null) {
return template?.type === 'DIMENSIONS' && template.dimensions.some((d) => isDynamicGridRepeat(d))
}

function elementContainsOnlyText(element: HTMLElement): boolean {
if (element.childNodes.length === 0) {
return false
Expand Down
Loading