这是indexloc提供的服务，不要输入任何密码
Skip to content

Allow multiple position-area declarations for a single selector #302

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

Merged
merged 2 commits into from
Mar 28, 2025
Merged

Allow multiple position-area declarations for a single selector #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4270fb
Allow multiple position-area declarations for a single selector
jgerigmeyer Mar 28, 2025
d7fc4ba
Merge branch 'position-area' into pa-review
jamesnw Mar 28, 2025
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
92 changes: 39 additions & 53 deletions src/parse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ export interface PositionAreaDeclaration {
wrapperEl?: HTMLElement | null;
targetEl?: HTMLElement | null;
anchorEl?: HTMLElement | PseudoElement | null;
anchorName?: string;
customPropName?: string;
targetUUID: string;
}
type PositionAreaDeclarations = Record<string, PositionAreaDeclaration>;

// `key` is the target element selector
// `value` is the position-area data for that property
type PositionAreaDeclarations = Record<string, PositionAreaData[]>;

export interface AnchorPosition {
declarations?: AnchorFunctionDeclaration;
positionAreas?: PositionAreaDeclaration[];
fallbacks?: TryBlock[];
order?: PositionTryOrder;
}
Expand Down Expand Up @@ -278,10 +278,10 @@ function getPositionAreaData(node: CssNode, block: Block | null) {

async function getAnchorEl(
targetEl: HTMLElement | null,
anchorObj: AnchorFunction | PositionAreaDeclaration,
anchorObj?: AnchorFunction,
) {
let anchorName = anchorObj.anchorName;
const customPropName = anchorObj.customPropName;
let anchorName = anchorObj?.anchorName;
const customPropName = anchorObj?.customPropName;
if (targetEl && !anchorName) {
const positionAnchorProperty = getCSSPropertyValue(
targetEl,
Expand Down Expand Up @@ -364,10 +364,10 @@ export async function parseCSS(styleData: StyleData[]) {

if (positionAreaData) {
for (const { selector } of selectors) {
positionAreas[selector] = {
...positionAreas[selector],
positionArea: positionAreaData,
};
positionAreas[selector] = [
...(positionAreas[selector] ?? []),
positionAreaData,
];
}
}
if (updated || positionAreaData?.changed) {
Expand Down Expand Up @@ -760,48 +760,34 @@ export async function parseCSS(styleData: StyleData[]) {
document.querySelectorAll(targetSel);
for (const targetEl of targets) {
// For every target element, find a valid anchor element
const targetUUID = `--pa-target-${nanoid(12)}`;
const anchorObj = {
targetUUID,
positionArea: { ...positions.positionArea },
fallbackValue: '',
};

const wrapperEl = wrapperForPositionedElement(targetEl, targetUUID);
positionAreaMappingStyleElement.css += activeWrapperStyles(
targetUUID,
positions.positionArea.selectorUUID,
);
positionAreaMappingStyleElement.changed = true;
const anchorEl = await getAnchorEl(targetEl, anchorObj);
const uuid = `--anchor-${nanoid(12)}`;
// Store new mapping, in case inline styles have changed and will
// be overwritten -- in which case new mappings will be re-added
inlineStyles.set(targetEl, {
...(inlineStyles.get(targetEl) ?? {}),
[anchorObj.targetUUID]: targetUUID,
});
// Point original uuid to new uuid
targetEl.setAttribute(
'style',
`${anchorObj.targetUUID}: var(${uuid}); ${
targetEl.getAttribute('style') ?? ''
}`,
);
const targetProperty = 'position-area';
// Populate new data for each anchor/target combo
validPositions[targetSel] = {
...validPositions[targetSel],
positionAreas: [positions],
declarations: {
...validPositions[targetSel]?.declarations,
[targetProperty]: [
...(validPositions[targetSel]?.declarations?.[targetProperty] ??
[]),
{ ...anchorObj, anchorEl, targetEl, wrapperEl, uuid },
],
},
};
const anchorEl = await getAnchorEl(targetEl);
for (const positionData of positions) {
const targetUUID = `--pa-target-${nanoid(12)}`;
const wrapperEl = wrapperForPositionedElement(targetEl, targetUUID);
positionAreaMappingStyleElement.css += activeWrapperStyles(
targetUUID,
positionData.selectorUUID,
);
positionAreaMappingStyleElement.changed = true;
// Populate new data for each anchor/target combo
validPositions[targetSel] = {
...validPositions[targetSel],
declarations: {
...validPositions[targetSel]?.declarations,
'position-area': [
...(validPositions[targetSel]?.declarations?.['position-area'] ??
[]),
{
targetUUID,
positionArea: positionData,
anchorEl,
targetEl,
wrapperEl,
} as PositionAreaDeclaration,
],
},
};
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/polyfill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ export async function polyfill(
let styleData = await fetchCSS(options.elements, options.excludeInlineStyles);

// pre parse CSS styles that we need to cascade
const cascadeCausedChanges = await cascadeCSS(styleData);
const cascadeCausedChanges = cascadeCSS(styleData);
if (cascadeCausedChanges) {
styleData = await transformCSS(styleData);
}
Expand Down
Loading